unbound-cli 1.16.7 → 1.16.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unbound-cli",
-  "version": "1.16.7",
+  "version": "1.16.9",
   "description": "CLI tool for Unbound - AI Gateway management",
   "main": "src/index.js",
   "bin": {

package/src/commands/discover.js

@@ -200,7 +200,7 @@ function register(program) {
     .addOption(new Option('--discovery-key <key>', 'Deprecated and ignored. The scan uses your API key.').hideHelp())
     .addHelpText('after', `
 Scans this device for installed AI coding tools (Cursor, Claude Code,
-Gemini CLI, Codex, Windsurf, Roo Code, Cline, GitHub Copilot, JetBrains,
+Gemini CLI, Codex, Devin Desktop, Roo Code, Cline, GitHub Copilot, JetBrains,
 and more) and reports findings to the Unbound backend.
 
 Which --api-key to use depends on scope:

package/src/commands/setup.js

@@ -86,12 +86,19 @@ function resolveSetupAllTools(clear) {
   return clear ? Object.keys(SETUP_TOOL_MAP) : [...SETUP_ALL_TOOLS];
 }
 
+// OpenAI-compatible Base URL: the gateway host with the /v1 path these clients
+// POST to. Strips a trailing slash because getGatewayUrl() returns env/config
+// values unnormalized, which would otherwise double the slash.
+function openAiBaseUrl(gatewayUrl) {
+  return `${String(gatewayUrl).replace(/\/+$/, '')}/v1`;
+}
+
 // Instruction-only tools (display config values, no setup scripts)
 const INSTRUCTION_TOOLS = {
   'roo-code':      { label: 'Roo Code',     values: (apiKey) => [['API Provider', 'unbound'], ['API Key', apiKey]] },
-  'cline':         { label: 'Cline',         values: (apiKey, frontendUrl) => [['API Provider', 'OpenAI Compatible'], ['Base URL', frontendUrl], ['API Key', apiKey]] },
+  'cline':         { label: 'Cline',         values: (apiKey, gatewayUrl) => [['API Provider', 'OpenAI Compatible'], ['Base URL', openAiBaseUrl(gatewayUrl)], ['API Key', apiKey]] },
   'kilo-code':     { label: 'Kilo Code',     values: (apiKey) => [['API Provider', 'Unbound'], ['API Key', apiKey]] },
-  'custom-access': { label: 'Custom Access', values: (apiKey, frontendUrl) => [['API Key', apiKey], ['Base URL', frontendUrl]] },
+  'custom-access': { label: 'Custom Access', values: (apiKey, gatewayUrl) => [['API Key', apiKey], ['Base URL', openAiBaseUrl(gatewayUrl)]] },
 };
 
 // Tools that need interactive mode selection (claude-code, codex without suffix)
@@ -1054,7 +1061,7 @@ must update the MDM configuration.
               if (r && r.mdmSkipped) reportMdmSkips([label]);
             }
           } else if (INSTRUCTION_TOOLS[toolName]) {
-            output.keyValue(INSTRUCTION_TOOLS[toolName].values(apiKey, frontendUrl));
+            output.keyValue(INSTRUCTION_TOOLS[toolName].values(apiKey, gatewayUrl));
           }
           return;
         }
@@ -1110,7 +1117,7 @@ must update the MDM configuration.
         for (const toolName of instructionResults) {
           console.log('');
           output.info(`${INSTRUCTION_TOOLS[toolName].label}:`);
-          output.keyValue(INSTRUCTION_TOOLS[toolName].values(apiKey, frontendUrl));
+          output.keyValue(INSTRUCTION_TOOLS[toolName].values(apiKey, gatewayUrl));
         }
 
       } catch (err) {
@@ -1290,6 +1297,7 @@ async function runMdmSetupAllBundle(adminApiKey, { backendUrl, frontendUrl, gate
 module.exports = {
   register,
   elevated,
+  INSTRUCTION_TOOLS,
   scopeNotice,
   runSetupAllBundle,
   runMdmSetupAllBundle,

package/test/setup-instruction-tools.test.js

@@ -0,0 +1,105 @@
+const { test } = require('node:test');
+const assert = require('node:assert/strict');
+const { Command } = require('commander');
+
+const { INSTRUCTION_TOOLS } = require('../src/commands/setup');
+
+// Regression: `unbound setup cline` / `custom-access` printed the dashboard/
+// frontend host as the Base URL. OpenAI-compatible clients POST to
+// `<Base URL>/v1/chat/completions`, so the Base URL must be the GATEWAY host
+// (with /v1), never the frontend host.
+const GATEWAY = 'https://api.getunbound.ai';
+const FRONTEND = 'https://gateway.getunbound.ai';
+const API_KEY = 'ub_test_key';
+
+function rows(tool, gatewayUrl = GATEWAY) {
+  return new Map(INSTRUCTION_TOOLS[tool].values(API_KEY, gatewayUrl));
+}
+
+test('cline: Base URL is the gateway /v1 endpoint, provider is OpenAI Compatible', () => {
+  const r = rows('cline');
+  assert.equal(r.get('Base URL'), `${GATEWAY}/v1`);
+  assert.equal(r.get('API Provider'), 'OpenAI Compatible');
+  assert.equal(r.get('API Key'), API_KEY);
+});
+
+test('custom-access: Base URL is the gateway /v1 endpoint', () => {
+  assert.equal(rows('custom-access').get('Base URL'), `${GATEWAY}/v1`);
+});
+
+test('a trailing slash on the gateway URL does not produce a double slash', () => {
+  // getGatewayUrl() returns env/config values unnormalized, so a trailing slash
+  // is reachable in practice.
+  for (const tool of ['cline', 'custom-access']) {
+    assert.equal(rows(tool, 'https://api.getunbound.ai/').get('Base URL'), `${GATEWAY}/v1`);
+  }
+});
+
+test('cline / custom-access never print the frontend host as Base URL', () => {
+  for (const tool of ['cline', 'custom-access']) {
+    for (const [, value] of INSTRUCTION_TOOLS[tool].values(API_KEY, FRONTEND)) {
+      assert.notEqual(value, FRONTEND, `${tool} leaked the frontend host as a value`);
+    }
+  }
+});
+
+test('roo-code / kilo-code print no Base URL row', () => {
+  for (const tool of ['roo-code', 'kilo-code']) {
+    const keys = INSTRUCTION_TOOLS[tool].values(API_KEY, GATEWAY).map(([k]) => k);
+    assert.ok(!keys.includes('Base URL'), `${tool} should not print a Base URL`);
+  }
+});
+
+// ---- Call-site wiring: drive the real `setup` command and confirm it feeds
+// the GATEWAY url (not the frontend url) into the instruction-tool callbacks.
+// The two paths — single-tool and multi-tool — print from separate call sites,
+// so both are exercised. gateway/frontend are deliberately distinct so a
+// regression that reintroduces frontendUrl surfaces as a frontend-host Base URL.
+async function driveSetup(tools) {
+  for (const m of ['../src/commands/setup', '../src/auth', '../src/config', '../src/output']) {
+    delete require.cache[require.resolve(m)];
+  }
+  const setup = require('../src/commands/setup');
+  const auth = require('../src/auth');
+  const config = require('../src/config');
+  const output = require('../src/output');
+
+  const printed = [];
+  // hasRootPrivileges() reads process.getuid; stub the uid (not the exported
+  // function, which setup.js calls locally) so scope is deterministically
+  // non-root and the run reaches the instruction-tool call sites on any host.
+  const origGetuid = process.getuid;
+  process.getuid = () => 1000;
+  auth.ensureLoggedIn = async () => {};
+  config.setUrls = () => ({});
+  config.getBaseUrl = () => 'https://backend.acme';
+  config.getFrontendUrl = () => 'https://frontend.acme';
+  config.getGatewayUrl = () => 'https://gateway.acme';
+  config.getApiKey = () => 'resolved-key';
+  config.isLoggedIn = () => true;
+  output.keyValue = (kv) => printed.push(...kv);
+  for (const k of ['info', 'success', 'error', 'warn']) output[k] = () => {};
+
+  const program = new Command();
+  program.exitOverride();
+  setup.register(program);
+  const prevExit = process.exitCode;
+  process.exitCode = 0;
+  try {
+    await program.parseAsync(['node', 'unbound', 'setup', ...tools]);
+  } finally {
+    process.exitCode = prevExit;
+    if (origGetuid) process.getuid = origGetuid; else delete process.getuid;
+  }
+  return new Map(printed);
+}
+
+test('setup cline (single-tool path) prints the gateway /v1 Base URL, not the frontend', async () => {
+  const r = await driveSetup(['cline']);
+  assert.equal(r.get('Base URL'), 'https://gateway.acme/v1');
+});
+
+test('setup cline custom-access (multi-tool path) prints the gateway /v1 Base URL, not the frontend', async () => {
+  const r = await driveSetup(['cline', 'custom-access']);
+  assert.equal(r.get('Base URL'), 'https://gateway.acme/v1');
+});