@secondlayer/cli 23.3.0 → 23.4.1

package/dist/cli.js

@@ -29357,6 +29357,12 @@ function inspectSourceGitState(absPath) {
   }
   return { kind: "clean" };
 }
+function uncommittedSourceWarning(state, file) {
+  if (state.kind !== "untracked" && state.kind !== "modified")
+    return;
+  const reason = state.kind === "untracked" ? "not tracked by git" : "modified with uncommitted changes";
+  return `${file} is ${reason}, so this deploy's only copy is the database row. Commit it to keep a copy.`;
+}
 var init_git_status = () => {};
 
 // src/lib/merge-print-subgraph.ts
@@ -29990,7 +29996,6 @@ import {
 } from "node:fs";
 import { basename, dirname as dirname5, extname, join as join7, relative, resolve as resolve5 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
-import { confirm as confirm2 } from "@inquirer/prompts";
 import {
   generatePrintPayloadTypes,
   generatePrintSchemaSubgraph as generatePrintSchemaSubgraph2,
@@ -30004,31 +30009,11 @@ import {
   deriveVerification as deriveVerification2,
   isDeterminismViolation
 } from "@secondlayer/subgraphs/verification";
-async function loadSubgraphWithDepCheck(absPath) {
-  try {
-    return await import(absPath);
-  } catch (err) {
-    const msg = err instanceof Error ? err.message : String(err);
-    const code = err?.code;
-    const missingSdk = (code === "ERR_MODULE_NOT_FOUND" || msg.includes("ERR_MODULE_NOT_FOUND")) && msg.includes("@secondlayer/subgraphs");
-    if (!missingSdk)
-      throw err;
-    warn("Missing dependency: @secondlayer/subgraphs");
-    const install = await confirm2({
-      message: "Install with `bun add @secondlayer/subgraphs`?",
-      default: true
-    });
-    if (!install)
-      throw err;
-    await new Promise((res, rej) => {
-      const child = spawn2("bun", ["add", "@secondlayer/subgraphs"], {
-        stdio: "inherit"
-      });
-      child.on("error", rej);
-      child.on("exit", (c) => c === 0 ? res() : rej(new Error(`bun add exit ${c}`)));
-    });
-    return await import(absPath);
-  }
+async function loadSubgraphDefinition(source, fileName) {
+  const { bundleSubgraphCode } = await import("@secondlayer/bundler");
+  const bundled = await bundleSubgraphCode(source, { fileName });
+  const url = `data:text/javascript;base64,${Buffer.from(bundled.handlerCode, "utf8").toString("base64")}`;
+  return { mod: await import(url), bundled };
 }
 async function typecheckHandler(absPath) {
   await new Promise((res, rej) => {
@@ -30055,6 +30040,15 @@ function parseStartBlockOption(value) {
   }
   return parsed;
 }
+function genesisWarning(startBlock) {
+  if (startBlock === undefined) {
+    return "No startBlock: the first deploy backfills from genesis.";
+  }
+  if (startBlock <= 1) {
+    return `startBlock ${startBlock}: the first deploy backfills all history from genesis.`;
+  }
+  return null;
+}
 function collectPinnedPrintSources(sources) {
   const out = [];
   for (const [sourceName, raw] of Object.entries(sources ?? {})) {
@@ -30542,8 +30536,7 @@ Try --trait sip-010 or \`subgraphs scaffold ${opts.fromContract}\` for ABI calls
     if (opts.fromContract) {
       info(`Schema inferred from ${opts.fromContract} print events (${opts.tablePerTopic ? "table per topic" : "single wide table"})`);
     }
-    info(`Next: git add subgraphs/${name}.ts && secondlayer subgraphs deploy subgraphs/${name}.ts`);
-    note("  deploy refuses an unstaged file unless you pass --allow-uncommitted: a staged copy is the one git can recover.");
+    info(`Next: secondlayer subgraphs deploy subgraphs/${name}.ts`);
   });
   subgraphs.command("add <file>").description("Merge another contract's observed print sources into an existing subgraph file").requiredOption("--from-contract <contractId>", "Contract whose print schema to merge (requires network)").option("--table-per-topic", "One table per print topic instead of a single wide table for the added contract").addHelpText("after", `
 Adds sources/schema/handlers for a second (or Nth) contract into an existing
@@ -30650,10 +30643,10 @@ Stopped watching.`);
     });
     await new Promise(() => {});
   });
-  subgraphs.command("deploy <file>").alias("update").description("Deploy a subgraph definition file (alias: update — deploy is create-or-update)").option("--start-block <n>", "Override the subgraph definition startBlock for this deploy").option("--tip-first", "Go live at chain tip immediately; history backfills in the background (handlers may only insert, upsert and delete; update, increment and row reads are refused)").option("--dry-run", "Validate and preview deploy without writing changes").option("-y, --yes", "Skip the reindex confirmation prompt").option("--strict", "Run `tsc --noEmit` against the handler before deploy (slower; catches TS type errors)").option("--allow-uncommitted", "Deploy even though the source file is not staged or committed in git (the deployed definition will exist only in the database)").addHelpText("after", `
-By default the source file must be staged or committed in git (\`git add <file>\`),
-otherwise the deployed definition's only copy is the row in the database. Pass
---allow-uncommitted to deploy anyway.
+  subgraphs.command("deploy <file>").alias("update").description("Deploy a subgraph definition file (alias: update — deploy is create-or-update)").option("--start-block <n>", "Override the subgraph definition startBlock for this deploy").option("--tip-first", "Go live at chain tip immediately; history backfills in the background (handlers may only insert, upsert and delete; update, increment and row reads are refused)").option("--dry-run", "Validate and preview deploy without writing changes").option("-y, --yes", "Skip the reindex confirmation prompt").option("--strict", "Run `tsc --noEmit` against the handler before deploy (slower; catches TS type errors)").option("--allow-uncommitted", "Don't warn when the source file isn't committed in git").addHelpText("after", `
+If the source file isn't committed in git, deploy warns that the deployed
+definition's only copy is the row in the database. It never blocks; pass
+--allow-uncommitted to silence the warning.
 
 Hosted: set SECONDLAYER_API_KEY and SECONDLAYER_API_URL=https://api.secondlayer.tools.
 Hostable sources are event filters and contract_call/contract_deploy; anything else
@@ -30662,28 +30655,10 @@ deploy does not backfill from genesis.`).action(async (file, options) => {
     try {
       const absPath = resolve5(file);
       if (!options.dryRun) {
-        if (options.allowUncommitted) {
-          info("--allow-uncommitted: skipping the git commit check for the source file.");
-        } else {
-          const gitState = inspectSourceGitState(absPath);
-          if (gitState.kind === "untracked" || gitState.kind === "modified") {
-            const reason = gitState.kind === "untracked" ? "not tracked by git" : "modified with uncommitted changes";
-            const message = `${file} is ${reason}. Deploy it and the only copy of this definition is a row in the database.`;
-            if (process.stdin.isTTY) {
-              warn(message);
-              const confirmed = await confirm2({
-                message: "Deploy anyway?",
-                default: false
-              });
-              if (!confirmed) {
-                info("Nothing was deployed.");
-                process.exit(0);
-              }
-            } else {
-              error(`${message} Stage it with \`git add ${file}\`, or pass --allow-uncommitted.`);
-              process.exit(1);
-            }
-          }
+        if (!options.allowUncommitted) {
+          const advice = uncommittedSourceWarning(inspectSourceGitState(absPath), file);
+          if (advice)
+            warn(advice);
         }
       }
       const config = await loadConfig2();
@@ -30697,18 +30672,28 @@ deploy does not backfill from genesis.`).action(async (file, options) => {
         await typecheckHandler(absPath);
       }
       info(`Loading subgraph from ${absPath}`);
-      const mod = await loadSubgraphWithDepCheck(absPath);
-      const def = mod.default ?? mod;
-      const effectiveDef = {
-        ...startBlock === undefined ? def : { ...def, startBlock },
-        ...options.tipFirst ? { backfillMode: "concurrent" } : {}
-      };
       const { validateSubgraphDefinition } = await import("@secondlayer/subgraphs/validate");
       const { readFile } = await import("node:fs/promises");
       const derived = config.network !== "local" ? await withDerivedAbis(await readFile(absPath, "utf8")) : undefined;
       for (const name of Object.keys(derived?.abis ?? {})) {
         info(`Using the deployed contract's abi for source "${name}"`);
       }
+      const source = derived?.source ?? await readFile(absPath, "utf8");
+      const { mod, bundled } = await loadSubgraphDefinition(source, relative(process.cwd(), absPath));
+      const def = mod.default ?? mod;
+      const authored = {
+        ...def,
+        sources: Object.fromEntries(Object.entries(def.sources ?? {}).map(([k, v]) => {
+          if (!derived?.abis[k])
+            return [k, v];
+          const { abi: _abi, ...rest } = v;
+          return [k, rest];
+        }))
+      };
+      const effectiveDef = {
+        ...startBlock === undefined ? authored : { ...authored, startBlock },
+        ...options.tipFirst ? { backfillMode: "concurrent" } : {}
+      };
       const validated = validateSubgraphDefinition(derived && Object.keys(derived.abis).length > 0 ? {
         ...effectiveDef,
         sources: Object.fromEntries(Object.entries(effectiveDef.sources).map(([k, v]) => [
@@ -30716,16 +30701,11 @@ deploy does not backfill from genesis.`).action(async (file, options) => {
           derived.abis[k] ? { ...v, abi: derived.abis[k] } : v
         ]))
       } : effectiveDef);
-      if ((validated.startBlock ?? 1) <= 1) {
-        warn("No startBlock: the first deploy backfills from genesis.");
-      }
+      const genesis = genesisWarning(effectiveDef.startBlock);
+      if (genesis)
+        warn(genesis);
       if (config.network !== "local") {
         info(`${dryRun ? "Bundling for remote deploy dry run" : "Bundling for remote deploy"} (${config.network})...`);
-        const source = derived?.source ?? await readFile(absPath, "utf8");
-        const { bundleSubgraphCode } = await import("@secondlayer/bundler");
-        const bundled = await bundleSubgraphCode(source, {
-          fileName: relative(process.cwd(), absPath)
-        });
         const handlerCode = bundled.handlerCode;
         const localVerification = checkDeterminism(effectiveDef, bundled.findings);
         if (dryRun) {
@@ -30840,16 +30820,7 @@ deploy does not backfill from genesis.`).action(async (file, options) => {
           await printDeployFooter();
         }
       } else {
-        let findings;
-        try {
-          const { bundleSubgraphCode } = await import("@secondlayer/bundler");
-          findings = (await bundleSubgraphCode(await readFile(absPath, "utf8"), {
-            fileName: relative(process.cwd(), absPath)
-          })).findings;
-        } catch {
-          findings = undefined;
-        }
-        const verification = findings ? checkDeterminism(effectiveDef, findings) : undefined;
+        const verification = checkDeterminism(effectiveDef, bundled.findings);
         if (dryRun) {
           printSubgraphDeployPreview(createSubgraphDeployPreview(validated), {
             network: config.network,
@@ -31892,7 +31863,7 @@ var {
 // package.json
 var package_default = {
   name: "@secondlayer/cli",
-  version: "23.3.0",
+  version: "23.4.1",
   description: "Run a Stacks index on your own hardware — set it up, restore verified history, and keep it current.",
   repository: {
     type: "git",
@@ -31943,8 +31914,8 @@ var package_default = {
     "@secondlayer/scaffold": "^1.6.3",
     "@secondlayer/sdk": "^16.2.0",
     "@secondlayer/shared": "^15.0.1",
-    "@secondlayer/stacks": "^6.5.3",
-    "@secondlayer/subgraphs": "^8.0.1",
+    "@secondlayer/stacks": "^6.6.0",
+    "@secondlayer/subgraphs": "^8.0.2",
     "@secondlayer/verify": "^0.6.1",
     esbuild: "^0.28.2",
     "smol-toml": "^1.9.1",
@@ -35867,7 +35838,7 @@ is what makes minting possible without Bitcoin.`).action(async (opts) => {
       const txid = await client.callContract({
         contract,
         functionName: "complete-deposit-wrapper",
-        functionArgs: [
+        args: [
           Cl.bufferFromHex(depositTxid),
           Cl.uint(0),
           Cl.uint(amount),
@@ -36868,7 +36839,7 @@ init_api_url();
 init_http();
 import { hostname } from "node:os";
 import { createInterface } from "node:readline";
-import { confirm as confirm3, input } from "@inquirer/prompts";
+import { confirm as confirm2, input } from "@inquirer/prompts";
 
 // src/lib/open-browser.ts
 import { spawn as spawn3 } from "node:child_process";
@@ -36951,7 +36922,7 @@ async function shouldContinueLogin(target, options, deps = defaultLoginCheckDeps
     return false;
   }
   try {
-    const proceed = await confirm3({
+    const proceed = await confirm2({
       message: "Log in as a different user?",
       default: false
     });
@@ -37120,18 +37091,24 @@ async function runLogout() {
     info(`Not logged in (${target}).`);
     return;
   }
-  try {
-    await httpAt(target, "/api/auth/logout", {
-      method: "POST",
-      bearer: session.token
-    });
-  } catch (err) {
-    if (err instanceof CliHttpError) {
-      warn(`Server logout failed (${err.code}); clearing the local session anyway`);
+  const isSession = session.token.startsWith("ss-sl_");
+  if (isSession) {
+    try {
+      await httpAt(target, "/api/auth/logout", {
+        method: "POST",
+        bearer: session.token
+      });
+    } catch (err) {
+      if (err instanceof CliHttpError) {
+        warn(`Server logout failed (${err.code}); clearing the local session anyway`);
+      }
     }
   }
   await clearSession(target);
   success(`Logged out (${target}).`);
+  if (!isSession) {
+    info("Removed the saved key from this machine. The key stays active; revoke it on the Keys tab.");
+  }
 }
 function registerLogoutCommand(program) {
   program.command("logout").description("Sign this machine out of your Secondlayer account").action(() => runLogout());
@@ -37698,8 +37675,7 @@ program.hook("preAction", (thisCommand) => {
 program.addHelpText("after", `
 Quickstart:
   $ secondlayer subgraphs create my-watcher --from-contract SP....my-contract
-  $ git add subgraphs/my-watcher.ts
-  $ secondlayer subgraphs deploy subgraphs/my-watcher.ts   # or --allow-uncommitted
+  $ secondlayer subgraphs deploy subgraphs/my-watcher.ts
 
 Self-host, from docker/oss in a checkout:
   $ secondlayer init --network mainnet
@@ -37737,5 +37713,5 @@ registerCreditsCommand(program);
 registerArchiveCommand(program);
 program.parse();
 
-//# debugId=599D8A8ADF6556BF64756E2164756E21
+//# debugId=8047E4F45A72C72F64756E2164756E21
 //# sourceMappingURL=cli.js.map