@secondlayer/cli 23.4.3 → 23.5.1

package/dist/cli.js

@@ -2129,12 +2129,16 @@ Expecting one of '${allowedValues.join("', '")}'`);
 });
 
 // src/lib/api-url.ts
-import { isHostedApiUrl, resolveBaseUrl } from "@secondlayer/sdk";
+import {
+  isHostedApiUrl,
+  resolveAccountUrl,
+  resolveBaseUrl
+} from "@secondlayer/sdk";
 function resolveApiUrl() {
   return resolveBaseUrl();
 }
 function resolveArchiveOpsUrl() {
-  return (process.env.SL_CREDITS_API_URL ?? ARCHIVE_OPS_API_URL).replace(/\/+$/, "");
+  return resolveAccountUrl();
 }
 function isMerchantUrl(url = resolveApiUrl()) {
   return isHostedApiUrl(url);
@@ -2160,6 +2164,7 @@ import {
 } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
+import { isHostedApiUrl as isHostedApiUrl2 } from "@secondlayer/sdk";
 import { z } from "zod";
 function getSessionPath() {
   return join(process.env.HOME || homedir(), ".secondlayer", "session.json");
@@ -2193,9 +2198,22 @@ async function readSessionFile(path) {
     return { sessions: {} };
   }
 }
-async function readSession(apiUrl = resolveApiUrl(), path = getSessionPath()) {
+async function readSession(apiUrl = resolveArchiveOpsUrl(), path = getSessionPath()) {
   const file = await readSessionFile(path);
-  return file.sessions[sessionKey(apiUrl)] ?? null;
+  const key = sessionKey(apiUrl);
+  const found = file.sessions[key];
+  if (found)
+    return found;
+  if (key !== sessionKey(resolveArchiveOpsUrl()) || !isHostedApiUrl2(key)) {
+    return null;
+  }
+  const legacy = [ARCHIVE_OPS_API_URL, resolveApiUrl()].map(sessionKey).filter((candidate) => candidate !== key && isHostedApiUrl2(candidate)).map((candidate) => file.sessions[candidate]).find((session) => session !== undefined);
+  if (!legacy)
+    return null;
+  try {
+    await writeSessionFile({ sessions: { ...file.sessions, [key]: legacy } }, path);
+  } catch {}
+  return legacy;
 }
 async function writeSessionFile(file, path) {
   const dir = dirname(path);
@@ -2209,12 +2227,12 @@ async function writeSessionFile(file, path) {
   await chmod(tmp, 384);
   await rename(tmp, path);
 }
-async function writeSession(session, apiUrl = resolveApiUrl(), path = getSessionPath()) {
+async function writeSession(session, apiUrl = resolveArchiveOpsUrl(), path = getSessionPath()) {
   const file = await readSessionFile(path);
   file.sessions[sessionKey(apiUrl)] = session;
   await writeSessionFile(file, path);
 }
-async function clearSession(apiUrl = resolveApiUrl(), path = getSessionPath()) {
+async function clearSession(apiUrl = resolveArchiveOpsUrl(), path = getSessionPath()) {
   const file = await readSessionFile(path);
   delete file.sessions[sessionKey(apiUrl)];
   if (Object.keys(file.sessions).length === 0) {
@@ -2258,7 +2276,7 @@ async function resolveAuth() {
   if (isOssMode()) {
     return { apiUrl, ephemeralKey: "", fromEnv: true };
   }
-  const session = await readSession();
+  const session = sessionKey(apiUrl) === sessionKey(resolveArchiveOpsUrl()) ? await readSession() : null;
   if (!session) {
     const err = new Error("Not logged in — run `secondlayer login`");
     err.code = "SESSION_EXPIRED";
@@ -2299,7 +2317,11 @@ var init_resolve_auth = __esm(() => {
 });
 
 // src/lib/http.ts
-import { resolveAccountKey as resolveAccountKey2, resolveApiKey as resolveApiKey2 } from "@secondlayer/sdk";
+import {
+  resolveAccountKey as resolveAccountKey2,
+  resolveApiKey as resolveApiKey2,
+  resolveIdentity
+} from "@secondlayer/sdk";
 async function request(url, opts) {
   const headers = {
     "content-type": "application/json",
@@ -2340,20 +2362,11 @@ async function httpArchiveOpsAnon(path, opts = {}) {
 async function resolveArchiveOpsBearer() {
   const envKey = resolveAccountKey2();
   const session = await readSession(resolveArchiveOpsUrl());
-  if (session) {
-    return {
-      bearer: session.token,
-      source: "session",
-      ignoredEnvKey: false
-    };
-  }
-  if (envKey && ARCHIVE_CREDENTIAL_RE.test(envKey)) {
-    return { bearer: envKey, source: "env", ignoredEnvKey: false };
-  }
+  const identity = resolveIdentity("account", { session: session?.token });
   return {
-    bearer: undefined,
-    source: null,
-    ignoredEnvKey: resolveApiKey2() !== undefined && envKey === undefined
+    bearer: identity.token,
+    source: identity.source === "none" ? null : identity.source,
+    ignoredEnvKey: identity.source === "none" && resolveApiKey2() !== undefined && envKey === undefined
   };
 }
 function ignoredEnvKeyNote(ignored) {
@@ -2371,13 +2384,13 @@ async function httpArchiveOps(path, opts = {}) {
     });
   } catch (err) {
     if (err instanceof CliHttpError && err.status === 401) {
-      const remedy = source === "session" ? `Your saved login was rejected (${err.message}). Run \`secondlayer login\`, or \`secondlayer logout\` to use SECONDLAYER_API_KEY.` : `Your account rejected the credential (${err.message}). ${ARCHIVE_AUTH_HINT}${ignoredEnvKeyNote(ignoredEnvKey)}`;
+      const remedy = source === "session" ? `Your saved login was rejected (${err.message}). Run \`secondlayer login\`, or set SECONDLAYER_API_KEY (it takes precedence over a saved login).` : `Your account rejected the credential (${err.message}). ${ARCHIVE_AUTH_HINT}${ignoredEnvKeyNote(ignoredEnvKey)}`;
       throw new CliHttpError(401, err.code, err.body, remedy);
     }
     throw err;
   }
 }
-var CliHttpError, REQUEST_TIMEOUT_MS = 30000, ARCHIVE_AUTH_HINT = "Set SECONDLAYER_API_KEY to your account key (sk-sl_…, from /account/keys), or run `secondlayer login`.", ARCHIVE_CREDENTIAL_RE;
+var CliHttpError, REQUEST_TIMEOUT_MS = 30000, ARCHIVE_AUTH_HINT = "Set SECONDLAYER_API_KEY to your account key (sk-sl_…, from /account/keys), or run `secondlayer login`.";
 var init_http = __esm(() => {
   init_api_url();
   init_resolve_auth();
@@ -2395,7 +2408,6 @@ var init_http = __esm(() => {
       this.body = body;
     }
   };
-  ARCHIVE_CREDENTIAL_RE = /^s[ks]-sl_/;
 });
 
 // src/lib/output.ts
@@ -29022,6 +29034,25 @@ var init_subgraphs = __esm(() => {
   init_format();
 });
 
+// src/lib/coalesced-runner.ts
+function createCoalescedRunner(task) {
+  let state = "idle";
+  const trigger = async () => {
+    if (state !== "idle") {
+      state = "deployingDirty";
+      return;
+    }
+    do {
+      state = "deploying";
+      try {
+        await task();
+      } catch {}
+    } while (state === "deployingDirty");
+    state = "idle";
+  };
+  return { trigger, state: () => state };
+}
+
 // src/lib/derive-abi.ts
 import {
   extractSubgraphDefinition,
@@ -30006,14 +30037,26 @@ import {
   generatePrintSchemaSubgraph as generatePrintSchemaSubgraph2,
   generateTraitSubgraph as generateTraitSubgraph2
 } from "@secondlayer/scaffold";
-import {
-  billingPausedCode
-} from "@secondlayer/shared/schemas";
 import { TRAIT_STANDARDS } from "@secondlayer/stacks/clarity";
 import {
   deriveVerification as deriveVerification2,
   isDeterminismViolation
 } from "@secondlayer/subgraphs/verification";
+function watchVerdict(subgraph) {
+  if (subgraph.health.billingPausedCode) {
+    return {
+      kind: "stopped",
+      message: `Subgraph is paused: ${subgraph.health.billingPausedCode.replace(/_/g, " ")}. Fix billing, then re-run.`
+    };
+  }
+  if (subgraph.status === "error" || subgraph.sync?.status === "error") {
+    return {
+      kind: "stopped",
+      message: `Subgraph is in error: ${subgraph.health.lastError ?? "no error recorded"}`
+    };
+  }
+  return subgraph.sync?.status === "synced" ? { kind: "synced" } : { kind: "running" };
+}
 async function loadSubgraphDefinition(source, fileName) {
   const { bundleSubgraphCode } = await import("@secondlayer/bundler");
   const bundled = await bundleSubgraphCode(source, { fileName });
@@ -30379,9 +30422,8 @@ function formatOperationRange(op) {
     return "whole subgraph";
   return `${op.fromBlock ?? "start"} → ${op.toBlock ?? "tip"}`;
 }
-function formatSubgraphStatus(status, lastError) {
-  const code = billingPausedCode(lastError);
-  return code ? `${status} (paused: ${code.replace(/_/g, " ")})` : status;
+function formatSubgraphStatus(status, billingPausedCode) {
+  return billingPausedCode ? `${status} (paused: ${billingPausedCode.replace(/_/g, " ")})` : status;
 }
 function formatOperationProgress(progress) {
   if (progress === null)
@@ -30627,7 +30669,8 @@ Check the contract id, and that the contract has emitted print events.`);
         error(`[${new Date().toLocaleTimeString()}] ${err}`);
       }
     };
-    await deploySubgraph();
+    const runner = createCoalescedRunner(deploySubgraph);
+    await runner.trigger();
     let timeout = null;
     const watcher = watch(absPath, () => {
       if (timeout)
@@ -30635,7 +30678,7 @@ Check the contract id, and that the contract has emitted print events.`);
       timeout = setTimeout(async () => {
         console.log("");
         info("File changed, redeploying...");
-        await deploySubgraph();
+        await runner.trigger();
       }, 300);
     });
     process.on("SIGINT", () => {
@@ -30892,7 +30935,7 @@ ${data.length} subgraph(s) total`));
       handleApiError(err, "list subgraphs");
     }
   });
-  subgraphs.command("status <name>").alias("get").description("Show detailed subgraph status").option("-w, --watch", "Refresh every 2s until synced or Ctrl-C").action(async (name, options) => {
+  subgraphs.command("status <name>").alias("get").description("Show detailed subgraph status").option("-w, --watch", "Refresh every 2s until synced; exits non-zero on error or a billing pause, or Ctrl-C").action(async (name, options) => {
     const renderOnce = async (opts = {}) => {
       const subgraph = await getSubgraphApi(name);
       if (opts.clearScreen)
@@ -30915,7 +30958,7 @@ ${data.length} subgraph(s) total`));
         ["Verification", formatVerificationStatus(subgraph.verification)],
         [
           "Status",
-          formatSubgraphStatus(subgraph.status, subgraph.health.lastError)
+          formatSubgraphStatus(subgraph.status, subgraph.health.billingPausedCode)
         ],
         ["Sync", syncDisplay.line],
         [syncDisplay.remainingLabel, syncDisplay.remaining],
@@ -30964,11 +31007,16 @@ Table endpoints:`));
           await new Promise((res) => setTimeout(res, 2000));
           continue;
         }
-        if (sg?.sync?.status === "synced") {
+        const verdict = watchVerdict(sg);
+        if (verdict.kind === "synced") {
           console.log(dim(`
 Synced, exiting watch.`));
           return;
         }
+        if (verdict.kind === "stopped") {
+          error(verdict.message);
+          process.exit(1);
+        }
         await new Promise((res) => setTimeout(res, 2000));
       }
     } catch (err) {
@@ -31868,7 +31916,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "23.4.3",
+  version: "23.5.1",
   description: "Run a Stacks index on your own hardware — set it up, restore verified history, and keep it current.",
   repository: {
     type: "git",
@@ -31917,10 +31965,10 @@ var package_default = {
     "@inquirer/prompts": "^8.2.0",
     "@secondlayer/bundler": "^0.7.3",
     "@secondlayer/scaffold": "^1.6.3",
-    "@secondlayer/sdk": "^16.2.0",
-    "@secondlayer/shared": "^15.2.1",
+    "@secondlayer/sdk": "^16.3.2",
+    "@secondlayer/shared": "^15.3.2",
     "@secondlayer/stacks": "^6.6.0",
-    "@secondlayer/subgraphs": "^8.0.4",
+    "@secondlayer/subgraphs": "^8.1.0",
     "@secondlayer/verify": "^0.6.3",
     esbuild: "^0.28.2",
     "smol-toml": "^1.9.1",
@@ -34489,7 +34537,7 @@ function registerCreditsCommand(program) {
   credits.command("buy").description("Open a one-time Stripe checkout for credits").requiredOption("--email <email>", "Receipt email; becomes the account").option("--pack <usd>", `One of ${PACKS.join(", ")}`, "25").option("--json", "Output as JSON").action((opts) => runBuy(opts));
   credits.command("balance").description("Show prepaid archive credit balance").option("--json", "Output as JSON").action((opts) => runBalance(opts));
   credits.command("usage").description("Rows delivered per day: free vs paid, by source").option("--days <n>", "Days to show (max 30)", "30").option("--json", "Output as JSON").action((opts) => runUsage(opts));
-  credits.command("refill").description("Opt-in auto-refill when the balance drops under a threshold").option("--below <usd>", "Trigger when balance is under this USD amount").option("--pack <usd>", `Pack to buy (${PACKS.join(", ")})`, "25").option("--off", "Turn auto-refill off").option("--json", "Output as JSON").action((opts) => runRefill(opts));
+  credits.command("refill").description("Opt-in auto-refill when the balance drops under a threshold. Needs a signed-in session (`secondlayer login`), not an API key").option("--below <usd>", "Trigger when balance is under this USD amount").option("--pack <usd>", `Pack to buy (${PACKS.join(", ")})`, "25").option("--off", "Turn auto-refill off").option("--json", "Output as JSON").action((opts) => runRefill(opts));
 }
 async function runRefill(opts) {
   if (!opts.off && opts.below === undefined) {
@@ -35317,7 +35365,7 @@ function attachWebhookSubcommands(parent) {
       console.log(formatTable(["Name", "ID", "Status", "Target", "Format", "Last Success"], data.map((sub) => [
         sub.name,
         sub.id,
-        sub.status === "active" ? green(sub.status) : sub.status === "paused" ? yellow(sub.status) : redStatus(sub.status),
+        sub.status === "active" ? green(sub.status) : yellow(sub.status),
         formatWebhookTarget(sub),
         sub.format,
         formatMaybeDate(sub.lastSuccessAt)
@@ -37083,7 +37131,9 @@ function registerLoginCommand(program) {
 Examples:
   $ secondlayer login
   $ secondlayer login --email
-  $ echo "$SECONDLAYER_API_KEY" | secondlayer login --with-token`).action((opts) => opts.withToken ? runTokenLogin() : opts.email ? runLoginFlow({ force: opts.force }) : runDeviceLogin({ force: opts.force }));
+  $ echo "$SECONDLAYER_API_KEY" | secondlayer login --with-token
+
+Precedence: SECONDLAYER_API_KEY (when set) beats the saved login. Unset it to act as the logged-in account.`).action((opts) => opts.withToken ? runTokenLogin() : opts.email ? runLoginFlow({ force: opts.force }) : runDeviceLogin({ force: opts.force }));
 }
 // src/commands/logout.ts
 init_http();
@@ -37718,5 +37768,5 @@ registerCreditsCommand(program);
 registerArchiveCommand(program);
 program.parse();
 
-//# debugId=CCB6C7D1DE3F411864756E2164756E21
+//# debugId=2C10A69C0E77EE3B64756E2164756E21
 //# sourceMappingURL=cli.js.map