@secondlayer/cli 7.0.1 → 8.1.0

package/dist/cli.js

@@ -32354,7 +32354,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "7.0.1",
+  version: "8.1.0",
   repository: {
     type: "git",
     url: "git+https://github.com/ryanwaits/secondlayer.git",
@@ -33386,7 +33386,7 @@ async function createSubscription(name, opts) {
   let sl = null;
   if (!opts.skipApi) {
     try {
-      sl = await getSubscriptionClient(opts);
+      sl = await getSubscriptionClient();
       await validateSubscriptionTargetFromApi(sl, {
         subgraphName: subgraph,
         tableName: table,
@@ -33418,7 +33418,7 @@ async function createSubscription(name, opts) {
   if (!opts.skipApi) {
     try {
       if (!sl)
-        sl = await getSubscriptionClient(opts);
+        sl = await getSubscriptionClient();
       const res = await sl.subscriptions.create({
         name,
         subgraphName: subgraph,
@@ -33490,39 +33490,12 @@ SIGNING_SECRET=${signingSecret}
   success(`Done. Next:
   ${dashboardLine}${pausedLine}${runHint}`);
 }
-function resolveSubscriptionClientConfig(opts, env = process.env, resolved) {
-  const needsResolvedKey = !opts.serviceKey && !env.SL_SERVICE_KEY;
-  const needsResolvedUrl = !opts.baseUrl && !env.SL_API_URL;
-  if ((needsResolvedKey || needsResolvedUrl) && !resolved) {
-    return { needsTenantResolution: true };
-  }
-  const apiKey = opts.serviceKey ?? env.SL_SERVICE_KEY ?? resolved?.ephemeralKey;
-  const baseUrl = opts.baseUrl ?? env.SL_API_URL ?? resolved?.apiUrl;
-  if (!apiKey) {
-    throw new Error("No service key available. Run `sl login` from an active project or pass --service-key.");
-  }
-  if (!baseUrl) {
-    throw new Error("No API URL available. Run `sl login` or pass --base-url.");
-  }
-  return { needsTenantResolution: false, baseUrl, apiKey };
-}
-async function getSubscriptionClient(opts) {
-  const config = resolveSubscriptionClientConfig(opts);
-  if (!config.needsTenantResolution) {
-    return new SecondLayer2({ baseUrl: config.baseUrl, apiKey: config.apiKey });
-  }
-  const resolved = await resolveAuth();
-  const resolvedConfig = resolveSubscriptionClientConfig(opts, process.env, resolved);
-  if (resolvedConfig.needsTenantResolution) {
-    throw new Error("Could not resolve credentials — run `sl login`.");
-  }
-  return new SecondLayer2({
-    baseUrl: resolvedConfig.baseUrl,
-    apiKey: resolvedConfig.apiKey
-  });
+async function getSubscriptionClient() {
+  const { apiUrl, ephemeralKey } = await resolveAuth();
+  return new SecondLayer2({ baseUrl: apiUrl, apiKey: ephemeralKey });
 }
 function addSubscriptionScaffold(parent, commandSpec, opts) {
-  parent.command(commandSpec).description(opts.description).option("-r, --runtime <runtime>", "inngest | trigger | cloudflare | node").option("-s, --subgraph <name>", "Subgraph to subscribe to").option("-t, --table <name>", "Table to subscribe to").option("-u, --url <url>", "Webhook URL").option("--auth-token <token>", "Bearer token for receiver API auth").option("--filter <kv...>", "Filter as key=value (supports .eq/.neq/.gt/.gte/.lt/.lte suffixes)").option("--service-key <key>", "SL_SERVICE_KEY override").option("--base-url <url>", "SL_API_URL override").option("--skip-api", "Copy template only, don't call the API").option("--no-scaffold", "Skip the local runtime template directory (webhook-only setups)").addHelpText("after", `
+  parent.command(commandSpec).description(opts.description).option("-r, --runtime <runtime>", "inngest | trigger | cloudflare | node").option("-s, --subgraph <name>", "Subgraph to subscribe to").option("-t, --table <name>", "Table to subscribe to").option("-u, --url <url>", "Webhook URL").option("--auth-token <token>", "Bearer token for receiver API auth").option("--filter <kv...>", "Filter as key=value (supports .eq/.neq/.gt/.gte/.lt/.lte suffixes)").option("--skip-api", "Copy template only, don't call the API").option("--no-scaffold", "Skip the local runtime template directory (webhook-only setups)").addHelpText("after", `
 Examples:
   $ ${opts.examplePrefix} my-sub -s my-graph -t transfers -u https://example.com/webhook
   $ ${opts.examplePrefix} my-sub -s my-graph -t balances -r inngest --filter amount.gte=1000`).action(async (name, options) => {
@@ -33537,9 +33510,6 @@ function addSubscriptionsCreateCommand(subscriptions) {
 }
 
 // src/commands/subscriptions.ts
-function commonOptions(cmd) {
-  return cmd.option("--service-key <key>", "SL_SERVICE_KEY override").option("--base-url <url>", "SL_API_URL override");
-}
 function parseIntegerOption(value, name, min) {
   if (value === undefined)
     return;
@@ -33892,11 +33862,11 @@ async function confirmOrExit(message, yes) {
   return true;
 }
 function registerSubscriptionsCommand(program2) {
-  const subscriptions = commonOptions(program2.command("subscriptions").alias("subs").description("Manage subgraph table subscriptions"));
+  const subscriptions = program2.command("subscriptions").alias("subs").description("Manage subgraph table subscriptions");
   addSubscriptionsCreateCommand(subscriptions);
-  commonOptions(subscriptions.command("list").alias("ls").description("List subscriptions").option("--json", "Output as JSON")).action(async (options) => {
+  subscriptions.command("list").alias("ls").description("List subscriptions").option("--json", "Output as JSON").action(async (options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { data } = await client.subscriptions.list();
       if (options.json) {
         printJson(data);
@@ -33920,9 +33890,9 @@ ${data.length} subscription(s) total`));
       handleApiError(err, "list subscriptions");
     }
   });
-  commonOptions(subscriptions.command("get <idOrName>").description("Show subscription details").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("get <idOrName>").description("Show subscription details").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { detail } = await resolveSubscriptionRef(client, idOrName);
       if (options.json)
         printJson(detail);
@@ -33932,13 +33902,13 @@ ${data.length} subscription(s) total`));
       handleApiError(err, "get subscription");
     }
   });
-  commonOptions(subscriptions.command("update <idOrName>").description("Update subscription config").option("--name <name>", "Rename subscription").option("--url <url>", "Webhook URL").option("--auth-token <token>", "Set bearer token auth config").option("--format <format>", "standard-webhooks | inngest | trigger | cloudflare | cloudevents | raw").option("--runtime <runtime>", "inngest | trigger | cloudflare | node | none").option("--filter <kv...>", "Filter as key=value (supports .eq/.neq/.gt/.gte/.lt/.lte suffixes)").option("--clear-filter", "Replace filter with {}").option("--max-retries <n>", "Maximum delivery retries").option("--timeout-ms <n>", "Delivery timeout in milliseconds").option("--concurrency <n>", "Per-subscription delivery concurrency").option("--json", "Output as JSON").addHelpText("after", `
+  subscriptions.command("update <idOrName>").description("Update subscription config").option("--name <name>", "Rename subscription").option("--url <url>", "Webhook URL").option("--auth-token <token>", "Set bearer token auth config").option("--format <format>", "standard-webhooks | inngest | trigger | cloudflare | cloudevents | raw").option("--runtime <runtime>", "inngest | trigger | cloudflare | node | none").option("--filter <kv...>", "Filter as key=value (supports .eq/.neq/.gt/.gte/.lt/.lte suffixes)").option("--clear-filter", "Replace filter with {}").option("--max-retries <n>", "Maximum delivery retries").option("--timeout-ms <n>", "Delivery timeout in milliseconds").option("--concurrency <n>", "Per-subscription delivery concurrency").option("--json", "Output as JSON").addHelpText("after", `
 Examples:
   $ sl subscriptions update my-sub --url https://example.com/hook
   $ sl subscriptions update my-sub --filter amount.gte=1000 --max-retries 5
-  $ sl subscriptions update my-sub --clear-filter`)).action(async (idOrName, options) => {
+  $ sl subscriptions update my-sub --clear-filter`).action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const patch = buildUpdatePatch(options);
       const { id, detail } = await resolveSubscriptionRef(client, idOrName);
       if (patch.filter !== undefined) {
@@ -33958,9 +33928,9 @@ Examples:
     }
   });
   for (const action of ["pause", "resume"]) {
-    commonOptions(subscriptions.command(`${action} <idOrName>`).description(`${action === "pause" ? "Pause" : "Resume"} a subscription`).option("--json", "Output as JSON")).action(async (idOrName, options) => {
+    subscriptions.command(`${action} <idOrName>`).description(`${action === "pause" ? "Pause" : "Resume"} a subscription`).option("--json", "Output as JSON").action(async (idOrName, options) => {
       try {
-        const client = await getSubscriptionClient(options);
+        const client = await getSubscriptionClient();
         const { id } = await resolveSubscriptionRef(client, idOrName);
         const updated = await client.subscriptions[action](id);
         if (options.json)
@@ -33972,9 +33942,9 @@ Examples:
       }
     });
   }
-  commonOptions(subscriptions.command("delete <idOrName>").alias("rm").description("Delete a subscription").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("delete <idOrName>").alias("rm").description("Delete a subscription").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       let resolved = null;
       try {
         resolved = await resolveSubscriptionRef(client, idOrName);
@@ -34003,9 +33973,9 @@ Examples:
       handleApiError(err, "delete subscription");
     }
   });
-  commonOptions(subscriptions.command("rotate-secret <idOrName>").description("Rotate the signing secret").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("rotate-secret <idOrName>").description("Rotate the signing secret").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id, detail } = await resolveSubscriptionRef(client, idOrName);
       const ok = await confirmOrExit(`Rotate signing secret for "${detail.name}"? Existing receivers using the old secret will fail verification.`, options.yes);
       if (!ok)
@@ -34021,9 +33991,9 @@ Examples:
       handleApiError(err, "rotate subscription secret");
     }
   });
-  commonOptions(subscriptions.command("deliveries <idOrName>").description("Show recent delivery attempts").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("deliveries <idOrName>").description("Show recent delivery attempts").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id } = await resolveSubscriptionRef(client, idOrName);
       const { data } = await client.subscriptions.recentDeliveries(id);
       if (options.json)
@@ -34034,9 +34004,9 @@ Examples:
       handleApiError(err, "list subscription deliveries");
     }
   });
-  commonOptions(subscriptions.command("dead <idOrName>").description("Show dead-letter outbox rows").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("dead <idOrName>").description("Show dead-letter outbox rows").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id } = await resolveSubscriptionRef(client, idOrName);
       const { data } = await client.subscriptions.dead(id);
       if (options.json)
@@ -34047,9 +34017,9 @@ Examples:
       handleApiError(err, "list dead-letter rows");
     }
   });
-  commonOptions(subscriptions.command("requeue <idOrName> <outboxId>").description("Requeue one dead-letter row").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON")).action(async (idOrName, outboxId, options) => {
+  subscriptions.command("requeue <idOrName> <outboxId>").description("Requeue one dead-letter row").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON").action(async (idOrName, outboxId, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id, detail } = await resolveSubscriptionRef(client, idOrName);
       const ok = await confirmOrExit(`Requeue ${outboxId} for "${detail.name}"?`, options.yes);
       if (!ok)
@@ -34063,16 +34033,16 @@ Examples:
       handleApiError(err, "requeue dead-letter row");
     }
   });
-  commonOptions(subscriptions.command("replay <idOrName>").description("Replay a block range").requiredOption("--from-block <n>", "Start block height").requiredOption("--to-block <n>", "End block height").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON").addHelpText("after", `
+  subscriptions.command("replay <idOrName>").description("Replay a block range").requiredOption("--from-block <n>", "Start block height").requiredOption("--to-block <n>", "End block height").option("-y, --yes", "Skip confirmation").option("--json", "Output as JSON").addHelpText("after", `
 Examples:
-  $ sl subscriptions replay my-sub --from-block 150000 --to-block 160000 -y`)).action(async (idOrName, options) => {
+  $ sl subscriptions replay my-sub --from-block 150000 --to-block 160000 -y`).action(async (idOrName, options) => {
     try {
       const fromBlock = requireIntegerOption(options.fromBlock, "--from-block");
       const toBlock = requireIntegerOption(options.toBlock, "--to-block");
       if (fromBlock > toBlock) {
         throw new Error("--from-block must be <= --to-block");
       }
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id, detail } = await resolveSubscriptionRef(client, idOrName);
       const ok = await confirmOrExit(`Replay ${detail.name} from block ${fromBlock} to ${toBlock}?`, options.yes);
       if (!ok)
@@ -34091,9 +34061,9 @@ Examples:
       handleApiError(err, "replay subscription");
     }
   });
-  commonOptions(subscriptions.command("doctor <idOrName>").description("Diagnose subscription health and next steps").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("doctor <idOrName>").description("Diagnose subscription health and next steps").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { id, detail } = await resolveSubscriptionRef(client, idOrName);
       const [deliveries, dead, subgraph] = await Promise.allSettled([
         client.subscriptions.recentDeliveries(id),
@@ -34114,10 +34084,10 @@ Examples:
       handleApiError(err, "diagnose subscription");
     }
   });
-  commonOptions(subscriptions.command("test <idOrName>").description("Build and optionally POST a signed Standard Webhooks fixture").option("--signing-secret <secret>", "Signing secret override").option("--post", "POST the fixture to the subscription URL").option("--json", "Output as JSON")).action(async (idOrName, options) => {
+  subscriptions.command("test <idOrName>").description("Build and optionally POST a signed Standard Webhooks fixture").option("--signing-secret <secret>", "Signing secret override").option("--post", "POST the fixture to the subscription URL").option("--json", "Output as JSON").action(async (idOrName, options) => {
     try {
       const signingSecret = resolveSigningSecret(options);
-      const client = await getSubscriptionClient(options);
+      const client = await getSubscriptionClient();
       const { detail } = await resolveSubscriptionRef(client, idOrName);
       const subgraph = await client.subgraphs.get(detail.subgraphName).catch(() => null);
       const row = await representativeRow(client, detail, subgraph);
@@ -37450,6 +37420,29 @@ init_dev_state();
 init_node_manager();
 init_output();
 var DEV_SERVICES = ["api", "indexer", "worker", "subgraphs"];
+async function startStack(options2) {
+  if (options2.devnet) {
+    await connect({
+      project: options2.project,
+      imageTag: options2.imageTag ?? DEFAULT_IMAGE_TAG,
+      owner: options2.owner,
+      up: options2.up ?? true
+    });
+  } else {
+    await stackStart({ node: options2.node, dev: options2.dev });
+  }
+}
+async function stopStack(options2) {
+  if (options2.devnet) {
+    await down({ project: options2.project, purge: options2.purge });
+  } else {
+    await stackStop({
+      node: options2.node,
+      dev: options2.dev,
+      wait: options2.wait
+    });
+  }
+}
 function registerLocalCommand(program2) {
   const local = program2.command("local").description("Manage local development environment and Stacks node").hook("preAction", async (_thisCommand, actionCommand) => {
     if (actionCommand.name() === "help")
@@ -37471,32 +37464,16 @@ function registerLocalCommand(program2) {
     const { stopDev: stopDev2 } = await Promise.resolve().then(() => (init_dev_impl(), exports_dev_impl));
     await stopDev2();
   });
-  local.command("restart").description("Restart dev services (preserves docker containers)").action(async () => {
-    const { restartDev: restartDev2 } = await Promise.resolve().then(() => (init_dev_impl(), exports_dev_impl));
-    await restartDev2();
-  });
-  local.command("up").description("Start the full local stack (Stacks node + dev services)").option("--devnet", "Run against a local Clarinet devnet instead").option("--no-node", "Skip starting the Stacks node").option("--no-dev", "Skip starting dev services").option("--project <dir>", "[--devnet] Clarinet project directory").option("--image-tag <tag>", "[--devnet] Published image tag to run").option("--owner <owner>", "[--devnet] ghcr image owner to pull from").option("--no-up", "[--devnet] Patch config + write compose without starting").action(async (options2) => {
-    if (options2.devnet) {
-      await connect({
-        project: options2.project,
-        imageTag: options2.imageTag ?? DEFAULT_IMAGE_TAG,
-        owner: options2.owner,
-        up: options2.up
-      });
-    } else {
-      await stackStart({ node: options2.node, dev: options2.dev });
-    }
-  });
-  local.command("down").description("Stop the full local stack").option("--devnet", "Stop a local Clarinet devnet instead").option("--no-node", "Skip stopping the Stacks node").option("--no-dev", "Skip stopping dev services").option("--wait", "Wait for in-flight work to drain before stopping").option("--project <dir>", "[--devnet] Clarinet project directory").option("--purge", "[--devnet] Also remove volumes (wipes the local index)").action(async (options2) => {
-    if (options2.devnet) {
-      await down({ project: options2.project, purge: options2.purge });
-    } else {
-      await stackStop({
-        node: options2.node,
-        dev: options2.dev,
-        wait: options2.wait
-      });
+  local.command("up").description("Start the full local stack (Stacks node + dev services)").option("--devnet", "Run against a local Clarinet devnet instead").option("--no-node", "Skip starting the Stacks node").option("--no-dev", "Skip starting dev services").option("--project <dir>", "[--devnet] Clarinet project directory").option("--image-tag <tag>", "[--devnet] Published image tag to run").option("--owner <owner>", "[--devnet] ghcr image owner to pull from").option("--no-up", "[--devnet] Patch config + write compose without starting").action((options2) => startStack(options2));
+  local.command("down").description("Stop the full local stack").option("--devnet", "Stop a local Clarinet devnet instead").option("--no-node", "Skip stopping the Stacks node").option("--no-dev", "Skip stopping dev services").option("--wait", "Wait for in-flight work to drain before stopping").option("--project <dir>", "[--devnet] Clarinet project directory").option("--purge", "[--devnet] Also remove volumes (wipes the local index)").action((options2) => stopStack(options2));
+  local.command("restart").description("Restart the full local stack (stop then start)").option("--devnet", "Restart a local Clarinet devnet instead").option("--no-node", "Skip the Stacks node (restart dev services only)").option("--no-dev", "Skip dev services").option("--wait", "Wait for in-flight work to drain before stopping").option("--project <dir>", "[--devnet] Clarinet project directory").option("--image-tag <tag>", "[--devnet] Published image tag to run").option("--owner <owner>", "[--devnet] ghcr image owner to pull from").action(async (options2) => {
+    if (options2.node === false && !options2.devnet) {
+      const { restartDev: restartDev2 } = await Promise.resolve().then(() => (init_dev_impl(), exports_dev_impl));
+      await restartDev2();
+      return;
     }
+    await stopStack(options2);
+    await startStack(options2);
   });
   local.command("status").description("Show local environment status").action(async () => {
     await showLocalStatus();
@@ -38043,5 +38020,5 @@ program.commandsGroup("Account:");
 registerAccountCommand(program);
 program.parse();
 
-//# debugId=6F90B87BC541369064756E2164756E21
+//# debugId=EB492BA5EF828A4C64756E2164756E21
 //# sourceMappingURL=cli.js.map