qwenproxy-cli 1.0.0 → 1.0.2

package/src/utils/session-id.ts

@@ -1,37 +1,37 @@
-import { createHash } from "crypto";
-import type { Message } from "./types.js";
-
-/**
- * Derive a deterministic session ID from a caller-provided conversation key
- * plus the conversation's anchoring content.
- */
-export function deriveSessionId(
-  messages: Message[],
-  systemPrompt: string = "",
-  conversationKey?: string,
-): string {
-  const firstUser = messages.find((m) => m.role === "user");
-  const anchor = [
-    conversationKey?.trim(),
-    systemPrompt.trim(),
-    extractTextContent(firstUser),
-  ]
-    .filter((part) => part && part.length > 0)
-    .join("|");
-  const hash = createHash("sha256").update(anchor).digest("hex").slice(0, 16);
-  return `sess_${hash}`;
-}
-
-function extractTextContent(msg: Message | undefined): string {
-  if (!msg || !msg.content) return "";
-  if (typeof msg.content === "string") return msg.content;
-
-  const content = msg.content as any;
-  if (Array.isArray(content)) {
-    return content
-      .filter((p: any) => p?.type === "text")
-      .map((p: any) => p.text || "")
-      .join(" ");
-  }
-  return "";
-}
+import { createHash } from "crypto";
+import type { Message } from "./types.js";
+
+/**
+ * Derive a deterministic session ID from a caller-provided conversation key
+ * plus the conversation's anchoring content.
+ */
+export function deriveSessionId(
+  messages: Message[],
+  systemPrompt: string = "",
+  conversationKey?: string,
+): string {
+  const firstUser = messages.find((m) => m.role === "user");
+  const anchor = [
+    conversationKey?.trim(),
+    systemPrompt.trim(),
+    extractTextContent(firstUser),
+  ]
+    .filter((part) => part && part.length > 0)
+    .join("|");
+  const hash = createHash("sha256").update(anchor).digest("hex").slice(0, 16);
+  return `sess_${hash}`;
+}
+
+function extractTextContent(msg: Message | undefined): string {
+  if (!msg || !msg.content) return "";
+  if (typeof msg.content === "string") return msg.content;
+
+  const content = msg.content as any;
+  if (Array.isArray(content)) {
+    return content
+      .filter((p: any) => p?.type === "text")
+      .map((p: any) => p.text || "")
+      .join(" ");
+  }
+  return "";
+}

package/src/utils/tool-call-guard.ts

@@ -1,85 +1,85 @@
-import type { Message } from "./types.ts";
-
-/**
- * Detects tool calls that were already executed (identical name + arguments)
- * earlier in the conversation and returns a short system reminder to be
- * appended to the prompt. This breaks the re-read/re-inspect loops where the
- * model keeps calling the same tool turn after turn instead of answering.
- *
- * The reminder is prompt-only and does not alter caching, session identity or
- * the upstream thread.
- *
- * @param messages - Full message history (assistant tool_calls + tool/function results).
- * @param threshold - Minimum number of identical executions before reminding.
- * @returns Reminder text to append to the prompt, or null when the history is clean.
- */
-export function buildRepeatedToolCallReminder(
-  messages: Message[] | null | undefined,
-  threshold = 2,
-): string | null {
-  if (!messages || messages.length === 0 || threshold < 2) return null;
-
-  // Canonical key: tool name + normalized arguments (object key order ignored).
-  const occurrences = new Map<string, number>();
-  let lastToolCallTurnIndex = -1;
-
-  for (let i = 0; i < messages.length; i++) {
-    const calls = messages[i]?.tool_calls;
-    if (!calls || calls.length === 0) continue;
-    lastToolCallTurnIndex = i;
-    for (const call of calls) {
-      const key = toolCallKey(call.function?.name, call.function?.arguments);
-      occurrences.set(key, (occurrences.get(key) ?? 0) + 1);
-    }
-  }
-
-  if (lastToolCallTurnIndex < 0) return null;
-
-  const lastCalls = messages[lastToolCallTurnIndex].tool_calls ?? [];
-  const reminders: string[] = [];
-
-  for (const call of lastCalls) {
-    const key = toolCallKey(call.function?.name, call.function?.arguments);
-    const count = occurrences.get(key) ?? 0;
-    if (count >= threshold) {
-      reminders.push(
-        `[SYSTEM REMINDER] You have already executed the tool call "${call.function?.name}" ${count} time(s) in this conversation with exactly the same arguments, and its result is already in the history. Do NOT call it again: use the existing result and write the final answer now. If the earlier attempts were rejected, do not repeat them either; answer directly.`,
-      );
-    }
-  }
-
-  return reminders.length > 0
-    ? reminders.join("\n\n")
-    : null;
-}
-
-function toolCallKey(name: string | undefined, rawArgs: string | undefined): string {
-  const toolName = typeof name === "string" ? name : "";
-  const raw = typeof rawArgs === "string" ? rawArgs : "";
-  let parsed: unknown = raw;
-  try {
-    parsed = JSON.parse(raw);
-  } catch {
-    // Unparseable payloads fall back to the raw string as the key.
-  }
-  return `${toolName}|${JSON.stringify(canonicalize(parsed))}`;
-}
-
-/**
- * Deep-normalizes JSON values so that argument objects with different key
- * orders or whitespace still produce the same canonical key.
- */
-function canonicalize(value: unknown): unknown {
-  if (Array.isArray(value)) {
-    return value.map(canonicalize);
-  }
-  if (value && typeof value === "object") {
-    const record = value as Record<string, unknown>;
-    const result: Record<string, unknown> = {};
-    for (const key of Object.keys(record).sort()) {
-      result[key] = canonicalize(record[key]);
-    }
-    return result;
-  }
-  return value;
+import type { Message } from "./types.ts";
+
+/**
+ * Detects tool calls that were already executed (identical name + arguments)
+ * earlier in the conversation and returns a short system reminder to be
+ * appended to the prompt. This breaks the re-read/re-inspect loops where the
+ * model keeps calling the same tool turn after turn instead of answering.
+ *
+ * The reminder is prompt-only and does not alter caching, session identity or
+ * the upstream thread.
+ *
+ * @param messages - Full message history (assistant tool_calls + tool/function results).
+ * @param threshold - Minimum number of identical executions before reminding.
+ * @returns Reminder text to append to the prompt, or null when the history is clean.
+ */
+export function buildRepeatedToolCallReminder(
+  messages: Message[] | null | undefined,
+  threshold = 2,
+): string | null {
+  if (!messages || messages.length === 0 || threshold < 2) return null;
+
+  // Canonical key: tool name + normalized arguments (object key order ignored).
+  const occurrences = new Map<string, number>();
+  let lastToolCallTurnIndex = -1;
+
+  for (let i = 0; i < messages.length; i++) {
+    const calls = messages[i]?.tool_calls;
+    if (!calls || calls.length === 0) continue;
+    lastToolCallTurnIndex = i;
+    for (const call of calls) {
+      const key = toolCallKey(call.function?.name, call.function?.arguments);
+      occurrences.set(key, (occurrences.get(key) ?? 0) + 1);
+    }
+  }
+
+  if (lastToolCallTurnIndex < 0) return null;
+
+  const lastCalls = messages[lastToolCallTurnIndex].tool_calls ?? [];
+  const reminders: string[] = [];
+
+  for (const call of lastCalls) {
+    const key = toolCallKey(call.function?.name, call.function?.arguments);
+    const count = occurrences.get(key) ?? 0;
+    if (count >= threshold) {
+      reminders.push(
+        `[SYSTEM REMINDER] You have already executed the tool call "${call.function?.name}" ${count} time(s) in this conversation with exactly the same arguments, and its result is already in the history. Do NOT call it again: use the existing result and write the final answer now. If the earlier attempts were rejected, do not repeat them either; answer directly.`,
+      );
+    }
+  }
+
+  return reminders.length > 0
+    ? reminders.join("\n\n")
+    : null;
+}
+
+function toolCallKey(name: string | undefined, rawArgs: string | undefined): string {
+  const toolName = typeof name === "string" ? name : "";
+  const raw = typeof rawArgs === "string" ? rawArgs : "";
+  let parsed: unknown = raw;
+  try {
+    parsed = JSON.parse(raw);
+  } catch {
+    // Unparseable payloads fall back to the raw string as the key.
+  }
+  return `${toolName}|${JSON.stringify(canonicalize(parsed))}`;
+}
+
+/**
+ * Deep-normalizes JSON values so that argument objects with different key
+ * orders or whitespace still produce the same canonical key.
+ */
+function canonicalize(value: unknown): unknown {
+  if (Array.isArray(value)) {
+    return value.map(canonicalize);
+  }
+  if (value && typeof value === "object") {
+    const record = value as Record<string, unknown>;
+    const result: Record<string, unknown> = {};
+    for (const key of Object.keys(record).sort()) {
+      result[key] = canonicalize(record[key]);
+    }
+    return result;
+  }
+  return value;
 }

package/src/utils/types.ts

@@ -1,109 +1,109 @@
-import type { JsonSchema, FunctionToolDefinition } from "../tools/types.ts";
-export type { JsonSchema, FunctionToolDefinition };
-
-/** Tool choice options */
-export type ToolChoice =
-  | "auto"
-  | "none"
-  | "required"
-  | {
-      type: "function";
-      function: { name: string };
-    };
-
-// --- Message Types ---
-
-export interface ToolCallFunction {
-  name: string;
-  arguments: string;
-}
-
-export interface MessageToolCall {
-  id: string;
-  type: "function";
-  function: ToolCallFunction;
-}
-
-export interface Message {
-  role: string;
-  content: string | null;
-  /** Present on assistant messages that invoked tools */
-  tool_calls?: MessageToolCall[];
-  /** Present on tool/function response messages to link back to a call */
-  tool_call_id?: string;
-  /** Present on tool/function response messages */
-  name?: string;
-  /** Reasoning content for thinking models */
-  reasoning_content?: string;
-}
-
-// --- Request Types ---
-
-export interface OpenAIRequest {
-  model: string;
-  messages: Message[];
-  stream?: boolean;
-  /** QwenProxy media extension used by image/video chat models. */
-  size?: string;
-  tools?: FunctionToolDefinition[];
-  tool_choice?: ToolChoice;
-  user?: string;
-  session_id?: string;
-  conversation_id?: string;
-  /** OpenAI chat spec: none|minimal|low|medium|high|xhigh|max (reasoning models). */
-  reasoning_effort?: string | null;
-  /** camelCase alias overlaid by OpenCode-style configs. */
-  reasoningEffort?: string | null;
-  stream_options?: {
-    include_usage?: boolean;
-  };
-}
-
-// --- Response Types ---
-
-export interface ToolCall {
-  index: number;
-  id?: string;
-  type: string;
-  function: {
-    name: string;
-    arguments: string;
-  };
-}
-
-export interface ChoiceDelta {
-  role?: string;
-  content?: string | null;
-  reasoning_content?: string | null;
-  tool_calls?: ToolCall[];
-}
-
-export interface Choice {
-  index: number;
-  delta?: ChoiceDelta;
-  message?: ChoiceDelta;
-  finish_reason: string | null;
-}
-
-export interface Usage {
-  prompt_tokens: number;
-  completion_tokens: number;
-  total_tokens: number;
-  prompt_tokens_details?: {
-    cached_tokens: number;
-    text_tokens?: number;
-  };
-  completion_tokens_details?: {
-    reasoning_tokens?: number;
-    text_tokens?: number;
-  };
-}
-
-export interface ChatCompletionChunk {
-  id: string;
-  object: string;
-  created: number;
-  model: string;
-  choices: Choice[];
-  usage?: Usage;
-}
+import type { JsonSchema, FunctionToolDefinition } from "../tools/types.ts";
+export type { JsonSchema, FunctionToolDefinition };
+
+/** Tool choice options */
+export type ToolChoice =
+  | "auto"
+  | "none"
+  | "required"
+  | {
+      type: "function";
+      function: { name: string };
+    };
+
+// --- Message Types ---
+
+export interface ToolCallFunction {
+  name: string;
+  arguments: string;
+}
+
+export interface MessageToolCall {
+  id: string;
+  type: "function";
+  function: ToolCallFunction;
+}
+
+export interface Message {
+  role: string;
+  content: string | null;
+  /** Present on assistant messages that invoked tools */
+  tool_calls?: MessageToolCall[];
+  /** Present on tool/function response messages to link back to a call */
+  tool_call_id?: string;
+  /** Present on tool/function response messages */
+  name?: string;
+  /** Reasoning content for thinking models */
+  reasoning_content?: string;
+}
+
+// --- Request Types ---
+
+export interface OpenAIRequest {
+  model: string;
+  messages: Message[];
+  stream?: boolean;
+  /** QwenProxy media extension used by image/video chat models. */
+  size?: string;
+  tools?: FunctionToolDefinition[];
+  tool_choice?: ToolChoice;
+  user?: string;
+  session_id?: string;
+  conversation_id?: string;
+  /** OpenAI chat spec: none|minimal|low|medium|high|xhigh|max (reasoning models). */
+  reasoning_effort?: string | null;
+  /** camelCase alias overlaid by OpenCode-style configs. */
+  reasoningEffort?: string | null;
+  stream_options?: {
+    include_usage?: boolean;
+  };
+}
+
+// --- Response Types ---
+
+export interface ToolCall {
+  index: number;
+  id?: string;
+  type: string;
+  function: {
+    name: string;
+    arguments: string;
+  };
+}
+
+export interface ChoiceDelta {
+  role?: string;
+  content?: string | null;
+  reasoning_content?: string | null;
+  tool_calls?: ToolCall[];
+}
+
+export interface Choice {
+  index: number;
+  delta?: ChoiceDelta;
+  message?: ChoiceDelta;
+  finish_reason: string | null;
+}
+
+export interface Usage {
+  prompt_tokens: number;
+  completion_tokens: number;
+  total_tokens: number;
+  prompt_tokens_details?: {
+    cached_tokens: number;
+    text_tokens?: number;
+  };
+  completion_tokens_details?: {
+    reasoning_tokens?: number;
+    text_tokens?: number;
+  };
+}
+
+export interface ChatCompletionChunk {
+  id: string;
+  object: string;
+  created: number;
+  model: string;
+  choices: Choice[];
+  usage?: Usage;
+}