@secondlayer/cli 1.4.1 → 1.5.1

package/dist/cli.js

@@ -2202,8 +2202,8 @@ function migrateConfig(raw) {
   if (typeof old.apiKey === "string") {
     migrated.apiKey = old.apiKey;
   }
-  if (typeof old.sessionToken === "string") {
-    migrated.sessionToken = old.sessionToken;
+  if (typeof old.sessionToken === "string" && !migrated.apiKey) {
+    console.warn("Warning: config contains sessionToken but no apiKey. Run `sl auth login` to re-authenticate.");
   }
   if (typeof old.apiUrl === "string" && old.apiUrl !== "http://localhost:3800") {
     migrated.apiUrl = old.apiUrl;
@@ -2268,9 +2268,6 @@ function applyEnvOverrides(config) {
   if (process.env.SECONDLAYER_API_KEY) {
     result.apiKey = process.env.SECONDLAYER_API_KEY;
   }
-  if (process.env.SECONDLAYER_SESSION_TOKEN) {
-    result.sessionToken = process.env.SECONDLAYER_SESSION_TOKEN;
-  }
   if (process.env.SL_DATA_DIR) {
     result.dataDir = process.env.SL_DATA_DIR;
   }
@@ -2406,7 +2403,6 @@ var init_config = __esm(() => {
     network: NetworkSchema.default("mainnet"),
     apiUrl: z.string().url().optional(),
     apiKey: z.string().optional(),
-    sessionToken: z.string().optional(),
     dataDir: z.string().default("~/.secondlayer/data"),
     defaultWebhookUrl: z.string().url().optional(),
     node: NodeSchema.optional(),
@@ -4550,10 +4546,25 @@ __export(exports_api_client, {
   deleteStream: () => deleteStream,
   createStream: () => createStream,
   authHeaders: () => authHeaders,
+  assertOk: () => assertOk,
   ApiError: () => ApiError
 });
 import { SecondLayer } from "@secondlayer/sdk";
 import { ApiError } from "@secondlayer/sdk";
+async function assertOk(res) {
+  if (res.ok)
+    return;
+  const body = await res.text();
+  try {
+    const parsed = JSON.parse(body);
+    if (typeof parsed.error === "string" && parsed.error)
+      throw new Error(parsed.error);
+  } catch (e) {
+    if (e instanceof Error && e.message !== body)
+      throw e;
+  }
+  throw new Error(`HTTP ${res.status}`);
+}
 function handleApiError(err, action) {
   if (err instanceof ApiError && err.status === 401) {
     console.error("Error: Authentication required. Run: sl auth login");
@@ -4565,10 +4576,10 @@ function handleApiError(err, action) {
 async function getClient() {
   const config = await loadConfig();
   const baseUrl = resolveApiUrl(config);
-  return new SecondLayer({ baseUrl, apiKey: config.sessionToken ?? config.apiKey });
+  return new SecondLayer({ baseUrl, apiKey: config.apiKey });
 }
 function authHeaders(config) {
-  return SecondLayer.authHeaders(config.sessionToken ?? config.apiKey);
+  return SecondLayer.authHeaders(config.apiKey);
 }
 async function createStream(data) {
   return (await getClient()).streams.create(data);
@@ -20157,6 +20168,8 @@ function isDirectFileContract(c) {
 import { promises as fs3 } from "fs";
 import path from "path";
 import { isValidAddress as _validateStacksAddress } from "@secondlayer/stacks";
+import { getErrorMessage } from "@secondlayer/shared";
+import { toCamelCase as toCamelCase2 } from "@secondlayer/stacks/clarity";
 
 class PluginManager {
   plugins = [];
@@ -20199,12 +20212,11 @@ class PluginManager {
             success: true
           });
         } catch (error2) {
-          const err = error2;
           this.recordHookResult(plugin.name, "transformConfig", {
             success: false,
-            error: err
+            error: error2 instanceof Error ? error2 : new Error(getErrorMessage(error2))
           });
-          throw new Error(`Plugin "${plugin.name}" failed during config transformation: ${err.message}`);
+          throw new Error(`Plugin "${plugin.name}" failed during config transformation: ${getErrorMessage(error2)}`);
         }
       }
     }
@@ -20218,31 +20230,11 @@ class PluginManager {
     const processedContracts = [];
     for (let contract of contracts) {
       if (isClarinetContract(contract) && contract.abi) {
-        const address = typeof contract.address === "string" ? contract.address : "";
-        const parsed = parseContractId(address);
-        const processed = {
-          name: contract.name || parsed.contractName,
-          address: parsed.address,
-          contractName: parsed.contractName,
-          abi: contract.abi,
-          source: "local",
-          metadata: { source: "clarinet" }
-        };
-        processedContracts.push(processed);
+        processedContracts.push(this.contractToProcessed(contract, "clarinet"));
         continue;
       }
       if (isDirectFileContract(contract) && contract.abi) {
-        const address = typeof contract.address === "string" ? contract.address : "";
-        const parsed = parseContractId(address);
-        const processed = {
-          name: contract.name || parsed.contractName,
-          address: parsed.address,
-          contractName: parsed.contractName,
-          abi: contract.abi,
-          source: "local",
-          metadata: { source: "direct" }
-        };
-        processedContracts.push(processed);
+        processedContracts.push(this.contractToProcessed(contract, "direct"));
         continue;
       }
       for (const plugin of this.plugins) {
@@ -20254,27 +20246,16 @@ class PluginManager {
               success: true
             });
           } catch (error2) {
-            const err = error2;
             this.recordHookResult(plugin.name, "transformContract", {
               success: false,
-              error: err
+              error: error2 instanceof Error ? error2 : new Error(getErrorMessage(error2))
             });
-            this.logger.warn(`Plugin "${plugin.name}" failed to transform contract: ${err.message}`);
+            this.logger.warn(`Plugin "${plugin.name}" failed to transform contract: ${getErrorMessage(error2)}`);
           }
         }
       }
       if (contract.abi) {
-        const addressStr = typeof contract.address === "string" ? contract.address : "";
-        const parsed = parseContractId(addressStr);
-        const processed = {
-          name: contract.name || parsed.contractName || "unknown",
-          address: parsed.address || "unknown",
-          contractName: parsed.contractName || contract.name || "unknown",
-          abi: contract.abi,
-          source: "api",
-          metadata: contract.metadata
-        };
-        processedContracts.push(processed);
+        processedContracts.push(this.contractToProcessed(contract, "api"));
       }
     }
     return processedContracts;
@@ -20290,12 +20271,11 @@ class PluginManager {
             success: true
           });
         } catch (error2) {
-          const err = error2;
           this.recordHookResult(plugin.name, hookName, {
             success: false,
-            error: err
+            error: error2 instanceof Error ? error2 : new Error(getErrorMessage(error2))
           });
-          this.logger.error(`Plugin "${plugin.name}" failed during ${hookName}: ${err.message}`);
+          this.logger.error(`Plugin "${plugin.name}" failed during ${hookName}: ${getErrorMessage(error2)}`);
         }
       }
     }
@@ -20335,12 +20315,11 @@ class PluginManager {
               success: true
             });
           } catch (error2) {
-            const err = error2;
             this.recordHookResult(plugin.name, "transformOutput", {
               success: false,
-              error: err
+              error: error2 instanceof Error ? error2 : new Error(getErrorMessage(error2))
             });
-            this.logger.warn(`Plugin "${plugin.name}" failed to transform output: ${err.message}`);
+            this.logger.warn(`Plugin "${plugin.name}" failed to transform output: ${getErrorMessage(error2)}`);
           }
         }
       }
@@ -20358,15 +20337,26 @@ class PluginManager {
         await this.utils.ensureDir(path.dirname(resolvedPath));
         await this.utils.writeFile(resolvedPath, output.content);
       } catch (error2) {
-        const err = error2;
-        this.logger.error(`Failed to write ${output.path}: ${err.message}`);
-        throw err;
+        this.logger.error(`Failed to write ${output.path}: ${getErrorMessage(error2)}`);
+        throw error2;
       }
     }
   }
   getExecutionResults() {
     return new Map(this.executionContext.results);
   }
+  contractToProcessed(contract, source) {
+    const address = typeof contract.address === "string" ? contract.address : "";
+    const parsed = parseContractId(address);
+    return {
+      name: contract.name || parsed.contractName || "unknown",
+      address: parsed.address || "unknown",
+      contractName: parsed.contractName || contract.name || "unknown",
+      abi: contract.abi,
+      source: source === "api" ? "api" : "local",
+      metadata: contract.metadata ?? { source }
+    };
+  }
   augmentOutput(outputs, outputKey, contractName, content) {
     const existing = outputs.get(outputKey);
     if (!existing) {
@@ -20403,9 +20393,7 @@ ${JSON.stringify(content, null, 2)}`;
   }
   createUtils() {
     return {
-      toCamelCase: (str) => {
-        return str.replace(/-([a-z])/g, (_, letter) => letter.toUpperCase());
-      },
+      toCamelCase: toCamelCase2,
       toKebabCase: (str) => {
         return str.replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
       },
@@ -20554,7 +20542,7 @@ var init_config2 = __esm(() => {
 
 // src/utils/type-mapping.ts
 import {
-  toCamelCase,
+  toCamelCase as toCamelCase3,
   isAbiList,
   isAbiTuple,
   isAbiOptional as isAbiOptional2,
@@ -20613,7 +20601,7 @@ function clarityTypeToTS(type) {
     return `${innerType}[]`;
   }
   if (isAbiTuple(type)) {
-    const fields = type.tuple.map((field) => `${toCamelCase(field.name)}: ${clarityTypeToTS(field.type)}`).join("; ");
+    const fields = type.tuple.map((field) => `${toCamelCase3(field.name)}: ${clarityTypeToTS(field.type)}`).join("; ");
     return `{ ${fields} }`;
   }
   if (isAbiResponse(type)) {
@@ -20630,7 +20618,7 @@ var init_type_mapping = () => {};
 
 // src/utils/clarity-conversion.ts
 import {
-  toCamelCase as toCamelCase2,
+  toCamelCase as toCamelCase4,
   isAbiStringAscii as isAbiStringAscii3,
   isAbiStringUtf8 as isAbiStringUtf83,
   isAbiBuffer as isAbiBuffer3,
@@ -20728,7 +20716,7 @@ function generateClarityConversion(argName, argType) {
     const requiredFields = type.tuple.map((f) => f.name);
     const fieldNames = JSON.stringify(requiredFields);
     const fields = type.tuple.map((field) => {
-      const camelFieldName = toCamelCase2(field.name);
+      const camelFieldName = toCamelCase4(field.name);
       const fieldConversion = generateClarityConversion(`tupleValue.${camelFieldName}`, { type: field.type });
       return `"${field.name}": ${fieldConversion}`;
     }).join(", ");
@@ -20769,11 +20757,11 @@ function generateClarityConversion(argName, argType) {
 var init_clarity_conversion = () => {};
 
 // src/utils/generator-helpers.ts
-import { toCamelCase as toCamelCase3, isAbiTuple as isAbiTuple3 } from "@secondlayer/stacks/clarity";
+import { toCamelCase as toCamelCase5, isAbiTuple as isAbiTuple3 } from "@secondlayer/stacks/clarity";
 function generateMapKeyConversion(keyType) {
   if (isAbiTuple3(keyType)) {
     const fields = keyType.tuple.map((field) => {
-      const camelFieldName = toCamelCase3(field.name);
+      const camelFieldName = toCamelCase5(field.name);
       const fieldConversion = generateClarityConversion(`key.${camelFieldName}`, { type: field.type });
       return `"${field.name}": ${fieldConversion}`;
     }).join(", ");
@@ -20788,7 +20776,7 @@ var init_generator_helpers = __esm(() => {
 
 // src/generators/contract.ts
 import {
-  toCamelCase as toCamelCase4
+  toCamelCase as toCamelCase6
 } from "@secondlayer/stacks/clarity";
 function generateNetworkUtils() {
   return `/**
@@ -20880,7 +20868,7 @@ function generateAbiConstant(name, abi) {
   return `export const ${name}Abi = ${abiJson} as const`;
 }
 function generateMethod(func, address, contractName) {
-  const methodName = toCamelCase4(func.name);
+  const methodName = toCamelCase6(func.name);
   if (func.args.length === 0) {
     return `${methodName}() {
     return {
@@ -20893,7 +20881,7 @@ function generateMethod(func, address, contractName) {
   }
   if (func.args.length === 1) {
     const originalArgName = func.args[0].name;
-    const argName = toCamelCase4(originalArgName);
+    const argName = toCamelCase6(originalArgName);
     const argType = getTypeForArg(func.args[0]);
     const clarityConversion = generateClarityConversion(argName, func.args[0]);
     return `${methodName}(...args: [{ ${argName}: ${argType} }] | [${argType}]) {
@@ -20909,17 +20897,17 @@ function generateMethod(func, address, contractName) {
     }
   }`;
   }
-  const argsList = func.args.map((arg) => toCamelCase4(arg.name)).join(", ");
+  const argsList = func.args.map((arg) => toCamelCase6(arg.name)).join(", ");
   const argsTypes = func.args.map((arg) => {
-    const camelName = toCamelCase4(arg.name);
+    const camelName = toCamelCase6(arg.name);
     return `${camelName}: ${getTypeForArg(arg)}`;
   }).join("; ");
   const argsArray = func.args.map((arg) => {
-    const argName = toCamelCase4(arg.name);
+    const argName = toCamelCase6(arg.name);
     return generateClarityConversion(argName, arg);
   }).join(", ");
   const objectAccess = func.args.map((arg) => {
-    const camelName = toCamelCase4(arg.name);
+    const camelName = toCamelCase6(arg.name);
     return `args[0].${camelName}`;
   }).join(", ");
   const positionTypes = func.args.map((arg) => getTypeForArg(arg)).join(", ");
@@ -20941,7 +20929,7 @@ function generateMapsObject(maps, address, contractName) {
     return "";
   }
   const mapMethods = maps.map((map) => {
-    const methodName = toCamelCase4(map.name);
+    const methodName = toCamelCase6(map.name);
     const keyType = getTypeForArg({ type: map.key });
     const valueType = getTypeForArg({ type: map.value });
     const keyConversion = generateMapKeyConversion(map.key);
@@ -21002,7 +20990,7 @@ function generateVarsObject(variables, address, contractName) {
     return "";
   }
   const varMethods = dataVars.map((variable) => {
-    const methodName = toCamelCase4(variable.name);
+    const methodName = toCamelCase6(variable.name);
     const valueType = getTypeForArg({ type: variable.type });
     return `${methodName}: {
       async get(options?: { network?: 'mainnet' | 'testnet' | 'devnet' }): Promise<${valueType}> {
@@ -21047,7 +21035,7 @@ function generateConstantsObject(variables, address, contractName) {
     return "";
   }
   const constMethods = constants.map((constant) => {
-    const methodName = toCamelCase4(constant.name);
+    const methodName = toCamelCase6(constant.name);
     const valueType = getTypeForArg({ type: constant.type });
     return `${methodName}: {
       async get(options?: { network?: 'mainnet' | 'testnet' | 'devnet' }): Promise<${valueType}> {
@@ -32648,7 +32636,8 @@ __export(exports_generate, {
   generate: () => generate
 });
 import path11 from "path";
-import { toCamelCase as toCamelCase5 } from "@secondlayer/stacks/clarity";
+import { toCamelCase as toCamelCase7 } from "@secondlayer/stacks/clarity";
+import { getErrorMessage as getErrorMessage2 } from "@secondlayer/shared";
 function isContractAddress(input4) {
   const contractIdPattern = /^(SP|ST|SM|SN)[A-Z0-9]{38,}\.[a-zA-Z][a-zA-Z0-9-]*$/;
   return contractIdPattern.test(input4);
@@ -32709,7 +32698,7 @@ async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddre
       const apiClient = new StacksApiClient(network, apiKey);
       const contractInfo = await apiClient.getContractInfo(contractId);
       const abi = parseApiResponse(contractInfo);
-      const name = toCamelCase5(contractName);
+      const name = toCamelCase7(contractName);
       contracts.push({
         name,
         address: contractId,
@@ -32717,7 +32706,7 @@ async function buildConfigFromInputs(parsedInputs, outPath, apiKey, defaultAddre
         _directFile: true
       });
     } catch (error2) {
-      throw new Error(`Failed to fetch contract ${contractId}: ${error2.message}`);
+      throw new Error(`Failed to fetch contract ${contractId}: ${getErrorMessage2(error2)}`);
     }
   }
   return {
@@ -32799,8 +32788,8 @@ To get started:`);
   } catch (error2) {
     console.error(source_default3.red("✗ Generation failed"));
     console.error(source_default3.red(`
-${error2.message}`));
-    if (process.env.DEBUG) {
+${getErrorMessage2(error2)}`));
+    if (process.env.DEBUG && error2 instanceof Error) {
       console.error(error2.stack);
     }
     process.exit(1);
@@ -32867,7 +32856,7 @@ async function resolveContracts(source, defaultNetwork, apiKey, apiUrl) {
           source: "api"
         });
       } catch (error2) {
-        console.warn(`Warning: Failed to resolve contract for ${network}: ${error2.message}`);
+        console.warn(`Warning: Failed to resolve contract for ${network}: ${getErrorMessage2(error2)}`);
       }
     }
     return resolvedContracts;
@@ -32954,7 +32943,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "1.4.1",
+  version: "1.5.1",
   description: "CLI for streams, views, and real-time blockchain indexing on Stacks",
   type: "module",
   bin: {
@@ -32995,10 +32984,10 @@ var package_default = {
   license: "MIT",
   dependencies: {
     "@inquirer/prompts": "^8.2.0",
-    "@secondlayer/sdk": "^0.4.1",
-    "@secondlayer/shared": "^0.3.0",
-    "@secondlayer/stacks": "^0.1.0",
-    "@secondlayer/views": "^0.2.4",
+    "@secondlayer/sdk": "^0.5.0",
+    "@secondlayer/shared": "^0.4.0",
+    "@secondlayer/stacks": "^0.2.0",
+    "@secondlayer/views": "^0.3.0",
     "@biomejs/js-api": "^0.7.0",
     "@biomejs/wasm-nodejs": "^1.9.0",
     esbuild: "^0.19.0",
@@ -33387,6 +33376,7 @@ async function validateDatabaseConnection(url) {
 }
 // src/commands/setup.ts
 init_output();
+init_api_client();
 import { select as select2, input, confirm } from "@inquirer/prompts";
 init_config();
 var STREAMS_DIR = "streams";
@@ -33639,13 +33629,10 @@ async function hostedLogin(config) {
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ email })
   });
-  if (!mlRes.ok) {
-    const body = await mlRes.text();
-    let msg = `HTTP ${mlRes.status}`;
-    try {
-      msg = JSON.parse(body).error || msg;
-    } catch {}
-    error(`Failed to send magic link: ${msg}`);
+  try {
+    await assertOk(mlRes);
+  } catch (e) {
+    error(`Failed to send magic link: ${e instanceof Error ? e.message : e}`);
     return false;
   }
   info("Check your email for a login token.");
@@ -33658,18 +33645,41 @@ async function hostedLogin(config) {
     headers: { "Content-Type": "application/json" },
     body: JSON.stringify({ token: token.trim() })
   });
-  if (!verifyRes.ok) {
-    const body = await verifyRes.text();
-    let msg = `HTTP ${verifyRes.status}`;
-    try {
-      msg = JSON.parse(body).error || msg;
-    } catch {}
-    error(`Verification failed: ${msg}`);
+  try {
+    await assertOk(verifyRes);
+  } catch (e) {
+    error(`Verification failed: ${e instanceof Error ? e.message : e}`);
     return false;
   }
   const result = await verifyRes.json();
-  config.sessionToken = result.sessionToken;
+  const { hostname } = await import("node:os");
+  const sessionHeaders = { Authorization: `Bearer ${result.sessionToken}`, "Content-Type": "application/json" };
+  const keyName = `cli-${hostname().toLowerCase()}`;
+  const listRes = await fetch(`${apiUrl}/api/keys`, { headers: sessionHeaders });
+  if (listRes.ok) {
+    const { keys } = await listRes.json();
+    const existing = keys.find((k) => k.name === keyName && k.status === "active");
+    if (existing) {
+      await fetch(`${apiUrl}/api/keys/${existing.id}`, { method: "DELETE", headers: sessionHeaders });
+    }
+  }
+  const createRes = await fetch(`${apiUrl}/api/keys`, {
+    method: "POST",
+    headers: sessionHeaders,
+    body: JSON.stringify({ name: keyName })
+  });
+  try {
+    await assertOk(createRes);
+  } catch (e) {
+    error(`Failed to create API key: ${e instanceof Error ? e.message : e}`);
+    return false;
+  }
+  const { key } = await createRes.json();
+  config.apiKey = key;
   await saveConfig(config);
+  try {
+    await fetch(`${apiUrl}/api/auth/logout`, { method: "POST", headers: sessionHeaders });
+  } catch {}
   const account = result.account;
   console.log();
   success(`Authenticated as ${account.email}!`);
@@ -35610,6 +35620,17 @@ ${handlersBlock}
 
 // src/generators/views.ts
 init_format();
+
+// src/utils/case-conversion.ts
+import { toCamelCase } from "@secondlayer/stacks/clarity";
+function capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function toPascalCase(str) {
+  return capitalize(toCamelCase(str));
+}
+
+// src/generators/views.ts
 async function generateViewConsumer(viewName, detail) {
   const tables = Object.entries(detail.tables);
   const rowInterfaces = tables.map(([tableName, tableDef]) => {
@@ -35662,9 +35683,6 @@ export function createClient(options?: { apiKey?: string; baseUrl?: string }): C
 `.trimStart();
   return formatCode(code);
 }
-function toPascalCase(str) {
-  return str.split(/[-_]/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join("");
-}
 function viewTypeToTS(type) {
   switch (type) {
     case "uint":
@@ -36564,6 +36582,7 @@ async function runLocalDoctor(jsonOutput) {
 init_config();
 init_api_client();
 init_output();
+import { hostname } from "node:os";
 import { input as input2 } from "@inquirer/prompts";
 function registerAuthCommand(program2) {
   const auth = program2.command("auth").description("Manage authentication and API keys");
@@ -36584,14 +36603,7 @@ function registerAuthCommand(program2) {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ email })
       });
-      if (!mlRes.ok) {
-        const body = await mlRes.text();
-        let msg = `HTTP ${mlRes.status}`;
-        try {
-          msg = JSON.parse(body).error || msg;
-        } catch {}
-        throw new Error(msg);
-      }
+      await assertOk(mlRes);
       console.log(dim("Check your email for a login token."));
       const token = await input2({
         message: "Token:",
@@ -36602,19 +36614,32 @@ function registerAuthCommand(program2) {
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ token: token.trim() })
       });
-      if (!verifyRes.ok) {
-        const body = await verifyRes.text();
-        let msg = `HTTP ${verifyRes.status}`;
-        try {
-          msg = JSON.parse(body).error || msg;
-        } catch {}
-        throw new Error(msg);
-      }
+      await assertOk(verifyRes);
       const result = await verifyRes.json();
-      config.sessionToken = result.sessionToken;
+      const sessionHeaders = { Authorization: `Bearer ${result.sessionToken}`, "Content-Type": "application/json" };
+      const keyName = `cli-${hostname().toLowerCase()}`;
+      const listRes = await fetch(`${apiUrl}/api/keys`, { headers: sessionHeaders });
+      if (listRes.ok) {
+        const { keys: keys2 } = await listRes.json();
+        const existing = keys2.find((k) => k.name === keyName && k.status === "active");
+        if (existing) {
+          await fetch(`${apiUrl}/api/keys/${existing.id}`, { method: "DELETE", headers: sessionHeaders });
+        }
+      }
+      const createRes = await fetch(`${apiUrl}/api/keys`, {
+        method: "POST",
+        headers: sessionHeaders,
+        body: JSON.stringify({ name: keyName })
+      });
+      await assertOk(createRes);
+      const { key, prefix } = await createRes.json();
+      config.apiKey = key;
       await saveConfig(config);
+      try {
+        await fetch(`${apiUrl}/api/auth/logout`, { method: "POST", headers: sessionHeaders });
+      } catch {}
       success(`Authenticated as ${result.account.email}`);
-      console.log(dim(`Plan: ${result.account.plan}`));
+      console.log(dim(`Key: ${prefix}...`));
       console.log(dim(`Network: ${config.network}`));
       console.log(dim(`API: ${apiUrl}`));
     } catch (err) {
@@ -36622,37 +36647,41 @@ function registerAuthCommand(program2) {
       process.exit(1);
     }
   });
-  auth.command("logout").description("Revoke session and remove from config").action(async () => {
+  auth.command("logout").description("Revoke API key and remove from config").action(async () => {
     const config = await loadConfig();
     const apiUrl = resolveApiUrl(config);
-    if (!config.sessionToken) {
+    if (!config.apiKey) {
       error("Not logged in.");
       process.exit(1);
     }
     try {
-      await fetch(`${apiUrl}/api/auth/logout`, {
-        method: "POST",
-        headers: { Authorization: `Bearer ${config.sessionToken}` }
-      });
+      const headers = authHeaders(config);
+      const listRes = await fetch(`${apiUrl}/api/keys`, { headers });
+      if (listRes.ok) {
+        const { keys: keys2 } = await listRes.json();
+        const currentPrefix = config.apiKey.slice(0, 14);
+        const match = keys2.find((k) => currentPrefix.startsWith(k.prefix));
+        if (match) {
+          await fetch(`${apiUrl}/api/keys/${match.id}`, { method: "DELETE", headers });
+        }
+      }
     } catch {}
-    delete config.sessionToken;
+    delete config.apiKey;
     await saveConfig(config);
-    success("Logged out. Session revoked.");
+    success("Logged out. API key revoked.");
   });
   auth.command("status").description("Show current auth status").action(async () => {
     const config = await loadConfig();
     const apiUrl = resolveApiUrl(config);
-    const token = config.sessionToken ?? config.apiKey;
     const pairs = [
       ["Network", config.network],
       ["API", apiUrl || "(not configured)"],
-      ["Session", config.sessionToken ? config.sessionToken.slice(0, 14) + "..." : "(none)"],
       ["API Key", config.apiKey ? config.apiKey.slice(0, 14) + "..." : "(none)"]
     ];
-    if (token && apiUrl) {
+    if (config.apiKey && apiUrl) {
       try {
         const res = await fetch(`${apiUrl}/api/accounts/me`, {
-          headers: { Authorization: `Bearer ${token}` }
+          headers: authHeaders(config)
         });
         if (res.ok) {
           const data = await res.json();
@@ -36696,14 +36725,7 @@ function registerAuthCommand(program2) {
         headers,
         body: JSON.stringify({ name: options2.name })
       });
-      if (!res.ok) {
-        const body = await res.text();
-        let msg = `HTTP ${res.status}`;
-        try {
-          msg = JSON.parse(body).error || msg;
-        } catch {}
-        throw new Error(msg);
-      }
+      await assertOk(res);
       const { key, prefix } = await res.json();
       success(`Created API key: ${prefix}...`);
       console.log();
@@ -36737,24 +36759,18 @@ function registerAuthCommand(program2) {
         method: "DELETE",
         headers
       });
-      if (!res.ok) {
-        const body = await res.text();
-        let msg = `HTTP ${res.status}`;
-        try {
-          msg = JSON.parse(body).error || msg;
-        } catch {}
-        throw new Error(msg);
-      }
+      await assertOk(res);
       success(`Revoked key ${idOrPrefix}`);
     } catch (err) {
       error(`Failed to revoke key: ${err}`);
       process.exit(1);
     }
   });
-  keys.command("rotate").description("Revoke current API key and create a new one").option("--name <name>", "Name for the new API key", "cli").action(async (options2) => {
+  const defaultKeyName = `cli-${hostname().toLowerCase()}`;
+  keys.command("rotate").description("Revoke current API key and create a new one").option("--name <name>", "Name for the new API key", defaultKeyName).action(async (options2) => {
     await rotateKey(options2);
   });
-  auth.command("rotate").description("Revoke current API key and create a new one").option("--name <name>", "Name for the new API key", "cli").action(async (options2) => {
+  auth.command("rotate").description("Revoke current API key and create a new one").option("--name <name>", "Name for the new API key", defaultKeyName).action(async (options2) => {
     await rotateKey(options2);
   });
 }
@@ -36762,7 +36778,7 @@ async function rotateKey(options2) {
   const config = await loadConfig();
   const apiUrl = resolveApiUrl(config);
   const headers = authHeaders(config);
-  if (!config.sessionToken && !config.apiKey) {
+  if (!config.apiKey) {
     error("Not logged in. Run `sl auth login` first.");
     process.exit(1);
   }
@@ -36787,14 +36803,7 @@ async function rotateKey(options2) {
       headers: { ...headers, "Content-Type": "application/json" },
       body: JSON.stringify({ name: options2.name })
     });
-    if (!createRes.ok) {
-      const body = await createRes.text();
-      let msg = `HTTP ${createRes.status}`;
-      try {
-        msg = JSON.parse(body).error || msg;
-      } catch {}
-      throw new Error(msg);
-    }
+    await assertOk(createRes);
     const { key, prefix } = await createRes.json();
     config.apiKey = key;
     await saveConfig(config);
@@ -37098,8 +37107,7 @@ function registerWhoamiCommand(program2) {
   program2.command("whoami").description("Show current authenticated account").action(async () => {
     const config = await loadConfig();
     const apiUrl = resolveApiUrl(config);
-    const token = config.sessionToken ?? config.apiKey;
-    if (!token) {
+    if (!config.apiKey) {
       error("Not authenticated. Run: sl auth login");
       process.exit(1);
     }
@@ -37165,5 +37173,5 @@ registerWhoamiCommand(program);
 registerWebhookCommand(program);
 program.parse();
 
-//# debugId=E0C86F93180D107264756E2164756E21
+//# debugId=623C283AFFA2A54D64756E2164756E21
 //# sourceMappingURL=cli.js.map