struere 0.11.3 → 0.12.1

package/dist/bin/struere.js

@@ -1,73 +1,42 @@
 #!/usr/bin/env bun
 // @bun
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, {
+      get: all[name],
+      enumerable: true,
+      configurable: true,
+      set: (newValue) => all[name] = () => newValue
+    });
+};
+var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
 var __require = import.meta.require;
 
-// src/cli/index.ts
-import { program } from "commander";
-
-// src/cli/commands/init.ts
-import { Command as Command4 } from "commander";
-import chalk5 from "chalk";
-import ora5 from "ora";
-import { select } from "@inquirer/prompts";
-import { basename as basename2 } from "path";
-
-// src/cli/utils/credentials.ts
-import { homedir } from "os";
-import { join } from "path";
-import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
-var CONFIG_DIR = join(homedir(), ".struere");
-var CREDENTIALS_FILE = join(CONFIG_DIR, "credentials.json");
-function ensureConfigDir() {
-  if (!existsSync(CONFIG_DIR)) {
-    mkdirSync(CONFIG_DIR, { recursive: true });
-  }
-}
-function saveCredentials(credentials) {
-  ensureConfigDir();
-  writeFileSync(CREDENTIALS_FILE, JSON.stringify(credentials, null, 2), { mode: 384 });
-}
-function loadCredentials() {
-  if (!existsSync(CREDENTIALS_FILE)) {
-    return null;
-  }
-  try {
-    const data = readFileSync(CREDENTIALS_FILE, "utf-8");
-    const credentials = JSON.parse(data);
-    if (new Date(credentials.expiresAt) < new Date) {
-      clearCredentials();
-      return null;
-    }
-    return credentials;
-  } catch {
-    return null;
-  }
-}
-function clearCredentials() {
-  if (existsSync(CREDENTIALS_FILE)) {
-    unlinkSync(CREDENTIALS_FILE);
-  }
-}
-function getApiKey() {
-  const credentials = loadCredentials();
-  if (credentials?.apiKey) {
-    return credentials.apiKey;
-  }
-  return process.env.STRUERE_API_KEY || null;
-}
-
-// src/cli/commands/login.ts
-import { Command } from "commander";
-import chalk from "chalk";
-import ora from "ora";
-
 // 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");
 }
+var CONVEX_URL;
+var init_config = __esm(() => {
+  CONVEX_URL = process.env.STRUERE_CONVEX_URL || "https://rapid-wildebeest-172.convex.cloud";
+});
 
 // src/cli/utils/convex.ts
+var exports_convex = {};
+__export(exports_convex, {
+  syncOrganization: () => syncOrganization,
+  runTool: () => runTool,
+  refreshToken: () => refreshToken,
+  listMyOrganizations: () => listMyOrganizations,
+  getUserInfo: () => getUserInfo,
+  getSyncState: () => getSyncState,
+  getSiteUrl: () => getSiteUrl,
+  getPullState: () => getPullState,
+  createOrganization: () => createOrganization,
+  compilePrompt: () => compilePrompt,
+  chatWithAgent: () => chatWithAgent
+});
 async function refreshToken() {
   const credentials = loadCredentials();
   if (!credentials?.sessionId)
@@ -86,6 +55,7 @@ async function refreshToken() {
     if (!data.token)
       return null;
     credentials.token = data.token;
+    credentials.expiresAt = new Date(Date.now() + 14 * 24 * 60 * 60 * 1000).toISOString();
     saveCredentials(credentials);
     return data.token;
   } catch {
@@ -721,8 +691,100 @@ async function getPullState(organizationId, environment = "development") {
   }
   return { error: `Unexpected response: ${JSON.stringify(result)}` };
 }
+var init_convex = __esm(() => {
+  init_credentials();
+  init_config();
+});
+
+// src/cli/utils/credentials.ts
+import { homedir } from "os";
+import { join } from "path";
+import { existsSync, mkdirSync, readFileSync, writeFileSync, unlinkSync } from "fs";
+function ensureConfigDir() {
+  if (!existsSync(CONFIG_DIR)) {
+    mkdirSync(CONFIG_DIR, { recursive: true });
+  }
+}
+function saveCredentials(credentials) {
+  ensureConfigDir();
+  writeFileSync(CREDENTIALS_FILE, JSON.stringify(credentials, null, 2), { mode: 384 });
+}
+function loadCredentials() {
+  if (!existsSync(CREDENTIALS_FILE)) {
+    return null;
+  }
+  try {
+    const data = readFileSync(CREDENTIALS_FILE, "utf-8");
+    return JSON.parse(data);
+  } catch {
+    return null;
+  }
+}
+function getJwtExpiry(token) {
+  try {
+    const parts = token.split(".");
+    if (parts.length !== 3)
+      return null;
+    const payload = JSON.parse(Buffer.from(parts[1], "base64url").toString());
+    if (typeof payload.exp === "number")
+      return new Date(payload.exp * 1000);
+    return null;
+  } catch {
+    return null;
+  }
+}
+async function getValidToken() {
+  const apiKey = getApiKey();
+  if (apiKey)
+    return { token: apiKey };
+  const credentials = loadCredentials();
+  if (!credentials?.token)
+    return { error: "Not authenticated. Run `struere login`." };
+  const expiry = getJwtExpiry(credentials.token);
+  const needsRefresh = !expiry || expiry.getTime() - Date.now() < 60000;
+  if (!needsRefresh)
+    return { token: credentials.token };
+  const { refreshToken: refreshToken2 } = await Promise.resolve().then(() => (init_convex(), exports_convex));
+  const refreshed = await refreshToken2();
+  if (refreshed)
+    return { token: refreshed };
+  return { error: "Session expired. Run `struere login`." };
+}
+function clearCredentials() {
+  if (existsSync(CREDENTIALS_FILE)) {
+    unlinkSync(CREDENTIALS_FILE);
+  }
+}
+function getApiKey() {
+  const credentials = loadCredentials();
+  if (credentials?.apiKey) {
+    return credentials.apiKey;
+  }
+  return process.env.STRUERE_API_KEY || null;
+}
+var CONFIG_DIR, CREDENTIALS_FILE;
+var init_credentials = __esm(() => {
+  CONFIG_DIR = join(homedir(), ".struere");
+  CREDENTIALS_FILE = join(CONFIG_DIR, "credentials.json");
+});
+
+// src/cli/index.ts
+import { program } from "commander";
+
+// src/cli/commands/init.ts
+init_credentials();
+import { Command as Command4 } from "commander";
+import chalk5 from "chalk";
+import ora5 from "ora";
+import { select } from "@inquirer/prompts";
+import { basename as basename2 } from "path";
 
 // src/cli/commands/login.ts
+init_convex();
+init_credentials();
+import { Command } from "commander";
+import chalk from "chalk";
+import ora from "ora";
 var AUTH_CALLBACK_PORT = 9876;
 var loginCommand = new Command("login").description("Log in to Struere").action(async () => {
   const spinner = ora();
@@ -731,10 +793,26 @@ var loginCommand = new Command("login").description("Log in to Struere").action(
   console.log();
   const existing = loadCredentials();
   if (existing) {
-    console.log(chalk.yellow("Already logged in as"), chalk.cyan(existing.user.email));
-    console.log(chalk.gray("Run"), chalk.cyan("struere logout"), chalk.gray("to log out first"));
+    const expiry = getJwtExpiry(existing.token);
+    const isValid = expiry && expiry.getTime() - Date.now() > 60000;
+    if (isValid) {
+      console.log(chalk.yellow("Already logged in as"), chalk.cyan(existing.user.email));
+      console.log(chalk.gray("Run"), chalk.cyan("struere logout"), chalk.gray("to log out first"));
+      console.log();
+      return;
+    }
+    spinner.start("Session expired, refreshing token");
+    const refreshed = await refreshToken();
+    if (refreshed) {
+      spinner.succeed("Token refreshed");
+      console.log(chalk.yellow("Already logged in as"), chalk.cyan(existing.user.email));
+      console.log();
+      return;
+    }
+    spinner.fail("Could not refresh session");
+    clearCredentials();
+    console.log(chalk.gray("Starting fresh login..."));
     console.log();
-    return;
   }
   await browserLogin(spinner);
 });
@@ -817,7 +895,7 @@ async function browserLoginInternal(spinner) {
         email: user.email,
         name: user.name || user.email
       },
-      expiresAt: new Date(Date.now() + 30 * 24 * 60 * 60 * 1000).toISOString()
+      expiresAt: new Date(Date.now() + 14 * 24 * 60 * 60 * 1000).toISOString()
     };
     saveCredentials(credentials);
     spinner.succeed("Logged in successfully");
@@ -1428,6 +1506,9 @@ function scaffoldFixture(cwd, name, slug) {
   return result;
 }
 
+// src/cli/commands/init.ts
+init_convex();
+
 // src/cli/utils/plugin.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "fs";
 import { join as join4 } from "path";
@@ -2109,6 +2190,7 @@ var docsCommand = new Command2("docs").description("Generate AI context files (C
 });
 
 // src/cli/utils/runtime.ts
+init_credentials();
 import ora3 from "ora";
 import chalk3 from "chalk";
 function isInteractive() {
@@ -2179,6 +2261,9 @@ function isOrgAccessError(error) {
 }
 
 // src/cli/commands/org.ts
+init_credentials();
+init_convex();
+init_convex();
 import { Command as Command3 } from "commander";
 import chalk4 from "chalk";
 import ora4 from "ora";
@@ -2480,6 +2565,7 @@ function slugify(name) {
 }
 
 // src/cli/commands/dev.ts
+init_credentials();
 import { Command as Command6 } from "commander";
 import chalk7 from "chalk";
 import ora6 from "ora";
@@ -2488,9 +2574,11 @@ import { join as join8 } from "path";
 import { existsSync as existsSync8 } from "fs";
 
 // src/cli/commands/sync.ts
+init_credentials();
 import { Command as Command5 } from "commander";
 import chalk6 from "chalk";
 import { confirm as confirm2 } from "@inquirer/prompts";
+init_convex();
 
 // src/cli/utils/extractor.ts
 var BUILTIN_TOOLS = [
@@ -3549,10 +3637,12 @@ var devCommand = new Command6("dev").description("Watch files and sync to develo
 });
 
 // src/cli/commands/deploy.ts
+init_credentials();
 import { Command as Command7 } from "commander";
 import chalk8 from "chalk";
 import ora7 from "ora";
 import { confirm as confirm4 } from "@inquirer/prompts";
+init_convex();
 var deployCommand = new Command7("deploy").description("Deploy all resources to production").option("--dry-run", "Show what would be deployed without deploying").option("--force", "Skip destructive sync confirmation").option("--json", "Output results as JSON").action(async (options) => {
   const spinner = ora7();
   const cwd = process.cwd();
@@ -3864,6 +3954,7 @@ var deployCommand = new Command7("deploy").description("Deploy all resources to
 });
 
 // src/cli/commands/logout.ts
+init_credentials();
 import { Command as Command8 } from "commander";
 import chalk9 from "chalk";
 var logoutCommand = new Command8("logout").description("Log out of Struere").action(async () => {
@@ -3881,6 +3972,8 @@ var logoutCommand = new Command8("logout").description("Log out of Struere").act
 });
 
 // src/cli/commands/whoami.ts
+init_credentials();
+init_convex();
 import { Command as Command9 } from "commander";
 import chalk10 from "chalk";
 import ora8 from "ora";
@@ -4089,9 +4182,11 @@ function slugify2(name) {
 }
 
 // src/cli/commands/status.ts
+init_credentials();
 import { Command as Command11 } from "commander";
 import chalk12 from "chalk";
 import ora9 from "ora";
+init_convex();
 var statusCommand = new Command11("status").description("Compare local vs remote state").option("--json", "Output raw JSON").action(async (opts) => {
   const spinner = ora9();
   const cwd = process.cwd();
@@ -4295,11 +4390,13 @@ var statusCommand = new Command11("status").description("Compare local vs remote
 });
 
 // src/cli/commands/pull.ts
+init_credentials();
 import { Command as Command12 } from "commander";
 import chalk13 from "chalk";
 import ora10 from "ora";
 import { existsSync as existsSync9, mkdirSync as mkdirSync6, writeFileSync as writeFileSync6 } from "fs";
 import { join as join9 } from "path";
+init_convex();
 
 // src/cli/utils/generator.ts
 var BUILTIN_TOOLS2 = [
@@ -4782,21 +4879,20 @@ var pullCommand = new Command12("pull").description("Pull remote resources to lo
 });
 
 // src/cli/commands/entities.ts
+init_credentials();
 import { Command as Command13 } from "commander";
 import chalk15 from "chalk";
 import ora11 from "ora";
 import { input as input2, confirm as confirm5 } from "@inquirer/prompts";
 
 // src/cli/utils/entities.ts
-function getToken() {
-  const credentials = loadCredentials();
-  const apiKey = getApiKey();
-  return apiKey || credentials?.token || null;
-}
+init_credentials();
+init_config();
 async function convexQuery(path, args) {
-  const token = getToken();
-  if (!token)
-    return { error: "Not authenticated" };
+  const result = await getValidToken();
+  if ("error" in result)
+    return { error: result.error };
+  const { token } = result;
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -4823,9 +4919,10 @@ async function convexQuery(path, args) {
   return { error: `Unexpected response: ${text}` };
 }
 async function convexMutation(path, args) {
-  const token = getToken();
-  if (!token)
-    return { error: "Not authenticated" };
+  const result = await getValidToken();
+  if ("error" in result)
+    return { error: result.error };
+  const { token } = result;
   const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
@@ -5353,20 +5450,19 @@ entitiesCommand.command("search <type> <query>").description("Search records").o
 });
 
 // src/cli/commands/logs.ts
+init_credentials();
 import { Command as Command14 } from "commander";
 import chalk16 from "chalk";
 import ora12 from "ora";
 
 // src/cli/utils/logs.ts
-function getToken2() {
-  const credentials = loadCredentials();
-  const apiKey = getApiKey();
-  return apiKey || credentials?.token || null;
-}
+init_credentials();
+init_config();
 async function convexQuery2(path, args) {
-  const token = getToken2();
-  if (!token)
-    return { error: "Not authenticated" };
+  const tokenResult = await getValidToken();
+  if ("error" in tokenResult)
+    return { error: tokenResult.error };
+  const { token } = tokenResult;
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -5383,7 +5479,8 @@ async function convexQuery2(path, args) {
     return { error: text || `HTTP ${response.status}` };
   }
   if (!response.ok) {
-    const msg = json.errorData?.message || json.message || json.errorMessage || text;
+    const errorData = json.errorData;
+    const msg = errorData?.message || json.message || json.errorMessage || text;
     return { error: String(msg) };
   }
   if (json.status === "success")
@@ -5393,12 +5490,25 @@ async function convexQuery2(path, args) {
   return { error: `Unexpected response: ${text}` };
 }
 async function queryThreads(options) {
-  return convexQuery2("threads:listWithPreviews", {
+  const result = await convexQuery2("threads:listWithPreviews", {
     environment: options.environment,
     ...options.agentId && { agentId: options.agentId },
     ...options.channel && { channel: options.channel },
     ...options.limit && { limit: options.limit }
   });
+  if (result.error || !result.data)
+    return result;
+  if (options.phone) {
+    const threads = result.data;
+    const filtered = threads.filter((t) => {
+      const externalId = t.externalId ?? "";
+      const params = t.channelParams;
+      const phone = params?.phoneNumber ?? "";
+      return externalId.includes(options.phone) || phone.includes(options.phone);
+    });
+    return { data: filtered };
+  }
+  return result;
 }
 async function queryThreadDetail(threadId, messageLimit) {
   return convexQuery2("threads:getWithMessages", {
@@ -5409,6 +5519,31 @@ async function queryThreadDetail(threadId, messageLimit) {
 async function queryThreadExecutions(threadId) {
   return convexQuery2("executions:getByThread", { threadId });
 }
+async function resolveThreadId(shortId, environment) {
+  if (shortId.includes("|") || shortId.length > 20) {
+    return { data: shortId };
+  }
+  const result = await queryThreads({ environment: environment ?? "development", limit: 100 });
+  if (result.error || !result.data)
+    return { error: result.error ?? "Could not fetch threads" };
+  const threads = result.data;
+  const match = threads.find((t) => t._id.endsWith(shortId));
+  if (!match) {
+    for (const env of ["production", "development", "eval"]) {
+      if (env === (environment ?? "development"))
+        continue;
+      const envResult = await queryThreads({ environment: env, limit: 100 });
+      if (envResult.data) {
+        const envThreads = envResult.data;
+        const envMatch = envThreads.find((t) => t._id.endsWith(shortId));
+        if (envMatch)
+          return { data: envMatch._id };
+      }
+    }
+    return { error: `No thread found matching "${shortId}"` };
+  }
+  return { data: match._id };
+}
 async function resolveAgentSlug(slug, organizationId) {
   const result = await convexQuery2("agents:getBySlug", { slug, ...organizationId && { organizationId } });
   if (result.error)
@@ -5477,7 +5612,7 @@ function formatTimestamp(ts) {
   return d.toTimeString().slice(0, 8);
 }
 var logsCommand = new Command14("logs").description("View and debug agent conversations");
-logsCommand.command("list", { isDefault: true }).description("List recent conversations").option("--env <environment>", "Environment (development|production|eval)", "development").option("--agent <slug>", "Filter by agent slug").option("--channel <channel>", "Filter by channel (api|whatsapp|widget|dashboard)").option("--limit <n>", "Maximum results", "20").option("--json", "Output raw JSON").action(async (opts) => {
+logsCommand.command("list", { isDefault: true }).description("List recent conversations").option("--env <environment>", "Environment (development|production|eval)", "development").option("--agent <slug>", "Filter by agent slug").option("--channel <channel>", "Filter by channel (api|whatsapp|widget|dashboard)").option("--phone <number>", "Filter by phone number").option("--limit <n>", "Maximum results", "20").option("--json", "Output raw JSON").action(async (opts) => {
   await ensureAuth2();
   const spinner = ora12();
   const orgId = getOrgId2();
@@ -5498,6 +5633,7 @@ logsCommand.command("list", { isDefault: true }).description("List recent conver
     environment: opts.env,
     agentId,
     channel: opts.channel,
+    phone: opts.phone,
     limit: parseInt(opts.limit, 10)
   });
   if (error || !data) {
@@ -5506,11 +5642,12 @@ logsCommand.command("list", { isDefault: true }).description("List recent conver
     process.exit(1);
   }
   const threads = data;
-  spinner.succeed(`Found ${threads.length} conversations`);
   if (opts.json) {
+    spinner.stop();
     console.log(JSON.stringify(threads, null, 2));
     return;
   }
+  spinner.succeed(`Found ${threads.length} conversations`);
   console.log();
   renderTable([
     { key: "id", label: "ID", width: 14 },
@@ -5532,37 +5669,86 @@ logsCommand.command("list", { isDefault: true }).description("List recent conver
   }));
   console.log();
 });
-logsCommand.command("view <thread-id>").description("View conversation messages").option("--exec", "Include execution details").option("--json", "Output raw JSON").option("--limit <n>", "Message limit", "100").action(async (threadId, opts) => {
+logsCommand.command("view <thread-id>").description("View conversation messages").option("--env <environment>", "Environment hint for resolving short IDs").option("--exec", "Include execution details").option("--verbose", "Show full tool call arguments and results").option("--tail", "Show most recent messages (use with --limit)").option("--json", "Output raw JSON").option("--limit <n>", "Message limit", "100").action(async (rawThreadId, opts) => {
   await ensureAuth2();
   const spinner = ora12();
+  spinner.start("Resolving thread");
+  const resolved = await resolveThreadId(rawThreadId, opts.env);
+  if (resolved.error || !resolved.data) {
+    spinner.fail("Thread not found");
+    console.log(chalk16.red("Error:"), resolved.error || `No thread matched "${rawThreadId}"`);
+    process.exit(1);
+  }
+  const threadId = resolved.data;
+  spinner.stop();
   spinner.start("Fetching conversation");
-  const { data, error } = await queryThreadDetail(threadId, parseInt(opts.limit, 10));
+  const fetchLimit = opts.tail ? 1000 : parseInt(opts.limit, 10);
+  const { data, error } = await queryThreadDetail(threadId, fetchLimit);
   if (error || !data) {
     spinner.fail("Failed to fetch conversation");
     console.log(chalk16.red("Error:"), error || "Thread not found");
     process.exit(1);
   }
-  spinner.succeed("Conversation loaded");
+  spinner.stop();
   const result = data;
+  let executions = [];
+  if (opts.exec) {
+    const execResult = await queryThreadExecutions(threadId);
+    if (execResult.data) {
+      executions = execResult.data;
+    }
+  }
   if (opts.json) {
-    console.log(JSON.stringify(result, null, 2));
+    console.log(JSON.stringify(opts.exec ? { ...result, executions } : result, null, 2));
     return;
   }
+  const truncLen = opts.verbose ? 1e4 : 500;
   console.log();
   console.log(chalk16.bold(`Thread: ${result._id}`));
   console.log(chalk16.gray(`  Environment: ${result.environment ?? "unknown"}  Channel: ${result.channel ?? "api"}`));
-  console.log(chalk16.gray("\u2500".repeat(60)));
-  const messages = result.messages ?? [];
+  console.log(chalk16.gray("\u2500".repeat(80)));
+  let messages = result.messages ?? [];
+  if (opts.tail) {
+    const limit = parseInt(opts.limit, 10);
+    if (messages.length > limit) {
+      messages = messages.slice(-limit);
+      console.log(chalk16.dim(`  ... ${messages.length} earlier messages hidden (showing last ${limit})`));
+    }
+  }
+  const execByTime = new Map;
+  for (const exec of executions) {
+    const ts = exec.createdAt ?? exec._creationTime ?? 0;
+    execByTime.set(ts, exec);
+  }
   for (let i = 0;i < messages.length; i++) {
     const msg = messages[i];
     const ts = formatTimestamp(msg.createdAt ?? msg._creationTime ?? Date.now());
+    const msgTs = msg.createdAt ?? msg._creationTime ?? 0;
     const role = msg.role;
     const content = msg.content ?? "";
     const toolCalls = msg.toolCalls;
+    const attachments = msg.attachments;
+    const channelData = msg.channelData;
     if (role === "user") {
       console.log();
       console.log(`  ${chalk16.gray(`[${ts}]`)} ${chalk16.cyan("User")}`);
       console.log(`  ${content}`);
+      if (attachments?.length) {
+        for (const att of attachments) {
+          console.log(`  ${chalk16.magenta(`\uD83D\uDCCE ${att.type}`)} ${att.fileName ?? ""} ${chalk16.dim(att.mimeType ?? "")}`);
+          console.log(`  ${chalk16.dim(`   url: ${att.url?.slice(0, 120)}`)}`);
+          if (att.attachmentId)
+            console.log(`  ${chalk16.dim(`   attachmentId: ${att.attachmentId}`)}`);
+        }
+      }
+      if (channelData && typeof channelData === "object") {
+        const cdType = channelData.type;
+        const mediaStorageId = channelData.mediaStorageId;
+        const mediaDirectUrl = channelData.mediaDirectUrl;
+        if (cdType && cdType !== "text") {
+          console.log(`  ${chalk16.dim(`   channel: ${cdType}${mediaStorageId ? ` storageId:${mediaStorageId}` : ""}${mediaDirectUrl ? ` directUrl:${String(mediaDirectUrl).slice(0, 80)}` : ""}`)}`);
+        }
+      }
     } else if (role === "assistant" && toolCalls?.length) {
       console.log();
       console.log(`  ${chalk16.gray(`[${ts}]`)} ${chalk16.green("Agent")}`);
@@ -5570,68 +5756,59 @@ logsCommand.command("view <thread-id>").description("View conversation messages"
         console.log(`  ${content}`);
       for (const call of toolCalls) {
         console.log(`  ${chalk16.yellow("Tool: " + call.name)}`);
-        console.log(`  ${chalk16.dim("\u2192 " + JSON.stringify(call.arguments).slice(0, 200))}`);
+        console.log(`  ${chalk16.dim("\u2192 " + JSON.stringify(call.arguments).slice(0, truncLen))}`);
       }
     } else if (role === "assistant") {
       console.log();
       console.log(`  ${chalk16.gray(`[${ts}]`)} ${chalk16.green("Agent")}`);
       console.log(`  ${content}`);
     } else if (role === "tool") {
-      console.log(`  ${chalk16.dim("\u2190 " + content.slice(0, 200))}`);
+      console.log(`  ${chalk16.dim("\u2190 " + content.slice(0, truncLen))}`);
     } else if (role === "system") {
       console.log();
       console.log(`  ${chalk16.dim("[System] " + content.slice(0, 100))}`);
     }
-  }
-  console.log();
-  if (opts.exec) {
-    spinner.start("Fetching executions");
-    const execResult = await queryThreadExecutions(threadId);
-    if (execResult.error || !execResult.data) {
-      spinner.fail("Failed to fetch executions");
-      console.log(chalk16.red("Error:"), execResult.error);
-      return;
-    }
-    spinner.succeed("Executions loaded");
-    const executions = execResult.data;
-    console.log();
-    console.log(chalk16.bold("Executions"));
-    console.log(chalk16.gray("\u2500".repeat(60)));
-    for (const exec of executions) {
-      const status = exec.status;
-      const statusColor = status === "success" ? chalk16.green : status === "error" ? chalk16.red : chalk16.yellow;
-      const toolCallDetails = exec.toolCallDetails;
-      console.log();
-      console.log(`  ${chalk16.gray("Status:")}   ${statusColor(status)}`);
-      if (exec.model)
-        console.log(`  ${chalk16.gray("Model:")}    ${exec.model}`);
-      if (exec.inputTokens || exec.outputTokens)
-        console.log(`  ${chalk16.gray("Tokens:")}   ${exec.inputTokens ?? 0} in / ${exec.outputTokens ?? 0} out`);
-      if (exec.durationMs)
-        console.log(`  ${chalk16.gray("Duration:")} ${exec.durationMs}ms`);
-      if (toolCallDetails?.length) {
-        console.log(`  ${chalk16.gray("Tools:")}    ${toolCallDetails.length} calls`);
-        for (const tc of toolCallDetails) {
-          console.log(`    ${tc.name} (${tc.durationMs}ms) -> ${tc.status}`);
+    if (opts.exec && role === "assistant" && toolCalls?.length) {
+      let closestExec;
+      let closestDiff = Infinity;
+      for (const exec of executions) {
+        const execTs = exec.createdAt ?? exec._creationTime ?? 0;
+        const diff = Math.abs(execTs - msgTs);
+        if (diff < closestDiff) {
+          closestDiff = diff;
+          closestExec = exec;
         }
       }
-      if (exec.errorMessage) {
-        console.log(`  ${chalk16.red("Error:")}    ${exec.errorMessage}`);
+      if (closestExec && closestDiff < 30000) {
+        const status = closestExec.status;
+        const statusColor = status === "success" ? chalk16.green : status === "error" ? chalk16.red : chalk16.yellow;
+        const model = closestExec.model;
+        const duration = closestExec.durationMs;
+        const inputTokens = closestExec.inputTokens;
+        const outputTokens = closestExec.outputTokens;
+        console.log(`  ${chalk16.dim(`  exec: ${statusColor(status)} ${model ?? ""} ${inputTokens ?? 0}in/${outputTokens ?? 0}out ${duration ?? 0}ms`)}`);
+        if (closestExec.errorMessage) {
+          console.log(`  ${chalk16.red(`  error: ${closestExec.errorMessage}`)}`);
+        }
       }
     }
-    console.log();
   }
+  console.log();
 });
 
 // src/cli/commands/eval.ts
+init_credentials();
 import { Command as Command15 } from "commander";
 import chalk17 from "chalk";
 import ora13 from "ora";
 import { join as join10 } from "path";
 import { mkdirSync as mkdirSync7, writeFileSync as writeFileSync7 } from "fs";
+init_convex();
 
 // src/cli/utils/evals.ts
-function getToken3() {
+init_credentials();
+init_config();
+function getToken() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   const token = apiKey || credentials?.token;
@@ -5640,7 +5817,7 @@ function getToken3() {
   return token;
 }
 async function convexQuery3(path, args) {
-  const token = getToken3();
+  const token = getToken();
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -5665,7 +5842,7 @@ async function convexQuery3(path, args) {
   return json.value;
 }
 async function convexMutation2(path, args) {
-  const token = getToken3();
+  const token = getToken();
   const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
@@ -6081,13 +6258,16 @@ var evalCommand = new Command15("eval").description("Eval suite management");
 evalCommand.addCommand(runCommand);
 
 // src/cli/commands/templates.ts
+init_credentials();
 import { Command as Command16 } from "commander";
 import chalk18 from "chalk";
 import { readFileSync as readFileSync5 } from "fs";
 import { confirm as confirm6 } from "@inquirer/prompts";
 
 // src/cli/utils/whatsapp.ts
-function getToken4() {
+init_credentials();
+init_config();
+function getToken2() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   return apiKey || credentials?.token || null;
@@ -6126,7 +6306,7 @@ async function httpPost(path, body) {
   }
 }
 async function convexAction(path, args) {
-  const token = getToken4();
+  const token = getToken2();
   if (!token)
     return { error: "Not authenticated" };
   const response = await fetch(`${CONVEX_URL}/api/action`, {
@@ -6155,7 +6335,7 @@ async function convexAction(path, args) {
   return { error: `Unexpected response: ${text}` };
 }
 async function convexQuery4(path, args) {
-  const token = getToken4();
+  const token = getToken2();
   if (!token)
     return { error: "Not authenticated" };
   const response = await fetch(`${CONVEX_URL}/api/query`, {
@@ -6238,6 +6418,16 @@ async function getTemplateStatus(connectionId, name) {
     name
   });
 }
+async function updateTemplate(connectionId, templateId, updates) {
+  if (getApiKey()) {
+    return httpPost("/v1/templates/update", { connectionId, templateId, ...updates });
+  }
+  return convexAction("whatsappActions:updateTemplate", {
+    connectionId,
+    templateId,
+    ...updates
+  });
+}
 
 // src/cli/commands/templates.ts
 async function ensureAuth3() {
@@ -6330,9 +6520,9 @@ function statusColor2(status) {
   }
 }
 var templatesCommand = new Command16("templates").description("Manage WhatsApp message templates");
-templatesCommand.command("list").description("List all message templates").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (opts) => {
+templatesCommand.command("list").description("List all message templates").option("--env <environment>", "Environment to find connection (development|production|eval)").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (opts) => {
   await ensureAuth3();
-  const connectionId = await resolveConnectionId("development", opts.connection);
+  const connectionId = await resolveConnectionId(opts.env ?? "production", opts.connection);
   const out = createOutput();
   out.start("Fetching templates");
   const { data, error } = await listTemplates(connectionId);
@@ -6367,9 +6557,9 @@ templatesCommand.command("list").description("List all message templates").optio
   })));
   console.log();
 });
-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) => {
+templatesCommand.command("create <name>").description("Create a new message template").option("--env <environment>", "Environment to find connection").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 ensureAuth3();
-  const connectionId = await resolveConnectionId("development", opts.connection);
+  const connectionId = await resolveConnectionId(opts.env ?? "production", opts.connection);
   let components;
   if (opts.file) {
     try {
@@ -6415,9 +6605,9 @@ templatesCommand.command("create <name>").description("Create a new message temp
     console.log();
   }
 });
-templatesCommand.command("delete <name>").description("Delete a message template").option("--connection <id>", "WhatsApp connection ID").option("--yes", "Skip confirmation").action(async (name, opts) => {
+templatesCommand.command("delete <name>").description("Delete a message template").option("--env <environment>", "Environment to find connection").option("--connection <id>", "WhatsApp connection ID").option("--yes", "Skip confirmation").action(async (name, opts) => {
   await ensureAuth3();
-  const connectionId = await resolveConnectionId("development", opts.connection);
+  const connectionId = await resolveConnectionId(opts.env ?? "production", opts.connection);
   if (!opts.yes && isInteractive()) {
     const confirmed = await confirm6({
       message: `Delete template "${name}"? This cannot be undone.`,
@@ -6439,9 +6629,9 @@ 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("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (name, opts) => {
+templatesCommand.command("status <name>").description("Check template approval status").option("--env <environment>", "Environment to find connection").option("--connection <id>", "WhatsApp connection ID").option("--json", "Output raw JSON").action(async (name, opts) => {
   await ensureAuth3();
-  const connectionId = await resolveConnectionId("development", opts.connection);
+  const connectionId = await resolveConnectionId(opts.env ?? "production", opts.connection);
   const out = createOutput();
   out.start(`Checking status for "${name}"`);
   const { data, error } = await getTemplateStatus(connectionId, name);
@@ -6467,6 +6657,8 @@ templatesCommand.command("status <name>").description("Check template approval s
     console.log(`  ${chalk18.gray("Status:")}     ${statusColor2(String(t.status ?? ""))}`);
     console.log(`  ${chalk18.gray("Category:")}   ${t.category}`);
     console.log(`  ${chalk18.gray("Language:")}   ${t.language}`);
+    if (t.id)
+      console.log(`  ${chalk18.gray("ID:")}         ${t.id}`);
     if (t.components) {
       console.log(`  ${chalk18.gray("Components:")} ${JSON.stringify(t.components, null, 2).split(`
 `).join(`
@@ -6475,22 +6667,105 @@ templatesCommand.command("status <name>").description("Check template approval s
     console.log();
   }
 });
+templatesCommand.command("edit <name>").description("Edit a message template").option("--env <environment>", "Environment to find connection").option("--connection <id>", "WhatsApp connection ID").option("--components <json>", "New components as JSON string").option("--file <path>", "Read components from a JSON file").option("--category <cat>", "New category (UTILITY|MARKETING|AUTHENTICATION)").option("--language <code>", "Language code").option("--json", "Output raw JSON").action(async (name, opts) => {
+  await ensureAuth3();
+  const connectionId = await resolveConnectionId(opts.env ?? "production", opts.connection);
+  const out = createOutput();
+  out.start(`Fetching template "${name}"`);
+  const { data: statusData, error: statusError } = await getTemplateStatus(connectionId, name);
+  if (statusError) {
+    out.fail("Failed to fetch template");
+    out.error(statusError);
+    process.exit(1);
+  }
+  const statusResult = statusData;
+  const existing = statusResult?.data ?? [];
+  const match = opts.language ? existing.find((t) => t.language === opts.language) : existing[0];
+  if (!match) {
+    out.fail(`Template "${name}" not found${opts.language ? ` for language ${opts.language}` : ""}`);
+    process.exit(1);
+  }
+  const templateId = match.id;
+  if (!templateId) {
+    out.fail("Template ID not found in response");
+    process.exit(1);
+  }
+  out.succeed(`Found template "${name}" (${match.language}, ID: ${templateId})`);
+  let components;
+  if (opts.file) {
+    try {
+      const fileContent = readFileSync5(opts.file, "utf-8");
+      const parsed = JSON.parse(fileContent);
+      components = Array.isArray(parsed) ? parsed : parsed.components ?? [parsed];
+    } catch (err) {
+      console.log(chalk18.red("Failed to read components file:"), err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
+  } else if (opts.components) {
+    try {
+      components = JSON.parse(opts.components);
+    } catch {
+      console.log(chalk18.red("Invalid JSON in --components"));
+      process.exit(1);
+    }
+  }
+  if (!components && !opts.category) {
+    console.log();
+    console.log(chalk18.gray("Current components:"));
+    console.log(JSON.stringify(match.components, null, 2));
+    console.log();
+    console.log(chalk18.yellow("Provide --components <json>, --file <path>, or --category <cat> to update"));
+    process.exit(1);
+  }
+  const updates = { name, language: opts.language ?? match.language };
+  if (components)
+    updates.components = components;
+  if (opts.category)
+    updates.category = opts.category.toUpperCase();
+  if (!opts.json && isInteractive()) {
+    console.log();
+    if (components) {
+      console.log(chalk18.gray("New components:"));
+      console.log(JSON.stringify(components, null, 2));
+      console.log();
+    }
+    const confirmed = await confirm6({
+      message: `Update template "${name}"? This will resubmit for Meta approval.`,
+      default: true
+    });
+    if (!confirmed) {
+      console.log(chalk18.gray("Cancelled"));
+      return;
+    }
+  }
+  out.start(`Updating template "${name}"`);
+  const { data, error } = await updateTemplate(connectionId, templateId, updates);
+  if (error) {
+    out.fail("Failed to update template");
+    out.error(error);
+    process.exit(1);
+  }
+  out.succeed(`Template "${name}" updated \u2014 resubmitted for approval`);
+  if (opts.json) {
+    console.log(JSON.stringify(data, null, 2));
+  }
+  console.log();
+});
 
 // src/cli/commands/integration.ts
+init_credentials();
 import { Command as Command17 } from "commander";
 import chalk19 from "chalk";
 import { confirm as confirm7 } from "@inquirer/prompts";
 
 // src/cli/utils/integrations.ts
-function getToken5() {
-  const credentials = loadCredentials();
-  const apiKey = getApiKey();
-  return apiKey || credentials?.token || null;
-}
+init_credentials();
+init_config();
 async function convexQuery5(path, args) {
-  const token = getToken5();
-  if (!token)
-    return { error: "Not authenticated" };
+  const result = await getValidToken();
+  if ("error" in result)
+    return { error: result.error };
+  const { token } = result;
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -6517,9 +6792,10 @@ async function convexQuery5(path, args) {
   return { error: `Unexpected response: ${text}` };
 }
 async function convexMutation3(path, args) {
-  const token = getToken5();
-  if (!token)
-    return { error: "Not authenticated" };
+  const result = await getValidToken();
+  if ("error" in result)
+    return { error: result.error };
+  const { token } = result;
   const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
@@ -6546,9 +6822,10 @@ async function convexMutation3(path, args) {
   return { error: `Unexpected response: ${text}` };
 }
 async function convexAction2(path, args) {
-  const token = getToken5();
-  if (!token)
-    return { error: "Not authenticated" };
+  const result = await getValidToken();
+  if ("error" in result)
+    return { error: result.error };
+  const { token } = result;
   const response = await fetch(`${CONVEX_URL}/api/action`, {
     method: "POST",
     headers: {
@@ -6869,12 +7146,15 @@ var integrationCommand = new Command17("integration").description("Manage integr
 });
 
 // src/cli/commands/triggers.ts
+init_credentials();
 import { Command as Command18 } from "commander";
 import chalk20 from "chalk";
 import ora14 from "ora";
 
 // src/cli/utils/triggers.ts
-function getToken6() {
+init_credentials();
+init_config();
+function getToken3() {
   const credentials = loadCredentials();
   const apiKey = getApiKey();
   const token = apiKey || credentials?.token;
@@ -6883,7 +7163,7 @@ function getToken6() {
   return token;
 }
 async function convexQuery6(path, args) {
-  const token = getToken6();
+  const token = getToken3();
   const response = await fetch(`${CONVEX_URL}/api/query`, {
     method: "POST",
     headers: {
@@ -6908,7 +7188,7 @@ async function convexQuery6(path, args) {
   return json.value;
 }
 async function convexMutation4(path, args) {
-  const token = getToken6();
+  const token = getToken3();
   const response = await fetch(`${CONVEX_URL}/api/mutation`, {
     method: "POST",
     headers: {
@@ -6979,7 +7259,7 @@ async function getTriggerExecutionDetail(eventId) {
   return convexQuery6("triggers:getExecutionDetail", { eventId });
 }
 async function convexAction3(path, args) {
-  const token = getToken6();
+  const token = getToken3();
   const response = await fetch(`${CONVEX_URL}/api/action`, {
     method: "POST",
     headers: {
@@ -7688,9 +7968,11 @@ triggersCommand.command("retry-event <event-id>").description("Retry a failed im
 });
 
 // src/cli/commands/compile-prompt.ts
+init_credentials();
 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) => {
   acc.push(val);
   return acc;
@@ -7836,9 +8118,11 @@ var compilePromptCommand = new Command19("compile-prompt").description("Compile
 });
 
 // src/cli/commands/run-tool.ts
+init_credentials();
 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) => {
   const spinner = ora16();
   const cwd = process.cwd();
@@ -7991,10 +8275,12 @@ var runToolCommand = new Command20("run-tool").description("Run a tool as it wou
 });
 
 // src/cli/commands/chat.ts
+init_credentials();
 import { Command as Command21 } from "commander";
 import chalk23 from "chalk";
 import ora17 from "ora";
 import readline from "readline";
+init_convex();
 var chatCommand = new Command21("chat").description("Chat with an agent").argument("<agent-slug>", "Agent slug").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").action(async (agentSlug, options) => {
   const spinner = ora17();
   const cwd = process.cwd();
@@ -8245,7 +8531,7 @@ var chatCommand = new Command21("chat").description("Chat with an agent").argume
 // package.json
 var package_default = {
   name: "struere",
-  version: "0.11.3",
+  version: "0.12.1",
   description: "Build, test, and deploy AI agents",
   keywords: [
     "ai",