@autotask/atools-tool 0.1.3 → 0.1.4

package/README.md

@@ -50,6 +50,12 @@ Recommended selections:
 npm i -g @autotask/atools-tool
 ```
 
+Default full install (recommended):
+
+```bash
+npm i -g @autotask/atools-tool && atools-tool-install && atools-tool openclaw
+```
+
 Optional installer command:
 
 ```bash

package/bin/cli.mjs

@@ -8,8 +8,6 @@ function parseArgs(argv) {
     openclawHome: undefined,
     port: undefined,
     upstream: undefined,
-    fallbackUpstream: undefined,
-    fallbackApiKey: undefined,
     maxReqBytes: undefined,
     logFile: undefined,
     retryMax: undefined,
@@ -27,8 +25,6 @@ function parseArgs(argv) {
     if (a === '--port') out.port = Number(next());
     else if (a === '--openclaw-home') out.openclawHome = next();
     else if (a === '--upstream') out.upstream = next();
-    else if (a === '--fallback-upstream') out.fallbackUpstream = next();
-    else if (a === '--fallback-api-key') out.fallbackApiKey = next();
     else if (a === '--max-req-bytes') out.maxReqBytes = Number(next());
     else if (a === '--log-file') out.logFile = next();
     else if (a === '--retry-max') out.retryMax = Number(next());
@@ -54,8 +50,6 @@ Options:
   --openclaw-home <path> OpenClaw home dir (default: ~/.openclaw)
   --port <number>          Listen port (default: 18888)
   --upstream <url>         Upstream base URL (default: https://sub2api.atools.live)
-  --fallback-upstream <url> Fallback base URL on primary 5xx
-  --fallback-api-key <key> Override Bearer key for fallback upstream
   --max-req-bytes <number> Compact requests larger than this threshold (default: 68000)
   --log-file <path>        Log file (default: /tmp/openclaw/atools-compat-proxy.log)
   --retry-max <number>     Retry attempts on 5xx for /responses (default: 6)
@@ -81,9 +75,8 @@ async function main() {
     throw new Error(`unsupported command: ${args.cmd}`);
   }
 
-  const { port, upstream, fallbackUpstream, logFile } = await createProxyServer(args);
-  const fallbackNote = fallbackUpstream ? `, fallback=${fallbackUpstream}` : '';
-  process.stdout.write(`atools-tool listening on http://127.0.0.1:${port}, upstream=${upstream}${fallbackNote}, log=${logFile}\n`);
+  const { port, upstream, logFile } = await createProxyServer(args);
+  process.stdout.write(`atools-tool listening on http://127.0.0.1:${port}, upstream=${upstream}, log=${logFile}\n`);
 }
 
 main().catch((err) => {

package/lib/config-openclaw.mjs

@@ -266,8 +266,6 @@ function configureLinuxProxyService() {
   const original = fs.readFileSync(servicePath, 'utf8');
   let next = original;
   next = upsertEnvLine(next, 'SUB2API_UPSTREAM', PROXY_UPSTREAM);
-  next = upsertEnvLine(next, 'SUB2API_FALLBACK_UPSTREAM', '');
-  next = upsertEnvLine(next, 'SUB2API_FALLBACK_API_KEY', '');
   next = upsertEnvLine(next, 'SUB2API_COMPAT_DROP_TOOLS_ON_COMPACT', '0');
   next = upsertEnvLine(next, 'SUB2API_COMPAT_PORT', String(PROXY_PORT));
   next = upsertEnvLine(next, 'SUB2API_COMPAT_LOG', PROXY_LOG_FILE);
@@ -317,9 +315,7 @@ function startDetachedProxy() {
         stdio: 'ignore',
         env: {
           ...process.env,
-          SUB2API_UPSTREAM: PROXY_UPSTREAM,
-          SUB2API_FALLBACK_UPSTREAM: '',
-          SUB2API_FALLBACK_API_KEY: ''
+          SUB2API_UPSTREAM: PROXY_UPSTREAM
         }
       }
     );
@@ -360,7 +356,7 @@ async function ensureProxyReady() {
 
   if (await isPortOpen(PROXY_HOST, PROXY_PORT)) return true;
 
-  // Linux fallback: service may exist but not running.
+  // Linux retry: service may exist but not running.
   if (process.platform === 'linux') {
     const service = configureLinuxProxyService();
     if (service.exists && isLinuxProxyServiceActive()) {

package/lib/install.mjs

@@ -8,7 +8,6 @@ const DEFAULT_PROVIDER = 'sub2api';
 const DEFAULT_MODEL = 'gpt-5.3-codex';
 const DEFAULT_PORT = 18888;
 const DEFAULT_UPSTREAM = 'https://sub2api.atools.live';
-const DEFAULT_FALLBACK_UPSTREAM = '';
 const DEFAULT_LOG_FILE = path.join(os.tmpdir(), 'openclaw', 'atools-compat-proxy.log');
 const DEFAULT_SERVICE_NAME = 'openclaw-atools-proxy.service';
 const OPENCLAW_GATEWAY_SERVICE = 'openclaw-gateway.service';
@@ -51,7 +50,7 @@ function defaultServiceId(name = DEFAULT_SERVICE_NAME) {
   return String(name || DEFAULT_SERVICE_NAME).replace(/\.service$/i, '');
 }
 
-function buildProxyServeArgs({ port, upstream, fallbackUpstream, fallbackApiKey, maxReqBytes, logFile }) {
+function buildProxyServeArgs({ port, upstream, maxReqBytes, logFile }) {
   const args = [
     'serve',
     '--port',
@@ -63,12 +62,6 @@ function buildProxyServeArgs({ port, upstream, fallbackUpstream, fallbackApiKey,
     '--max-req-bytes',
     String(maxReqBytes)
   ];
-  if (fallbackUpstream) {
-    args.push('--fallback-upstream', String(fallbackUpstream));
-  }
-  if (fallbackApiKey) {
-    args.push('--fallback-api-key', String(fallbackApiKey));
-  }
   return args;
 }
 
@@ -94,12 +87,10 @@ function parseArgs(argv) {
     model: DEFAULT_MODEL,
     port: DEFAULT_PORT,
     upstream: DEFAULT_UPSTREAM,
-    fallbackUpstream: DEFAULT_FALLBACK_UPSTREAM,
     maxReqBytes: 68000,
     logFile: DEFAULT_LOG_FILE,
     serviceName: DEFAULT_SERVICE_NAME,
     apiKey: process.env.SUB_OAI_KEY || '',
-    fallbackApiKey: process.env.FALLBACK_OAI_KEY || '',
     dryRun: false,
     noRestart: false
   };
@@ -113,12 +104,10 @@ function parseArgs(argv) {
     else if (a === '--model') out.model = next();
     else if (a === '--port') out.port = Number(next());
     else if (a === '--upstream') out.upstream = next();
-    else if (a === '--fallback-upstream') out.fallbackUpstream = next();
     else if (a === '--max-req-bytes') out.maxReqBytes = Number(next());
     else if (a === '--log-file') out.logFile = next();
     else if (a === '--service-name') out.serviceName = next();
     else if (a === '--api-key') out.apiKey = next();
-    else if (a === '--fallback-api-key') out.fallbackApiKey = next();
     else if (a === '--dry-run') out.dryRun = true;
     else if (a === '--no-restart') out.noRestart = true;
     else if (a === '--help' || a === '-h') {
@@ -137,13 +126,8 @@ function parseArgs(argv) {
 function renderSystemdService({
   nodeBin,
   cliPath,
-  serveArgs,
-  fallbackUpstream,
-  fallbackApiKey
+  serveArgs
 }) {
-  const fallbackEnv = fallbackUpstream
-    ? `Environment=SUB2API_FALLBACK_UPSTREAM=${fallbackUpstream}\nEnvironment=SUB2API_FALLBACK_API_KEY=${fallbackApiKey || ''}\n`
-    : '';
   const execArgs = [nodeBin, cliPath, ...serveArgs].join(' ');
   return `[Unit]
 Description=OpenClaw ATools Compatibility Proxy
@@ -157,7 +141,6 @@ RestartSec=2
 Environment=HOME=${os.homedir()}
 Environment=TMPDIR=/tmp
 Environment="SUB2API_COMPAT_USER_AGENT=codex_cli_rs/0.101.0 (Ubuntu 24.4.0; x86_64) WindowsTerminal"
-${fallbackEnv}
 
 [Install]
 WantedBy=default.target
@@ -207,13 +190,6 @@ function detectApiKey(openclawHome, explicitKey) {
   return auth?.profiles?.['sub2api:default']?.key || '';
 }
 
-function detectFallbackApiKey(openclawHome, explicitKey) {
-  if (explicitKey) return explicitKey;
-  const cfgPath = path.join(openclawHome, 'openclaw.json');
-  const cfg = readJsonIfExists(cfgPath);
-  return cfg?.models?.providers?.gmn?.apiKey || '';
-}
-
 function patchOpenclawConfig(openclawHome, provider, model, port, dryRun) {
   const cfgPath = path.join(openclawHome, 'openclaw.json');
   const cfg = readJsonIfExists(cfgPath);
@@ -504,12 +480,10 @@ Options:
   --model <id>             Default: gpt-5.3-codex
   --port <number>          Default: 18888
   --upstream <url>         Default: https://sub2api.atools.live
-  --fallback-upstream <url> Default: empty (disabled)
   --max-req-bytes <number> Default: 68000
   --log-file <path>        Default: <tmp>/openclaw/atools-compat-proxy.log
   --service-name <name>    Linux: *.service; macOS/Windows: service id/task name
-  --api-key <key>          Prefer explicit key; fallback env SUB_OAI_KEY then auth-profiles
-  --fallback-api-key <key> Prefer explicit key; fallback env FALLBACK_OAI_KEY then openclaw gmn key
+  --api-key <key>          Prefer explicit key; otherwise use SUB_OAI_KEY or auth-profiles
   --no-restart             Do not restart openclaw-gateway.service
   --dry-run                Print actions without changing files
   -h, --help               Show help
@@ -527,12 +501,9 @@ export async function runInstall(rawArgs = process.argv.slice(2)) {
   const nodeBin = process.execPath;
   const cliPath = fileURLToPath(new URL('../bin/cli.mjs', import.meta.url));
   const apiKey = detectApiKey(args.openclawHome, args.apiKey);
-  const fallbackApiKey = detectFallbackApiKey(args.openclawHome, args.fallbackApiKey);
   const serveArgs = buildProxyServeArgs({
     port: args.port,
     upstream: args.upstream,
-    fallbackUpstream: args.fallbackUpstream,
-    fallbackApiKey,
     maxReqBytes: args.maxReqBytes,
     logFile: args.logFile
   });
@@ -541,9 +512,6 @@ export async function runInstall(rawArgs = process.argv.slice(2)) {
   info(`platform=${process.platform}`);
   info(`provider/model=${args.provider}/${args.model}`);
   info(`proxy=http://127.0.0.1:${args.port}/v1 -> ${args.upstream}`);
-  if (args.fallbackUpstream) {
-    info(`fallback=${args.fallbackUpstream}`);
-  }
 
   patchOpenclawConfig(args.openclawHome, args.provider, args.model, args.port, args.dryRun);
   patchAgentModels(args.openclawHome, args.provider, args.model, args.port, apiKey, args.dryRun);
@@ -552,9 +520,7 @@ export async function runInstall(rawArgs = process.argv.slice(2)) {
   const linuxServiceContent = renderSystemdService({
     nodeBin,
     cliPath,
-    serveArgs,
-    fallbackUpstream: args.fallbackUpstream,
-    fallbackApiKey
+    serveArgs
   });
   const macPlistContent = renderLaunchdPlist({
     label: defaultServiceId(args.serviceName),

package/lib/proxy-server.mjs

@@ -6,8 +6,6 @@ const DEFAULT_PORT = 18888;
 const DEFAULT_UPSTREAM = 'https://sub2api.atools.live';
 const DEFAULT_LOG = '/tmp/openclaw/atools-compat-proxy.log';
 const DEFAULT_USER_AGENT = 'codex_cli_rs/0.101.0 (Ubuntu 24.4.0; x86_64) WindowsTerminal';
-const DEFAULT_FALLBACK_UPSTREAM = '';
-const DEFAULT_FALLBACK_API_KEY = '';
 const DEFAULT_MAX_REQ_BYTES = 68000;
 const DEFAULT_DROP_TOOLS_ON_COMPACT = false;
 const DEFAULT_STRIP_PREVIOUS_RESPONSE_ID = false;
@@ -149,13 +147,10 @@ async function forward(url, req, headers, body) {
   });
 }
 
-function buildHeaders(baseHeaders, bodyLen, apiKeyOverride = '') {
+function buildHeaders(baseHeaders, bodyLen) {
   const headers = { ...baseHeaders };
   headers['content-type'] = 'application/json';
   headers['content-length'] = String(bodyLen);
-  if (apiKeyOverride) {
-    headers.authorization = `Bearer ${apiKeyOverride}`;
-  }
   return headers;
 }
 
@@ -166,8 +161,6 @@ export async function createProxyServer(options = {}) {
   const retryMax = Number(options.retryMax ?? process.env.SUB2API_COMPAT_RETRY_MAX ?? 6);
   const retryBaseMs = Number(options.retryBaseMs ?? process.env.SUB2API_COMPAT_RETRY_BASE_MS ?? 300);
   const userAgent = options.userAgent ?? process.env.SUB2API_COMPAT_USER_AGENT ?? DEFAULT_USER_AGENT;
-  const fallbackUpstream = options.fallbackUpstream ?? process.env.SUB2API_FALLBACK_UPSTREAM ?? DEFAULT_FALLBACK_UPSTREAM;
-  const fallbackApiKey = options.fallbackApiKey ?? process.env.SUB2API_FALLBACK_API_KEY ?? DEFAULT_FALLBACK_API_KEY;
   const maxReqBytes = Number(options.maxReqBytes ?? process.env.SUB2API_COMPAT_MAX_REQ_BYTES ?? DEFAULT_MAX_REQ_BYTES);
   const dropToolsOnCompact = options.dropToolsOnCompact
     ?? ['1', 'true', 'yes', 'on'].includes(String(process.env.SUB2API_COMPAT_DROP_TOOLS_ON_COMPACT || '').toLowerCase());
@@ -178,7 +171,6 @@ export async function createProxyServer(options = {}) {
     const startAt = Date.now();
     try {
       const url = new URL(req.url || '/', upstream);
-      const fallbackUrl = fallbackUpstream ? new URL(req.url || '/', fallbackUpstream) : null;
       const chunks = [];
       for await (const c of req) chunks.push(c);
       const rawBody = Buffer.concat(chunks);
@@ -245,9 +237,7 @@ export async function createProxyServer(options = {}) {
 
       let resp;
       let attempts = 0;
-      let via = 'primary';
       let primaryStatus = null;
-      let fallbackStatus = null;
       let compacted = false;
       let strategy = 'full';
       const maxAttempts = isResponsesPath ? retryMax : 1;
@@ -260,32 +250,11 @@ export async function createProxyServer(options = {}) {
           ? 'full'
           : (strategyIndex === 1 ? 'compact' : (strategyIndex === 2 ? 'aggressive' : 'minimal'));
         const primaryHeaders = isResponsesPath ? buildHeaders(baseHeaders, requestBody.length) : baseHeaders;
-        const fallbackHeaders = isResponsesPath
-          ? buildHeaders(baseHeaders, requestBody.length, fallbackApiKey)
-          : (fallbackApiKey ? { ...baseHeaders, authorization: `Bearer ${fallbackApiKey}` } : baseHeaders);
 
         const primaryResp = await forward(url, req, primaryHeaders, requestBody);
         primaryStatus = primaryResp.status;
-        if (primaryResp.status < 500) {
-          resp = primaryResp;
-          via = 'primary';
-          break;
-        }
-
-        if (fallbackUrl) {
-          const fbResp = await forward(fallbackUrl, req, fallbackHeaders, requestBody);
-          fallbackStatus = fbResp.status;
-          if (fbResp.status < 500) {
-            resp = fbResp;
-            via = 'fallback';
-            break;
-          }
-          resp = fbResp;
-          via = 'fallback';
-        } else {
-          resp = primaryResp;
-          via = 'primary';
-        }
+        resp = primaryResp;
+        if (primaryResp.status < 500) break;
 
         if (attempts < maxAttempts) {
           await sleep(retryBaseMs * attempts);
@@ -304,9 +273,7 @@ export async function createProxyServer(options = {}) {
         path: url.pathname,
         status: resp.status,
         attempts,
-        via,
         primaryStatus,
-        fallbackStatus,
         compacted,
         strategy,
         reqBytes: rawBody.length,
@@ -339,7 +306,6 @@ export async function createProxyServer(options = {}) {
     server,
     port,
     upstream,
-    fallbackUpstream,
     logFile,
     close: () => new Promise((resolve, reject) => server.close((err) => (err ? reject(err) : resolve())))
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autotask/atools-tool",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "ATools CLI for OpenClaw proxy compatibility and interactive model configuration",
   "type": "module",
   "license": "MIT",