@superglue/cli 0.1.0 → 1.0.0

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,13 @@ 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");
 }
-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,6 +21672,7 @@ 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
@@ -22039,6 +22068,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 +22091,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:
 `);
@@ -23100,10 +23146,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,
@@ -23241,8 +23298,43 @@ function registerRunCommands(program2, getContext2) {
 // src/version.ts
 var import_node_child_process2 = require("child_process");
 var import_node_util = require("util");
+
+// package.json
+var package_default = {
+  name: "@superglue/cli",
+  version: "1.0.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_process2.exec);
-var CLI_VERSION = "0.1.0";
+var CLI_VERSION = package_default.version;
 function compareVersions(a, b) {
   const partsA = a.split(".").map(Number);
   const partsB = b.split(".").map(Number);
@@ -23317,7 +23409,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 +23488,31 @@ 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;
+}
+var subcommand = findSubcommand(process.argv);
+if (subcommand && commandsRequiringServer.includes(subcommand)) {
+  const apiKeyIdx = process.argv.indexOf("--api-key");
+  const endpointIdx = process.argv.indexOf("--endpoint");
+  const cliApiKey = apiKeyIdx !== -1 ? process.argv[apiKeyIdx + 1] : void 0;
+  const cliEndpoint = endpointIdx !== -1 ? process.argv[endpointIdx + 1] : void 0;
+  const config = resolveConfig({ apiKey: cliApiKey, endpoint: cliEndpoint });
   if (config.apiKey) {
     checkVersionCompatibility(config.endpoint).then(() => program.parse());
   } else {

package/dist/skills/superglue/SKILL.md

@@ -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/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.0.0",
   "bin": {
     "sg": "./dist/cli.js"
   },

package/skills/superglue/SKILL.md

@@ -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/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