@superglue/cli 0.1.0 → 1.1.0

package/README.md

@@ -0,0 +1,79 @@
+# superglue CLI
+
+[![npm](https://img.shields.io/npm/v/@superglue/cli?style=flat-square&logo=npm)](https://www.npmjs.com/package/@superglue/cli)
+[![License](https://img.shields.io/badge/license-MIT-blue?style=flat-square)](LICENSE)
+
+Build, test, and manage superglue API integration tools from the command line.
+
+## What is superglue?
+
+- AI-powered tool builder that works with any API, database or file storage server
+- Abstracts away authentication, documentation handling and data mapping between systems
+- Self-heals tools: when steps fail due to upstream API changes, superglue can auto-repair failures
+
+## Installation
+
+### As npm package
+
+```bash
+npm install -g @superglue/cli
+sg --help
+```
+
+### As Claude Code Plugin
+
+```
+/plugin install github:superglue-ai/cli
+```
+
+## Quick Start
+
+```bash
+sg init                        # guided setup
+sg system list                 # verify connection
+sg tool build --config '...'   # build a tool
+sg tool run --draft <id>       # test it
+sg tool save --draft <id>      # save it
+```
+
+## Commands
+
+### Tools
+
+- `sg tool build` — Build a tool from config
+- `sg tool run` — Run a draft or saved tool
+- `sg tool edit` — Edit via JSON Patch
+- `sg tool save` — Save a draft
+- `sg tool list` — List saved tools
+- `sg tool find` — Search tools
+
+### Systems
+
+- `sg system create` — Create a system
+- `sg system edit` — Edit system config
+- `sg system list` — List systems
+- `sg system find` — Search systems
+- `sg system call` — Make authenticated API calls
+- `sg system oauth` — Authenticate via OAuth
+- `sg system docs` — Search system documentation
+
+### Runs
+
+- `sg run list` — List execution runs
+- `sg run get` — Get run details
+
+## Documentation
+
+- [Full CLI Reference](./skills/superglue/SKILL.md) — Complete command documentation
+- [superglue Docs](https://docs.superglue.cloud) — Platform documentation
+- [API Reference](https://docs.superglue.cloud/api-reference/) — REST API docs
+
+## Related
+
+- [superglue Web App](https://app.superglue.cloud) — Visual tool builder
+- [@superglue/client](https://www.npmjs.com/package/@superglue/client) — TypeScript SDK
+- [superglue-client](https://pypi.org/project/superglue-client/) — Python SDK
+
+## License
+
+MIT

package/dist/cli.js

@@ -20962,23 +20962,32 @@ var require_cli_oauth = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.encryptCliApiKey = encryptCliApiKey2;
     exports2.decryptCliApiKey = decryptCliApiKey;
-    var crypto_1 = __importDefault(require("crypto"));
-    function encryptCliApiKey2(apiKey, systemId) {
-      const key = crypto_1.default.createHash("sha256").update(`cli-oauth-${systemId}`).digest();
-      const iv = crypto_1.default.randomBytes(16);
-      const cipher = crypto_1.default.createCipheriv("aes-256-cbc", key, iv);
+    var node_crypto_1 = __importDefault(require("crypto"));
+    function encryptCliApiKey2(apiKey, systemId, secret) {
+      if (!secret) {
+        throw new Error("Server secret required for CLI OAuth encryption");
+      }
+      const key = node_crypto_1.default.createHash("sha256").update(`${secret}:cli-oauth:${systemId}`).digest();
+      const iv = node_crypto_1.default.randomBytes(12);
+      const cipher = node_crypto_1.default.createCipheriv("aes-256-gcm", key, iv);
       let encrypted = cipher.update(apiKey, "utf8", "hex");
       encrypted += cipher.final("hex");
-      return `${iv.toString("hex")}:${encrypted}`;
+      const authTag = cipher.getAuthTag().toString("hex");
+      return `${iv.toString("hex")}:${encrypted}:${authTag}`;
     }
-    function decryptCliApiKey(encrypted, systemId) {
+    function decryptCliApiKey(encrypted, systemId, secret) {
+      if (!secret) {
+        return null;
+      }
       try {
-        const [ivHex, encryptedHex] = encrypted.split(":");
-        if (!ivHex || !encryptedHex)
+        const [ivHex, encryptedHex, authTagHex] = encrypted.split(":");
+        if (!ivHex || !encryptedHex || !authTagHex)
           return null;
-        const key = crypto_1.default.createHash("sha256").update(`cli-oauth-${systemId}`).digest();
+        const key = node_crypto_1.default.createHash("sha256").update(`${secret}:cli-oauth:${systemId}`).digest();
         const iv = Buffer.from(ivHex, "hex");
-        const decipher = crypto_1.default.createDecipheriv("aes-256-cbc", key, iv);
+        const authTag = Buffer.from(authTagHex, "hex");
+        const decipher = node_crypto_1.default.createDecipheriv("aes-256-gcm", key, iv);
+        decipher.setAuthTag(authTag);
         let decrypted = decipher.update(encryptedHex, "hex", "utf8");
         decrypted += decipher.final("utf8");
         return decrypted;
@@ -21454,6 +21463,14 @@ var require_superglue_client = __commonJS({
         const response = await this.restRequest("GET", `/v1/oauth/templates/${encodeURIComponent(params.templateId)}/credentials`);
         return response.data;
       }
+      /**
+       * Get the CLI OAuth encryption secret and orgId.
+       * Used by CLI to encrypt API keys in OAuth state parameters.
+       */
+      async getCliOAuthSecret() {
+        const response = await this.restRequest("GET", "/v1/oauth/cli-secret");
+        return response.data;
+      }
       async triggerSystemDocumentationScrapeJob(systemId, options) {
         const response = await this.restRequest("POST", `/v1/systems/${encodeURIComponent(systemId)}/documentation/scrape`, options);
         return response.data;
@@ -21571,6 +21588,7 @@ var import_commander = require("commander");
 
 // src/config.ts
 var fs = __toESM(require("fs"));
+var os = __toESM(require("os"));
 var path = __toESM(require("path"));
 var DEFAULT_CONFIG = {
   output: { mode: "stdout", directory: ".superglue/output" },
@@ -21579,16 +21597,26 @@ var DEFAULT_CONFIG = {
     editTool: "confirm"
   }
 };
-function getConfigDir() {
+function getConfigDir(preferLocal) {
   const localDir = path.join(process.cwd(), ".superglue");
+  const homeDir = os.homedir();
+  if (!homeDir) {
+    return localDir;
+  }
+  const globalDir = path.join(homeDir, ".superglue");
+  if (preferLocal === true) {
+    return localDir;
+  }
+  if (preferLocal === false) {
+    return globalDir;
+  }
   if (fs.existsSync(path.join(localDir, "config.json"))) {
     return localDir;
   }
-  const homeDir = process.env.HOME || process.env.USERPROFILE || "";
-  return path.join(homeDir, ".superglue");
+  return globalDir;
 }
-function getConfigPath() {
-  return path.join(getConfigDir(), "config.json");
+function getConfigPath(preferLocal) {
+  return path.join(getConfigDir(preferLocal), "config.json");
 }
 function loadConfigFile() {
   const configPath = getConfigPath();
@@ -21614,13 +21642,15 @@ function resolveConfig(flags) {
     policies: { ...DEFAULT_CONFIG.policies, ...file.policies }
   };
 }
-function writeConfig(config) {
-  const dir = getConfigDir();
+function writeConfig(config, preferLocal) {
+  const dir = getConfigDir(preferLocal);
   if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(getConfigPath(), JSON.stringify(config, null, 2) + "\n");
+  fs.writeFileSync(path.join(dir, "config.json"), JSON.stringify(config, null, 2) + "\n", {
+    mode: 384
+  });
 }
-function ensureConfigDirs(config) {
-  const draftsDir = path.join(getConfigDir(), "drafts");
+function ensureConfigDirs(config, preferLocal) {
+  const draftsDir = path.join(getConfigDir(preferLocal), "drafts");
   if (!fs.existsSync(draftsDir)) fs.mkdirSync(draftsDir, { recursive: true });
   if (config.output.mode === "stdout+file") {
     const outDir = path.resolve(config.output.directory);
@@ -21644,10 +21674,130 @@ function createClient(config) {
 // src/commands/init.ts
 var fs2 = __toESM(require("fs"));
 var path2 = __toESM(require("path"));
+var os2 = __toESM(require("os"));
 var import_shared2 = __toESM(require_dist2());
 
 // src/output.ts
 var readline = __toESM(require("readline"));
+
+// src/version.ts
+var import_node_child_process = require("child_process");
+var import_node_util = require("util");
+
+// package.json
+var package_default = {
+  name: "@superglue/cli",
+  version: "1.1.0",
+  bin: {
+    sg: "./dist/cli.js"
+  },
+  files: [
+    "dist/",
+    "skills/",
+    "skills.md"
+  ],
+  dependencies: {
+    commander: "^13.0.0",
+    "fast-json-patch": "^3.1.1"
+  },
+  devDependencies: {
+    "@superglue/shared": "file:../shared",
+    "@types/node": "^20.0.0",
+    tsup: "^8.0.0",
+    typescript: "^5.0.0"
+  },
+  scripts: {
+    build: "tsup && (cp -r skills dist/ 2>/dev/null || true)",
+    dev: "tsup --watch",
+    "type-check": "tsc --noEmit",
+    prepublishOnly: "npm run build"
+  },
+  publishConfig: {
+    access: "public"
+  }
+};
+
+// src/version.ts
+var execAsync = (0, import_node_util.promisify)(import_node_child_process.exec);
+var CLI_VERSION = package_default.version;
+function parseVersionPart(part) {
+  const match = part.match(/^(\d+)(?:-(.+))?$/);
+  if (match) {
+    return { numeric: parseInt(match[1], 10), prerelease: match[2] || null };
+  }
+  return { numeric: 0, prerelease: part };
+}
+function compareVersions(a, b) {
+  const partsA = a.split(".");
+  const partsB = b.split(".");
+  const maxLen = Math.max(partsA.length, partsB.length);
+  for (let i = 0; i < maxLen; i++) {
+    const parsedA = parseVersionPart(partsA[i] || "0");
+    const parsedB = parseVersionPart(partsB[i] || "0");
+    if (parsedA.numeric < parsedB.numeric) return -1;
+    if (parsedA.numeric > parsedB.numeric) return 1;
+    if (parsedA.prerelease === null && parsedB.prerelease !== null) return 1;
+    if (parsedA.prerelease !== null && parsedB.prerelease === null) return -1;
+    if (parsedA.prerelease !== null && parsedB.prerelease !== null) {
+      if (parsedA.prerelease < parsedB.prerelease) return -1;
+      if (parsedA.prerelease > parsedB.prerelease) return 1;
+    }
+  }
+  return 0;
+}
+async function checkVersionCompatibility(endpoint) {
+  try {
+    const healthUrl = `${endpoint.replace(/\/$/, "")}/v1/health`;
+    const response = await fetch(healthUrl, { signal: AbortSignal.timeout(3e3) });
+    if (!response.ok) return;
+    const health = await response.json();
+    if (!health.minCliVersion) return;
+    if (compareVersions(CLI_VERSION, health.minCliVersion) < 0) {
+      console.error("");
+      console.error(`${c.yellow}${c.bold}\u26A0 CLI version ${CLI_VERSION} is outdated.${c.reset}`);
+      console.error(
+        `${c.yellow}  Server requires at least v${health.minCliVersion}. Run: ${c.bold}sg update${c.reset}`
+      );
+      console.error("");
+    }
+  } catch {
+  }
+}
+async function getLatestNpmVersion() {
+  try {
+    const response = await fetch("https://registry.npmjs.org/@superglue/cli/latest", {
+      signal: AbortSignal.timeout(5e3)
+    });
+    if (!response.ok) return null;
+    const data = await response.json();
+    return data.version || null;
+  } catch {
+    return null;
+  }
+}
+async function updateCli() {
+  const latestVersion = await getLatestNpmVersion();
+  if (!latestVersion) {
+    return { success: false, message: "Could not fetch latest version from npm" };
+  }
+  if (compareVersions(CLI_VERSION, latestVersion) >= 0) {
+    return { success: true, message: `Already on latest version (${CLI_VERSION})` };
+  }
+  try {
+    await execAsync("npm install -g @superglue/cli@latest");
+    return {
+      success: true,
+      message: `Updated from ${CLI_VERSION} to ${latestVersion}`
+    };
+  } catch (err) {
+    return {
+      success: false,
+      message: `Update failed: ${err.message}. Try manually: npm install -g @superglue/cli@latest`
+    };
+  }
+}
+
+// src/output.ts
 var isJsonMode = () => process.argv.includes("--json") || !process.stdout.isTTY;
 var c = {
   reset: "\x1B[0m",
@@ -21700,7 +21850,7 @@ function banner() {
     const after = line.slice(last + 1);
     console.log(`  ${before}${inv}${inside}${rst}${after}`);
   });
-  console.log(`  ${d}  CLI v0.1.0${rst}`);
+  console.log(`  ${d}  CLI v${CLI_VERSION}${rst}`);
   console.log("");
 }
 function spinner(message) {
@@ -21753,6 +21903,11 @@ function error(message, details) {
     if (details) prettyPrint(details, 4);
   }
 }
+function warn(message) {
+  if (!isJsonMode()) {
+    console.log(`  ${c.yellow}\u26A0${c.reset} ${message}`);
+  }
+}
 function info(message) {
   if (!isJsonMode()) {
     console.log(`  ${c.dim}${message}${c.reset}`);
@@ -21945,22 +22100,25 @@ async function promptHidden(message) {
     let input = "";
     const onData = (ch) => {
       const s = ch.toString();
-      if (s === "\n" || s === "\r") {
-        if (process.stdin.isTTY) process.stdin.setRawMode(false);
-        process.stdin.removeListener("data", onData);
-        process.stdout.write("\n");
-        rl.close();
-        resolve4(input);
-      } else if (s === "") {
-        process.exit(0);
-      } else if (s === "\x7F" || s === "\b") {
-        if (input.length > 0) {
-          input = input.slice(0, -1);
-          process.stdout.write("\b \b");
+      for (const char of s) {
+        if (char === "\n" || char === "\r") {
+          if (process.stdin.isTTY) process.stdin.setRawMode(false);
+          process.stdin.removeListener("data", onData);
+          process.stdout.write("\n");
+          rl.close();
+          resolve4(input);
+          return;
+        } else if (char === "") {
+          process.exit(130);
+        } else if (char === "\x7F" || char === "\b") {
+          if (input.length > 0) {
+            input = input.slice(0, -1);
+            process.stdout.write("\b \b");
+          }
+        } else {
+          input += char;
+          process.stdout.write(`${c.dim}\u2022${c.reset}`);
         }
-      } else {
-        input += s;
-        process.stdout.write(`${c.dim}\u2022${c.reset}`);
       }
     };
     process.stdin.on("data", onData);
@@ -22039,6 +22197,19 @@ function registerInitCommand(program2) {
       0
     );
     const editPolicies = ["confirm", "auto_accept"];
+    heading("Config Location");
+    const homeDir = os2.homedir();
+    const localPath = path2.join(process.cwd(), ".superglue");
+    const globalPath = path2.join(homeDir, ".superglue");
+    const configLocationIdx = await choose(
+      "Where to save config?",
+      [
+        `Project (${localPath}) \u2014 config stays with this project`,
+        `Global (${globalPath}) \u2014 shared across all projects`
+      ],
+      0
+    );
+    const preferLocal = configLocationIdx === 0;
     const config = {
       apiKey,
       endpoint,
@@ -22049,35 +22220,39 @@ function registerInitCommand(program2) {
         editTool: editPolicies[editPolicyIdx]
       }
     };
-    writeConfig(config);
-    ensureConfigDirs(config);
+    writeConfig(config, preferLocal);
+    ensureConfigDirs(config, preferLocal);
+    const configDir = getConfigDir(preferLocal);
+    const configRelPath = preferLocal ? ".superglue/config.json" : path2.join(configDir, "config.json");
     const gitignorePath = path2.join(process.cwd(), ".gitignore");
-    const ignoreEntries = [".superglue/drafts/", `${outputDir}/`, ".superglue/config.json"];
-    if (fs2.existsSync(gitignorePath)) {
-      const existing = fs2.readFileSync(gitignorePath, "utf-8");
-      const toAdd = ignoreEntries.filter((e) => !existing.includes(e));
-      if (toAdd.length > 0) {
-        fs2.appendFileSync(gitignorePath, "\n# superglue CLI\n" + toAdd.join("\n") + "\n");
-        info("Updated .gitignore");
+    const ignoreEntries = [];
+    if (outputMode === "stdout+file" && !path2.isAbsolute(outputDir)) {
+      ignoreEntries.push(`${outputDir}/`);
+    }
+    if (preferLocal) {
+      ignoreEntries.push(".superglue/drafts/", ".superglue/config.json");
+    }
+    if (ignoreEntries.length > 0) {
+      if (fs2.existsSync(gitignorePath)) {
+        const existing = fs2.readFileSync(gitignorePath, "utf-8");
+        const toAdd = ignoreEntries.filter((e) => !existing.includes(e));
+        if (toAdd.length > 0) {
+          fs2.appendFileSync(gitignorePath, "\n# superglue CLI\n" + toAdd.join("\n") + "\n");
+          info("Updated .gitignore");
+        }
+      } else if (preferLocal) {
+        fs2.writeFileSync(gitignorePath, "# superglue CLI\n" + ignoreEntries.join("\n") + "\n");
+        info("Created .gitignore");
       }
-    } else {
-      fs2.writeFileSync(gitignorePath, "# superglue CLI\n" + ignoreEntries.join("\n") + "\n");
-      info("Created .gitignore");
     }
     console.log("");
-    console.log(`  ${c.dim}\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510${c.reset}`);
-    console.log(
-      `  ${c.dim}\u2502${c.reset}  ${c.green}\u2713${c.reset} Config saved to ${c.bold}.superglue/config.json${c.reset}   ${c.dim}\u2502${c.reset}`
-    );
-    console.log(
-      `  ${c.dim}\u2502${c.reset}  ${c.green}\u2713${c.reset} Created ${c.bold}.superglue/drafts/${c.reset}              ${c.dim}\u2502${c.reset}`
-    );
+    success(`Config saved to ${c.bold}${configRelPath}${c.reset}`);
+    if (preferLocal) {
+      success(`Created ${c.bold}.superglue/drafts/${c.reset}`);
+    }
     if (outputMode === "stdout+file") {
-      console.log(
-        `  ${c.dim}\u2502${c.reset}  ${c.green}\u2713${c.reset} Created ${c.bold}${outputDir}/${c.reset}${"".padEnd(Math.max(0, 27 - outputDir.length))}${c.dim}\u2502${c.reset}`
-      );
+      success(`Created ${c.bold}${outputDir}/${c.reset}`);
     }
-    console.log(`  ${c.dim}\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518${c.reset}`);
     console.log("");
     console.log(`  ${c.bold}You're all set!${c.reset} Try these commands:
 `);
@@ -22105,9 +22280,11 @@ var path3 = __toESM(require("path"));
 function getDraftsDir() {
   return path3.join(getConfigDir(), "drafts");
 }
+function encodeDraftId(draftId) {
+  return Buffer.from(draftId, "utf-8").toString("base64url");
+}
 function getDraftPath(draftId) {
-  const safeName = draftId.replace(/[^a-zA-Z0-9_-]/g, "_");
-  return path3.join(getDraftsDir(), `${safeName}.json`);
+  return path3.join(getDraftsDir(), `${encodeDraftId(draftId)}.json`);
 }
 function writeDraft(draft) {
   const dir = getDraftsDir();
@@ -22425,11 +22602,11 @@ function registerEditCommand(parent, getContext2) {
       draftId: workingDraftId,
       config: {
         ...patchedConfig,
-        instruction: originalConfig.instruction || patchedConfig.instruction,
+        instruction: patchedConfig.instruction ?? originalConfig.instruction,
         updatedAt: (/* @__PURE__ */ new Date()).toISOString()
       },
       systemIds: patchedConfig.systemIds || [],
-      instruction: patchedConfig.instruction || "",
+      instruction: patchedConfig.instruction ?? "",
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
     writeDraft(draft);
@@ -22495,8 +22672,8 @@ function registerSaveCommand(parent, getContext2) {
       process.exit(1);
     }
     const toolId = opts.id || draft.config.id;
+    const spin = spinner(`Saving tool ${c.bold}${toolId}${c.reset}...`);
     try {
-      const spin = spinner(`Saving tool ${c.bold}${toolId}${c.reset}...`);
       const saved = await client.upsertWorkflow(toolId, {
         ...draft.config,
         id: toolId,
@@ -22518,6 +22695,7 @@ function registerSaveCommand(parent, getContext2) {
         console.log("");
       }
     } catch (err) {
+      spin.stop();
       error(err.message);
       process.exit(1);
     }
@@ -22556,7 +22734,7 @@ function registerFindCommand(parent, getContext2) {
         output({ success: true, tool });
         return;
       }
-      const searchQuery = query || "*";
+      const searchQuery = (query || "").trim() || "*";
       if (searchQuery === "*") {
         const { items } = await client.listWorkflows(100);
         const tools = items.filter((t) => !t.archived).map((t) => ({
@@ -22657,10 +22835,10 @@ function registerCreateCommand(parent, getContext2) {
         if (template.oauth.client_id) oauthCreds.client_id = template.oauth.client_id;
       }
       systemInput = {
+        ...systemInput,
         name: systemInput.name || template.name,
-        url: template.apiUrl,
+        url: systemInput.url || template.apiUrl,
         templateName: opts.template,
-        ...systemInput,
         credentials: { ...oauthCreds, ...systemInput.credentials }
       };
     }
@@ -22759,7 +22937,9 @@ function registerEditCommand2(parent, getContext2) {
             url: opts.scrapeUrl,
             keywords
           });
-        } catch {
+        } catch (scrapeErr) {
+          const errMsg = scrapeErr instanceof Error ? scrapeErr.message : String(scrapeErr || "Unknown error");
+          warn(`Documentation scrape failed for ${opts.scrapeUrl}: ${errMsg}`);
         }
       }
       spin.stop();
@@ -22875,14 +23055,29 @@ function registerCallCommand(parent, getContext2) {
     if (body && Object.keys(filePayloads).length > 0) {
       try {
         let parsed = JSON.parse(body);
-        for (const [k, v] of Object.entries(parsed)) {
-          if (typeof v === "string" && v.startsWith("file::")) {
-            const key = v.slice(6);
-            if (key in filePayloads) parsed[k] = filePayloads[key];
+        const resolveFileRefs = (obj) => {
+          if (typeof obj === "string" && obj.startsWith("file::")) {
+            const key = obj.slice(6);
+            if (key in filePayloads) return filePayloads[key];
+            error(
+              `Unresolved file reference: file::${key}. Available: ${Object.keys(filePayloads).join(", ") || "(none)"}`
+            );
+            process.exit(1);
           }
-        }
+          if (Array.isArray(obj)) return obj.map(resolveFileRefs);
+          if (obj && typeof obj === "object") {
+            const result = {};
+            for (const [k, v] of Object.entries(obj)) {
+              result[k] = resolveFileRefs(v);
+            }
+            return result;
+          }
+          return obj;
+        };
+        parsed = resolveFileRefs(parsed);
         body = JSON.stringify(parsed);
-      } catch {
+      } catch (err) {
+        if (err.message?.startsWith("Unresolved file reference")) throw err;
       }
     }
     const autoExec = process.argv.includes("--yes") || process.argv.includes("-y") || shouldAutoExecute(config.policies.callSystem, method, opts.url);
@@ -22995,13 +23190,13 @@ function registerDocsCommand(parent, getContext2) {
 }
 
 // src/commands/system/oauth.ts
-var import_node_child_process = require("child_process");
+var import_node_child_process2 = require("child_process");
 var import_shared8 = __toESM(require_dist2());
 function openBrowser(url) {
   const platform = process.platform;
   const cmd = platform === "darwin" ? "open" : platform === "win32" ? "cmd" : "xdg-open";
   const args = platform === "win32" ? ["/c", "start", "", url] : [url];
-  (0, import_node_child_process.spawn)(cmd, args, { detached: true, stdio: "ignore" }).unref();
+  (0, import_node_child_process2.spawn)(cmd, args, { detached: true, stdio: "ignore" }).unref();
 }
 async function pollForTokens(client, systemId, originalToken, timeoutMs = 3e5, intervalMs = 2e3) {
   const start = Date.now();
@@ -23100,10 +23295,21 @@ function registerOAuthCommand(parent, getContext2) {
       process.exit(1);
     }
     const originalToken = system.credentials?.access_token;
-    const encryptedApiKey = (0, import_shared8.encryptCliApiKey)(config.apiKey, opts.systemId);
+    let encryptionSecret;
+    let orgId;
+    try {
+      const secretData = await client.getCliOAuthSecret();
+      encryptionSecret = secretData.secret;
+      orgId = secretData.orgId;
+    } catch (err) {
+      error(`Failed to get OAuth encryption secret: ${err.message}`);
+      process.exit(1);
+    }
+    const encryptedApiKey = (0, import_shared8.encryptCliApiKey)(config.apiKey, opts.systemId, encryptionSecret);
     const redirectUri = `${config.webEndpoint.replace(/\/$/, "")}/api/auth/callback`;
     const state = {
       systemId: opts.systemId,
+      orgId,
       timestamp: Date.now(),
       redirectUri,
       token_url: tokenUrl,
@@ -23150,12 +23356,12 @@ function registerSystemCommands(program2, getContext2) {
 
 // src/commands/run/list.ts
 function registerListCommand(parent, getContext2) {
-  parent.command("list").description("List recent runs").option("--tool <id>", "Filter by tool ID").option("--status <status>", "Filter by status (running, success, failed, aborted)").option("--source <sources>", "Comma-separated request sources").option("--user <userId>", "Filter by user ID").option("--system-id <id>", "Filter by system ID").option("--limit <n>", "Max results", "10").option("--offset <n>", "Skip first N results", "0").option("--search <text>", "Full-text search").action(async (opts) => {
+  parent.command("list").description("List recent runs").option("--tool <id>", "Filter by tool ID").option("--status <status>", "Filter by status (running, success, failed, aborted)").option("--source <sources>", "Comma-separated request sources").option("--user <userId>", "Filter by user ID").option("--system-id <id>", "Filter by system ID").option("--limit <n>", "Max results", "10").option("--offset <n>", "Skip first N results", "0").action(async (opts) => {
     const { client } = getContext2();
     try {
       const limit = Math.min(parseInt(opts.limit, 10) || 10, 50);
       const offset = parseInt(opts.offset, 10) || 0;
-      const page = Math.floor(offset / limit) + 1;
+      const page = Math.ceil((offset + 1) / limit);
       const requestSources = opts.source?.split(",").filter(Boolean);
       const result = await client.listRuns({
         toolId: opts.tool,
@@ -23238,74 +23444,6 @@ function registerRunCommands(program2, getContext2) {
   registerGetCommand(run, getContext2);
 }
 
-// src/version.ts
-var import_node_child_process2 = require("child_process");
-var import_node_util = require("util");
-var execAsync = (0, import_node_util.promisify)(import_node_child_process2.exec);
-var CLI_VERSION = "0.1.0";
-function compareVersions(a, b) {
-  const partsA = a.split(".").map(Number);
-  const partsB = b.split(".").map(Number);
-  for (let i = 0; i < Math.max(partsA.length, partsB.length); i++) {
-    const numA = partsA[i] || 0;
-    const numB = partsB[i] || 0;
-    if (numA < numB) return -1;
-    if (numA > numB) return 1;
-  }
-  return 0;
-}
-async function checkVersionCompatibility(endpoint) {
-  try {
-    const healthUrl = `${endpoint.replace(/\/$/, "")}/v1/health`;
-    const response = await fetch(healthUrl, { signal: AbortSignal.timeout(3e3) });
-    if (!response.ok) return;
-    const health = await response.json();
-    if (!health.minCliVersion) return;
-    if (compareVersions(CLI_VERSION, health.minCliVersion) < 0) {
-      console.error("");
-      console.error(`${c.yellow}${c.bold}\u26A0 CLI version ${CLI_VERSION} is outdated.${c.reset}`);
-      console.error(
-        `${c.yellow}  Server requires at least v${health.minCliVersion}. Run: ${c.bold}sg update${c.reset}`
-      );
-      console.error("");
-    }
-  } catch {
-  }
-}
-async function getLatestNpmVersion() {
-  try {
-    const response = await fetch("https://registry.npmjs.org/@superglue/cli/latest", {
-      signal: AbortSignal.timeout(5e3)
-    });
-    if (!response.ok) return null;
-    const data = await response.json();
-    return data.version || null;
-  } catch {
-    return null;
-  }
-}
-async function updateCli() {
-  const latestVersion = await getLatestNpmVersion();
-  if (!latestVersion) {
-    return { success: false, message: "Could not fetch latest version from npm" };
-  }
-  if (compareVersions(CLI_VERSION, latestVersion) >= 0) {
-    return { success: true, message: `Already on latest version (${CLI_VERSION})` };
-  }
-  try {
-    await execAsync("npm install -g @superglue/cli@latest");
-    return {
-      success: true,
-      message: `Updated from ${CLI_VERSION} to ${latestVersion}`
-    };
-  } catch (err) {
-    return {
-      success: false,
-      message: `Update failed: ${err.message}. Try manually: npm install -g @superglue/cli@latest`
-    };
-  }
-}
-
 // src/commands/update.ts
 function registerUpdateCommand(program2) {
   program2.command("update").description("Update the superglue CLI to the latest version").option("--check", "Only check for updates, don't install").action(async (opts) => {
@@ -23317,7 +23455,8 @@ function registerUpdateCommand(program2) {
         error("Could not fetch latest version from npm");
         process.exit(1);
       }
-      if (latestVersion === CLI_VERSION) {
+      const comparison = compareVersions(CLI_VERSION, latestVersion);
+      if (comparison >= 0) {
         success(`You're on the latest version (${CLI_VERSION})`);
       } else {
         console.log("");
@@ -23395,10 +23534,41 @@ registerToolCommands(program, getContext);
 registerSystemCommands(program, getContext);
 registerRunCommands(program, getContext);
 var commandsRequiringServer = ["tool", "system", "run"];
-var firstArg = process.argv[2];
-if (firstArg && commandsRequiringServer.includes(firstArg)) {
-  const opts = program.opts();
-  const config = resolveConfig({ apiKey: opts.apiKey, endpoint: opts.endpoint });
+var globalFlagsWithValues = ["--api-key", "--endpoint"];
+var globalFlagsNoValue = ["--json", "-y", "--yes", "-h", "--help", "-V", "--version"];
+function findSubcommand(argv) {
+  let i = 2;
+  while (i < argv.length) {
+    const arg = argv[i];
+    if (globalFlagsWithValues.includes(arg)) {
+      i += 2;
+    } else if (globalFlagsNoValue.includes(arg)) {
+      i += 1;
+    } else if (arg.startsWith("-")) {
+      i += 1;
+    } else {
+      return arg;
+    }
+  }
+  return void 0;
+}
+function extractFlagValue(argv, flag) {
+  for (let i = 0; i < argv.length; i++) {
+    const arg = argv[i];
+    if (arg.startsWith(`${flag}=`)) {
+      return arg.slice(flag.length + 1);
+    }
+    if (arg === flag && i + 1 < argv.length) {
+      return argv[i + 1];
+    }
+  }
+  return void 0;
+}
+var subcommand = findSubcommand(process.argv);
+if (subcommand && commandsRequiringServer.includes(subcommand)) {
+  const cliApiKey = extractFlagValue(process.argv, "--api-key");
+  const cliEndpoint = extractFlagValue(process.argv, "--endpoint");
+  const config = resolveConfig({ apiKey: cliApiKey, endpoint: cliEndpoint });
   if (config.apiKey) {
     checkVersionCompatibility(config.endpoint).then(() => program.parse());
   } else {

package/dist/skills/superglue/SKILL.md

@@ -227,14 +227,14 @@ sg system oauth --system-id my_api --grant-type client_credentials --scopes "rea
     {
       "id": "unique-step-id",
       "config": {
-        "systemId": "system-id",
-        "url": "https://api.example.com/endpoint?param=<<payload.field>>",
+        "systemId": "example_system",
+        "url": "https://api.example.com/endpoint?param=<<payload_field>>",
         "method": "GET",
         "headers": {
-          "Authorization": "Bearer <<system-id_access_token>>"
+          "Authorization": "Bearer <<example_system_access_token>>"
         },
         "queryParams": { "limit": "10" },
-        "body": "{ \"key\": \"<<payload.field>>\" }"
+        "body": "{ \"key\": \"<<payload_field>>\" }"
       },
       "dataSelector": "(sourceData) => sourceData.previousStep.data.items",
       "transformCode": "(items) => items.map(i => ({ id: i.id, name: i.name }))",
@@ -620,6 +620,7 @@ const { data } = await runTool("my-tool-id", { inputs: { userId: "123" } });
 ### Python SDK
 
 ```python
+import os
 from superglue_client import SuperglueClient
 from superglue_client.api.tools import run_tool
 client = SuperglueClient(base_url="https://api.superglue.cloud/v1", token=os.environ["SUPERGLUE_API_KEY"])

package/dist/skills/superglue/references/file-servers.md

@@ -75,7 +75,7 @@ Downloaded files are all parsed automatically:
 
 - String → written as-is
 - Buffer → written directly
-- Object/Array → JSON.stringified with 2-space indent
+- Object/Array → `JSON.stringify` with 2-space indent
 
 ## Connection Details
 

package/dist/skills/superglue/references/integration.md

@@ -7,36 +7,36 @@ After building and saving tools with the CLI, integrate them into your applicati
 For any language, use the REST API directly:
 
 ```bash
-# Set your API key
+# Set your API key and endpoint
 export SUPERGLUE_API_KEY="your-api-key"
-export SUPERGLUE_ENDPOINT="https://api.superglue.cloud"
+export SUPERGLUE_API_ENDPOINT="https://api.superglue.cloud"
 
 # Run a tool (sync - waits for completion)
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id/run" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id/run" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY" \
   -H "Content-Type: application/json" \
   -d '{"inputs": {"userId": "123"}, "options": {"async": false}}'
 
 # Run a tool (async - returns immediately)
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id/run" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id/run" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY" \
   -H "Content-Type: application/json" \
   -d '{"inputs": {"userId": "123"}, "options": {"async": true}}'
 
 # Get run status/result
-curl "$SUPERGLUE_ENDPOINT/v1/runs/{runId}" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/runs/{runId}" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # List tools
-curl "$SUPERGLUE_ENDPOINT/v1/tools?page=1&limit=50" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/tools?page=1&limit=50" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # Get tool details
-curl "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # Cancel a running tool
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/runs/{runId}/cancel" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/runs/{runId}/cancel" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 ```
 
@@ -144,6 +144,7 @@ const { data: systems } = await listSystems();
 ## Python Usage
 
 ```python
+import os
 from superglue_client import SuperglueClient
 from superglue_client.api.tools import run_tool, list_tools, get_tool
 from superglue_client.api.runs import get_run
@@ -261,7 +262,7 @@ async function runWithFallback(inputs: Record<string, any>) {
 SUPERGLUE_API_KEY=your-api-key
 
 # Optional (defaults to hosted)
-SUPERGLUE_API_ENDPOINT=https://api.superglue.cloud/v1
+SUPERGLUE_API_ENDPOINT=https://api.superglue.cloud
 ```
 
 ## Best Practices

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superglue/cli",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "bin": {
     "sg": "./dist/cli.js"
   },
@@ -20,7 +20,7 @@
     "typescript": "^5.0.0"
   },
   "scripts": {
-    "build": "tsup && cp -r skills dist/ 2>/dev/null || true",
+    "build": "tsup && (cp -r skills dist/ 2>/dev/null || true)",
     "dev": "tsup --watch",
     "type-check": "tsc --noEmit",
     "prepublishOnly": "npm run build"

package/skills/superglue/SKILL.md

@@ -227,14 +227,14 @@ sg system oauth --system-id my_api --grant-type client_credentials --scopes "rea
     {
       "id": "unique-step-id",
       "config": {
-        "systemId": "system-id",
-        "url": "https://api.example.com/endpoint?param=<<payload.field>>",
+        "systemId": "example_system",
+        "url": "https://api.example.com/endpoint?param=<<payload_field>>",
         "method": "GET",
         "headers": {
-          "Authorization": "Bearer <<system-id_access_token>>"
+          "Authorization": "Bearer <<example_system_access_token>>"
         },
         "queryParams": { "limit": "10" },
-        "body": "{ \"key\": \"<<payload.field>>\" }"
+        "body": "{ \"key\": \"<<payload_field>>\" }"
       },
       "dataSelector": "(sourceData) => sourceData.previousStep.data.items",
       "transformCode": "(items) => items.map(i => ({ id: i.id, name: i.name }))",
@@ -620,6 +620,7 @@ const { data } = await runTool("my-tool-id", { inputs: { userId: "123" } });
 ### Python SDK
 
 ```python
+import os
 from superglue_client import SuperglueClient
 from superglue_client.api.tools import run_tool
 client = SuperglueClient(base_url="https://api.superglue.cloud/v1", token=os.environ["SUPERGLUE_API_KEY"])

package/skills/superglue/references/file-servers.md

@@ -75,7 +75,7 @@ Downloaded files are all parsed automatically:
 
 - String → written as-is
 - Buffer → written directly
-- Object/Array → JSON.stringified with 2-space indent
+- Object/Array → `JSON.stringify` with 2-space indent
 
 ## Connection Details
 

package/skills/superglue/references/integration.md

@@ -7,36 +7,36 @@ After building and saving tools with the CLI, integrate them into your applicati
 For any language, use the REST API directly:
 
 ```bash
-# Set your API key
+# Set your API key and endpoint
 export SUPERGLUE_API_KEY="your-api-key"
-export SUPERGLUE_ENDPOINT="https://api.superglue.cloud"
+export SUPERGLUE_API_ENDPOINT="https://api.superglue.cloud"
 
 # Run a tool (sync - waits for completion)
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id/run" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id/run" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY" \
   -H "Content-Type: application/json" \
   -d '{"inputs": {"userId": "123"}, "options": {"async": false}}'
 
 # Run a tool (async - returns immediately)
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id/run" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id/run" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY" \
   -H "Content-Type: application/json" \
   -d '{"inputs": {"userId": "123"}, "options": {"async": true}}'
 
 # Get run status/result
-curl "$SUPERGLUE_ENDPOINT/v1/runs/{runId}" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/runs/{runId}" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # List tools
-curl "$SUPERGLUE_ENDPOINT/v1/tools?page=1&limit=50" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/tools?page=1&limit=50" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # Get tool details
-curl "$SUPERGLUE_ENDPOINT/v1/tools/my-tool-id" \
+curl "$SUPERGLUE_API_ENDPOINT/v1/tools/my-tool-id" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 
 # Cancel a running tool
-curl -X POST "$SUPERGLUE_ENDPOINT/v1/runs/{runId}/cancel" \
+curl -X POST "$SUPERGLUE_API_ENDPOINT/v1/runs/{runId}/cancel" \
   -H "Authorization: Bearer $SUPERGLUE_API_KEY"
 ```
 
@@ -144,6 +144,7 @@ const { data: systems } = await listSystems();
 ## Python Usage
 
 ```python
+import os
 from superglue_client import SuperglueClient
 from superglue_client.api.tools import run_tool, list_tools, get_tool
 from superglue_client.api.runs import get_run
@@ -261,7 +262,7 @@ async function runWithFallback(inputs: Record<string, any>) {
 SUPERGLUE_API_KEY=your-api-key
 
 # Optional (defaults to hosted)
-SUPERGLUE_API_ENDPOINT=https://api.superglue.cloud/v1
+SUPERGLUE_API_ENDPOINT=https://api.superglue.cloud
 ```
 
 ## Best Practices