@autotask/atools-tool 0.1.5 → 0.1.7

package/README.md

@@ -68,6 +68,9 @@ atools-tool-install --help
 - macOS: launchd user agent (`~/Library/LaunchAgents`)
 - Windows: Task Scheduler user task (ONLOGON + start now)
 
+By default, installer does not hard-force a single outbound model.
+Proxy normalizes `sub2api/<model>` to plain model id for codex-compatible upstreams.
+
 ## Proxy Command
 
 ```bash

package/bin/cli.mjs

@@ -8,6 +8,7 @@ function parseArgs(argv) {
     openclawHome: undefined,
     port: undefined,
     upstream: undefined,
+    forceModel: undefined,
     maxReqBytes: undefined,
     logFile: undefined,
     retryMax: undefined,
@@ -25,6 +26,7 @@ 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 === '--force-model') out.forceModel = 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());
@@ -50,6 +52,7 @@ 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)
+  --force-model <id>       Force outbound model id (e.g. gpt-5.3-codex)
   --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)

package/lib/config-openclaw.mjs

@@ -258,6 +258,11 @@ function upsertEnvLine(content, key, value) {
   return `${content.slice(0, afterServiceHeader + 1)}${line}\n${content.slice(afterServiceHeader + 1)}`;
 }
 
+function removeEnvLine(content, key) {
+  const re = new RegExp(`^Environment=${escapeRegExp(key)}=.*\\n?`, 'gm');
+  return content.replace(re, '');
+}
+
 function configureLinuxProxyService() {
   const servicePath = path.join(os.homedir(), '.config/systemd/user', PROXY_SERVICE);
   if (!fs.existsSync(servicePath)) {
@@ -266,6 +271,7 @@ function configureLinuxProxyService() {
   const original = fs.readFileSync(servicePath, 'utf8');
   let next = original;
   next = upsertEnvLine(next, 'SUB2API_UPSTREAM', PROXY_UPSTREAM);
+  next = removeEnvLine(next, 'SUB2API_COMPAT_FORCE_MODEL');
   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);

package/lib/install.mjs

@@ -6,6 +6,7 @@ import { fileURLToPath } from 'node:url';
 
 const DEFAULT_PROVIDER = 'sub2api';
 const DEFAULT_MODEL = 'gpt-5.3-codex';
+const DEFAULT_FORCE_MODEL = '';
 const DEFAULT_PORT = 18888;
 const DEFAULT_UPSTREAM = 'https://sub2api.atools.live';
 const DEFAULT_LOG_FILE = path.join(os.tmpdir(), 'openclaw', 'atools-compat-proxy.log');
@@ -50,7 +51,7 @@ function defaultServiceId(name = DEFAULT_SERVICE_NAME) {
   return String(name || DEFAULT_SERVICE_NAME).replace(/\.service$/i, '');
 }
 
-function buildProxyServeArgs({ port, upstream, maxReqBytes, logFile }) {
+function buildProxyServeArgs({ port, upstream, forceModel, maxReqBytes, logFile }) {
   const args = [
     'serve',
     '--port',
@@ -62,6 +63,9 @@ function buildProxyServeArgs({ port, upstream, maxReqBytes, logFile }) {
     '--max-req-bytes',
     String(maxReqBytes)
   ];
+  if (forceModel) {
+    args.push('--force-model', String(forceModel));
+  }
   return args;
 }
 
@@ -85,6 +89,7 @@ function parseArgs(argv) {
     openclawHome: process.env.OPENCLAW_HOME || path.join(os.homedir(), '.openclaw'),
     provider: DEFAULT_PROVIDER,
     model: DEFAULT_MODEL,
+    forceModel: DEFAULT_FORCE_MODEL,
     port: DEFAULT_PORT,
     upstream: DEFAULT_UPSTREAM,
     maxReqBytes: 68000,
@@ -102,6 +107,7 @@ function parseArgs(argv) {
     if (a === '--openclaw-home') out.openclawHome = next();
     else if (a === '--provider') out.provider = next();
     else if (a === '--model') out.model = next();
+    else if (a === '--force-model') out.forceModel = next();
     else if (a === '--port') out.port = Number(next());
     else if (a === '--upstream') out.upstream = next();
     else if (a === '--max-req-bytes') out.maxReqBytes = Number(next());
@@ -480,6 +486,7 @@ Options:
   --openclaw-home <path>   Default: ~/.openclaw
   --provider <name>        Default: sub2api
   --model <id>             Default: gpt-5.3-codex
+  --force-model <id>       Default: disabled (optional hard rewrite)
   --port <number>          Default: 18888
   --upstream <url>         Default: https://sub2api.atools.live
   --max-req-bytes <number> Default: 68000
@@ -506,6 +513,7 @@ export async function runInstall(rawArgs = process.argv.slice(2)) {
   const serveArgs = buildProxyServeArgs({
     port: args.port,
     upstream: args.upstream,
+    forceModel: args.forceModel,
     maxReqBytes: args.maxReqBytes,
     logFile: args.logFile
   });
@@ -513,6 +521,7 @@ export async function runInstall(rawArgs = process.argv.slice(2)) {
   info(`openclawHome=${args.openclawHome}`);
   info(`platform=${process.platform}`);
   info(`provider/model=${args.provider}/${args.model}`);
+  info(`proxy forceModel=${args.forceModel || '(disabled)'}`);
   info(`proxy=http://127.0.0.1:${args.port}/v1 -> ${args.upstream}`);
 
   patchOpenclawConfig(args.openclawHome, args.provider, args.model, args.port, args.dryRun);

package/lib/proxy-server.mjs

@@ -9,6 +9,35 @@ const DEFAULT_USER_AGENT = 'codex_cli_rs/0.101.0 (Ubuntu 24.4.0; x86_64) Windows
 const DEFAULT_MAX_REQ_BYTES = 68000;
 const DEFAULT_DROP_TOOLS_ON_COMPACT = false;
 const DEFAULT_STRIP_PREVIOUS_RESPONSE_ID = false;
+const DEFAULT_FORCE_MODEL = '';
+const SUPPORTED_MODEL_IDS = new Set(['gpt-5.2', 'gpt-5.3-codex', 'gpt-5.4']);
+const FORWARD_HEADER_ALLOWLIST = new Set([
+  'authorization',
+  'api-key',
+  'x-api-key',
+  'openai-organization',
+  'openai-project'
+]);
+const RESPONSES_KEY_ALLOWLIST = new Set([
+  'model',
+  'input',
+  'instructions',
+  'reasoning',
+  'metadata',
+  'temperature',
+  'max_output_tokens',
+  'top_p',
+  'stream',
+  'store',
+  'previous_response_id',
+  'tools',
+  'tool_choice',
+  'parallel_tool_calls',
+  'text',
+  'truncation',
+  'max_tool_calls',
+  'prompt_cache_key'
+]);
 
 function ensureParentDir(filePath) {
   const dir = path.dirname(filePath);
@@ -54,13 +83,20 @@ function normalizeContent(content) {
   return [toInputText('')];
 }
 
-function normalizeResponsesPayload(payload, { stripPreviousResponseId = DEFAULT_STRIP_PREVIOUS_RESPONSE_ID } = {}) {
+function normalizeResponsesPayload(payload, {
+  stripPreviousResponseId = DEFAULT_STRIP_PREVIOUS_RESPONSE_ID,
+  forceModel = DEFAULT_FORCE_MODEL
+} = {}) {
   if (!payload || typeof payload !== 'object') return payload;
   const out = { ...payload };
 
   if (stripPreviousResponseId && 'previous_response_id' in out) {
     delete out.previous_response_id;
   }
+  const normalizedModel = normalizeModelId(out.model, forceModel);
+  if (normalizedModel) {
+    out.model = normalizedModel;
+  }
 
   if (typeof out.input === 'string') {
     out.input = [{ role: 'user', content: normalizeContent(out.input) }];
@@ -75,6 +111,32 @@ function normalizeResponsesPayload(payload, { stripPreviousResponseId = DEFAULT_
     });
   }
 
+  return pruneResponsesPayload(out);
+}
+
+function normalizeModelId(modelId, forceModel = DEFAULT_FORCE_MODEL) {
+  const forced = String(forceModel || '').trim();
+  if (forced) return forced;
+  if (typeof modelId !== 'string') return '';
+
+  const raw = modelId.trim();
+  if (!raw) return raw;
+  if (SUPPORTED_MODEL_IDS.has(raw)) return raw;
+
+  const slashIndex = raw.lastIndexOf('/');
+  if (slashIndex < 0) return raw;
+  const tail = raw.slice(slashIndex + 1).trim();
+  if (SUPPORTED_MODEL_IDS.has(tail)) return tail;
+  return raw;
+}
+
+function pruneResponsesPayload(payload) {
+  const out = {};
+  for (const [key, value] of Object.entries(payload || {})) {
+    if (RESPONSES_KEY_ALLOWLIST.has(key)) {
+      out[key] = value;
+    }
+  }
   return out;
 }
 
@@ -154,6 +216,29 @@ function buildHeaders(baseHeaders, bodyLen) {
   return headers;
 }
 
+function normalizeHeaderValue(value) {
+  if (Array.isArray(value)) return value.join(', ');
+  if (value == null) return '';
+  return String(value);
+}
+
+function buildCodexLikeHeaders(incomingHeaders, userAgent) {
+  const headers = {};
+  for (const [rawKey, rawValue] of Object.entries(incomingHeaders || {})) {
+    const key = String(rawKey || '').toLowerCase();
+    if (!FORWARD_HEADER_ALLOWLIST.has(key)) continue;
+    const value = normalizeHeaderValue(rawValue);
+    if (value) headers[key] = value;
+  }
+  headers.accept = 'application/json';
+  headers['content-type'] = 'application/json';
+  headers['user-agent'] = userAgent;
+  headers['x-stainless-lang'] = 'rust';
+  headers['x-stainless-package-name'] = 'codex-cli';
+  headers['x-stainless-package-version'] = '0.101.0';
+  return headers;
+}
+
 export async function createProxyServer(options = {}) {
   const port = Number(options.port ?? process.env.SUB2API_COMPAT_PORT ?? DEFAULT_PORT);
   const upstream = options.upstream ?? process.env.SUB2API_UPSTREAM ?? DEFAULT_UPSTREAM;
@@ -166,6 +251,7 @@ export async function createProxyServer(options = {}) {
     ?? ['1', 'true', 'yes', 'on'].includes(String(process.env.SUB2API_COMPAT_DROP_TOOLS_ON_COMPACT || '').toLowerCase());
   const stripPreviousResponseId = options.stripPreviousResponseId
     ?? ['1', 'true', 'yes', 'on'].includes(String(process.env.SUB2API_COMPAT_STRIP_PREVIOUS_RESPONSE_ID || '').toLowerCase());
+  const forceModel = String(options.forceModel ?? process.env.SUB2API_COMPAT_FORCE_MODEL ?? '').trim();
 
   const server = http.createServer(async (req, res) => {
     const startAt = Date.now();
@@ -175,10 +261,7 @@ export async function createProxyServer(options = {}) {
       for await (const c of req) chunks.push(c);
       const rawBody = Buffer.concat(chunks);
 
-      const baseHeaders = { ...req.headers };
-      delete baseHeaders.host;
-      delete baseHeaders.connection;
-      baseHeaders['user-agent'] = userAgent;
+      const baseHeaders = buildCodexLikeHeaders(req.headers, userAgent);
 
       const isResponsesPath = req.method === 'POST' && url.pathname.endsWith('/responses');
       let body = rawBody;
@@ -189,7 +272,12 @@ export async function createProxyServer(options = {}) {
       if (isResponsesPath && rawBody.length > 0) {
         try {
           const parsed = JSON.parse(rawBody.toString('utf8'));
-          const normalized = normalizeResponsesPayload(parsed, { stripPreviousResponseId });
+          const inputModel = typeof parsed.model === 'string' ? parsed.model : '';
+          const normalized = normalizeResponsesPayload(parsed, {
+            stripPreviousResponseId,
+            forceModel
+          });
+          const outputModel = typeof normalized.model === 'string' ? normalized.model : '';
           body = Buffer.from(JSON.stringify(normalized));
           if (body.length > maxReqBytes) {
             const compacted = compactResponsesPayload(normalized, { dropToolsOnCompact });
@@ -214,6 +302,13 @@ export async function createProxyServer(options = {}) {
               minimalBody = minimalBuf;
             }
           }
+          if (inputModel && outputModel && inputModel !== outputModel) {
+            appendLog(logFile, {
+              method: req.method,
+              path: url.pathname,
+              modelRewrite: { from: inputModel, to: outputModel }
+            });
+          }
         } catch {
           // Keep original body if parse fails.
         }
@@ -268,6 +363,9 @@ export async function createProxyServer(options = {}) {
       });
 
       const outBuffer = Buffer.from(await resp.arrayBuffer());
+      const upstreamError = resp.status >= 500
+        ? outBuffer.toString('utf8').replace(/\s+/g, ' ').slice(0, 240)
+        : '';
       appendLog(logFile, {
         method: req.method,
         path: url.pathname,
@@ -279,6 +377,7 @@ export async function createProxyServer(options = {}) {
         reqBytes: rawBody.length,
         upstreamReqBytes: requestBodies[Math.min(requestBodies.length - 1, attempts - 1)].length,
         respBytes: outBuffer.length,
+        ...(upstreamError ? { upstreamError } : {}),
         durationMs: Date.now() - startAt
       });
       res.end(outBuffer);

package/package.json

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