@struere/cli 0.2.2 → 0.2.4

package/dist/index.js

@@ -76,11 +76,13 @@ function getSyncUrl() {
 
 class ApiClient {
   baseUrl;
-  constructor(baseUrl) {
+  tokenOverride;
+  constructor(baseUrl, token) {
     this.baseUrl = baseUrl || getApiUrl();
+    this.tokenOverride = token;
   }
   async request(path, options = {}) {
-    const token = getToken();
+    const token = this.tokenOverride || getToken();
     const apiKey = getApiKey();
     const headers = {
       "Content-Type": "application/json",
@@ -165,7 +167,7 @@ class ApiError extends Error {
 
 // src/commands/login.ts
 var AUTH_CALLBACK_PORT = 9876;
-var loginCommand = new Command("login").description("Log in to Struere").option("--headless", "Login with email/password (no browser)").action(async (options) => {
+var loginCommand = new Command("login").description("Log in to Struere").action(async () => {
   const spinner = ora();
   console.log();
   console.log(chalk.bold("Struere Login"));
@@ -177,22 +179,14 @@ var loginCommand = new Command("login").description("Log in to Struere").option(
     console.log();
     return;
   }
-  if (options.headless) {
-    await headlessLogin(spinner);
-  } else {
-    await browserLogin(spinner);
-  }
+  await browserLogin(spinner);
 });
-async function performLogin(options = {}) {
+async function performLogin() {
   const spinner = ora();
   console.log();
   console.log(chalk.bold("Struere Login"));
   console.log();
-  if (options.headless) {
-    return headlessLoginInternal(spinner);
-  } else {
-    return browserLoginInternal(spinner);
-  }
+  return browserLoginInternal(spinner);
 }
 async function browserLogin(spinner) {
   const result = await browserLoginInternal(spinner);
@@ -212,6 +206,7 @@ async function browserLoginInternal(spinner) {
           const sessionId = url.searchParams.get("session_id");
           if (token && sessionId) {
             resolve({ token, sessionId });
+            setTimeout(() => server.stop(), 1000);
             return new Response(getSuccessHtml(), {
               headers: { "Content-Type": "text/html" }
             });
@@ -250,7 +245,7 @@ async function browserLoginInternal(spinner) {
   try {
     const { token } = await authPromise;
     spinner.text = "Fetching user info";
-    const api = new ApiClient;
+    const api = new ApiClient(undefined, token);
     const { user, organization } = await api.getMe();
     const credentials = {
       token,
@@ -279,60 +274,6 @@ async function browserLoginInternal(spinner) {
     console.log();
     console.log(chalk.red("Error:"), error instanceof Error ? error.message : String(error));
     console.log();
-    console.log(chalk.gray("Try"), chalk.cyan("struere login --headless"), chalk.gray("for email/password login"));
-    console.log();
-    return null;
-  }
-}
-async function headlessLogin(spinner) {
-  const result = await headlessLoginInternal(spinner);
-  if (result) {
-    printNextSteps();
-  }
-}
-async function headlessLoginInternal(spinner) {
-  const email = await prompt("Email: ");
-  const password = await prompt("Password: ", true);
-  if (!email || !password) {
-    console.log(chalk.red("Email and password are required"));
-    return null;
-  }
-  spinner.start("Logging in");
-  try {
-    const api = new ApiClient;
-    const { token, user } = await api.login(email, password);
-    const { organization } = await api.getMe();
-    const credentials = {
-      token,
-      user: {
-        id: user.id,
-        email: user.email,
-        name: user.name,
-        organizationId: user.organizationId
-      },
-      organization: {
-        id: organization.id,
-        name: organization.name,
-        slug: organization.slug
-      },
-      expiresAt: new Date(Date.now() + 7 * 24 * 60 * 60 * 1000).toISOString()
-    };
-    saveCredentials(credentials);
-    spinner.succeed("Logged in successfully");
-    console.log();
-    console.log(chalk.green("Welcome,"), chalk.cyan(user.name));
-    console.log(chalk.gray("Organization:"), organization.name);
-    console.log();
-    return credentials;
-  } catch (error) {
-    spinner.fail("Login failed");
-    console.log();
-    if (error instanceof ApiError) {
-      console.log(chalk.red("Error:"), error.message);
-    } else {
-      console.log(chalk.red("Error:"), error instanceof Error ? error.message : String(error));
-    }
-    console.log();
     return null;
   }
 }
@@ -344,9 +285,9 @@ function printNextSteps() {
   console.log();
 }
 function getAuthUrl() {
-  const baseUrl = process.env.STRUERE_AUTH_URL || "https://struere.dev";
+  const baseUrl = process.env.STRUERE_AUTH_URL || "https://app.struere.dev";
   const callbackUrl = `http://localhost:${AUTH_CALLBACK_PORT}/callback`;
-  return `${baseUrl}/cli-auth?callback=${encodeURIComponent(callbackUrl)}`;
+  return `${baseUrl}/authorize?callback=${encodeURIComponent(callbackUrl)}`;
 }
 function getSuccessHtml() {
   return `<!DOCTYPE html>
@@ -389,39 +330,6 @@ function getErrorHtml(message) {
 </body>
 </html>`;
 }
-async function prompt(message, hidden = false) {
-  process.stdout.write(chalk.gray(message));
-  return new Promise((resolve) => {
-    let input = "";
-    if (hidden) {
-      process.stdin.setRawMode(true);
-    }
-    process.stdin.resume();
-    process.stdin.setEncoding("utf8");
-    const onData = (char) => {
-      if (char === `
-` || char === "\r") {
-        process.stdin.removeListener("data", onData);
-        process.stdin.pause();
-        if (hidden) {
-          process.stdin.setRawMode(false);
-          console.log();
-        }
-        resolve(input);
-      } else if (char === "\x03") {
-        process.exit();
-      } else if (char === "\x7F") {
-        input = input.slice(0, -1);
-      } else {
-        input += char;
-        if (!hidden) {
-          process.stdout.write(char);
-        }
-      }
-    };
-    process.stdin.on("data", onData);
-  });
-}
 
 // src/utils/project.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
@@ -774,7 +682,7 @@ function hasAgentFiles(cwd) {
 }
 
 // src/commands/init.ts
-var initCommand = new Command2("init").description("Initialize a new Struere project").argument("[project-name]", "Project name").option("-y, --yes", "Skip prompts and use defaults").option("--headless", "Use headless login if authentication is needed").action(async (projectNameArg, options) => {
+var initCommand = new Command2("init").description("Initialize a new Struere project").argument("[project-name]", "Project name").option("-y, --yes", "Skip prompts and use defaults").action(async (projectNameArg, options) => {
   const cwd = process.cwd();
   const spinner = ora2();
   console.log();
@@ -802,7 +710,7 @@ var initCommand = new Command2("init").description("Initialize a new Struere pro
   if (!credentials) {
     console.log(chalk2.gray("Authentication required"));
     console.log();
-    credentials = await performLogin({ headless: options.headless });
+    credentials = await performLogin();
     if (!credentials) {
       console.log(chalk2.red("Authentication failed"));
       process.exit(1);
@@ -2208,7 +2116,7 @@ var whoamiCommand = new Command11("whoami").description("Show current logged in
 });
 
 // src/index.ts
-program.name("struere").description("Struere CLI - Build, test, and deploy AI agents").version("0.2.2");
+program.name("struere").description("Struere CLI - Build, test, and deploy AI agents").version("0.2.4");
 program.addCommand(initCommand);
 program.addCommand(loginCommand);
 program.addCommand(logoutCommand);

package/package.json

@@ -1,8 +1,14 @@
 {
   "name": "@struere/cli",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "CLI tool for developing, testing, and deploying AI agents",
-  "keywords": ["ai", "agents", "cli", "developer-tools", "llm"],
+  "keywords": [
+    "ai",
+    "agents",
+    "cli",
+    "developer-tools",
+    "llm"
+  ],
   "author": "struere",
   "license": "MIT",
   "publishConfig": {
@@ -22,13 +28,15 @@
     "struere": "./dist/index.js"
   },
   "main": "./dist/index.js",
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "scripts": {
     "build": "bun build ./src/index.ts --outdir ./dist --target bun --external commander --external chalk --external ora --external chokidar --external yaml --external @struere/runtime && chmod +x ./dist/index.js",
     "dev": "tsc --watch",
     "test": "bun test",
     "prepublishOnly": "bun run build && bun run verify-build",
-    "bump": "node scripts/bump-version.js",
+    "bump": "node scripts/bump-version.cjs",
     "verify-build": "node -e \"const pkg = require('./package.json'); const fs = require('fs'); const bundle = fs.readFileSync('./dist/index.js', 'utf8'); const match = bundle.match(/version\\(\\\"([^\\\"]+)\\\"\\)/); if (!match || match[1] !== pkg.version) { console.error('Version mismatch: package.json=' + pkg.version + ' bundle=' + (match ? match[1] : 'not found')); process.exit(1); } console.log('Build verified: v' + pkg.version);\""
   },
   "dependencies": {