struere 0.12.6 → 0.12.8

package/dist/bin/struere.js

@@ -33,11 +33,24 @@ __export(exports_convex, {
   getSyncState: () => getSyncState,
   getSiteUrl: () => getSiteUrl,
   getPullState: () => getPullState,
+  fireTrigger: () => fireTrigger,
   createOrganization: () => createOrganization,
   compilePrompt: () => compilePrompt,
   chatWithRouter: () => chatWithRouter,
   chatWithAgent: () => chatWithAgent
 });
+function isAuthErrorMessage(error) {
+  return error.includes("Unauthenticated") || error.includes("OIDC") || error.includes("token") || error.includes("expired");
+}
+async function withAuthRetry(fn) {
+  const result = await fn();
+  if (!result.error || !isAuthErrorMessage(result.error))
+    return result;
+  const refreshed = await refreshToken();
+  if (!refreshed)
+    return result;
+  return fn();
+}
 async function refreshToken() {
   const credentials = loadCredentials();
   if (!credentials?.sessionId)
@@ -211,6 +224,9 @@ async function syncViaHttp(apiKey, payload) {
   return json;
 }
 async function syncOrganization(payload) {
+  return withAuthRetry(() => _syncOrganization(payload));
+}
+async function _syncOrganization(payload) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -274,6 +290,9 @@ async function syncOrganization(payload) {
   return { success: false, error: `Unexpected response: ${text}` };
 }
 async function getSyncState(organizationId, environment) {
+  return withAuthRetry(() => _getSyncState(organizationId, environment));
+}
+async function _getSyncState(organizationId, environment) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -330,6 +349,9 @@ async function getSyncState(organizationId, environment) {
   return { error: `Unexpected response: ${JSON.stringify(result)}` };
 }
 async function compilePrompt(options) {
+  return withAuthRetry(() => _compilePrompt(options));
+}
+async function _compilePrompt(options) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -440,6 +462,9 @@ async function compilePrompt(options) {
   return { error: `Unexpected response: ${text}` };
 }
 async function runTool(options) {
+  return withAuthRetry(() => _runTool(options));
+}
+async function _runTool(options) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -484,6 +509,43 @@ async function runTool(options) {
   if (!token) {
     return { error: "Not authenticated" };
   }
+  if (!options.agentSlug) {
+    const response2 = await fetch(`${CONVEX_URL}/api/action`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`
+      },
+      body: JSON.stringify({
+        path: "toolTesting:runTool",
+        args: {
+          environment: options.environment,
+          toolName: options.toolName,
+          toolArgs: options.toolArgs,
+          organizationId: options.organizationId
+        }
+      }),
+      signal: AbortSignal.timeout(30000)
+    });
+    const text2 = await response2.text();
+    let json2;
+    try {
+      json2 = JSON.parse(text2);
+    } catch {
+      return { error: text2 || `HTTP ${response2.status}` };
+    }
+    if (!response2.ok) {
+      const msg = json2.errorData?.message || json2.errorMessage || text2;
+      return { error: msg };
+    }
+    if (json2.status === "success" && json2.value) {
+      return { result: json2.value };
+    }
+    if (json2.status === "error") {
+      return { error: json2.errorData?.message || json2.errorMessage || "Unknown error from Convex" };
+    }
+    return { error: `Unexpected response: ${text2}` };
+  }
   const agentResponse = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -545,7 +607,97 @@ async function runTool(options) {
   }
   return { error: `Unexpected response: ${text}` };
 }
+async function fireTrigger(options) {
+  return withAuthRetry(() => _fireTrigger(options));
+}
+async function _fireTrigger(options) {
+  const credentials = loadCredentials();
+  const apiKey = getApiKey();
+  if (apiKey && !credentials?.token) {
+    const siteUrl = getSiteUrl();
+    try {
+      const response2 = await fetch(`${siteUrl}/v1/fire-trigger`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${apiKey}`
+        },
+        body: JSON.stringify({
+          slug: options.slug,
+          entityId: options.entityId,
+          data: options.data
+        }),
+        signal: AbortSignal.timeout(60000)
+      });
+      const text2 = await response2.text();
+      let json2;
+      try {
+        json2 = JSON.parse(text2);
+      } catch {
+        return { error: text2 || `HTTP ${response2.status}` };
+      }
+      if (!response2.ok) {
+        return { error: json2.error || text2 };
+      }
+      return { result: json2 };
+    } catch (err) {
+      if (err instanceof DOMException && err.name === "TimeoutError") {
+        return { error: "Request timed out after 60s" };
+      }
+      return { error: `Network error: ${err instanceof Error ? err.message : String(err)}` };
+    }
+  }
+  if (credentials?.sessionId) {
+    await refreshToken();
+  }
+  const freshCredentials = loadCredentials();
+  const token = apiKey || freshCredentials?.token;
+  if (!token) {
+    return { error: "Not authenticated" };
+  }
+  const response = await fetch(`${CONVEX_URL}/api/action`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify({
+      path: "triggers:fire",
+      args: {
+        slug: options.slug,
+        environment: options.environment,
+        entityId: options.entityId,
+        data: options.data
+      }
+    }),
+    signal: AbortSignal.timeout(60000)
+  });
+  const text = await response.text();
+  let json;
+  try {
+    json = JSON.parse(text);
+  } catch {
+    return { error: text || `HTTP ${response.status}` };
+  }
+  if (!response.ok) {
+    const msg = json.errorData?.message || json.errorMessage || text;
+    return { error: msg };
+  }
+  if (json.status === "success" && json.value) {
+    return { result: json.value };
+  }
+  if (json.status === "success" && json.value === null) {
+    return { error: `Trigger not found: ${options.slug}` };
+  }
+  if (json.status === "error") {
+    return { error: json.errorData?.message || json.errorMessage || "Unknown error from Convex" };
+  }
+  return { error: `Unexpected response: ${text}` };
+}
 async function chatWithAgent(options) {
+  return withAuthRetry(() => _chatWithAgent(options));
+}
+async function _chatWithAgent(options) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -639,6 +791,9 @@ async function chatWithAgent(options) {
   }
 }
 async function chatWithRouter(options) {
+  return withAuthRetry(() => _chatWithRouter(options));
+}
+async function _chatWithRouter(options) {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (credentials?.sessionId) {
@@ -698,6 +853,9 @@ async function chatWithRouter(options) {
   }
 }
 async function getPullState(organizationId, environment = "development") {
+  return withAuthRetry(() => _getPullState(organizationId, environment));
+}
+async function _getPullState(organizationId, environment = "development") {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   if (apiKey && !credentials?.token) {
@@ -803,7 +961,7 @@ async function getValidToken() {
   if (!credentials?.token)
     return { error: "Not authenticated. Run `struere login`." };
   const expiry = getJwtExpiry(credentials.token);
-  const needsRefresh = !expiry || expiry.getTime() - Date.now() < 60000;
+  const needsRefresh = !expiry || expiry.getTime() - Date.now() < 300000;
   if (!needsRefresh)
     return { token: credentials.token };
   const { refreshToken: refreshToken2 } = await Promise.resolve().then(() => (init_convex(), exports_convex));
@@ -1684,7 +1842,7 @@ function defineTrigger(config) {
   if (!config.slug) throw new Error('Trigger slug is required')
   if (!config.on) throw new Error('Trigger "on" configuration is required')
   if (config.on.schedule) {
-    const parts = config.on.schedule.trim().split(/s+/)
+    const parts = config.on.schedule.trim().split(/\\s+/)
     if (parts.length !== 5) throw new Error('Invalid cron expression: expected 5 fields, got ' + parts.length)
   } else {
     if (!config.on.entityType) throw new Error('Trigger entityType is required')
@@ -1735,11 +1893,32 @@ function defineTools(tools) {
   })
 }
 
+function defineRouter(config) {
+  const VALID_OPERATORS = ['eq', 'neq', 'in', 'contains', 'regex', 'gt', 'lt', 'exists']
+  if (!config.name) throw new Error('Router name is required')
+  if (!config.slug) throw new Error('Router slug is required')
+  if (!config.agents || config.agents.length === 0) throw new Error('Router must have at least one agent')
+  var agentSlugs = new Set(config.agents.map(function(a) { return a.slug }))
+  if (!agentSlugs.has(config.fallback)) throw new Error('Router fallback "' + config.fallback + '" must reference an agent slug in the agents array')
+  if (config.mode === 'rules') {
+    if (!config.rules || config.rules.length === 0) throw new Error('Router with mode "rules" must have at least one rule')
+    for (var rule of config.rules) {
+      if (!rule.conditions || rule.conditions.length === 0) throw new Error('Each router rule must have at least one condition')
+      if (!agentSlugs.has(rule.route)) throw new Error('Router rule route "' + rule.route + '" must reference an agent slug in the agents array')
+      for (var condition of rule.conditions) {
+        if (!condition.field) throw new Error('Router rule condition field is required')
+        if (!VALID_OPERATORS.includes(condition.operator)) throw new Error('Router rule condition operator must be one of: ' + VALID_OPERATORS.join(', '))
+      }
+    }
+  }
+  return config
+}
+
 function defineEntityType() {
   throw new Error('defineEntityType has been renamed to defineData. Please update your imports: import { defineData } from "struere"')
 }
 
-export { defineAgent, defineRole, defineData, defineEntityType, defineTrigger, defineTools }
+export { defineAgent, defineRole, defineData, defineEntityType, defineTrigger, defineTools, defineRouter }
 `;
 function registerStruerePlugin() {
   if (registered)
@@ -1956,12 +2135,43 @@ export interface TriggerConfig {
   }
 }
 
+export interface RouterAgentRef {
+  slug: string
+  description: string
+}
+
+export interface RouterRuleCondition {
+  field: string
+  operator: 'eq' | 'neq' | 'in' | 'contains' | 'regex' | 'gt' | 'lt' | 'exists'
+  value?: unknown
+}
+
+export interface RouterRule {
+  conditions: RouterRuleCondition[]
+  route: string
+}
+
+export interface RouterConfig {
+  name: string
+  slug: string
+  description?: string
+  mode: 'rules' | 'classify'
+  agents: RouterAgentRef[]
+  rules?: RouterRule[]
+  fallback: string
+  classifyModel?: { model: string; temperature?: number; maxTokens?: number }
+  contextMessages?: number
+  maxTransfers?: number
+  inactivityResetMs?: number
+}
+
 export function defineAgent(config: AgentConfig): AgentConfig
 export function defineRole(config: RoleConfig): RoleConfig
 export function defineData(config: EntityTypeConfig): EntityTypeConfig
 export function defineEntityType(config: EntityTypeConfig): never
 export function defineTrigger(config: TriggerConfig): TriggerConfig
 export function defineTools(tools: ToolDefinition[]): ToolReference[]
+export function defineRouter(config: RouterConfig): RouterConfig
 `;
 function generateTypeDeclarations(cwd) {
   const struereDir = join4(cwd, ".struere");
@@ -2010,6 +2220,26 @@ async function importUserFile(filePath) {
 ${detail}`);
   }
 }
+function formatResourceSummary(resources) {
+  const parts = [];
+  if (resources.agents.length > 0)
+    parts.push(`${resources.agents.length} agents`);
+  if (resources.entityTypes.length > 0)
+    parts.push(`${resources.entityTypes.length} data types`);
+  if (resources.roles.length > 0)
+    parts.push(`${resources.roles.length} roles`);
+  if (resources.customTools.length > 0)
+    parts.push(`${resources.customTools.length} custom tools`);
+  if (resources.routers.length > 0)
+    parts.push(`${resources.routers.length} routers`);
+  if (resources.triggers.length > 0)
+    parts.push(`${resources.triggers.length} triggers`);
+  if (resources.evalSuites.length > 0)
+    parts.push(`${resources.evalSuites.length} eval suites`);
+  if (resources.fixtures.length > 0)
+    parts.push(`${resources.fixtures.length} fixtures`);
+  return `Loaded ${parts.join(", ") || "no resources"}`;
+}
 async function loadAllResources(cwd) {
   const errors = [];
   const agents = await loadTsDirectory(join5(cwd, "agents"));
@@ -2902,6 +3132,59 @@ function extractHandlerCode(handler) {
   return code;
 }
 
+// src/cli/utils/validator.ts
+var INTEGRATION_PREFIXES = {
+  "whatsapp.": "WhatsApp (Kapso)",
+  "calendar.": "Google Calendar",
+  "airtable.": "Airtable",
+  "email.": "Resend",
+  "payment.": "Flow / Polar"
+};
+function validateResources(payload, resources) {
+  const warnings = [];
+  const errors = [];
+  const agentSlugs = new Set(payload.agents.map((a) => a.slug));
+  if (payload.routers) {
+    for (const router of payload.routers) {
+      for (const agentRef of router.agents) {
+        if (!agentSlugs.has(agentRef.slug)) {
+          errors.push(`Router "${router.name}" references agent "${agentRef.slug}" but no agent with that slug exists`);
+        }
+      }
+      if (!agentSlugs.has(router.fallback)) {
+        errors.push(`Router "${router.name}" has fallback "${router.fallback}" but no agent with that slug exists`);
+      }
+      if (router.rules) {
+        for (const rule of router.rules) {
+          if (!agentSlugs.has(rule.route)) {
+            errors.push(`Router "${router.name}" has rule routing to "${rule.route}" but no agent with that slug exists`);
+          }
+        }
+      }
+    }
+  }
+  const entityTypeSlugs = new Set(payload.entityTypes.map((et) => et.slug));
+  if (payload.triggers) {
+    for (const trigger of payload.triggers) {
+      if (trigger.entityType && !entityTypeSlugs.has(trigger.entityType)) {
+        errors.push(`Trigger "${trigger.name}" references entity type "${trigger.entityType}" but no entity type with that slug exists`);
+      }
+    }
+  }
+  const seenIntegrations = new Set;
+  for (const agent of payload.agents) {
+    for (const toolName of agent.tools) {
+      for (const [prefix, integration] of Object.entries(INTEGRATION_PREFIXES)) {
+        if (toolName.startsWith(prefix) && !seenIntegrations.has(integration)) {
+          seenIntegrations.add(integration);
+          warnings.push(`Agent "${agent.name}" uses ${toolName} \u2014 ensure ${integration} integration is configured`);
+        }
+      }
+    }
+  }
+  return { warnings, errors };
+}
+
 // src/cli/commands/sync.ts
 async function performDevSync(cwd, organizationId) {
   generateTypeDeclarations(cwd);
@@ -2912,6 +3195,16 @@ ${resources.errors.join(`
 `)}`);
   }
   const payload = extractSyncPayload(resources);
+  const validation = validateResources(payload, resources);
+  for (const warning of validation.warnings) {
+    console.log(chalk6.yellow(`\u26A0 ${warning}`));
+  }
+  if (validation.errors.length > 0) {
+    for (const error of validation.errors) {
+      console.log(chalk6.red(`\u2716 ${error}`));
+    }
+    throw new Error(`${validation.errors.length} validation error(s) \u2014 fix the issues above before syncing`);
+  }
   const devResult = await syncOrganization({
     agents: payload.agents,
     tools: payload.tools,
@@ -2981,6 +3274,7 @@ async function checkForDeletions(resources, organizationId, environment) {
   return deletions;
 }
 async function syncToEnvironment(cwd, organizationId, environment) {
+  generateTypeDeclarations(cwd);
   const resources = await loadAllResources(cwd);
   if (resources.errors.length > 0) {
     throw new Error(`${resources.errors.length} resource loading error(s):
@@ -2988,6 +3282,16 @@ ${resources.errors.join(`
 `)}`);
   }
   const payload = extractSyncPayload(resources);
+  const validation = validateResources(payload, resources);
+  for (const warning of validation.warnings) {
+    console.log(chalk6.yellow(`\u26A0 ${warning}`));
+  }
+  if (validation.errors.length > 0) {
+    for (const error of validation.errors) {
+      console.log(chalk6.red(`\u2716 ${error}`));
+    }
+    throw new Error(`${validation.errors.length} validation error(s) \u2014 fix the issues above before syncing`);
+  }
   if (environment === "eval") {
     const result = await syncOrganization({
       agents: payload.agents,
@@ -3055,6 +3359,7 @@ var syncCommand = new Command5("sync").description("Sync resources to Convex and
     output.info(`Environment: ${environment}${syncEval && environment === "development" ? " + eval" : ""}`);
     console.log();
   }
+  generateTypeDeclarations(cwd);
   if (!jsonMode)
     output.start("Loading resources");
   let resources;
@@ -3072,7 +3377,7 @@ var syncCommand = new Command5("sync").description("Sync resources to Convex and
       process.exit(1);
     }
     if (!jsonMode && !options.dryRun)
-      output.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} data types, ${resources.roles.length} roles, ${resources.customTools.length} custom tools`);
+      output.succeed(formatResourceSummary(resources));
   } catch (error) {
     if (jsonMode) {
       console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
@@ -3181,32 +3486,13 @@ var syncCommand = new Command5("sync").description("Sync resources to Convex and
       }));
     }
   } catch (error) {
-    if (isAuthError(error) && interactive && !jsonMode) {
-      output.fail("Session expired - re-authenticating...");
-      clearCredentials();
-      const newCredentials = await performLogin();
-      if (!newCredentials) {
-        output.error("Authentication failed");
-        process.exit(1);
-      }
-      output.start("Syncing to Convex");
-      try {
-        const result = await syncToEnvironment(cwd, project.organization.id, environment);
-        output.succeed(`Synced to ${environment}`);
-      } catch (retryError) {
-        output.fail("Sync failed");
-        output.error(retryError instanceof Error ? retryError.message : String(retryError));
-        process.exit(1);
-      }
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
     } else {
-      if (jsonMode) {
-        console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
-      } else {
-        output.fail("Sync failed");
-        output.error(error instanceof Error ? error.message : String(error));
-      }
-      process.exit(1);
+      output.fail("Sync failed");
+      output.error(error instanceof Error ? error.message : String(error));
     }
+    process.exit(1);
   }
 });
 
@@ -3273,7 +3559,7 @@ var devCommand = new Command6("dev").description("Watch files and sync to develo
   spinner.start("Loading resources");
   try {
     loadedResources = await loadAllResources(cwd);
-    spinner.succeed(`Loaded ${loadedResources.agents.length} agents, ${loadedResources.entityTypes.length} data types, ${loadedResources.roles.length} roles, ${loadedResources.customTools.length} custom tools, ${loadedResources.evalSuites.length} eval suites, ${loadedResources.triggers.length} triggers, ${loadedResources.routers.length} routers, ${loadedResources.fixtures.length} fixtures`);
+    spinner.succeed(formatResourceSummary(loadedResources));
     for (const err of loadedResources.errors) {
       console.log(chalk7.red("  \u2716"), err);
     }
@@ -3320,28 +3606,7 @@ var devCommand = new Command6("dev").description("Watch files and sync to develo
       await performDevSync(cwd, project.organization.id);
       spinner.succeed("Synced to development");
     } catch (error) {
-      if (isAuthError(error) && !nonInteractive) {
-        spinner.fail("Session expired - re-authenticating...");
-        clearCredentials();
-        credentials = await performLogin();
-        if (!credentials) {
-          console.log(chalk7.red("Authentication failed"));
-          process.exit(1);
-        }
-        spinner.start("Syncing to Convex");
-        try {
-          await performDevSync(cwd, project.organization.id);
-          spinner.succeed("Synced to development");
-        } catch (retryError) {
-          spinner.fail("Sync failed");
-          console.log(chalk7.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
-        }
-      } else if (isAuthError(error) && nonInteractive) {
-        spinner.fail("API key authentication failed");
-        console.log(chalk7.red("Error:"), error instanceof Error ? error.message : String(error));
-        console.log(chalk7.gray("Check that STRUERE_API_KEY is valid and not expired."));
-        process.exit(1);
-      } else if (isOrgAccessError(error)) {
+      if (isOrgAccessError(error)) {
         spinner.fail("Organization access denied");
         console.log();
         console.log(chalk7.red("You do not have access to organization:"), chalk7.cyan(project.organization.name));
@@ -3391,26 +3656,8 @@ var devCommand = new Command6("dev").description("Watch files and sync to develo
       await performDevSync(cwd, project.organization.id);
       syncSpinner.succeed("Synced");
     } catch (error) {
-      if (isAuthError(error) && !nonInteractive) {
-        syncSpinner.fail("Session expired - re-authenticating...");
-        clearCredentials();
-        const newCredentials = await performLogin();
-        if (!newCredentials) {
-          console.log(chalk7.red("Authentication failed"));
-          return;
-        }
-        const retrySyncSpinner = ora6("Syncing...").start();
-        try {
-          await performDevSync(cwd, project.organization.id);
-          retrySyncSpinner.succeed("Synced");
-        } catch (retryError) {
-          retrySyncSpinner.fail("Sync failed");
-          console.log(chalk7.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
-        }
-      } else {
-        syncSpinner.fail("Sync failed");
-        console.log(chalk7.red("Error:"), error instanceof Error ? error.message : String(error));
-      }
+      syncSpinner.fail("Sync failed");
+      console.log(chalk7.red("Error:"), error instanceof Error ? error.message : String(error));
     }
   };
   const handleFileChange = (path, action) => {
@@ -3502,13 +3749,14 @@ var deployCommand = new Command7("deploy").description("Deploy all resources to
     }
     console.log();
   }
+  generateTypeDeclarations(cwd);
   if (!jsonMode)
     spinner.start("Loading resources");
   let resources;
   try {
     resources = await loadAllResources(cwd);
     if (!jsonMode)
-      spinner.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} data types, ${resources.roles.length} roles, ${resources.customTools.length} custom tools, ${resources.evalSuites.length} eval suites`);
+      spinner.succeed(formatResourceSummary(resources));
     for (const err of resources.errors) {
       if (!jsonMode)
         console.log(chalk8.red("  \u2716"), err);
@@ -3541,6 +3789,28 @@ var deployCommand = new Command7("deploy").description("Deploy all resources to
     return;
   }
   const payload = extractSyncPayload(resources);
+  const validation = validateResources(payload, resources);
+  if (validation.warnings.length > 0 || validation.errors.length > 0) {
+    if (!jsonMode) {
+      for (const warning of validation.warnings) {
+        console.log(chalk8.yellow(`\u26A0 ${warning}`));
+      }
+      for (const error of validation.errors) {
+        console.log(chalk8.red(`\u2716 ${error}`));
+      }
+    }
+    if (validation.errors.length > 0) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: `${validation.errors.length} validation error(s)`, errors: validation.errors, warnings: validation.warnings }));
+      } else {
+        console.log();
+        console.log(chalk8.red(`${validation.errors.length} validation error(s) \u2014 fix the issues above before deploying`));
+      }
+      process.exit(1);
+    }
+    if (!jsonMode)
+      console.log();
+  }
   if (!jsonMode)
     spinner.start("Checking remote state");
   let deletions = [];
@@ -3679,51 +3949,7 @@ var deployCommand = new Command7("deploy").description("Deploy all resources to
       console.log();
     }
   } catch (error) {
-    if (isAuthError(error) && !nonInteractive) {
-      if (!jsonMode)
-        spinner.fail("Session expired - re-authenticating...");
-      clearCredentials();
-      credentials = await performLogin();
-      if (!credentials) {
-        if (jsonMode) {
-          console.log(JSON.stringify({ success: false, error: "Authentication failed" }));
-        } else {
-          console.log(chalk8.red("Authentication failed"));
-        }
-        process.exit(1);
-      }
-      if (!jsonMode)
-        spinner.start("Deploying to production");
-      try {
-        const syncResult = await syncOrganization({
-          agents: payload.agents,
-          entityTypes: payload.entityTypes,
-          roles: payload.roles,
-          triggers: payload.triggers,
-          organizationId: project.organization.id,
-          environment: "production"
-        });
-        if (!syncResult.success) {
-          throw new Error(syncResult.error || "Deploy failed");
-        }
-        if (!jsonMode) {
-          spinner.succeed("Deployed to production");
-          console.log();
-          console.log(chalk8.green("Success!"), "All resources deployed to production");
-          console.log();
-        } else {
-          console.log(JSON.stringify({ success: true, environment: "production" }));
-        }
-      } catch (retryError) {
-        if (jsonMode) {
-          console.log(JSON.stringify({ success: false, error: retryError instanceof Error ? retryError.message : String(retryError) }));
-        } else {
-          spinner.fail("Deployment failed");
-          console.log(chalk8.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
-        }
-        process.exit(1);
-      }
-    } else if (isOrgAccessError(error)) {
+    if (isOrgAccessError(error)) {
       if (jsonMode) {
         console.log(JSON.stringify({ success: false, error: `Organization access denied: ${project.organization.name}` }));
       } else {
@@ -4057,6 +4283,7 @@ var statusCommand = new Command11("status").description("Compare local vs remote
     }
     console.log();
   }
+  generateTypeDeclarations(cwd);
   if (!jsonMode)
     spinner.start("Loading local resources");
   let localResources;
@@ -7094,6 +7321,7 @@ import ora14 from "ora";
 // src/cli/utils/triggers.ts
 init_credentials();
 init_config();
+init_convex();
 function getToken3() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -7195,8 +7423,8 @@ async function listTriggerExecutions(options) {
     ...options.limit && { limit: options.limit }
   });
 }
-async function getTriggerExecutionDetail(eventId) {
-  return convexQuery6("triggers:getExecutionDetail", { eventId });
+async function getTriggerExecutionDetail(eventId, environment) {
+  return convexQuery6("triggers:getExecutionDetail", { eventId, ...environment && { environment } });
 }
 async function convexAction3(path, args) {
   const token = getToken3();
@@ -7522,7 +7750,7 @@ triggersCommand.command("runs [slug]").description("List trigger runs").option("
     }
     console.log();
     renderTable([
-      { key: "id", label: "ID", width: 24 },
+      { key: "id", label: "ID", width: 40 },
       { key: "trigger", label: "Trigger", width: 16 },
       { key: "status", label: "Status", width: 10 },
       { key: "attempts", label: "Attempts", width: 8 },
@@ -7649,7 +7877,7 @@ triggersCommand.command("stats").description("Show trigger run statistics").opti
     process.exit(1);
   }
 });
-triggersCommand.command("logs [slug]").description("View trigger execution history").option("--env <environment>", "Environment", "development").option("--limit <n>", "Maximum results", "10").option("--json", "Output raw JSON").action(async (slug, opts) => {
+triggersCommand.command("logs [slug]").description("View trigger execution history").option("--env <environment>", "Environment", "development").option("--limit <n>", "Maximum results", "10").option("--json", "Output raw JSON").option("-v, --verbose", "Show full error messages").action(async (slug, opts) => {
   await ensureAuth5();
   const spinner = ora14();
   try {
@@ -7666,12 +7894,12 @@ triggersCommand.command("logs [slug]").description("View trigger execution histo
     }
     console.log();
     renderTable([
-      { key: "id", label: "ID", width: 24 },
+      { key: "id", label: "ID", width: 40 },
       { key: "trigger", label: "Trigger", width: 16 },
       { key: "status", label: "Status", width: 8 },
       { key: "steps", label: "Steps", width: 7 },
       { key: "duration", label: "Duration", width: 10 },
-      { key: "error", label: "Error", width: 30 },
+      { key: "error", label: "Error", width: 50 },
       { key: "time", label: "Time", width: 10 }
     ], executions.map((e) => {
       const status = e.eventType === "trigger.executed" ? "success" : "failed";
@@ -7684,10 +7912,23 @@ triggersCommand.command("logs [slug]").description("View trigger execution histo
         status: statusColor4(status),
         steps: `${passed}/${log.length}`,
         duration: `${totalMs}ms`,
-        error: status === "failed" ? (e.payload?.error ?? "").slice(0, 28) : "",
+        error: status === "failed" ? (e.payload?.error ?? "").slice(0, 80) : "",
         time: relativeTime2(e.timestamp ?? Date.now())
       };
     }));
+    if (opts.verbose) {
+      const failures = executions.filter((e) => e.eventType === "trigger.failed");
+      if (failures.length) {
+        console.log();
+        console.log(chalk20.bold("Error Details"));
+        console.log(chalk20.gray("\u2500".repeat(60)));
+        for (const f of failures) {
+          console.log(`  ${chalk20.cyan(f.payload?.triggerSlug ?? "")} ${chalk20.gray(relativeTime2(f.timestamp ?? Date.now()))}`);
+          console.log(`  ${chalk20.red(f.payload?.error ?? "Unknown error")}`);
+          console.log();
+        }
+      }
+    }
     console.log();
   } catch (err) {
     const message = err instanceof Error ? err.message : String(err);
@@ -7700,12 +7941,36 @@ triggersCommand.command("logs [slug]").description("View trigger execution histo
     process.exit(1);
   }
 });
-triggersCommand.command("log <event-id>").description("View detailed trigger execution log").option("--json", "Output raw JSON").option("-v, --verbose", "Show detailed agent tool calls").action(async (eventId, opts) => {
+triggersCommand.command("log <identifier>").description("View detailed trigger execution log (by event ID or trigger slug)").option("--env <environment>", "Environment", "development").option("--nth <n>", "Show nth most recent execution (when using slug)", "1").option("--json", "Output raw JSON").option("-v, --verbose", "Show detailed agent tool calls").action(async (identifier, opts) => {
   await ensureAuth5();
   const spinner = ora14();
   try {
+    let eventId = identifier;
+    const isConvexId = identifier.includes("_") || identifier.length > 30;
+    if (!isConvexId) {
+      spinner.start("Resolving trigger slug to latest execution");
+      const executions = await listTriggerExecutions({
+        environment: opts.env,
+        triggerSlug: identifier,
+        limit: parseInt(opts.nth, 10)
+      });
+      if (!executions.length) {
+        spinner.fail(`No executions found for trigger "${identifier}" in ${opts.env}`);
+        if (opts.json) {
+          console.log(JSON.stringify({ success: false, error: `No executions found for trigger "${identifier}"` }));
+        }
+        process.exit(1);
+      }
+      const idx = parseInt(opts.nth, 10) - 1;
+      if (idx >= executions.length) {
+        spinner.fail(`Only ${executions.length} executions found, cannot get #${opts.nth}`);
+        process.exit(1);
+      }
+      eventId = executions[idx]._id;
+      spinner.succeed(`Found execution for "${identifier}"`);
+    }
     spinner.start("Fetching execution detail");
-    const event = await getTriggerExecutionDetail(eventId);
+    const event = await getTriggerExecutionDetail(eventId, opts.env);
     if (!event) {
       spinner.fail("Execution not found");
       if (opts.json) {
@@ -7911,6 +8176,79 @@ triggersCommand.command("retry-event <event-id>").description("Retry a failed im
     process.exit(1);
   }
 });
+triggersCommand.command("fire <slug>").description("Manually fire a trigger").option("--env <environment>", "Environment (development|production|eval)", "development").option("--entity <entityId>", "Entity ID to provide as context").option("--data <json>", "JSON data for template context").option("--json", "Output raw JSON").option("--confirm", "Skip production confirmation").option("-v, --verbose", "Show detailed agent tool calls").action(async (slug, opts) => {
+  await ensureAuth5();
+  const spinner = ora14();
+  const environment = opts.env;
+  if (environment === "production" && !opts.confirm && isInteractive()) {
+    const readline = await import("readline");
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    await new Promise((resolve) => {
+      rl.question(chalk20.yellow(`WARNING: Firing trigger in PRODUCTION environment.
+  Press Enter to continue or Ctrl+C to cancel: `), resolve);
+    });
+    rl.close();
+  }
+  let data;
+  if (opts.data) {
+    try {
+      data = JSON.parse(opts.data);
+    } catch {
+      console.log(chalk20.red("Error: --data must be valid JSON"));
+      process.exit(1);
+    }
+  }
+  try {
+    spinner.start(`Firing trigger ${chalk20.cyan(slug)}...`);
+    const { result, error } = await fireTrigger({
+      slug,
+      environment,
+      entityId: opts.entity,
+      data
+    });
+    if (error) {
+      spinner.fail("Trigger execution failed");
+      if (opts.json) {
+        console.log(JSON.stringify({ success: false, error }));
+      } else {
+        console.log(chalk20.red("Error:"), error);
+      }
+      process.exit(1);
+    }
+    if (!result) {
+      spinner.fail("No result returned");
+      process.exit(1);
+    }
+    if (result.success) {
+      spinner.succeed(chalk20.green(`Trigger ${chalk20.cyan(slug)} fired successfully`));
+    } else {
+      spinner.fail(chalk20.red(`Trigger ${chalk20.cyan(slug)} execution failed`));
+    }
+    if (opts.json) {
+      console.log(JSON.stringify(result, null, 2));
+      return;
+    }
+    console.log();
+    console.log(`  ${chalk20.gray("Trigger:")}     ${chalk20.cyan(result.trigger.name)} (${result.trigger.slug})`);
+    console.log(`  ${chalk20.gray("Environment:")} ${chalk20.cyan(result.environment)}`);
+    console.log(`  ${chalk20.gray("Status:")}      ${result.success ? chalk20.green("success") : chalk20.red("failed")}`);
+    if (result.executionLog?.length) {
+      renderExecutionLog(result.executionLog, opts.verbose);
+    }
+    if (!result.success) {
+      process.exit(1);
+    }
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    spinner.fail("Failed to fire trigger");
+    if (opts.json) {
+      console.log(JSON.stringify({ success: false, error: message }));
+    } else {
+      console.log(chalk20.red("Error:"), message);
+    }
+    process.exit(1);
+  }
+});
 
 // src/cli/commands/compile-prompt.ts
 init_credentials();
@@ -7918,7 +8256,7 @@ import { Command as Command19 } from "commander";
 import chalk21 from "chalk";
 import ora15 from "ora";
 init_convex();
-var compilePromptCommand = new Command19("compile-prompt").description("Compile and preview an agent's system prompt after template processing").argument("<agent-slug>", "Agent slug to compile prompt for").option("--env <env>", "Environment: development | production", "development").option("--message <msg>", "Sample message for template context").option("--channel <channel>", "Sample channel (whatsapp, widget, api, dashboard)").option("--param <key=value...>", "Custom thread param (repeatable)", (val, acc) => {
+var compilePromptCommand = new Command19("compile-prompt").description("Compile and preview an agent's system prompt after template processing").argument("<agent-slug>", "Agent slug to compile prompt for").option("--env <env>", "Environment: development | production | eval", "development").option("--message <msg>", "Sample message for template context").option("--channel <channel>", "Sample channel (whatsapp, widget, api, dashboard)").option("--param <key=value...>", "Custom thread param (repeatable)", (val, acc) => {
   acc.push(val);
   return acc;
 }, []).option("--json", "Output full JSON (raw + compiled + context)").option("--raw", "Show raw uncompiled template instead of compiled").action(async (agentSlug, options) => {
@@ -8001,26 +8339,7 @@ var compilePromptCommand = new Command19("compile-prompt").description("Compile
       threadMetadata: Object.keys(threadMetadata).length > 0 ? threadMetadata : undefined
     });
   };
-  let { result, error } = await doCompile();
-  if (error && isAuthError(error) && !nonInteractive) {
-    if (!jsonMode)
-      spinner.fail("Session expired - re-authenticating...");
-    clearCredentials();
-    credentials = await performLogin();
-    if (!credentials) {
-      if (jsonMode) {
-        console.log(JSON.stringify({ success: false, error: "Authentication failed" }));
-      } else {
-        console.log(chalk21.red("Authentication failed"));
-      }
-      process.exit(1);
-    }
-    const retry = await doCompile();
-    result = retry.result;
-    error = retry.error;
-    if (!jsonMode && !error)
-      spinner.succeed("Compiled prompt");
-  }
+  const { result, error } = await doCompile();
   if (error) {
     if (jsonMode) {
       console.log(JSON.stringify({ success: false, error }));
@@ -8068,7 +8387,7 @@ import { Command as Command20 } from "commander";
 import chalk22 from "chalk";
 import ora16 from "ora";
 init_convex();
-var runToolCommand = new Command20("run-tool").description("Run a tool as it would execute during a real agent conversation").argument("<agent-slug>", "Agent slug").argument("<tool-name>", "Tool name (e.g., entity.query)").option("--env <environment>", "Environment: development | production | eval", "development").option("--args <json>", "Tool arguments as JSON string", "{}").option("--args-file <path>", "Read tool arguments from a JSON file").option("--json", "Output full JSON result").option("--confirm", "Skip production confirmation prompt").action(async (agentSlug, toolName, options) => {
+var runToolCommand = new Command20("run-tool").description("Run a tool as it would execute during a real agent conversation").argument("<tool-name>", "Tool name (e.g., entity.query, run_scrapers)").option("--agent <slug>", "Agent slug (optional \u2014 omit to run without agent context)").option("--env <environment>", "Environment: development | production | eval", "development").option("--args <json>", "Tool arguments as JSON string", "{}").option("--args-file <path>", "Read tool arguments from a JSON file").option("--json", "Output full JSON result").option("--confirm", "Skip production confirmation prompt").action(async (toolName, options) => {
   const spinner = ora16();
   const cwd = process.cwd();
   const nonInteractive = !isInteractive();
@@ -8137,6 +8456,9 @@ var runToolCommand = new Command20("run-tool").description("Run a tool as it wou
     process.exit(1);
   }
   const environment = options.env;
+  if (!options.agent && !toolName.includes(".") && !jsonMode) {
+    console.log(chalk22.dim(`Tip: Running without agent context. Use --agent <slug> to run with a specific agent.`));
+  }
   if (environment === "production" && !options.confirm && !nonInteractive) {
     const readline = await import("readline");
     const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
@@ -8148,37 +8470,18 @@ var runToolCommand = new Command20("run-tool").description("Run a tool as it wou
     rl.close();
   }
   if (!jsonMode) {
-    spinner.start(`Running ${chalk22.cyan(toolName)} on ${chalk22.cyan(agentSlug)} (${environment})`);
+    spinner.start(`Running ${chalk22.cyan(toolName)}${options.agent ? ` on ${chalk22.cyan(options.agent)}` : ""} (${environment})`);
   }
   const doRunTool = async () => {
     return runTool({
-      agentSlug,
+      agentSlug: options.agent,
       toolName,
       toolArgs,
       environment,
       organizationId: project?.organization.id
     });
   };
-  let { result, error } = await doRunTool();
-  if (error && isAuthError(error) && !nonInteractive) {
-    if (!jsonMode)
-      spinner.fail("Session expired - re-authenticating...");
-    clearCredentials();
-    credentials = await performLogin();
-    if (!credentials) {
-      if (jsonMode) {
-        console.log(JSON.stringify({ success: false, error: "Authentication failed" }));
-      } else {
-        console.log(chalk22.red("Authentication failed"));
-      }
-      process.exit(1);
-    }
-    const retry = await doRunTool();
-    result = retry.result;
-    error = retry.error;
-    if (!jsonMode && !error)
-      spinner.succeed(`Ran ${chalk22.cyan(toolName)}`);
-  }
+  const { result, error } = await doRunTool();
   if (error) {
     if (jsonMode) {
       console.log(JSON.stringify({ success: false, error }));
@@ -8205,7 +8508,7 @@ var runToolCommand = new Command20("run-tool").description("Run a tool as it wou
     process.exit(1);
   }
   if (!jsonMode) {
-    spinner.succeed(`Ran ${chalk22.cyan(toolName)} on ${chalk22.cyan(result.agent.slug)} (${result.environment}) in ${result.durationMs}ms`);
+    spinner.succeed(`Ran ${chalk22.cyan(toolName)}${result.agent ? ` on ${chalk22.cyan(result.agent.slug)}` : ""} (${result.environment}) in ${result.durationMs}ms`);
   }
   if (jsonMode) {
     console.log(JSON.stringify(result, null, 2));
@@ -8226,7 +8529,18 @@ import chalk23 from "chalk";
 import ora17 from "ora";
 import readline from "readline";
 init_convex();
-var chatCommand = new Command21("chat").description("Chat with an agent or via a router").argument("<slug>", "Agent slug (or router slug when --router is used)").option("--env <environment>", "Environment: development | production | eval", "development").option("--thread <id>", "Continue an existing thread").option("--message <msg>", "Single message mode (send and exit)").option("--json", "Output JSON").option("--channel <channel>", "Channel identifier", "api").option("-v, --verbose", "Show detailed response info").option("--confirm", "Skip production warning prompt").option("--router", "Chat via a router instead of directly with an agent").option("--phone <number>", "Sender phone number for routing rules").action(async (slug, options) => {
+function printExecutionMeta(meta) {
+  console.log(chalk23.dim(`Model: ${meta.model} | Duration: ${meta.durationMs}ms`));
+  if (meta.toolCallSummary.length > 0) {
+    console.log(chalk23.dim("Tool calls:"));
+    for (const tc of meta.toolCallSummary) {
+      const status = tc.status === "success" ? chalk23.green("ok") : chalk23.red(tc.status);
+      const err = tc.errorMessage ? chalk23.red(` \u2014 ${tc.errorMessage}`) : "";
+      console.log(chalk23.dim(`  ${tc.name} ${status} ${tc.durationMs}ms${err}`));
+    }
+  }
+}
+var chatCommand = new Command21("chat").description("Chat with an agent or via a router").argument("<slug>", "Agent slug (or router slug when --router is used)").option("--env <environment>", "Environment: development | production | eval", "development").option("--thread <id>", "Continue an existing thread").option("--message <msg>", "Single message mode (send and exit)").option("--json", "Output JSON").option("--channel <channel>", "Channel identifier", "api").option("-v, --verbose", "Show execution metadata (model, duration, tool calls)").option("--confirm", "Skip production warning prompt").option("--router", "Chat via a router instead of directly with an agent").option("--phone <number>", "Sender phone number for routing rules").action(async (slug, options) => {
   const spinner = ora17();
   const cwd = process.cwd();
   const nonInteractive = !isInteractive();
@@ -8374,16 +8688,18 @@ var chatCommand = new Command21("chat").description("Chat with an agent or via a
       console.log("\u2500".repeat(60));
       console.log();
       if (routerResult.routedToAgent) {
-        console.log(chalk23.magenta(`Routed to: ${routerResult.routedToAgent} (${routerResult.routedToAgentSlug})`));
-        console.log();
+        console.log(chalk23.green(`${routerResult.routedToAgent}`) + chalk23.dim(` (${routerResult.routedToAgentSlug})`) + chalk23.magenta(" \u2190 routed") + chalk23.dim(":"));
+      } else {
+        console.log(chalk23.green("Agent:"));
       }
-      console.log(chalk23.green("Agent:"));
       console.log(result.message);
       console.log();
       if (options.verbose) {
         console.log(chalk23.dim(`Thread: ${result.threadId}`));
         console.log(chalk23.dim(`Tokens: ${result.usage.inputTokens} in / ${result.usage.outputTokens} out (${result.usage.totalTokens} total)`));
-        console.log(chalk23.dim("Tool call details available in dashboard"));
+        if (result._executionMeta) {
+          printExecutionMeta(result._executionMeta);
+        }
       } else {
         console.log(chalk23.dim(`Thread: ${result.threadId} | Tokens: ${result.usage.totalTokens}`));
       }
@@ -8485,16 +8801,18 @@ var chatCommand = new Command21("chat").description("Chat with an agent or via a
     const interactiveRouterResult = result;
     console.log();
     if (interactiveRouterResult.routedToAgent) {
-      console.log(chalk23.magenta(`Routed to: ${interactiveRouterResult.routedToAgent} (${interactiveRouterResult.routedToAgentSlug})`));
-      console.log();
+      console.log(chalk23.green(`${interactiveRouterResult.routedToAgent}`) + chalk23.dim(` (${interactiveRouterResult.routedToAgentSlug})`) + chalk23.magenta(" \u2190 routed") + chalk23.dim(":"));
+    } else {
+      console.log(chalk23.green("Agent:"));
     }
-    console.log(chalk23.green("Agent:"));
     console.log(result.message);
     console.log();
     if (options.verbose) {
       console.log(chalk23.dim(`Thread: ${result.threadId}`));
       console.log(chalk23.dim(`Tokens: ${result.usage.inputTokens} in / ${result.usage.outputTokens} out (${result.usage.totalTokens} total)`));
-      console.log(chalk23.dim("Tool call details available in dashboard"));
+      if (result._executionMeta) {
+        printExecutionMeta(result._executionMeta);
+      }
     } else {
       console.log(chalk23.dim(`Tokens: ${result.usage.totalTokens}`));
     }
@@ -8710,7 +9028,7 @@ whatsappCommand.command("set-agent <connection> <agent-slug>").description("Assi
 // package.json
 var package_default = {
   name: "struere",
-  version: "0.12.6",
+  version: "0.12.8",
   description: "Build, test, and deploy AI agents",
   keywords: [
     "ai",