starkbot-cli 0.2.2 → 0.3.1

package/dist/index.js

@@ -182,15 +182,16 @@ var init_flash_client = __esm({
 import { createServer } from "http";
 import { createInterface } from "readline";
 import { randomBytes } from "crypto";
-import { URL } from "url";
+import { URL as URL2 } from "url";
 import open from "open";
 async function runOAuthFlow() {
   return new Promise((resolve, reject) => {
     let server;
     let timeout;
+    let loginSpin = null;
     const csrfNonce = randomBytes(16).toString("hex");
     server = createServer((req, res) => {
-      const url = new URL(req.url ?? "/", `http://localhost`);
+      const url = new URL2(req.url ?? "/", `http://localhost`);
       if (url.pathname === "/callback") {
         const returnedNonce = url.searchParams.get("nonce");
         if (returnedNonce !== csrfNonce) {
@@ -215,6 +216,7 @@ async function runOAuthFlow() {
             </body>
             </html>
           `);
+          loginSpin?.stop();
           clearTimeout(timeout);
           server.close();
           resolve({
@@ -225,6 +227,7 @@ async function runOAuthFlow() {
         } else {
           res.writeHead(400, { "Content-Type": "text/html" });
           res.end("<h1>Login failed</h1><p>Missing JWT or username in callback.</p>");
+          loginSpin?.stop();
           clearTimeout(timeout);
           server.close();
           reject(new Error("OAuth callback missing jwt or username"));
@@ -256,16 +259,17 @@ async function runOAuthFlow() {
             res();
           });
         });
-        const loginSpin = spinner("Opening browser for X login...");
+        loginSpin = spinner("Opening browser for X login...");
         loginSpin.start();
         await open(url);
         loginSpin.text = "Waiting for login in browser...";
         timeout = setTimeout(() => {
-          loginSpin.fail("Login timed out (5 minutes)");
+          loginSpin?.fail("Login timed out (5 minutes)");
           server.close();
           reject(new Error("Login timed out"));
         }, 5 * 60 * 1e3);
       } catch (err) {
+        loginSpin?.stop();
         printError("Failed to start login");
         server.close();
         reject(err);
@@ -318,6 +322,7 @@ function clearCredentials() {
   }
 }
 function isJwtExpired(creds) {
+  if (creds.mode === "external") return false;
   if (!creds.jwt) return true;
   try {
     const parts = creds.jwt.split(".");
@@ -337,6 +342,12 @@ function requireCredentials() {
   if (!creds) {
     throw new Error("Not logged in. Run `starkbot login` first.");
   }
+  if (creds.mode === "external") {
+    if (!creds.gateway_token || !creds.instance_domain) {
+      throw new Error("External credentials incomplete. Run `starkbot login` to reconfigure.");
+    }
+    return creds;
+  }
   if (isJwtExpired(creds)) {
     throw new Error("Session expired. Run `starkbot login` to re-authenticate.");
   }
@@ -351,17 +362,168 @@ var init_credentials = __esm({
   }
 });
 
+// src/lib/gateway-client.ts
+var GatewayClient;
+var init_gateway_client = __esm({
+  "src/lib/gateway-client.ts"() {
+    "use strict";
+    GatewayClient = class {
+      baseUrl;
+      token;
+      sessionId;
+      constructor(baseUrl, token, sessionId) {
+        this.baseUrl = baseUrl.replace(/\/+$/, "");
+        this.token = token;
+        this.sessionId = sessionId;
+      }
+      headers() {
+        return {
+          Authorization: `Bearer ${this.token}`,
+          "Content-Type": "application/json"
+        };
+      }
+      chatBody(message) {
+        return {
+          message,
+          ...this.sessionId ? { session_id: this.sessionId } : {}
+        };
+      }
+      /** Send a message and get the full response */
+      async chat(message) {
+        const url = `${this.baseUrl}/api/gateway/chat`;
+        const resp = await fetch(url, {
+          method: "POST",
+          headers: this.headers(),
+          body: JSON.stringify(this.chatBody(message))
+        });
+        if (!resp.ok) {
+          const text = await resp.text().catch(() => "");
+          throw new Error(`HTTP ${resp.status}: ${text}`);
+        }
+        return resp.json();
+      }
+      /** Send a message and stream SSE events */
+      async chatStream(message, onEvent) {
+        const url = `${this.baseUrl}/api/gateway/chat/stream`;
+        const resp = await fetch(url, {
+          method: "POST",
+          headers: this.headers(),
+          body: JSON.stringify(this.chatBody(message))
+        });
+        if (!resp.ok) {
+          const text = await resp.text().catch(() => "");
+          throw new Error(`HTTP ${resp.status}: ${text}`);
+        }
+        if (!resp.body) throw new Error("No response body");
+        const reader = resp.body.getReader();
+        const decoder = new TextDecoder();
+        let buffer = "";
+        while (true) {
+          const { done, value } = await reader.read();
+          if (done) break;
+          buffer += decoder.decode(value, { stream: true });
+          let pos;
+          while ((pos = buffer.indexOf("\n\n")) !== -1) {
+            const frame = buffer.slice(0, pos);
+            buffer = buffer.slice(pos + 2);
+            for (const line of frame.split("\n")) {
+              if (line.startsWith("data: ")) {
+                try {
+                  const event = JSON.parse(line.slice(6));
+                  const isDone = event.type === "done";
+                  onEvent(event);
+                  if (isDone) return;
+                } catch {
+                }
+              }
+            }
+          }
+        }
+      }
+      /** Create a new session */
+      async newSession() {
+        const url = `${this.baseUrl}/api/gateway/sessions/new`;
+        const resp = await fetch(url, {
+          method: "POST",
+          headers: this.headers()
+        });
+        if (!resp.ok) {
+          const text = await resp.text().catch(() => "");
+          throw new Error(`HTTP ${resp.status}: ${text}`);
+        }
+        return resp.json();
+      }
+      /** List sessions */
+      async listSessions() {
+        const url = `${this.baseUrl}/api/gateway/sessions`;
+        const resp = await fetch(url, {
+          method: "GET",
+          headers: this.headers()
+        });
+        if (!resp.ok) {
+          const text = await resp.text().catch(() => "");
+          throw new Error(`HTTP ${resp.status}: ${text}`);
+        }
+        return resp.json();
+      }
+      /** Get message history for a session */
+      async getHistory(sessionId) {
+        const url = `${this.baseUrl}/api/gateway/sessions/${sessionId}/messages`;
+        const resp = await fetch(url, {
+          method: "GET",
+          headers: this.headers()
+        });
+        if (!resp.ok) {
+          const text = await resp.text().catch(() => "");
+          throw new Error(`HTTP ${resp.status}: ${text}`);
+        }
+        return resp.json();
+      }
+      /** Simple health check */
+      async ping() {
+        try {
+          const resp = await fetch(`${this.baseUrl}/api/health`, {
+            headers: this.headers()
+          });
+          return resp.ok;
+        } catch {
+          return false;
+        }
+      }
+    };
+  }
+});
+
 // src/commands/login.ts
 var login_exports = {};
 __export(login_exports, {
   loginCommand: () => loginCommand
 });
+import inquirer from "inquirer";
 async function loginCommand() {
   const existing = loadCredentials();
   if (existing && !isJwtExpired(existing)) {
     printWarning(`Already logged in as @${existing.username}. Use \`starkbot logout\` first to switch accounts.`);
     return;
   }
+  const { loginMethod } = await inquirer.prompt([
+    {
+      type: "list",
+      name: "loginMethod",
+      message: "How would you like to connect?",
+      choices: [
+        { name: "Login with X", value: "x" },
+        { name: "Custom external channel", value: "external" }
+      ]
+    }
+  ]);
+  if (loginMethod === "external") {
+    await externalLogin();
+  } else {
+    await xLogin();
+  }
+}
+async function xLogin() {
   const result = await runOAuthFlow();
   const spin = spinner("Fetching account info...");
   spin.start();
@@ -373,7 +535,8 @@ async function loginCommand() {
       username: me.user.username,
       tenant_id: me.tenant.id,
       instance_domain: me.tenant.domain ?? void 0,
-      jwt_expires_at: new Date(Date.now() + 24 * 60 * 60 * 1e3).toISOString()
+      jwt_expires_at: new Date(Date.now() + 24 * 60 * 60 * 1e3).toISOString(),
+      mode: "x"
     });
     spin.stop();
     printSuccess(`Logged in as @${me.user.username}`);
@@ -388,17 +551,71 @@ async function loginCommand() {
     saveCredentials({
       jwt: result.jwt,
       username: result.username,
-      tenant_id: result.tenant_id ?? ""
+      tenant_id: result.tenant_id ?? "",
+      mode: "x"
     });
     printSuccess(`Logged in as @${result.username}`);
   }
 }
+async function externalLogin() {
+  const { instanceUrl, apiToken } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "instanceUrl",
+      message: "Instance URL (e.g. https://mybot.example.com):",
+      validate: (val) => {
+        if (!val.trim()) return "Instance URL is required";
+        try {
+          new URL(val.trim());
+          return true;
+        } catch {
+          return "Please enter a valid URL";
+        }
+      }
+    },
+    {
+      type: "password",
+      name: "apiToken",
+      message: "API token:",
+      mask: "*",
+      validate: (val) => val.trim() ? true : "API token is required"
+    }
+  ]);
+  const url = new URL(instanceUrl.trim());
+  const domain = url.host;
+  const baseUrl = url.origin;
+  const token = apiToken.trim();
+  const spin = spinner("Testing connection...");
+  spin.start();
+  try {
+    const gw = new GatewayClient(baseUrl, token);
+    const ok = await gw.ping();
+    spin.stop();
+    if (!ok) {
+      printError("Instance is not responding. Check the URL and try again.");
+      return;
+    }
+    saveCredentials({
+      jwt: "",
+      username: "external",
+      tenant_id: "",
+      gateway_token: token,
+      instance_domain: domain,
+      mode: "external"
+    });
+    printSuccess(`Connected to ${domain}`);
+  } catch (err) {
+    spin.stop();
+    printError(`Connection failed: ${err.message}`);
+  }
+}
 var init_login = __esm({
   "src/commands/login.ts"() {
     "use strict";
     init_auth();
     init_credentials();
     init_flash_client();
+    init_gateway_client();
     init_ui();
   }
 });
@@ -508,7 +725,7 @@ var subscribe_exports = {};
 __export(subscribe_exports, {
   subscribeCommand: () => subscribeCommand
 });
-import inquirer from "inquirer";
+import inquirer2 from "inquirer";
 async function subscribeCommand() {
   const creds = requireCredentials();
   const client = new FlashClient(creds.jwt);
@@ -520,7 +737,7 @@ async function subscribeCommand() {
     printSuccess(`You already have an active subscription (${me.subscription.days_remaining} days remaining).`);
     return;
   }
-  const { action } = await inquirer.prompt([
+  const { action } = await inquirer2.prompt([
     {
       type: "list",
       name: "action",
@@ -548,7 +765,7 @@ async function subscribeCommand() {
       printError(err.message);
     }
   } else if (action === "voucher") {
-    const { code } = await inquirer.prompt([
+    const { code } = await inquirer2.prompt([
       {
         type: "input",
         name: "code",
@@ -645,144 +862,12 @@ var init_provision = __esm({
   }
 });
 
-// src/lib/gateway-client.ts
-var GatewayClient;
-var init_gateway_client = __esm({
-  "src/lib/gateway-client.ts"() {
-    "use strict";
-    GatewayClient = class {
-      baseUrl;
-      token;
-      sessionId;
-      constructor(baseUrl, token, sessionId) {
-        this.baseUrl = baseUrl.replace(/\/+$/, "");
-        this.token = token;
-        this.sessionId = sessionId;
-      }
-      headers() {
-        return {
-          Authorization: `Bearer ${this.token}`,
-          "Content-Type": "application/json"
-        };
-      }
-      chatBody(message) {
-        return {
-          message,
-          ...this.sessionId ? { session_id: this.sessionId } : {}
-        };
-      }
-      /** Send a message and get the full response */
-      async chat(message) {
-        const url = `${this.baseUrl}/api/gateway/chat`;
-        const resp = await fetch(url, {
-          method: "POST",
-          headers: this.headers(),
-          body: JSON.stringify(this.chatBody(message))
-        });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
-          throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        return resp.json();
-      }
-      /** Send a message and stream SSE events */
-      async chatStream(message, onEvent) {
-        const url = `${this.baseUrl}/api/gateway/chat/stream`;
-        const resp = await fetch(url, {
-          method: "POST",
-          headers: this.headers(),
-          body: JSON.stringify(this.chatBody(message))
-        });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
-          throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        if (!resp.body) throw new Error("No response body");
-        const reader = resp.body.getReader();
-        const decoder = new TextDecoder();
-        let buffer = "";
-        while (true) {
-          const { done, value } = await reader.read();
-          if (done) break;
-          buffer += decoder.decode(value, { stream: true });
-          let pos;
-          while ((pos = buffer.indexOf("\n\n")) !== -1) {
-            const frame = buffer.slice(0, pos);
-            buffer = buffer.slice(pos + 2);
-            for (const line of frame.split("\n")) {
-              if (line.startsWith("data: ")) {
-                try {
-                  const event = JSON.parse(line.slice(6));
-                  const isDone = event.type === "done";
-                  onEvent(event);
-                  if (isDone) return;
-                } catch {
-                }
-              }
-            }
-          }
-        }
-      }
-      /** Create a new session */
-      async newSession() {
-        const url = `${this.baseUrl}/api/gateway/sessions/new`;
-        const resp = await fetch(url, {
-          method: "POST",
-          headers: this.headers()
-        });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
-          throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        return resp.json();
-      }
-      /** List sessions */
-      async listSessions() {
-        const url = `${this.baseUrl}/api/gateway/sessions`;
-        const resp = await fetch(url, {
-          method: "GET",
-          headers: this.headers()
-        });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
-          throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        return resp.json();
-      }
-      /** Get message history for a session */
-      async getHistory(sessionId) {
-        const url = `${this.baseUrl}/api/gateway/sessions/${sessionId}/messages`;
-        const resp = await fetch(url, {
-          method: "GET",
-          headers: this.headers()
-        });
-        if (!resp.ok) {
-          const text = await resp.text().catch(() => "");
-          throw new Error(`HTTP ${resp.status}: ${text}`);
-        }
-        return resp.json();
-      }
-      /** Simple health check */
-      async ping() {
-        try {
-          const resp = await fetch(`${this.baseUrl}/api/health`, {
-            headers: this.headers()
-          });
-          return resp.ok;
-        } catch {
-          return false;
-        }
-      }
-    };
-  }
-});
-
 // src/commands/connect.ts
 var connect_exports = {};
 __export(connect_exports, {
   connectCommand: () => connectCommand
 });
-import inquirer2 from "inquirer";
+import inquirer3 from "inquirer";
 async function connectCommand(opts = {}) {
   const creds = requireCredentials();
   if (opts.token) {
@@ -839,7 +924,7 @@ async function connectCommand(opts = {}) {
     printWarning("Could not auto-fetch gateway credentials \u2014 you can enter them manually.");
     console.log(dim(`  (${err.message})
 `));
-    const answers = await inquirer2.prompt([
+    const answers = await inquirer3.prompt([
       {
         type: "input",
         name: "token",
@@ -870,7 +955,7 @@ var init_connect = __esm({
 // src/lib/status.ts
 import ora2 from "ora";
 import chalk2 from "chalk";
-var subtypeColor, toolColor, subagentColor, dimText, StatusTracker;
+var subtypeColor, toolColor, subagentColor, dimText, successMark, failMark, StatusTracker;
 var init_status2 = __esm({
   "src/lib/status.ts"() {
     "use strict";
@@ -878,6 +963,8 @@ var init_status2 = __esm({
     toolColor = chalk2.yellow;
     subagentColor = chalk2.cyan;
     dimText = chalk2.dim;
+    successMark = chalk2.green("\u2705");
+    failMark = chalk2.red("\u274C");
     StatusTracker = class {
       spinner;
       activeSubtype = "";
@@ -891,10 +978,12 @@ var init_status2 = __esm({
       handleEvent(event) {
         switch (event.type) {
           case "tool_call":
+            this.printToolCall(event);
             this.addTool(event.tool_name ?? "unknown");
             break;
           case "tool_result":
             this.removeTool(event.tool_name ?? "unknown");
+            this.printToolResult(event);
             break;
           case "subagent_spawned":
             this.addSubagent(event.label ?? "?", event.agent_subtype);
@@ -925,6 +1014,25 @@ var init_status2 = __esm({
             break;
         }
       }
+      printToolCall(event) {
+        const name = event.tool_name ?? "unknown";
+        this.pauseForText();
+        console.log(dimText(`  \u{1F527} ${toolColor("Calling:")} ${chalk2.bold(name)}`));
+        this.resumeAfterText();
+      }
+      printToolResult(event) {
+        const name = event.tool_name ?? "unknown";
+        const ok = event.success !== false;
+        const mark = ok ? successMark : failMark;
+        const durationStr = event.duration_ms != null ? ` ${dimText(`(${event.duration_ms}ms)`)}` : "";
+        this.pauseForText();
+        console.log(dimText(`  ${mark} ${chalk2.bold(name)}${durationStr}`));
+        if (!ok && event.content) {
+          const snippet = event.content.length > 200 ? event.content.slice(0, 200) + "..." : event.content;
+          console.log(dimText(`     ${chalk2.red(snippet)}`));
+        }
+        this.resumeAfterText();
+      }
       prefix() {
         if (this.activeSubtype) {
           return `${subtypeColor(`[${this.activeSubtype}]`)} `;
@@ -969,7 +1077,7 @@ var init_status2 = __esm({
         }
         if (this.activeTools.length > 0) {
           const names = this.activeTools.map((t) => toolColor(t)).join(", ");
-          parts.push(`calling ${names}`);
+          parts.push(`running ${names}`);
         }
         if (parts.length === 0) {
           if (this.spinner.isSpinning && !this.paused) {
@@ -1253,7 +1361,7 @@ __export(instances_exports, {
   instancesNewCommand: () => instancesNewCommand,
   instancesSelectCommand: () => instancesSelectCommand
 });
-import inquirer3 from "inquirer";
+import inquirer4 from "inquirer";
 async function instancesListCommand() {
   const creds = requireCredentials();
   const client = new FlashClient(creds.jwt);
@@ -1335,7 +1443,7 @@ async function instancesSelectCommand(tenantId) {
         name: `${inst.display_name ?? inst.id} ${dim(`(${inst.status}${inst.domain ? ` - ${inst.domain}` : ""})`)}${inst.id === creds.tenant_id ? success(" *active*") : ""}`,
         value: inst.id
       }));
-      const answer = await inquirer3.prompt([
+      const answer = await inquirer4.prompt([
         {
           type: "list",
           name: "tenantId",
@@ -1409,7 +1517,7 @@ async function instancesDeleteCommand(tenantId) {
   await doDelete(client, creds.tenant_id, creds);
 }
 async function doDelete(client, tenantId, creds) {
-  const answer = await inquirer3.prompt([
+  const answer = await inquirer4.prompt([
     {
       type: "confirm",
       name: "confirm",
@@ -1553,16 +1661,16 @@ var wizard_exports = {};
 __export(wizard_exports, {
   wizardCommand: () => wizardCommand
 });
-import inquirer4 from "inquirer";
+import inquirer5 from "inquirer";
 async function wizardCommand() {
   banner();
   let creds = loadCredentials();
   if (!creds || isJwtExpired(creds)) {
-    console.log(bold("  Step 1: Login with X\n"));
+    console.log(bold("  Step 1: Login\n"));
     await loginCommand();
     console.log();
   } else {
-    const { accountAction } = await inquirer4.prompt([
+    const { accountAction } = await inquirer5.prompt([
       {
         type: "list",
         name: "accountAction",
@@ -1575,12 +1683,30 @@ async function wizardCommand() {
     ]);
     if (accountAction === "signout") {
       await logoutCommand();
-      console.log(bold("\n  Login with X\n"));
+      console.log(bold("\n  Login\n"));
       await loginCommand();
       console.log();
       creds = loadCredentials();
     }
   }
+  creds = loadCredentials();
+  if (creds?.mode === "external") {
+    if (creds.gateway_token && creds.instance_domain) {
+      const { startChat } = await inquirer5.prompt([
+        {
+          type: "confirm",
+          name: "startChat",
+          message: "Start chatting with your bot?",
+          default: true
+        }
+      ]);
+      if (startChat) {
+        console.log();
+        await chatReplCommand();
+      }
+    }
+    return;
+  }
   const currentCreds = requireCredentials();
   const client = new FlashClient(currentCreds.jwt);
   const spin = spinner("Checking account...");
@@ -1607,7 +1733,7 @@ async function wizardCommand() {
     });
     choices.push({ name: "Create new instance", value: "__new__" });
     console.log(bold("\n  Select an instance\n"));
-    const { instanceChoice } = await inquirer4.prompt([
+    const { instanceChoice } = await inquirer5.prompt([
       {
         type: "list",
         name: "instanceChoice",
@@ -1617,7 +1743,7 @@ async function wizardCommand() {
       }
     ]);
     if (instanceChoice === "__new__") {
-      const { displayName } = await inquirer4.prompt([
+      const { displayName } = await inquirer5.prompt([
         {
           type: "input",
           name: "displayName",
@@ -1665,7 +1791,7 @@ async function wizardCommand() {
   }
   const finalCreds = loadCredentials();
   if (finalCreds?.gateway_token && finalCreds?.instance_domain) {
-    const { startChat } = await inquirer4.prompt([
+    const { startChat } = await inquirer5.prompt([
       {
         type: "confirm",
         name: "startChat",
@@ -1697,8 +1823,8 @@ var init_wizard = __esm({
 init_ui();
 import { Command } from "commander";
 var program = new Command();
-program.name("starkbot").description("CLI for Starkbot \u2014 login, provision, and chat with your bot").version("0.1.0").addHelpCommand("help", "Show help for a command");
-program.command("login").description("Login with your X (Twitter) account").action(async () => {
+program.name("starkbot").description("CLI for Starkbot \u2014 login, provision, and chat with your bot").version("0.3.1").addHelpCommand("help", "Show help for a command");
+program.command("login").description("Login with X or connect to an external instance").action(async () => {
   const { loginCommand: loginCommand2 } = await Promise.resolve().then(() => (init_login(), login_exports));
   await loginCommand2();
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starkbot-cli",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "CLI for Starkbot — login, provision, and chat with your bot from the terminal",
   "type": "module",
   "bin": {