@skillport/cli 0.1.0 → 0.1.2

package/dist/index.js

@@ -2496,46 +2496,89 @@ import { createServer } from "node:http";
 import { randomBytes } from "node:crypto";
 import chalk9 from "chalk";
 import inquirer4 from "inquirer";
-async function loginCommand() {
+function listenOnPort(server, port) {
+  return new Promise((resolve, reject) => {
+    server.once("error", reject);
+    server.listen(port, () => {
+      server.removeListener("error", reject);
+      const addr = server.address();
+      resolve(addr.port);
+    });
+  });
+}
+async function loginCommand(options) {
   const config = loadConfig();
   console.log(chalk9.bold("SkillPort Market Login"));
   console.log(chalk9.dim(`Marketplace: ${config.marketplace_url}`));
   console.log();
-  const { method } = await inquirer4.prompt([
-    {
-      type: "list",
-      name: "method",
-      message: "Login method:",
-      choices: [
-        { name: "Browser (GitHub OAuth)", value: "browser" },
-        { name: "Paste API token", value: "token" }
-      ]
-    }
-  ]);
-  if (method === "token") {
-    const { token: token2 } = await inquirer4.prompt([
-      { type: "password", name: "token", message: "Enter your API token:" }
+  let method = options.method;
+  if (options.token) {
+    method = "token";
+  }
+  if (!options.yes && method === "browser" && !options.token) {
+    const answer = await inquirer4.prompt([
+      {
+        type: "list",
+        name: "method",
+        message: "Login method:",
+        choices: [
+          { name: "Browser (GitHub OAuth)", value: "browser" },
+          { name: "Paste API token", value: "token" }
+        ]
+      }
     ]);
+    method = answer.method;
+  }
+  if (method === "token") {
+    let token2 = options.token;
+    if (!token2) {
+      const answer = await inquirer4.prompt([
+        { type: "password", name: "token", message: "Enter your API token:" }
+      ]);
+      token2 = answer.token;
+    }
     config.auth_token = token2;
     saveConfig(config);
     console.log(chalk9.green("Login successful! Token saved."));
     return;
   }
   const state = randomBytes(16).toString("hex");
-  const port = 9876;
-  const authUrl = `${config.marketplace_url}/auth/cli?state=${state}&port=${port}`;
-  console.log(chalk9.dim(`Opening browser to: ${authUrl}`));
-  console.log(chalk9.dim("Waiting for authentication..."));
-  const { exec } = await import("node:child_process");
-  const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-  exec(`${openCmd} "${authUrl}"`);
+  const requestedPort = options.port !== void 0 ? parseInt(options.port, 10) : 9876;
+  const userExplicitPort = options.port !== void 0;
+  const server = createServer();
+  let actualPort;
+  try {
+    actualPort = await listenOnPort(server, requestedPort);
+  } catch (err) {
+    const code = err.code;
+    if (code === "EADDRINUSE" && !userExplicitPort) {
+      console.log(chalk9.yellow(`Port ${requestedPort} in use, selecting a free port...`));
+      actualPort = await listenOnPort(server, 0);
+    } else {
+      throw err;
+    }
+  }
+  const authUrl = `${config.marketplace_url}/auth/cli?state=${state}&port=${actualPort}`;
+  if (options.browser === false) {
+    console.log(chalk9.bold("Open this URL in your browser to authenticate:"));
+    console.log();
+    console.log(`  ${authUrl}`);
+    console.log();
+    console.log(chalk9.dim("Waiting for authentication callback..."));
+  } else {
+    console.log(chalk9.dim(`Opening browser to: ${authUrl}`));
+    console.log(chalk9.dim("Waiting for authentication..."));
+    const { exec } = await import("node:child_process");
+    const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
+    exec(`${openCmd} "${authUrl}"`);
+  }
   const token = await new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
       server.close();
-      reject(new Error("Authentication timed out (60s)"));
+      reject(new Error("Authentication timed out (60s). Try again or use: skillport login --method token --token <your-token>"));
     }, 6e4);
-    const server = createServer(async (req, res) => {
-      const url = new URL(req.url || "", `http://localhost:${port}`);
+    server.on("request", (req, res) => {
+      const url = new URL(req.url || "", `http://localhost:${actualPort}`);
       if (url.pathname === "/callback") {
         const callbackState = url.searchParams.get("state");
         const accessToken = url.searchParams.get("token");
@@ -2556,7 +2599,6 @@ async function loginCommand() {
         resolve(accessToken);
       }
     });
-    server.listen(port);
   });
   try {
     const response = await fetch(`${config.marketplace_url}/v1/auth/cli-token`, {
@@ -2678,7 +2720,7 @@ async function publishCommand(sspPath) {
 
 // src/index.ts
 var program = new Command();
-program.name("skillport").description("SkillPort \u2014 secure skill distribution for OpenClaw").version("0.1.0");
+program.name("skillport").description("SkillPort \u2014 secure skill distribution for OpenClaw").version("0.1.2");
 program.command("init").description("Generate Ed25519 key pair for signing").action(initCommand);
 program.command("scan <path>").description("Run security scan on a skill directory or .ssp file").action(scanCommand);
 program.command("export <path>").description("Export a skill directory as a SkillPort package (.ssp)").option("-o, --output <file>", "Output file path").option("-y, --yes", "Non-interactive mode (include all, skip prompts)").option("--id <id>", "Skill ID (author-slug/skill-slug)").option("--name <name>", "Skill name").option("--description <desc>", "Skill description").option("--skill-version <ver>", "Skill version (semver)").option("--author <name>", "Author name").option("--openclaw-compat <range>", "OpenClaw compatibility range").option("--os <os...>", "Compatible OS (macos, linux, windows)").action(exportCommand);
@@ -2687,6 +2729,6 @@ program.command("verify <ssp>").description("Verify SkillPort package signatures
 program.command("install <target>").description("Install a SkillPort package").option("--accept-risk", "Accept high-risk permissions (shell, critical flags)").option("-y, --yes", "Non-interactive mode (auto-approve, use defaults)").action(installCommand);
 program.command("dry-run <ssp>").description("Run installation diagnostics without installing").action(dryRunCommand);
 program.command("uninstall <id>").description("Uninstall an installed skill").action(uninstallCommand);
-program.command("login").description("Authenticate with SkillPort Market").action(loginCommand);
+program.command("login").description("Authenticate with SkillPort Market").option("--method <method>", "Login method: browser or token", "browser").option("--token <token>", "API token (for --method token)").option("-y, --yes", "Non-interactive mode (skip prompts)").option("--no-browser", "Print auth URL instead of opening browser").option("--port <port>", "Callback port (default: 9876, use 0 for auto)").action(loginCommand);
 program.command("publish <ssp>").description("Publish a SkillPort package to the marketplace").action(publishCommand);
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skillport/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "SkillPort CLI — secure skill distribution for OpenClaw. Export, scan, sign, and install AI skill packages.",
   "type": "module",
   "license": "MIT",