struere 0.9.6 → 0.9.9

package/dist/bin/struere.js

@@ -19463,11 +19463,13 @@ function getApiKey() {
   return process.env.STRUERE_API_KEY || null;
 }
 
-// src/cli/utils/convex.ts
+// src/cli/utils/config.ts
 var CONVEX_URL = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
 function getSiteUrl() {
   return CONVEX_URL.replace(".cloud", ".site");
 }
+
+// src/cli/utils/convex.ts
 async function refreshToken() {
   const credentials = loadCredentials();
   if (!credentials?.sessionId)
@@ -19492,6 +19494,38 @@ async function refreshToken() {
     return null;
   }
 }
+async function createOrganization(token, name, slug) {
+  const response = await fetch(`${CONVEX_URL}/api/action`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify({
+      path: "organizations:createFromCli",
+      args: { name, slug }
+    }),
+    signal: AbortSignal.timeout(30000)
+  });
+  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 { organization: json.value };
+  }
+  if (json.status === "error") {
+    return { error: json.errorData?.message || json.errorMessage || "Unknown error" };
+  }
+  return { error: `Unexpected response: ${text}` };
+}
 async function listMyOrganizations(token) {
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
@@ -19710,6 +19744,115 @@ async function getSyncState(organizationId, environment) {
   }
   return { error: `Unexpected response: ${JSON.stringify(result)}` };
 }
+async function compilePrompt(options) {
+  const credentials = loadCredentials();
+  const apiKey = getApiKey();
+  if (apiKey && !credentials?.token) {
+    const siteUrl = getSiteUrl();
+    try {
+      const response2 = await fetch(`${siteUrl}/v1/compile-prompt`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${apiKey}`
+        },
+        body: JSON.stringify({
+          slug: options.slug,
+          message: options.message,
+          channel: options.channel,
+          threadMetadata: options.threadMetadata
+        }),
+        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) {
+        return { error: json2.error || text2 };
+      }
+      return { result: json2 };
+    } catch (err) {
+      if (err instanceof DOMException && err.name === "TimeoutError") {
+        return { error: "Request timed out after 30s" };
+      }
+      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 agentResponse = await fetch(`${CONVEX_URL}/api/query`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify({
+      path: "agents:getBySlug",
+      args: { slug: options.slug }
+    })
+  });
+  if (!agentResponse.ok) {
+    return { error: await agentResponse.text() };
+  }
+  const agentResult = await agentResponse.json();
+  if (agentResult.status === "error") {
+    return { error: agentResult.errorMessage || "Failed to look up agent" };
+  }
+  if (!agentResult.value) {
+    return { error: `Agent not found: ${options.slug}` };
+  }
+  const response = await fetch(`${CONVEX_URL}/api/action`, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify({
+      path: "agents:compileSystemPrompt",
+      args: {
+        agentId: agentResult.value._id,
+        environment: options.environment,
+        sampleContext: {
+          message: options.message,
+          channel: options.channel,
+          threadMetadata: options.threadMetadata
+        }
+      }
+    }),
+    signal: AbortSignal.timeout(30000)
+  });
+  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: `Agent not found or no config for environment: ${options.environment}` };
+  }
+  if (json.status === "error") {
+    return { error: json.errorData?.message || json.errorMessage || "Unknown error from Convex" };
+  }
+  return { error: `Unexpected response: ${text}` };
+}
 async function getPullState(organizationId, environment = "development") {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -19802,6 +19945,7 @@ async function browserLoginInternal(spinner) {
   const authPromise = new Promise((resolve, reject) => {
     const server = Bun.serve({
       port: AUTH_CALLBACK_PORT,
+      hostname: "127.0.0.1",
       async fetch(req) {
         const url = new URL(req.url);
         if (url.pathname === "/callback") {
@@ -19870,7 +20014,7 @@ async function browserLoginInternal(spinner) {
     if (organizations.length > 0) {
       console.log(source_default.gray("Organizations:"), organizations.map((o) => o.name).join(", "));
     } else {
-      console.log(source_default.yellow("No organizations found. Create one in the dashboard first."));
+      console.log(source_default.yellow("No organizations found. Run"), source_default.cyan("struere org create"), source_default.yellow("to create one."));
     }
     console.log();
     return credentials;
@@ -20102,9 +20246,9 @@ logs/
 }
 function getEntityTypeTs(name, slug) {
   const displayName = name.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-  return `import { defineEntityType } from 'struere'
+  return `import { defineData } from 'struere'
 
-export default defineEntityType({
+export default defineData({
   name: "${displayName}",
   slug: "${slug}",
   schema: {
@@ -20182,7 +20326,7 @@ export default defineTools([
         },
       },
     },
-    handler: async (args, context, fetch) => {
+    handler: async (args, context, struere, fetch) => {
       const timezone = (args.timezone as string) || 'UTC'
       const now = new Date()
       return {
@@ -20211,7 +20355,7 @@ export default defineTools([
       },
       required: ['message'],
     },
-    handler: async (args, context, fetch) => {
+    handler: async (args, context, struere, fetch) => {
       const webhookUrl = process.env.SLACK_WEBHOOK_URL
       if (!webhookUrl) {
         return { success: false, error: 'SLACK_WEBHOOK_URL not configured' }
@@ -20520,11 +20664,11 @@ function validateObjectProperties(schema, path) {
   }
 }
 
-function defineEntityType(config) {
-  if (!config.name) throw new Error('Entity type name is required')
-  if (!config.slug) throw new Error('Entity type slug is required')
-  if (!config.schema) throw new Error('Entity type schema is required')
-  if (config.schema.type !== 'object') throw new Error('Entity type schema must be an object type')
+function defineData(config) {
+  if (!config.name) throw new Error('Data type name is required')
+  if (!config.slug) throw new Error('Data type slug is required')
+  if (!config.schema) throw new Error('Data type schema is required')
+  if (config.schema.type !== 'object') throw new Error('Data type schema must be an object type')
   if (config.schema.properties) {
     for (const [key, value] of Object.entries(config.schema.properties)) {
       validateObjectProperties(value, key)
@@ -20552,6 +20696,15 @@ function defineTrigger(config) {
     if (!action.tool) throw new Error('Trigger action tool is required')
     if (!action.args || typeof action.args !== 'object') throw new Error('Trigger action args must be an object')
   }
+  if (config.schedule) {
+    if (config.schedule.delay !== undefined && config.schedule.at !== undefined) throw new Error('Trigger schedule cannot have both "delay" and "at"')
+    if (config.schedule.delay !== undefined && typeof config.schedule.delay !== 'number') throw new Error('Trigger schedule.delay must be a number')
+    if (config.schedule.at !== undefined && typeof config.schedule.at !== 'string') throw new Error('Trigger schedule.at must be a string')
+  }
+  if (config.retry) {
+    if (config.retry.maxAttempts !== undefined && (typeof config.retry.maxAttempts !== 'number' || config.retry.maxAttempts < 1)) throw new Error('Trigger retry.maxAttempts must be a positive number')
+    if (config.retry.backoffMs !== undefined && (typeof config.retry.backoffMs !== 'number' || config.retry.backoffMs < 0)) throw new Error('Trigger retry.backoffMs must be a non-negative number')
+  }
   return config
 }
 
@@ -20582,24 +20735,7 @@ function defineTools(tools) {
   })
 }
 
-function defineConfig(config) {
-  const defaultConfig = {
-    port: 3000,
-    host: 'localhost',
-    cors: { origins: ['http://localhost:3000'], credentials: true },
-    logging: { level: 'info', format: 'pretty' },
-    auth: { type: 'none' },
-  }
-  return {
-    ...defaultConfig,
-    ...config,
-    cors: config.cors ? { ...defaultConfig.cors, ...config.cors } : defaultConfig.cors,
-    logging: config.logging ? { ...defaultConfig.logging, ...config.logging } : defaultConfig.logging,
-    auth: config.auth ? { ...defaultConfig.auth, ...config.auth } : defaultConfig.auth,
-  }
-}
-
-export { defineAgent, defineRole, defineEntityType, defineTrigger, defineTools, defineConfig }
+export { defineAgent, defineRole, defineData, defineTrigger, defineTools }
 `;
 function registerStruerePlugin() {
   if (registered)
@@ -20645,11 +20781,6 @@ var TYPE_DECLARATIONS = `declare module 'struere' {
   export interface ToolContext {
     conversationId: string
     userId?: string
-    state: {
-      get<T>(key: string): Promise<T | undefined>
-      set<T>(key: string, value: T): Promise<void>
-      delete(key: string): Promise<void>
-    }
   }
 
   export type ToolHandler = (params: Record<string, unknown>, context: ToolContext) => Promise<unknown>
@@ -20678,6 +20809,12 @@ var TYPE_DECLARATIONS = `declare module 'struere' {
     model?: ModelConfig
     tools?: string[]
     firstMessageSuggestions?: string[]
+    threadContextParams?: Array<{
+      name: string
+      type: 'string' | 'number' | 'boolean'
+      required?: boolean
+      description?: string
+    }>
   }
 
   export interface JSONSchemaProperty {
@@ -20714,13 +20851,12 @@ var TYPE_DECLARATIONS = `declare module 'struere' {
     resource: string
     actions: string[]
     effect: 'allow' | 'deny'
-    priority?: number
   }
 
   export interface ScopeRuleConfig {
     entityType: string
     field: string
-    operator: 'eq' | 'ne' | 'in' | 'contains'
+    operator: 'eq' | 'neq' | 'in' | 'contains'
     value: string
   }
 
@@ -20755,31 +20891,23 @@ var TYPE_DECLARATIONS = `declare module 'struere' {
       condition?: Record<string, unknown>
     }
     actions: TriggerAction[]
-  }
-
-  export interface FrameworkConfig {
-    port?: number
-    host?: string
-    cors?: {
-      origins: string[]
-      credentials?: boolean
-    }
-    logging?: {
-      level: 'debug' | 'info' | 'warn' | 'error'
-      format?: 'json' | 'pretty'
+    schedule?: {
+      delay?: number
+      at?: string
+      offset?: number
+      cancelPrevious?: boolean
     }
-    auth?: {
-      type: 'none' | 'api-key' | 'jwt' | 'custom'
-      validate?: (token: string) => Promise<boolean>
+    retry?: {
+      maxAttempts?: number
+      backoffMs?: number
     }
   }
 
   export function defineAgent(config: AgentConfig): AgentConfig
   export function defineRole(config: RoleConfig): RoleConfig
-  export function defineEntityType(config: EntityTypeConfig): EntityTypeConfig
+  export function defineData(config: EntityTypeConfig): EntityTypeConfig
   export function defineTrigger(config: TriggerConfig): TriggerConfig
   export function defineTools(tools: ToolDefinition[]): ToolReference[]
-  export function defineConfig(config?: Partial<FrameworkConfig>): FrameworkConfig
 }
 `;
 function generateTypeDeclarations(cwd) {
@@ -20950,7 +21078,7 @@ function buildProjectContext(orgName, resources) {
   }
   if (resources.entityTypes.length > 0) {
     lines.push("");
-    lines.push(`### Entity Types (${resources.entityTypes.length})`);
+    lines.push(`### Data Types (${resources.entityTypes.length})`);
     for (const et of resources.entityTypes) {
       const fields = et.schema?.properties ? Object.keys(et.schema.properties).join(", ") : "";
       const fieldStr = fields ? ` \u2014 fields: ${fields}` : "";
@@ -20986,7 +21114,7 @@ function buildDocument(projectContext) {
   const lines = [];
   lines.push(`# Struere Workspace`);
   lines.push("");
-  lines.push(`> This is a Struere workspace project. You define agents, entity types, roles, triggers, and custom tools here. The CLI syncs them to the Convex backend.`);
+  lines.push(`> This is a Struere workspace project. You define agents, data types, roles, triggers, and custom tools here. The CLI syncs them to the Convex backend.`);
   lines.push("");
   lines.push(`## Agent Usage`);
   lines.push("");
@@ -21006,7 +21134,7 @@ function buildDocument(projectContext) {
   lines.push("");
   lines.push("**JSON output**: Most commands support `--json` for structured output:");
   lines.push("```bash");
-  lines.push("struere entities list <type> --json");
+  lines.push("struere data list <type> --json");
   lines.push("struere status --json");
   lines.push("struere deploy --json --force");
   lines.push("```");
@@ -21023,7 +21151,7 @@ function buildDocument(projectContext) {
   lines.push("");
   lines.push("```");
   lines.push("agents/              # Agent definitions (one file per agent)");
-  lines.push("entity-types/        # Entity type schemas (like DB tables)");
+  lines.push("entity-types/        # Data type schemas (like DB tables)");
   lines.push("roles/               # RBAC roles with policies, scope rules, field masks");
   lines.push("triggers/            # Automation rules (react to entity changes)");
   lines.push("tools/index.ts       # Custom tools shared by all agents");
@@ -21039,16 +21167,16 @@ function buildDocument(projectContext) {
   lines.push("| `struere sync` | One-shot sync to Convex and exit (agent-friendly) |");
   lines.push("| `struere dev` | Watch files and sync to Convex on save |");
   lines.push("| `struere deploy` | Push development config to production |");
-  lines.push("| `struere add agent\\|entity-type\\|role\\|trigger\\|eval\\|fixture <name>` | Scaffold a new resource |");
+  lines.push("| `struere add agent\\|data-type\\|role\\|trigger\\|eval\\|fixture <name>` | Scaffold a new resource |");
   lines.push("| `struere status` | Compare local vs remote state |");
   lines.push("| `struere pull` | Download remote resources to local files |");
-  lines.push("| `struere entities types` | List entity types in an environment |");
-  lines.push("| `struere entities list <type>` | List entities (supports `--status`, `--limit`, `--json`) |");
-  lines.push("| `struere entities get <id>` | Get entity details |");
-  lines.push("| `struere entities create <type>` | Create entity (interactive or `--data <json>`) |");
-  lines.push("| `struere entities update <id>` | Update entity (`--data <json>`, `--status`) |");
-  lines.push("| `struere entities delete <id>` | Delete entity (with confirmation) |");
-  lines.push("| `struere entities search <type> <query>` | Search entities by text |");
+  lines.push("| `struere data types` | List data types in an environment |");
+  lines.push("| `struere data list <type>` | List records (supports `--status`, `--limit`, `--json`) |");
+  lines.push("| `struere data get <id>` | Get record details |");
+  lines.push("| `struere data create <type>` | Create record (interactive or `--data <json>`) |");
+  lines.push("| `struere data update <id>` | Update record (`--data <json>`, `--status`) |");
+  lines.push("| `struere data delete <id>` | Delete record (with confirmation) |");
+  lines.push("| `struere data search <type> <query>` | Search records by text |");
   lines.push("| `struere eval run <suite>` | Run an eval suite and write Markdown results |");
   lines.push("| `struere eval run <suite> --case <name>` | Run specific case(s) by name |");
   lines.push("| `struere eval run <suite> --tag <tag>` | Run cases matching a tag |");
@@ -21060,7 +21188,7 @@ function buildDocument(projectContext) {
   lines.push("");
   lines.push(`## Key Patterns`);
   lines.push("");
-  lines.push("- **Imports**: `import { defineAgent, defineEntityType, defineRole, defineTrigger, defineTools } from 'struere'`");
+  lines.push("- **Imports**: `import { defineAgent, defineData, defineRole, defineTrigger, defineTools } from 'struere'`");
   lines.push("- **Default model**: `grok-4-1-fast` (provider: `xai`). Also supports `anthropic`, `openai` and `google`");
   lines.push("- **Scope rule values**: `actor.userId`, `actor.entityId`, `actor.organizationId`, `actor.relatedIds:TYPE`, `literal:VALUE`");
   lines.push("- **Policy actions**: `create`, `read`, `update`, `delete`, `list` (deny overrides allow)");
@@ -21157,7 +21285,7 @@ function buildDocument(projectContext) {
   lines.push("### SDK");
   lines.push(`- [SDK Overview](${DOCS_BASE}/sdk/overview.md)`);
   lines.push(`- [defineAgent](${DOCS_BASE}/sdk/define-agent.md)`);
-  lines.push(`- [defineEntityType](${DOCS_BASE}/sdk/define-entity-type.md)`);
+  lines.push(`- [defineData](${DOCS_BASE}/sdk/define-data.md)`);
   lines.push(`- [defineRole](${DOCS_BASE}/sdk/define-role.md)`);
   lines.push(`- [defineTrigger](${DOCS_BASE}/sdk/define-trigger.md)`);
   lines.push(`- [defineTools](${DOCS_BASE}/sdk/define-tools.md)`);
@@ -21168,7 +21296,7 @@ function buildDocument(projectContext) {
   lines.push(`- [System Prompt Templates](${DOCS_BASE}/tools/system-prompt-templates.md)`);
   lines.push("");
   lines.push("### Platform");
-  lines.push(`- [Entities](${DOCS_BASE}/platform/entities.md)`);
+  lines.push(`- [Data](${DOCS_BASE}/platform/data.md)`);
   lines.push(`- [Permissions](${DOCS_BASE}/platform/permissions.md)`);
   lines.push(`- [Agents](${DOCS_BASE}/platform/agents.md)`);
   lines.push(`- [Events](${DOCS_BASE}/platform/events.md)`);
@@ -21335,6 +21463,112 @@ function isOrgAccessError(error) {
   return message.includes("Access denied") || message.includes("not a member") || message.includes("Organization not found");
 }
 
+// src/cli/commands/org.ts
+async function promptCreateOrg(token) {
+  if (!isInteractive2()) {
+    console.log(source_default.red("No organizations found. Run struere org create to create one."));
+    return null;
+  }
+  const shouldCreate = await esm_default2({
+    message: "No organizations found. Create one now?",
+    default: true
+  });
+  if (!shouldCreate)
+    return null;
+  const name = await esm_default3({
+    message: "Organization name:",
+    validate: (v) => v.trim().length > 0 || "Name is required"
+  });
+  const slug = slugify(name.trim());
+  const spinner = ora();
+  spinner.start("Creating organization");
+  const { organization, error } = await createOrganization(token, name.trim(), slug);
+  if (error || !organization) {
+    spinner.fail("Failed to create organization");
+    console.log(source_default.red(error || "Unknown error"));
+    return null;
+  }
+  spinner.succeed(`Created organization ${source_default.cyan(organization.name)} (${organization.slug})`);
+  return organization;
+}
+var orgCommand = new Command("org").description("Manage organizations");
+orgCommand.command("list").description("List your organizations").option("--json", "Output as JSON").action(async (options) => {
+  const credentials = loadCredentials();
+  if (!credentials) {
+    console.log(source_default.red("Not authenticated. Run struere login first."));
+    process.exit(1);
+  }
+  await refreshToken();
+  const fresh = loadCredentials();
+  const token = fresh?.token || credentials.token;
+  const spinner = ora();
+  spinner.start("Fetching organizations");
+  const { organizations, error } = await listMyOrganizations(token);
+  if (error) {
+    spinner.fail("Failed to fetch organizations");
+    console.log(source_default.red(error));
+    process.exit(1);
+  }
+  spinner.stop();
+  if (options.json) {
+    console.log(JSON.stringify(organizations, null, 2));
+    return;
+  }
+  if (organizations.length === 0) {
+    console.log(source_default.yellow("No organizations found."));
+    console.log(source_default.gray("Run"), source_default.cyan("struere org create"), source_default.gray("to create one."));
+    return;
+  }
+  console.log();
+  console.log(source_default.bold("Organizations"));
+  console.log();
+  for (const org of organizations) {
+    console.log(`  ${source_default.cyan(org.name)} ${source_default.gray(`(${org.slug})`)} ${source_default.gray(`- ${org.role}`)}`);
+  }
+  console.log();
+});
+orgCommand.command("create").argument("[name]", "Organization name").description("Create a new organization").option("--slug <slug>", "Custom slug").option("--json", "Output as JSON").action(async (nameArg, options) => {
+  const credentials = loadCredentials();
+  if (!credentials) {
+    console.log(source_default.red("Not authenticated. Run struere login first."));
+    process.exit(1);
+  }
+  await refreshToken();
+  const fresh = loadCredentials();
+  const token = fresh?.token || credentials.token;
+  let name = nameArg;
+  if (!name) {
+    if (!isInteractive2()) {
+      console.log(source_default.red("Organization name is required in non-interactive mode."));
+      process.exit(1);
+    }
+    name = await esm_default3({
+      message: "Organization name:",
+      validate: (v) => v.trim().length > 0 || "Name is required"
+    });
+  }
+  name = name.trim();
+  const slug = options.slug || slugify(name);
+  const spinner = ora();
+  spinner.start("Creating organization");
+  const { organization, error } = await createOrganization(token, name, slug);
+  if (error || !organization) {
+    spinner.fail("Failed to create organization");
+    console.log(source_default.red(error || "Unknown error"));
+    process.exit(1);
+  }
+  spinner.stop();
+  if (options.json) {
+    console.log(JSON.stringify(organization, null, 2));
+    return;
+  }
+  console.log(source_default.green("\u2713"), `Created organization ${source_default.cyan(organization.name)} (${organization.slug})`);
+  console.log();
+  console.log(source_default.gray("Next steps:"));
+  console.log(source_default.gray("  \u2022"), source_default.cyan("struere init"), source_default.gray("- Initialize a project"));
+  console.log();
+});
+
 // src/cli/commands/init.ts
 async function runInit(cwd, selectedOrg) {
   const spinner = ora();
@@ -21363,10 +21597,11 @@ async function runInit(cwd, selectedOrg) {
       return false;
     }
     if (organizations.length === 0) {
-      console.log(source_default.red("No organizations found. Please create one in the dashboard first."));
-      return false;
-    }
-    if (organizations.length === 1) {
+      const created = await promptCreateOrg(credentials.token);
+      if (!created)
+        return false;
+      org = created;
+    } else if (organizations.length === 1) {
       org = organizations[0];
     } else {
       org = await esm_default4({
@@ -21444,12 +21679,17 @@ var initCommand = new Command("init").description("Initialize a new Struere orga
     console.log(source_default.red("Failed to fetch organizations:"), error);
     process.exit(1);
   }
-  if (organizations.length === 0) {
-    console.log(source_default.red("No organizations found. Please create one in the dashboard first."));
-    process.exit(1);
-  }
   let selectedOrg;
-  if (options.org) {
+  if (organizations.length === 0) {
+    if (nonInteractive) {
+      console.log(source_default.red("No organizations found. Run struere org create to create one."));
+      process.exit(1);
+    }
+    const created = await promptCreateOrg(credentials?.token || "");
+    if (!created)
+      process.exit(1);
+    selectedOrg = created;
+  } else if (options.org) {
     const found = organizations.find((o) => o.slug === options.org);
     if (!found) {
       console.log(source_default.red(`Organization "${options.org}" not found.`));
@@ -21505,7 +21745,7 @@ var initCommand = new Command("init").description("Initialize a new Struere orga
   console.log();
   console.log(source_default.gray("Project structure:"));
   console.log(source_default.gray("  agents/       "), source_default.cyan("Agent definitions"));
-  console.log(source_default.gray("  entity-types/ "), source_default.cyan("Entity type schemas"));
+  console.log(source_default.gray("  entity-types/ "), source_default.cyan("Data type schemas"));
   console.log(source_default.gray("  roles/        "), source_default.cyan("Role + permission definitions"));
   console.log(source_default.gray("  tools/        "), source_default.cyan("Shared custom tools"));
   console.log();
@@ -21563,7 +21803,9 @@ var BUILTIN_TOOLS = [
   "airtable.createRecords",
   "airtable.updateRecords",
   "airtable.deleteRecords",
-  "email.send"
+  "email.send",
+  "payment.create",
+  "payment.getStatus"
 ];
 function extractSyncPayload(resources) {
   const customToolsMap = new Map;
@@ -21618,7 +21860,9 @@ function extractSyncPayload(resources) {
         userMessage: t.user,
         assertions: t.assertions
       })),
-      finalAssertions: c.finalAssertions
+      finalAssertions: c.finalAssertions,
+      channel: c.channel,
+      contextParams: c.contextParams
     }))
   })) : undefined;
   const triggers = resources.triggers.length > 0 ? resources.triggers.map((t) => ({
@@ -21683,7 +21927,8 @@ function extractAgentPayload(agent, customToolsMap) {
       name: customTool.name,
       description: customTool.description,
       parameters: customTool.parameters || { type: "object", properties: {} },
-      handlerCode: extractHandlerCode(customTool._originalHandler || customTool.handler)
+      handlerCode: extractHandlerCode(customTool._originalHandler || customTool.handler),
+      ...customTool.templateOnly && { templateOnly: true }
     };
   });
   return {
@@ -21734,7 +21979,9 @@ function getBuiltinToolDescription(name) {
     "airtable.createRecords": "Create up to 10 records in an Airtable table",
     "airtable.updateRecords": "Update up to 10 records in an Airtable table",
     "airtable.deleteRecords": "Delete up to 10 records from an Airtable table",
-    "email.send": "Send an email via Resend"
+    "email.send": "Send an email via Resend",
+    "payment.create": "Create a payment link via Flow.cl and return the URL",
+    "payment.getStatus": "Check the current status of a payment"
   };
   return descriptions[name] || name;
 }
@@ -22042,6 +22289,24 @@ function getBuiltinToolParameters(name) {
         replyTo: { type: "string", description: "Reply-to email address" }
       },
       required: ["to", "subject"]
+    },
+    "payment.create": {
+      type: "object",
+      properties: {
+        amount: { type: "number", description: "Payment amount in the smallest currency unit" },
+        description: { type: "string", description: "Description of the payment" },
+        currency: { type: "string", description: "Currency code (defaults to CLP)" },
+        customerEmail: { type: "string", description: "Customer email address" },
+        entityId: { type: "string", description: "Optional entity ID to link the payment to" }
+      },
+      required: ["amount", "description"]
+    },
+    "payment.getStatus": {
+      type: "object",
+      properties: {
+        entityId: { type: "string", description: "Payment entity ID to check status for" }
+      },
+      required: ["entityId"]
     }
   };
   return schemas[name] || { type: "object", properties: {} };
@@ -22118,7 +22383,7 @@ async function checkForDeletions(resources, organizationId, environment) {
     deletions.push({ type: "Agents", remote: remoteState.agents.length, local: payload.agents.length, deleted: deletedAgents });
   const deletedEntityTypes = remoteState.entityTypes.filter((et) => !localSlugs.entityTypes.has(et.slug)).map((et) => et.name);
   if (deletedEntityTypes.length > 0)
-    deletions.push({ type: "Entity types", remote: remoteState.entityTypes.length, local: payload.entityTypes.length, deleted: deletedEntityTypes });
+    deletions.push({ type: "Data types", remote: remoteState.entityTypes.length, local: payload.entityTypes.length, deleted: deletedEntityTypes });
   const deletedRoles = remoteState.roles.filter((r) => !localSlugs.roles.has(r.name)).map((r) => r.name);
   if (deletedRoles.length > 0)
     deletions.push({ type: "Roles", remote: remoteState.roles.length, local: payload.roles.length, deleted: deletedRoles });
@@ -22223,7 +22488,7 @@ var syncCommand = new Command("sync").description("Sync resources to Convex and
       process.exit(1);
     }
     if (!jsonMode && !options.dryRun)
-      output.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} entity types, ${resources.roles.length} roles`);
+      output.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} data types, ${resources.roles.length} roles`);
   } catch (error) {
     if (jsonMode) {
       console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
@@ -22255,7 +22520,7 @@ var syncCommand = new Command("sync").description("Sync resources to Convex and
       console.log(source_default.bold("Dry run \u2014 nothing will be synced"));
       console.log();
       console.log(source_default.gray("  Agents:"), payload.agents.map((a) => a.slug).join(", ") || "none");
-      console.log(source_default.gray("  Entity types:"), payload.entityTypes.map((et) => et.slug).join(", ") || "none");
+      console.log(source_default.gray("  Data types:"), payload.entityTypes.map((et) => et.slug).join(", ") || "none");
       console.log(source_default.gray("  Roles:"), payload.roles.map((r) => r.name).join(", ") || "none");
       console.log(source_default.gray("  Triggers:"), (payload.triggers || []).map((t) => t.slug).join(", ") || "none");
       if (deletions.length > 0) {
@@ -22421,7 +22686,7 @@ var devCommand = new Command("dev").description("Watch files and sync to develop
   spinner.start("Loading resources");
   try {
     loadedResources = await loadAllResources(cwd);
-    spinner.succeed(`Loaded ${loadedResources.agents.length} agents, ${loadedResources.entityTypes.length} entity types, ${loadedResources.roles.length} roles, ${loadedResources.customTools.length} custom tools, ${loadedResources.evalSuites.length} eval suites, ${loadedResources.triggers.length} triggers, ${loadedResources.fixtures.length} fixtures`);
+    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.fixtures.length} fixtures`);
     for (const err of loadedResources.errors) {
       console.log(source_default.red("  \u2716"), err);
     }
@@ -22524,9 +22789,15 @@ var devCommand = new Command("dev").description("Watch files and sync to develop
     persistent: true,
     usePolling: false
   });
-  const handleFileChange = async (path, action) => {
-    const relativePath = path.replace(cwd, ".");
-    console.log(source_default.gray(`${action}: ${relativePath}`));
+  let debounceTimer = null;
+  let pendingChanges = [];
+  const triggerSync = async () => {
+    const changes = [...pendingChanges];
+    pendingChanges = [];
+    for (const { path, action } of changes) {
+      const relativePath = path.replace(cwd, ".");
+      console.log(source_default.gray(`${action}: ${relativePath}`));
+    }
     const syncSpinner = ora("Syncing...").start();
     try {
       await performDevSync(cwd, project.organization.id);
@@ -22554,6 +22825,15 @@ var devCommand = new Command("dev").description("Watch files and sync to develop
       }
     }
   };
+  const handleFileChange = (path, action) => {
+    pendingChanges.push({ path, action });
+    if (debounceTimer)
+      clearTimeout(debounceTimer);
+    debounceTimer = setTimeout(() => {
+      debounceTimer = null;
+      triggerSync();
+    }, 300);
+  };
   watcher.on("change", (path) => handleFileChange(path, "Changed"));
   watcher.on("add", (path) => handleFileChange(path, "Added"));
   watcher.on("unlink", (path) => handleFileChange(path, "Removed"));
@@ -22634,7 +22914,7 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
   try {
     resources = await loadAllResources(cwd);
     if (!jsonMode)
-      spinner.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} entity types, ${resources.roles.length} roles, ${resources.customTools.length} custom tools, ${resources.evalSuites.length} eval suites`);
+      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`);
     for (const err of resources.errors) {
       if (!jsonMode)
         console.log(source_default.red("  \u2716"), err);
@@ -22698,7 +22978,7 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
       console.log(source_default.gray("  -"), `${source_default.cyan(agent.name)} (${agent.slug}) v${agent.version}`);
     }
     console.log();
-    console.log("Entity types:");
+    console.log("Data types:");
     for (const et of resources.entityTypes) {
       console.log(source_default.gray("  -"), source_default.cyan(et.name), `(${et.slug})`);
     }
@@ -22976,7 +23256,7 @@ var whoamiCommand = new Command("whoami").description("Show current logged in us
 });
 
 // src/cli/commands/add.ts
-var addCommand = new Command("add").description("Scaffold a new resource").argument("<type>", "Resource type: agent, entity-type, role, eval, trigger, or fixture").argument("<name>", "Resource name").action(async (type, name) => {
+var addCommand = new Command("add").description("Scaffold a new resource").argument("<type>", "Resource type: agent, data-type, role, eval, trigger, or fixture").argument("<name>", "Resource name").action(async (type, name) => {
   const cwd = process.cwd();
   console.log();
   if (!hasProject(cwd)) {
@@ -23003,17 +23283,19 @@ var addCommand = new Command("add").description("Scaffold a new resource").argum
         console.log(source_default.yellow("Agent already exists:"), `agents/${slug}.ts`);
       }
       break;
+    case "data-type":
+    case "datatype":
     case "entity-type":
     case "entitytype":
     case "type":
       result = scaffoldEntityType(cwd, displayName, slug);
       if (result.createdFiles.length > 0) {
-        console.log(source_default.green("\u2713"), `Created entity type "${displayName}"`);
+        console.log(source_default.green("\u2713"), `Created data type "${displayName}"`);
         for (const file of result.createdFiles) {
           console.log(source_default.gray("  \u2192"), file);
         }
       } else {
-        console.log(source_default.yellow("Entity type already exists:"), `entity-types/${slug}.ts`);
+        console.log(source_default.yellow("Data type already exists:"), `entity-types/${slug}.ts`);
       }
       break;
     case "role":
@@ -23070,10 +23352,10 @@ var addCommand = new Command("add").description("Scaffold a new resource").argum
       console.log();
       console.log("Available types:");
       console.log(source_default.gray("  -"), source_default.cyan("agent"), "- Create an AI agent");
-      console.log(source_default.gray("  -"), source_default.cyan("entity-type"), "- Create an entity type schema");
+      console.log(source_default.gray("  -"), source_default.cyan("data-type"), "- Create a data type schema");
       console.log(source_default.gray("  -"), source_default.cyan("role"), "- Create a role with permissions");
       console.log(source_default.gray("  -"), source_default.cyan("eval"), "- Create an eval suite (YAML)");
-      console.log(source_default.gray("  -"), source_default.cyan("trigger"), "- Create an entity trigger");
+      console.log(source_default.gray("  -"), source_default.cyan("trigger"), "- Create a data trigger");
       console.log(source_default.gray("  -"), source_default.cyan("fixture"), "- Create a test data fixture (YAML)");
       console.log();
       process.exit(1);
@@ -23153,7 +23435,7 @@ var statusCommand = new Command("status").description("Compare local vs remote s
   try {
     localResources = await loadAllResources(cwd);
     if (!jsonMode) {
-      spinner.succeed(`Loaded ${localResources.agents.length} agents, ${localResources.entityTypes.length} entity types, ${localResources.roles.length} roles, ${localResources.customTools.length} custom tools, ${localResources.evalSuites.length} eval suites`);
+      spinner.succeed(`Loaded ${localResources.agents.length} agents, ${localResources.entityTypes.length} data types, ${localResources.roles.length} roles, ${localResources.customTools.length} custom tools, ${localResources.evalSuites.length} eval suites`);
       for (const err of localResources.errors) {
         console.log(source_default.red("  \u2716"), err);
       }
@@ -23241,10 +23523,10 @@ var statusCommand = new Command("status").description("Compare local vs remote s
     }
   }
   console.log();
-  console.log(source_default.bold("Entity Types"));
+  console.log(source_default.bold("Data Types"));
   console.log(source_default.gray("\u2500".repeat(60)));
   if (localResources.entityTypes.length === 0 && devState.entityTypes.length === 0) {
-    console.log(source_default.gray("  No entity types"));
+    console.log(source_default.gray("  No data types"));
   } else {
     for (const et of localResources.entityTypes) {
       const remote = devState.entityTypes.find((r) => r.slug === et.slug);
@@ -23390,9 +23672,9 @@ function generateEntityTypeFile(entityType) {
   if (entityType.displayConfig) {
     parts.push(`  displayConfig: ${stringifyValue(entityType.displayConfig, 2)}`);
   }
-  return `import { defineEntityType } from 'struere'
+  return `import { defineData } from 'struere'
 
-export default defineEntityType({
+export default defineData({
 ${parts.join(`,
 `)},
 })
@@ -23480,13 +23762,13 @@ export default defineTools([])
       `    parameters: ${stringifyValue(tool.parameters, 4)}`
     ];
     if (tool.handlerCode) {
-      parts.push(`    handler: async (args, context, fetch) => {
+      parts.push(`    handler: async (args, context, struere, fetch) => {
       ${tool.handlerCode.split(`
 `).join(`
       `)}
     }`);
     } else {
-      parts.push(`    handler: async (args, context, fetch) => {
+      parts.push(`    handler: async (args, context, struere, fetch) => {
       throw new Error("TODO: implement handler")
     }`);
     }
@@ -23776,7 +24058,6 @@ var pullCommand = new Command("pull").description("Pull remote resources to loca
 });
 
 // src/cli/utils/entities.ts
-var CONVEX_URL2 = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
 function getToken() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -23786,7 +24067,7 @@ async function convexQuery(path, args) {
   const token = getToken();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL2}/api/query`, {
+  const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -23815,7 +24096,7 @@ async function convexMutation(path, args) {
   const token = getToken();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL2}/api/mutation`, {
+  const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -24001,20 +24282,20 @@ function flattenEntityForTable(entity) {
     status: entity.status
   };
 }
-var entitiesCommand = new Command("entities").description("Manage entity data");
-entitiesCommand.command("types").description("List available entity types").option("--env <environment>", "Environment (development|production)", "development").option("--json", "Output raw JSON").action(async (opts) => {
+var entitiesCommand = new Command("data").description("Manage data records");
+entitiesCommand.command("types").description("List available data types").option("--env <environment>", "Environment (development|production)", "development").option("--json", "Output raw JSON").action(async (opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
   const orgId = getOrgId();
-  spinner.start("Fetching entity types");
+  spinner.start("Fetching data types");
   const { data, error } = await queryEntityTypes(env2, orgId);
   if (error || !data) {
-    spinner.fail("Failed to fetch entity types");
+    spinner.fail("Failed to fetch data types");
     console.log(source_default.red("Error:"), error);
     process.exit(1);
   }
-  spinner.succeed("Entity types loaded");
+  spinner.succeed("Data types loaded");
   const types = data;
   if (opts.json) {
     console.log(JSON.stringify(types, null, 2));
@@ -24037,12 +24318,12 @@ entitiesCommand.command("types").description("List available entity types").opti
   }));
   console.log();
 });
-entitiesCommand.command("list <type>").description("List entities of a type").option("--env <environment>", "Environment (development|production)", "development").option("--status <status>", "Filter by status").option("--limit <n>", "Maximum results", "50").option("--json", "Output raw JSON").action(async (type, opts) => {
+entitiesCommand.command("list <type>").description("List records of a type").option("--env <environment>", "Environment (development|production)", "development").option("--status <status>", "Filter by status").option("--limit <n>", "Maximum results", "50").option("--json", "Output raw JSON").action(async (type, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
   const orgId = getOrgId();
-  spinner.start(`Fetching ${type} entities`);
+  spinner.start(`Fetching ${type} records`);
   const [entitiesResult, typeResult] = await Promise.all([
     queryEntities(type, env2, {
       status: opts.status,
@@ -24051,12 +24332,12 @@ entitiesCommand.command("list <type>").description("List entities of a type").op
     queryEntityTypeBySlug(type, env2, orgId)
   ]);
   if (entitiesResult.error || !entitiesResult.data) {
-    spinner.fail(`Failed to fetch ${type} entities`);
+    spinner.fail(`Failed to fetch ${type} records`);
     console.log(source_default.red("Error:"), entitiesResult.error);
     process.exit(1);
   }
   const entities = entitiesResult.data;
-  spinner.succeed(`Found ${entities.length} ${type} entities`);
+  spinner.succeed(`Found ${entities.length} ${type} records`);
   if (opts.json) {
     console.log(JSON.stringify(entities, null, 2));
     return;
@@ -24069,27 +24350,27 @@ entitiesCommand.command("list <type>").description("List entities of a type").op
   renderTable(columns, entities.map(flattenEntityForTable));
   console.log();
 });
-entitiesCommand.command("get <id>").description("Get entity details").option("--env <environment>", "Environment (development|production)", "development").option("--json", "Output raw JSON").action(async (rawId, opts) => {
+entitiesCommand.command("get <id>").description("Get record details").option("--env <environment>", "Environment (development|production)", "development").option("--json", "Output raw JSON").action(async (rawId, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
   const orgId = getOrgId();
-  spinner.start("Resolving entity ID");
+  spinner.start("Resolving record ID");
   const resolved = await resolveEntityId(rawId, env2, orgId);
   if (resolved.error || !resolved.data) {
-    spinner.fail("Entity not found");
-    console.log(source_default.red("Error:"), resolved.error || `No entity matched "${rawId}"`);
+    spinner.fail("Record not found");
+    console.log(source_default.red("Error:"), resolved.error || `No record matched "${rawId}"`);
     process.exit(1);
   }
   const id = resolved.data;
-  spinner.text = "Fetching entity";
+  spinner.text = "Fetching record";
   const { data, error } = await queryEntity(id, env2, orgId);
   if (error || !data) {
-    spinner.fail("Failed to fetch entity");
-    console.log(source_default.red("Error:"), error || "Entity not found");
+    spinner.fail("Failed to fetch record");
+    console.log(source_default.red("Error:"), error || "Record not found");
     process.exit(1);
   }
-  spinner.succeed("Entity loaded");
+  spinner.succeed("Record loaded");
   const result = data;
   if (opts.json) {
     console.log(JSON.stringify(result, null, 2));
@@ -24117,7 +24398,7 @@ entitiesCommand.command("get <id>").description("Get entity details").option("--
   }
   console.log();
 });
-entitiesCommand.command("create <type>").description("Create a new entity").option("--env <environment>", "Environment (development|production)", "development").option("--data <json>", "Entity data as JSON").option("--status <status>", "Initial status").option("--json", "Output raw JSON").action(async (type, opts) => {
+entitiesCommand.command("create <type>").description("Create a new record").option("--env <environment>", "Environment (development|production)", "development").option("--data <json>", "Record data as JSON").option("--status <status>", "Initial status").option("--json", "Output raw JSON").action(async (type, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
@@ -24137,7 +24418,7 @@ entitiesCommand.command("create <type>").description("Create a new entity").opti
     spinner.start(`Fetching ${type} schema`);
     const { data: typeData, error: error2 } = await queryEntityTypeBySlug(type, env2, orgId);
     if (error2 || !typeData) {
-      spinner.fail(`Entity type not found: ${type}`);
+      spinner.fail(`Data type not found: ${type}`);
       console.log(source_default.red("Error:"), error2 || "Not found");
       process.exit(1);
     }
@@ -24146,7 +24427,7 @@ entitiesCommand.command("create <type>").description("Create a new entity").opti
     const entityType = typeData;
     const schema = entityType.schema;
     if (!schema?.properties) {
-      console.log(source_default.red("Entity type has no schema properties defined"));
+      console.log(source_default.red("Data type has no schema properties defined"));
       process.exit(1);
     }
     data = {};
@@ -24175,14 +24456,14 @@ entitiesCommand.command("create <type>").description("Create a new entity").opti
     }
     console.log();
   }
-  spinner.start(`Creating ${type} entity`);
+  spinner.start(`Creating ${type} record`);
   const { data: result, error } = await createEntity(type, data, env2, opts.status, orgId);
   if (error) {
-    spinner.fail("Failed to create entity");
+    spinner.fail("Failed to create record");
     console.log(source_default.red("Error:"), error);
     process.exit(1);
   }
-  spinner.succeed(`Entity created`);
+  spinner.succeed(`Record created`);
   if (opts.json) {
     console.log(JSON.stringify({ id: result }, null, 2));
   } else {
@@ -24191,7 +24472,7 @@ entitiesCommand.command("create <type>").description("Create a new entity").opti
     console.log();
   }
 });
-entitiesCommand.command("update <id>").description("Update an entity").option("--env <environment>", "Environment (development|production)", "development").option("--data <json>", "Update data as JSON").option("--status <status>", "New status").option("--json", "Output raw JSON").action(async (rawId, opts) => {
+entitiesCommand.command("update <id>").description("Update a record").option("--env <environment>", "Environment (development|production)", "development").option("--data <json>", "Update data as JSON").option("--status <status>", "New status").option("--json", "Output raw JSON").action(async (rawId, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
@@ -24209,63 +24490,63 @@ entitiesCommand.command("update <id>").description("Update an entity").option("-
       process.exit(1);
     }
   }
-  spinner.start("Resolving entity ID");
+  spinner.start("Resolving record ID");
   const resolved = await resolveEntityId(rawId, env2, orgId);
   if (resolved.error || !resolved.data) {
-    spinner.fail("Entity not found");
-    console.log(source_default.red("Error:"), resolved.error || `No entity matched "${rawId}"`);
+    spinner.fail("Record not found");
+    console.log(source_default.red("Error:"), resolved.error || `No record matched "${rawId}"`);
     process.exit(1);
   }
   const id = resolved.data;
-  spinner.text = "Updating entity";
+  spinner.text = "Updating record";
   const { data: result, error } = await updateEntity(id, data, env2, opts.status, orgId);
   if (error) {
-    spinner.fail("Failed to update entity");
+    spinner.fail("Failed to update record");
     console.log(source_default.red("Error:"), error);
     process.exit(1);
   }
-  spinner.succeed("Entity updated");
+  spinner.succeed("Record updated");
   if (opts.json) {
     console.log(JSON.stringify(result, null, 2));
   } else {
     console.log();
-    console.log(source_default.green("  Entity updated successfully"));
+    console.log(source_default.green("  Record updated successfully"));
     console.log();
   }
 });
-entitiesCommand.command("delete <id>").description("Delete an entity").option("--env <environment>", "Environment (development|production)", "development").option("--yes", "Skip confirmation").option("--json", "Output raw JSON").action(async (rawId, opts) => {
+entitiesCommand.command("delete <id>").description("Delete a record").option("--env <environment>", "Environment (development|production)", "development").option("--yes", "Skip confirmation").option("--json", "Output raw JSON").action(async (rawId, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
   const orgId = getOrgId();
   const jsonMode = !!opts.json;
   if (!jsonMode)
-    spinner.start("Resolving entity ID");
+    spinner.start("Resolving record ID");
   const resolved = await resolveEntityId(rawId, env2, orgId);
   if (resolved.error || !resolved.data) {
     if (jsonMode) {
-      console.log(JSON.stringify({ success: false, error: resolved.error || `No entity matched "${rawId}"` }));
+      console.log(JSON.stringify({ success: false, error: resolved.error || `No record matched "${rawId}"` }));
     } else {
-      spinner.fail("Entity not found");
-      console.log(source_default.red("Error:"), resolved.error || `No entity matched "${rawId}"`);
+      spinner.fail("Record not found");
+      console.log(source_default.red("Error:"), resolved.error || `No record matched "${rawId}"`);
     }
     process.exit(1);
   }
   const id = resolved.data;
   if (!jsonMode)
-    spinner.text = "Fetching entity";
+    spinner.text = "Fetching record";
   const { data, error: fetchError } = await queryEntity(id, env2, orgId);
   if (fetchError || !data) {
     if (jsonMode) {
-      console.log(JSON.stringify({ success: false, error: fetchError || "Entity not found" }));
+      console.log(JSON.stringify({ success: false, error: fetchError || "Record not found" }));
     } else {
-      spinner.fail("Failed to fetch entity");
-      console.log(source_default.red("Error:"), fetchError || "Entity not found");
+      spinner.fail("Failed to fetch record");
+      console.log(source_default.red("Error:"), fetchError || "Record not found");
     }
     process.exit(1);
   }
   if (!jsonMode)
-    spinner.succeed("Entity loaded");
+    spinner.succeed("Record loaded");
   const result = data;
   const entity = result.entity;
   const entityType = result.entityType;
@@ -24283,7 +24564,7 @@ entitiesCommand.command("delete <id>").description("Delete an entity").option("-
   }
   if (!opts.yes && !jsonMode && isInteractive2()) {
     const confirmed = await esm_default2({
-      message: "Are you sure you want to delete this entity?",
+      message: "Are you sure you want to delete this record?",
       default: false
     });
     if (!confirmed) {
@@ -24292,13 +24573,13 @@ entitiesCommand.command("delete <id>").description("Delete an entity").option("-
     }
   }
   if (!jsonMode)
-    spinner.start("Deleting entity");
+    spinner.start("Deleting record");
   const { error } = await removeEntity(id, env2, orgId);
   if (error) {
     if (jsonMode) {
       console.log(JSON.stringify({ success: false, error }));
     } else {
-      spinner.fail("Failed to delete entity");
+      spinner.fail("Failed to delete record");
       console.log(source_default.red("Error:"), error);
     }
     process.exit(1);
@@ -24306,11 +24587,11 @@ entitiesCommand.command("delete <id>").description("Delete an entity").option("-
   if (jsonMode) {
     console.log(JSON.stringify({ success: true, id }));
   } else {
-    spinner.succeed("Entity deleted");
+    spinner.succeed("Record deleted");
     console.log();
   }
 });
-entitiesCommand.command("search <type> <query>").description("Search entities").option("--env <environment>", "Environment (development|production)", "development").option("--limit <n>", "Maximum results", "25").option("--json", "Output raw JSON").action(async (type, query, opts) => {
+entitiesCommand.command("search <type> <query>").description("Search records").option("--env <environment>", "Environment (development|production)", "development").option("--limit <n>", "Maximum results", "25").option("--json", "Output raw JSON").action(async (type, query, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
@@ -24345,7 +24626,6 @@ import { join as join9 } from "path";
 import { mkdirSync as mkdirSync6, writeFileSync as writeFileSync6 } from "fs";
 
 // src/cli/utils/evals.ts
-var CONVEX_URL3 = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
 function getToken2() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -24356,7 +24636,7 @@ function getToken2() {
 }
 async function convexQuery2(path, args) {
   const token = getToken2();
-  const response = await fetch(`${CONVEX_URL3}/api/query`, {
+  const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -24381,7 +24661,7 @@ async function convexQuery2(path, args) {
 }
 async function convexMutation2(path, args) {
   const token = getToken2();
-  const response = await fetch(`${CONVEX_URL3}/api/mutation`, {
+  const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -24798,10 +25078,6 @@ evalCommand.addCommand(runCommand);
 import { readFileSync as readFileSync4 } from "fs";
 
 // src/cli/utils/whatsapp.ts
-var CONVEX_URL4 = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
-function getSiteUrl2() {
-  return CONVEX_URL4.replace(".cloud", ".site");
-}
 function getToken3() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -24811,7 +25087,7 @@ async function httpPost(path, body) {
   const apiKey = getApiKey();
   if (!apiKey)
     return { error: "Not authenticated" };
-  const siteUrl = getSiteUrl2();
+  const siteUrl = getSiteUrl();
   try {
     const response = await fetch(`${siteUrl}${path}`, {
       method: "POST",
@@ -24844,7 +25120,7 @@ async function convexAction(path, args) {
   const token = getToken3();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL4}/api/action`, {
+  const response = await fetch(`${CONVEX_URL}/api/action`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -24873,7 +25149,7 @@ async function convexQuery3(path, args) {
   const token = getToken3();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL4}/api/query`, {
+  const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -24907,16 +25183,15 @@ async function listWhatsAppConnections(env2) {
   }
   return convexQuery3("whatsapp:listConnections", { environment: env2 });
 }
-async function listTemplates(connectionId, env2) {
+async function listTemplates(connectionId) {
   if (getApiKey()) {
     return httpPost("/v1/templates/list", { connectionId });
   }
   return convexAction("whatsappActions:listTemplates", {
-    connectionId,
-    environment: env2
+    connectionId
   });
 }
-async function createTemplate(connectionId, env2, name, language, category, components, allowCategoryChange) {
+async function createTemplate(connectionId, name, language, category, components, allowCategoryChange) {
   if (getApiKey()) {
     return httpPost("/v1/templates/create", {
       connectionId,
@@ -24929,7 +25204,6 @@ async function createTemplate(connectionId, env2, name, language, category, comp
   }
   return convexAction("whatsappActions:createTemplate", {
     connectionId,
-    environment: env2,
     name,
     language,
     category,
@@ -24937,23 +25211,21 @@ async function createTemplate(connectionId, env2, name, language, category, comp
     ...allowCategoryChange !== undefined && { allowCategoryChange }
   });
 }
-async function deleteTemplate(connectionId, env2, name) {
+async function deleteTemplate(connectionId, name) {
   if (getApiKey()) {
     return httpPost("/v1/templates/delete", { connectionId, name });
   }
   return convexAction("whatsappActions:deleteTemplate", {
     connectionId,
-    environment: env2,
     name
   });
 }
-async function getTemplateStatus(connectionId, env2, name) {
+async function getTemplateStatus(connectionId, name) {
   if (getApiKey()) {
     return httpPost("/v1/templates/status", { connectionId, name });
   }
   return convexAction("whatsappActions:getTemplateStatus", {
     connectionId,
-    environment: env2,
     name
   });
 }
@@ -25049,13 +25321,12 @@ function statusColor2(status) {
   }
 }
 var templatesCommand = new Command("templates").description("Manage WhatsApp message templates");
-templatesCommand.command("list").description("List all message templates").option("--env <environment>", "Environment (development|production)", "development").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (opts) => {
+templatesCommand.command("list").description("List all message templates").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (opts) => {
   await ensureAuth2();
-  const env2 = opts.env;
-  const connectionId = await resolveConnectionId(env2, opts.connection);
+  const connectionId = await resolveConnectionId("development", opts.connection);
   const out = createOutput();
   out.start("Fetching templates");
-  const { data, error } = await listTemplates(connectionId, env2);
+  const { data, error } = await listTemplates(connectionId);
   if (error) {
     out.fail("Failed to fetch templates");
     out.error(error);
@@ -25087,10 +25358,9 @@ templatesCommand.command("list").description("List all message templates").optio
   })));
   console.log();
 });
-templatesCommand.command("create <name>").description("Create a new message template").option("--env <environment>", "Environment (development|production)", "development").option("--connection <id>", "WhatsApp connection ID").option("--language <code>", "Language code", "en_US").option("--category <cat>", "Category (UTILITY|MARKETING|AUTHENTICATION)", "UTILITY").option("--components <json>", "Components as JSON string").option("--file <path>", "Read components from a JSON file").option("--allow-category-change", "Allow Meta to reassign category").option("--json", "Output raw JSON").action(async (name, opts) => {
+templatesCommand.command("create <name>").description("Create a new message template").option("--connection <id>", "WhatsApp connection ID").option("--language <code>", "Language code", "en_US").option("--category <cat>", "Category (UTILITY|MARKETING|AUTHENTICATION)", "UTILITY").option("--components <json>", "Components as JSON string").option("--file <path>", "Read components from a JSON file").option("--allow-category-change", "Allow Meta to reassign category").option("--json", "Output raw JSON").action(async (name, opts) => {
   await ensureAuth2();
-  const env2 = opts.env;
-  const connectionId = await resolveConnectionId(env2, opts.connection);
+  const connectionId = await resolveConnectionId("development", opts.connection);
   let components;
   if (opts.file) {
     try {
@@ -25118,7 +25388,7 @@ templatesCommand.command("create <name>").description("Create a new message temp
   }
   const out = createOutput();
   out.start(`Creating template "${name}"`);
-  const { data, error } = await createTemplate(connectionId, env2, name, opts.language, opts.category.toUpperCase(), components, opts.allowCategoryChange);
+  const { data, error } = await createTemplate(connectionId, name, opts.language, opts.category.toUpperCase(), components, opts.allowCategoryChange);
   if (error) {
     out.fail("Failed to create template");
     out.error(error);
@@ -25136,10 +25406,9 @@ templatesCommand.command("create <name>").description("Create a new message temp
     console.log();
   }
 });
-templatesCommand.command("delete <name>").description("Delete a message template").option("--env <environment>", "Environment (development|production)", "development").option("--connection <id>", "WhatsApp connection ID").option("--yes", "Skip confirmation").action(async (name, opts) => {
+templatesCommand.command("delete <name>").description("Delete a message template").option("--connection <id>", "WhatsApp connection ID").option("--yes", "Skip confirmation").action(async (name, opts) => {
   await ensureAuth2();
-  const env2 = opts.env;
-  const connectionId = await resolveConnectionId(env2, opts.connection);
+  const connectionId = await resolveConnectionId("development", opts.connection);
   if (!opts.yes && isInteractive2()) {
     const confirmed = await esm_default2({
       message: `Delete template "${name}"? This cannot be undone.`,
@@ -25152,7 +25421,7 @@ templatesCommand.command("delete <name>").description("Delete a message template
   }
   const out = createOutput();
   out.start(`Deleting template "${name}"`);
-  const { error } = await deleteTemplate(connectionId, env2, name);
+  const { error } = await deleteTemplate(connectionId, name);
   if (error) {
     out.fail("Failed to delete template");
     out.error(error);
@@ -25161,13 +25430,12 @@ templatesCommand.command("delete <name>").description("Delete a message template
   out.succeed(`Template "${name}" deleted`);
   console.log();
 });
-templatesCommand.command("status <name>").description("Check template approval status").option("--env <environment>", "Environment (development|production)", "development").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (name, opts) => {
+templatesCommand.command("status <name>").description("Check template approval status").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (name, opts) => {
   await ensureAuth2();
-  const env2 = opts.env;
-  const connectionId = await resolveConnectionId(env2, opts.connection);
+  const connectionId = await resolveConnectionId("development", opts.connection);
   const out = createOutput();
   out.start(`Checking status for "${name}"`);
-  const { data, error } = await getTemplateStatus(connectionId, env2, name);
+  const { data, error } = await getTemplateStatus(connectionId, name);
   if (error) {
     out.fail("Failed to fetch template status");
     out.error(error);
@@ -25200,7 +25468,6 @@ templatesCommand.command("status <name>").description("Check template approval s
 });
 
 // src/cli/utils/integrations.ts
-var CONVEX_URL5 = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
 function getToken4() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
@@ -25210,7 +25477,7 @@ async function convexQuery4(path, args) {
   const token = getToken4();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL5}/api/query`, {
+  const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -25239,7 +25506,7 @@ async function convexMutation3(path, args) {
   const token = getToken4();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL5}/api/mutation`, {
+  const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -25268,7 +25535,7 @@ async function convexAction2(path, args) {
   const token = getToken4();
   if (!token)
     return { error: "Not authenticated" };
-  const response = await fetch(`${CONVEX_URL5}/api/action`, {
+  const response = await fetch(`${CONVEX_URL}/api/action`, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
@@ -25313,7 +25580,7 @@ async function setIntegrationStatus(provider, env2, status) {
 }
 
 // src/cli/commands/integration.ts
-var VALID_PROVIDERS = ["airtable", "resend"];
+var VALID_PROVIDERS = ["airtable", "resend", "flow"];
 async function ensureAuth3() {
   const cwd = process.cwd();
   const nonInteractive = !isInteractive2();
@@ -25366,6 +25633,8 @@ function getProviderHelp(provider) {
       return `Usage: struere integration airtable --token <pat> [--base-id <id>] [--test]`;
     case "resend":
       return `Usage: struere integration resend --from-email <email> [--from-name <name>] [--reply-to <email>]`;
+    case "flow":
+      return `Usage: struere integration flow --api-url <url> --api-key <key> --secret-key <secret> [--return-url <url>]`;
     default:
       return "";
   }
@@ -25393,9 +25662,23 @@ function buildConfigFromOpts(provider, opts) {
       return null;
     return config;
   }
+  if (provider === "flow") {
+    const config = {};
+    if (opts.apiUrl)
+      config.apiUrl = opts.apiUrl;
+    if (opts.apiKey)
+      config.apiKey = opts.apiKey;
+    if (opts.secretKey)
+      config.secretKey = opts.secretKey;
+    if (opts.returnUrl)
+      config.returnUrl = opts.returnUrl;
+    if (Object.keys(config).length === 0)
+      return null;
+    return config;
+  }
   return null;
 }
-var integrationCommand = new Command("integration").description("Manage integrations").argument("[provider]", "Integration provider (airtable, resend)").option("--env <environment>", "Environment (development|production)", "development").option("--token <pat>", "Personal access token (airtable)").option("--base-id <id>", "Default base ID (airtable)").option("--from-email <email>", "From email address (resend)").option("--from-name <name>", "From display name (resend)").option("--reply-to <email>", "Reply-to address (resend)").option("--test", "Test the connection after saving").option("--remove", "Remove integration config").option("--enable", "Enable integration").option("--disable", "Disable integration").option("--status", "Show current config status").option("--yes", "Skip confirmation prompts").option("--json", "Output raw JSON").action(async (provider, opts) => {
+var integrationCommand = new Command("integration").description("Manage integrations").argument("[provider]", "Integration provider (airtable, resend, flow)").option("--env <environment>", "Environment (development|production)", "development").option("--token <pat>", "Personal access token (airtable)").option("--base-id <id>", "Default base ID (airtable)").option("--from-email <email>", "From email address (resend)").option("--from-name <name>", "From display name (resend)").option("--reply-to <email>", "Reply-to address (resend)").option("--api-url <url>", "API URL (flow)").option("--api-key <key>", "API key (flow)").option("--secret-key <secret>", "Secret key (flow)").option("--return-url <url>", "Return URL after payment (flow)").option("--test", "Test the connection after saving").option("--remove", "Remove integration config").option("--enable", "Enable integration").option("--disable", "Disable integration").option("--status", "Show current config status").option("--yes", "Skip confirmation prompts").option("--json", "Output raw JSON").action(async (provider, opts) => {
   await ensureAuth3();
   const env2 = opts.env;
   const out = createOutput();
@@ -25570,10 +25853,154 @@ var integrationCommand = new Command("integration").description("Manage integrat
   }
   console.log();
 });
+
+// src/cli/commands/compile-prompt.ts
+var compilePromptCommand = new Command("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) => {
+  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) => {
+  const spinner = ora();
+  const cwd = process.cwd();
+  const nonInteractive = !isInteractive2();
+  const jsonMode = !!options.json;
+  if (!hasProject(cwd)) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: "No struere.json found" }));
+      } else {
+        console.log(source_default.red("No struere.json found. Run struere init first."));
+      }
+      process.exit(1);
+    }
+    console.log(source_default.yellow("No struere.json found - initializing project..."));
+    console.log();
+    const success = await runInit(cwd);
+    if (!success) {
+      process.exit(1);
+    }
+    console.log();
+  }
+  const project = loadProject(cwd);
+  if (!project) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "Failed to load struere.json" }));
+    } else {
+      console.log(source_default.red("Failed to load struere.json"));
+    }
+    process.exit(1);
+  }
+  let credentials = loadCredentials();
+  const apiKey = getApiKey();
+  if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: "Not authenticated. Set STRUERE_API_KEY or run struere login." }));
+      } else {
+        console.log(source_default.red("Not authenticated. Set STRUERE_API_KEY or run struere login."));
+      }
+      process.exit(1);
+    }
+    console.log(source_default.yellow("Not logged in - authenticating..."));
+    console.log();
+    credentials = await performLogin();
+    if (!credentials) {
+      console.log(source_default.red("Authentication failed"));
+      process.exit(1);
+    }
+    console.log();
+  }
+  const threadMetadata = {};
+  for (const param of options.param) {
+    const eqIndex = param.indexOf("=");
+    if (eqIndex === -1) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: `Invalid param format: ${param}. Use key=value.` }));
+      } else {
+        console.log(source_default.red(`Invalid param format: ${param}. Use key=value.`));
+      }
+      process.exit(1);
+    }
+    const key = param.slice(0, eqIndex);
+    const value = param.slice(eqIndex + 1);
+    threadMetadata[key] = value;
+  }
+  const environment = options.env;
+  if (!jsonMode) {
+    spinner.start(`Compiling prompt for ${source_default.cyan(agentSlug)} (${environment})`);
+  }
+  const doCompile = async () => {
+    return compilePrompt({
+      slug: agentSlug,
+      environment,
+      message: options.message,
+      channel: options.channel,
+      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(source_default.red("Authentication failed"));
+      }
+      process.exit(1);
+    }
+    const retry = await doCompile();
+    result = retry.result;
+    error = retry.error;
+    if (!jsonMode && !error)
+      spinner.succeed("Compiled prompt");
+  }
+  if (error) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error }));
+    } else {
+      spinner.fail("Failed to compile prompt");
+      console.log(source_default.red("Error:"), error);
+    }
+    process.exit(1);
+  }
+  if (!result) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "No result returned" }));
+    } else {
+      spinner.fail("No result returned");
+    }
+    process.exit(1);
+  }
+  if (!jsonMode)
+    spinner.succeed("Compiled prompt");
+  if (jsonMode) {
+    console.log(JSON.stringify({
+      success: true,
+      raw: result.raw,
+      compiled: result.compiled,
+      context: result.context
+    }, null, 2));
+  } else if (options.raw) {
+    console.log();
+    console.log(source_default.bold("Raw System Prompt"));
+    console.log(source_default.gray("\u2500".repeat(60)));
+    console.log(result.raw);
+    console.log(source_default.gray("\u2500".repeat(60)));
+  } else {
+    console.log();
+    console.log(source_default.bold("Compiled System Prompt"));
+    console.log(source_default.gray("\u2500".repeat(60)));
+    console.log(result.compiled);
+    console.log(source_default.gray("\u2500".repeat(60)));
+  }
+});
 // package.json
 var package_default = {
   name: "struere",
-  version: "0.9.6",
+  version: "0.9.9",
   description: "Build, test, and deploy AI agents",
   keywords: [
     "ai",
@@ -25677,6 +26104,7 @@ program.addCommand(initCommand);
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
+program.addCommand(orgCommand);
 program.addCommand(syncCommand);
 program.addCommand(devCommand);
 program.addCommand(deployCommand);
@@ -25688,4 +26116,5 @@ program.addCommand(docsCommand);
 program.addCommand(evalCommand);
 program.addCommand(templatesCommand);
 program.addCommand(integrationCommand);
+program.addCommand(compilePromptCommand);
 program.parse();