nous-token 0.2.2 → 0.3.1

package/cli/setup.ts

@@ -24,8 +24,8 @@ function saveWallet(wallet: string): void {
   writeFileSync(NOUS_CONFIG, wallet);
 }
 
-function gatewayUrl(path: string, wallet: string): string {
-  return wallet ? `${GATEWAY}${path}/w/${wallet}` : `${GATEWAY}${path}`;
+function gatewayUrl(provider: string, apiPath: string, wallet: string): string {
+  return wallet ? `${GATEWAY}/${provider}/w/${wallet}${apiPath}` : `${GATEWAY}/${provider}${apiPath}`;
 }
 
 interface Tool {
@@ -67,7 +67,7 @@ const tools: Tool[] = [
       try { execSync("which claude", { stdio: "ignore" }); return true; } catch { return false; }
     },
     configure: (wallet: string) => {
-      return setShellEnv("ANTHROPIC_BASE_URL", gatewayUrl("/anthropic", wallet), "Claude Code");
+      return setShellEnv("ANTHROPIC_BASE_URL", gatewayUrl("anthropic", "", wallet), "Claude Code");
     },
   },
 
@@ -94,7 +94,7 @@ const tools: Tool[] = [
             if (content["openai.baseUrl"]?.includes("nousai")) {
               return { success: true, message: "already configured" };
             }
-            content["openai.baseUrl"] = gatewayUrl("/openai/v1", wallet);
+            content["openai.baseUrl"] = gatewayUrl("openai", "/v1", wallet);
             writeFileSync(sp, JSON.stringify(content, null, 2));
             return { success: true, message: `set baseUrl in Cursor settings` };
           } catch {
@@ -114,7 +114,7 @@ const tools: Tool[] = [
         (() => { try { execSync("which codex", { stdio: "ignore" }); return true; } catch { return false; } })();
     },
     configure: (wallet: string) => {
-      return setShellEnv("OPENAI_BASE_URL", gatewayUrl("/openai/v1", wallet), "Codex");
+      return setShellEnv("OPENAI_BASE_URL", gatewayUrl("openai", "/v1", wallet), "Codex");
     },
   },
 
@@ -126,7 +126,7 @@ const tools: Tool[] = [
         (() => { try { execSync("which gemini", { stdio: "ignore" }); return true; } catch { return false; } })();
     },
     configure: (wallet: string) => {
-      return setShellEnv("GOOGLE_GEMINI_BASE_URL", gatewayUrl("/gemini", wallet), "Gemini CLI");
+      return setShellEnv("GOOGLE_GEMINI_BASE_URL", gatewayUrl("gemini", "", wallet), "Gemini CLI");
     },
   },
 
@@ -137,7 +137,7 @@ const tools: Tool[] = [
       try { execSync("python3 -c 'import openai'", { stdio: "ignore" }); return true; } catch { return false; }
     },
     configure: (wallet: string) => {
-      return setShellEnv("OPENAI_BASE_URL", gatewayUrl("/openai/v1", wallet), "Python openai SDK");
+      return setShellEnv("OPENAI_BASE_URL", gatewayUrl("openai", "/v1", wallet), "Python openai SDK");
     },
   },
 
@@ -148,36 +148,19 @@ const tools: Tool[] = [
       try { execSync("python3 -c 'import anthropic'", { stdio: "ignore" }); return true; } catch { return false; }
     },
     configure: (wallet: string) => {
-      return setShellEnv("ANTHROPIC_BASE_URL", gatewayUrl("/anthropic", wallet), "Python anthropic SDK");
+      return setShellEnv("ANTHROPIC_BASE_URL", gatewayUrl("anthropic", "", wallet), "Python anthropic SDK");
     },
   },
 ];
 
 // ── Shell env helper ──
 
-function setShellEnv(key: string, value: string, toolName: string): ConfigResult {
-  const shell = process.env.SHELL || "/bin/bash";
-  const rcFile = shell.includes("zsh") ? join(HOME, ".zshrc") : join(HOME, ".bashrc");
+// Collect env vars to set — don't write to shell rc file
+const envCommands: string[] = [];
 
-  if (existsSync(rcFile)) {
-    const content = readFileSync(rcFile, "utf-8");
-    // Check if already configured with the exact same value
-    if (content.includes(`${key}="${value}"`)) {
-      return { success: true, message: "already configured" };
-    }
-    // Remove old nous-token setting if exists, then write new one
-    const lines = content.split("\n").filter(l => !(l.includes(`${key}=`) && l.includes("nousai")));
-    lines.push(`export ${key}="${value}"  # nous-token gateway`);
-    writeFileSync(rcFile, lines.join("\n"));
-  } else {
-    writeFileSync(rcFile, `export ${key}="${value}"  # nous-token gateway\n`);
-  }
-
-  // Also set in current process
-  process.env[key] = value;
-
-  const rcName = rcFile.includes("zsh") ? "~/.zshrc" : "~/.bashrc";
-  return { success: true, message: `set ${key} in ${rcName}` };
+function setShellEnv(key: string, value: string, toolName: string): ConfigResult {
+  envCommands.push(`export ${key}="${value}"`);
+  return { success: true, message: `${key}` };
 }
 
 
@@ -250,9 +233,14 @@ for (const tool of tools) {
 console.log("");
 
 if (configured > 0) {
-  console.log(`  \x1b[32m${configured} tool(s) configured.\x1b[0m`);
+  console.log(`  \x1b[32m${configured} tool(s) detected.\x1b[0m\n`);
+  console.log("  \x1b[1mThis terminal only:\x1b[0m");
+  console.log(`  \x1b[36m${envCommands.join(" && ")}\x1b[0m\n`);
+  console.log("  \x1b[1mAll terminals (permanent):\x1b[0m");
+  const shell = process.env.SHELL || "/bin/bash";
+  const rcFile = shell.includes("zsh") ? "~/.zshrc" : "~/.bashrc";
+  console.log(`  \x1b[36mecho '${envCommands.join("\\n")}' >> ${rcFile} && source ${rcFile}\x1b[0m\n`);
   console.log(`  See your usage at \x1b[4mhttps://token.nousai.cc\x1b[0m`);
-  console.log(`  Run \x1b[1msource ~/.zshrc\x1b[0m to apply changes in this terminal.`);
 } else {
   console.log("  No AI tools found. Install Claude Code, Cursor, or any OpenAI-compatible tool.");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nous-token",
-  "version": "0.2.2",
+  "version": "0.3.1",
   "description": "Open-source AI usage tracker. One command to track all your AI spending.",
   "type": "module",
   "main": "index.ts",