@tolkbot/cli 0.2.0 → 0.3.0

package/dist/index.js

@@ -3650,8 +3650,8 @@ var require_utils3 = __commonJS({
     exports.array = array2;
     var errno = require_errno();
     exports.errno = errno;
-    var fs9 = require_fs();
-    exports.fs = fs9;
+    var fs10 = require_fs();
+    exports.fs = fs10;
     var path12 = require_path();
     exports.path = path12;
     var pattern = require_pattern();
@@ -3835,12 +3835,12 @@ var require_fs2 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createFileSystemAdapter = exports.FILE_SYSTEM_ADAPTER = void 0;
-    var fs9 = __require("fs");
+    var fs10 = __require("fs");
     exports.FILE_SYSTEM_ADAPTER = {
-      lstat: fs9.lstat,
-      stat: fs9.stat,
-      lstatSync: fs9.lstatSync,
-      statSync: fs9.statSync
+      lstat: fs10.lstat,
+      stat: fs10.stat,
+      lstatSync: fs10.lstatSync,
+      statSync: fs10.statSync
     };
     function createFileSystemAdapter(fsMethods) {
       if (fsMethods === void 0) {
@@ -3857,12 +3857,12 @@ var require_settings = __commonJS({
   "../../node_modules/.pnpm/@nodelib+fs.stat@2.0.5/node_modules/@nodelib/fs.stat/out/settings.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    var fs9 = require_fs2();
+    var fs10 = require_fs2();
     var Settings = class {
       constructor(_options = {}) {
         this._options = _options;
         this.followSymbolicLink = this._getValue(this._options.followSymbolicLink, true);
-        this.fs = fs9.createFileSystemAdapter(this._options.fs);
+        this.fs = fs10.createFileSystemAdapter(this._options.fs);
         this.markSymbolicLink = this._getValue(this._options.markSymbolicLink, false);
         this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
       }
@@ -4019,8 +4019,8 @@ var require_utils4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.fs = void 0;
-    var fs9 = require_fs3();
-    exports.fs = fs9;
+    var fs10 = require_fs3();
+    exports.fs = fs10;
   }
 });
 
@@ -4215,14 +4215,14 @@ var require_fs4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createFileSystemAdapter = exports.FILE_SYSTEM_ADAPTER = void 0;
-    var fs9 = __require("fs");
+    var fs10 = __require("fs");
     exports.FILE_SYSTEM_ADAPTER = {
-      lstat: fs9.lstat,
-      stat: fs9.stat,
-      lstatSync: fs9.lstatSync,
-      statSync: fs9.statSync,
-      readdir: fs9.readdir,
-      readdirSync: fs9.readdirSync
+      lstat: fs10.lstat,
+      stat: fs10.stat,
+      lstatSync: fs10.lstatSync,
+      statSync: fs10.statSync,
+      readdir: fs10.readdir,
+      readdirSync: fs10.readdirSync
     };
     function createFileSystemAdapter(fsMethods) {
       if (fsMethods === void 0) {
@@ -4241,12 +4241,12 @@ var require_settings2 = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     var path12 = __require("path");
     var fsStat = require_out();
-    var fs9 = require_fs4();
+    var fs10 = require_fs4();
     var Settings = class {
       constructor(_options = {}) {
         this._options = _options;
         this.followSymbolicLinks = this._getValue(this._options.followSymbolicLinks, false);
-        this.fs = fs9.createFileSystemAdapter(this._options.fs);
+        this.fs = fs10.createFileSystemAdapter(this._options.fs);
         this.pathSegmentSeparator = this._getValue(this._options.pathSegmentSeparator, path12.sep);
         this.stats = this._getValue(this._options.stats, false);
         this.throwErrorOnBrokenSymbolicLink = this._getValue(this._options.throwErrorOnBrokenSymbolicLink, true);
@@ -5628,16 +5628,16 @@ var require_settings4 = __commonJS({
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.DEFAULT_FILE_SYSTEM_ADAPTER = void 0;
-    var fs9 = __require("fs");
+    var fs10 = __require("fs");
     var os3 = __require("os");
     var CPU_COUNT = Math.max(os3.cpus().length, 1);
     exports.DEFAULT_FILE_SYSTEM_ADAPTER = {
-      lstat: fs9.lstat,
-      lstatSync: fs9.lstatSync,
-      stat: fs9.stat,
-      statSync: fs9.statSync,
-      readdir: fs9.readdir,
-      readdirSync: fs9.readdirSync
+      lstat: fs10.lstat,
+      lstatSync: fs10.lstatSync,
+      stat: fs10.stat,
+      statSync: fs10.statSync,
+      readdir: fs10.readdir,
+      readdirSync: fs10.readdirSync
     };
     var Settings = class {
       constructor(_options = {}) {
@@ -5784,114 +5784,41 @@ var require_out4 = __commonJS({
 });
 
 // src/main.ts
-import { Command as Command6 } from "commander";
+import { Command as Command6, CommanderError } from "commander";
 
 // package.json
-var version = "0.2.0";
+var version = "0.3.0";
 
 // src/commands/auth/index.ts
 import { Command } from "commander";
 import { z as z2 } from "zod/v4";
 
-// src/utils/validate-command.ts
-import { program } from "commander";
-function validateOrExit(schema, value) {
-  const res = schema.safeParse(value);
-  if (!res.success) {
-    const msg = res.error.issues.map((e) => `${e.path.join(".") || "(root)"}: ${e.message}`).join("\n");
-    program.error(`Invalid arguments:
-${msg}`);
-  }
-  return res.data;
-}
-
-// src/commands/auth/login.tsx
-import http from "http";
-import crypto from "crypto";
-import { Spinner } from "@inkjs/ui";
-import { Box, render, Text } from "ink";
-import open from "open";
-
-// src/lib/telemetry.ts
-import { randomUUID } from "crypto";
-import fs2 from "fs/promises";
-import os2 from "os";
-import path2 from "path";
-
-// ../shared/src/analytics/index.ts
-var ORGANIZATION_GROUP = "organization";
-var analyticsEventNames = [
-  "trial_started",
-  "project_created",
-  "project_page_viewed",
-  "github_connect_started",
-  "github_install_initiated",
-  "plan_change_initiated",
-  "credits_purchase_initiated",
-  "glossary_created",
-  "glossary_deleted",
-  "glossary_imported",
-  "translation_job_viewed",
-  "translation_logs_viewed",
-  "cli_login_completed",
-  "cli_command_completed",
-  "cli_init_completed",
-  "cli_translate_completed",
-  "cli_validate_completed",
-  "translation_job_started",
-  "translation_job_completed",
-  "translation_job_failed",
-  "pull_request_opened",
-  "pull_request_merged",
-  "pull_request_closed_unmerged",
-  "github_app_installed",
-  "github_app_uninstalled",
-  "repository_connected",
-  "subscription_started",
-  "subscription_plan_changed",
-  "subscription_canceled",
-  "trial_ended",
-  "credits_purchased",
-  "credits_exhausted",
-  "usage_limit_reached",
-  "cta_clicked",
-  "waitlist_joined",
-  "signed_up",
-  "signed_in",
-  "onboarding_step_completed",
-  "onboarding_completed",
-  "language_added",
-  "translation_edited",
-  "translation_bulk_retranslated",
-  "dashboard_translation_started",
-  "project_settings_changed",
-  "member_invited",
-  "feedback_submitted",
-  "analytics_smoke_tested"
-];
-var registeredNames = new Set(analyticsEventNames);
-
-// src/lib/telemetry.ts
-import { PostHog } from "posthog-node";
-
 // src/utils/errors.ts
 var CliError = class extends Error {
   hint;
   /** The message without the trailing hint. */
   baseMessage;
-  constructor(message, hint) {
+  code;
+  constructor(message, hint, code = "failed") {
     super(hint ? `${message} ${hint}` : message);
     this.name = "CliError";
     this.baseMessage = message;
     this.hint = hint;
+    this.code = code;
   }
 };
 var AuthError = class extends CliError {
-  constructor(message, hint) {
-    super(message, hint);
+  constructor(message, hint, code = "not_authenticated") {
+    super(message, hint, code);
     this.name = "AuthError";
   }
 };
+var UsageError = class extends CliError {
+  constructor(message, hint) {
+    super(message, hint, "usage");
+    this.name = "UsageError";
+  }
+};
 function describeError(error62) {
   if (error62 instanceof Error) return error62.message;
   if (typeof error62 === "string") return error62;
@@ -5912,30 +5839,114 @@ function isUnauthenticatedError(error62) {
     "Could not parse JWT"
   ].some((marker) => message.includes(marker));
 }
-function wantsJson(argv = process.argv) {
-  return argv.includes("--json");
+var NETWORK_ERROR_CODES = /* @__PURE__ */ new Set([
+  "ECONNREFUSED",
+  "ECONNRESET",
+  "ENOTFOUND",
+  "EAI_AGAIN",
+  "ETIMEDOUT",
+  "ENETUNREACH",
+  "EHOSTUNREACH",
+  "UND_ERR_CONNECT_TIMEOUT",
+  "UND_ERR_SOCKET"
+]);
+function isNetworkError(error62) {
+  for (let current = error62, depth = 0; current instanceof Error && depth < 4; current = current.cause, depth++) {
+    const code = current.code;
+    if (typeof code === "string" && NETWORK_ERROR_CODES.has(code)) {
+      return true;
+    }
+    if (current.name === "TypeError" && current.message === "fetch failed")
+      return true;
+  }
+  return false;
 }
-function reportFatal(error62) {
-  const isKnown = error62 instanceof CliError;
-  const message = isKnown ? error62.baseMessage : describeError(error62);
-  const hint = isKnown ? error62.hint : void 0;
-  if (wantsJson()) {
-    console.error(JSON.stringify({ error: message, hint }, null, 2));
-    process.exit(1);
+function noConfigError() {
+  return new CliError(
+    "No tolkbot.json found.",
+    "Run 'tolkbot init' to create one.",
+    "no_config"
+  );
+}
+function projectNotFoundError() {
+  return new CliError(
+    "Project not found.",
+    "Run 'tolkbot init' again to link this repository to a project.",
+    "project_not_found"
+  );
+}
+
+// src/utils/validate-command.ts
+function validateOrExit(schema, value) {
+  const res = schema.safeParse(value);
+  if (!res.success) {
+    const msg = res.error.issues.map((e) => `${e.path.join(".") || "(root)"}: ${e.message}`).join("; ");
+    throw new UsageError(`Invalid arguments: ${msg}`);
+  }
+  return res.data;
+}
+
+// src/commands/auth/login.tsx
+import http from "http";
+import crypto from "crypto";
+import { Spinner } from "@inkjs/ui";
+import { Box, render, Text } from "ink";
+import open from "open";
+
+// src/utils/env.ts
+import path from "path";
+import { fileURLToPath } from "url";
+import { createEnv } from "@t3-oss/env-core";
+import * as dotenv from "dotenv";
+import { z } from "zod/v4";
+var RELEASE_CONVEX_URL = "https://uncommon-monitor-462.convex.cloud"?.trim();
+var RELEASE_WEB_URL = "https://www.tolkbot.ai"?.trim();
+if (!RELEASE_CONVEX_URL) {
+  try {
+    const dir = path.dirname(fileURLToPath(import.meta.url));
+    dotenv.config({
+      path: path.resolve(dir, "../../../.env"),
+      quiet: true
+    });
+  } catch {
+  }
+}
+var env = createEnv({
+  server: {
+    // Optional here, required at the point of use: commands that never
+    // reach the backend (help, logout) must work without deployment config.
+    CONVEX_URL: z.url().optional(),
+    TOLKBOT_WEB_URL: z.url().default("http://localhost:3000")
+  },
+  runtimeEnv: {
+    CONVEX_URL: RELEASE_CONVEX_URL || process.env.CONVEX_URL,
+    TOLKBOT_WEB_URL: RELEASE_WEB_URL || process.env.TOLKBOT_WEB_URL
+  },
+  skipValidation: !!process.env.CI || process.env.npm_lifecycle_event === "lint",
+  onValidationError: (issues) => {
+    const details = issues.map((issue2) => {
+      const name = issue2.path?.join(".") ?? "(unknown)";
+      return `${name}: ${issue2.message}`;
+    }).join("\n  ");
+    throw new CliError(`Invalid configuration:
+  ${details}`);
   }
-  console.error(`\u2717 ${message}`);
-  if (hint) console.error(`  ${hint}`);
-  if (!isKnown && error62 instanceof Error && error62.stack) {
-    console.error("");
-    console.error(error62.stack);
+});
+function requireConvexUrl() {
+  if (!env.CONVEX_URL) {
+    throw new CliError(
+      "CONVEX_URL is not set, so the CLI cannot reach the TolkBot backend.",
+      "Set CONVEX_URL to your TolkBot deployment URL.",
+      "network"
+    );
   }
-  process.exit(1);
+  return env.CONVEX_URL;
 }
 
 // src/utils/token.ts
 import fs from "fs/promises";
 import os from "os";
-import path from "path";
+import path2 from "path";
 var TOKEN_ENV_VAR = "TOLKBOT_TOKEN";
 var EXPIRY_SKEW_SECONDS = 30;
 var tokenOverride = null;
@@ -5947,11 +5958,11 @@ function setTokenOverride(token) {
   tokenOverride = token?.trim() ? token.trim() : null;
 }
 function getTokenPath() {
-  return path.join(os.homedir(), ".tolkbot", "token");
+  return path2.join(os.homedir(), ".tolkbot", "token");
 }
 async function saveToken(token) {
   const file2 = getTokenPath();
-  await fs.mkdir(path.dirname(file2), { recursive: true, mode: 448 });
+  await fs.mkdir(path2.dirname(file2), { recursive: true, mode: 448 });
   await fs.writeFile(file2, token, { mode: 384 });
 }
 async function loadToken() {
@@ -6043,274 +6054,48 @@ function reauthHint(source) {
   }
 }
 
-// src/lib/telemetry.ts
-var TELEMETRY_ENV_VAR = "TOLKBOT_TELEMETRY";
-var DO_NOT_TRACK_ENV_VAR = "DO_NOT_TRACK";
-var POSTHOG_HOST = "https://eu.i.posthog.com";
-var FLUSH_TIMEOUT_MS = 1e3;
-var OFF_VALUES = /* @__PURE__ */ new Set(["0", "false", "off", "no"]);
-var ON_VALUES = /* @__PURE__ */ new Set(["1", "true", "on", "yes"]);
-function readEnv(name) {
-  return process.env[name]?.trim();
-}
-function projectKey() {
-  const key = "phc_uSMLUC9D7bHeaHFAosnoDzBj6DY5uzLcCQkXZxzj0mQ"?.trim();
-  if (!key) return void 0;
-  return key;
-}
-function environment() {
-  const nodeEnv = process.env.NODE_ENV;
-  return nodeEnv === "development" || nodeEnv === "test" ? nodeEnv : "production";
-}
-function inCi() {
-  return Boolean(process.env.CI);
-}
-function getTelemetryDir() {
-  return path2.join(os2.homedir(), ".tolkbot");
-}
-function getPreferencePath() {
-  return path2.join(getTelemetryDir(), "telemetry");
-}
-function getAnonymousIdPath() {
-  return path2.join(getTelemetryDir(), "anonymous-id");
-}
-async function readFileOrNull(file2) {
-  try {
-    return (await fs2.readFile(file2, "utf-8")).trim() || null;
-  } catch {
-    return null;
-  }
-}
-async function writePrivateFile(file2, content) {
-  await fs2.mkdir(path2.dirname(file2), { recursive: true, mode: 448 });
-  await fs2.writeFile(file2, content, { mode: 384 });
-}
-async function telemetryState() {
-  const envValue = readEnv(TELEMETRY_ENV_VAR)?.toLowerCase();
-  if (envValue !== void 0 && OFF_VALUES.has(envValue)) {
-    return { enabled: false, reason: "env" };
-  }
-  const doNotTrack = readEnv(DO_NOT_TRACK_ENV_VAR)?.toLowerCase();
-  if (doNotTrack !== void 0 && ON_VALUES.has(doNotTrack)) {
-    return { enabled: false, reason: "do-not-track" };
-  }
-  const preference = (await readFileOrNull(getPreferencePath()))?.toLowerCase();
-  if (preference !== void 0 && OFF_VALUES.has(preference)) {
-    return { enabled: false, reason: "preference" };
-  }
-  if (!projectKey()) {
-    return { enabled: false, reason: "no-key" };
+// src/commands/auth/login.tsx
+import { jsx, jsxs } from "react/jsx-runtime";
+var CALLBACK_PORTS = [3003, 3013, 3023, 3033, 3043];
+var LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
+function generateVerificationCode() {
+  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
+  let code = "";
+  for (let i = 0; i < 8; i++) {
+    code += chars.charAt(crypto.randomInt(chars.length));
   }
-  return { enabled: true, reason: "default" };
+  return code;
 }
-async function setTelemetryPreference(enabled) {
-  await writePrivateFile(getPreferencePath(), enabled ? "on\n" : "off\n");
+function respond(res, status, body) {
+  res.writeHead(status, { "Content-Type": "text/html" });
+  res.end(`
+        <!DOCTYPE html>
+        <html>
+        <head><title>TolkBot CLI</title></head>
+        <body style="font-family: system-ui; text-align: center; padding: 50px;">
+            ${body}
+        </body>
+        </html>
+    `);
 }
-function decodeTokenSubject(token) {
-  const payload = token.split(".")[1];
-  if (!payload) return null;
-  try {
-    const json2 = Buffer.from(payload, "base64url").toString("utf-8");
-    const claims = JSON.parse(json2);
-    if (typeof claims === "object" && claims !== null && "sub" in claims && typeof claims.sub === "string") {
-      return claims.sub;
-    }
-  } catch {
-  }
-  return null;
-}
-async function resolveDistinctId() {
-  const resolved = await resolveToken();
-  const subject = resolved ? decodeTokenSubject(resolved.token) : null;
-  if (subject) return subject;
-  const file2 = getAnonymousIdPath();
-  const existing = await readFileOrNull(file2);
-  if (existing) return existing;
-  const generated = randomUUID();
-  try {
-    await writePrivateFile(file2, `${generated}
-`);
-  } catch {
-  }
-  return generated;
-}
-var organizationId = null;
-function setTelemetryOrganization(id) {
-  organizationId = id;
-}
-var client = null;
-function getClient(key) {
-  client ??= new PostHog(key, {
-    host: POSTHOG_HOST,
-    // A CLI process is short-lived: send each event as it happens
-    // rather than batching for a flush that may never come.
-    flushAt: 1,
-    flushInterval: 0,
-    requestTimeout: FLUSH_TIMEOUT_MS,
-    // No IP-derived location on CLI events. The privacy policy lists
-    // exactly what the CLI reports, and location is not on it.
-    disableGeoip: true
-  });
-  return client;
-}
-var inFlight = /* @__PURE__ */ new Set();
-async function send(event, properties) {
-  const state = await telemetryState();
-  if (!state.enabled) return;
-  const key = projectKey();
-  if (!key) return;
-  const distinctId = await resolveDistinctId();
-  await getClient(key).captureImmediate({
-    distinctId,
-    event,
-    properties: { ...properties, environment: environment() },
-    groups: organizationId ? { [ORGANIZATION_GROUP]: organizationId } : void 0
-  });
-}
-function track(event, properties) {
-  const attempt = send(event, properties).catch(() => void 0);
-  inFlight.add(attempt);
-  void attempt.finally(() => inFlight.delete(attempt));
-}
-async function flushTelemetry(timeoutMs = FLUSH_TIMEOUT_MS) {
-  if (inFlight.size === 0 && !client) return;
-  const deadline = new Promise((resolve) => {
-    const timer = setTimeout(resolve, timeoutMs);
-    timer.unref();
-  });
-  await Promise.race([Promise.allSettled([...inFlight]), deadline]);
-  if (client) {
-    const closing = client.shutdown(timeoutMs).catch(() => void 0);
-    client = null;
-    await Promise.race([closing, deadline]);
-  }
-}
-function runtimeProperties(cliVersion) {
-  return {
-    cli_version: cliVersion,
-    node_version: process.version,
-    platform: process.platform,
-    ci: inCi()
-  };
-}
-var activeCommand = null;
-function beginCommand(path12, cliVersion) {
-  activeCommand = {
-    path: path12,
-    startedAt: Date.now(),
-    cliVersion,
-    reported: false
-  };
-}
-function completeCommand(exitCode) {
-  if (!activeCommand || activeCommand.reported) return;
-  activeCommand.reported = true;
-  track("cli_command_completed", {
-    command: activeCommand.path,
-    success: exitCode === 0,
-    exit_code: exitCode,
-    duration_ms: Date.now() - activeCommand.startedAt,
-    json: wantsJson(),
-    ...runtimeProperties(activeCommand.cliVersion)
-  });
-}
-async function exitAfterFlush(code) {
-  completeCommand(code);
-  await flushTelemetry();
-  process.exit(code);
-}
-
-// src/utils/env.ts
-import path3 from "path";
-import { fileURLToPath } from "url";
-import { createEnv } from "@t3-oss/env-core";
-import * as dotenv from "dotenv";
-import { z } from "zod/v4";
-var RELEASE_CONVEX_URL = "https://uncommon-monitor-462.convex.cloud"?.trim();
-var RELEASE_WEB_URL = "https://www.tolkbot.ai"?.trim();
-if (!RELEASE_CONVEX_URL) {
-  try {
-    const dir = path3.dirname(fileURLToPath(import.meta.url));
-    dotenv.config({
-      path: path3.resolve(dir, "../../../.env"),
-      quiet: true
-    });
-  } catch {
-  }
-}
-var env = createEnv({
-  server: {
-    // Optional here, required at the point of use: commands that never
-    // reach the backend (help, logout) must work without deployment config.
-    CONVEX_URL: z.url().optional(),
-    TOLKBOT_WEB_URL: z.url().default("http://localhost:3000")
-  },
-  runtimeEnv: {
-    CONVEX_URL: RELEASE_CONVEX_URL || process.env.CONVEX_URL,
-    TOLKBOT_WEB_URL: RELEASE_WEB_URL || process.env.TOLKBOT_WEB_URL
-  },
-  skipValidation: !!process.env.CI || process.env.npm_lifecycle_event === "lint",
-  onValidationError: (issues) => {
-    const details = issues.map((issue2) => {
-      const name = issue2.path?.join(".") ?? "(unknown)";
-      return `${name}: ${issue2.message}`;
-    }).join("\n  ");
-    throw new CliError(`Invalid configuration:
-  ${details}`);
-  }
-});
-function requireConvexUrl() {
-  if (!env.CONVEX_URL) {
-    throw new CliError(
-      "CONVEX_URL is not set, so the CLI cannot reach the TolkBot backend.",
-      "Set CONVEX_URL to your TolkBot deployment URL."
-    );
-  }
-  return env.CONVEX_URL;
-}
-
-// src/commands/auth/login.tsx
-import { jsx, jsxs } from "react/jsx-runtime";
-var CALLBACK_PORTS = [3003, 3013, 3023, 3033, 3043];
-var LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
-function generateVerificationCode() {
-  const chars = "ABCDEFGHJKLMNPQRSTUVWXYZ23456789";
-  let code = "";
-  for (let i = 0; i < 8; i++) {
-    code += chars.charAt(crypto.randomInt(chars.length));
-  }
-  return code;
-}
-function respond(res, status, body) {
-  res.writeHead(status, { "Content-Type": "text/html" });
-  res.end(`
-        <!DOCTYPE html>
-        <html>
-        <head><title>TolkBot CLI</title></head>
-        <body style="font-family: system-ui; text-align: center; padding: 50px;">
-            ${body}
-        </body>
-        </html>
-    `);
-}
-async function startCallbackServer(expectedCode) {
-  let settle2;
-  const settled = new Promise((resolve) => {
-    settle2 = resolve;
-  });
-  const server = http.createServer((req, res) => {
-    if (!req.url?.startsWith("/callback")) return;
-    const url2 = new URL(req.url, "http://localhost");
-    const token2 = url2.searchParams.get("token");
-    const returnedCode = url2.searchParams.get("code");
-    if (!token2) {
-      respond(
-        res,
-        400,
-        "<h1>Authentication failed</h1><p>No token received. Please try again.</p>"
-      );
-      settle2({ error: new Error("No token received from browser") });
-      return;
+async function startCallbackServer(expectedCode) {
+  let settle2;
+  const settled = new Promise((resolve) => {
+    settle2 = resolve;
+  });
+  const server = http.createServer((req, res) => {
+    if (!req.url?.startsWith("/callback")) return;
+    const url2 = new URL(req.url, "http://localhost");
+    const token2 = url2.searchParams.get("token");
+    const returnedCode = url2.searchParams.get("code");
+    if (!token2) {
+      respond(
+        res,
+        400,
+        "<h1>Authentication failed</h1><p>No token received. Please try again.</p>"
+      );
+      settle2({ error: new Error("No token received from browser") });
+      return;
     }
     if (returnedCode !== expectedCode) {
       respond(
@@ -6404,22 +6189,16 @@ function LoginUI({ state }) {
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "Confirm this code matches the one shown in your browser" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs(Box, { children: [
-        /* @__PURE__ */ jsx(Text, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsx(Text, { children: " Successfully authenticated!" })
-      ] }),
-      /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-        "Token saved to ",
-        getTokenPath()
-      ] }) }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: validityNote(state.expiresAt) })
-    ] });
-  }
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx(Text, { color: "red", children: "\u2717 Authentication failed" }),
-    /* @__PURE__ */ jsx(Text, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs(Box, { children: [
+      /* @__PURE__ */ jsx(Text, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsx(Text, { children: " Successfully authenticated!" })
+    ] }),
+    /* @__PURE__ */ jsx(Box, { marginTop: 1, children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      "Token saved to ",
+      getTokenPath()
+    ] }) }),
+    /* @__PURE__ */ jsx(Text, { dimColor: true, children: validityNote(state.expiresAt) })
   ] });
 }
 async function runPlainLogin(opts, verificationCode) {
@@ -6440,12 +6219,17 @@ async function runPlainLogin(opts, verificationCode) {
     console.log(validityNote(decodeTokenExpiry(token)));
   } catch (error62) {
     server?.close();
-    console.error(
-      `Authentication failed: ${error62 instanceof Error ? error62.message : String(error62)}`
-    );
-    return exitAfterFlush(1);
+    throw loginFailed(error62);
   }
 }
+function loginFailed(error62) {
+  if (error62 instanceof CliError) return error62;
+  return new CliError(
+    `Authentication failed: ${error62 instanceof Error ? error62.message : String(error62)}`,
+    "Run 'tolkbot auth login' again.",
+    "login_failed"
+  );
+}
 function loginUrl(port, verificationCode) {
   return `${env.TOLKBOT_WEB_URL}/cli/login/confirm?port=${port}&code=${verificationCode}`;
 }
@@ -6493,19 +6277,7 @@ async function runAuthLogin(opts = {}) {
   } catch (error62) {
     server?.close();
     unmount();
-    const errorUi = render(
-      /* @__PURE__ */ jsx(
-        LoginUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await errorUi.waitUntilExit();
-    return exitAfterFlush(1);
+    throw loginFailed(error62);
   }
 }
 
@@ -6541,10 +6313,10 @@ function readProperty(candidate, key) {
 // src/lib/convex-client.ts
 import { ConvexHttpClient } from "convex/browser";
 var BACKEND_METHODS = /* @__PURE__ */ new Set(["query", "mutation", "action"]);
-var client2 = null;
+var client = null;
 function getConvexClient() {
-  client2 ??= new ConvexHttpClient(requireConvexUrl());
-  return client2;
+  client ??= new ConvexHttpClient(requireConvexUrl());
+  return client;
 }
 function translateAuthError(error62, resolved) {
   const signedOut = findCliSignedOut(error62);
@@ -6552,13 +6324,15 @@ function translateAuthError(error62, resolved) {
     const at = new Date(signedOut.signedOutAt).toLocaleString();
     return new AuthError(
       `These credentials were signed out on ${at} (from ${describeTokenSource(resolved.source)}).`,
-      reauthHint(resolved.source)
+      reauthHint(resolved.source),
+      "signed_out"
     );
   }
   if (!isUnauthenticatedError(error62)) return error62;
   return new AuthError(
     `Your token was rejected (from ${describeTokenSource(resolved.source)}). It may be revoked, malformed, or issued for a different deployment.`,
-    reauthHint(resolved.source)
+    reauthHint(resolved.source),
+    "token_rejected"
   );
 }
 function withAuthErrors(target, resolved) {
@@ -6590,7 +6364,6 @@ function warnOnceIfExpiringSoon(resolved) {
   console.error(warning);
 }
 async function getAuthenticatedConvexClient() {
-  const convexClient = getConvexClient();
   const resolved = await resolveToken();
   if (!resolved) {
     throw new AuthError(
@@ -6602,9 +6375,11 @@ async function getAuthenticatedConvexClient() {
     const expiredAt = resolved.expiresAt ? new Date(resolved.expiresAt * 1e3).toLocaleString() : "an unknown time";
     throw new AuthError(
       `Your token expired at ${expiredAt} (from ${describeTokenSource(resolved.source)}).`,
-      reauthHint(resolved.source)
+      reauthHint(resolved.source),
+      "token_expired"
     );
   }
+  const convexClient = getConvexClient();
   warnOnceIfExpiringSoon(resolved);
   convexClient.setAuth(resolved.token);
   return withAuthErrors(convexClient, resolved);
@@ -6637,11 +6412,6 @@ function jsonSuccess(data) {
     console.log(JSON.stringify(data, null, 2));
   });
 }
-function jsonError(message) {
-  throw requestExit(1, () => {
-    console.error(JSON.stringify({ error: message }, null, 2));
-  });
-}
 function jsonResult(data, exitCode) {
   console.log(JSON.stringify(data, null, 2));
   process.exitCode = exitCode;
@@ -6657,12 +6427,6 @@ function stillValidNote(expiresAt) {
   return `The token stays valid anywhere else it was copied ${until}. Run 'tolkbot auth logout --all' to sign out every CLI session.`;
 }
 function LogoutUI({ state }) {
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx2(Text2, { color: "red", children: "\u2717 Logout failed" }),
-      /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: state.message })
-    ] });
-  }
   const signedOutAll = state.signedOutAt !== null;
   let headline = state.hadToken ? " Successfully logged out!" : " Already logged out.";
   if (signedOutAll) headline = " Signed out every CLI session.";
@@ -6697,58 +6461,77 @@ async function signOutAllCliSessions() {
   return signedOutAt;
 }
 async function runAuthLogout(opts = {}) {
-  try {
-    const signedOutAt = opts.all ? await signOutAllCliSessions() : null;
-    const stored = await loadToken();
-    const hadToken = stored !== null;
-    const removedTokenExpiresAt = stored ? decodeTokenExpiry(stored) : null;
-    await deleteToken();
-    const envTokenStillSet = hasEnvToken();
-    if (opts.json) {
-      const warnings = [
-        ...signedOutAt === null && hadToken ? [stillValidNote(removedTokenExpiresAt)] : [],
-        ...envTokenStillSet ? [
-          signedOutAt === null ? `$${TOKEN_ENV_VAR} is still set and takes precedence over ${getTokenPath()}.` : `$${TOKEN_ENV_VAR} is still set; it was signed out too, so remove it.`
-        ] : []
-      ];
-      jsonSuccess({
-        loggedOut: true,
-        hadStoredToken: hadToken,
-        envTokenStillSet,
-        signedOutAllCliSessions: signedOutAt !== null,
-        ...signedOutAt !== null ? { signedOutAt: new Date(signedOutAt).toISOString() } : {},
-        ...warnings.length > 0 ? { warning: warnings.join(" ") } : {}
-      });
-    }
-    const ui = render2(
-      /* @__PURE__ */ jsx2(
-        LogoutUI,
-        {
-          state: {
-            type: "success",
-            hadToken,
-            envTokenStillSet,
-            removedTokenExpiresAt,
-            signedOutAt
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-  } catch (error62) {
-    const message = error62 instanceof Error ? error62.message : String(error62);
-    if (opts.json) {
-      jsonError(message);
-    }
-    const ui = render2(/* @__PURE__ */ jsx2(LogoutUI, { state: { type: "error", message } }));
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
+  const signedOutAt = opts.all ? await signOutAllCliSessions() : null;
+  const stored = await loadToken();
+  const hadToken = stored !== null;
+  const removedTokenExpiresAt = stored ? decodeTokenExpiry(stored) : null;
+  await deleteToken();
+  const envTokenStillSet = hasEnvToken();
+  if (opts.json) {
+    const warnings = [
+      ...signedOutAt === null && hadToken ? [stillValidNote(removedTokenExpiresAt)] : [],
+      ...envTokenStillSet ? [
+        signedOutAt === null ? `$${TOKEN_ENV_VAR} is still set and takes precedence over ${getTokenPath()}.` : `$${TOKEN_ENV_VAR} is still set; it was signed out too, so remove it.`
+      ] : []
+    ];
+    jsonSuccess({
+      loggedOut: true,
+      hadStoredToken: hadToken,
+      envTokenStillSet,
+      signedOutAllCliSessions: signedOutAt !== null,
+      ...signedOutAt !== null ? { signedOutAt: new Date(signedOutAt).toISOString() } : {},
+      ...warnings.length > 0 ? { warning: warnings.join(" ") } : {}
+    });
   }
+  render2(
+    /* @__PURE__ */ jsx2(
+      LogoutUI,
+      {
+        state: {
+          type: "success",
+          hadToken,
+          envTokenStillSet,
+          removedTokenExpiresAt,
+          signedOutAt
+        }
+      }
+    )
+  ).unmount();
 }
 
 // src/commands/auth/whoami.tsx
 import { Spinner as Spinner2 } from "@inkjs/ui";
-import { Box as Box3, render as render3, Text as Text3 } from "ink";
+import { Box as Box3, render as render4, Text as Text3 } from "ink";
+
+// src/utils/terminal.ts
+import { render as render3 } from "ink";
+function isInteractive() {
+  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+}
+var jsonOutput = null;
+function setJsonOutput(value) {
+  jsonOutput = value;
+}
+function wantsJson(argv = process.argv) {
+  if (jsonOutput !== null) return jsonOutput;
+  if (argv.includes("--no-json")) return false;
+  if (argv.includes("--json")) return true;
+  return !isInteractive();
+}
+function resolveJson(flag) {
+  return flag ?? !isInteractive();
+}
+var NOTHING = {
+  unmount: () => void 0,
+  rerender: (_node) => void 0,
+  waitUntilExit: () => Promise.resolve()
+};
+function renderTransient(node2) {
+  if (!isInteractive()) return NOTHING;
+  return render3(node2);
+}
+
+// src/commands/auth/whoami.tsx
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 function formatExpiry(expiresAt) {
   if (expiresAt === null) return "unknown";
@@ -6766,118 +6549,73 @@ function WhoamiUI({ state }) {
       /* @__PURE__ */ jsx3(Text3, { children: " Checking authentication\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs3(Box3, { children: [
-        /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u250C " }),
-        /* @__PURE__ */ jsx3(Text3, { children: " Credentials " }),
-        /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: describeTokenSource(state.resolved.source) })
-      ] }),
-      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2502" }),
-      /* @__PURE__ */ jsxs3(Box3, { children: [
-        /* @__PURE__ */ jsx3(Text3, { color: "green", children: "\u25CF " }),
-        /* @__PURE__ */ jsx3(Text3, { children: " Logged in as " }),
-        /* @__PURE__ */ jsx3(Text3, { bold: true, color: "yellow", children: state.email })
-      ] }),
-      /* @__PURE__ */ jsxs3(Box3, { children: [
-        /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2502 " }),
-        /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
-          " ",
-          describeExpiry(state.resolved)
-        ] })
-      ] }),
-      /* @__PURE__ */ jsxs3(Box3, { children: [
-        /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2514 " }),
-        /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2713" })
-      ] })
-    ] });
-  }
-  if (state.type === "not-logged-in") {
-    return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u26A0 Not logged in" }),
+  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs3(Box3, { children: [
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u250C " }),
+      /* @__PURE__ */ jsx3(Text3, { children: " Credentials " }),
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: describeTokenSource(state.resolved.source) })
+    ] }),
+    /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2502" }),
+    /* @__PURE__ */ jsxs3(Box3, { children: [
+      /* @__PURE__ */ jsx3(Text3, { color: "green", children: "\u25CF " }),
+      /* @__PURE__ */ jsx3(Text3, { children: " Logged in as " }),
+      /* @__PURE__ */ jsx3(Text3, { bold: true, color: "yellow", children: state.email })
+    ] }),
+    /* @__PURE__ */ jsxs3(Box3, { children: [
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2502 " }),
       /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
-        "Run ",
-        /* @__PURE__ */ jsx3(Text3, { bold: true, children: "tolkbot auth login" }),
-        ", or set $",
-        TOKEN_ENV_VAR,
-        " for CI."
+        " ",
+        describeExpiry(state.resolved)
       ] })
-    ] });
-  }
-  if (state.type === "expired") {
-    return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx3(Text3, { color: "yellow", children: "\u26A0 Token expired" }),
-      /* @__PURE__ */ jsxs3(Text3, { dimColor: true, children: [
-        "From ",
-        describeTokenSource(state.resolved.source),
-        ", expired",
-        " ",
-        formatExpiry(state.resolved.expiresAt)
-      ] }),
-      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: reauthHint(state.resolved.source) })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx3(Text3, { color: "red", children: "\u2717 Failed to read authentication" }),
-    /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: state.message })
+    ] }),
+    /* @__PURE__ */ jsxs3(Box3, { children: [
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2514 " }),
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "\u2713" })
+    ] })
   ] });
 }
-async function renderAndExit(state, exitCode) {
-  const ui = render3(/* @__PURE__ */ jsx3(WhoamiUI, { state }));
-  await ui.waitUntilExit();
-  return exitAfterFlush(exitCode);
-}
 async function runAuthWhoami(opts = {}) {
   const resolved = await resolveToken();
   if (!resolved) {
-    if (opts.json) {
-      jsonError("Not authenticated.");
-    }
-    return renderAndExit({ type: "not-logged-in" }, 1);
+    throw new AuthError(
+      "Not logged in.",
+      `Run 'tolkbot auth login', or set $${TOKEN_ENV_VAR} for CI.`
+    );
   }
   if (isTokenExpired(resolved)) {
-    if (opts.json) {
-      jsonError(
-        `Token from ${describeTokenSource(resolved.source)} expired at ${formatExpiry(resolved.expiresAt)}.`
-      );
-    }
-    return renderAndExit({ type: "expired", resolved }, 1);
+    throw new AuthError(
+      `Your token (from ${describeTokenSource(resolved.source)}) expired at ${formatExpiry(resolved.expiresAt)}.`,
+      reauthHint(resolved.source),
+      "token_expired"
+    );
   }
-  const spinner = opts.json ? null : render3(/* @__PURE__ */ jsx3(WhoamiUI, { state: { type: "loading" } }));
-  const unmount = () => spinner?.unmount();
+  const spinner = opts.json ? null : renderTransient(/* @__PURE__ */ jsx3(WhoamiUI, { state: { type: "loading" } }));
+  let email3;
   try {
     const convexClient = await getAuthenticatedConvexClient();
     const user = await convexClient.query(api.users.current, {});
     if (!user) {
-      unmount();
-      if (opts.json) {
-        jsonError("Token is valid but no matching user was found.");
-      }
-      return renderAndExit({ type: "not-logged-in" }, 1);
-    }
-    unmount();
-    if (opts.json) {
-      jsonSuccess({
-        authenticated: true,
-        email: user.email,
-        tokenSource: resolved.source,
-        tokenPath: getTokenPath(),
-        expiresAt: resolved.expiresAt ? new Date(resolved.expiresAt * 1e3).toISOString() : null,
-        expiresInSeconds: expiresInSeconds(resolved)
-      });
-    }
-    return renderAndExit(
-      { type: "success", email: user.email, resolved },
-      0
-    );
-  } catch (error62) {
-    unmount();
-    const message = error62 instanceof Error ? error62.message : String(error62);
-    if (opts.json) {
-      jsonError(message);
+      throw new AuthError(
+        "Your token is valid, but TolkBot has no user for it.",
+        reauthHint(resolved.source),
+        "token_rejected"
+      );
     }
-    return renderAndExit({ type: "error", message }, 1);
+    email3 = user.email;
+  } finally {
+    spinner?.unmount();
+  }
+  if (opts.json) {
+    jsonSuccess({
+      authenticated: true,
+      email: email3,
+      tokenSource: resolved.source,
+      tokenPath: getTokenPath(),
+      expiresAt: resolved.expiresAt ? new Date(resolved.expiresAt * 1e3).toISOString() : null,
+      expiresInSeconds: expiresInSeconds(resolved)
+    });
   }
+  render4(/* @__PURE__ */ jsx3(WhoamiUI, { state: { type: "success", email: email3, resolved } })).unmount();
 }
 
 // src/commands/auth/index.ts
@@ -6918,15 +6656,15 @@ import { z as z4 } from "zod/v4";
 
 // src/commands/glossary/create.tsx
 import { Spinner as Spinner3 } from "@inkjs/ui";
-import { Box as Box4, render as render4, Text as Text4 } from "ink";
+import { Box as Box4, render as render5, Text as Text4 } from "ink";
 
 // ../config/dist/index.js
-import * as fs3 from "fs";
-import * as path4 from "path";
+import * as fs2 from "fs";
+import * as path3 from "path";
 import * as fs22 from "fs";
 import * as path22 from "path";
 import { execSync } from "child_process";
-import * as fs32 from "fs/promises";
+import * as fs3 from "fs/promises";
 import * as path32 from "path";
 var __defProp2 = Object.defineProperty;
 var __export = (target, all) => {
@@ -6934,12 +6672,12 @@ var __export = (target, all) => {
     __defProp2(target, name, { get: all[name], enumerable: true });
 };
 function readJSON(p) {
-  return JSON.parse(fs3.readFileSync(p, "utf-8"));
+  return JSON.parse(fs2.readFileSync(p, "utf-8"));
 }
 function readPackageDeps(cwd) {
   try {
-    const pkgPath = path4.join(cwd, "package.json");
-    if (!fs3.existsSync(pkgPath)) return {};
+    const pkgPath = path3.join(cwd, "package.json");
+    if (!fs2.existsSync(pkgPath)) return {};
     const pkg = readJSON(pkgPath);
     return { ...pkg.dependencies ?? {}, ...pkg.devDependencies ?? {} };
   } catch {
@@ -6950,8 +6688,8 @@ function hasPackage(deps, name) {
   return name in deps;
 }
 function detectPackageManager(cwd) {
-  if (fs3.existsSync(path4.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (fs3.existsSync(path4.join(cwd, "yarn.lock"))) return "yarn";
+  if (fs2.existsSync(path3.join(cwd, "pnpm-lock.yaml"))) return "pnpm";
+  if (fs2.existsSync(path3.join(cwd, "yarn.lock"))) return "yarn";
   return "npm";
 }
 function tryReadNextI18n(cwd) {
@@ -6961,12 +6699,12 @@ function tryReadNextI18n(cwd) {
     "next.config.cjs",
     "next.config.ts",
     "next.config.mts"
-  ].map((f) => path4.join(cwd, f));
+  ].map((f) => path3.join(cwd, f));
   const res = {};
   for (const f of files) {
-    if (!fs3.existsSync(f)) continue;
+    if (!fs2.existsSync(f)) continue;
     try {
-      const txt = fs3.readFileSync(f, "utf-8");
+      const txt = fs2.readFileSync(f, "utf-8");
       const locMatch = txt.match(/locales\s*:\s*\[([\s\S]*?)\]/m);
       if (locMatch) {
         const arr = Array.from(
@@ -6986,14 +6724,14 @@ function tryReadNextI18n(cwd) {
 }
 function listSubdirs(p) {
   try {
-    return fs3.readdirSync(p, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
+    return fs2.readdirSync(p, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
   } catch {
     return [];
   }
 }
 function listJSONFiles(p) {
   try {
-    return fs3.readdirSync(p, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".json")).map((e) => e.name);
+    return fs2.readdirSync(p, { withFileTypes: true }).filter((e) => e.isFile() && e.name.endsWith(".json")).map((e) => e.name);
   } catch {
     return [];
   }
@@ -7025,13 +6763,13 @@ function detectProject(cwd) {
   const hasVue = hasPackage(deps, "vue");
   const hasExpo = hasPackage(deps, "expo");
   if (hasNext) {
-    const hasAppDir = fs3.existsSync(path4.join(cwd, "app"));
-    const hasPagesDir = fs3.existsSync(path4.join(cwd, "pages"));
+    const hasAppDir = fs2.existsSync(path3.join(cwd, "app"));
+    const hasPagesDir = fs2.existsSync(path3.join(cwd, "pages"));
     projectType = hasAppDir ? "next-app" : hasPagesDir ? "next-pages" : "next-app";
   } else if (hasExpo) {
     projectType = "expo";
   } else if (hasReact) {
-    const hasViteConfig = fs3.existsSync(path4.join(cwd, "vite.config.js")) || fs3.existsSync(path4.join(cwd, "vite.config.ts"));
+    const hasViteConfig = fs2.existsSync(path3.join(cwd, "vite.config.js")) || fs2.existsSync(path3.join(cwd, "vite.config.ts"));
     projectType = hasViteConfig ? "react-vite" : "react-cra";
   } else if (hasVue) {
     projectType = "vue";
@@ -7063,36 +6801,36 @@ function detectFromRepo(cwd) {
     out.framework = "i18next";
   }
   const candidates = [
-    path4.join(cwd, "messages"),
+    path3.join(cwd, "messages"),
     // next-intl pattern
-    path4.join(cwd, "locales"),
-    path4.join(cwd, "public", "locales"),
+    path3.join(cwd, "locales"),
+    path3.join(cwd, "public", "locales"),
     // next-i18next / i18next pattern
-    path4.join(cwd, "app", "locales"),
-    path4.join(cwd, "app", "messages"),
-    path4.join(cwd, "src", "locales"),
-    path4.join(cwd, "src", "messages")
-  ].filter((p) => fs3.existsSync(p) && fs3.statSync(p).isDirectory());
+    path3.join(cwd, "app", "locales"),
+    path3.join(cwd, "app", "messages"),
+    path3.join(cwd, "src", "locales"),
+    path3.join(cwd, "src", "messages")
+  ].filter((p) => fs2.existsSync(p) && fs2.statSync(p).isDirectory());
   if (candidates.length) {
     const dir = candidates[0];
     out.outDir = dir;
-    if (dir?.includes(`${path4.sep}public${path4.sep}locales`)) {
+    if (dir?.includes(`${path3.sep}public${path3.sep}locales`)) {
       out.include = ["public/locales/*/*.json"];
-    } else if (dir?.endsWith(`${path4.sep}messages`)) {
+    } else if (dir?.endsWith(`${path3.sep}messages`)) {
       out.include = ["messages/*.json"];
     } else {
       out.include = ["**/messages/*.json", "**/locales/*.json"];
     }
     let locales;
-    if (dir?.includes(`${path4.sep}public${path4.sep}locales`)) {
+    if (dir?.includes(`${path3.sep}public${path3.sep}locales`)) {
       const subdirs = listSubdirs(dir);
       locales = subdirs.filter((name) => {
-        const hasFiles = listJSONFiles(path4.join(dir, name)).length > 0;
+        const hasFiles = listJSONFiles(path3.join(dir, name)).length > 0;
         return hasFiles;
       });
     } else {
       const files = listJSONFiles(dir ?? "");
-      locales = files.map((f) => path4.parse(f).name);
+      locales = files.map((f) => path3.parse(f).name);
     }
     const nextI18n = tryReadNextI18n(cwd);
     const preferred = nextI18n.defaultLocale;
@@ -26858,7 +26596,7 @@ function getFrameworkSetup(framework) {
 function installDependencies(cwd, packageManager, deps) {
   if (deps.length === 0) return;
   const cmd = packageManager === "npm" ? `npm install ${deps.join(" ")}` : packageManager === "yarn" ? `yarn add ${deps.join(" ")}` : `pnpm add ${deps.join(" ")}`;
-  execSync(cmd, { stdio: "inherit", cwd });
+  execSync(cmd, { stdio: ["ignore", 2, 2], cwd });
 }
 async function createLocaleFiles(cwd, framework, baseLocale, targetLocales) {
   const setup = FRAMEWORK_SETUPS[framework];
@@ -26866,22 +26604,22 @@ async function createLocaleFiles(cwd, framework, baseLocale, targetLocales) {
   for (const file2 of setup.files) {
     if (!file2.path.includes("{{lng}}")) {
       const filePath = path32.join(cwd, file2.path);
-      await fs32.mkdir(path32.dirname(filePath), { recursive: true });
-      await fs32.writeFile(filePath, file2.content);
+      await fs3.mkdir(path32.dirname(filePath), { recursive: true });
+      await fs3.writeFile(filePath, file2.content);
       createdFiles.push(file2.path);
       continue;
     }
     const basePath = file2.path.replace("{{lng}}", baseLocale);
     const baseFilePath = path32.join(cwd, basePath);
-    await fs32.mkdir(path32.dirname(baseFilePath), { recursive: true });
-    await fs32.writeFile(baseFilePath, file2.content);
+    await fs3.mkdir(path32.dirname(baseFilePath), { recursive: true });
+    await fs3.writeFile(baseFilePath, file2.content);
     createdFiles.push(basePath);
     for (const locale of targetLocales) {
       const targetPath = file2.path.replace("{{lng}}", locale);
       const targetFilePath = path32.join(cwd, targetPath);
-      await fs32.mkdir(path32.dirname(targetFilePath), { recursive: true });
+      await fs3.mkdir(path32.dirname(targetFilePath), { recursive: true });
       const emptyContent = file2.path.endsWith(".json") ? "{}" : file2.content;
-      await fs32.writeFile(targetFilePath, emptyContent);
+      await fs3.writeFile(targetFilePath, emptyContent);
       createdFiles.push(targetPath);
     }
   }
@@ -26906,18 +26644,12 @@ async function setupFramework(cwd, framework, baseLocale, targetLocales, package
 async function getProjectContext(convexClient) {
   const baseDir = process.cwd();
   const config3 = readConfig(baseDir);
-  if (!config3) {
-    throw new Error(
-      "No tolkbot.json found. Run 'tolkbot init' to create one."
-    );
-  }
+  if (!config3) throw noConfigError();
   const projectId = config3.config.projectId;
   const project = await convexClient.query(api.projects.getProjectForCli, {
     projectId
   });
-  if (!project) {
-    throw new Error("Project not found. Please run 'tolkbot init' again.");
-  }
+  if (!project) throw projectNotFoundError();
   return {
     projectId,
     organizationId: project.organizationId,
@@ -26928,15 +26660,17 @@ function parseTranslations(raw) {
   return raw.map((entry) => {
     const colonIdx = entry.indexOf(":");
     if (colonIdx === -1) {
-      throw new Error(
-        `Invalid translation format: "${entry}". Expected "locale:text" (e.g. "no:Hei")`
+      throw new UsageError(
+        `Invalid translation format: "${entry}".`,
+        'Expected "locale:text", such as "no:Hei".'
       );
     }
     const locale = entry.slice(0, colonIdx);
     const text = entry.slice(colonIdx + 1);
     if (!locale || !text) {
-      throw new Error(
-        `Invalid translation format: "${entry}". Both locale and text are required.`
+      throw new UsageError(
+        `Invalid translation format: "${entry}".`,
+        "Both locale and text are required."
       );
     }
     return { locale, text };
@@ -26952,56 +26686,27 @@ function CreateUI({ state }) {
       /* @__PURE__ */ jsx4(Text4, { children: " Creating glossary term\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs4(Box4, { children: [
-        /* @__PURE__ */ jsx4(Text4, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsxs4(Text4, { children: [
-          " ",
-          "Created glossary term: ",
-          /* @__PURE__ */ jsx4(Text4, { bold: true, children: state.term })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsx4(Box4, { marginTop: 1, children: /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
-        "ID: ",
-        state.id
-      ] }) })
-    ] });
-  }
   return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx4(Text4, { color: "red", children: "\u2717 Failed to create glossary term" }),
-    /* @__PURE__ */ jsx4(Text4, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs4(Box4, { children: [
+      /* @__PURE__ */ jsx4(Text4, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsxs4(Text4, { children: [
+        " ",
+        "Created glossary term: ",
+        /* @__PURE__ */ jsx4(Text4, { bold: true, children: state.term })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx4(Box4, { marginTop: 1, children: /* @__PURE__ */ jsxs4(Text4, { dimColor: true, children: [
+      "ID: ",
+      state.id
+    ] }) })
   ] });
 }
 async function runGlossaryCreate(opts) {
-  if (opts.json) {
-    try {
-      const translations = opts.translation ? parseTranslations(opts.translation) : void 0;
-      const convexClient = await getAuthenticatedConvexClient();
-      const { projectId, organizationId: organizationId2 } = await getProjectContext(convexClient);
-      const glossaryId = await convexClient.mutation(
-        api.glossaries.create,
-        {
-          organizationId: organizationId2,
-          projectId,
-          src: opts.term,
-          srcLocale: opts.locale,
-          aiContext: opts.context,
-          doNotTranslate: opts.doNotTranslate,
-          translations
-        }
-      );
-      jsonSuccess({ id: glossaryId, term: opts.term });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
-  }
-  let { unmount } = render4(/* @__PURE__ */ jsx4(CreateUI, { state: { type: "creating" } }));
-  try {
+  const create = async () => {
     const translations = opts.translation ? parseTranslations(opts.translation) : void 0;
     const convexClient = await getAuthenticatedConvexClient();
     const { projectId, organizationId: organizationId2 } = await getProjectContext(convexClient);
-    const glossaryId = await convexClient.mutation(api.glossaries.create, {
+    return convexClient.mutation(api.glossaries.create, {
       organizationId: organizationId2,
       projectId,
       src: opts.term,
@@ -27010,38 +26715,32 @@ async function runGlossaryCreate(opts) {
       doNotTranslate: opts.doNotTranslate,
       translations
     });
+  };
+  if (opts.json) {
+    jsonSuccess({ id: await create(), term: opts.term });
+  }
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx4(CreateUI, { state: { type: "creating" } })
+  );
+  let glossaryId;
+  try {
+    glossaryId = await create();
+  } finally {
     unmount();
-    const ui = render4(
-      /* @__PURE__ */ jsx4(
-        CreateUI,
-        {
-          state: { type: "success", id: glossaryId, term: opts.term }
-        }
-      )
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
-    unmount();
-    const ui = render4(
-      /* @__PURE__ */ jsx4(
-        CreateUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render5(
+    /* @__PURE__ */ jsx4(
+      CreateUI,
+      {
+        state: { type: "success", id: glossaryId, term: opts.term }
+      }
+    )
+  ).unmount();
 }
 
 // src/commands/glossary/list.tsx
 import { Spinner as Spinner4 } from "@inkjs/ui";
-import { Box as Box5, render as render5, Text as Text5 } from "ink";
+import { Box as Box5, render as render6, Text as Text5 } from "ink";
 
 // ../shared/src/types/settings.ts
 var SUPPORTED_LOCALES = [
@@ -27266,12 +26965,6 @@ function GlossaryListUI({ state }) {
       /* @__PURE__ */ jsx5(Text5, { children: " Loading glossary terms\u2026" })
     ] });
   }
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx5(Text5, { color: "red", children: "\u2717 Error" }),
-      /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: state.message })
-    ] });
-  }
   const { listing } = state;
   const glossaries = listing.entries;
   if (glossaries.length === 0) {
@@ -27372,43 +27065,23 @@ function jsonListing(listing) {
 }
 async function runGlossaryList(opts) {
   if (opts.json) {
-    try {
-      const listing = await loadListing(opts);
-      jsonSuccess(jsonListing(listing));
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    jsonSuccess(jsonListing(await loadListing(opts)));
   }
-  let { unmount } = render5(/* @__PURE__ */ jsx5(GlossaryListUI, { state: { type: "loading" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx5(GlossaryListUI, { state: { type: "loading" } })
+  );
+  let listing;
   try {
-    const listing = await loadListing(opts);
-    unmount();
-    const ui = render5(
-      /* @__PURE__ */ jsx5(GlossaryListUI, { state: { type: "success", listing } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
+    listing = await loadListing(opts);
+  } finally {
     unmount();
-    const ui = render5(
-      /* @__PURE__ */ jsx5(
-        GlossaryListUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render6(/* @__PURE__ */ jsx5(GlossaryListUI, { state: { type: "success", listing } })).unmount();
 }
 
 // src/commands/glossary/remove.tsx
 import { Spinner as Spinner5 } from "@inkjs/ui";
-import { Box as Box6, render as render6, Text as Text6 } from "ink";
+import { Box as Box6, render as render7, Text as Text6 } from "ink";
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 function RemoveUI({ state }) {
   if (state.type === "removing") {
@@ -27417,66 +27090,38 @@ function RemoveUI({ state }) {
       /* @__PURE__ */ jsx6(Text6, { children: " Removing glossary term\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs6(Box6, { children: [
-      /* @__PURE__ */ jsx6(Text6, { color: "green", children: "\u2713" }),
-      /* @__PURE__ */ jsx6(Text6, { children: " Glossary term removed" })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx6(Text6, { color: "red", children: "\u2717 Failed to remove glossary term" }),
-    /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: state.message })
+  return /* @__PURE__ */ jsxs6(Box6, { children: [
+    /* @__PURE__ */ jsx6(Text6, { color: "green", children: "\u2713" }),
+    /* @__PURE__ */ jsx6(Text6, { children: " Glossary term removed" })
   ] });
 }
 async function runGlossaryRemove(opts) {
-  if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      await convexClient.mutation(api.glossaries.remove, {
-        organizationId: organizationId2,
-        glossaryId: opts.id
-      });
-      jsonSuccess({ id: opts.id, ok: true });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
-  }
-  let { unmount } = render6(/* @__PURE__ */ jsx6(RemoveUI, { state: { type: "removing" } }));
-  try {
+  const run = async () => {
     const convexClient = await getAuthenticatedConvexClient();
     const { organizationId: organizationId2 } = await getProjectContext(convexClient);
     await convexClient.mutation(api.glossaries.remove, {
       organizationId: organizationId2,
       glossaryId: opts.id
     });
+  };
+  if (opts.json) {
+    await run();
+    jsonSuccess({ id: opts.id, ok: true });
+  }
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx6(RemoveUI, { state: { type: "removing" } })
+  );
+  try {
+    await run();
+  } finally {
     unmount();
-    const ui = render6(
-      /* @__PURE__ */ jsx6(RemoveUI, { state: { type: "success", id: opts.id } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
-    unmount();
-    const ui = render6(
-      /* @__PURE__ */ jsx6(
-        RemoveUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render7(/* @__PURE__ */ jsx6(RemoveUI, { state: { type: "success", id: opts.id } })).unmount();
 }
 
 // src/commands/glossary/show.tsx
 import { Spinner as Spinner6 } from "@inkjs/ui";
-import { Box as Box7, render as render7, Text as Text7 } from "ink";
+import { Box as Box7, render as render8, Text as Text7 } from "ink";
 import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 function GlossaryShowUI({ state }) {
   if (state.type === "loading") {
@@ -27485,15 +27130,6 @@ function GlossaryShowUI({ state }) {
       /* @__PURE__ */ jsx7(Text7, { children: " Loading glossary term\u2026" })
     ] });
   }
-  if (state.type === "not-found") {
-    return /* @__PURE__ */ jsx7(Box7, { children: /* @__PURE__ */ jsx7(Text7, { color: "red", children: "\u2717 Glossary term not found" }) });
-  }
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx7(Text7, { color: "red", children: "\u2717 Error" }),
-      /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: state.message })
-    ] });
-  }
   const { glossary } = state;
   return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs7(Box7, { gap: 1, children: [
@@ -27528,73 +27164,49 @@ function GlossaryShowUI({ state }) {
     ] }) })
   ] });
 }
+async function loadGlossary(id) {
+  const convexClient = await getAuthenticatedConvexClient();
+  const { organizationId: organizationId2 } = await getProjectContext(convexClient);
+  const glossary = await convexClient.query(api.glossaries.getById, {
+    organizationId: organizationId2,
+    glossaryId: id
+  });
+  if (!glossary) {
+    throw new CliError(
+      `Glossary term ${id} was not found.`,
+      "List the terms with 'tolkbot glossary list'.",
+      "not_found"
+    );
+  }
+  return glossary;
+}
 async function runGlossaryShow(opts) {
   if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      const glossary = await convexClient.query(api.glossaries.getById, {
-        organizationId: organizationId2,
-        glossaryId: opts.id
-      });
-      if (!glossary) {
-        jsonError("Glossary term not found");
-      }
-      jsonSuccess({
-        id: glossary._id,
-        term: glossary.src,
-        locale: glossary.srcLocale,
-        doNotTranslate: glossary.doNotTranslate ?? false,
-        translations: glossary.translations ?? [],
-        context: glossary.aiContext ?? null
-      });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    const glossary2 = await loadGlossary(opts.id);
+    jsonSuccess({
+      id: glossary2._id,
+      term: glossary2.src,
+      locale: glossary2.srcLocale,
+      doNotTranslate: glossary2.doNotTranslate ?? false,
+      translations: glossary2.translations ?? [],
+      context: glossary2.aiContext ?? null
+    });
   }
-  let { unmount } = render7(/* @__PURE__ */ jsx7(GlossaryShowUI, { state: { type: "loading" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx7(GlossaryShowUI, { state: { type: "loading" } })
+  );
+  let glossary;
   try {
-    const convexClient = await getAuthenticatedConvexClient();
-    const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-    const glossary = await convexClient.query(api.glossaries.getById, {
-      organizationId: organizationId2,
-      glossaryId: opts.id
-    });
-    if (!glossary) {
-      unmount();
-      const ui2 = render7(/* @__PURE__ */ jsx7(GlossaryShowUI, { state: { type: "not-found" } }));
-      unmount = ui2.unmount;
-      await ui2.waitUntilExit();
-      return exitAfterFlush(1);
-      return;
-    }
-    unmount();
-    const ui = render7(
-      /* @__PURE__ */ jsx7(GlossaryShowUI, { state: { type: "success", glossary } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
+    glossary = await loadGlossary(opts.id);
+  } finally {
     unmount();
-    const ui = render7(
-      /* @__PURE__ */ jsx7(
-        GlossaryShowUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render8(/* @__PURE__ */ jsx7(GlossaryShowUI, { state: { type: "success", glossary } })).unmount();
 }
 
 // src/commands/glossary/update.tsx
 import { Spinner as Spinner7 } from "@inkjs/ui";
-import { Box as Box8, render as render8, Text as Text8 } from "ink";
+import { Box as Box8, render as render9, Text as Text8 } from "ink";
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 function UpdateUI({ state }) {
   if (state.type === "updating") {
@@ -27603,21 +27215,15 @@ function UpdateUI({ state }) {
       /* @__PURE__ */ jsx8(Text8, { children: " Updating glossary term\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs8(Box8, { children: [
-        /* @__PURE__ */ jsx8(Text8, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsx8(Text8, { children: " Glossary term updated" })
-      ] }),
-      /* @__PURE__ */ jsx8(Box8, { marginTop: 1, children: /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
-        "ID: ",
-        state.id
-      ] }) })
-    ] });
-  }
   return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "red", children: "\u2717 Failed to update glossary term" }),
-    /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs8(Box8, { children: [
+      /* @__PURE__ */ jsx8(Text8, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsx8(Text8, { children: " Glossary term updated" })
+    ] }),
+    /* @__PURE__ */ jsx8(Box8, { marginTop: 1, children: /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
+      "ID: ",
+      state.id
+    ] }) })
   ] });
 }
 async function runGlossaryUpdate(opts) {
@@ -27631,124 +27237,333 @@ async function runGlossaryUpdate(opts) {
       patch.doNotTranslate = opts.doNotTranslate;
     if (translations !== void 0) patch.translations = translations;
     if (Object.keys(patch).length === 0) {
-      throw new Error(
-        "No fields to update. Provide at least one of: --term, --locale, --context, --do-not-translate, --translation"
+      throw new UsageError(
+        "No fields to update.",
+        "Pass at least one of --term, --locale, --context, --do-not-translate, --translation."
       );
     }
     return patch;
   };
+  const update = async () => {
+    const patch = buildPatch();
+    const convexClient = await getAuthenticatedConvexClient();
+    const { organizationId: organizationId2 } = await getProjectContext(convexClient);
+    await convexClient.mutation(api.glossaries.update, {
+      organizationId: organizationId2,
+      glossaryId: opts.id,
+      patch
+    });
+  };
   if (opts.json) {
-    try {
-      const patch = buildPatch();
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      await convexClient.mutation(api.glossaries.update, {
-        organizationId: organizationId2,
-        glossaryId: opts.id,
-        patch
-      });
-      jsonSuccess({ id: opts.id, ok: true });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
+    await update();
+    jsonSuccess({ id: opts.id, ok: true });
+  }
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx8(UpdateUI, { state: { type: "updating" } })
+  );
+  try {
+    await update();
+  } finally {
+    unmount();
+  }
+  render9(/* @__PURE__ */ jsx8(UpdateUI, { state: { type: "success", id: opts.id } })).unmount();
+}
+
+// src/commands/glossary/index.ts
+var glossaryCommand = new Command2("glossary").description(
+  "Manage glossary terms"
+);
+glossaryCommand.command("list").description("List glossary terms for the current project").option("--locale <locale>", "Filter by source locale").option("--limit <n>", "Max number of results", (v) => Number(v), 100).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
+  const schema = z4.object({
+    locale: z4.string().optional(),
+    limit: z4.coerce.number().int().positive().default(100),
+    json: z4.boolean().optional()
+  });
+  const parsed = validateOrExit(schema, opts);
+  await runGlossaryList(parsed);
+});
+glossaryCommand.command("show").description("Show details of a glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
+  const schema = z4.object({
+    id: z4.string().min(1),
+    json: z4.boolean().optional()
+  });
+  const parsed = validateOrExit(schema, opts);
+  await runGlossaryShow(parsed);
+});
+glossaryCommand.command("create").description("Create a new glossary term").requiredOption("--term <text>", "Source term").requiredOption("--locale <locale>", "Source locale (e.g. en)").option("--context <text>", "AI context for translation guidance").option("--do-not-translate", "Mark term as do-not-translate").option(
+  "--translation <locale:text...>",
+  "Translations in locale:text format (e.g. --translation no:Hei de:Hallo)"
+).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
+  const schema = z4.object({
+    term: z4.string().min(1),
+    locale: z4.string().min(1),
+    context: z4.string().optional(),
+    doNotTranslate: z4.boolean().optional(),
+    translation: z4.array(z4.string()).optional(),
+    json: z4.boolean().optional()
+  });
+  const parsed = validateOrExit(schema, opts);
+  await runGlossaryCreate(parsed);
+});
+glossaryCommand.command("update").description("Update an existing glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--term <text>", "New source term").option("--locale <locale>", "New source locale").option("--context <text>", "AI context for translation guidance").option("--do-not-translate", "Mark term as do-not-translate").option("--no-do-not-translate", "Unmark do-not-translate").option(
+  "--translation <locale:text...>",
+  "Translations in locale:text format (replaces all translations)"
+).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
+  const schema = z4.object({
+    id: z4.string().min(1),
+    term: z4.string().optional(),
+    locale: z4.string().optional(),
+    context: z4.string().optional(),
+    doNotTranslate: z4.boolean().optional(),
+    translation: z4.array(z4.string()).optional(),
+    json: z4.boolean().optional()
+  });
+  const parsed = validateOrExit(schema, opts);
+  await runGlossaryUpdate(parsed);
+});
+glossaryCommand.command("remove").description("Remove a glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
+  const schema = z4.object({
+    id: z4.string().min(1),
+    json: z4.boolean().optional()
+  });
+  const parsed = validateOrExit(schema, opts);
+  await runGlossaryRemove(parsed);
+});
+
+// src/commands/init/index.tsx
+import { Box as Box10, render as render10, Text as Text10 } from "ink";
+
+// src/lib/telemetry.ts
+import { randomUUID } from "crypto";
+import fs4 from "fs/promises";
+import os2 from "os";
+import path4 from "path";
+
+// ../shared/src/analytics/index.ts
+var ORGANIZATION_GROUP = "organization";
+var analyticsEventNames = [
+  "trial_started",
+  "project_created",
+  "project_page_viewed",
+  "github_connect_started",
+  "github_install_initiated",
+  "plan_change_initiated",
+  "credits_purchase_initiated",
+  "glossary_created",
+  "glossary_deleted",
+  "glossary_imported",
+  "translation_job_viewed",
+  "translation_logs_viewed",
+  "cli_login_completed",
+  "cli_command_completed",
+  "cli_init_completed",
+  "cli_translate_completed",
+  "cli_validate_completed",
+  "translation_job_started",
+  "translation_job_completed",
+  "translation_job_failed",
+  "pull_request_opened",
+  "pull_request_merged",
+  "pull_request_closed_unmerged",
+  "github_app_installed",
+  "github_app_uninstalled",
+  "repository_connected",
+  "subscription_started",
+  "subscription_plan_changed",
+  "subscription_canceled",
+  "trial_ended",
+  "credits_purchased",
+  "credits_exhausted",
+  "usage_limit_reached",
+  "cta_clicked",
+  "waitlist_joined",
+  "signed_up",
+  "signed_in",
+  "onboarding_step_completed",
+  "onboarding_completed",
+  "language_added",
+  "translation_edited",
+  "translation_bulk_retranslated",
+  "dashboard_translation_started",
+  "project_settings_changed",
+  "member_invited",
+  "feedback_submitted",
+  "analytics_smoke_tested"
+];
+var registeredNames = new Set(analyticsEventNames);
+
+// src/lib/telemetry.ts
+import { PostHog } from "posthog-node";
+var TELEMETRY_ENV_VAR = "TOLKBOT_TELEMETRY";
+var DO_NOT_TRACK_ENV_VAR = "DO_NOT_TRACK";
+var POSTHOG_HOST = "https://eu.i.posthog.com";
+var FLUSH_TIMEOUT_MS = 1e3;
+var OFF_VALUES = /* @__PURE__ */ new Set(["0", "false", "off", "no"]);
+var ON_VALUES = /* @__PURE__ */ new Set(["1", "true", "on", "yes"]);
+function readEnv(name) {
+  return process.env[name]?.trim();
+}
+function projectKey() {
+  const key = "phc_uSMLUC9D7bHeaHFAosnoDzBj6DY5uzLcCQkXZxzj0mQ"?.trim();
+  if (!key) return void 0;
+  return key;
+}
+function environment() {
+  const nodeEnv = process.env.NODE_ENV;
+  return nodeEnv === "development" || nodeEnv === "test" ? nodeEnv : "production";
+}
+function inCi() {
+  return Boolean(process.env.CI);
+}
+function getTelemetryDir() {
+  return path4.join(os2.homedir(), ".tolkbot");
+}
+function getPreferencePath() {
+  return path4.join(getTelemetryDir(), "telemetry");
+}
+function getAnonymousIdPath() {
+  return path4.join(getTelemetryDir(), "anonymous-id");
+}
+async function readFileOrNull(file2) {
+  try {
+    return (await fs4.readFile(file2, "utf-8")).trim() || null;
+  } catch {
+    return null;
+  }
+}
+async function writePrivateFile(file2, content) {
+  await fs4.mkdir(path4.dirname(file2), { recursive: true, mode: 448 });
+  await fs4.writeFile(file2, content, { mode: 384 });
+}
+async function telemetryState() {
+  const envValue = readEnv(TELEMETRY_ENV_VAR)?.toLowerCase();
+  if (envValue !== void 0 && OFF_VALUES.has(envValue)) {
+    return { enabled: false, reason: "env" };
+  }
+  const doNotTrack = readEnv(DO_NOT_TRACK_ENV_VAR)?.toLowerCase();
+  if (doNotTrack !== void 0 && ON_VALUES.has(doNotTrack)) {
+    return { enabled: false, reason: "do-not-track" };
+  }
+  const preference = (await readFileOrNull(getPreferencePath()))?.toLowerCase();
+  if (preference !== void 0 && OFF_VALUES.has(preference)) {
+    return { enabled: false, reason: "preference" };
+  }
+  if (!projectKey()) {
+    return { enabled: false, reason: "no-key" };
+  }
+  return { enabled: true, reason: "default" };
+}
+async function setTelemetryPreference(enabled) {
+  await writePrivateFile(getPreferencePath(), enabled ? "on\n" : "off\n");
+}
+function decodeTokenSubject(token) {
+  const payload = token.split(".")[1];
+  if (!payload) return null;
+  try {
+    const json2 = Buffer.from(payload, "base64url").toString("utf-8");
+    const claims = JSON.parse(json2);
+    if (typeof claims === "object" && claims !== null && "sub" in claims && typeof claims.sub === "string") {
+      return claims.sub;
     }
+  } catch {
   }
-  let { unmount } = render8(/* @__PURE__ */ jsx8(UpdateUI, { state: { type: "updating" } }));
+  return null;
+}
+async function resolveDistinctId() {
+  const resolved = await resolveToken();
+  const subject = resolved ? decodeTokenSubject(resolved.token) : null;
+  if (subject) return subject;
+  const file2 = getAnonymousIdPath();
+  const existing = await readFileOrNull(file2);
+  if (existing) return existing;
+  const generated = randomUUID();
   try {
-    const patch = buildPatch();
-    const convexClient = await getAuthenticatedConvexClient();
-    const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-    await convexClient.mutation(api.glossaries.update, {
-      organizationId: organizationId2,
-      glossaryId: opts.id,
-      patch
-    });
-    unmount();
-    const ui = render8(
-      /* @__PURE__ */ jsx8(UpdateUI, { state: { type: "success", id: opts.id } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
-    unmount();
-    const ui = render8(
-      /* @__PURE__ */ jsx8(
-        UpdateUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
+    await writePrivateFile(file2, `${generated}
+`);
+  } catch {
   }
+  return generated;
 }
-
-// src/commands/glossary/index.ts
-var glossaryCommand = new Command2("glossary").description(
-  "Manage glossary terms"
-);
-glossaryCommand.command("list").description("List glossary terms for the current project").option("--locale <locale>", "Filter by source locale").option("--limit <n>", "Max number of results", (v) => Number(v), 100).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
-  const schema = z4.object({
-    locale: z4.string().optional(),
-    limit: z4.coerce.number().int().positive().default(100),
-    json: z4.boolean().optional()
-  });
-  const parsed = validateOrExit(schema, opts);
-  await runGlossaryList(parsed);
-});
-glossaryCommand.command("show").description("Show details of a glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
-  const schema = z4.object({
-    id: z4.string().min(1),
-    json: z4.boolean().optional()
+var organizationId = null;
+function setTelemetryOrganization(id) {
+  organizationId = id;
+}
+var client2 = null;
+function getClient(key) {
+  client2 ??= new PostHog(key, {
+    host: POSTHOG_HOST,
+    // A CLI process is short-lived: send each event as it happens
+    // rather than batching for a flush that may never come.
+    flushAt: 1,
+    flushInterval: 0,
+    requestTimeout: FLUSH_TIMEOUT_MS,
+    // No IP-derived location on CLI events. The privacy policy lists
+    // exactly what the CLI reports, and location is not on it.
+    disableGeoip: true
   });
-  const parsed = validateOrExit(schema, opts);
-  await runGlossaryShow(parsed);
-});
-glossaryCommand.command("create").description("Create a new glossary term").requiredOption("--term <text>", "Source term").requiredOption("--locale <locale>", "Source locale (e.g. en)").option("--context <text>", "AI context for translation guidance").option("--do-not-translate", "Mark term as do-not-translate").option(
-  "--translation <locale:text...>",
-  "Translations in locale:text format (e.g. --translation no:Hei de:Hallo)"
-).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
-  const schema = z4.object({
-    term: z4.string().min(1),
-    locale: z4.string().min(1),
-    context: z4.string().optional(),
-    doNotTranslate: z4.boolean().optional(),
-    translation: z4.array(z4.string()).optional(),
-    json: z4.boolean().optional()
+  return client2;
+}
+var inFlight = /* @__PURE__ */ new Set();
+async function send(event, properties) {
+  const state = await telemetryState();
+  if (!state.enabled) return;
+  const key = projectKey();
+  if (!key) return;
+  const distinctId = await resolveDistinctId();
+  await getClient(key).captureImmediate({
+    distinctId,
+    event,
+    properties: { ...properties, environment: environment() },
+    groups: organizationId ? { [ORGANIZATION_GROUP]: organizationId } : void 0
   });
-  const parsed = validateOrExit(schema, opts);
-  await runGlossaryCreate(parsed);
-});
-glossaryCommand.command("update").description("Update an existing glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--term <text>", "New source term").option("--locale <locale>", "New source locale").option("--context <text>", "AI context for translation guidance").option("--do-not-translate", "Mark term as do-not-translate").option("--no-do-not-translate", "Unmark do-not-translate").option(
-  "--translation <locale:text...>",
-  "Translations in locale:text format (replaces all translations)"
-).option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
-  const schema = z4.object({
-    id: z4.string().min(1),
-    term: z4.string().optional(),
-    locale: z4.string().optional(),
-    context: z4.string().optional(),
-    doNotTranslate: z4.boolean().optional(),
-    translation: z4.array(z4.string()).optional(),
-    json: z4.boolean().optional()
+}
+function track(event, properties) {
+  const attempt = send(event, properties).catch(() => void 0);
+  inFlight.add(attempt);
+  void attempt.finally(() => inFlight.delete(attempt));
+}
+async function flushTelemetry(timeoutMs = FLUSH_TIMEOUT_MS) {
+  if (inFlight.size === 0 && !client2) return;
+  const deadline = new Promise((resolve) => {
+    const timer = setTimeout(resolve, timeoutMs);
+    timer.unref();
   });
-  const parsed = validateOrExit(schema, opts);
-  await runGlossaryUpdate(parsed);
-});
-glossaryCommand.command("remove").description("Remove a glossary term").requiredOption("--id <glossaryId>", "Glossary term ID").option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
-  const schema = z4.object({
-    id: z4.string().min(1),
-    json: z4.boolean().optional()
+  await Promise.race([Promise.allSettled([...inFlight]), deadline]);
+  if (client2) {
+    const closing = client2.shutdown(timeoutMs).catch(() => void 0);
+    client2 = null;
+    await Promise.race([closing, deadline]);
+  }
+}
+function runtimeProperties(cliVersion) {
+  return {
+    cli_version: cliVersion,
+    node_version: process.version,
+    platform: process.platform,
+    ci: inCi()
+  };
+}
+var activeCommand = null;
+function beginCommand(path12, cliVersion) {
+  activeCommand = {
+    path: path12,
+    startedAt: Date.now(),
+    cliVersion,
+    reported: false
+  };
+}
+function completeCommand(exitCode) {
+  if (!activeCommand || activeCommand.reported) return;
+  activeCommand.reported = true;
+  track("cli_command_completed", {
+    command: activeCommand.path,
+    success: exitCode === 0,
+    exit_code: exitCode,
+    duration_ms: Date.now() - activeCommand.startedAt,
+    json: wantsJson(),
+    ...runtimeProperties(activeCommand.cliVersion)
   });
-  const parsed = validateOrExit(schema, opts);
-  await runGlossaryRemove(parsed);
-});
-
-// src/commands/init/index.tsx
-import { Box as Box10, render as render9, Text as Text10 } from "ink";
+}
 
 // src/commands/init/core.ts
 import { execSync as execSync2 } from "child_process";
@@ -27805,7 +27620,8 @@ function assertSupportedLocales(locales, label) {
   if (unsupported.length > 0) {
     throw new CliError(
       `Unsupported ${label}: ${unsupported.join(", ")}.`,
-      `TolkBot supports ${SUPPORTED.size} locales. Run 'tolkbot init' without --yes to pick from the list.`
+      `TolkBot supports ${SUPPORTED.size} locales. Run 'tolkbot init' without --yes in a terminal to pick from the list.`,
+      "usage"
     );
   }
   return normalized.filter((l) => isSupportedLocale(l));
@@ -27831,7 +27647,8 @@ async function linkRepository(cwd, plan) {
   if (!repository) {
     throw new CliError(
       `Repository ${owner}/${name} is not connected to TolkBot.`,
-      "Install the GitHub App at https://github.com/apps/tolkbot, grant it access to this repository, then run 'tolkbot init' again."
+      "Install the GitHub App at https://github.com/apps/tolkbot, grant it access to this repository, then run 'tolkbot init' again.",
+      "repository_not_connected"
     );
   }
   const existingProjects = await convexClient.query(
@@ -27927,7 +27744,8 @@ function requireSourcePattern(project, repository) {
   const reason = project.initializationStatus === "failed" && project.initializationError ? ` Detection failed: ${project.initializationError}` : "";
   throw new CliError(
     `TolkBot found no translation files in ${repository}.${reason}`,
-    `Set the file pattern in the project's settings at ${patternSettingsUrl(project.slug)}, then run 'tolkbot init' again.`
+    `Set the file pattern in the project's settings at ${patternSettingsUrl(project.slug)}, then run 'tolkbot init' again.`,
+    "no_translation_files"
   );
 }
 
@@ -28311,7 +28129,8 @@ function resolvePlan(cwd, opts) {
     if (!FRAMEWORKS.includes(opts.framework)) {
       throw new CliError(
         `Unknown framework "${opts.framework}".`,
-        `Expected one of: ${FRAMEWORKS.join(", ")}.`
+        `Expected one of: ${FRAMEWORKS.join(", ")}.`,
+        "usage"
       );
     }
     framework = opts.framework;
@@ -28421,37 +28240,36 @@ async function runHeadless(cwd, opts) {
     );
     return;
   }
-  render9(/* @__PURE__ */ jsx10(SummaryUI, { plan, result })).unmount();
+  render10(/* @__PURE__ */ jsx10(SummaryUI, { plan, result })).unmount();
 }
-function canPrompt() {
-  return Boolean(process.stdin.isTTY && process.stdout.isTTY);
+async function requireLogin() {
+  const resolved = await resolveToken();
+  if (!resolved) {
+    throw new AuthError(
+      "tolkbot init needs a TolkBot account, and this machine is not logged in.",
+      `Run 'tolkbot auth login', which opens tolkbot.ai in a browser to sign in with GitHub, or set $${TOKEN_ENV_VAR} in CI. Init also needs the TolkBot GitHub App on this repository, and translating needs an organization with a subscription.`
+    );
+  }
+  if (isTokenExpired(resolved)) {
+    throw new AuthError(
+      `Your token (from ${describeTokenSource(resolved.source)}) has expired.`,
+      reauthHint(resolved.source),
+      "token_expired"
+    );
+  }
 }
 async function runInit(opts = {}) {
   const cwd = process.cwd();
-  const asked = Boolean(opts.yes) || Boolean(opts.json);
-  const headless = asked || !canPrompt();
-  if (!headless) {
+  await requireLogin();
+  if (!opts.yes && !opts.json && isInteractive()) {
     await runInteractive(opts);
     return;
   }
-  if (!asked) {
-    throw new CliError(
-      "tolkbot init needs a terminal to prompt, and this session has none.",
-      "Re-run with --yes to accept detected settings, overriding any of them with --base, --targets or --framework."
-    );
-  }
-  try {
-    await runHeadless(cwd, opts);
-  } catch (error62) {
-    if (opts.json && !(error62 instanceof CliError)) {
-      throw new CliError(describeError(error62));
-    }
-    throw error62;
-  }
+  await runHeadless(cwd, opts);
 }
 async function runInteractive(opts) {
   const outcome = { failed: false };
-  const { unmount, waitUntilExit } = render9(
+  const { unmount, waitUntilExit } = render10(
     /* @__PURE__ */ jsx10(
       InitWizard,
       {
@@ -28487,7 +28305,7 @@ import { z as z5 } from "zod/v4";
 
 // src/commands/learnings/archive.tsx
 import { Spinner as Spinner9 } from "@inkjs/ui";
-import { Box as Box11, render as render10, Text as Text11 } from "ink";
+import { Box as Box11, render as render11, Text as Text11 } from "ink";
 import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 function ArchiveUI({ state }) {
   if (state.type === "archiving") {
@@ -28496,64 +28314,38 @@ function ArchiveUI({ state }) {
       /* @__PURE__ */ jsx11(Text11, { children: " Archiving learning\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs11(Box11, { children: [
-      /* @__PURE__ */ jsx11(Text11, { color: "green", children: "\u2713" }),
-      /* @__PURE__ */ jsx11(Text11, { children: " Learning archived" })
-    ] });
-  }
-  return /* @__PURE__ */ jsxs11(Box11, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx11(Text11, { color: "red", children: "\u2717 Failed to archive learning" }),
-    /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: state.message })
+  return /* @__PURE__ */ jsxs11(Box11, { children: [
+    /* @__PURE__ */ jsx11(Text11, { color: "green", children: "\u2713" }),
+    /* @__PURE__ */ jsx11(Text11, { children: " Learning archived" })
   ] });
 }
 async function runLearningsArchive(opts) {
-  if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      await convexClient.mutation(api.learnings.archive, {
-        organizationId: organizationId2,
-        learningId: opts.id
-      });
-      jsonSuccess({ id: opts.id, ok: true });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
-  }
-  let { unmount } = render10(/* @__PURE__ */ jsx11(ArchiveUI, { state: { type: "archiving" } }));
-  try {
+  const run = async () => {
     const convexClient = await getAuthenticatedConvexClient();
     const { organizationId: organizationId2 } = await getProjectContext(convexClient);
     await convexClient.mutation(api.learnings.archive, {
       organizationId: organizationId2,
       learningId: opts.id
     });
+  };
+  if (opts.json) {
+    await run();
+    jsonSuccess({ id: opts.id, ok: true });
+  }
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx11(ArchiveUI, { state: { type: "archiving" } })
+  );
+  try {
+    await run();
+  } finally {
     unmount();
-    const ui = render10(/* @__PURE__ */ jsx11(ArchiveUI, { state: { type: "success" } }));
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
-    unmount();
-    const ui = render10(
-      /* @__PURE__ */ jsx11(
-        ArchiveUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render11(/* @__PURE__ */ jsx11(ArchiveUI, { state: { type: "success" } })).unmount();
 }
 
 // src/commands/learnings/list.tsx
 import { Spinner as Spinner10 } from "@inkjs/ui";
-import { Box as Box12, render as render11, Text as Text12 } from "ink";
+import { Box as Box12, render as render12, Text as Text12 } from "ink";
 import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
 var feedbackLabels = {
   "incorrect-term": "Incorrect term",
@@ -28569,12 +28361,6 @@ function LearningsListUI({ state }) {
       /* @__PURE__ */ jsx12(Text12, { children: " Loading learnings\u2026" })
     ] });
   }
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs12(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx12(Text12, { color: "red", children: "\u2717 Error" }),
-      /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: state.message })
-    ] });
-  }
   const { learnings } = state;
   if (learnings.length === 0) {
     return /* @__PURE__ */ jsx12(Box12, { children: /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: "No learnings found." }) });
@@ -28617,143 +28403,90 @@ function LearningsListUI({ state }) {
     ] }, l._id))
   ] });
 }
+async function loadLearnings(opts) {
+  const convexClient = await getAuthenticatedConvexClient();
+  const { projectId, organizationId: organizationId2 } = await getProjectContext(convexClient);
+  return convexClient.query(api.learnings.listByProject, {
+    organizationId: organizationId2,
+    projectId,
+    status: opts.status,
+    limit: opts.limit
+  });
+}
 async function runLearningsList(opts) {
   if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { projectId, organizationId: organizationId2 } = await getProjectContext(convexClient);
-      const learnings = await convexClient.query(
-        api.learnings.listByProject,
-        {
-          organizationId: organizationId2,
-          projectId,
-          status: opts.status,
-          limit: opts.limit
-        }
-      );
-      jsonSuccess({
-        learnings: learnings.map((l) => ({
-          id: l._id,
-          sourceText: l.sourceText,
-          suggestedTranslation: l.suggestedTranslation,
-          srcLocale: l.srcLocale,
-          dstLocale: l.dstLocale,
-          feedbackType: l.feedbackType,
-          reasoning: l.reasoning,
-          status: l.status,
-          source: l.source
-        }))
-      });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    const learnings2 = await loadLearnings(opts);
+    jsonSuccess({
+      learnings: learnings2.map((l) => ({
+        id: l._id,
+        sourceText: l.sourceText,
+        suggestedTranslation: l.suggestedTranslation,
+        srcLocale: l.srcLocale,
+        dstLocale: l.dstLocale,
+        feedbackType: l.feedbackType,
+        reasoning: l.reasoning,
+        status: l.status,
+        source: l.source
+      }))
+    });
   }
-  let { unmount } = render11(/* @__PURE__ */ jsx12(LearningsListUI, { state: { type: "loading" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx12(LearningsListUI, { state: { type: "loading" } })
+  );
+  let learnings;
   try {
-    const convexClient = await getAuthenticatedConvexClient();
-    const { projectId, organizationId: organizationId2 } = await getProjectContext(convexClient);
-    const learnings = await convexClient.query(
-      api.learnings.listByProject,
-      {
-        organizationId: organizationId2,
-        projectId,
-        status: opts.status,
-        limit: opts.limit
-      }
-    );
-    unmount();
-    const ui = render11(
-      /* @__PURE__ */ jsx12(LearningsListUI, { state: { type: "success", learnings } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
+    learnings = await loadLearnings(opts);
+  } finally {
     unmount();
-    const ui = render11(
-      /* @__PURE__ */ jsx12(
-        LearningsListUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render12(
+    /* @__PURE__ */ jsx12(LearningsListUI, { state: { type: "success", learnings } })
+  ).unmount();
 }
 
 // src/commands/learnings/remove.tsx
 import { Spinner as Spinner11 } from "@inkjs/ui";
-import { Box as Box13, render as render12, Text as Text13 } from "ink";
+import { Box as Box13, render as render13, Text as Text13 } from "ink";
 import { jsx as jsx13, jsxs as jsxs13 } from "react/jsx-runtime";
 function RemoveUI2({ state }) {
   if (state.type === "removing") {
     return /* @__PURE__ */ jsxs13(Box13, { children: [
       /* @__PURE__ */ jsx13(Spinner11, {}),
-      /* @__PURE__ */ jsx13(Text13, { children: " Removing learning\u2026" })
-    ] });
-  }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs13(Box13, { children: [
-      /* @__PURE__ */ jsx13(Text13, { color: "green", children: "\u2713" }),
-      /* @__PURE__ */ jsx13(Text13, { children: " Learning removed" })
+      /* @__PURE__ */ jsx13(Text13, { children: " Removing learning\u2026" })
     ] });
   }
-  return /* @__PURE__ */ jsxs13(Box13, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx13(Text13, { color: "red", children: "\u2717 Failed to remove learning" }),
-    /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: state.message })
+  return /* @__PURE__ */ jsxs13(Box13, { children: [
+    /* @__PURE__ */ jsx13(Text13, { color: "green", children: "\u2713" }),
+    /* @__PURE__ */ jsx13(Text13, { children: " Learning removed" })
   ] });
 }
 async function runLearningsRemove(opts) {
-  if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      await convexClient.mutation(api.learnings.remove, {
-        organizationId: organizationId2,
-        learningId: opts.id
-      });
-      jsonSuccess({ id: opts.id, ok: true });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
-  }
-  let { unmount } = render12(/* @__PURE__ */ jsx13(RemoveUI2, { state: { type: "removing" } }));
-  try {
+  const run = async () => {
     const convexClient = await getAuthenticatedConvexClient();
     const { organizationId: organizationId2 } = await getProjectContext(convexClient);
     await convexClient.mutation(api.learnings.remove, {
       organizationId: organizationId2,
       learningId: opts.id
     });
+  };
+  if (opts.json) {
+    await run();
+    jsonSuccess({ id: opts.id, ok: true });
+  }
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx13(RemoveUI2, { state: { type: "removing" } })
+  );
+  try {
+    await run();
+  } finally {
     unmount();
-    const ui = render12(/* @__PURE__ */ jsx13(RemoveUI2, { state: { type: "success" } }));
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
-    unmount();
-    const ui = render12(
-      /* @__PURE__ */ jsx13(
-        RemoveUI2,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render13(/* @__PURE__ */ jsx13(RemoveUI2, { state: { type: "success" } })).unmount();
 }
 
 // src/commands/learnings/show.tsx
 import { Spinner as Spinner12 } from "@inkjs/ui";
-import { Box as Box14, render as render13, Text as Text14 } from "ink";
+import { Box as Box14, render as render14, Text as Text14 } from "ink";
 import { jsx as jsx14, jsxs as jsxs14 } from "react/jsx-runtime";
 function LearningShowUI({ state }) {
   if (state.type === "loading") {
@@ -28762,15 +28495,6 @@ function LearningShowUI({ state }) {
       /* @__PURE__ */ jsx14(Text14, { children: " Loading learning\u2026" })
     ] });
   }
-  if (state.type === "not-found") {
-    return /* @__PURE__ */ jsx14(Box14, { children: /* @__PURE__ */ jsx14(Text14, { color: "red", children: "\u2717 Learning not found" }) });
-  }
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx14(Text14, { color: "red", children: "\u2717 Error" }),
-      /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: state.message })
-    ] });
-  }
   const { learning } = state;
   return /* @__PURE__ */ jsxs14(Box14, { flexDirection: "column", children: [
     /* @__PURE__ */ jsxs14(Box14, { gap: 1, children: [
@@ -28811,70 +28535,47 @@ function LearningShowUI({ state }) {
     ] }) })
   ] });
 }
+async function loadLearning(id) {
+  const convexClient = await getAuthenticatedConvexClient();
+  const { organizationId: organizationId2 } = await getProjectContext(convexClient);
+  const learning = await convexClient.query(api.learnings.getById, {
+    organizationId: organizationId2,
+    learningId: id
+  });
+  if (!learning) {
+    throw new CliError(
+      `Learning ${id} was not found.`,
+      "List them with 'tolkbot learnings list'.",
+      "not_found"
+    );
+  }
+  return learning;
+}
 async function runLearningsShow(opts) {
   if (opts.json) {
-    try {
-      const convexClient = await getAuthenticatedConvexClient();
-      const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-      const learning = await convexClient.query(api.learnings.getById, {
-        organizationId: organizationId2,
-        learningId: opts.id
-      });
-      if (!learning) {
-        jsonError("Learning not found");
-      }
-      jsonSuccess({
-        id: learning._id,
-        sourceText: learning.sourceText,
-        suggestedTranslation: learning.suggestedTranslation,
-        srcLocale: learning.srcLocale,
-        dstLocale: learning.dstLocale,
-        feedbackType: learning.feedbackType,
-        reasoning: learning.reasoning,
-        status: learning.status,
-        source: learning.source
-      });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    const learning2 = await loadLearning(opts.id);
+    jsonSuccess({
+      id: learning2._id,
+      sourceText: learning2.sourceText,
+      suggestedTranslation: learning2.suggestedTranslation,
+      srcLocale: learning2.srcLocale,
+      dstLocale: learning2.dstLocale,
+      feedbackType: learning2.feedbackType,
+      reasoning: learning2.reasoning,
+      status: learning2.status,
+      source: learning2.source
+    });
   }
-  let { unmount } = render13(/* @__PURE__ */ jsx14(LearningShowUI, { state: { type: "loading" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx14(LearningShowUI, { state: { type: "loading" } })
+  );
+  let learning;
   try {
-    const convexClient = await getAuthenticatedConvexClient();
-    const { organizationId: organizationId2 } = await getProjectContext(convexClient);
-    const learning = await convexClient.query(api.learnings.getById, {
-      organizationId: organizationId2,
-      learningId: opts.id
-    });
-    if (!learning) {
-      unmount();
-      const ui2 = render13(/* @__PURE__ */ jsx14(LearningShowUI, { state: { type: "not-found" } }));
-      unmount = ui2.unmount;
-      await ui2.waitUntilExit();
-      return exitAfterFlush(1);
-    }
-    unmount();
-    const ui = render13(
-      /* @__PURE__ */ jsx14(LearningShowUI, { state: { type: "success", learning } })
-    );
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
+    learning = await loadLearning(opts.id);
+  } finally {
     unmount();
-    const ui = render13(
-      /* @__PURE__ */ jsx14(
-        LearningShowUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render14(/* @__PURE__ */ jsx14(LearningShowUI, { state: { type: "success", learning } })).unmount();
 }
 
 // src/commands/learnings/index.ts
@@ -28964,13 +28665,13 @@ import { Command as Command5 } from "commander";
 import { z as z7 } from "zod/v4";
 
 // src/commands/translate/plan.tsx
-import fs7 from "fs/promises";
+import fs8 from "fs/promises";
 import path8 from "path";
 import { Spinner as Spinner13 } from "@inkjs/ui";
-import { Box as Box15, render as render14, Text as Text15 } from "ink";
+import { Box as Box15, render as render15, Text as Text15 } from "ink";
 
 // src/commands/translate/task-generator.ts
-import fs6 from "fs/promises";
+import fs7 from "fs/promises";
 import path7 from "path";
 
 // ../../node_modules/.pnpm/emoji-regex@10.6.0/node_modules/emoji-regex/index.mjs
@@ -29066,7 +28767,7 @@ function eastAsianWidth(codePoint, { ambiguousAsWide = false } = {}) {
 var import_fast_glob = __toESM(require_out4(), 1);
 var import_fast_glob2 = __toESM(require_out4(), 1);
 import path5 from "path";
-import fs4 from "fs/promises";
+import fs5 from "fs/promises";
 import path23 from "path";
 import fs23 from "fs/promises";
 import path33 from "path";
@@ -29174,11 +28875,11 @@ function flattenValues(data) {
   const values = /* @__PURE__ */ new Map();
   function walk(obj, prefix) {
     for (const [key, value] of Object.entries(obj)) {
-      const fullKey3 = prefix ? `${prefix}.${key}` : key;
+      const fullKey4 = prefix ? `${prefix}.${key}` : key;
       if (typeof value === "string") {
-        values.set(fullKey3, value);
+        values.set(fullKey4, value);
       } else if (typeof value === "object" && value !== null) {
-        walk(value, fullKey3);
+        walk(value, fullKey4);
       }
     }
   }
@@ -29280,23 +28981,23 @@ function parseTsContent(content) {
     let parsed;
     try {
       parsed = JSON.parse(jsonString);
-    } catch (jsonError2) {
-      if (jsonError2 instanceof SyntaxError) {
-        const posMatch = jsonError2.message.match(/position\s+(\d+)/);
+    } catch (jsonError) {
+      if (jsonError instanceof SyntaxError) {
+        const posMatch = jsonError.message.match(/position\s+(\d+)/);
         const pos = posMatch ? Number(posMatch[1]) : -1;
         const start = Math.max(0, pos - 40);
         const end = Math.min(jsonString.length, pos + 40);
         const snippet = jsonString.slice(start, end);
         const pointer = pos >= 0 ? " ".repeat(Math.min(pos - start, 40)) + "^" : "";
         throw new SyntaxError(
-          `${jsonError2.message}
+          `${jsonError.message}
 --- context around position ${pos} ---
 ${snippet}
 ${pointer}`,
-          { cause: jsonError2 }
+          { cause: jsonError }
         );
       }
-      throw jsonError2;
+      throw jsonError;
     }
     if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
       return {
@@ -30316,7 +30017,7 @@ var JsonAdapter = class extends BaseAdapter {
     for (const dir of COMMON_LOCALE_DIRS) {
       const dirPath = path23.join(baseDir, dir);
       try {
-        await fs4.access(dirPath);
+        await fs5.access(dirPath);
         const files = await (0, import_fast_glob.default)("**/*.json", {
           cwd: dirPath,
           absolute: true,
@@ -30348,7 +30049,7 @@ var JsonAdapter = class extends BaseAdapter {
   async parse(filePath) {
     let content;
     try {
-      content = await fs4.readFile(filePath, "utf-8");
+      content = await fs5.readFile(filePath, "utf-8");
     } catch (error62) {
       if (error62 instanceof Error && "code" in error62 && error62.code === "ENOENT") {
         throw new FileNotFoundError(filePath, error62);
@@ -30389,16 +30090,16 @@ var JsonAdapter = class extends BaseAdapter {
     let finalData = data;
     if (shouldMerge) {
       try {
-        const existingContent = await fs4.readFile(filePath, "utf-8");
+        const existingContent = await fs5.readFile(filePath, "utf-8");
         const existing = parseJsonContent(existingContent);
         finalData = merge2(existing.data, data);
       } catch {
       }
     }
     const dir = path23.dirname(filePath);
-    await fs4.mkdir(dir, { recursive: true });
+    await fs5.mkdir(dir, { recursive: true });
     const content = serializeJsonContent(finalData, { indent });
-    await fs4.writeFile(filePath, content, "utf-8");
+    await fs5.writeFile(filePath, content, "utf-8");
   }
 };
 var IGNORED = [
@@ -31298,7 +30999,7 @@ function planLocale(input2) {
 }
 
 // src/commands/translate/project-files.ts
-import fs5 from "fs/promises";
+import fs6 from "fs/promises";
 import path6 from "path";
 function fullPattern(scope) {
   return scope.subpath ? path6.posix.join(scope.subpath, scope.sourcePattern) : scope.sourcePattern;
@@ -31346,7 +31047,7 @@ function targetFileFor(source, targetLocale, files, scope) {
 }
 async function readTranslationFile(absolutePath, format) {
   try {
-    const content = await fs5.readFile(absolutePath, "utf-8");
+    const content = await fs6.readFile(absolutePath, "utf-8");
     const file2 = await createAdapter(format).parse(absolutePath);
     return { data: file2.data, content };
   } catch (error62) {
@@ -31360,7 +31061,7 @@ async function readTranslationFile(absolutePath, format) {
 var HOLD_CHUNK = 2e3;
 async function loadTasksFromFile(tasksPath) {
   const abs = path7.resolve(process.cwd(), tasksPath);
-  const raw = await fs6.readFile(abs, "utf8");
+  const raw = await fs7.readFile(abs, "utf8");
   const parsed = JSON.parse(raw);
   if (!Array.isArray(parsed)) throw new Error("tasks file must be an array");
   return parsed;
@@ -31453,22 +31154,12 @@ async function generateTasks(ctx, srcLocale, dstLocale, opts = {}) {
 import { jsx as jsx15, jsxs as jsxs15 } from "react/jsx-runtime";
 async function loadPlanContext(cwd) {
   const config3 = readConfig(cwd);
-  if (!config3) {
-    throw new CliError(
-      "No tolkbot.json found.",
-      "Run 'tolkbot init' to create one."
-    );
-  }
+  if (!config3) throw noConfigError();
   const client3 = await getAuthenticatedConvexClient();
   const project = await client3.query(api.projects.getProjectForCli, {
     projectId: config3.config.projectId
   });
-  if (!project) {
-    throw new CliError(
-      "Project not found.",
-      "Run 'tolkbot init' again to link this repository to a project."
-    );
-  }
+  if (!project) throw projectNotFoundError();
   setTelemetryOrganization(project.organizationId);
   return {
     root: path8.dirname(config3.path),
@@ -31525,32 +31216,26 @@ function PlanUI({
       ] }) })
     ] });
   }
-  if (state.type === "success") {
-    const { plan } = state;
-    return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs15(Box15, { children: [
-        /* @__PURE__ */ jsx15(Text15, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsx15(Text15, { children: " Translation plan generated" })
-      ] }),
-      /* @__PURE__ */ jsx15(Box15, { marginTop: 1, children: /* @__PURE__ */ jsxs15(Text15, { dimColor: true, children: [
-        src,
-        " \u2192 ",
-        dst,
-        ": ",
-        plan.tasks.length,
-        " task(s)"
-      ] }) }),
-      describePlan(plan).map((line) => /* @__PURE__ */ jsx15(Box15, { children: /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: line }) }, line)),
-      plan.tasks.length === 0 && /* @__PURE__ */ jsx15(Box15, { marginTop: 1, children: /* @__PURE__ */ jsxs15(Text15, { color: "yellow", children: [
-        "No translations needed - ",
-        dst,
-        " is up to date."
-      ] }) })
-    ] });
-  }
+  const { plan } = state;
   return /* @__PURE__ */ jsxs15(Box15, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx15(Text15, { color: "red", children: "\u2717 Planning failed" }),
-    /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs15(Box15, { children: [
+      /* @__PURE__ */ jsx15(Text15, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsx15(Text15, { children: " Translation plan generated" })
+    ] }),
+    /* @__PURE__ */ jsx15(Box15, { marginTop: 1, children: /* @__PURE__ */ jsxs15(Text15, { dimColor: true, children: [
+      src,
+      " \u2192 ",
+      dst,
+      ": ",
+      plan.tasks.length,
+      " task(s)"
+    ] }) }),
+    describePlan(plan).map((line) => /* @__PURE__ */ jsx15(Box15, { children: /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: line }) }, line)),
+    plan.tasks.length === 0 && /* @__PURE__ */ jsx15(Box15, { marginTop: 1, children: /* @__PURE__ */ jsxs15(Text15, { color: "yellow", children: [
+      "No translations needed - ",
+      dst,
+      " is up to date."
+    ] }) })
   ] });
 }
 function planOutput(plan) {
@@ -31565,88 +31250,68 @@ function planOutput(plan) {
 async function runPlan(opts) {
   const cwd = process.cwd();
   if (opts.json) {
-    try {
-      const ctx = await loadPlanContext(cwd);
-      const src2 = opts.src ?? ctx.project.baseLanguage;
-      const plan = await planForLocale(ctx, src2, opts.dst, {
-        retranslateUntracked: opts.retranslateUntracked
-      });
-      track("cli_translate_completed", {
-        mode: "plan",
-        key_count: plan.tasks.length,
-        locale_count: 1,
-        job_count: 0,
-        json: true
-      });
-      jsonSuccess(planOutput(plan));
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
+    const ctx = await loadPlanContext(cwd);
+    const src2 = opts.src ?? ctx.project.baseLanguage;
+    const plan2 = await planForLocale(ctx, src2, opts.dst, {
+      retranslateUntracked: opts.retranslateUntracked
+    });
+    track("cli_translate_completed", {
+      mode: "plan",
+      key_count: plan2.tasks.length,
+      locale_count: 1,
+      job_count: 0,
+      json: true
+    });
+    if (opts.write) {
+      const outputPath = await writeTasks(cwd, opts.write, plan2);
+      jsonSuccess({ ...planOutput(plan2), writtenTo: outputPath });
     }
+    jsonSuccess(planOutput(plan2));
   }
   let src = opts.src ?? "";
-  let { unmount } = render14(
+  const progress = renderTransient(
     /* @__PURE__ */ jsx15(PlanUI, { state: { type: "loading" }, src, dst: opts.dst })
   );
+  let plan;
   try {
     const ctx = await loadPlanContext(cwd);
     src = opts.src ?? ctx.project.baseLanguage;
-    unmount();
-    const planningUi = render14(
+    progress.rerender(
       /* @__PURE__ */ jsx15(PlanUI, { state: { type: "planning" }, src, dst: opts.dst })
     );
-    unmount = planningUi.unmount;
-    const plan = await planForLocale(ctx, src, opts.dst, {
+    plan = await planForLocale(ctx, src, opts.dst, {
       retranslateUntracked: opts.retranslateUntracked
     });
-    unmount();
-    const successUi = render14(
-      /* @__PURE__ */ jsx15(
-        PlanUI,
-        {
-          state: { type: "success", plan },
-          src,
-          dst: opts.dst
-        }
-      )
-    );
-    unmount = successUi.unmount;
-    track("cli_translate_completed", {
-      mode: "plan",
-      key_count: plan.tasks.length,
-      locale_count: 1,
-      job_count: 0,
-      json: false
-    });
-    const tasksJson = JSON.stringify(plan.tasks, null, 2);
-    if (opts.write) {
-      const outputPath = path8.resolve(cwd, opts.write);
-      await fs7.writeFile(outputPath, tasksJson + "\n", "utf-8");
-      await successUi.waitUntilExit();
-      console.log(`
+  } finally {
+    progress.unmount();
+  }
+  render15(
+    /* @__PURE__ */ jsx15(PlanUI, { state: { type: "success", plan }, src, dst: opts.dst })
+  ).unmount();
+  track("cli_translate_completed", {
+    mode: "plan",
+    key_count: plan.tasks.length,
+    locale_count: 1,
+    job_count: 0,
+    json: false
+  });
+  if (opts.write) {
+    const outputPath = await writeTasks(cwd, opts.write, plan);
+    console.log(`
 Tasks written to: ${outputPath}`);
-    } else {
-      await successUi.waitUntilExit();
-      console.log("\n" + tasksJson);
-    }
-  } catch (error62) {
-    unmount();
-    const errorUi = render14(
-      /* @__PURE__ */ jsx15(
-        PlanUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          },
-          src,
-          dst: opts.dst
-        }
-      )
-    );
-    await errorUi.waitUntilExit();
-    return exitAfterFlush(1);
+  } else {
+    console.log("\n" + JSON.stringify(plan.tasks, null, 2));
   }
 }
+async function writeTasks(cwd, file2, plan) {
+  const outputPath = path8.resolve(cwd, file2);
+  await fs8.writeFile(
+    outputPath,
+    JSON.stringify(plan.tasks, null, 2) + "\n",
+    "utf-8"
+  );
+  return outputPath;
+}
 
 // src/commands/translate/adopt.tsx
 var STAMP_CHUNK = 200;
@@ -31694,51 +31359,44 @@ async function runAdopt(opts) {
     const src = opts.src ?? ctx.project.baseLanguage;
     const locales = opts.all ? ctx.project.targetLanguages : opts.dst ? [opts.dst] : [];
     if (locales.length === 0) {
-      throw new CliError(
-        opts.all ? "No target languages configured for this project." : "Either --dst <locale> or --all must be provided."
+      throw opts.all ? new CliError(
+        "No target languages configured for this project.",
+        void 0,
+        "no_target_languages"
+      ) : new UsageError(
+        "Either --dst <locale> or --all must be provided."
       );
     }
-    const outcomes = [];
+    const outcomes2 = [];
     for (const dst of locales)
-      outcomes.push(await adoptLocale(ctx, src, dst));
+      outcomes2.push(await adoptLocale(ctx, src, dst));
     track("cli_translate_completed", {
       mode: "adopt",
-      key_count: outcomes.reduce((n, o) => n + o.adopted, 0),
-      locale_count: outcomes.length,
+      key_count: outcomes2.reduce((n, o) => n + o.adopted, 0),
+      locale_count: outcomes2.length,
       job_count: 0,
       json: opts.json === true
     });
-    return outcomes;
+    return outcomes2;
   };
   if (opts.json) {
-    try {
-      jsonSuccess({ adopted: await run() });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    jsonSuccess({ adopted: await run() });
   }
-  try {
-    const outcomes = await run();
-    for (const o of outcomes) {
-      console.log(
-        `\u2713 ${o.dstLocale}: adopted ${o.adopted} untracked translation(s)` + (o.skipped > 0 ? `, ${o.skipped} already tracked` : "")
-      );
-    }
-  } catch (error62) {
-    console.error(
-      `\u2717 ${error62 instanceof Error ? error62.message : String(error62)}`
+  const outcomes = await run();
+  for (const o of outcomes) {
+    console.log(
+      `\u2713 ${o.dstLocale}: adopted ${o.adopted} untracked translation(s)` + (o.skipped > 0 ? `, ${o.skipped} already tracked` : "")
     );
-    return exitAfterFlush(1);
   }
 }
 
 // src/commands/translate/apply.tsx
 import { useState as useState2 } from "react";
-import { MultiSelect, Spinner as Spinner14 } from "@inkjs/ui";
-import { Box as Box16, render as render15, Text as Text16 } from "ink";
+import { MultiSelect } from "@inkjs/ui";
+import { Box as Box16, render as render16, Text as Text16 } from "ink";
 
 // src/commands/translate/apply-core.ts
-import fs8 from "fs/promises";
+import fs9 from "fs/promises";
 import path9 from "path";
 function fullKey2(namespace, key) {
   return namespace ? `${namespace}.${key}` : key;
@@ -31785,26 +31443,32 @@ async function applyTasks(input2) {
     for (const task of tasks) {
       const sourceKey = sourceKeyFor(task.key, baseKeys);
       const currentSource = sourceKey === null ? void 0 : getByPath(source.data, sourceKey);
-      if (typeof currentSource !== "string" || computeValueHash(currentSource) !== (task.hash ?? computeValueHash(task.src))) {
+      if (typeof currentSource !== "string" || computeValueHash(currentSource) !== computeValueHash(task.src)) {
         refuse(task, "source_changed");
         continue;
       }
+      const translatedValue = task.dst ?? "";
       const current = getByPath(data, task.key);
       const currentHash = typeof current === "string" ? computeValueHash(current) : null;
       if (task.expectedTargetHash !== void 0 && task.expectedTargetHash !== currentHash) {
-        refuse(task, "target_changed");
+        refuse(
+          task,
+          current === translatedValue ? "already_applied" : "target_changed"
+        );
         continue;
       }
-      const translatedValue = task.dst ?? "";
       data = setByPath(data, task.key, translatedValue);
       written.entries.push({
         key: task.key,
         namespace: task.namespace,
         baseValue: task.src,
-        translatedValue
+        translatedValue,
+        changesFile: current !== translatedValue
       });
     }
     if (written.entries.length === 0) continue;
+    result.written.push(written);
+    if (input2.dryRun) continue;
     await writeTranslationFile({
       format,
       targetPath,
@@ -31813,16 +31477,15 @@ async function applyTasks(input2) {
       existingContent: existing?.content,
       sourceContent: source.content
     });
-    result.written.push(written);
   }
   return result;
 }
 async function writeTranslationFile(input2) {
   const { targetPath, data } = input2;
   const model = input2.existingContent ?? input2.sourceContent;
-  await fs8.mkdir(path9.dirname(targetPath), { recursive: true });
+  await fs9.mkdir(path9.dirname(targetPath), { recursive: true });
   if (input2.format === "json") {
-    await fs8.writeFile(
+    await fs9.writeFile(
       targetPath,
       serializeJsonContent(data, detectJsonStyle(model)),
       "utf-8"
@@ -31837,63 +31500,18 @@ async function writeTranslationFile(input2) {
     exportName: input2.existingContent ? shape?.exportName ?? void 0 : localeExportIdentifier(input2.dstLocale),
     useDefaultExport: shape?.useDefaultExport ?? false
   });
-  await fs8.writeFile(targetPath, content, "utf-8");
+  await fs9.writeFile(targetPath, content, "utf-8");
 }
 
 // src/commands/translate/apply.tsx
 import { jsx as jsx16, jsxs as jsxs16 } from "react/jsx-runtime";
-function ApplyUI({
-  jobs,
-  state,
-  onSubmit
-}) {
-  const [selectedValues, setSelectedValues] = useState2([]);
-  if (state.status === "selecting") {
-    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(Text16, { bold: true, children: "Select translation jobs to apply:" }),
-      /* @__PURE__ */ jsx16(Text16, { dimColor: true, children: "Space to select, Enter to confirm, Ctrl+C to cancel" }),
-      /* @__PURE__ */ jsx16(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx16(
-        MultiSelect,
-        {
-          options: jobs,
-          onChange: setSelectedValues,
-          onSubmit: () => onSubmit(selectedValues)
-        }
-      ) })
-    ] });
-  }
-  if (state.status === "applying") {
-    return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx16(Spinner14, {}),
-      /* @__PURE__ */ jsxs16(Text16, { children: [
-        "Applying job ",
-        state.currentJobIndex,
-        "/",
-        state.totalJobs
-      ] }),
-      state.currentJob && /* @__PURE__ */ jsx16(Text16, { dimColor: true, children: state.currentJob })
-    ] });
-  }
-  if (state.status === "success") {
-    return /* @__PURE__ */ jsx16(Box16, { flexDirection: "column", children: /* @__PURE__ */ jsxs16(Text16, { color: "green", children: [
-      "\u2713 Applied ",
-      state.keys,
-      " keys to ",
-      state.files,
-      " files from",
-      " ",
-      state.totalJobs,
-      " job(s)",
-      state.refused ? `, ${state.refused} not applied` : ""
-    ] }) });
-  }
-  return /* @__PURE__ */ jsx16(Box16, { flexDirection: "column", children: /* @__PURE__ */ jsxs16(Text16, { color: "red", children: [
-    "\u2717 Error: ",
-    state.message
-  ] }) });
-}
 var STAMP_CHUNK2 = 200;
-async function applyJob(ctx, jobId) {
+var RECENT_JOBS = 50;
+var APPLICABLE_STATUSES = /* @__PURE__ */ new Set(["succeeded", "partial", "failed"]);
+function fullKey3(namespace, key) {
+  return namespace ? `${namespace}.${key}` : key;
+}
+async function readJob(ctx, jobId) {
   const { client: client3, project } = ctx;
   const organizationId2 = project.organizationId;
   const job = await client3.query(api.translations.getJobById, {
@@ -31901,17 +31519,28 @@ async function applyJob(ctx, jobId) {
     jobId
   });
   if (!job) {
-    throw new Error(`Job ${jobId} not found`);
+    throw new CliError(
+      `Translation job ${jobId} was not found in this project.`,
+      void 0,
+      "job_not_found"
+    );
   }
-  if (job.status !== "succeeded" && job.status !== "partial" && job.status !== "failed") {
-    throw new Error(
-      `Job status is "${job.status}". Only completed jobs can be applied.`
+  if (!APPLICABLE_STATUSES.has(job.status)) {
+    throw new CliError(
+      `Translation job ${jobId} is ${job.status}. Only a finished job can be applied.`,
+      `Check it with 'tolkbot translate status --job-id ${jobId}'.`,
+      "job_not_finished"
     );
   }
   const tasks = await client3.query(api.translations.listTasksByJobId, {
     organizationId: organizationId2,
     jobId
   });
+  return { job, tasks };
+}
+async function applyJob(ctx, jobId) {
+  const { client: client3, project } = ctx;
+  const { job, tasks } = await readJob(ctx, jobId);
   const result = await applyTasks({
     root: ctx.root,
     scope: scopeOf(project),
@@ -31921,24 +31550,36 @@ async function applyJob(ctx, jobId) {
   });
   const locale = governanceLocale(project, job.dstLocale);
   for (const file2 of result.written) {
-    for (let i = 0; i < file2.entries.length; i += STAMP_CHUNK2) {
+    const entries = file2.entries.map(
+      ({ key, namespace, baseValue, translatedValue }) => ({
+        key,
+        namespace,
+        baseValue,
+        translatedValue
+      })
+    );
+    for (let i = 0; i < entries.length; i += STAMP_CHUNK2) {
       await client3.mutation(api.localeKeyStates.stampAppliedForCli, {
-        organizationId: organizationId2,
+        organizationId: project.organizationId,
         projectId: project._id,
         locale,
         pathTemplate: file2.pathTemplate,
-        entries: file2.entries.slice(i, i + STAMP_CHUNK2)
+        entries: entries.slice(i, i + STAMP_CHUNK2)
       });
     }
   }
   return {
+    dstLocale: job.dstLocale,
     files: result.written.length,
     keys: result.written.reduce((n, f) => n + f.entries.length, 0),
-    refused: result.refused.filter((r) => r.reason !== "not_translated")
+    refused: result.refused.filter(
+      (r) => r.reason !== "not_translated" && r.reason !== "already_applied"
+    )
   };
 }
 var REFUSAL_TEXT = {
   not_translated: "the task did not finish",
+  already_applied: "the file already holds it",
   no_source_file: "its source file is gone or unreadable",
   source_changed: "the source text changed after it was planned",
   target_unreadable: "the target file cannot be read",
@@ -31949,296 +31590,251 @@ function describeRefusals(refused) {
     (r) => `  ${r.key}: not applied, ${REFUSAL_TEXT[r.reason]}`
   );
 }
-async function runApply(opts) {
-  const ctx = await loadPlanContext(process.cwd());
-  const { project, client: convexClient } = ctx;
-  const projectId = project._id;
-  const organizationId2 = project.organizationId;
-  if (opts.json) {
-    if (!opts.jobId || opts.jobId.length === 0) {
-      jsonError(
-        "--job-id is required when using --json (no interactive selection)"
+async function findUnappliedJobs(ctx) {
+  const { client: client3, project } = ctx;
+  const jobs = await client3.query(api.translations.listJobsByProject, {
+    organizationId: project.organizationId,
+    projectId: project._id,
+    limit: RECENT_JOBS
+  });
+  const wanted = /* @__PURE__ */ new Map();
+  const plannedKeys = (srcLocale, dstLocale) => {
+    const id = `${srcLocale}\0${dstLocale}`;
+    let keys = wanted.get(id);
+    if (!keys) {
+      keys = planForLocale(ctx, srcLocale, dstLocale).then(
+        (plan) => new Set(
+          plan.tasks.map(
+            (task) => fullKey3(task.namespace, task.key)
+          )
+        )
       );
+      wanted.set(id, keys);
     }
-    try {
-      const applied = [];
-      for (const jobId of opts.jobId) {
-        applied.push({ jobId, ...await applyJob(ctx, jobId) });
-      }
-      track("cli_translate_completed", {
-        mode: "apply",
-        key_count: applied.reduce((n, a) => n + a.keys, 0),
-        locale_count: applied.length,
-        job_count: applied.length,
-        json: true
-      });
-      jsonSuccess({ applied });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
-  }
-  if (opts.jobId && opts.jobId.length > 0) {
-    console.log(`Applying ${opts.jobId.length} job(s)...`);
-    let totalFiles = 0;
-    let totalKeys = 0;
-    let totalRefused = 0;
-    for (let i = 0; i < opts.jobId.length; i++) {
-      const jobId = opts.jobId[i];
-      if (!jobId) continue;
-      console.log(`  [${i + 1}/${opts.jobId.length}] ${jobId}`);
-      const { files, keys, refused } = await applyJob(ctx, jobId);
-      totalFiles += files;
-      totalKeys += keys;
-      totalRefused += refused.length;
-      for (const line of describeRefusals(refused)) console.log(line);
-    }
-    track("cli_translate_completed", {
-      mode: "apply",
-      key_count: totalKeys,
-      locale_count: opts.jobId.length,
-      job_count: opts.jobId.length,
-      json: false
+    return keys;
+  };
+  const unapplied = [];
+  for (const job of jobs) {
+    if (!APPLICABLE_STATUSES.has(job.status)) continue;
+    const tasks = await client3.query(api.translations.listTasksByJobId, {
+      organizationId: project.organizationId,
+      jobId: job._id
+    });
+    const preview2 = await applyTasks({
+      root: ctx.root,
+      scope: scopeOf(project),
+      srcLocale: job.srcLocale,
+      dstLocale: job.dstLocale,
+      tasks,
+      dryRun: true
+    });
+    let pending2 = 0;
+    for (const file2 of preview2.written) {
+      for (const entry of file2.entries) {
+        if (entry.changesFile || (await plannedKeys(job.srcLocale, job.dstLocale)).has(
+          fullKey3(entry.namespace, entry.key)
+        )) {
+          pending2++;
+        }
+      }
+    }
+    if (pending2 === 0) continue;
+    unapplied.push({
+      jobId: job._id,
+      srcLocale: job.srcLocale,
+      dstLocale: job.dstLocale,
+      createdAt: job._creationTime,
+      pending: pending2
     });
-    console.log(
-      `\u2713 Applied ${totalKeys} keys to ${totalFiles} files from ${opts.jobId.length} job(s)` + (totalRefused > 0 ? `, ${totalRefused} not applied` : "")
-    );
-    return;
   }
-  const jobs = await convexClient.query(api.translations.listJobsByProject, {
-    organizationId: organizationId2,
-    projectId,
-    limit: 10
-  });
-  if (jobs.length === 0) {
-    console.log("No translation jobs found for this project.");
-    console.log('Run "tolkbot translate run" to create translation jobs.');
-    return;
+  return unapplied;
+}
+function chooseJobs(unapplied) {
+  if (unapplied.length === 0) return { kind: "none" };
+  const byLocale = /* @__PURE__ */ new Map();
+  for (const job of unapplied) {
+    const group = byLocale.get(job.dstLocale) ?? [];
+    group.push(job);
+    byLocale.set(job.dstLocale, group);
   }
-  const applicableJobs = jobs.filter(
-    (job) => job.status === "succeeded" || job.status === "partial"
+  const locales = [...byLocale].filter(([, group]) => group.length > 1).map(([locale]) => locale);
+  if (locales.length > 0) return { kind: "ambiguous", locales };
+  return {
+    kind: "apply",
+    jobs: [...unapplied].sort((a, b) => a.createdAt - b.createdAt)
+  };
+}
+function describeJob(job) {
+  return `${job.jobId} (${job.srcLocale} \u2192 ${job.dstLocale}, ${job.pending} key(s), ${new Date(job.createdAt).toLocaleString()})`;
+}
+function nothingToApply() {
+  return new CliError(
+    "No finished translation job is waiting to be applied.",
+    "Run 'tolkbot translate run --all' to translate what is missing, or pass --job-id to apply a job again.",
+    "nothing_to_apply"
   );
-  if (applicableJobs.length === 0) {
-    console.log("No successful translation jobs found.");
-    console.log(
-      "Recent jobs:\n" + jobs.map(
-        (j) => `  ${j.dstLocale} - ${j.status} (${new Date(j._creationTime).toLocaleString()})`
-      ).join("\n")
-    );
-    return;
-  }
-  const jobOptions = applicableJobs.map((job) => ({
-    label: `${job.srcLocale} \u2192 ${job.dstLocale} (${job.completed}/${job.total} tasks) - ${new Date(job._creationTime).toLocaleString()}`,
-    value: job._id
-  }));
-  let state = { status: "selecting" };
-  let selectedJobIds = [];
-  const { rerender, unmount } = render15(
+}
+function ambiguousJobs(unapplied, locales) {
+  const waiting = unapplied.filter((job) => locales.includes(job.dstLocale));
+  const newest = locales.map(
+    (locale) => waiting.filter((job) => job.dstLocale === locale).reduce((a, b) => b.createdAt > a.createdAt ? b : a)
+  );
+  return new UsageError(
+    `More than one translation job is waiting to be applied for ${locales.join(", ")}: ${waiting.map(describeJob).join("; ")}.`,
+    `Pass --job-id with the job(s) to apply. The newest is usually the one: --job-id ${newest.map((job) => job.jobId).join(" ")}.`
+  );
+}
+function JobPicker({
+  jobs,
+  onSubmit
+}) {
+  const [selected, setSelected] = useState2([]);
+  return /* @__PURE__ */ jsxs16(Box16, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx16(Text16, { bold: true, children: "Select translation jobs to apply:" }),
+    /* @__PURE__ */ jsx16(Text16, { dimColor: true, children: "Space to select, Enter to confirm, Ctrl+C to cancel" }),
+    /* @__PURE__ */ jsx16(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx16(
+      MultiSelect,
+      {
+        options: jobs.map((job) => ({
+          label: describeJob(job),
+          value: job.jobId
+        })),
+        onChange: setSelected,
+        onSubmit: () => onSubmit(selected)
+      }
+    ) })
+  ] });
+}
+async function pickJobs(jobs) {
+  let chosen = [];
+  const ui = render16(
     /* @__PURE__ */ jsx16(
-      ApplyUI,
+      JobPicker,
       {
-        jobs: jobOptions,
-        state,
+        jobs,
         onSubmit: (selected) => {
-          selectedJobIds = selected;
+          chosen = selected;
+          ui.unmount();
         }
       }
     )
   );
-  const updateState = (newState) => {
-    state = { ...state, ...newState };
-    rerender(
-      /* @__PURE__ */ jsx16(
-        ApplyUI,
-        {
-          jobs: jobOptions,
-          state,
-          onSubmit: (selected) => {
-            selectedJobIds = selected;
-          }
-        }
-      )
+  await ui.waitUntilExit();
+  return chosen;
+}
+async function resolveJobIds(ctx, json2) {
+  const unapplied = await findUnappliedJobs(ctx);
+  const choice = chooseJobs(unapplied);
+  if (choice.kind === "none") throw nothingToApply();
+  if (choice.kind === "apply") return choice.jobs.map((job) => job.jobId);
+  if (json2 || !isInteractive()) {
+    throw ambiguousJobs(unapplied, choice.locales);
+  }
+  const picked = await pickJobs(unapplied);
+  if (picked.length === 0) {
+    throw new UsageError(
+      "No job selected.",
+      "Pass --job-id with the job(s) to apply."
     );
-  };
-  await new Promise((resolve) => {
-    const checkInterval = setInterval(() => {
-      if (selectedJobIds.length > 0 && state.status === "selecting") {
-        clearInterval(checkInterval);
-        resolve();
-      }
-    }, 100);
-  });
-  if (selectedJobIds.length === 0) {
-    unmount();
-    console.log("No jobs selected.");
-    return;
   }
-  updateState({
-    status: "applying",
-    totalJobs: selectedJobIds.length
-  });
-  try {
-    let totalFiles = 0;
-    let totalKeys = 0;
-    let totalRefused = 0;
-    const refusals = [];
-    for (let i = 0; i < selectedJobIds.length; i++) {
-      const jobId = selectedJobIds[i];
-      if (!jobId) continue;
-      updateState({
-        currentJob: jobId,
-        currentJobIndex: i + 1
-      });
-      const { files, keys, refused } = await applyJob(ctx, jobId);
-      totalFiles += files;
-      totalKeys += keys;
-      totalRefused += refused.length;
-      refusals.push(...describeRefusals(refused));
-    }
-    updateState({
-      status: "success",
-      files: totalFiles,
-      keys: totalKeys,
-      refused: totalRefused
-    });
+  return picked;
+}
+async function runApply(opts) {
+  const ctx = await loadPlanContext(process.cwd());
+  const json2 = opts.json ?? false;
+  const jobIds = opts.jobId && opts.jobId.length > 0 ? opts.jobId : await resolveJobIds(ctx, json2);
+  if (json2) {
+    const applied = [];
+    for (const jobId of jobIds) {
+      applied.push({ jobId, ...await applyJob(ctx, jobId) });
+    }
     track("cli_translate_completed", {
       mode: "apply",
-      key_count: totalKeys,
-      locale_count: selectedJobIds.length,
-      job_count: selectedJobIds.length,
-      json: false
-    });
-    await new Promise((resolve) => setTimeout(resolve, 2e3));
-    unmount();
-    for (const line of refusals) console.log(line);
-  } catch (err) {
-    updateState({
-      status: "error",
-      message: err instanceof Error ? err.message : String(err)
+      key_count: applied.reduce((n, a) => n + a.keys, 0),
+      locale_count: new Set(applied.map((a) => a.dstLocale)).size,
+      job_count: applied.length,
+      json: true
     });
-    await new Promise((resolve) => setTimeout(resolve, 2e3));
-    unmount();
-    return exitAfterFlush(1);
-  }
+    jsonSuccess({ applied });
+  }
+  console.log(`Applying ${jobIds.length} job(s)...`);
+  let totalFiles = 0;
+  let totalKeys = 0;
+  let totalRefused = 0;
+  const locales = /* @__PURE__ */ new Set();
+  for (const [i, jobId] of jobIds.entries()) {
+    console.log(`  [${i + 1}/${jobIds.length}] ${jobId}`);
+    const { dstLocale, files, keys, refused } = await applyJob(ctx, jobId);
+    locales.add(dstLocale);
+    totalFiles += files;
+    totalKeys += keys;
+    totalRefused += refused.length;
+    for (const line of describeRefusals(refused)) console.log(line);
+  }
+  track("cli_translate_completed", {
+    mode: "apply",
+    key_count: totalKeys,
+    locale_count: locales.size,
+    job_count: jobIds.length,
+    json: false
+  });
+  console.log(
+    `\u2713 Applied ${totalKeys} keys to ${totalFiles} files from ${jobIds.length} job(s)` + (totalRefused > 0 ? `, ${totalRefused} not applied` : "")
+  );
 }
 
 // src/commands/translate/cancel.tsx
-import { Spinner as Spinner15 } from "@inkjs/ui";
-import { Box as Box17, render as render16, Text as Text17 } from "ink";
+import { Spinner as Spinner14 } from "@inkjs/ui";
+import { Box as Box17, render as render17, Text as Text17 } from "ink";
 import { jsx as jsx17, jsxs as jsxs17 } from "react/jsx-runtime";
 function CancelUI({ state }) {
   if (state.type === "cancelling") {
     return /* @__PURE__ */ jsxs17(Box17, { children: [
-      /* @__PURE__ */ jsx17(Spinner15, {}),
+      /* @__PURE__ */ jsx17(Spinner14, {}),
       /* @__PURE__ */ jsx17(Text17, { children: " Cancelling job\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs17(Box17, { children: [
-        /* @__PURE__ */ jsx17(Text17, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsx17(Text17, { children: " Job cancelled successfully" })
-      ] }),
-      /* @__PURE__ */ jsx17(Box17, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text17, { dimColor: true, children: [
-        "Job ID: ",
-        state.jobId
-      ] }) })
-    ] });
-  }
   return /* @__PURE__ */ jsxs17(Box17, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx17(Text17, { color: "red", children: "\u2717 Failed to cancel job" }),
-    /* @__PURE__ */ jsx17(Text17, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs17(Box17, { children: [
+      /* @__PURE__ */ jsx17(Text17, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsx17(Text17, { children: " Job cancelled successfully" })
+    ] }),
+    /* @__PURE__ */ jsx17(Box17, { marginTop: 1, children: /* @__PURE__ */ jsxs17(Text17, { dimColor: true, children: [
+      "Job ID: ",
+      state.jobId
+    ] }) })
   ] });
 }
+async function cancelJob(jobId) {
+  const { project } = await loadPlanContext(process.cwd());
+  const client3 = await getAuthenticatedConvexClient();
+  await client3.action(api.translations.cancelJob, {
+    organizationId: project.organizationId,
+    jobId
+  });
+}
 async function runCancel(opts) {
   if (opts.json) {
-    try {
-      if (!opts.jobId) {
-        jsonError("--job-id is required");
-      }
-      const convexClient = await getAuthenticatedConvexClient();
-      const baseDir = process.cwd();
-      const config3 = readConfig(baseDir);
-      if (!config3) {
-        jsonError(
-          "No tolkbot.json found. Run 'tolkbot init' to create one."
-        );
-      }
-      const project = await convexClient.query(
-        api.projects.getProjectForCli,
-        { projectId: config3.config.projectId }
-      );
-      if (!project) {
-        jsonError(
-          "Project not found. Please run 'tolkbot init' again."
-        );
-      }
-      setTelemetryOrganization(project.organizationId);
-      await convexClient.action(api.translations.cancelJob, {
-        organizationId: project.organizationId,
-        jobId: opts.jobId
-      });
-      jsonSuccess({ jobId: opts.jobId, ok: true });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    await cancelJob(opts.jobId);
+    jsonSuccess({ jobId: opts.jobId, ok: true });
   }
-  let { unmount } = render16(/* @__PURE__ */ jsx17(CancelUI, { state: { type: "cancelling" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx17(CancelUI, { state: { type: "cancelling" } })
+  );
   try {
-    if (!opts.jobId) {
-      throw new Error("--job-id is required");
-    }
-    const convexClient = await getAuthenticatedConvexClient();
-    const baseDir = process.cwd();
-    const config3 = readConfig(baseDir);
-    if (!config3) {
-      throw new Error(
-        "No tolkbot.json found. Run 'tolkbot init' to create one."
-      );
-    }
-    const project = await convexClient.query(
-      api.projects.getProjectForCli,
-      {
-        projectId: config3.config.projectId
-      }
-    );
-    if (!project) {
-      throw new Error(
-        "Project not found. Please run 'tolkbot init' again."
-      );
-    }
-    setTelemetryOrganization(project.organizationId);
-    await convexClient.action(api.translations.cancelJob, {
-      organizationId: project.organizationId,
-      jobId: opts.jobId
-    });
-    unmount();
-    const successUi = render16(
-      /* @__PURE__ */ jsx17(CancelUI, { state: { type: "success", jobId: opts.jobId } })
-    );
-    unmount = successUi.unmount;
-    await successUi.waitUntilExit();
-  } catch (error62) {
+    await cancelJob(opts.jobId);
+  } finally {
     unmount();
-    const errorUi = render16(
-      /* @__PURE__ */ jsx17(
-        CancelUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await errorUi.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render17(
+    /* @__PURE__ */ jsx17(CancelUI, { state: { type: "success", jobId: opts.jobId } })
+  ).unmount();
 }
 
 // src/commands/translate/edit.tsx
 import path11 from "path";
-import { Spinner as Spinner16 } from "@inkjs/ui";
-import { Box as Box18, render as render17, Text as Text18 } from "ink";
+import { Spinner as Spinner15 } from "@inkjs/ui";
+import { Box as Box18, render as render18, Text as Text18 } from "ink";
 
 // src/utils/locale-files.ts
 import path10 from "path";
@@ -32280,51 +31876,44 @@ import { jsx as jsx18, jsxs as jsxs18 } from "react/jsx-runtime";
 function EditUI({ state }) {
   if (state.type === "editing") {
     return /* @__PURE__ */ jsxs18(Box18, { children: [
-      /* @__PURE__ */ jsx18(Spinner16, {}),
+      /* @__PURE__ */ jsx18(Spinner15, {}),
       /* @__PURE__ */ jsx18(Text18, { children: " Editing translation\u2026" })
     ] });
   }
-  if (state.type === "success") {
-    return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs18(Box18, { children: [
-        /* @__PURE__ */ jsx18(Text18, { color: "green", children: "\u2713" }),
-        /* @__PURE__ */ jsxs18(Text18, { children: [
-          " ",
-          "Updated ",
-          /* @__PURE__ */ jsx18(Text18, { bold: true, children: state.key })
-        ] })
-      ] }),
-      /* @__PURE__ */ jsx18(Box18, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text18, { dimColor: true, children: state.value }) }),
-      /* @__PURE__ */ jsx18(Box18, { marginTop: 1, children: /* @__PURE__ */ jsxs18(Text18, { dimColor: true, children: [
-        "File: ",
-        state.filePath
-      ] }) })
-    ] });
-  }
   return /* @__PURE__ */ jsxs18(Box18, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx18(Text18, { color: "red", children: "\u2717 Failed to edit translation" }),
-    /* @__PURE__ */ jsx18(Text18, { dimColor: true, children: state.message })
+    /* @__PURE__ */ jsxs18(Box18, { children: [
+      /* @__PURE__ */ jsx18(Text18, { color: "green", children: "\u2713" }),
+      /* @__PURE__ */ jsxs18(Text18, { children: [
+        " ",
+        "Updated ",
+        /* @__PURE__ */ jsx18(Text18, { bold: true, children: state.key })
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx18(Box18, { paddingLeft: 2, children: /* @__PURE__ */ jsx18(Text18, { dimColor: true, children: state.value }) }),
+    /* @__PURE__ */ jsx18(Box18, { marginTop: 1, children: /* @__PURE__ */ jsxs18(Text18, { dimColor: true, children: [
+      "File: ",
+      state.filePath
+    ] }) })
   ] });
 }
 async function performEdit(opts) {
   const baseDir = process.cwd();
   const config3 = readConfig(baseDir);
-  if (!config3) {
-    throw new Error(
-      "No tolkbot.json found. Run 'tolkbot init' to create one."
-    );
-  }
+  if (!config3) throw noConfigError();
   const localeFiles = await findLocaleFiles(baseDir);
   const files = localeFiles.get(opts.locale);
   if (!files || files.length === 0) {
-    throw new Error(
-      `No translation files found for locale "${opts.locale}". Available locales: ${[...localeFiles.keys()].join(", ") || "none"}`
+    throw new CliError(
+      `No translation files found for locale "${opts.locale}".`,
+      `Available locales: ${[...localeFiles.keys()].join(", ") || "none"}.`,
+      "no_translation_files"
     );
   }
   const targetFile = resolveFileForKey(files, opts.key, opts.namespace);
   if (!targetFile) {
-    throw new Error(
-      `Could not determine target file for key "${opts.key}" in locale "${opts.locale}".`
+    throw new CliError(
+      `Could not determine target file for key "${opts.key}" in locale "${opts.locale}".`,
+      "Pass --namespace to say which file the key belongs to."
     );
   }
   const keyInFile = resolveKeyInFile(
@@ -32351,47 +31940,199 @@ async function performEdit(opts) {
 }
 async function runEdit(opts) {
   if (opts.json) {
-    try {
-      const result = await performEdit(opts);
-      jsonSuccess({
-        file: result.filePath,
-        key: result.key,
-        value: result.value
-      });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    const result2 = await performEdit(opts);
+    jsonSuccess({
+      file: result2.filePath,
+      key: result2.key,
+      value: result2.value
+    });
   }
-  let { unmount } = render17(/* @__PURE__ */ jsx18(EditUI, { state: { type: "editing" } }));
+  const { unmount } = renderTransient(/* @__PURE__ */ jsx18(EditUI, { state: { type: "editing" } }));
+  let result;
   try {
-    const result = await performEdit(opts);
-    unmount();
-    const ui = render17(/* @__PURE__ */ jsx18(EditUI, { state: { type: "success", ...result } }));
-    unmount = ui.unmount;
-    await ui.waitUntilExit();
-  } catch (error62) {
+    result = await performEdit(opts);
+  } finally {
     unmount();
-    const ui = render17(
-      /* @__PURE__ */ jsx18(
-        EditUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
-        }
-      )
-    );
-    await ui.waitUntilExit();
-    return exitAfterFlush(1);
   }
+  render18(/* @__PURE__ */ jsx18(EditUI, { state: { type: "success", ...result } })).unmount();
 }
 
 // src/commands/translate/run.tsx
-import { render as render18 } from "ink";
+import { render as render19 } from "ink";
+
+// ../shared/src/conditions/index.ts
+var BILLING_BLOCKED = "BILLING_BLOCKED";
+
+// ../shared/src/projects/localeSetup.ts
+var LOCALE_SETUP_STALE_MS = 15 * 60 * 1e3;
+
+// ../shared/src/projects/index.ts
+var PROJECT_ARCHIVED = "PROJECT_ARCHIVED";
+
+// src/utils/error-codes.ts
+var EXIT_CODES = {
+  success: 0,
+  failure: 1,
+  usage: 2,
+  auth: 3,
+  billing: 4,
+  network: 5
+};
+var ERROR_CODES = {
+  // 1: the command ran and failed
+  failed: EXIT_CODES.failure,
+  internal: EXIT_CODES.failure,
+  no_config: EXIT_CODES.failure,
+  project_not_found: EXIT_CODES.failure,
+  repository_not_connected: EXIT_CODES.failure,
+  no_translation_files: EXIT_CODES.failure,
+  no_target_languages: EXIT_CODES.failure,
+  not_found: EXIT_CODES.failure,
+  job_not_found: EXIT_CODES.failure,
+  job_not_finished: EXIT_CODES.failure,
+  job_failed: EXIT_CODES.failure,
+  job_cancelled: EXIT_CODES.failure,
+  job_timed_out: EXIT_CODES.failure,
+  nothing_to_apply: EXIT_CODES.failure,
+  validation_failed: EXIT_CODES.failure,
+  login_failed: EXIT_CODES.failure,
+  // 2: usage
+  usage: EXIT_CODES.usage,
+  // 3: not authenticated, or not allowed
+  not_authenticated: EXIT_CODES.auth,
+  token_expired: EXIT_CODES.auth,
+  token_rejected: EXIT_CODES.auth,
+  signed_out: EXIT_CODES.auth,
+  project_archived: EXIT_CODES.auth,
+  // 4: billing
+  no_subscription: EXIT_CODES.billing,
+  out_of_credits: EXIT_CODES.billing,
+  payment_failed: EXIT_CODES.billing,
+  // 5: could not reach TolkBot
+  network: EXIT_CODES.network
+};
+function exitCodeFor(code) {
+  return ERROR_CODES[code];
+}
+
+// src/utils/report.ts
+function convexErrorData(error62) {
+  if (error62 instanceof Error && error62.name === "ConvexError" && "data" in error62) {
+    return { data: error62.data };
+  }
+  return null;
+}
+function billingHint() {
+  return `Manage billing at ${env.TOLKBOT_WEB_URL}/subscription.`;
+}
+var BILLING_MESSAGES = [
+  { startsWith: "No billing account", code: "no_subscription" },
+  { startsWith: "Insufficient credits", code: "out_of_credits" },
+  { startsWith: "Overage limit", code: "out_of_credits" }
+];
+function fromConvexError(data) {
+  if (typeof data === "string") {
+    const billing = BILLING_MESSAGES.find(
+      (m) => data.startsWith(m.startsWith)
+    );
+    if (billing) return new CliError(data, billingHint(), billing.code);
+    return new CliError(data);
+  }
+  if (typeof data !== "object" || data === null) return null;
+  const { code, message } = data;
+  const text = typeof message === "string" ? message : describeError(data);
+  if (code === PROJECT_ARCHIVED) {
+    return new CliError(text, void 0, "project_archived");
+  }
+  if (code === BILLING_BLOCKED) {
+    return new CliError(text, billingHint(), "payment_failed");
+  }
+  return typeof message === "string" ? new CliError(message) : null;
+}
+function serverMessage(message) {
+  const unwrapped = message.replace(
+    /^\[Request ID: [^\]]*\] Server Error\s*/,
+    ""
+  );
+  const uncaught = /Uncaught (?:\w*Error: )?([\s\S]*?)(?:\n\s+at |$)/.exec(
+    unwrapped
+  );
+  return (uncaught?.[1] ?? unwrapped).trim();
+}
+function argumentError(message) {
+  if (!message.includes("ArgumentValidationError")) return null;
+  const path12 = /Path: \.?(\S+)/.exec(message)?.[1];
+  const value = /Value: (.+)/.exec(message)?.[1];
+  return new UsageError(
+    path12 && value ? `TolkBot refused ${value} as ${path12}.` : "TolkBot refused the arguments.",
+    "Check the id or value passed; list ids with the command's list subcommand."
+  );
+}
+function toCliError(error62) {
+  if (error62 instanceof CliError) return error62;
+  const convex = convexErrorData(error62);
+  if (convex) {
+    const known = fromConvexError(convex.data);
+    if (known) return known;
+  }
+  if (isUnauthenticatedError(error62)) {
+    return new CliError(
+      "Not authenticated.",
+      "Run 'tolkbot auth login', or set $TOLKBOT_TOKEN for CI and headless environments.",
+      "not_authenticated"
+    );
+  }
+  if (isNetworkError(error62)) {
+    return new CliError(
+      "Could not reach TolkBot.",
+      "Check the network connection and try again.",
+      "network"
+    );
+  }
+  const message = describeError(error62);
+  const refused = argumentError(message);
+  if (refused) return refused;
+  if (message.includes("Server Error")) {
+    return new CliError(serverMessage(message));
+  }
+  const internal = new CliError(message, void 0, "internal");
+  if (error62 instanceof Error) internal.stack = error62.stack;
+  return internal;
+}
+function errorPayload(error62) {
+  return {
+    error: {
+      code: error62.code,
+      message: error62.baseMessage,
+      hint: error62.hint ?? null
+    }
+  };
+}
+function reportError(error62) {
+  const cli = toCliError(error62);
+  if (wantsJson()) {
+    console.error(JSON.stringify(errorPayload(cli), null, 2));
+  } else {
+    console.error(`\u2717 ${cli.baseMessage}`);
+    if (cli.hint) console.error(`  ${cli.hint}`);
+    if (cli.code === "internal" && cli.stack) {
+      console.error("");
+      console.error(cli.stack);
+    }
+  }
+  const code = exitCodeFor(cli.code);
+  process.exitCode = code;
+  return code;
+}
+function fail(error62) {
+  const cli = toCliError(error62);
+  throw requestExit(exitCodeFor(cli.code), () => {
+    reportError(cli);
+  });
+}
 
 // src/commands/translate/run-ui.tsx
-import { Spinner as Spinner17 } from "@inkjs/ui";
+import { Spinner as Spinner16 } from "@inkjs/ui";
 import { Box as Box19, Text as Text19 } from "ink";
 import { jsx as jsx19, jsxs as jsxs19 } from "react/jsx-runtime";
 function JobLink({ jobId }) {
@@ -32421,7 +32162,7 @@ function JobRow({ srcLocale, job }) {
   }
   if (status === "generating") {
     return /* @__PURE__ */ jsxs19(Box19, { children: [
-      /* @__PURE__ */ jsx19(Spinner17, {}),
+      /* @__PURE__ */ jsx19(Spinner16, {}),
       /* @__PURE__ */ jsxs19(Text19, { children: [
         " ",
         srcLocale,
@@ -32436,7 +32177,7 @@ function JobRow({ srcLocale, job }) {
     const percent = progress.total > 0 ? Math.round(processed / progress.total * 100) : 0;
     return /* @__PURE__ */ jsxs19(Box19, { flexDirection: "column", children: [
       /* @__PURE__ */ jsxs19(Box19, { children: [
-        /* @__PURE__ */ jsx19(Spinner17, {}),
+        /* @__PURE__ */ jsx19(Spinner16, {}),
         /* @__PURE__ */ jsxs19(Text19, { children: [
           " ",
           srcLocale,
@@ -32561,13 +32302,31 @@ function isJobFinished(status) {
 function isJobUnsuccessful(status) {
   return status === "failed" || status === "cancelled";
 }
+function unsuccessfulJobError(jobId, status) {
+  if (status === "cancelled") {
+    return new CliError(
+      `Translation job ${jobId} was cancelled.`,
+      void 0,
+      "job_cancelled"
+    );
+  }
+  if (status === "failed") {
+    return new CliError(
+      `Translation job ${jobId} failed.`,
+      `See it at ${env.TOLKBOT_WEB_URL}/translation-jobs/${jobId}.`,
+      "job_failed"
+    );
+  }
+  return null;
+}
 var JOB_WAIT_TIMEOUT_MS = 60 * 6e4;
 var JOB_POLL_MS = 500;
 var JobWaitTimeoutError = class extends CliError {
   constructor(jobId, timeoutMs) {
     super(
       `Translation job ${jobId} was still running after ${Math.round(timeoutMs / 6e4)} minutes, so the CLI stopped waiting.`,
-      `The job keeps running. Check it with 'tolkbot translate status --job-id ${jobId}' and apply it with 'tolkbot translate apply --job-id ${jobId}' once it finishes.`
+      `The job keeps running. Check it with 'tolkbot translate status --job-id ${jobId}' and apply it with 'tolkbot translate apply --job-id ${jobId}' once it finishes.`,
+      "job_timed_out"
     );
     this.jobId = jobId;
     this.name = "JobWaitTimeoutError";
@@ -32583,7 +32342,11 @@ async function waitForJob(jobId, read, opts = {}) {
   for (; ; ) {
     const summary = await read();
     if (!summary) {
-      throw new CliError(`Translation job ${jobId} was not found.`);
+      throw new CliError(
+        `Translation job ${jobId} was not found.`,
+        void 0,
+        "job_not_found"
+      );
     }
     opts.onProgress?.(summary);
     if (isJobFinished(summary.status)) return summary;
@@ -32641,67 +32404,68 @@ async function runTranslate(opts) {
   if (opts.all) {
     dstLocales = project.targetLanguages;
     if (dstLocales.length === 0) {
-      throw new Error(
-        `No target languages configured.
-Please configure them in the project settings at:
-${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
+      throw new CliError(
+        "No target languages configured.",
+        `Configure them in the project settings at ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings.`,
+        "no_target_languages"
       );
     }
   } else if (opts.dst) {
     dstLocales = [opts.dst];
   } else {
-    throw new Error("Either --dst or --all must be provided");
+    throw new UsageError(
+      "Either --dst <locale> or --all must be provided."
+    );
   }
   const planOpts = { retranslateUntracked: opts.retranslateUntracked };
   const tasksFor = async (dstLocale) => opts.tasks ? { tasks: await loadTasksFromFile(opts.tasks), plan: void 0 } : await generateTasks(ctx, srcLocale, dstLocale, planOpts);
   if (opts.json) {
     const results = [];
-    try {
-      for (const dstLocale of dstLocales) {
-        const { tasks, plan } = await tasksFor(dstLocale);
-        const summary = plan ? summarize(plan) : void 0;
-        if (tasks.length === 0) {
-          results.push({
-            dstLocale,
-            status: "up-to-date",
-            plan: summary
-          });
-          continue;
-        }
-        try {
-          const { jobId, summary: job } = await runTranslationJob({
-            projectId,
-            organizationId: project.organizationId,
-            framework,
-            srcLocale,
-            dstLocale,
-            tasks
-          });
-          results.push({
-            dstLocale,
-            jobId,
-            status: job.status,
-            completed: job.completed,
-            failed: job.failed,
-            total: job.total,
-            error: job.status === "cancelled" ? "The job was cancelled." : void 0,
-            plan: summary
-          });
-        } catch (error62) {
-          if (!(error62 instanceof JobWaitTimeoutError)) throw error62;
-          results.push({
-            dstLocale,
-            jobId: error62.jobId,
-            status: "timed-out",
-            error: error62.message,
-            plan: summary
-          });
-          break;
-        }
-        if (results.at(-1)?.status === "cancelled") break;
+    let failure3 = null;
+    for (const dstLocale of dstLocales) {
+      const { tasks, plan } = await tasksFor(dstLocale);
+      const summary = plan ? summarize(plan) : void 0;
+      if (tasks.length === 0) {
+        results.push({
+          dstLocale,
+          status: "up-to-date",
+          plan: summary
+        });
+        continue;
       }
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
+      try {
+        const { jobId, summary: job } = await runTranslationJob({
+          projectId,
+          organizationId: project.organizationId,
+          framework,
+          srcLocale,
+          dstLocale,
+          tasks
+        });
+        results.push({
+          dstLocale,
+          jobId,
+          status: job.status,
+          completed: job.completed,
+          failed: job.failed,
+          total: job.total,
+          error: job.status === "cancelled" ? "The job was cancelled." : void 0,
+          plan: summary
+        });
+        failure3 ??= unsuccessfulJobError(jobId, job.status);
+      } catch (error62) {
+        if (!(error62 instanceof JobWaitTimeoutError)) throw error62;
+        results.push({
+          dstLocale,
+          jobId: error62.jobId,
+          status: "timed-out",
+          error: error62.message,
+          plan: summary
+        });
+        failure3 ??= error62;
+        break;
+      }
+      if (results.at(-1)?.status === "cancelled") break;
     }
     track("cli_translate_completed", {
       mode: "run",
@@ -32710,18 +32474,15 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
       job_count: results.filter((r) => r.jobId).length,
       json: true
     });
-    const ok = results.every(
-      (r) => r.status !== "timed-out" && !isJobUnsuccessful(r.status)
-    );
-    if (ok) jsonSuccess({ jobs: results });
+    if (!failure3) jsonSuccess({ jobs: results });
     jsonResult({ jobs: results }, 1);
-    return;
+    fail(failure3);
   }
   const jobs = dstLocales.map((locale) => ({
     dstLocale: locale,
     status: "waiting"
   }));
-  const { rerender, unmount } = render18(
+  const { rerender, unmount } = render19(
     /* @__PURE__ */ jsx20(RunUI, { srcLocale, jobs })
   );
   const updateJob = (locale, update) => {
@@ -32745,6 +32506,7 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
       });
     }
   };
+  let failure2 = null;
   try {
     for (const dstLocale of dstLocales) {
       updateJob(dstLocale, { status: "generating" });
@@ -32783,7 +32545,7 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
           jobId: error62.jobId,
           error: error62.message
         });
-        process.exitCode = 1;
+        failure2 ??= error62;
         skipRemaining(dstLocale, "the CLI stopped waiting for");
         break;
       }
@@ -32795,7 +32557,7 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
           jobId,
           error: "Translation failed"
         });
-        process.exitCode = 1;
+        failure2 ??= unsuccessfulJobError(jobId, summary.status);
       } else if (summary.status === "cancelled") {
         updateJob(dstLocale, {
           status: "error",
@@ -32803,7 +32565,7 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
           jobId,
           error: "The job was cancelled."
         });
-        process.exitCode = 1;
+        failure2 ??= unsuccessfulJobError(jobId, summary.status);
         skipRemaining(dstLocale, "someone cancelled");
         break;
       } else {
@@ -32821,10 +32583,10 @@ ${env.TOLKBOT_WEB_URL}/projects/${project.slug}/settings`
       job_count: jobs.filter((j) => j.jobId).length,
       json: false
     });
-  } catch (err) {
+  } finally {
     unmount();
-    throw err;
   }
+  if (failure2) fail(failure2);
 }
 function summarize(plan) {
   return {
@@ -32836,32 +32598,23 @@ function summarize(plan) {
 }
 
 // src/commands/translate/status.tsx
-import { Spinner as Spinner18 } from "@inkjs/ui";
-import { Box as Box20, render as render19, Text as Text20 } from "ink";
+import { Spinner as Spinner17 } from "@inkjs/ui";
+import { Box as Box20, render as render20, Text as Text20 } from "ink";
 import { jsx as jsx21, jsxs as jsxs20 } from "react/jsx-runtime";
 function StatusUI({ state }) {
   if (state.type === "loading") {
     return /* @__PURE__ */ jsxs20(Box20, { children: [
-      /* @__PURE__ */ jsx21(Spinner18, {}),
+      /* @__PURE__ */ jsx21(Spinner17, {}),
       /* @__PURE__ */ jsx21(Text20, { children: " Loading job status\u2026" })
     ] });
   }
-  if (state.type === "not-found") {
-    return /* @__PURE__ */ jsx21(Box20, { children: /* @__PURE__ */ jsx21(Text20, { color: "red", children: "\u2717 Job not found" }) });
-  }
-  if (state.type === "error") {
-    return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx21(Text20, { color: "red", children: "\u2717 Error fetching job status" }),
-      /* @__PURE__ */ jsx21(Text20, { dimColor: true, children: state.message })
-    ] });
-  }
   const { summary } = state;
   const processed = summary.completed + summary.failed;
   const progress = summary.total > 0 ? Math.round(processed / summary.total * 100) : 0;
   if (state.type === "running") {
     return /* @__PURE__ */ jsxs20(Box20, { flexDirection: "column", children: [
       /* @__PURE__ */ jsxs20(Box20, { children: [
-        /* @__PURE__ */ jsx21(Spinner18, {}),
+        /* @__PURE__ */ jsx21(Spinner17, {}),
         /* @__PURE__ */ jsx21(Text20, { children: " Job is running\u2026" })
       ] }),
       /* @__PURE__ */ jsx21(Box20, { marginTop: 1, children: /* @__PURE__ */ jsxs20(Text20, { children: [
@@ -32912,96 +32665,59 @@ function StatusUI({ state }) {
   ] });
 }
 async function fetchJobSummary(jobId) {
-  const convexClient = await getAuthenticatedConvexClient();
-  const baseDir = process.cwd();
-  const config3 = readConfig(baseDir);
-  if (!config3) {
-    throw new Error(
-      "No tolkbot.json found. Run 'tolkbot init' to create one."
-    );
-  }
-  const project = await convexClient.query(api.projects.getProjectForCli, {
-    projectId: config3.config.projectId
-  });
-  if (!project) {
-    throw new Error("Project not found. Please run 'tolkbot init' again.");
-  }
-  setTelemetryOrganization(project.organizationId);
-  const summary = await convexClient.query(api.translations.getJobSummary, {
+  const { client: client3, project } = await loadPlanContext(process.cwd());
+  const summary = await client3.query(api.translations.getJobSummary, {
     organizationId: project.organizationId,
     jobId
   });
+  if (!summary) {
+    throw new CliError(
+      `Translation job ${jobId} was not found in this project.`,
+      void 0,
+      "job_not_found"
+    );
+  }
   return summary;
 }
 async function runStatus(opts) {
   if (opts.json) {
-    try {
-      if (!opts.jobId) {
-        jsonError("--job-id is required");
-      }
-      const summary = await fetchJobSummary(opts.jobId);
-      if (!summary) {
-        jsonError("Job not found");
-      }
-      jsonSuccess({
-        jobId: opts.jobId,
-        status: summary.status,
-        completed: summary.completed,
-        failed: summary.failed,
-        total: summary.total
-      });
-    } catch (error62) {
-      jsonError(error62 instanceof Error ? error62.message : String(error62));
-    }
+    const summary2 = await fetchJobSummary(opts.jobId);
+    const output2 = {
+      jobId: opts.jobId,
+      status: summary2.status,
+      completed: summary2.completed,
+      failed: summary2.failed,
+      total: summary2.total
+    };
+    const failure2 = unsuccessfulJobError(opts.jobId, summary2.status);
+    if (!failure2) jsonSuccess(output2);
+    jsonResult(output2, 1);
+    fail(failure2);
   }
-  let { unmount } = render19(/* @__PURE__ */ jsx21(StatusUI, { state: { type: "loading" } }));
+  const { unmount } = renderTransient(
+    /* @__PURE__ */ jsx21(StatusUI, { state: { type: "loading" } })
+  );
+  let summary;
   try {
-    if (!opts.jobId) {
-      throw new Error("--job-id is required");
-    }
-    const summary = await fetchJobSummary(opts.jobId);
-    if (!summary) {
-      unmount();
-      const notFoundUi = render19(
-        /* @__PURE__ */ jsx21(StatusUI, { state: { type: "not-found" } })
-      );
-      unmount = notFoundUi.unmount;
-      await notFoundUi.waitUntilExit();
-      return exitAfterFlush(1);
-    }
-    const isCompleted = isJobFinished(summary.status);
-    unmount();
-    const finalUi = render19(
-      /* @__PURE__ */ jsx21(
-        StatusUI,
-        {
-          state: {
-            type: isCompleted ? "completed" : "running",
-            summary
-          }
-        }
-      )
-    );
-    unmount = finalUi.unmount;
-    await finalUi.waitUntilExit();
-    if (isJobUnsuccessful(summary.status)) {
-      return exitAfterFlush(1);
-    }
-  } catch (error62) {
+    summary = await fetchJobSummary(opts.jobId);
+  } finally {
     unmount();
-    const errorUi = render19(
-      /* @__PURE__ */ jsx21(
-        StatusUI,
-        {
-          state: {
-            type: "error",
-            message: error62 instanceof Error ? error62.message : String(error62)
-          }
+  }
+  const finalUi = render20(
+    /* @__PURE__ */ jsx21(
+      StatusUI,
+      {
+        state: {
+          type: isJobFinished(summary.status) ? "completed" : "running",
+          summary
         }
-      )
-    );
-    await errorUi.waitUntilExit();
-    return exitAfterFlush(1);
+      }
+    )
+  );
+  finalUi.unmount();
+  if (isJobUnsuccessful(summary.status)) {
+    const failure2 = unsuccessfulJobError(opts.jobId, summary.status);
+    if (failure2) fail(failure2);
   }
 }
 
@@ -33040,14 +32756,12 @@ translateCommand.command("run").description("Run translation job (auto-generates
   });
   const parsed = validateOrExit(schema, opts);
   if (!parsed.dst && !parsed.all) {
-    console.error(
-      "Error: Either --dst <locale> or --all must be provided"
+    throw new UsageError(
+      "Either --dst <locale> or --all must be provided."
     );
-    return exitAfterFlush(1);
   }
   if (parsed.dst && parsed.all) {
-    console.error("Error: Cannot use both --dst and --all");
-    return exitAfterFlush(1);
+    throw new UsageError("Cannot use both --dst and --all.");
   }
   await runTranslate(parsed);
 });
@@ -33065,8 +32779,7 @@ translateCommand.command("adopt").description(
   });
   const parsed = validateOrExit(schema, opts);
   if (parsed.dst && parsed.all) {
-    console.error("Error: Cannot use both --dst and --all");
-    return exitAfterFlush(1);
+    throw new UsageError("Cannot use both --dst and --all.");
   }
   await runAdopt(parsed);
 });
@@ -33079,7 +32792,7 @@ translateCommand.command("cancel").description("Cancel translation job by job ID
   await runCancel(parsed);
 });
 translateCommand.command("apply").description(
-  "Apply translation job results (interactive select or specify --job-id)"
+  "Apply finished translation jobs to the working tree. Without --job-id: the one unapplied job per language, or a picker in a terminal"
 ).option("--job-id <id...>", "Job ID(s) to apply").option("--json", "Output as JSON (machine-readable)").action(async (opts) => {
   const schema = z7.object({
     jobId: z7.array(z7.string()).optional(),
@@ -33109,7 +32822,7 @@ translateCommand.command("status").description("Check status of translation job
 });
 
 // src/commands/validate.tsx
-import { Box as Box21, render as render20, Text as Text21 } from "ink";
+import { Box as Box21, render as render21, Text as Text21 } from "ink";
 
 // ../ai/src/validators/placeholders.ts
 var IDENTIFIER = /^[A-Za-z0-9_$][A-Za-z0-9_$.[\]-]*$/;
@@ -34275,11 +33988,24 @@ function emit(report, json2) {
   });
   if (json2) {
     jsonResult(report, exitCode);
+    if (!report.valid) fail(validationFailure(report));
     return;
   }
-  render20(/* @__PURE__ */ jsx22(ReportUI, { report })).unmount();
+  render21(/* @__PURE__ */ jsx22(ReportUI, { report })).unmount();
   process.exitCode = exitCode;
 }
+function validationFailure(report) {
+  if (report.issues.some((issue2) => issue2.rule === "no-config")) {
+    return noConfigError();
+  }
+  const { error: error62, warning } = report.counts;
+  const found = report.strict ? `${error62} error(s) and ${warning} warning(s)` : `${error62} error(s)`;
+  return new CliError(
+    `Validation found ${found}.`,
+    "The report on stdout lists each one.",
+    "validation_failed"
+  );
+}
 async function runValidate(opts = {}) {
   const json2 = opts.json ?? false;
   const strict = opts.strict ?? false;
@@ -34324,16 +34050,17 @@ function commandPath(command) {
   return names.join(" ");
 }
 function buildProgram() {
-  const program2 = new Command6().name("tolkbot").description("Localization workflow for your repo").version(version, "-v, --version", "Output the version number").helpOption("-h, --help", "Show help").helpCommand("help [command]", "Show help for a command").option(
+  const program = new Command6().name("tolkbot").description("Localization workflow for your repo").version(version, "-v, --version", "Output the version number").helpOption("-h, --help", "Show help").helpCommand("help [command]", "Show help for a command").option(
     "--token <token>",
     `Auth token to use for this invocation (overrides $${TOKEN_ENV_VAR} and the stored token)`
   );
-  program2.hook("preAction", (thisCommand, actionCommand) => {
+  program.hook("preAction", (thisCommand, actionCommand) => {
     const { token } = thisCommand.opts();
     setTokenOverride(token);
+    resolveJsonOption(actionCommand);
     beginCommand(commandPath(actionCommand), version);
   });
-  program2.command("init").description("Initialize TolkBot in the current repo").option("--force", "Overwrite existing config").option(
+  program.command("init").description("Initialize TolkBot in the current repo").option("--force", "Overwrite existing config").option(
     "-y, --yes",
     "Skip all prompts, accepting detected settings. Required outside a terminal."
   ).option("--json", "Output the result as JSON (implies --yes)").option("--base <locale>", "Base locale (default: detected, else en)").option(
@@ -34346,28 +34073,75 @@ function buildProgram() {
     "--install",
     "Also install i18n dependencies and scaffold files. Off by default when non-interactive."
   ).action((opts) => runInit(opts));
-  program2.command("validate").description("Validate translation files and configuration").option("--json", "Output the report as JSON").option(
+  program.command("validate").description("Validate translation files and configuration").option("--json", "Output the report as JSON").option(
     "--strict",
     "Treat warnings (incomplete locales) as errors. Off by default, since a locale is normally behind the base while a translation job is in flight."
   ).action(
     (opts) => runValidate(opts)
   );
-  program2.addCommand(authCommand);
-  program2.addCommand(glossaryCommand);
-  program2.addCommand(learningsCommand);
-  program2.addCommand(telemetryCommand);
-  program2.addCommand(translateCommand);
-  program2.addHelpText("after", PROGRAM_HELP_FOOTER);
-  return program2;
+  program.addCommand(authCommand);
+  program.addCommand(glossaryCommand);
+  program.addCommand(learningsCommand);
+  program.addCommand(telemetryCommand);
+  program.addCommand(translateCommand);
+  program.addHelpText("after", PROGRAM_HELP_FOOTER);
+  forEachCommand(program, (command) => {
+    addNoJsonOption(command);
+    reportUsageErrors(command);
+  });
+  return program;
+}
+function forEachCommand(command, visit2) {
+  visit2(command);
+  for (const sub of command.commands) forEachCommand(sub, visit2);
+}
+function jsonOptionOf(command) {
+  return command.options.find((option) => option.long === "--json");
+}
+function addNoJsonOption(command) {
+  const json2 = jsonOptionOf(command);
+  if (!json2 || command.options.some((o) => o.long === "--no-json")) return;
+  json2.description = `${json2.description.replace(" (machine-readable)", "")}, the default without a terminal`;
+  command.option("--no-json", "Output text, even without a terminal");
+}
+function resolveJsonOption(command) {
+  if (!jsonOptionOf(command)) {
+    setJsonOutput(null);
+    return;
+  }
+  const json2 = resolveJson(command.opts().json);
+  command.setOptionValue("json", json2);
+  setJsonOutput(json2);
+}
+function reportUsageErrors(command) {
+  command.exitOverride().configureOutput({
+    outputError: (message, write) => {
+      if (wantsJson()) {
+        const help = ["tolkbot", commandPath(command), "--help"].filter(Boolean).join(" ");
+        pendingUsageError = new UsageError(
+          message.replace(/^error:\s*/, "").trim(),
+          `Run '${help}'.`
+        );
+        return;
+      }
+      write(message);
+    }
+  });
 }
+var pendingUsageError = null;
 var PROGRAM_HELP_FOOTER = `
 Examples:
   $ tolkbot auth login
-  $ tolkbot init --yes
-  $ tolkbot translate plan --dst nb --json
+  $ tolkbot init
   $ tolkbot translate run --all
-  $ tolkbot translate apply --job-id <id>
-  $ tolkbot validate --strict
+  $ tolkbot translate apply
+  $ tolkbot validate
+
+Without a terminal (an agent, CI), nothing prompts: commands take their
+defaults and print JSON (--no-json for text). A failure prints
+{"error": {"code", "message", "hint"}} on stderr and exits with
+  1 failed   2 usage   3 not logged in or not allowed
+  4 billing  5 could not reach TolkBot
 
 Environment variables:
   ${TOKEN_ENV_VAR}       Auth token for CI and headless environments (--token overrides it)
@@ -34388,8 +34162,14 @@ async function main() {
       exitCode = error62.code;
       return;
     }
-    exitCode = 1;
-    throw error62;
+    if (error62 instanceof CommanderError) {
+      if (error62.exitCode === 0) return;
+      exitCode = EXIT_CODES.usage;
+      process.exitCode = exitCode;
+      if (pendingUsageError) reportError(pendingUsageError);
+      return;
+    }
+    exitCode = reportError(error62);
   } finally {
     completeCommand(exitCode);
     await flushTelemetry();
@@ -34397,7 +34177,9 @@ async function main() {
 }
 
 // src/index.ts
-main().catch(reportFatal);
+main().catch((error62) => {
+  process.exitCode = reportError(error62);
+});
 /*! Bundled license information:
 
 is-extglob/index.js: