@autotask/atools-tool 0.1.6 → 0.1.7

package/README.md

@@ -68,14 +68,13 @@ atools-tool-install --help
 - macOS: launchd user agent (`~/Library/LaunchAgents`)
 - Windows: Task Scheduler user task (ONLOGON + start now)
 
-By default, installer enables proxy model rewrite:
-
-- force outbound model to `gpt-5.3-codex` (for codex-only upstream compatibility)
+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
-atools-tool serve --port 18888 --upstream https://sub2api.atools.live --force-model gpt-5.3-codex
+atools-tool serve --port 18888 --upstream https://sub2api.atools.live
 ```
 
 ## Repo Install

package/lib/config-openclaw.mjs

@@ -16,7 +16,6 @@ const PROXY_HOST = '127.0.0.1';
 const PROXY_PORT = 18888;
 const PROXY_BASE_URL = `http://${PROXY_HOST}:${PROXY_PORT}/v1`;
 const PROXY_UPSTREAM = 'https://sub2api.atools.live';
-const PROXY_FORCE_MODEL = 'gpt-5.3-codex';
 const PROXY_LOG_FILE = path.join(os.tmpdir(), 'openclaw', 'atools-compat-proxy.log');
 const PROXY_SERVICE = 'openclaw-atools-proxy.service';
 
@@ -259,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)) {
@@ -267,7 +271,7 @@ function configureLinuxProxyService() {
   const original = fs.readFileSync(servicePath, 'utf8');
   let next = original;
   next = upsertEnvLine(next, 'SUB2API_UPSTREAM', PROXY_UPSTREAM);
-  next = upsertEnvLine(next, 'SUB2API_COMPAT_FORCE_MODEL', PROXY_FORCE_MODEL);
+  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);
@@ -317,8 +321,7 @@ function startDetachedProxy() {
         stdio: 'ignore',
         env: {
           ...process.env,
-          SUB2API_UPSTREAM: PROXY_UPSTREAM,
-          SUB2API_COMPAT_FORCE_MODEL: PROXY_FORCE_MODEL
+          SUB2API_UPSTREAM: PROXY_UPSTREAM
         }
       }
     );

package/lib/install.mjs

@@ -6,7 +6,7 @@ import { fileURLToPath } from 'node:url';
 
 const DEFAULT_PROVIDER = 'sub2api';
 const DEFAULT_MODEL = 'gpt-5.3-codex';
-const DEFAULT_FORCE_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');
@@ -486,7 +486,7 @@ Options:
   --openclaw-home <path>   Default: ~/.openclaw
   --provider <name>        Default: sub2api
   --model <id>             Default: gpt-5.3-codex
-  --force-model <id>       Default: gpt-5.3-codex (proxy rewrites outbound model)
+  --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

package/lib/proxy-server.mjs

@@ -10,6 +10,34 @@ 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);
@@ -65,8 +93,9 @@ function normalizeResponsesPayload(payload, {
   if (stripPreviousResponseId && 'previous_response_id' in out) {
     delete out.previous_response_id;
   }
-  if (forceModel) {
-    out.model = forceModel;
+  const normalizedModel = normalizeModelId(out.model, forceModel);
+  if (normalizedModel) {
+    out.model = normalizedModel;
   }
 
   if (typeof out.input === 'string') {
@@ -82,6 +111,32 @@ function normalizeResponsesPayload(payload, {
     });
   }
 
+  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;
 }
 
@@ -161,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;
@@ -183,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;
@@ -227,7 +302,7 @@ export async function createProxyServer(options = {}) {
               minimalBody = minimalBuf;
             }
           }
-          if (forceModel && inputModel && inputModel !== outputModel) {
+          if (inputModel && outputModel && inputModel !== outputModel) {
             appendLog(logFile, {
               method: req.method,
               path: url.pathname,
@@ -288,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,
@@ -299,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.6",
+  "version": "0.1.7",
   "description": "ATools CLI for OpenClaw proxy compatibility and interactive model configuration",
   "type": "module",
   "license": "MIT",