kiro-proxy 0.1.18 → 0.2.1

package/README.md

@@ -13,7 +13,7 @@
 ## 快速开始
 
 ```bash
-npx @colin3191/kiro-proxy
+npx kiro-proxy
 ```
 
 服务默认监听 `http://localhost:3456`。
@@ -23,6 +23,8 @@ npx @colin3191/kiro-proxy
 | 环境变量 | 默认值 | 说明 |
 |----------|--------|------|
 | `PORT`   | `3456` | 监听端口 |
+| `PROXY_API_KEY` | 无 | 设置后所有请求需携带此 key 进行鉴权，未设置则不校验 |
+| `HTTPS_PROXY` | 无 | HTTP/HTTPS 代理地址，如 `http://127.0.0.1:7890` |
 
 ## API
 
@@ -32,40 +34,58 @@ npx @colin3191/kiro-proxy
 curl http://localhost:3456/v1/models
 ```
 
-### POST /v1/chat/completions — OpenAI 兼容
+### POST /v1/messages — Anthropic 兼容
 
 ```bash
 # 非流式
-curl http://localhost:3456/v1/chat/completions \
+curl http://localhost:3456/v1/messages \
   -H "Content-Type: application/json" \
-  -d '{"model": "claude-sonnet-4.6", "messages": [{"role": "user", "content": "Hello"}]}'
+  -H "x-api-key: any" \
+  -d '{"model": "claude-sonnet-4.6", "max_tokens": 1024, "messages": [{"role": "user", "content": "Hello"}]}'
 
 # 流式
-curl http://localhost:3456/v1/chat/completions \
+curl http://localhost:3456/v1/messages \
   -H "Content-Type: application/json" \
-  -d '{"model": "claude-sonnet-4.6", "messages": [{"role": "user", "content": "Hello"}], "stream": true}'
+  -H "x-api-key: any" \
+  -d '{"model": "claude-sonnet-4.6", "max_tokens": 1024, "messages": [{"role": "user", "content": "Hello"}], "stream": true}'
 ```
 
-### POST /v1/messages — Anthropic 兼容
+### POST /v1/chat/completions — OpenAI 兼容
 
 ```bash
 # 非流式
-curl http://localhost:3456/v1/messages \
+curl http://localhost:3456/v1/chat/completions \
   -H "Content-Type: application/json" \
-  -H "x-api-key: any" \
-  -d '{"model": "claude-sonnet-4.6", "max_tokens": 1024, "messages": [{"role": "user", "content": "Hello"}]}'
+  -d '{"model": "claude-sonnet-4.6", "messages": [{"role": "user", "content": "Hello"}]}'
 
 # 流式
-curl http://localhost:3456/v1/messages \
+curl http://localhost:3456/v1/chat/completions \
   -H "Content-Type: application/json" \
-  -H "x-api-key: any" \
-  -d '{"model": "claude-sonnet-4.6", "max_tokens": 1024, "messages": [{"role": "user", "content": "Hello"}], "stream": true}'
+  -d '{"model": "claude-sonnet-4.6", "messages": [{"role": "user", "content": "Hello"}], "stream": true}'
 ```
 
 ### GET /health
 
 检查 token 状态及过期时间。
 
+### GET /credits
+
+查询积分消耗统计，支持 `period` 参数：
+
+```bash
+# 今日消耗（默认）
+curl http://localhost:3456/credits
+
+# 最近 7 天
+curl http://localhost:3456/credits?period=7d
+
+# 最近 30 天
+curl http://localhost:3456/credits?period=30d
+
+# 全部
+curl http://localhost:3456/credits?period=all
+```
+
 ## 与 Claude Code 集成
 
 Claude Code 默认使用 Anthropic 官方 model ID，需要通过环境变量映射到 Q Developer 的 model ID。
@@ -89,6 +109,21 @@ Claude Code 默认使用 Anthropic 官方 model ID，需要通过环境变量映
 
 > 注意：不要设置 `ANTHROPIC_MODEL` 环境变量，它会覆盖 `model` 字段，导致上下文窗口等配置失效。
 
+## 代理设置
+
+自 2026 年 5 月 1 日起，Kiro 上的 Claude 模型无法在中国大陆及港澳台地区使用。如果遇到 `Invalid model` 错误，请配置代理。
+
+> 注意：代理节点需选择其他地区（如新加坡、泰国、韩国等）。
+
+通过环境变量设置 HTTP 代理：
+
+```bash
+# 设置代理后启动
+HTTPS_PROXY=http://127.0.0.1:7890 npx kiro-proxy
+```
+
+支持的环境变量：`HTTPS_PROXY`、`https_proxy`、`HTTP_PROXY`、`http_proxy`，优先级从左到右。
+
 ## 相关项目
 
 - [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.18",
+  "version": "0.2.1",
   "description": "Kiro API proxy with OpenAI and Anthropic compatible endpoints",
   "type": "module",
   "bin": {
@@ -15,7 +15,8 @@
     "token-reader.js",
     "token-counter.js",
     "usage-tracker.js",
-    "logger.js"
+    "logger.js",
+    "proxy-config.js"
   ],
   "repository": {
     "type": "git",
@@ -23,6 +24,8 @@
   },
   "dependencies": {
     "@aws/codewhisperer-streaming-client": "^1.0.34",
-    "express": "^4.21.0"
+    "express": "^4.21.0",
+    "https-proxy-agent": "^7.0.0",
+    "undici": "^6.19.0"
   }
 }

package/proxy-config.js

@@ -0,0 +1,21 @@
+import { setGlobalDispatcher, EnvHttpProxyAgent } from 'undici';
+import { HttpsProxyAgent } from 'https-proxy-agent';
+
+export function getProxyUrl() {
+  return process.env.HTTPS_PROXY || process.env.https_proxy ||
+         process.env.HTTP_PROXY || process.env.http_proxy || '';
+}
+
+export function initGlobalProxy() {
+  const proxyUrl = getProxyUrl();
+  if (proxyUrl) {
+    setGlobalDispatcher(new EnvHttpProxyAgent());
+  }
+  return proxyUrl;
+}
+
+export function createProxyAgent() {
+  const proxyUrl = getProxyUrl();
+  if (!proxyUrl) return undefined;
+  return new HttpsProxyAgent(proxyUrl);
+}

package/q-client.js

@@ -1,6 +1,7 @@
 import { CodeWhispererStreaming, GenerateAssistantResponseCommand } from '@aws/codewhisperer-streaming-client';
 import crypto from 'crypto';
 import os from 'os';
+import { createProxyAgent } from './proxy-config.js';
 
 // region → endpoint 映射
 const REGION_ENDPOINTS = {
@@ -71,12 +72,19 @@ export function createClient(accessToken, { endpoint, region, authMethod, profil
   const finalRegion = region || arnRegion || DEFAULT_REGION;
   const finalEndpoint = endpoint || endpointForRegion(finalRegion);
 
-  const client = new CodeWhispererStreaming({
+  const clientConfig = {
     region: finalRegion,
     endpoint: finalEndpoint,
     token: { token: accessToken },
     customUserAgent: buildUserAgent(machineId),
-  });
+  };
+
+  const proxyAgent = createProxyAgent();
+  if (proxyAgent) {
+    clientConfig.requestHandler = { httpsAgent: proxyAgent };
+  }
+
+  const client = new CodeWhispererStreaming(clientConfig);
   addRequiredHeaders(client, { authMethod, provider });
   return client;
 }
@@ -157,6 +165,25 @@ function extractText(content) {
     .join('');
 }
 
+/**
+ * 从 assistant content blocks 中提取 thinking → CodeWhisperer reasoningContent
+ * Anthropic 格式: { type: "thinking", thinking: "...", signature: "..." }
+ * CodeWhisperer 格式: { reasoningText: { text, signature? } }
+ */
+function extractReasoning(content) {
+  if (!Array.isArray(content)) return undefined;
+  const thinkingBlocks = content.filter(b => b.type === 'thinking' && typeof b.thinking === 'string' && b.thinking.length > 0);
+  if (thinkingBlocks.length === 0) return undefined;
+  const text = thinkingBlocks.map(b => b.thinking).join('');
+  const sig = thinkingBlocks.map(b => b.signature).find(s => typeof s === 'string' && s.length > 0);
+  return {
+    reasoningText: {
+      text,
+      ...(sig && { signature: sig }),
+    },
+  };
+}
+
 /**
  * 从 assistant content blocks 中提取 tool_use 调用
  */
@@ -225,10 +252,12 @@ export function convertMessages(messages, { modelId, system, tools } = {}) {
       const images = extractImages(msg.content);
 
       if (toolResults.length > 0) {
-        // tool_result 消息：content 为空，结果放在 userInputMessageContext.toolResults
+        // tool_result 消息：text block 作为 content，tool_result 放在 userInputMessageContext
+        // 关键：Claude Code 的 ESC 中断会把 tool_result + [Request interrupted] + 新 prompt 打包成同一条 user message 的多个 content block，
+        // 如果这里把 content 写死成 ''，中断标记和新 prompt 会被静默丢弃，模型无法感知中断
         history.push({
           userInputMessage: {
-            content: '',
+            content: text,
             modelId: validModelId,
             origin: 'AI_EDITOR',
             userInputMessageContext: { toolResults },
@@ -246,10 +275,12 @@ export function convertMessages(messages, { modelId, system, tools } = {}) {
     } else if (msg.role === 'assistant') {
       const text = extractText(msg.content);
       const toolUses = extractToolUses(msg.content);
+      const reasoningContent = extractReasoning(msg.content);
       history.push({
         assistantResponseMessage: {
           content: text,
           toolUses: toolUses.length > 0 ? toolUses : undefined,
+          ...(reasoningContent && { reasoningContent }),
         },
       });
     }
@@ -257,7 +288,7 @@ export function convertMessages(messages, { modelId, system, tools } = {}) {
   }
 
   // 确保 history 以 user→assistant 交替，末尾是 user
-  // 如果末尾是 assistant（不应该发生），追加空 user
+  // 桥接后末尾仍可能是 assistant；CW 要求 currentMessage 必须是 userInputMessage
   const last = history.at(-1);
   if (last?.assistantResponseMessage) {
     history.push({

package/server.js

@@ -3,14 +3,29 @@ import express from 'express';
 import crypto from 'crypto';
 import { getAccessToken } from './token-reader.js';
 import { createClient, chat, chatStream, listAvailableModels } from './q-client.js';
-import { c, log, logSummary, reqId, tagError } from './logger.js';
+import { c, log, tagLog, logSummary, reqId, tagError } from './logger.js';
 import { countMessages, countContent } from './token-counter.js';
 import { recordUsage, queryUsage, todaySummary } from './usage-tracker.js';
+import { initGlobalProxy } from './proxy-config.js';
+
+const proxyUrl = initGlobalProxy();
+if (proxyUrl) tagLog('proxy', `Using proxy: ${proxyUrl}`);
 
 const app = express();
 app.use(express.json({ limit: '10mb' }));
 
 const PORT = process.env.PORT || 3456;
+const PROXY_API_KEY = process.env.PROXY_API_KEY;
+
+function authMiddleware(req, res, next) {
+  if (!PROXY_API_KEY) return next();
+  const auth = req.headers['authorization'];
+  const token = auth?.startsWith('Bearer ') ? auth.slice(7) : null;
+  if (token === PROXY_API_KEY) return next();
+  res.status(401).json({ type: 'error', error: { type: 'authentication_error', message: 'Invalid or missing API key' } });
+}
+
+app.use(authMiddleware);
 
 let cachedClient = null;
 let cachedToken = null;
@@ -357,6 +372,7 @@ app.listen(PORT, async () => {
   console.log(`  ${c.gray}OpenAI:   ${c.reset} http://localhost:${PORT}/v1/chat/completions`);
   console.log(`  ${c.gray}Models:   ${c.reset} http://localhost:${PORT}/v1/models`);
   console.log(`  ${c.gray}Credits: ${c.reset} http://localhost:${PORT}/credits`);
+  console.log(`  ${c.gray}Auth:     ${c.reset} ${PROXY_API_KEY ? `${c.green}enabled${c.reset} (PROXY_API_KEY)` : `${c.yellow}disabled${c.reset} (no PROXY_API_KEY set)`}`);
   try {
     const t = await getAccessToken();
     console.log(`  ${c.gray}Provider: ${c.yellow}${t.provider || 'unknown'}${c.reset}, Expires: ${c.dim}${t.expiresAt || 'unknown'}${c.reset}`);