@hasna/skills 0.1.37 → 0.1.39

package/bin/index.js

@@ -1910,7 +1910,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@hasna/skills",
-    version: "0.1.37",
+    version: "0.1.39",
     description: "Skills library for AI coding agents",
     type: "module",
     bin: {
@@ -6661,6 +6661,7 @@ var init_pricing = __esm(() => {
   init_skill_aliases();
   MUSIC_ALBUM_SONG_COUNTS = [7, 14, 21];
   PREMIUM_SKILLS = [
+    { slug: "icon-pack", displayName: "Icon Pack", tier: "premium", costCents: 200, providers: ["hosted"], description: "Hosted coordinated icon pack with SVGs, transparent PNGs, size variants, and manifest" },
     { slug: "logo-design", displayName: "Logo Design", tier: "premium", costCents: 50, providers: ["hosted"], description: "Hosted multi-variant logo package with transparent PNGs, vector-style SVGs, usage notes, and manifest" },
     { slug: "deepresearch", displayName: "Deep Research", tier: "premium", costCents: 20, providers: ["exa"], description: "Agentic web research with semantic search and synthesis" },
     { slug: "playlist-maker", displayName: "Playlist Maker", tier: "premium", costCents: 30, providers: ["exa", "gemini-3-pro"], description: "Curated playlist with research, track selection, and album art" },
@@ -6773,8 +6774,8 @@ function sanitizePublicDiscoveryText(text) {
 function publicDiscoveryEnvVars(skillName, envVars) {
   if (!isPremiumSkill(skillName))
     return envVars;
-  const filtered = envVars.filter((envVar) => !VENDOR_ENV_PREFIXES.some((prefix) => envVar.startsWith(prefix)));
-  return filtered.includes("SKILL_API_KEY") ? filtered : ["SKILL_API_KEY", ...filtered];
+  const filtered = envVars.filter((envVar) => envVar !== "SKILL_API_KEY" && !VENDOR_ENV_PREFIXES.some((prefix) => envVar.startsWith(prefix)));
+  return filtered.includes("SKILLS_API_KEY") ? filtered : ["SKILLS_API_KEY", ...filtered];
 }
 function publicDiscoveryDependencies(skillName, dependencies) {
   if (!isPremiumSkill(skillName))
@@ -6790,7 +6791,7 @@ function publicDiscoveryDocumentation(skill, documentation) {
     `# ${skill.displayName || skill.name}`,
     sanitizePublicDiscoveryText(skill.description),
     `Pricing: ${getPublicSkillPricing(skill.name).formattedCost}.`,
-    "Set `SKILL_API_KEY` for hosted runtime execution. Runtime routing and model selection are managed by the hosted Skills runtime."
+    "Set `SKILLS_API_KEY` or run `skills auth login` for hosted runtime execution. Runtime routing and model selection are managed by the hosted Skills runtime."
   ].join(`
 
 `);
@@ -20907,6 +20908,8 @@ function clearAuthConfig() {
 function getApiKey() {
   if (process.env.SKILLS_API_KEY)
     return process.env.SKILLS_API_KEY;
+  if (process.env.SKILL_API_KEY)
+    return process.env.SKILL_API_KEY;
   return getAuthConfig()?.apiKey || null;
 }
 function normalizeSkillsApiOrigin(apiUrl) {
@@ -21619,7 +21622,8 @@ function getSkillRequirements(name) {
         envVars.delete(envVar);
       }
     }
-    envVars.add("SKILL_API_KEY");
+    envVars.delete("SKILL_API_KEY");
+    envVars.add("SKILLS_API_KEY");
   }
   const systemDeps = new Set;
   const depPatterns = [
@@ -38602,7 +38606,7 @@ var MCP_CONTRACT_SCHEMA_VERSION = 1, stringSchema = (description) => ({
   type: "array",
   items,
   ...description ? { description } : {}
-}), skillNameInput, optionalAgentInput, scopeInput, runInputSchema, runArgsSchema, errorSchema, pricingSchema, skillSummarySchema, validationMessageSchema, validationOutputSchema, installOutputSchema, runOutputSchema, toolContracts, contracts, resourceContracts;
+}), skillNameInput, optionalAgentInput, scopeInput, runInputSchema, runArgsSchema, paidRunApprovalSchema, errorSchema, pricingSchema, skillSummarySchema, validationMessageSchema, validationOutputSchema, installOutputSchema, runOutputSchema, toolContracts, contracts, resourceContracts;
 var init_mcp_contracts = __esm(() => {
   skillNameInput = stringSchema("skill name or alias.");
   optionalAgentInput = stringSchema("Optional target agent slug. Use MCP registration instead of direct skill-folder installs.");
@@ -38622,6 +38626,10 @@ var init_mcp_contracts = __esm(() => {
     default: [],
     description: "CLI-style string arguments passed to the skill."
   };
+  paidRunApprovalSchema = {
+    type: "boolean",
+    description: "Set true only after the user has approved the quoted cost for a paid hosted run."
+  };
   errorSchema = objectSchema({
     code: stringSchema("Stable error code."),
     message: stringSchema("Human-readable error message."),
@@ -38849,11 +38857,16 @@ var init_mcp_contracts = __esm(() => {
       name: "run_skill",
       title: "Run Skill",
       description: "Run a skill locally or through a configured remote runner.",
-      params: ["name", "input?", "args?"],
+      params: ["name", "input?", "args?", "approved?"],
       category: "execution",
       sideEffects: "local-process-or-remote-run",
       stable: true,
-      inputSchema: objectSchema({ name: skillNameInput, input: runInputSchema, args: runArgsSchema }, ["name"]),
+      inputSchema: objectSchema({
+        name: skillNameInput,
+        input: runInputSchema,
+        args: runArgsSchema,
+        approved: paidRunApprovalSchema
+      }, ["name"]),
       outputSchema: runOutputSchema
     },
     {
@@ -39541,9 +39554,10 @@ function registerOperationTools(server) {
     inputSchema: {
       name: exports_external.string(),
       input: exports_external.record(exports_external.string(), exports_external.unknown()).optional(),
-      args: exports_external.array(exports_external.string()).optional()
+      args: exports_external.array(exports_external.string()).optional(),
+      approved: exports_external.boolean().optional()
     }
-  }, async ({ name, input, args }) => {
+  }, async ({ name, input, args, approved }) => {
     const skill = getSkill(name);
     if (!skill) {
       return mcpError("SKILL_NOT_FOUND", `Skill '${name}' not found`, findSimilarSkills(name));
@@ -39581,6 +39595,17 @@ function registerOperationTools(server) {
       const run = completeSkillRun(runContext, { status: "failed", error: error48, costCents });
       return mcpError("AUTH_REQUIRED", `${error48}. Local run metadata: ${run.paths.runDir}/run.json`, ["skills auth login"]);
     }
+    if (isPremiumSkill2(skillName) && apiKey && approved !== true) {
+      const cost = formatCost2(costCents ?? 0);
+      const error48 = `${skillName} is a paid hosted skill (${cost}). Call quote_skill first, then call run_skill with approved: true after user approval.`;
+      writeRunLogs(runContext, "", error48 + `
+`);
+      const run = completeSkillRun(runContext, { status: "failed", error: error48, costCents });
+      return mcpError("APPROVAL_REQUIRED", `${error48}. Local run metadata: ${run.paths.runDir}/run.json`, [
+        "quote_skill",
+        "run_skill approved=true"
+      ]);
+    }
     if (isPremiumSkill2(skillName) && apiKey) {
       try {
         const { RemoteSkillsClient: RemoteSkillsClient2 } = await Promise.resolve().then(() => (init_remote_client(), exports_remote_client));
@@ -40736,7 +40761,7 @@ import { dirname as dirname5, join as join16 } from "path";
 import { createInterface } from "readline";
 function registerRuntime(parent) {
   parent.command("quote").argument("<skill>", "Skill name").argument("[args...]", "Arguments that affect pricing, such as --count 8").allowUnknownOption(true).passThroughOptions(true).option("--json", "Output quote as JSON", false).description("Quote a skill run before spending account balance").action((name, args2, options) => handleQuote(name, args2, options));
-  parent.command("run").argument("<skill>", "Skill name").argument("[args...]", "Arguments to pass to the skill").allowUnknownOption(true).passThroughOptions(true).option("--json", "Output result as JSON", false).option("--wait", "Poll remote runs until a terminal status", false).option("--poll-interval-ms <ms>", "Remote polling interval in milliseconds", "1000").option("--poll-timeout-ms <ms>", "Maximum time to wait for a remote run", "300000").description("Run a skill directly").action(async (name, args2, options) => handleRun(name, args2, options));
+  parent.command("run").argument("<skill>", "Skill name").argument("[args...]", "Arguments to pass to the skill").allowUnknownOption(true).passThroughOptions(true).option("--json", "Output result as JSON", false).option("-y, --yes", "Approve paid hosted execution without an interactive prompt", false).option("--wait", "Poll remote runs until a terminal status", false).option("--poll-interval-ms <ms>", "Remote polling interval in milliseconds", "1000").option("--poll-timeout-ms <ms>", "Maximum time to wait for a remote run", "300000").description("Run a skill directly").action(async (name, args2, options) => handleRun(name, args2, options));
   const runs = parent.command("runs").description("Inspect local skill run records");
   runs.command("list").option("--json", "Output as JSON", false).option("--limit <n>", "Maximum number of runs", "20").description("List recent skill runs").action((options) => handleRunsList(options));
   runs.command("show").argument("<run-id>", "Run id").option("--json", "Output as JSON", false).description("Show a skill run record").action((runId, options) => handleRunsShow(runId, options));
@@ -40931,6 +40956,34 @@ async function handleRun(name, args2, options) {
       process.exitCode = 1;
       return;
     }
+    const approval = await approvePaidHostedRun({
+      skill: skill.name,
+      formattedCost: publicPricing.formattedCost,
+      json: options.json,
+      yes: Boolean(options.yes)
+    });
+    if (!approval.approved) {
+      writeRunLogs(runContext, "", approval.error + `
+`);
+      const run = completeSkillRun(runContext, { status: "failed", error: approval.error, costCents });
+      if (options.json) {
+        console.log(JSON.stringify({
+          contractVersion: REMOTE_SKILL_RUN_CONTRACT_VERSION,
+          skill: skill.name,
+          args: args2,
+          exitCode: 1,
+          remote: true,
+          approvalRequired: true,
+          error: approval.error,
+          pricing: publicPricing,
+          run
+        }, null, 2));
+      } else {
+        console.error(chalk8.red(approval.error));
+      }
+      process.exitCode = 1;
+      return;
+    }
     try {
       const { RemoteSkillsClient: RemoteSkillsClient2 } = await Promise.resolve().then(() => (init_remote_client(), exports_remote_client));
       const client = new RemoteSkillsClient2(apiKey);
@@ -41041,6 +41094,18 @@ async function handleRun(name, args2, options) {
   }
   process.exitCode = result.exitCode;
 }
+async function approvePaidHostedRun(params) {
+  if (params.yes)
+    return { approved: true };
+  const error48 = `${params.skill} is a paid hosted skill (${params.formattedCost}). Run skills quote ${params.skill} first, then rerun with --yes to approve the charge.`;
+  if (params.json || !process.stdin.isTTY || !process.stdout.isTTY) {
+    return { approved: false, error: error48 };
+  }
+  const answer = await promptLine(`Run paid hosted skill ${params.skill} for ${params.formattedCost}? [y/N] `);
+  if (/^(y|yes)$/i.test(answer.trim()))
+    return { approved: true };
+  return { approved: false, error: `Paid hosted run for ${params.skill} was not approved.` };
+}
 function writeBlogArticleValidationError(errors4, json2) {
   const payload = {
     error: "invalid blog article options",
@@ -41841,26 +41906,46 @@ Scheduled skills (${schedules.length}):
     if (!ok)
       process.exitCode = 1;
   });
-  scheduleCmd.command("run").option("--dry-run", "Show which schedules are due without running them", false).option("--json", "Output as JSON", false).description("Execute all due schedules now").action(async (options) => {
+  scheduleCmd.command("run").option("--dry-run", "Show which schedules are due without running them", false).option("--allow-paid", "Allow due paid hosted schedules to spend account balance", false).option("--max-paid-cents <cents>", "Maximum paid hosted spend approved for this run").option("--json", "Output as JSON", false).description("Execute all due schedules now").action(async (options) => {
     const due = getDueSchedules();
     if (!due.length) {
       console.log(options.json ? JSON.stringify({ ran: 0, schedules: [] }) : chalk10.dim("No schedules are due."));
       return;
     }
+    const dueDetails = await Promise.all(due.map((schedule) => describeDueSchedule(schedule)));
+    const paidTotalCents = dueDetails.reduce((total, schedule) => total + (schedule.costCents ?? 0), 0);
     if (options.dryRun) {
-      console.log(options.json ? JSON.stringify({ due: due.map((s) => s.name) }) : chalk10.bold(`${due.length} schedule(s) due:
+      console.log(options.json ? JSON.stringify({ due: dueDetails, paidTotalCents, paidTotal: formatCost2(paidTotalCents) }) : chalk10.bold(`${due.length} schedule(s) due:
 `));
       if (!options.json)
-        for (const s of due)
-          console.log(`  ${chalk10.cyan(s.name)} \u2014 ${s.skill} (${s.cron})`);
+        for (const s of dueDetails)
+          console.log(`  ${chalk10.cyan(s.name)} \u2014 ${s.skill} (${s.cron})${s.cost ? ` \u2014 ${s.cost}` : ""}`);
+      return;
+    }
+    const approvedMaxCents = parseMaxPaidCents(options.maxPaidCents);
+    if (paidTotalCents > 0 && (!options.allowPaid || approvedMaxCents === null || approvedMaxCents < paidTotalCents)) {
+      const error48 = `Due paid hosted schedules cost ${formatCost2(paidTotalCents)} total. Review with skills schedule run --dry-run, then rerun with --allow-paid --max-paid-cents ${paidTotalCents}.`;
+      if (options.json) {
+        console.log(JSON.stringify({
+          ran: 0,
+          approvalRequired: true,
+          error: error48,
+          paidTotalCents,
+          paidTotal: formatCost2(paidTotalCents),
+          schedules: dueDetails.filter((schedule) => schedule.paid)
+        }));
+      } else {
+        console.error(chalk10.red(`\u2717 ${error48}`));
+      }
+      process.exitCode = 1;
       return;
     }
     const results = [];
     for (const s of due) {
       try {
-        await executeScheduledSkill(s.skill, s.args ?? []);
+        const execution = await executeScheduledSkill(s.skill, s.args ?? [], { allowPaid: options.allowPaid });
         recordScheduleRun(s.id, "success");
-        results.push({ name: s.name, skill: s.skill, status: "success" });
+        results.push({ name: s.name, skill: s.skill, status: "success", ...execution });
       } catch (err) {
         recordScheduleRun(s.id, "error");
         results.push({ name: s.name, skill: s.skill, status: "error", error: err.message });
@@ -41906,13 +41991,17 @@ Next 5 run times:`));
       console.log(`  ${new Date(nextRun).toLocaleString()}`);
   });
 }
-async function executeScheduledSkill(skillName, args2) {
+async function executeScheduledSkill(skillName, args2, options) {
   const { getSkill: getSkill2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
   const skill = getSkill2(skillName);
   if (!skill)
     throw new Error(`Skill '${skillName}' not found`);
   const pricing = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
   if (pricing.isPremiumSkill(skill.name)) {
+    const publicPricing = pricing.getPublicSkillPricing(skill.name, {}, args2);
+    if (!options.allowPaid) {
+      throw new Error(`${skill.name} is a paid hosted skill (${publicPricing.formattedCost}). Review with skills schedule run --dry-run, then rerun with --allow-paid --max-paid-cents ${publicPricing.costCents}.`);
+    }
     const { getApiKey: getApiKey2 } = await Promise.resolve().then(() => (init_auth_store(), exports_auth_store));
     const apiKey = getApiKey2();
     if (!apiKey) {
@@ -41923,13 +42012,40 @@ async function executeScheduledSkill(skillName, args2) {
     const run = await client.submitRun(skill.name, {}, args2);
     if (run.error)
       throw new Error(String(run.error));
-    return;
+    return { paid: true, costCents: publicPricing.costCents, cost: publicPricing.formattedCost };
   }
   const { runSkill: runSkill2 } = await Promise.resolve().then(() => (init_skillinfo(), exports_skillinfo));
   const result = await runSkill2(skill.name, args2);
   if (result.exitCode !== 0) {
     throw new Error(result.error || result.stderr || `Skill '${skill.name}' exited with ${result.exitCode}`);
   }
+  return { paid: false };
+}
+async function describeDueSchedule(schedule) {
+  const { getSkill: getSkill2 } = await Promise.resolve().then(() => (init_registry(), exports_registry));
+  const pricing = await Promise.resolve().then(() => (init_pricing(), exports_pricing));
+  const skill = getSkill2(schedule.skill);
+  const paid = Boolean(skill && pricing.isPremiumSkill(skill.name));
+  const publicPricing = paid && skill ? pricing.getPublicSkillPricing(skill.name, {}, schedule.args ?? []) : null;
+  return {
+    name: schedule.name,
+    skill: schedule.skill,
+    cron: schedule.cron,
+    paid,
+    costCents: publicPricing?.costCents,
+    cost: publicPricing?.formattedCost
+  };
+}
+function parseMaxPaidCents(value) {
+  if (!value)
+    return null;
+  const parsed = Number(value);
+  if (!Number.isInteger(parsed) || parsed < 0)
+    return null;
+  return parsed;
+}
+function formatCost2(cents) {
+  return `$${(cents / 100).toFixed(2)}`;
 }
 var init_schedule = __esm(() => {
   init_scheduler();
@@ -42074,11 +42190,58 @@ function prompt(question) {
 }
 async function apiRequest(path, options) {
   const url2 = getApiUrl();
-  const res = await fetch(`${url2}${path}`, {
-    ...options,
-    headers: { "Content-Type": "application/json", ...options?.headers }
-  });
-  return res.json();
+  let res;
+  try {
+    res = await fetch(`${url2}${path}`, {
+      ...options,
+      headers: { "Content-Type": "application/json", ...options?.headers }
+    });
+  } catch (err) {
+    throw new HostedApiError(`Unable to reach hosted Skills API: ${err.message}`);
+  }
+  const text = await res.text();
+  const body = text ? parseJsonBody(text) : {};
+  if (!res.ok) {
+    const record3 = isRecord2(body) ? body : {};
+    const detail = typeof record3.detail === "string" ? record3.detail : undefined;
+    const error48 = typeof record3.error === "string" ? record3.error : undefined;
+    const code = typeof record3.code === "string" ? record3.code : undefined;
+    throw new HostedApiError(detail || error48 || `${res.status} ${res.statusText}`, {
+      status: res.status,
+      code,
+      detail
+    });
+  }
+  return body;
+}
+function parseJsonBody(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return { detail: text };
+  }
+}
+function isRecord2(value) {
+  return Boolean(value && typeof value === "object" && !Array.isArray(value));
+}
+function commandErrorPayload(err, fallback) {
+  if (err instanceof HostedApiError) {
+    return {
+      error: err.message || fallback,
+      ...err.status !== undefined ? { status: err.status } : {},
+      ...err.code ? { code: err.code } : {},
+      ...err.detail && err.detail !== err.message ? { detail: err.detail } : {}
+    };
+  }
+  return { error: err?.message || fallback };
+}
+function writeCommandError(err, fallback, json2) {
+  const payload = commandErrorPayload(err, fallback);
+  if (json2)
+    console.log(JSON.stringify(payload, null, 2));
+  else
+    console.error(chalk12.red(String(payload.detail || payload.error || fallback)));
+  process.exitCode = 1;
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -42140,55 +42303,77 @@ function printLoginSuccess(loginResult, json2) {
     console.log(chalk12.dim(`  API key saved to ~/.hasna/skills/auth.json`));
   }
 }
-async function doLogin(email3, code) {
+async function doLogin(email3, code, json2) {
   if (!email3 || !email3.includes("@")) {
-    console.error(chalk12.red("Invalid email"));
+    writeCommandError(new Error("Invalid email"), "Invalid email", json2);
     process.exitCode = 1;
     return;
   }
   if (!code) {
-    console.log(chalk12.dim("Sending code..."));
-    const sendRes = await apiRequest("/api/auth/login", {
-      method: "POST",
-      body: JSON.stringify({ email: email3 })
-    });
+    if (!json2)
+      console.log(chalk12.dim("Sending code..."));
+    let sendRes;
+    try {
+      sendRes = await apiRequest("/api/auth/login", {
+        method: "POST",
+        body: JSON.stringify({ email: email3 })
+      });
+    } catch (err) {
+      writeCommandError(err, "Failed to request login code", json2);
+      return;
+    }
     if (sendRes.error) {
-      console.error(chalk12.red(sendRes.error));
-      process.exitCode = 1;
+      writeCommandError(new Error(sendRes.error), "Failed to request login code", json2);
       return;
     }
-    console.log(chalk12.green("\u2713 Code sent to " + email3));
-    if (!isTTY) {
+    if (!json2)
+      console.log(chalk12.green("\u2713 Code sent to " + email3));
+    if (json2 || !isTTY) {
       console.log(JSON.stringify({ status: "code_sent", email: email3, message: "Check email for 6-digit code, then run: skills auth login --email " + email3 + " --code <CODE>" }));
       return;
     }
     code = await prompt(chalk12.bold("Code: "));
   }
-  const verifyRes = await apiRequest("/api/auth/verify", {
-    method: "POST",
-    body: JSON.stringify({ email: email3, code })
-  });
+  let verifyRes;
+  try {
+    verifyRes = await apiRequest("/api/auth/verify", {
+      method: "POST",
+      body: JSON.stringify({ email: email3, code })
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to verify login code", json2);
+    return;
+  }
   if (verifyRes.error) {
-    console.error(chalk12.red(verifyRes.error));
-    process.exitCode = 1;
+    writeCommandError(new Error(verifyRes.error), "Failed to verify login code", json2);
+    return;
+  }
+  let storedKey;
+  try {
+    storedKey = await persistLoginResult(verifyRes);
+  } catch (err) {
+    writeCommandError(err, "Login succeeded but API key creation failed", json2);
     return;
   }
-  const storedKey = await persistLoginResult(verifyRes);
   if (!storedKey) {
-    console.error(chalk12.red("Login succeeded but API key creation failed"));
-    process.exitCode = 1;
+    writeCommandError(new Error("Login succeeded but API key creation failed"), "Login succeeded but API key creation failed", json2);
     return;
   }
-  printLoginSuccess(verifyRes, false);
+  printLoginSuccess(verifyRes, Boolean(json2));
 }
 async function doDeviceLogin(options) {
-  const start = await apiRequest("/api/auth/device/start", {
-    method: "POST",
-    body: JSON.stringify({ client: "skills-cli" })
-  });
+  let start;
+  try {
+    start = await apiRequest("/api/auth/device/start", {
+      method: "POST",
+      body: JSON.stringify({ client: "skills-cli" })
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to start device login", options.json);
+    return;
+  }
   if (start.error) {
-    console.error(chalk12.red(start.error));
-    process.exitCode = 1;
+    writeCommandError(new Error(start.error), "Failed to start device login", options.json);
     return;
   }
   const verificationUrl = start.verificationUriComplete || start.verificationUri;
@@ -42230,23 +42415,33 @@ Waiting for authentication...`));
   const timeoutMs = Number(options.pollTimeoutMs || DEFAULT_DEVICE_POLL_TIMEOUT_MS);
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    const tokenRes = await apiRequest("/api/auth/device/token", {
-      method: "POST",
-      body: JSON.stringify({ deviceCode: start.deviceCode })
-    });
+    let tokenRes;
+    try {
+      tokenRes = await apiRequest("/api/auth/device/token", {
+        method: "POST",
+        body: JSON.stringify({ deviceCode: start.deviceCode })
+      });
+    } catch (err) {
+      writeCommandError(err, "Failed to poll device login", options.json);
+      return;
+    }
     if (tokenRes.error === "authorization_pending" || tokenRes.status === "pending") {
       await sleep(intervalMs);
       continue;
     }
     if (tokenRes.error) {
-      console.error(chalk12.red(tokenRes.detail || tokenRes.error));
-      process.exitCode = 1;
+      writeCommandError(new Error(tokenRes.detail || tokenRes.error), "Failed to poll device login", options.json);
+      return;
+    }
+    let storedKey;
+    try {
+      storedKey = await persistLoginResult(tokenRes);
+    } catch (err) {
+      writeCommandError(err, "Login succeeded but API key creation failed", options.json);
       return;
     }
-    const storedKey = await persistLoginResult(tokenRes);
     if (!storedKey) {
-      console.error(chalk12.red("Login succeeded but API key creation failed"));
-      process.exitCode = 1;
+      writeCommandError(new Error("Login succeeded but API key creation failed"), "Login succeeded but API key creation failed", options.json);
       return;
     }
     printLoginSuccess(tokenRes, Boolean(options.json));
@@ -42282,7 +42477,7 @@ function registerAuth(parent) {
       process.exitCode = 1;
       return;
     }
-    await doLogin(email3, options.code);
+    await doLogin(email3, options.code, options.json);
   });
   auth.command("signup").description("Create or sign in with your email (passwordless)").option("--email <email>", "Email address (non-interactive)").option("--code <code>", "Verification code (non-interactive)").action(async (options) => {
     let email3 = options.email;
@@ -42370,22 +42565,26 @@ async function handleBillingStatus(options = {}) {
     }
     console.log(chalk12.bold("Plan:    ") + res.plan);
     console.log(chalk12.bold("Balance: ") + res.balance);
-  } catch {
-    console.error(chalk12.red("Failed to fetch billing status"));
-    process.exitCode = 1;
+  } catch (err) {
+    writeCommandError(err, "Failed to fetch billing status", options.json);
   }
 }
 async function handleCheckout(options = {}) {
   const config2 = requireHostedAuth(options.json);
   if (!config2)
     return;
-  const res = await apiRequest("/api/v1/billing/checkout", {
-    method: "POST",
-    headers: { Authorization: `Bearer ${config2.apiKey}` }
-  });
+  let res;
+  try {
+    res = await apiRequest("/api/v1/billing/checkout", {
+      method: "POST",
+      headers: { Authorization: `Bearer ${config2.apiKey}` }
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to create checkout session", options.json);
+    return;
+  }
   if (res.error || !res.url) {
-    console.error(chalk12.red(res.detail || res.error || "Failed to create checkout session"));
-    process.exitCode = 1;
+    writeCommandError(new Error(res.detail || res.error || "Failed to create checkout session"), "Failed to create checkout session", options.json);
     return;
   }
   if (options.json)
@@ -42397,13 +42596,18 @@ async function handlePortal(options = {}) {
   const config2 = requireHostedAuth(options.json);
   if (!config2)
     return;
-  const res = await apiRequest("/api/v1/billing/portal", {
-    method: "POST",
-    headers: { Authorization: `Bearer ${config2.apiKey}` }
-  });
+  let res;
+  try {
+    res = await apiRequest("/api/v1/billing/portal", {
+      method: "POST",
+      headers: { Authorization: `Bearer ${config2.apiKey}` }
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to create customer portal session", options.json);
+    return;
+  }
   if (res.error || !res.url) {
-    console.error(chalk12.red(res.detail || res.error || "Failed to create customer portal session"));
-    process.exitCode = 1;
+    writeCommandError(new Error(res.detail || res.error || "Failed to create customer portal session"), "Failed to create customer portal session", options.json);
     return;
   }
   if (options.json)
@@ -42415,14 +42619,19 @@ async function handleBuyCredits(amount, options = {}) {
   const config2 = requireHostedAuth(options.json);
   if (!config2)
     return;
-  const res = await apiRequest("/api/v1/billing/credits", {
-    method: "POST",
-    headers: { Authorization: `Bearer ${config2.apiKey}` },
-    body: JSON.stringify({ amount })
-  });
+  let res;
+  try {
+    res = await apiRequest("/api/v1/billing/credits", {
+      method: "POST",
+      headers: { Authorization: `Bearer ${config2.apiKey}` },
+      body: JSON.stringify({ amount })
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to create credit checkout session", options.json);
+    return;
+  }
   if (res.error || !res.url) {
-    console.error(chalk12.red(res.detail || res.error || "Failed to create credit checkout session"));
-    process.exitCode = 1;
+    writeCommandError(new Error(res.detail || res.error || "Failed to create credit checkout session"), "Failed to create credit checkout session", options.json);
     return;
   }
   if (options.json)
@@ -42434,12 +42643,17 @@ async function handleListCreditPacks(options = {}) {
   const config2 = requireHostedAuth(options.json);
   if (!config2)
     return;
-  const res = await apiRequest("/api/v1/billing/credits", {
-    headers: { Authorization: `Bearer ${config2.apiKey}` }
-  });
+  let res;
+  try {
+    res = await apiRequest("/api/v1/billing/credits", {
+      headers: { Authorization: `Bearer ${config2.apiKey}` }
+    });
+  } catch (err) {
+    writeCommandError(err, "Failed to list credit packs", options.json);
+    return;
+  }
   if (res.error) {
-    console.error(chalk12.red(res.detail || res.error || "Failed to list credit packs"));
-    process.exitCode = 1;
+    writeCommandError(new Error(res.detail || res.error || "Failed to list credit packs"), "Failed to list credit packs", options.json);
     return;
   }
   if (options.json) {
@@ -42463,11 +42677,23 @@ function registerCredits(parent) {
   credits.command("buy").description("Create a credit pack checkout session").argument("<amount>", "Credit pack amount: 1, 5, 20, 50, or 100").option("--json", "Output as JSON", false).action(handleBuyCredits);
   credits.command("packs").description("List available credit packs").option("--json", "Output as JSON", false).action(handleListCreditPacks);
 }
-var isTTY, DEFAULT_DEVICE_POLL_TIMEOUT_MS;
+var isTTY, DEFAULT_DEVICE_POLL_TIMEOUT_MS, HostedApiError;
 var init_auth = __esm(() => {
   init_auth_store();
   isTTY = process.stdin.isTTY && process.stdout.isTTY;
   DEFAULT_DEVICE_POLL_TIMEOUT_MS = 10 * 60 * 1000;
+  HostedApiError = class HostedApiError extends Error {
+    status;
+    code;
+    detail;
+    constructor(message, options = {}) {
+      super(message);
+      this.name = "HostedApiError";
+      this.status = options.status;
+      this.code = options.code;
+      this.detail = options.detail;
+    }
+  };
 });
 
 // src/cli/commands/feedback.ts