kiro-proxy 0.1.17 → 0.1.18

package/README.md

@@ -77,14 +77,18 @@ Claude Code 默认使用 Anthropic 官方 model ID，需要通过环境变量映
   "env": {
     "ANTHROPIC_AUTH_TOKEN": "any",
     "ANTHROPIC_BASE_URL": "http://localhost:3456",
-    "ANTHROPIC_MODEL": "claude-sonnet-4.6",
     "ANTHROPIC_DEFAULT_SONNET_MODEL": "claude-sonnet-4.6",
     "ANTHROPIC_DEFAULT_OPUS_MODEL": "claude-opus-4.6",
     "ANTHROPIC_DEFAULT_HAIKU_MODEL": "claude-haiku-4.5"
-  }
+  },
+  "model": "sonnet"
 }
 ```
 
+`model` 可选值：`sonnet`、`opus`、`haiku`，添加 `[1m]` 后缀可启用 1M 上下文窗口（如 `"opus[1m]"`）。
+
+> 注意：不要设置 `ANTHROPIC_MODEL` 环境变量，它会覆盖 `model` 字段，导致上下文窗口等配置失效。
+
 ## 相关项目
 
 - [kiro-web-search](https://github.com/Colin3191/kiro-web-search) — 将 Kiro 内置的联网搜索封装为 MCP server，可在 Claude Code 等客户端中使用

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kiro-proxy",
-  "version": "0.1.17",
+  "version": "0.1.18",
   "description": "Kiro API proxy with OpenAI and Anthropic compatible endpoints",
   "type": "module",
   "bin": {

package/token-counter.js

@@ -1,11 +1,131 @@
+const CLAUDE_MULTIPLIERS = {
+  word: 1.13,
+  number: 1.63,
+  cjk: 1.21,
+  symbol: 0.4,
+  mathSymbol: 4.52,
+  urlDelim: 1.26,
+  atSign: 2.82,
+  emoji: 2.6,
+  newline: 0.89,
+  space: 0.39,
+};
+
+function isCJK(code) {
+  return (
+    (code >= 0x4e00 && code <= 0x9fff) ||
+    (code >= 0x3400 && code <= 0x4dbf) ||
+    (code >= 0x20000 && code <= 0x2a6df) ||
+    (code >= 0x2a700 && code <= 0x2b73f) ||
+    (code >= 0x2b740 && code <= 0x2b81f) ||
+    (code >= 0x3040 && code <= 0x30ff) ||
+    (code >= 0xac00 && code <= 0xd7a3)
+  );
+}
+
+function isEmoji(code) {
+  return (
+    (code >= 0x1f300 && code <= 0x1f9ff) ||
+    (code >= 0x2600 && code <= 0x26ff) ||
+    (code >= 0x2700 && code <= 0x27bf) ||
+    (code >= 0x1f600 && code <= 0x1f64f) ||
+    (code >= 0x1f900 && code <= 0x1f9ff) ||
+    (code >= 0x1fa00 && code <= 0x1faff)
+  );
+}
+
+function isMathSymbol(code) {
+  if (code >= 0x2200 && code <= 0x22ff) return true;
+  if (code >= 0x2a00 && code <= 0x2aff) return true;
+  if (code >= 0x1d400 && code <= 0x1d7ff) return true;
+  const mathChars =
+    '∑∫∂√∞≤≥≠≈±×÷∈∉∋∌⊂⊃⊆⊇∪∩∧∨¬∀∃∄∅∆∇∝∟∠∡∢°′″‴⁺⁻⁼⁽⁾ⁿ₀₁₂₃₄₅₆₇₈₉₊₋₌₍₎²³¹⁴⁵⁶⁷⁸⁹⁰';
+  return mathChars.includes(String.fromCodePoint(code));
+}
+
+function isURLDelim(code) {
+  return '/:?&=;#%'.includes(String.fromCodePoint(code));
+}
+
+function isLetterOrDigit(code) {
+  return (
+    (code >= 0x41 && code <= 0x5a) ||
+    (code >= 0x61 && code <= 0x7a) ||
+    (code >= 0x30 && code <= 0x39) ||
+    (code >= 0xc0 && code <= 0x24f)
+  );
+}
+
+function isDigit(code) {
+  return code >= 0x30 && code <= 0x39;
+}
+
+const NONE = 0;
+const LATIN = 1;
+const NUMBER = 2;
+
 function countText(text) {
   if (!text) return 0;
-  return Math.round(text.length / 4);
+
+  const m = CLAUDE_MULTIPLIERS;
+  let count = 0;
+  let currentWordType = NONE;
+
+  for (const char of text) {
+    const code = char.codePointAt(0);
+
+    if (char === ' ' || char === '\t' || char === '\n' || char === '\r') {
+      currentWordType = NONE;
+      if (char === '\n' || char === '\t') {
+        count += m.newline;
+      } else {
+        count += m.space;
+      }
+      continue;
+    }
+
+    if (isCJK(code)) {
+      currentWordType = NONE;
+      count += m.cjk;
+      continue;
+    }
+
+    if (isEmoji(code)) {
+      currentWordType = NONE;
+      count += m.emoji;
+      continue;
+    }
+
+    if (isLetterOrDigit(code)) {
+      const isNum = isDigit(code);
+      const newType = isNum ? NUMBER : LATIN;
+
+      if (currentWordType === NONE || currentWordType !== newType) {
+        count += isNum ? m.number : m.word;
+        currentWordType = newType;
+      }
+      continue;
+    }
+
+    currentWordType = NONE;
+    if (isMathSymbol(code)) {
+      count += m.mathSymbol;
+    } else if (code === 0x40) {
+      count += m.atSign;
+    } else if (isURLDelim(code)) {
+      count += m.urlDelim;
+    } else {
+      count += m.symbol;
+    }
+  }
+
+  return Math.ceil(count);
 }
 
 export function countMessages(messages, system) {
   let tokens = 0;
-  if (system) tokens += countText(typeof system === 'string' ? system : JSON.stringify(system));
+  if (system)
+    tokens += countText(typeof system === 'string' ? system : JSON.stringify(system));
   for (const msg of messages || []) {
     tokens += 4;
     if (typeof msg.content === 'string') {
@@ -13,7 +133,10 @@ export function countMessages(messages, system) {
     } else if (Array.isArray(msg.content)) {
       for (const block of msg.content) {
         if (block.type === 'text') tokens += countText(block.text);
-        else if (block.type === 'tool_result') tokens += countText(typeof block.content === 'string' ? block.content : JSON.stringify(block.content));
+        else if (block.type === 'tool_result')
+          tokens += countText(
+            typeof block.content === 'string' ? block.content : JSON.stringify(block.content),
+          );
         else if (block.type === 'tool_use') tokens += countText(JSON.stringify(block.input));
       }
     }