kimi-proxy 0.1.1 → 0.1.3

package/dist/core/types.d.ts

@@ -16,7 +16,7 @@ export interface JsonObject {
     [key: string]: JsonValue | undefined;
 }
 export type JsonValue = JsonPrimitive | JsonObject | JsonArray;
-export declare function isJsonObject(value: JsonValue): value is JsonObject;
+export declare function isJsonObject(value: JsonValue | undefined): value is JsonObject;
 export declare enum Operation {
     Chat = "chat",
     Messages = "messages",
@@ -2792,3 +2792,5 @@ export interface PipelineResult {
 }
 export type Json = JsonValue;
 export declare const isMessage: (value: unknown) => value is Message;
+export declare function getToolSchemas(request: Request): Record<string, z.ZodSchema>;
+export declare function findMatchingTool(request: Request, args: unknown): string | null;

package/dist/index.js

@@ -1018,6 +1018,77 @@ var ResponseSchema = z3.object({
     synthetic: z3.boolean().optional()
   }).optional()
 });
+function jsonSchemaToZod(schema) {
+  if (!schema || typeof schema !== "object" || Array.isArray(schema))
+    return z3.any();
+  const s = schema;
+  switch (s.type) {
+    case "object": {
+      const shape = {};
+      const properties = s.properties || {};
+      const required = s.required || [];
+      for (const key in properties) {
+        let propSchema = jsonSchemaToZod(properties[key]);
+        if (!required.includes(key)) {
+          propSchema = propSchema.optional();
+        }
+        shape[key] = propSchema;
+      }
+      const zodObj = z3.object(shape);
+      if (s.additionalProperties === false) {
+        return zodObj.strict();
+      } else {
+        return zodObj.passthrough();
+      }
+    }
+    case "array":
+      return z3.array(jsonSchemaToZod(s.items || {}));
+    case "string":
+      if (Array.isArray(s.enum) && s.enum.length > 0 && s.enum.every((e) => typeof e === "string")) {
+        return z3.enum(s.enum);
+      }
+      return z3.string();
+    case "number":
+    case "integer":
+      return z3.number();
+    case "boolean":
+      return z3.boolean();
+    case "null":
+      return z3.null();
+    default:
+      return z3.any();
+  }
+}
+var toolSchemaCache = new WeakMap;
+function getToolSchemas(request) {
+  let schemas = toolSchemaCache.get(request);
+  if (schemas)
+    return schemas;
+  schemas = {};
+  for (const tool of request.tools ?? []) {
+    schemas[tool.name] = jsonSchemaToZod(tool.parameters);
+  }
+  toolSchemaCache.set(request, schemas);
+  return schemas;
+}
+function safeParseJson(str) {
+  try {
+    return JSON.parse(str);
+  } catch {
+    return str;
+  }
+}
+function findMatchingTool(request, args) {
+  const schemas = getToolSchemas(request);
+  const matches = [];
+  const parsedArgs = typeof args === "string" ? safeParseJson(args) : args;
+  for (const [name, schema] of Object.entries(schemas)) {
+    if (schema.safeParse(parsedArgs).success) {
+      matches.push(name);
+    }
+  }
+  return matches.length === 1 ? matches[0] : null;
+}
 
 // src/core/ensureToolCall.ts
 var ENSURE_TOOL_CALL_STATE_KEY = "__ensureToolCall";
@@ -2635,13 +2706,39 @@ function parseToolCalls(section) {
   }
   return toolCalls;
 }
-function fixKimiResponse(response) {
+function repairToolNames(toolCalls, request) {
+  const schemas = getToolSchemas(request);
+  const toolNames = new Set(Object.keys(schemas));
+  let repairedCount = 0;
+  for (const call of toolCalls) {
+    if (call.type !== "function" || !isJsonObject(call.function))
+      continue;
+    const fn = call.function;
+    if (typeof fn.name === "number") {
+      fn.name = String(fn.name);
+    }
+    const name = fn.name;
+    if (typeof name !== "string")
+      continue;
+    if (toolNames.has(name))
+      continue;
+    const match = findMatchingTool(request, fn.arguments);
+    if (match) {
+      logger.debug(`[KimiFixer] Repaired tool name: ${name} -> ${match}`);
+      fn.name = match;
+      repairedCount++;
+    }
+  }
+  return repairedCount;
+}
+function fixKimiResponse(response, request) {
   const metadata = {
     extractedToolCalls: 0,
     extractedFromReasoning: 0,
     extractedFromContent: 0,
     cleanedReasoningContent: false,
-    cleanedMessageContent: false
+    cleanedMessageContent: false,
+    repairedToolNames: 0
   };
   try {
     const choices = response?.choices;
@@ -2698,6 +2795,10 @@ ${thinkingContent}` : thinkingContent;
         }
       }
       if (aggregatedToolCalls.length) {
+        const repaired = repairToolNames(aggregatedToolCalls, request);
+        if (repaired > 0) {
+          metadata.repairedToolNames = (metadata.repairedToolNames || 0) + repaired;
+        }
         message.tool_calls = aggregatedToolCalls;
         choice.finish_reason = "tool_calls";
       } else if ("tool_calls" in message) {
@@ -2741,7 +2842,7 @@ var OpenAIToolCallSchema = z7.object({
   id: z7.string().optional(),
   type: z7.literal("function").optional(),
   function: z7.object({
-    name: z7.string(),
+    name: z7.union([z7.string(), z7.number()]).transform(String),
     arguments: z7.union([z7.string(), z7.record(z7.unknown())]).optional()
   }).passthrough()
 }).passthrough();
@@ -2771,13 +2872,14 @@ function normalizeToolCalls(toolCalls) {
   const normalized = [];
   for (const call of toolCalls) {
     const fn = call?.function;
-    if (!fn || typeof fn.name !== "string")
+    if (!fn || typeof fn.name !== "string" && typeof fn.name !== "number")
       continue;
-    const id = typeof call.id === "string" && call.id.length ? call.id : fn.name;
+    const name = String(fn.name);
+    const id = typeof call.id === "string" && call.id.length ? call.id : `${name}_call_${Math.random().toString(36).substring(2, 10)}`;
     normalized.push({
       id,
       type: "function",
-      name: fn.name,
+      name,
       arguments: safeJsonString(fn.arguments)
     });
   }
@@ -2879,7 +2981,7 @@ function toOpenAIMessages(messages) {
     };
   });
 }
-function normalizeOpenAIProviderResponse(payload) {
+function normalizeOpenAIProviderResponse(payload, request) {
   const parsed = OpenAIResponseSchema.safeParse(payload.body);
   if (!parsed.success) {
     const issue = parsed.error.issues[0]?.message ?? "Invalid provider payload";
@@ -2887,7 +2989,7 @@ function normalizeOpenAIProviderResponse(payload) {
     return { error: issue };
   }
   const cloned = structuredClone(parsed.data);
-  const { response, metadata } = fixKimiResponse(cloned);
+  const { response, metadata } = fixKimiResponse(cloned, request);
   const normalized = OpenAIResponseSchema.safeParse(response);
   if (!normalized.success) {
     const issue = normalized.error.issues[0]?.message ?? "Provider payload invalid after normalization";
@@ -3002,7 +3104,7 @@ class OpenAIProviderAdapter {
     if (payload.status >= 400) {
       return toUlxErrorResponse(payload, request);
     }
-    const normalized = normalizeOpenAIProviderResponse(payload);
+    const normalized = normalizeOpenAIProviderResponse(payload, request);
     if ("error" in normalized) {
       return {
         id: request.id,
@@ -3090,7 +3192,7 @@ class OpenRouterProviderAdapter {
     if (payload.status >= 400) {
       return toUlxErrorResponse(payload, request);
     }
-    const normalized = normalizeOpenAIProviderResponse(payload);
+    const normalized = normalizeOpenAIProviderResponse(payload, request);
     if ("error" in normalized) {
       return {
         id: request.id,
@@ -3422,7 +3524,7 @@ class VertexProviderAdapter {
       return toUlxErrorResponse(payload, request);
     }
     if (request.model && MAAS_MODEL_PATTERN.test(request.model)) {
-      const normalized = normalizeOpenAIProviderResponse(payload);
+      const normalized = normalizeOpenAIProviderResponse(payload, request);
       if ("error" in normalized) {
         return {
           id: request.id,
@@ -3977,7 +4079,7 @@ ${content}`
         logger.warn({ requestId: request.id }, "Detected prior assistant termination; requesting synthetic response");
         return true;
       }
-      if (toolCalls.length === 1 && this.checkTerminationHeuristic(message, toolCalls[0])) {
+      if (toolCalls.length === 1 && this.checkTerminationHeuristic(message, toolCalls[0], request)) {
         requestSyntheticResponse(request.state);
         logger.warn({ requestId: request.id }, "Detected TodoWrite termination heuristic; requesting synthetic response");
         return true;
@@ -3985,7 +4087,10 @@ ${content}`
     }
     return false;
   }
-  checkTerminationHeuristic(message, toolCall) {
+  checkTerminationHeuristic(message, toolCall, request) {
+    if (!request.model.toLowerCase().includes("kimi")) {
+      return false;
+    }
     if (!hasCaseInsensitiveTerminationKeywords(message.content)) {
       return false;
     }
@@ -4014,7 +4119,7 @@ class EnsureToolCallResponseTransform {
     const response = context.response;
     if (!ensureState || !response)
       return;
-    if (this.checkTerminationHeuristic(response)) {
+    if (this.checkTerminationHeuristic(response, context.request)) {
       ensureState.pendingReminder = false;
       logger.info({ requestId: context.request.id }, "EnsureToolCall satisfied by TodoWrite + keyword heuristics");
       return;
@@ -4058,6 +4163,8 @@ class EnsureToolCallResponseTransform {
         }
         if (!hasContent && finalAnswer) {
           messageBlock.content = [{ type: "text", text: finalAnswer }];
+        } else if (hasContent && finalAnswer) {
+          messageBlock.content.push({ type: "text", text: finalAnswer });
         }
         continue;
       }
@@ -4086,7 +4193,10 @@ class EnsureToolCallResponseTransform {
     }
     return false;
   }
-  checkTerminationHeuristic(response) {
+  checkTerminationHeuristic(response, request) {
+    if (!request.model.toLowerCase().includes("kimi")) {
+      return false;
+    }
     const messageBlock = response.output.find((block) => block.type === "message");
     if (!messageBlock || messageBlock.type !== "message")
       return false;
@@ -4189,7 +4299,7 @@ class ModelRegistry {
     }));
   }
   resolve(modelName, profile) {
-    let variants = this.groups.get(modelName);
+    let variants = this.groups.get(modelName)?.filter((v) => !v.profile || v.profile === profile);
     if (variants && variants.length > 0 && profile) {
       const filtered = variants.filter((v) => v.profile === profile);
       if (filtered.length > 0) {
@@ -5697,13 +5807,15 @@ async function handleRequest(req, reply, body, modelRegistry, pipeline, logStore
       method: req.method,
       url: req.url,
       statusCode: 400,
+      provider: "schema_validation_failed",
       startedAt,
       finishedAt: Date.now(),
       requestBody: req.body,
       responseBody: errorBody,
       operation: options.operation,
       clientFormat: options.clientFormat,
-      profile: options.profile
+      profile: options.profile,
+      summary: summarizeError(error, "schema_validation")
     });
     reply.status(400).send(errorBody);
     return;
@@ -5728,13 +5840,15 @@ async function handleRequest(req, reply, body, modelRegistry, pipeline, logStore
       url: req.url,
       statusCode: 400,
       model,
+      provider: "resolution_failed",
       startedAt,
       finishedAt: Date.now(),
       requestBody: parsedBody,
       responseBody: errorBody,
       operation: options.operation,
       clientFormat: options.clientFormat,
-      profile: options.profile
+      profile: options.profile,
+      summary: summarizeError(error, "model_resolution")
     });
     reply.status(400).send(errorBody);
     return;
@@ -5811,7 +5925,8 @@ async function handleRequest(req, reply, body, modelRegistry, pipeline, logStore
       requestBody: upstreamModel ? { ...parsedBody, model: upstreamModel } : parsedBody,
       responseBody: { error: errorDetails },
       providerRequestBody: null,
-      providerResponseBody: null
+      providerResponseBody: null,
+      summary: summarizeError(error, "pipeline_execution")
     });
     reply.status(500).send({ error: { message: "Internal proxy error" } });
   }
@@ -5900,6 +6015,13 @@ function summarize(response) {
     preview
   });
 }
+function summarizeError(error, errorType) {
+  const errorMessage = error instanceof Error ? error.message : String(error);
+  return JSON.stringify({
+    error_type: errorType,
+    error_message: errorMessage.slice(0, 500)
+  });
+}
 function isPrematureCloseError(error) {
   if (!error || typeof error !== "object")
     return false;
@@ -5923,5 +6045,5 @@ async function bootstrap() {
 }
 bootstrap();
 
-//# debugId=78CDAC4F2B51930964756E2164756E21
+//# debugId=49E2D016D6E3465664756E2164756E21
 //# sourceMappingURL=index.js.map