ccproxypal 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccproxypal",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Local proxy server that routes AI API requests through your Claude Code OAuth subscription",
   "type": "module",
   "bin": {

package/src/adapter.js

@@ -22,6 +22,11 @@ export function openaiToAnthropic(body) {
   for (const msg of convMsgs) {
     if (msg.role === 'user') {
       const content = convertUserContent(msg.content);
+      // Skip user messages with empty content — Anthropic rejects them
+      const isEmpty = Array.isArray(content) ? content.length === 0
+        : typeof content === 'string' ? content.trim().length === 0
+        : !content;
+      if (isEmpty) continue;
       anthropicMessages.push({ role: 'user', content });
     } else if (msg.role === 'assistant') {
       const content = convertAssistantContent(msg);
@@ -42,14 +47,24 @@ export function openaiToAnthropic(body) {
     }
   }
 
-  // Convert tool definitions
+  // Convert tool definitions — filter out entries with null/invalid names (e.g. Cursor placeholders)
   const anthropicTools = tools
-    ?.filter((t) => t.type === 'function' || t.name)
-    .map((t) =>
-      t.type === 'function'
-        ? { name: t.function.name, description: t.function.description, input_schema: t.function.parameters ?? { type: 'object', properties: {} } }
-        : t
-    );
+    ?.map((t) => {
+      // Claude Code format: {type:"custom", custom:{name,...}} → standard
+      if (t.type === 'custom' && t.custom) {
+        const { name, description, input_schema } = t.custom;
+        if (!name || typeof name !== 'string') return null;
+        return { name, description, input_schema };
+      }
+      // OpenAI format: {type:"function", function:{name,...}}
+      if (t.type === 'function' && t.function) {
+        return { name: t.function.name, description: t.function.description, input_schema: t.function.parameters ?? { type: 'object', properties: {} } };
+      }
+      // Already Anthropic format — drop if name is missing/null
+      if (!t.name || typeof t.name !== 'string') return null;
+      return t;
+    })
+    .filter(Boolean);
 
   return {
     model: model ?? 'claude-opus-4-5',

package/src/server.js

@@ -30,28 +30,54 @@ function jsonResponse(res, status, body) {
 
 // ─── Upstream request to Anthropic API ───────────────────────────────────────
 
-async function callAnthropic(body, reqHeaders) {
-  const { accessToken } = await getToken();
-
-  const upstreamBody = injectClaudeCodeSystem(body);
+function sanitizeBody(body) {
+  const b = injectClaudeCodeSystem(body);
+  // Remove fields the Anthropic OAuth API doesn't support
+  delete b.reasoning_budget;
+  delete b.context_management;
+  // Filter out tools with null/empty names (Cursor sends placeholder entries)
+  if (Array.isArray(b.tools)) {
+    b.tools = b.tools
+      .map((t) => {
+        if (t.type === 'custom' && t.custom) {
+          const { name, description, input_schema } = t.custom;
+          return (name && typeof name === 'string') ? { name, description, input_schema } : null;
+        }
+        return (t.name && typeof t.name === 'string') ? t : null;
+      })
+      .filter(Boolean);
+    if (b.tools.length === 0) delete b.tools;
+  }
+  return b;
+}
 
-  // Remove fields unsupported by Claude Code
-  delete upstreamBody.reasoning_budget;
+async function callAnthropic(body, reqHeaders) {
+  const makeRequest = async (accessToken) =>
+    fetch(`${ANTHROPIC_API_BASE}/v1/messages`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'Authorization': `Bearer ${accessToken}`,
+        'anthropic-beta': [reqHeaders['anthropic-beta'], CLAUDE_CODE_BETA].filter(Boolean).join(','),
+        'anthropic-version': reqHeaders['anthropic-version'] ?? ANTHROPIC_VERSION,
+        'User-Agent': USER_AGENT,
+      },
+      body: JSON.stringify(sanitizeBody(body)),
+    });
 
-  const res = await fetch(`${ANTHROPIC_API_BASE}/v1/messages`, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-      'Authorization': `Bearer ${accessToken}`,
-      'anthropic-beta': [reqHeaders['anthropic-beta'], CLAUDE_CODE_BETA].filter(Boolean).join(','),
-      'anthropic-version': reqHeaders['anthropic-version'] ?? ANTHROPIC_VERSION,
-      'User-Agent': USER_AGENT,
-    },
-    body: JSON.stringify(upstreamBody),
-  });
+  const { accessToken } = await getToken();
+  let res = await makeRequest(accessToken);
 
-  // On 401 clear cache so next request re-loads credentials
-  if (res.status === 401) clearTokenCache();
+  // On 401: clear cache, refresh token, retry once
+  if (res.status === 401) {
+    clearTokenCache();
+    try {
+      const { accessToken: newToken } = await getToken();
+      res = await makeRequest(newToken);
+    } catch {
+      // If refresh fails, return the original 401
+    }
+  }
 
   return res;
 }

package/src/token.js

@@ -11,7 +11,8 @@ let _cache = null;
 
 /** Inject tokens manually (client mode — no local credentials needed) */
 export function setManualToken(accessToken, refreshToken) {
-  _cache = { accessToken, refreshToken, expiresAt: Date.now() + 60 * 60 * 1000 };
+  // 55 min — lets the 5-min buffer trigger a refresh before actual expiry
+  _cache = { accessToken, refreshToken, expiresAt: Date.now() + 55 * 60 * 1000 };
 }
 
 function loadFromKeychain() {