mslxdff 0.1.170 → 0.1.172

package/src/providers/qwenwork/payload.js

@@ -1,142 +1,144 @@
-// vendor 自 _shared/body.js（OpenAI body → agent_chat 请求体），逐字搬；去掉 desensitize 分支。
-// 实测通过的字段形状（2026-09-29 真号 200）：request_id==request_set_id==chat_record_id、
-// stream 恒 true、system 抽到顶层且不出现在 messages、parameters.max_tokens 默认 32000。
-import { uuid } from "./crypto.js";
-import { DEFAULT_MODEL, BUSINESS_PRODUCT, BUSINESS_TYPE, CONTEXT_LENGTH } from "./constants.js";
-
-export function mapModel(name) {
-  const m = String(name || "").trim();
-  switch (m) {
-    case "":
-    case "auto":
-    case "lite":
-    case "flash":
-      return "flash";
-    case "advanced":
-    case "pro":
-      return "pro";
-    case "max":
-    case "qwen3.8-max":
-    case "qwen3.8-max-preview":
-      return "qwen3.8-max-preview";
-    default:
-      return m;
-  }
-}
-
-function contentText(value) {
-  if (typeof value === "string") return value;
-  if (Array.isArray(value)) {
-    let out = "";
-    for (const part of value) {
-      if (part && typeof part === "object" && typeof part.text === "string") out += part.text;
-    }
-    return out;
-  }
-  if (value === null || value === undefined) return "";
-  return JSON.stringify(value);
-}
-
-function splitMessages(payload) {
-  const raw = Array.isArray(payload.messages) ? payload.messages : [];
-  const sysParts = [];
-  const messages = [];
-  let lastUser = "";
-  for (const item of raw) {
-    if (!item || typeof item !== "object") continue;
-    if (item.role === "system") {
-      const text = contentText(item.content);
-      if (text) sysParts.push(text);
-      continue;
-    }
-    messages.push(item);
-  }
-  for (let i = messages.length - 1; i >= 0; i--) {
-    const m = messages[i];
-    if (m && m.role === "user") {
-      lastUser = contentText(m.content);
-      break;
-    }
-  }
-  return { system: sysParts.join("\n\n"), messages, lastUser };
-}
-
-export function buildBody(payload, modelKey) {
-  const key = modelKey || DEFAULT_MODEL;
-  const requestID = uuid();
-  const { system, messages, lastUser: first } = splitMessages(payload);
-  let lastUser = first;
-  if (!lastUser) {
-    for (const m of messages) {
-      if (m && m.role === "user") {
-        lastUser = contentText(m.content);
-        if (lastUser) break;
-      }
-    }
-  }
-  if (!lastUser) lastUser = "ping";
-
-  const tokenCap = payload.max_completion_tokens !== undefined ? payload.max_completion_tokens : payload.max_tokens;
-  const parameters = {};
-  for (const k of ["temperature", "top_p", "presence_penalty", "frequency_penalty"]) {
-    if (payload[k] !== undefined && payload[k] !== null) parameters[k] = payload[k];
-  }
-  if (tokenCap !== undefined && tokenCap !== null) {
-    const n = Number(tokenCap);
-    if (Number.isFinite(n) && n > 0) parameters.max_tokens = Math.floor(n);
-  }
-  if (parameters.max_tokens === undefined) parameters.max_tokens = 32000;
-
-  const tools = !(payload.tool_choice === "none") && Array.isArray(payload.tools) ? payload.tools : [];
-  const isReasoning = false;
-
-  return JSON.stringify({
-    request_id: requestID,
-    request_set_id: requestID,
-    chat_record_id: requestID,
-    session_id: uuid(),
-    stream: true,
-    chat_task: "FREE_INPUT",
-    chat_context: {
-      text: lastUser,
-      features: [],
-      extra: {
-        context: [],
-        modelConfig: { key, is_reasoning: isReasoning },
-        originalContent: lastUser,
-      },
-      chatPrompt: "",
-      imageUrls: null,
-    },
-    is_reply: true,
-    is_retry: false,
-    source: 1,
-    version: "3",
-    agent_id: "agent_common",
-    task_id: "common",
-    session_type: "qoder_work",
-    aliyun_user_type: "",
-    model_config: {
-      key,
-      display_name: key,
-      model: "",
-      format: "openai",
-      is_vl: true,
-      is_reasoning: isReasoning,
-      api_key: "",
-      url: "",
-      source: "system",
-      max_input_tokens: CONTEXT_LENGTH,
-    },
-    system,
-    messages,
-    tools,
-    parameters,
-    business: {
-      product: BUSINESS_PRODUCT,
-      type: BUSINESS_TYPE,
-      version: "1",
-      feature_switches: {},
-    },
-  });
-}
+// vendor 自 _shared/body.js（OpenAI body → agent_chat 请求体），逐字搬；去掉 desensitize 分支。
+// 实测通过的字段形状（2026-09-29 真号 200）：request_id==request_set_id==chat_record_id、
+// stream 恒 true、system 抽到顶层且不出现在 messages、parameters.max_tokens 默认 32000。
+import { uuid } from "./crypto.js";
+import { DEFAULT_MODEL, BUSINESS_PRODUCT, BUSINESS_TYPE, CONTEXT_LENGTH } from "./constants.js";
+import { effortFromBody, isReasoningEnabled } from "../../thinking-effort.js";
+
+export function mapModel(name) {
+  const m = String(name || "").trim();
+  switch (m) {
+    case "":
+    case "auto":
+    case "lite":
+    case "flash":
+      return "flash";
+    case "advanced":
+    case "pro":
+      return "pro";
+    case "max":
+    case "qwen3.8-max":
+    case "qwen3.8-max-preview":
+      return "qwen3.8-max-preview";
+    default:
+      return m;
+  }
+}
+
+function contentText(value) {
+  if (typeof value === "string") return value;
+  if (Array.isArray(value)) {
+    let out = "";
+    for (const part of value) {
+      if (part && typeof part === "object" && typeof part.text === "string") out += part.text;
+    }
+    return out;
+  }
+  if (value === null || value === undefined) return "";
+  return JSON.stringify(value);
+}
+
+function splitMessages(payload) {
+  const raw = Array.isArray(payload.messages) ? payload.messages : [];
+  const sysParts = [];
+  const messages = [];
+  let lastUser = "";
+  for (const item of raw) {
+    if (!item || typeof item !== "object") continue;
+    if (item.role === "system") {
+      const text = contentText(item.content);
+      if (text) sysParts.push(text);
+      continue;
+    }
+    messages.push(item);
+  }
+  for (let i = messages.length - 1; i >= 0; i--) {
+    const m = messages[i];
+    if (m && m.role === "user") {
+      lastUser = contentText(m.content);
+      break;
+    }
+  }
+  return { system: sysParts.join("\n\n"), messages, lastUser };
+}
+
+export function buildBody(payload, modelKey) {
+  const key = modelKey || DEFAULT_MODEL;
+  const requestID = uuid();
+  const { system, messages, lastUser: first } = splitMessages(payload);
+  let lastUser = first;
+  if (!lastUser) {
+    for (const m of messages) {
+      if (m && m.role === "user") {
+        lastUser = contentText(m.content);
+        if (lastUser) break;
+      }
+    }
+  }
+  if (!lastUser) lastUser = "ping";
+
+  const tokenCap = payload.max_completion_tokens !== undefined ? payload.max_completion_tokens : payload.max_tokens;
+  const parameters = {};
+  for (const k of ["temperature", "top_p", "presence_penalty", "frequency_penalty"]) {
+    if (payload[k] !== undefined && payload[k] !== null) parameters[k] = payload[k];
+  }
+  if (tokenCap !== undefined && tokenCap !== null) {
+    const n = Number(tokenCap);
+    if (Number.isFinite(n) && n > 0) parameters.max_tokens = Math.floor(n);
+  }
+  if (parameters.max_tokens === undefined) parameters.max_tokens = 32000;
+
+  const tools = !(payload.tool_choice === "none") && Array.isArray(payload.tools) ? payload.tools : [];
+  // 客户端显式档位优先（change fix-thinking-effort-passthrough）：关断→false、其余非空→true；无档位→false（旧行为）。
+  const isReasoning = isReasoningEnabled(effortFromBody(payload), false);
+
+  return JSON.stringify({
+    request_id: requestID,
+    request_set_id: requestID,
+    chat_record_id: requestID,
+    session_id: uuid(),
+    stream: true,
+    chat_task: "FREE_INPUT",
+    chat_context: {
+      text: lastUser,
+      features: [],
+      extra: {
+        context: [],
+        modelConfig: { key, is_reasoning: isReasoning },
+        originalContent: lastUser,
+      },
+      chatPrompt: "",
+      imageUrls: null,
+    },
+    is_reply: true,
+    is_retry: false,
+    source: 1,
+    version: "3",
+    agent_id: "agent_common",
+    task_id: "common",
+    session_type: "qoder_work",
+    aliyun_user_type: "",
+    model_config: {
+      key,
+      display_name: key,
+      model: "",
+      format: "openai",
+      is_vl: true,
+      is_reasoning: isReasoning,
+      api_key: "",
+      url: "",
+      source: "system",
+      max_input_tokens: CONTEXT_LENGTH,
+    },
+    system,
+    messages,
+    tools,
+    parameters,
+    business: {
+      product: BUSINESS_PRODUCT,
+      type: BUSINESS_TYPE,
+      version: "1",
+      feature_switches: {},
+    },
+  });
+}

package/src/providers/qwenwork/rsa.js

@@ -1,54 +1,54 @@
-// vendor 自 _shared/crypto.js 的 RSA 段（BigInt modPow + PKCS#1 v1.5 type-2），逐字搬。
-// 模数取 constants.js 的 RSA_MODULUS_HEX（与上游一致，勿改）。
-import { b64, utf8 } from "./crypto.js";
-import { RSA_MODULUS_HEX, RSA_EXPONENT } from "./constants.js";
-
-export const RSA_N = BigInt("0x" + RSA_MODULUS_HEX);
-export const RSA_E = BigInt(RSA_EXPONENT);
-
-function modPow(base, exp, mod) {
-  let result = 1n;
-  let b = base % mod;
-  let e = exp;
-  while (e > 0n) {
-    if (e & 1n) result = (result * b) % mod;
-    b = (b * b) % mod;
-    e >>= 1n;
-  }
-  return result;
-}
-
-export function rsaPkcs1Encrypt(data, n = RSA_N, e = RSA_E, k = 128) {
-  const psLen = k - data.length - 3;
-  if (psLen < 8) throw new Error("rsa: message too long");
-  const ps = new Uint8Array(psLen);
-  for (;;) {
-    crypto.getRandomValues(ps);
-    let ok = true;
-    for (let i = 0; i < psLen; i++) {
-      if (ps[i] === 0) {
-        ok = false;
-        break;
-      }
-    }
-    if (ok) break;
-  }
-  const em = new Uint8Array(k);
-  em[0] = 0x00;
-  em[1] = 0x02;
-  em.set(ps, 2);
-  em[2 + psLen] = 0x00;
-  em.set(data, 3 + psLen);
-  let m = 0n;
-  for (let i = 0; i < k; i++) m = (m << 8n) | BigInt(em[i]);
-  const c = modPow(m, e, n);
-  const out = new Uint8Array(k);
-  let v = c;
-  for (let i = k - 1; i >= 0; i--) {
-    out[i] = Number(v & 0xffn);
-    v >>= 8n;
-  }
-  return b64(out);
-}
-
-export { b64, utf8 };
+// vendor 自 _shared/crypto.js 的 RSA 段（BigInt modPow + PKCS#1 v1.5 type-2），逐字搬。
+// 模数取 constants.js 的 RSA_MODULUS_HEX（与上游一致，勿改）。
+import { b64, utf8 } from "./crypto.js";
+import { RSA_MODULUS_HEX, RSA_EXPONENT } from "./constants.js";
+
+export const RSA_N = BigInt("0x" + RSA_MODULUS_HEX);
+export const RSA_E = BigInt(RSA_EXPONENT);
+
+function modPow(base, exp, mod) {
+  let result = 1n;
+  let b = base % mod;
+  let e = exp;
+  while (e > 0n) {
+    if (e & 1n) result = (result * b) % mod;
+    b = (b * b) % mod;
+    e >>= 1n;
+  }
+  return result;
+}
+
+export function rsaPkcs1Encrypt(data, n = RSA_N, e = RSA_E, k = 128) {
+  const psLen = k - data.length - 3;
+  if (psLen < 8) throw new Error("rsa: message too long");
+  const ps = new Uint8Array(psLen);
+  for (;;) {
+    crypto.getRandomValues(ps);
+    let ok = true;
+    for (let i = 0; i < psLen; i++) {
+      if (ps[i] === 0) {
+        ok = false;
+        break;
+      }
+    }
+    if (ok) break;
+  }
+  const em = new Uint8Array(k);
+  em[0] = 0x00;
+  em[1] = 0x02;
+  em.set(ps, 2);
+  em[2 + psLen] = 0x00;
+  em.set(data, 3 + psLen);
+  let m = 0n;
+  for (let i = 0; i < k; i++) m = (m << 8n) | BigInt(em[i]);
+  const c = modPow(m, e, n);
+  const out = new Uint8Array(k);
+  let v = c;
+  for (let i = k - 1; i >= 0; i--) {
+    out[i] = Number(v & 0xffn);
+    v >>= 8n;
+  }
+  return b64(out);
+}
+
+export { b64, utf8 };