struere 0.8.2 → 0.9.0

package/dist/bin/struere.js

@@ -19780,7 +19780,7 @@ async function browserLoginInternal(spinner) {
 }
 function printNextSteps() {
   console.log(source_default.gray("You can now use:"));
-  console.log(source_default.gray("  \u2022"), source_default.cyan("struere dev"), source_default.gray("- Start cloud-connected dev server"));
+  console.log(source_default.gray("  \u2022"), source_default.cyan("struere sync"), source_default.gray("- Sync resources to development"));
   console.log(source_default.gray("  \u2022"), source_default.cyan("struere deploy"), source_default.gray("- Deploy your agent"));
   console.log(source_default.gray("  \u2022"), source_default.cyan("struere status"), source_default.gray("- Compare local vs remote state"));
   console.log();
@@ -20883,6 +20883,33 @@ function buildDocument(projectContext) {
   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("");
+  lines.push(`## Agent Usage`);
+  lines.push("");
+  lines.push("If you are an AI coding agent (Claude Code, Cursor, Copilot, etc.), use these patterns:");
+  lines.push("");
+  lines.push("**Auth**: Set `STRUERE_API_KEY` environment variable (no browser login needed)");
+  lines.push("");
+  lines.push("**Sync**: Use `struere sync` instead of `struere dev` \u2014 it syncs once and exits (no watch loop)");
+  lines.push("```bash");
+  lines.push("struere sync              # sync to development + eval, then exit");
+  lines.push("struere sync --json       # machine-readable JSON output");
+  lines.push("struere sync --env production  # sync to production");
+  lines.push("struere sync --force      # skip deletion confirmations");
+  lines.push("```");
+  lines.push("");
+  lines.push("**Deploy**: `struere deploy --force` skips confirmation prompts");
+  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 status --json");
+  lines.push("struere deploy --json --force");
+  lines.push("```");
+  lines.push("");
+  lines.push("**Non-interactive mode** is auto-detected when `STRUERE_API_KEY` is set or stdout is not a TTY. In this mode, all confirmation prompts are auto-accepted and spinners are replaced with plain text.");
+  lines.push("");
+  lines.push("**Exit codes**: All commands exit `0` on success, `1` on error. Check `$?` after execution.");
+  lines.push("");
   if (projectContext) {
     lines.push(projectContext);
     lines.push("");
@@ -20904,6 +20931,7 @@ function buildDocument(projectContext) {
   lines.push("");
   lines.push("| Command | Description |");
   lines.push("|---------|-------------|");
+  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 |");
@@ -21014,7 +21042,7 @@ function buildDocument(projectContext) {
   lines.push("- **Keep tools under 10 per agent.** Agents perform significantly worse when they have too many tools to choose from. If an agent needs more, split it into specialist agents and use `agent.chat` to orchestrate");
   lines.push("- **Always ask the user before making assumptions.** The user may not be technical \u2014 help them accomplish what they want by asking the right questions and offering clear options");
   lines.push("- **Always check the documentation before making changes.** Fetch the relevant doc link below to verify the correct API, field names, and patterns. Do not guess \u2014 wrong field names or patterns will cause silent failures");
-  lines.push("- **Use `struere dev` to validate changes.** Every save triggers a sync \u2014 check the terminal for errors before testing");
+  lines.push("- **Use `struere sync` to validate changes.** Run after editing files to sync to Convex. Use `struere dev` for continuous watch mode during manual development");
   lines.push("- **Test with evals.** Write eval suites to catch regressions in agent behavior (`struere add eval <name>`)");
   lines.push("");
   lines.push(`## Documentation`);
@@ -21046,6 +21074,7 @@ function buildDocument(projectContext) {
   lines.push("### CLI");
   lines.push(`- [CLI Overview](${DOCS_BASE}/cli/overview.md)`);
   lines.push(`- [struere init](${DOCS_BASE}/cli/init.md)`);
+  lines.push(`- [struere sync](${DOCS_BASE}/cli/sync.md)`);
   lines.push(`- [struere dev](${DOCS_BASE}/cli/dev.md)`);
   lines.push(`- [struere add](${DOCS_BASE}/cli/add.md)`);
   lines.push(`- [struere deploy](${DOCS_BASE}/cli/deploy.md)`);
@@ -21133,11 +21162,84 @@ var docsCommand = new Command("docs").description("Generate AI context files (CL
   console.log();
 });
 
+// src/cli/utils/runtime.ts
+function isInteractive2() {
+  return process.stdout.isTTY === true && !process.env.CI && !getApiKey();
+}
+function createOutput() {
+  if (isInteractive2()) {
+    const spinner = ora();
+    return {
+      start(msg) {
+        spinner.start(msg);
+      },
+      succeed(msg) {
+        spinner.succeed(msg);
+      },
+      fail(msg) {
+        spinner.fail(msg);
+      },
+      stop() {
+        spinner.stop();
+      },
+      info(msg) {
+        console.log(source_default.gray(msg));
+      },
+      warn(msg) {
+        console.log(source_default.yellow(msg));
+      },
+      error(msg) {
+        console.error(source_default.red(msg));
+      },
+      json(data) {
+        console.log(JSON.stringify(data, null, 2));
+      }
+    };
+  }
+  return {
+    start(msg) {
+      console.log(msg);
+    },
+    succeed(msg) {
+      console.log(msg);
+    },
+    fail(msg) {
+      console.error(msg);
+    },
+    stop() {},
+    info(msg) {
+      console.log(msg);
+    },
+    warn(msg) {
+      console.log(msg);
+    },
+    error(msg) {
+      console.error(msg);
+    },
+    json(data) {
+      console.log(JSON.stringify(data));
+    }
+  };
+}
+function isAuthError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("Unauthenticated") || message.includes("OIDC") || message.includes("token") || message.includes("expired");
+}
+function isOrgAccessError(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.includes("Access denied") || message.includes("not a member") || message.includes("Organization not found");
+}
+
 // src/cli/commands/init.ts
 async function runInit(cwd, selectedOrg) {
   const spinner = ora();
+  const nonInteractive = !isInteractive2();
   let credentials = loadCredentials();
   if (!credentials) {
+    if (nonInteractive) {
+      console.log(source_default.red("Not authenticated. Set STRUERE_API_KEY or run struere login."));
+      return false;
+    }
     console.log(source_default.yellow("Not logged in - authenticating..."));
     console.log();
     credentials = await performLogin();
@@ -21202,18 +21304,24 @@ async function runInit(cwd, selectedOrg) {
 var initCommand = new Command("init").description("Initialize a new Struere organization project").argument("[project-name]", "Project name").option("-y, --yes", "Skip prompts and use defaults").option("--org <slug>", "Organization slug").action(async (projectNameArg, options) => {
   const cwd = process.cwd();
   const spinner = ora();
+  const nonInteractive = !isInteractive2();
   console.log();
   console.log(source_default.bold("Struere CLI"));
   console.log();
   if (hasProject(cwd)) {
     console.log(source_default.yellow("This project is already initialized."));
     console.log();
-    console.log(source_default.gray("Run"), source_default.cyan("struere dev"), source_default.gray("to start development"));
+    console.log(source_default.gray("Run"), source_default.cyan("struere sync"), source_default.gray("to sync changes"));
     console.log();
     return;
   }
   let credentials = loadCredentials();
-  if (!credentials) {
+  const apiKey = getApiKey();
+  if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      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();
@@ -21223,8 +21331,10 @@ var initCommand = new Command("init").description("Initialize a new Struere orga
     }
     console.log();
   }
-  console.log(source_default.green("\u2713"), "Logged in as", source_default.cyan(credentials.user.name || credentials.user.email));
-  const { organizations, error } = await listMyOrganizations(credentials.token);
+  if (credentials) {
+    console.log(source_default.green("\u2713"), "Logged in as", source_default.cyan(credentials.user.name || credentials.user.email));
+  }
+  const { organizations, error } = await listMyOrganizations(credentials?.token || "");
   if (error) {
     console.log(source_default.red("Failed to fetch organizations:"), error);
     process.exit(1);
@@ -21244,6 +21354,10 @@ var initCommand = new Command("init").description("Initialize a new Struere orga
     selectedOrg = found;
   } else if (organizations.length === 1) {
     selectedOrg = organizations[0];
+  } else if (nonInteractive) {
+    console.log(source_default.red("Multiple organizations found. Use --org <slug> to specify one."));
+    console.log(source_default.gray("Available:"), organizations.map((o) => o.slug).join(", "));
+    process.exit(1);
   } else {
     selectedOrg = await esm_default4({
       message: "Select organization:",
@@ -21292,7 +21406,7 @@ var initCommand = new Command("init").description("Initialize a new Struere orga
   console.log();
   console.log(source_default.gray("Next steps:"));
   console.log(source_default.gray("  1."), source_default.cyan("struere add agent my-agent"), source_default.gray("- Create an agent"));
-  console.log(source_default.gray("  2."), source_default.cyan("struere dev"), source_default.gray("- Start development"));
+  console.log(source_default.gray("  2."), source_default.cyan("struere sync"), source_default.gray("- Sync to development"));
   console.log();
 });
 function slugify(name) {
@@ -21756,17 +21870,298 @@ function extractHandlerCode(handler) {
   return code;
 }
 
+// src/cli/commands/sync.ts
+async function performDevSync(cwd, organizationId) {
+  const resources = await loadAllResources(cwd);
+  if (resources.errors.length > 0) {
+    throw new Error(`${resources.errors.length} resource loading error(s):
+${resources.errors.join(`
+`)}`);
+  }
+  const payload = extractSyncPayload(resources);
+  const devResult = await syncOrganization({
+    agents: payload.agents,
+    entityTypes: payload.entityTypes,
+    roles: payload.roles,
+    triggers: payload.triggers,
+    organizationId,
+    environment: "development"
+  });
+  if (!devResult.success) {
+    throw new Error(devResult.error || "Dev sync failed");
+  }
+  const hasEvalContent = payload.evalSuites && payload.evalSuites.length > 0 || payload.fixtures && payload.fixtures.length > 0;
+  if (hasEvalContent) {
+    const evalResult = await syncOrganization({
+      agents: payload.agents,
+      entityTypes: payload.entityTypes,
+      roles: payload.roles,
+      evalSuites: payload.evalSuites,
+      fixtures: payload.fixtures,
+      organizationId,
+      environment: "eval"
+    });
+    if (!evalResult.success) {
+      throw new Error(evalResult.error || "Eval sync failed");
+    }
+  }
+  return devResult;
+}
+async function checkForDeletions(resources, organizationId, environment) {
+  const { state: remoteState } = await getSyncState(organizationId, environment);
+  if (!remoteState)
+    return [];
+  const payload = extractSyncPayload(resources);
+  const localSlugs = {
+    agents: new Set(payload.agents.map((a) => a.slug)),
+    entityTypes: new Set(payload.entityTypes.map((et) => et.slug)),
+    roles: new Set(payload.roles.map((r) => r.name)),
+    evalSuites: new Set((payload.evalSuites || []).map((es) => es.slug)),
+    triggers: new Set((payload.triggers || []).map((t) => t.slug))
+  };
+  const deletions = [];
+  const deletedAgents = remoteState.agents.filter((a) => !localSlugs.agents.has(a.slug)).map((a) => a.name);
+  if (deletedAgents.length > 0)
+    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 });
+  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 });
+  const remoteEvalSuites = remoteState.evalSuites || [];
+  const deletedEvalSuites = remoteEvalSuites.filter((es) => !localSlugs.evalSuites.has(es.slug)).map((es) => es.name);
+  if (deletedEvalSuites.length > 0)
+    deletions.push({ type: "Eval suites", remote: remoteEvalSuites.length, local: (payload.evalSuites || []).length, deleted: deletedEvalSuites });
+  const remoteTriggers = remoteState.triggers || [];
+  const deletedTriggers = remoteTriggers.filter((t) => !localSlugs.triggers.has(t.slug)).map((t) => t.name);
+  if (deletedTriggers.length > 0)
+    deletions.push({ type: "Triggers", remote: remoteTriggers.length, local: (payload.triggers || []).length, deleted: deletedTriggers });
+  return deletions;
+}
+async function syncToEnvironment(cwd, organizationId, environment) {
+  const resources = await loadAllResources(cwd);
+  if (resources.errors.length > 0) {
+    throw new Error(`${resources.errors.length} resource loading error(s):
+${resources.errors.join(`
+`)}`);
+  }
+  const payload = extractSyncPayload(resources);
+  if (environment === "eval") {
+    const result = await syncOrganization({
+      agents: payload.agents,
+      entityTypes: payload.entityTypes,
+      roles: payload.roles,
+      evalSuites: payload.evalSuites,
+      fixtures: payload.fixtures,
+      organizationId,
+      environment: "eval"
+    });
+    if (!result.success)
+      throw new Error(result.error || "Eval sync failed");
+    return result;
+  }
+  if (environment === "production") {
+    const result = await syncOrganization({
+      ...payload,
+      organizationId,
+      environment: "production"
+    });
+    if (!result.success)
+      throw new Error(result.error || "Production sync failed");
+    return result;
+  }
+  return performDevSync(cwd, organizationId);
+}
+var syncCommand = new Command("sync").description("Sync resources to Convex and exit").option("--force", "Skip destructive sync confirmation").option("--json", "Output results as JSON").option("--dry-run", "Show what would be synced without syncing").option("--env <environment>", "Target environment (development|production|eval)").action(async (options) => {
+  const cwd = process.cwd();
+  const jsonMode = !!options.json;
+  const output = createOutput();
+  const interactive = isInteractive2();
+  const shouldForce = options.force || !interactive;
+  const environment = options.env || "development";
+  const syncEval = !options.env || options.env === "development";
+  if (!hasProject(cwd)) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "No struere.json found" }));
+    } else {
+      output.fail("No struere.json found. Run struere init first.");
+    }
+    process.exit(1);
+  }
+  const project = loadProject(cwd);
+  if (!project) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "Failed to load struere.json" }));
+    } else {
+      output.fail("Failed to load struere.json");
+    }
+    process.exit(1);
+  }
+  const credentials = loadCredentials();
+  const apiKey = getApiKey();
+  if (!credentials && !apiKey) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "Not authenticated. Set STRUERE_API_KEY or run struere login." }));
+    } else {
+      output.fail("Not authenticated. Set STRUERE_API_KEY or run struere login.");
+    }
+    process.exit(1);
+  }
+  if (!jsonMode) {
+    output.info(`Organization: ${project.organization.name}`);
+    output.info(`Environment: ${environment}${syncEval && environment === "development" ? " + eval" : ""}`);
+    console.log();
+  }
+  if (!jsonMode)
+    output.start("Loading resources");
+  let resources;
+  try {
+    resources = await loadAllResources(cwd);
+    if (resources.errors.length > 0) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: `${resources.errors.length} resource loading error(s)`, errors: resources.errors }));
+      } else {
+        output.fail("Failed to load resources");
+        for (const err of resources.errors) {
+          output.error(`  ${err}`);
+        }
+      }
+      process.exit(1);
+    }
+    if (!jsonMode && !options.dryRun)
+      output.succeed(`Loaded ${resources.agents.length} agents, ${resources.entityTypes.length} entity types, ${resources.roles.length} roles`);
+  } catch (error) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
+    } else {
+      output.fail("Failed to load resources");
+      output.error(error instanceof Error ? error.message : String(error));
+    }
+    process.exit(1);
+  }
+  if (options.dryRun) {
+    const payload = extractSyncPayload(resources);
+    if (!jsonMode)
+      output.stop();
+    let deletions = [];
+    try {
+      deletions = await checkForDeletions(resources, project.organization.id, environment);
+    } catch {}
+    if (jsonMode) {
+      console.log(JSON.stringify({
+        dryRun: true,
+        environment,
+        agents: payload.agents.map((a) => a.slug),
+        entityTypes: payload.entityTypes.map((et) => et.slug),
+        roles: payload.roles.map((r) => r.name),
+        triggers: (payload.triggers || []).map((t) => t.slug),
+        deletions: deletions.map((d) => ({ type: d.type, names: d.deleted }))
+      }));
+    } else {
+      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("  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) {
+        console.log();
+        console.log(source_default.yellow.bold("  Would delete:"));
+        for (const d of deletions) {
+          for (const name of d.deleted) {
+            console.log(source_default.red(`    - ${d.type}: ${name}`));
+          }
+        }
+      }
+      console.log();
+    }
+    return;
+  }
+  if (!shouldForce) {
+    if (!jsonMode)
+      output.start("Checking remote state");
+    try {
+      const deletions = await checkForDeletions(resources, project.organization.id, environment);
+      if (!jsonMode)
+        output.stop();
+      if (deletions.length > 0) {
+        console.log(source_default.yellow.bold("  Warning: this sync will DELETE remote resources:"));
+        console.log();
+        for (const d of deletions) {
+          console.log(source_default.yellow(`    ${d.type}:`.padEnd(20)), `${d.remote} remote \u2192 ${d.local} local`, source_default.red(`(${d.deleted.length} will be deleted)`));
+          for (const name of d.deleted) {
+            console.log(source_default.red(`      - ${name}`));
+          }
+        }
+        console.log();
+        console.log(source_default.gray("  Run"), source_default.cyan("struere pull"), source_default.gray("first to download remote resources."));
+        console.log();
+        const shouldContinue = await esm_default2({ message: "Continue anyway?", default: false });
+        if (!shouldContinue) {
+          console.log(source_default.gray("Aborted."));
+          process.exit(0);
+        }
+        console.log();
+      }
+    } catch {
+      if (!jsonMode)
+        output.stop();
+    }
+  }
+  if (!jsonMode)
+    output.start("Syncing to Convex");
+  try {
+    const result = await syncToEnvironment(cwd, project.organization.id, environment);
+    if (!jsonMode)
+      output.succeed(`Synced to ${environment}`);
+    if (jsonMode) {
+      console.log(JSON.stringify({
+        success: true,
+        environment,
+        agents: {
+          created: result.agents?.created || [],
+          updated: result.agents?.updated || [],
+          deleted: result.agents?.deleted || []
+        },
+        entityTypes: {
+          created: result.entityTypes?.created || [],
+          updated: result.entityTypes?.updated || [],
+          deleted: result.entityTypes?.deleted || []
+        },
+        roles: {
+          created: result.roles?.created || [],
+          updated: result.roles?.updated || [],
+          deleted: result.roles?.deleted || []
+        }
+      }));
+    }
+  } catch (error) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
+    } else {
+      output.fail("Sync failed");
+      output.error(error instanceof Error ? error.message : String(error));
+    }
+    process.exit(1);
+  }
+});
+
 // src/cli/commands/dev.ts
-var devCommand = new Command("dev").description("Sync all resources to development environment").option("--force", "Skip destructive sync confirmation").action(async (options) => {
+var devCommand = new Command("dev").description("Watch files and sync to development on change (long-running)").option("--force", "Skip destructive sync confirmation").action(async (options) => {
   const spinner = ora();
   const cwd = process.cwd();
   const apiKey = getApiKey();
-  const isHeadless = !!apiKey && !loadCredentials()?.token;
+  const nonInteractive = !isInteractive2();
+  if (nonInteractive) {
+    console.error("Error: struere dev is a long-running watch process. Use struere sync instead.");
+    process.exit(1);
+  }
   console.log();
   console.log(source_default.bold("Struere Dev"));
   console.log();
   if (!hasProject(cwd)) {
-    if (isHeadless) {
+    if (nonInteractive) {
       console.log(source_default.red("No struere.json found. Cannot run init in headless mode."));
       process.exit(1);
     }
@@ -21783,8 +22178,8 @@ var devCommand = new Command("dev").description("Sync all resources to developme
   generateTypeDeclarations(cwd);
   console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
   console.log(source_default.gray("Environment:"), source_default.cyan("development"), "+", source_default.cyan("eval"));
-  if (isHeadless) {
-    console.log(source_default.gray("Auth:"), source_default.cyan("API key (headless)"));
+  if (nonInteractive) {
+    console.log(source_default.gray("Auth:"), source_default.cyan("non-interactive"));
   }
   console.log();
   let credentials = loadCredentials();
@@ -21809,53 +22204,6 @@ var devCommand = new Command("dev").description("Sync all resources to developme
       console.log(source_default.yellow("\u26A0"), "Could not fetch docs for CLAUDE.md");
     }
   }
-  const isAuthError = (error) => {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes("Unauthenticated") || message.includes("OIDC") || message.includes("token") || message.includes("expired");
-  };
-  const isOrgAccessError = (error) => {
-    const message = error instanceof Error ? error.message : String(error);
-    return message.includes("Access denied") || message.includes("not a member") || message.includes("Organization not found");
-  };
-  const performSync = async () => {
-    const resources = await loadAllResources(cwd);
-    if (resources.errors.length > 0) {
-      for (const err of resources.errors) {
-        console.log(source_default.red("  \u2716"), err);
-      }
-      throw new Error(`${resources.errors.length} resource loading error(s):
-${resources.errors.join(`
-`)}`);
-    }
-    const payload = extractSyncPayload(resources);
-    const devResult = await syncOrganization({
-      agents: payload.agents,
-      entityTypes: payload.entityTypes,
-      roles: payload.roles,
-      triggers: payload.triggers,
-      organizationId: project.organization.id,
-      environment: "development"
-    });
-    if (!devResult.success) {
-      throw new Error(devResult.error || "Dev sync failed");
-    }
-    const hasEvalContent = payload.evalSuites && payload.evalSuites.length > 0 || payload.fixtures && payload.fixtures.length > 0;
-    if (hasEvalContent) {
-      const evalResult = await syncOrganization({
-        agents: payload.agents,
-        entityTypes: payload.entityTypes,
-        roles: payload.roles,
-        evalSuites: payload.evalSuites,
-        fixtures: payload.fixtures,
-        organizationId: project.organization.id,
-        environment: "eval"
-      });
-      if (!evalResult.success) {
-        throw new Error(evalResult.error || "Eval sync failed");
-      }
-    }
-    return true;
-  };
   let initialSyncOk = false;
   let loadedResources = null;
   spinner.start("Loading resources");
@@ -21872,59 +22220,31 @@ ${resources.errors.join(`
     spinner.fail("Failed to load resources");
     console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
   }
-  const shouldSkipConfirmation = options.force || isHeadless;
+  const shouldSkipConfirmation = options.force || nonInteractive;
   if (initialSyncOk && !shouldSkipConfirmation && loadedResources) {
     spinner.start("Checking remote state");
     try {
-      const { state: remoteState } = await getSyncState(project.organization.id, "development");
+      const deletions = await checkForDeletions(loadedResources, project.organization.id, "development");
       spinner.stop();
-      if (remoteState) {
-        const payload = extractSyncPayload(loadedResources);
-        const localSlugs = {
-          agents: new Set(payload.agents.map((a) => a.slug)),
-          entityTypes: new Set(payload.entityTypes.map((et) => et.slug)),
-          roles: new Set(payload.roles.map((r) => r.name)),
-          evalSuites: new Set((payload.evalSuites || []).map((es) => es.slug)),
-          triggers: new Set((payload.triggers || []).map((t) => t.slug))
-        };
-        const deletions = [];
-        const deletedAgents = remoteState.agents.filter((a) => !localSlugs.agents.has(a.slug)).map((a) => a.name);
-        if (deletedAgents.length > 0)
-          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 });
-        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 });
-        const remoteEvalSuites = remoteState.evalSuites || [];
-        const deletedEvalSuites = remoteEvalSuites.filter((es) => !localSlugs.evalSuites.has(es.slug)).map((es) => es.name);
-        if (deletedEvalSuites.length > 0)
-          deletions.push({ type: "Eval suites", remote: remoteEvalSuites.length, local: (payload.evalSuites || []).length, deleted: deletedEvalSuites });
-        const remoteTriggers = remoteState.triggers || [];
-        const deletedTriggers = remoteTriggers.filter((t) => !localSlugs.triggers.has(t.slug)).map((t) => t.name);
-        if (deletedTriggers.length > 0)
-          deletions.push({ type: "Triggers", remote: remoteTriggers.length, local: (payload.triggers || []).length, deleted: deletedTriggers });
-        if (deletions.length > 0) {
-          console.log(source_default.yellow.bold("  Warning: this sync will DELETE remote resources:"));
-          console.log();
-          for (const d of deletions) {
-            console.log(source_default.yellow(`    ${d.type}:`.padEnd(20)), `${d.remote} remote \u2192 ${d.local} local`, source_default.red(`(${d.deleted.length} will be deleted)`));
-            for (const name of d.deleted) {
-              console.log(source_default.red(`      - ${name}`));
-            }
-          }
-          console.log();
-          console.log(source_default.gray("  Run"), source_default.cyan("struere pull"), source_default.gray("first to download remote resources."));
-          console.log();
-          const shouldContinue = await esm_default2({ message: "Continue anyway?", default: false });
-          if (!shouldContinue) {
-            console.log();
-            console.log(source_default.gray("Aborted."));
-            process.exit(0);
+      if (deletions.length > 0) {
+        console.log(source_default.yellow.bold("  Warning: this sync will DELETE remote resources:"));
+        console.log();
+        for (const d of deletions) {
+          console.log(source_default.yellow(`    ${d.type}:`.padEnd(20)), `${d.remote} remote \u2192 ${d.local} local`, source_default.red(`(${d.deleted.length} will be deleted)`));
+          for (const name of d.deleted) {
+            console.log(source_default.red(`      - ${name}`));
           }
+        }
+        console.log();
+        console.log(source_default.gray("  Run"), source_default.cyan("struere pull"), source_default.gray("first to download remote resources."));
+        console.log();
+        const shouldContinue = await esm_default2({ message: "Continue anyway?", default: false });
+        if (!shouldContinue) {
           console.log();
+          console.log(source_default.gray("Aborted."));
+          process.exit(0);
         }
+        console.log();
       }
     } catch {
       spinner.stop();
@@ -21933,10 +22253,10 @@ ${resources.errors.join(`
   if (initialSyncOk) {
     spinner.start("Syncing to Convex");
     try {
-      await performSync();
+      await performDevSync(cwd, project.organization.id);
       spinner.succeed("Synced to development");
     } catch (error) {
-      if (isAuthError(error) && !isHeadless) {
+      if (isAuthError(error) && !nonInteractive) {
         spinner.fail("Session expired - re-authenticating...");
         clearCredentials();
         credentials = await performLogin();
@@ -21946,13 +22266,13 @@ ${resources.errors.join(`
         }
         spinner.start("Syncing to Convex");
         try {
-          await performSync();
+          await performDevSync(cwd, project.organization.id);
           spinner.succeed("Synced to development");
         } catch (retryError) {
           spinner.fail("Sync failed");
           console.log(source_default.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
         }
-      } else if (isAuthError(error) && isHeadless) {
+      } else if (isAuthError(error) && nonInteractive) {
         spinner.fail("API key authentication failed");
         console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
         console.log(source_default.gray("Check that STRUERE_API_KEY is valid and not expired."));
@@ -21992,15 +22312,15 @@ ${resources.errors.join(`
     persistent: true,
     usePolling: false
   });
-  watcher.on("change", async (path) => {
+  const handleFileChange = async (path, action) => {
     const relativePath = path.replace(cwd, ".");
-    console.log(source_default.gray(`Changed: ${relativePath}`));
+    console.log(source_default.gray(`${action}: ${relativePath}`));
     const syncSpinner = ora("Syncing...").start();
     try {
-      await performSync();
+      await performDevSync(cwd, project.organization.id);
       syncSpinner.succeed("Synced");
     } catch (error) {
-      if (isAuthError(error) && !isHeadless) {
+      if (isAuthError(error) && !nonInteractive) {
         syncSpinner.fail("Session expired - re-authenticating...");
         clearCredentials();
         const newCredentials = await performLogin();
@@ -22010,7 +22330,7 @@ ${resources.errors.join(`
         }
         const retrySyncSpinner = ora("Syncing...").start();
         try {
-          await performSync();
+          await performDevSync(cwd, project.organization.id);
           retrySyncSpinner.succeed("Synced");
         } catch (retryError) {
           retrySyncSpinner.fail("Sync failed");
@@ -22021,31 +22341,10 @@ ${resources.errors.join(`
         console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
       }
     }
-  });
-  watcher.on("add", async (path) => {
-    const relativePath = path.replace(cwd, ".");
-    console.log(source_default.gray(`Added: ${relativePath}`));
-    const syncSpinner = ora("Syncing...").start();
-    try {
-      await performSync();
-      syncSpinner.succeed("Synced");
-    } catch (error) {
-      syncSpinner.fail("Sync failed");
-      console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
-    }
-  });
-  watcher.on("unlink", async (path) => {
-    const relativePath = path.replace(cwd, ".");
-    console.log(source_default.gray(`Removed: ${relativePath}`));
-    const syncSpinner = ora("Syncing...").start();
-    try {
-      await performSync();
-      syncSpinner.succeed("Synced");
-    } catch (error) {
-      syncSpinner.fail("Sync failed");
-      console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
-    }
-  });
+  };
+  watcher.on("change", (path) => handleFileChange(path, "Changed"));
+  watcher.on("add", (path) => handleFileChange(path, "Added"));
+  watcher.on("unlink", (path) => handleFileChange(path, "Removed"));
   process.on("SIGINT", () => {
     console.log();
     console.log(source_default.gray("Stopping..."));
@@ -22055,21 +22354,26 @@ ${resources.errors.join(`
 });
 
 // src/cli/commands/deploy.ts
-var isAuthError = (error) => {
-  const message = error instanceof Error ? error.message : String(error);
-  return message.includes("Unauthenticated") || message.includes("OIDC") || message.includes("token") || message.includes("expired");
-};
-var isOrgAccessError = (error) => {
-  const message = error instanceof Error ? error.message : String(error);
-  return message.includes("Access denied") || message.includes("not a member") || message.includes("Organization not found");
-};
-var deployCommand = new Command("deploy").description("Deploy all resources to production").option("--dry-run", "Show what would be deployed without deploying").action(async (options) => {
+var deployCommand = new Command("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 = ora();
   const cwd = process.cwd();
-  console.log();
-  console.log(source_default.bold("Deploying to Production"));
-  console.log();
+  const nonInteractive = !isInteractive2();
+  const shouldForce = options.force || nonInteractive;
+  const jsonMode = !!options.json;
+  if (!jsonMode) {
+    console.log();
+    console.log(source_default.bold("Deploying to Production"));
+    console.log();
+  }
   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);
@@ -22080,15 +22384,29 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
   }
   const project = loadProject(cwd);
   if (!project) {
-    console.log(source_default.red("Failed to load struere.json"));
+    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);
   }
-  console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
-  console.log(source_default.gray("Environment:"), source_default.cyan("production"));
-  console.log();
+  if (!jsonMode) {
+    console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
+    console.log(source_default.gray("Environment:"), source_default.cyan("production"));
+    console.log();
+  }
   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();
@@ -22098,66 +22416,68 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
     }
     console.log();
   }
-  spinner.start("Loading resources");
+  if (!jsonMode)
+    spinner.start("Loading resources");
   let resources;
   try {
     resources = await loadAllResources(cwd);
-    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`);
+    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`);
     for (const err of resources.errors) {
-      console.log(source_default.red("  \u2716"), err);
+      if (!jsonMode)
+        console.log(source_default.red("  \u2716"), err);
     }
     if (resources.errors.length > 0) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: `${resources.errors.length} resource loading error(s)`, errors: resources.errors }));
+      }
       process.exit(1);
     }
   } catch (error) {
-    spinner.fail("Failed to load resources");
-    console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
+    } else {
+      spinner.fail("Failed to load resources");
+      console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
+    }
     process.exit(1);
   }
   if (resources.agents.length === 0) {
-    console.log();
-    console.log(source_default.yellow("No agents found to deploy"));
-    console.log();
-    console.log(source_default.gray("Run"), source_default.cyan("struere add agent my-agent"), source_default.gray("to create an agent"));
-    console.log();
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: "No agents found to deploy" }));
+    } else {
+      console.log();
+      console.log(source_default.yellow("No agents found to deploy"));
+      console.log();
+      console.log(source_default.gray("Run"), source_default.cyan("struere add agent my-agent"), source_default.gray("to create an agent"));
+      console.log();
+    }
     return;
   }
   const payload = extractSyncPayload(resources);
-  spinner.start("Checking remote state");
+  if (!jsonMode)
+    spinner.start("Checking remote state");
   let deletions = [];
   try {
-    const { state: remoteState } = await getSyncState(project.organization.id, "production");
-    spinner.stop();
-    if (remoteState) {
-      const localSlugs = {
-        agents: new Set(payload.agents.map((a) => a.slug)),
-        entityTypes: new Set(payload.entityTypes.map((et) => et.slug)),
-        roles: new Set(payload.roles.map((r) => r.name)),
-        evalSuites: new Set((payload.evalSuites || []).map((es) => es.slug)),
-        triggers: new Set((payload.triggers || []).map((t) => t.slug))
-      };
-      const deletedAgents = remoteState.agents.filter((a) => !localSlugs.agents.has(a.slug)).map((a) => a.name);
-      if (deletedAgents.length > 0)
-        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 });
-      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 });
-      const remoteEvalSuites = remoteState.evalSuites || [];
-      const deletedEvalSuites = remoteEvalSuites.filter((es) => !localSlugs.evalSuites.has(es.slug)).map((es) => es.name);
-      if (deletedEvalSuites.length > 0)
-        deletions.push({ type: "Eval suites", remote: remoteEvalSuites.length, local: (payload.evalSuites || []).length, deleted: deletedEvalSuites });
-      const remoteTriggers = remoteState.triggers || [];
-      const deletedTriggers = remoteTriggers.filter((t) => !localSlugs.triggers.has(t.slug)).map((t) => t.name);
-      if (deletedTriggers.length > 0)
-        deletions.push({ type: "Triggers", remote: remoteTriggers.length, local: (payload.triggers || []).length, deleted: deletedTriggers });
-    }
+    deletions = await checkForDeletions(resources, project.organization.id, "production");
+    if (!jsonMode)
+      spinner.stop();
   } catch {
-    spinner.stop();
+    if (!jsonMode)
+      spinner.stop();
   }
   if (options.dryRun) {
+    if (jsonMode) {
+      console.log(JSON.stringify({
+        success: true,
+        dryRun: true,
+        agents: resources.agents.map((a) => ({ name: a.name, slug: a.slug, version: a.version })),
+        entityTypes: resources.entityTypes.map((et) => ({ name: et.name, slug: et.slug })),
+        roles: resources.roles.map((r) => ({ name: r.name })),
+        deletions: deletions.flatMap((d) => d.deleted.map((name) => ({ type: d.type.toLowerCase(), name })))
+      }));
+      return;
+    }
     console.log();
     console.log(source_default.yellow("Dry run mode - no changes will be made"));
     console.log();
@@ -22194,7 +22514,7 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
     console.log();
     return;
   }
-  if (deletions.length > 0) {
+  if (deletions.length > 0 && !shouldForce) {
     console.log(source_default.yellow.bold("  Warning: this deploy will DELETE production resources:"));
     console.log();
     for (const d of deletions) {
@@ -22212,7 +22532,8 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
     }
     console.log();
   }
-  spinner.start("Deploying to production");
+  if (!jsonMode)
+    spinner.start("Deploying to production");
   try {
     const syncResult = await syncOrganization({
       ...payload,
@@ -22222,38 +22543,67 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
     if (!syncResult.success) {
       throw new Error(syncResult.error || "Deploy failed");
     }
-    spinner.succeed("Deployed to production");
-    console.log();
-    console.log(source_default.green("Success!"), "All resources deployed to production");
-    console.log();
-    if (syncResult.agents?.created && syncResult.agents.created.length > 0) {
-      console.log("New agents:");
-      for (const slug of syncResult.agents.created) {
-        const agent = resources.agents.find((a) => a.slug === slug);
-        console.log(source_default.gray("  -"), source_default.cyan(agent?.name || slug));
+    if (!jsonMode)
+      spinner.succeed("Deployed to production");
+    if (jsonMode) {
+      console.log(JSON.stringify({
+        success: true,
+        environment: "production",
+        agents: {
+          created: syncResult.agents?.created || [],
+          updated: syncResult.agents?.updated || [],
+          deleted: syncResult.agents?.deleted || []
+        },
+        entityTypes: {
+          created: syncResult.entityTypes?.created || [],
+          updated: syncResult.entityTypes?.updated || [],
+          deleted: syncResult.entityTypes?.deleted || []
+        },
+        roles: {
+          created: syncResult.roles?.created || [],
+          updated: syncResult.roles?.updated || [],
+          deleted: syncResult.roles?.deleted || []
+        }
+      }));
+    } else {
+      console.log();
+      console.log(source_default.green("Success!"), "All resources deployed to production");
+      console.log();
+      if (syncResult.agents?.created && syncResult.agents.created.length > 0) {
+        console.log("New agents:");
+        for (const slug of syncResult.agents.created) {
+          const agent = resources.agents.find((a) => a.slug === slug);
+          console.log(source_default.gray("  -"), source_default.cyan(agent?.name || slug));
+        }
       }
-    }
-    if (syncResult.agents?.updated && syncResult.agents.updated.length > 0) {
-      console.log("Updated agents:");
-      for (const slug of syncResult.agents.updated) {
-        const agent = resources.agents.find((a) => a.slug === slug);
-        console.log(source_default.gray("  -"), source_default.cyan(agent?.name || slug));
+      if (syncResult.agents?.updated && syncResult.agents.updated.length > 0) {
+        console.log("Updated agents:");
+        for (const slug of syncResult.agents.updated) {
+          const agent = resources.agents.find((a) => a.slug === slug);
+          console.log(source_default.gray("  -"), source_default.cyan(agent?.name || slug));
+        }
       }
+      console.log();
+      console.log(source_default.gray("Test your agents:"));
+      console.log(source_default.gray("  $"), source_default.cyan(`curl -X POST https://<agent-slug>.struere.dev/chat -H "Authorization: Bearer YOUR_API_KEY" -d '{"message": "Hello"}'`));
+      console.log();
     }
-    console.log();
-    console.log(source_default.gray("Test your agents:"));
-    console.log(source_default.gray("  $"), source_default.cyan(`curl -X POST https://<agent-slug>.struere.dev/chat -H "Authorization: Bearer YOUR_API_KEY" -d '{"message": "Hello"}'`));
-    console.log();
   } catch (error) {
-    if (isAuthError(error)) {
-      spinner.fail("Session expired - re-authenticating...");
+    if (isAuthError(error) && !nonInteractive) {
+      if (!jsonMode)
+        spinner.fail("Session expired - re-authenticating...");
       clearCredentials();
       credentials = await performLogin();
       if (!credentials) {
-        console.log(source_default.red("Authentication failed"));
+        if (jsonMode) {
+          console.log(JSON.stringify({ success: false, error: "Authentication failed" }));
+        } else {
+          console.log(source_default.red("Authentication failed"));
+        }
         process.exit(1);
       }
-      spinner.start("Deploying to production");
+      if (!jsonMode)
+        spinner.start("Deploying to production");
       try {
         const syncResult = await syncOrganization({
           ...payload,
@@ -22263,30 +22613,46 @@ var deployCommand = new Command("deploy").description("Deploy all resources to p
         if (!syncResult.success) {
           throw new Error(syncResult.error || "Deploy failed");
         }
-        spinner.succeed("Deployed to production");
-        console.log();
-        console.log(source_default.green("Success!"), "All resources deployed to production");
-        console.log();
+        if (!jsonMode) {
+          spinner.succeed("Deployed to production");
+          console.log();
+          console.log(source_default.green("Success!"), "All resources deployed to production");
+          console.log();
+        } else {
+          console.log(JSON.stringify({ success: true, environment: "production" }));
+        }
       } catch (retryError) {
-        spinner.fail("Deployment failed");
-        console.log(source_default.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
+        if (jsonMode) {
+          console.log(JSON.stringify({ success: false, error: retryError instanceof Error ? retryError.message : String(retryError) }));
+        } else {
+          spinner.fail("Deployment failed");
+          console.log(source_default.red("Error:"), retryError instanceof Error ? retryError.message : String(retryError));
+        }
         process.exit(1);
       }
     } else if (isOrgAccessError(error)) {
-      spinner.fail("Organization access denied");
-      console.log();
-      console.log(source_default.red("You do not have access to organization:"), source_default.cyan(project.organization.name));
-      console.log();
-      console.log(source_default.gray("To fix this:"));
-      console.log(source_default.gray("  1."), "Check that you have access to this organization");
-      console.log(source_default.gray("  2."), "Or run", source_default.cyan("struere init"), "to select a different organization");
-      console.log();
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: `Organization access denied: ${project.organization.name}` }));
+      } else {
+        spinner.fail("Organization access denied");
+        console.log();
+        console.log(source_default.red("You do not have access to organization:"), source_default.cyan(project.organization.name));
+        console.log();
+        console.log(source_default.gray("To fix this:"));
+        console.log(source_default.gray("  1."), "Check that you have access to this organization");
+        console.log(source_default.gray("  2."), "Or run", source_default.cyan("struere init"), "to select a different organization");
+        console.log();
+      }
       process.exit(1);
     } else {
-      spinner.fail("Deployment failed");
-      console.log();
-      console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
-      console.log();
+      if (jsonMode) {
+        console.log(JSON.stringify({ success: false, error: error instanceof Error ? error.message : String(error) }));
+      } else {
+        spinner.fail("Deployment failed");
+        console.log();
+        console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
+        console.log();
+      }
       process.exit(1);
     }
   }
@@ -22308,32 +22674,47 @@ var logoutCommand = new Command("logout").description("Log out of Struere").acti
 });
 
 // src/cli/commands/whoami.ts
-var whoamiCommand = new Command("whoami").description("Show current logged in user").option("--refresh", "Refresh user info from server").action(async (options) => {
-  console.log();
+var whoamiCommand = new Command("whoami").description("Show current logged in user").option("--refresh", "Refresh user info from server").option("--json", "Output raw JSON").action(async (options) => {
+  const jsonMode = !!options.json;
   const credentials = loadCredentials();
-  if (!credentials) {
-    console.log(source_default.yellow("Not logged in"));
-    console.log();
-    console.log(source_default.gray("Run"), source_default.cyan("struere login"), source_default.gray("to log in"));
-    console.log();
+  const apiKey = getApiKey();
+  if (!credentials && !apiKey) {
+    if (jsonMode) {
+      console.log(JSON.stringify({ authenticated: false }));
+    } else {
+      console.log();
+      console.log(source_default.yellow("Not logged in"));
+      console.log();
+      console.log(source_default.gray("Run"), source_default.cyan("struere login"), source_default.gray("to log in"));
+      console.log();
+    }
     return;
   }
-  if (options.refresh) {
-    const spinner = ora("Fetching user info").start();
+  if (options.refresh && credentials) {
+    const spinner = jsonMode ? null : ora("Fetching user info").start();
     const { userInfo, error } = await getUserInfo(credentials.token);
     if (error || !userInfo) {
-      spinner.fail("Failed to fetch user info");
-      console.log();
-      if (error?.includes("401") || error?.includes("unauthorized")) {
-        console.log(source_default.red("Session expired. Please log in again."));
+      if (jsonMode) {
+        console.log(JSON.stringify({ authenticated: false, error: error || "Unknown error" }));
       } else {
-        console.log(source_default.red("Error:"), error || "Unknown error");
+        spinner?.fail("Failed to fetch user info");
+        console.log();
+        if (error?.includes("401") || error?.includes("unauthorized")) {
+          console.log(source_default.red("Session expired. Please log in again."));
+        } else {
+          console.log(source_default.red("Error:"), error || "Unknown error");
+        }
+        console.log();
       }
-      console.log();
       process.exit(1);
     }
-    spinner.stop();
+    spinner?.stop();
     const { user, organizations } = userInfo;
+    if (jsonMode) {
+      console.log(JSON.stringify({ user, organizations }));
+      return;
+    }
+    console.log();
     console.log(source_default.bold("Logged in as:"));
     console.log();
     console.log(source_default.gray("  User:        "), source_default.cyan(user.name || user.email), source_default.gray(`<${user.email}>`));
@@ -22349,13 +22730,36 @@ var whoamiCommand = new Command("whoami").description("Show current logged in us
     }
     console.log();
   } else {
-    console.log(source_default.bold("Logged in as:"));
-    console.log();
-    console.log(source_default.gray("  User:        "), source_default.cyan(credentials.user.name), source_default.gray(`<${credentials.user.email}>`));
-    console.log(source_default.gray("  User ID:     "), source_default.gray(credentials.user.id));
-    console.log();
-    console.log(source_default.gray("Use"), source_default.cyan("struere whoami --refresh"), source_default.gray("to fetch organizations"));
-    console.log();
+    if (credentials) {
+      if (jsonMode) {
+        console.log(JSON.stringify({
+          user: {
+            id: credentials.user.id,
+            name: credentials.user.name,
+            email: credentials.user.email
+          }
+        }));
+        return;
+      }
+      console.log();
+      console.log(source_default.bold("Logged in as:"));
+      console.log();
+      console.log(source_default.gray("  User:        "), source_default.cyan(credentials.user.name), source_default.gray(`<${credentials.user.email}>`));
+      console.log(source_default.gray("  User ID:     "), source_default.gray(credentials.user.id));
+      console.log();
+      console.log(source_default.gray("Use"), source_default.cyan("struere whoami --refresh"), source_default.gray("to fetch organizations"));
+      console.log();
+    } else {
+      if (jsonMode) {
+        console.log(JSON.stringify({ authenticated: true, authMethod: "api-key" }));
+      } else {
+        console.log();
+        console.log(source_default.bold("Authenticated via API key"));
+        console.log();
+        console.log(source_default.gray("Use"), source_default.cyan("struere whoami --refresh"), source_default.gray("with browser login for full details"));
+        console.log();
+      }
+    }
   }
 });
 
@@ -22420,7 +22824,7 @@ var addCommand = new Command("add").description("Scaffold a new resource").argum
           console.log(source_default.gray("  \u2192"), file);
         }
         console.log();
-        console.log(source_default.gray("Edit the YAML file, then run"), source_default.cyan("struere dev"), source_default.gray("to sync"));
+        console.log(source_default.gray("Edit the YAML file, then run"), source_default.cyan("struere sync"), source_default.gray("to sync"));
       } else {
         console.log(source_default.yellow("Eval suite already exists:"), `evals/${slug}.eval.yaml`);
       }
@@ -22444,7 +22848,7 @@ var addCommand = new Command("add").description("Scaffold a new resource").argum
           console.log(source_default.gray("  \u2192"), file);
         }
         console.log();
-        console.log(source_default.gray("Edit the YAML file, then run"), source_default.cyan("struere dev"), source_default.gray("to sync"));
+        console.log(source_default.gray("Edit the YAML file, then run"), source_default.cyan("struere sync"), source_default.gray("to sync"));
       } else {
         console.log(source_default.yellow("Fixture already exists:"), `fixtures/${slug}.fixture.yaml`);
       }
@@ -22463,7 +22867,7 @@ var addCommand = new Command("add").description("Scaffold a new resource").argum
       process.exit(1);
   }
   console.log();
-  console.log(source_default.gray("Run"), source_default.cyan("struere dev"), source_default.gray("to sync changes"));
+  console.log(source_default.gray("Run"), source_default.cyan("struere sync"), source_default.gray("to sync changes"));
   console.log();
 });
 function slugify2(name) {
@@ -22471,13 +22875,25 @@ function slugify2(name) {
 }
 
 // src/cli/commands/status.ts
-var statusCommand = new Command("status").description("Compare local vs remote state").action(async () => {
+var statusCommand = new Command("status").description("Compare local vs remote state").option("--json", "Output raw JSON").action(async (opts) => {
   const spinner = ora();
   const cwd = process.cwd();
-  console.log();
-  console.log(source_default.bold("Struere Status"));
-  console.log();
+  const jsonMode = !!opts.json;
+  const nonInteractive = !isInteractive2();
+  if (!jsonMode) {
+    console.log();
+    console.log(source_default.bold("Struere Status"));
+    console.log();
+  }
   if (!hasProject(cwd)) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ error: "No struere.json found. Run struere init first." }));
+      } 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);
@@ -22488,14 +22904,28 @@ var statusCommand = new Command("status").description("Compare local vs remote s
   }
   const project = loadProject(cwd);
   if (!project) {
-    console.log(source_default.red("Failed to load struere.json"));
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Failed to load struere.json" }));
+    } else {
+      console.log(source_default.red("Failed to load struere.json"));
+    }
     process.exit(1);
   }
-  console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
-  console.log();
+  if (!jsonMode) {
+    console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
+    console.log();
+  }
   let credentials = loadCredentials();
   const apiKey = getApiKey();
   if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ 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();
@@ -22505,34 +22935,49 @@ var statusCommand = new Command("status").description("Compare local vs remote s
     }
     console.log();
   }
-  spinner.start("Loading local resources");
+  if (!jsonMode)
+    spinner.start("Loading local resources");
   let localResources;
   try {
     localResources = await loadAllResources(cwd);
-    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`);
-    for (const err of localResources.errors) {
-      console.log(source_default.red("  \u2716"), err);
+    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`);
+      for (const err of localResources.errors) {
+        console.log(source_default.red("  \u2716"), err);
+      }
     }
     if (localResources.errors.length > 0) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ error: `${localResources.errors.length} resource loading error(s)`, errors: localResources.errors }));
+      }
       process.exit(1);
     }
   } catch (error) {
-    spinner.fail("Failed to load local resources");
-    console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: error instanceof Error ? error.message : String(error) }));
+    } else {
+      spinner.fail("Failed to load local resources");
+      console.log(source_default.red("Error:"), error instanceof Error ? error.message : String(error));
+    }
     process.exit(1);
   }
-  spinner.start("Fetching remote state");
+  if (!jsonMode)
+    spinner.start("Fetching remote state");
   const [devResult, prodResult] = await Promise.all([
     getSyncState(undefined, "development"),
     getSyncState(undefined, "production")
   ]);
   if (devResult.error || !devResult.state) {
-    spinner.fail("Failed to fetch remote state");
-    console.log(source_default.red("Error:"), devResult.error || "Unknown error");
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: devResult.error || "Failed to fetch remote state" }));
+    } else {
+      spinner.fail("Failed to fetch remote state");
+      console.log(source_default.red("Error:"), devResult.error || "Unknown error");
+    }
     process.exit(1);
   }
-  spinner.succeed("Remote state fetched");
-  console.log();
+  if (!jsonMode)
+    spinner.succeed("Remote state fetched");
   const devState = devResult.state;
   const prodState = prodResult.state;
   const localAgentSlugs = new Set(localResources.agents.map((a) => a.slug));
@@ -22541,6 +22986,24 @@ var statusCommand = new Command("status").description("Compare local vs remote s
   const devEntityTypeSlugs = new Set(devState.entityTypes.map((et) => et.slug));
   const localRoleNames = new Set(localResources.roles.map((r) => r.name));
   const devRoleNames = new Set(devState.roles.map((r) => r.name));
+  if (opts.json) {
+    const classify = (localItems, remoteItems, useSlug) => {
+      const localKeys = new Set(localItems.map((i) => useSlug ? i.slug : i.name));
+      const remoteKeys = new Set(remoteItems.map((i) => useSlug ? i.slug : i.name));
+      return {
+        synced: localItems.filter((i) => remoteKeys.has(useSlug ? i.slug : i.name)).map((i) => useSlug ? i.slug : i.name),
+        new: localItems.filter((i) => !remoteKeys.has(useSlug ? i.slug : i.name)).map((i) => useSlug ? i.slug : i.name),
+        deleted: remoteItems.filter((i) => !localKeys.has(useSlug ? i.slug : i.name)).map((i) => useSlug ? i.slug : i.name)
+      };
+    };
+    console.log(JSON.stringify({
+      agents: classify(localResources.agents, devState.agents, true),
+      entityTypes: classify(localResources.entityTypes, devState.entityTypes, true),
+      roles: classify(localResources.roles, devState.roles, false)
+    }));
+    return;
+  }
+  console.log();
   console.log(source_default.bold("Agents"));
   console.log(source_default.gray("\u2500".repeat(60)));
   if (localResources.agents.length === 0 && devState.agents.length === 0) {
@@ -22609,7 +23072,7 @@ var statusCommand = new Command("status").description("Compare local vs remote s
   console.log(source_default.gray("Legend:"));
   console.log(source_default.gray("  "), source_default.green("\u25CF"), "Synced", source_default.yellow("\u25CB"), "Not in production", source_default.blue("+"), "New", source_default.red("-"), "Will be deleted");
   console.log();
-  console.log(source_default.gray("Run"), source_default.cyan("struere dev"), source_default.gray("to sync to development"));
+  console.log(source_default.gray("Run"), source_default.cyan("struere sync"), source_default.gray("to sync to development"));
   console.log(source_default.gray("Run"), source_default.cyan("struere deploy"), source_default.gray("to deploy to production"));
   console.log();
 });
@@ -22908,13 +23371,25 @@ function collectCustomTools(agents) {
 }
 
 // src/cli/commands/pull.ts
-var pullCommand = new Command("pull").description("Pull remote resources to local files").option("--force", "Overwrite existing local files").option("--env <environment>", "Environment to pull from", "development").option("--dry-run", "Show what would be written without writing").action(async (options) => {
+var pullCommand = new Command("pull").description("Pull remote resources to local files").option("--force", "Overwrite existing local files").option("--env <environment>", "Environment to pull from", "development").option("--dry-run", "Show what would be written without writing").option("--json", "Output raw JSON").action(async (options) => {
   const spinner = ora();
   const cwd = process.cwd();
-  console.log();
-  console.log(source_default.bold("Struere Pull"));
-  console.log();
+  const jsonMode = !!options.json;
+  const nonInteractive = !isInteractive2();
+  if (!jsonMode) {
+    console.log();
+    console.log(source_default.bold("Struere Pull"));
+    console.log();
+  }
   if (!hasProject(cwd)) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ error: "No struere.json found. Run struere init first." }));
+      } 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);
@@ -22925,15 +23400,29 @@ var pullCommand = new Command("pull").description("Pull remote resources to loca
   }
   const project = loadProject(cwd);
   if (!project) {
-    console.log(source_default.red("Failed to load struere.json"));
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: "Failed to load struere.json" }));
+    } else {
+      console.log(source_default.red("Failed to load struere.json"));
+    }
     process.exit(1);
   }
-  console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
-  console.log(source_default.gray("Environment:"), source_default.cyan(options.env));
-  console.log();
+  if (!jsonMode) {
+    console.log(source_default.gray("Organization:"), source_default.cyan(project.organization.name));
+    console.log(source_default.gray("Environment:"), source_default.cyan(options.env));
+    console.log();
+  }
   let credentials = loadCredentials();
   const apiKey = getApiKey();
   if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      if (jsonMode) {
+        console.log(JSON.stringify({ 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();
@@ -22943,16 +23432,23 @@ var pullCommand = new Command("pull").description("Pull remote resources to loca
     }
     console.log();
   }
-  spinner.start("Fetching remote state");
+  if (!jsonMode)
+    spinner.start("Fetching remote state");
   const environment = options.env;
   const { state, error } = await getPullState(project.organization.id, environment);
   if (error || !state) {
-    spinner.fail("Failed to fetch remote state");
-    console.log(source_default.red("Error:"), error || "Unknown error");
+    if (jsonMode) {
+      console.log(JSON.stringify({ error: error || "Failed to fetch remote state" }));
+    } else {
+      spinner.fail("Failed to fetch remote state");
+      console.log(source_default.red("Error:"), error || "Unknown error");
+    }
     process.exit(1);
   }
-  spinner.succeed("Remote state fetched");
-  console.log();
+  if (!jsonMode) {
+    spinner.succeed("Remote state fetched");
+    console.log();
+  }
   const created = [];
   const skipped = [];
   const ensureDir2 = (dir) => {
@@ -23031,6 +23527,14 @@ var pullCommand = new Command("pull").description("Pull remote resources to loca
     if (content)
       writeOrSkip("triggers/index.ts", content);
   }
+  if (options.json) {
+    console.log(JSON.stringify({
+      created,
+      skipped,
+      dryRun: !!options.dryRun
+    }));
+    return;
+  }
   if (options.dryRun) {
     console.log(source_default.cyan("Dry run - no files written"));
     console.log();
@@ -23054,7 +23558,7 @@ var pullCommand = new Command("pull").description("Pull remote resources to loca
     console.log();
   }
   if (!options.dryRun && created.length > 0) {
-    console.log(source_default.gray("Run"), source_default.cyan("struere dev"), source_default.gray("to sync changes"));
+    console.log(source_default.gray("Run"), source_default.cyan("struere sync"), source_default.gray("to sync changes"));
     console.log();
   }
 });
@@ -23229,7 +23733,12 @@ function deriveColumnsFromSchema(schema, displayConfig) {
 // src/cli/commands/entities.ts
 async function ensureAuth() {
   const cwd = process.cwd();
+  const nonInteractive = !isInteractive2();
   if (!hasProject(cwd)) {
+    if (nonInteractive) {
+      console.error(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);
@@ -23241,6 +23750,10 @@ async function ensureAuth() {
   let credentials = loadCredentials();
   const apiKey = getApiKey();
   if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      console.error(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();
@@ -23377,6 +23890,9 @@ entitiesCommand.command("create <type>").description("Create a new entity").opti
       console.log(source_default.red("Invalid JSON in --data"));
       process.exit(1);
     }
+  } else if (!isInteractive2()) {
+    console.log(source_default.red("--data <json> is required in non-interactive mode"));
+    process.exit(1);
   } else {
     spinner.start(`Fetching ${type} schema`);
     const { data: typeData, error: error2 } = await queryEntityTypeBySlug(type, env2);
@@ -23468,32 +23984,41 @@ entitiesCommand.command("update <id>").description("Update an entity").option("-
     console.log();
   }
 });
-entitiesCommand.command("delete <id>").description("Delete an entity").option("--env <environment>", "Environment (development|production)", "development").option("--yes", "Skip confirmation").action(async (id, opts) => {
+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 (id, opts) => {
   await ensureAuth();
   const spinner = ora();
   const env2 = opts.env;
-  spinner.start("Fetching entity");
+  const jsonMode = !!opts.json;
+  if (!jsonMode)
+    spinner.start("Fetching entity");
   const { data, error: fetchError } = await queryEntity(id, env2);
   if (fetchError || !data) {
-    spinner.fail("Failed to fetch entity");
-    console.log(source_default.red("Error:"), fetchError || "Entity not found");
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error: fetchError || "Entity not found" }));
+    } else {
+      spinner.fail("Failed to fetch entity");
+      console.log(source_default.red("Error:"), fetchError || "Entity not found");
+    }
     process.exit(1);
   }
-  spinner.succeed("Entity loaded");
+  if (!jsonMode)
+    spinner.succeed("Entity loaded");
   const result = data;
   const entity = result.entity;
   const entityType = result.entityType;
   const entityData = entity.data;
-  console.log();
-  console.log(source_default.bold(`  ${entityType.name}`), source_default.gray(`(${entity._id})`));
-  if (entityData) {
-    const preview = Object.entries(entityData).slice(0, 3);
-    for (const [key, value] of preview) {
-      console.log(`  ${source_default.gray(key + ":")} ${String(value ?? "")}`);
+  if (!jsonMode) {
+    console.log();
+    console.log(source_default.bold(`  ${entityType.name}`), source_default.gray(`(${entity._id})`));
+    if (entityData) {
+      const preview = Object.entries(entityData).slice(0, 3);
+      for (const [key, value] of preview) {
+        console.log(`  ${source_default.gray(key + ":")} ${String(value ?? "")}`);
+      }
     }
+    console.log();
   }
-  console.log();
-  if (!opts.yes) {
+  if (!opts.yes && !jsonMode && isInteractive2()) {
     const confirmed = await esm_default2({
       message: "Are you sure you want to delete this entity?",
       default: false
@@ -23503,15 +24028,24 @@ entitiesCommand.command("delete <id>").description("Delete an entity").option("-
       return;
     }
   }
-  spinner.start("Deleting entity");
+  if (!jsonMode)
+    spinner.start("Deleting entity");
   const { error } = await removeEntity(id, env2);
   if (error) {
-    spinner.fail("Failed to delete entity");
-    console.log(source_default.red("Error:"), error);
+    if (jsonMode) {
+      console.log(JSON.stringify({ success: false, error }));
+    } else {
+      spinner.fail("Failed to delete entity");
+      console.log(source_default.red("Error:"), error);
+    }
     process.exit(1);
   }
-  spinner.succeed("Entity deleted");
-  console.log();
+  if (jsonMode) {
+    console.log(JSON.stringify({ success: true, id }));
+  } else {
+    spinner.succeed("Entity 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) => {
   await ensureAuth();
@@ -23791,7 +24325,7 @@ ${turn.assistantResponse}
   }
   return md;
 }
-var runCommand = new Command("run").description("Run an eval suite").argument("<suite-slug>", "Eval suite slug to run").option("--case <name...>", "Run specific case(s) by name").option("--tag <tag...>", "Run cases matching tag(s)").action(async (suiteSlug, options) => {
+var runCommand = new Command("run").description("Run an eval suite").argument("<suite-slug>", "Eval suite slug to run").option("--case <name...>", "Run specific case(s) by name").option("--tag <tag...>", "Run cases matching tag(s)").option("--timeout <seconds>", "Max seconds to wait for results (default: 300)").action(async (suiteSlug, options) => {
   const spinner = ora();
   const cwd = process.cwd();
   console.log();
@@ -23925,6 +24459,9 @@ var runCommand = new Command("run").description("Run an eval suite").argument("<
     console.log(source_default.red("Failed to start run:"), error instanceof Error ? error.message : String(error));
     process.exit(1);
   }
+  console.log(source_default.gray("Run ID:"), source_default.cyan(runId));
+  const timeoutMs = (options.timeout ? parseInt(options.timeout, 10) : 300) * 1000;
+  const startTime = Date.now();
   spinner.start("Running...");
   let run = null;
   while (true) {
@@ -23937,6 +24474,11 @@ var runCommand = new Command("run").description("Run an eval suite").argument("<
     if (run.status === "completed" || run.status === "failed" || run.status === "cancelled") {
       break;
     }
+    if (Date.now() - startTime > timeoutMs) {
+      spinner.fail(`Timed out after ${options.timeout || 300}s \u2014 run is still in progress`);
+      console.log(source_default.gray("Run ID:"), source_default.cyan(runId));
+      process.exit(2);
+    }
     spinner.text = `Running: ${run.completedCases}/${run.totalCases} cases (${run.passedCases} passed, ${run.failedCases} failed)`;
   }
   const duration = run.totalDurationMs ? formatDuration(run.totalDurationMs) : "-";
@@ -24094,7 +24636,12 @@ async function getTemplateStatus(connectionId, env2, name) {
 // src/cli/commands/templates.ts
 async function ensureAuth2() {
   const cwd = process.cwd();
+  const nonInteractive = !isInteractive2();
   if (!hasProject(cwd)) {
+    if (nonInteractive) {
+      console.error(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);
@@ -24106,6 +24653,10 @@ async function ensureAuth2() {
   let credentials = loadCredentials();
   const apiKey = getApiKey();
   if (!credentials && !apiKey) {
+    if (nonInteractive) {
+      console.error(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();
@@ -24255,7 +24806,7 @@ templatesCommand.command("delete <name>").description("Delete a message template
   await ensureAuth2();
   const env2 = opts.env;
   const connectionId = await resolveConnectionId(env2, opts.connection);
-  if (!opts.yes) {
+  if (!opts.yes && isInteractive2()) {
     const confirmed = await esm_default2({
       message: `Delete template "${name}"? This cannot be undone.`,
       default: false
@@ -24314,7 +24865,7 @@ templatesCommand.command("status <name>").description("Check template approval s
 // package.json
 var package_default = {
   name: "struere",
-  version: "0.8.2",
+  version: "0.9.0",
   description: "Build, test, and deploy AI agents",
   keywords: [
     "ai",
@@ -24380,6 +24931,8 @@ var CURRENT_VERSION = package_default.version;
 async function checkForUpdates() {
   if (process.env.STRUERE_SKIP_UPDATE_CHECK)
     return;
+  if (process.env.STRUERE_API_KEY || !process.stdout.isTTY)
+    return;
   try {
     const response = await fetch("https://registry.npmjs.org/struere/latest", {
       signal: AbortSignal.timeout(2000)
@@ -24399,9 +24952,12 @@ async function checkForUpdates() {
           return 0;
         };
         if (semverCompare(data.version, CURRENT_VERSION) > 0) {
-          console.log(`\x1B[33m\u26A0 Update available: ${CURRENT_VERSION} \u2192 ${data.version}\x1B[0m`);
-          console.log(`\x1B[90m  Run: npm install -g struere@${data.version}\x1B[0m`);
-          console.log();
+          process.stderr.write(`\x1B[33m\u26A0 Update available: ${CURRENT_VERSION} \u2192 ${data.version}\x1B[0m
+`);
+          process.stderr.write(`\x1B[90m  Run: npm install -g struere@${data.version}\x1B[0m
+`);
+          process.stderr.write(`
+`);
         }
       }
     }
@@ -24413,6 +24969,7 @@ program.addCommand(initCommand);
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);
 program.addCommand(whoamiCommand);
+program.addCommand(syncCommand);
 program.addCommand(devCommand);
 program.addCommand(deployCommand);
 program.addCommand(addCommand);