@downcity/agent 1.1.287 → 1.1.310

package/src/utils/logger/FormatRequest.ts

@@ -8,20 +8,20 @@
 
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import {
-  buildInfoAttrs,
-  contentToText,
-  extractFunctionCallExecCommandCmd,
-  extractMessages,
-  extractSystemForLog,
-  formatLogField,
-  getObjectField,
-  getStringField,
-  isJsonObject,
-  parseInfoBlockText,
-  pushLabeledTextBlock,
-  safeJsonParse,
-  stringifyCompact,
-  toInlineLogValue,
+  build_info_attrs,
+  content_to_text,
+  extract_function_call_exec_command_cmd,
+  extract_messages,
+  extract_system_for_log,
+  format_log_field,
+  get_object_field,
+  get_string_field,
+  is_json_object,
+  parse_info_block_text,
+  push_labeled_text_block,
+  safe_json_parse,
+  stringify_compact,
+  to_inline_log_value,
   truncate,
   type ParsedPayload,
 } from "./FormatShared.js";
@@ -34,7 +34,7 @@ const UNLIMITED_LOG_CHARS = Number.MAX_SAFE_INTEGER;
  *
  * 关键点（中文）
  * - 用于 LLM 请求日志的增量打印，避免每轮都重复输出全量历史 messages。
- * - key 建议使用 sessionId；无 key 时保持原有行为（全量打印）。
+ * - key 建议使用 session_id；无 key 时保持原有行为（全量打印）。
  */
 const lastLoggedMessagesCountByKey = new Map<string, number>();
 
@@ -65,13 +65,13 @@ function formatToolCalls(
   const out: FormattedToolCall[] = [];
 
   for (const toolCall of toolCalls) {
-    if (!isJsonObject(toolCall)) continue;
+    if (!is_json_object(toolCall)) continue;
 
-    const id = getStringField(toolCall, "id");
-    const type = getStringField(toolCall, "type");
-    const fn = getObjectField(toolCall, "function");
+    const id = get_string_field(toolCall, "id");
+    const type = get_string_field(toolCall, "type");
+    const fn = get_object_field(toolCall, "function");
     const name =
-      (fn && getStringField(fn, "name")) || getStringField(toolCall, "tool");
+      (fn && get_string_field(fn, "name")) || get_string_field(toolCall, "tool");
     const argsRaw = fn ? fn.arguments : toolCall.arguments;
     const args =
       typeof argsRaw === "string"
@@ -96,7 +96,7 @@ function summarizeValue(value: JsonValue | undefined): string {
     return String(value);
   }
   if (Array.isArray(value)) return `[array:${value.length}]`;
-  if (isJsonObject(value)) return `[object:${Object.keys(value).length}]`;
+  if (is_json_object(value)) return `[object:${Object.keys(value).length}]`;
   return String(value);
 }
 
@@ -122,13 +122,13 @@ function normalizeSystemTextForLog(
     return truncate(merged, maxChars);
   }
 
-  if (isJsonObject(system)) {
+  if (is_json_object(system)) {
     const directText =
-      getStringField(system, "text") ||
-      getStringField(system, "content") ||
-      getStringField(system, "instructions");
+      get_string_field(system, "text") ||
+      get_string_field(system, "content") ||
+      get_string_field(system, "instructions");
     if (directText) return truncate(directText, maxChars);
-    return stringifyCompact(system, maxChars);
+    return stringify_compact(system, maxChars);
   }
 
   return truncate(String(system), maxChars);
@@ -154,8 +154,8 @@ function formatMessagesForLog(
   const out: string[] = [];
 
   for (const message of messages) {
-    const role = String(getStringField(message, "role") || "").trim().toLowerCase();
-    const itemType = String(getStringField(message, "type") || "")
+    const role = String(get_string_field(message, "role") || "").trim().toLowerCase();
+    const itemType = String(get_string_field(message, "type") || "")
       .trim()
       .toLowerCase();
     const output = summarizeValue(message.output);
@@ -171,14 +171,14 @@ function formatMessagesForLog(
           .filter(Boolean)
           .join(" | ");
         if (detail) {
-          pushLabeledTextBlock(out, "tool", detail, opts.maxToolArgsChars);
+          push_labeled_text_block(out, "tool", detail, opts.maxToolArgsChars);
         }
       }
     }
 
     if (itemType === "function_call") {
-      const functionName = String(getStringField(message, "name") || "").trim();
-      const functionCallExecCmd = extractFunctionCallExecCommandCmd(message);
+      const functionName = String(get_string_field(message, "name") || "").trim();
+      const functionCallExecCmd = extract_function_call_exec_command_cmd(message);
       const argsText =
         typeof message.arguments === "string"
           ? truncate(message.arguments, opts.maxToolArgsChars)
@@ -190,7 +190,7 @@ function formatMessagesForLog(
       ]
         .filter(Boolean)
         .join(" | ");
-      pushLabeledTextBlock(
+      push_labeled_text_block(
         out,
         "tool",
         functionCallDetail || "function_call",
@@ -199,28 +199,28 @@ function formatMessagesForLog(
       continue;
     }
 
-    let bodyText = "";
+    let body_text = "";
     let userInfoAttrs: string[] = [];
     if ("content" in message) {
       const isSystemRole = role === "system" || role === "developer";
-      const contentText = contentToText(
+      const contentText = content_to_text(
         message.content,
         isSystemRole ? opts.maxSystemChars : opts.maxContentChars,
       );
       if (role === "user") {
-        const parsedInfoBlock = parseInfoBlockText(contentText);
-        bodyText = parsedInfoBlock ? parsedInfoBlock.body : contentText;
-        userInfoAttrs = parsedInfoBlock ? buildInfoAttrs(parsedInfoBlock.info) : [];
+        const parsedInfoBlock = parse_info_block_text(contentText);
+        body_text = parsedInfoBlock ? parsedInfoBlock.body : contentText;
+        userInfoAttrs = parsedInfoBlock ? build_info_attrs(parsedInfoBlock.info) : [];
       } else {
-        bodyText = contentText;
+        body_text = contentText;
       }
     }
 
     if (role === "user") {
-      pushLabeledTextBlock(
+      push_labeled_text_block(
         out,
         "user",
-        bodyText || "-",
+        body_text || "-",
         opts.maxContentChars,
         userInfoAttrs,
       );
@@ -228,7 +228,7 @@ function formatMessagesForLog(
     }
 
     if (role === "system" || role === "developer") {
-      pushLabeledTextBlock(out, "system", bodyText || "-", opts.maxSystemChars);
+      push_labeled_text_block(out, "system", body_text || "-", opts.maxSystemChars);
       continue;
     }
 
@@ -239,8 +239,8 @@ function formatMessagesForLog(
       itemType === "tool_error" ||
       itemType === "tool-error"
     ) {
-      const toolResultText = [bodyText, outputText, output].filter(Boolean).join(" | ");
-      pushLabeledTextBlock(
+      const toolResultText = [body_text, outputText, output].filter(Boolean).join(" | ");
+      push_labeled_text_block(
         out,
         "tool_result",
         toolResultText || "-",
@@ -249,11 +249,11 @@ function formatMessagesForLog(
       continue;
     }
 
-    const assistantText = [bodyText, outputText, output]
+    const assistantText = [body_text, outputText, output]
       .filter(Boolean)
-      .join(bodyText ? "" : " | ");
+      .join(body_text ? "" : " | ");
     if (assistantText) {
-      pushLabeledTextBlock(out, "assistant", assistantText, opts.maxContentChars);
+      push_labeled_text_block(out, "assistant", assistantText, opts.maxContentChars);
     }
   }
 
@@ -265,10 +265,10 @@ function formatPayloadSummaryLines(
   maxChars: number,
 ): string[] {
   if (Array.isArray(payload)) {
-    return [formatLogField("agent", `payload=[array:${payload.length}]`)];
+    return [format_log_field("agent", `payload=[array:${payload.length}]`)];
   }
   const keys = Object.keys(payload).slice(0, 12).join(",") || "-";
-  return [formatLogField("agent", toInlineLogValue(`payload.keys=${keys}`, maxChars))];
+  return [format_log_field("agent", to_inline_log_value(`payload.keys=${keys}`, maxChars))];
 }
 
 function selectMessagesForIncrementalLog(
@@ -298,11 +298,11 @@ function selectMessagesForIncrementalLog(
 function trimLeadingAssistantMessages(messages: JsonObject[]): JsonObject[] {
   if (!Array.isArray(messages) || messages.length === 0) return [];
   const firstUserIndex = messages.findIndex(
-    (message) => getStringField(message, "role") === "user",
+    (message) => get_string_field(message, "role") === "user",
   );
   if (firstUserIndex <= 0) return messages;
   for (let index = 0; index < firstUserIndex; index += 1) {
-    if (getStringField(messages[index], "role") !== "assistant") {
+    if (get_string_field(messages[index], "role") !== "assistant") {
       return messages;
     }
   }
@@ -310,12 +310,12 @@ function trimLeadingAssistantMessages(messages: JsonObject[]): JsonObject[] {
   return messages.slice(firstUserIndex);
 }
 
-export function parseFetchRequestForLog(
+export function parse_fetch_request_for_log(
   input: string | URL | Request,
   init?: RequestInit,
   opts?: {
     /**
-     * 增量日志 key，通常使用 sessionId。
+     * 增量日志 key，通常使用 session_id。
      */
     incrementalKey?: string;
   },
@@ -351,7 +351,7 @@ export function parseFetchRequestForLog(
   );
 
   const initBody = typeof init?.body === "string" ? init.body : undefined;
-  const payload = safeJsonParse(initBody);
+  const payload = safe_json_parse(initBody);
   if (!payload) {
     if (initBody) {
       return {
@@ -363,17 +363,17 @@ export function parseFetchRequestForLog(
         messages: null,
         system: undefined,
         toolsCount: 0,
-        requestText: formatLogField("agent", "llm.request non-json body"),
+        requestText: format_log_field("agent", "llm.request non-json body"),
         meta: { kind: "llm_request", url, method },
       };
     }
     return null;
   }
 
-  const payloadObject = isJsonObject(payload) ? payload : undefined;
-  const model = payloadObject ? getStringField(payloadObject, "model") : undefined;
-  const system = extractSystemForLog(payloadObject);
-  const messages = payloadObject ? extractMessages(payloadObject) : null;
+  const payloadObject = is_json_object(payload) ? payload : undefined;
+  const model = payloadObject ? get_string_field(payloadObject, "model") : undefined;
+  const system = extract_system_for_log(payloadObject);
+  const messages = payloadObject ? extract_messages(payloadObject) : null;
   const tools = payloadObject ? payloadObject.tools : undefined;
   const toolChoiceRaw = payloadObject
     ? payloadObject.tool_choice ?? payloadObject.toolChoice
@@ -382,11 +382,11 @@ export function parseFetchRequestForLog(
     typeof toolChoiceRaw === "string"
       ? toolChoiceRaw
       : toolChoiceRaw !== undefined
-        ? stringifyCompact(toolChoiceRaw as JsonValue | object, 300)
+        ? stringify_compact(toolChoiceRaw as JsonValue | object, 300)
         : undefined;
   const toolsCount = Array.isArray(tools)
     ? tools.length
-    : isJsonObject(tools)
+    : is_json_object(tools)
       ? Object.keys(tools).length
       : 0;
 
@@ -395,7 +395,7 @@ export function parseFetchRequestForLog(
 
   if (messages && Array.isArray(messages)) {
     const hasSystemMessage = messages.some((item) => {
-      const role = String(getStringField(item, "role") || "")
+      const role = String(get_string_field(item, "role") || "")
         .trim()
         .toLowerCase();
       return role === "system" || role === "developer";
@@ -403,7 +403,7 @@ export function parseFetchRequestForLog(
     if (!hasSystemMessage) {
       const systemText = normalizeSystemTextForLog(system, maxSystemChars).trim();
       if (systemText) {
-        pushLabeledTextBlock(messageTextParts, "system", systemText, maxSystemChars);
+        push_labeled_text_block(messageTextParts, "system", systemText, maxSystemChars);
       }
     }
 
@@ -418,13 +418,13 @@ export function parseFetchRequestForLog(
       maxSystemChars,
     }));
     if (selectedMessages.length === 0) {
-      messageTextParts.push(formatLogField("agent", "no incremental items"));
+      messageTextParts.push(format_log_field("agent", "no incremental items"));
     }
   } else {
     messageTextParts.push(...formatPayloadSummaryLines(payload, maxChars));
   }
   if (messageTextParts.length === 0) {
-    messageTextParts.push(formatLogField("agent", "empty"));
+    messageTextParts.push(format_log_field("agent", "empty"));
   }
 
   return {

package/src/utils/logger/FormatResponse.ts

@@ -8,13 +8,13 @@
 
 import type { JsonObject, JsonValue } from "@/types/common/Json.js";
 import {
-  formatLogField,
-  getArrayField,
-  getObjectField,
-  getStringField,
-  isJsonObject,
-  safeJsonParse,
-  toInlineLogValue,
+  format_log_field,
+  get_array_field,
+  get_object_field,
+  get_string_field,
+  is_json_object,
+  safe_json_parse,
+  to_inline_log_value,
 } from "./FormatShared.js";
 
 interface ProviderResponseLike {
@@ -45,8 +45,8 @@ function pickOutputTypes(output: JsonValue[] | undefined): string[] {
   if (!Array.isArray(output)) return [];
   return output
     .map((item) => {
-      if (!isJsonObject(item)) return "";
-      return getStringField(item, "type") || "";
+      if (!is_json_object(item)) return "";
+      return get_string_field(item, "type") || "";
     })
     .filter((type) => Boolean(type))
     .slice(0, 16);
@@ -56,9 +56,9 @@ function pickFunctionCallNames(output: JsonValue[] | undefined): string[] {
   if (!Array.isArray(output)) return [];
   return output
     .map((item) => {
-      if (!isJsonObject(item)) return "";
-      if (getStringField(item, "type") !== "function_call") return "";
-      return getStringField(item, "name") || "";
+      if (!is_json_object(item)) return "";
+      if (get_string_field(item, "type") !== "function_call") return "";
+      return get_string_field(item, "name") || "";
     })
     .filter((name) => Boolean(name))
     .slice(0, 8);
@@ -69,27 +69,27 @@ function summarizeResponseObjectForLog(
 ): JsonObject {
   if (!responseObject) return {};
 
-  const output = getArrayField(responseObject, "output");
+  const output = get_array_field(responseObject, "output");
   const incompleteDetails =
-    getObjectField(responseObject, "incomplete_details") ||
-    getObjectField(responseObject, "incompleteDetails");
+    get_object_field(responseObject, "incomplete_details") ||
+    get_object_field(responseObject, "incompleteDetails");
   const finishReason =
-    getStringField(responseObject, "finish_reason") ||
-    getStringField(responseObject, "finishReason");
+    get_string_field(responseObject, "finish_reason") ||
+    get_string_field(responseObject, "finishReason");
 
   return {
-    responseId: getStringField(responseObject, "id") || null,
-    responseObjectType: getStringField(responseObject, "object") || null,
+    responseId: get_string_field(responseObject, "id") || null,
+    responseObjectType: get_string_field(responseObject, "object") || null,
     responseFinishReason: finishReason || null,
     responseIncompleteReason:
-      getStringField(incompleteDetails || {}, "reason") || null,
+      get_string_field(incompleteDetails || {}, "reason") || null,
     responseOutputCount: Array.isArray(output) ? output.length : 0,
     responseOutputTypes: pickOutputTypes(output),
     responseFunctionCallNames: pickFunctionCallNames(output),
   };
 }
 
-function summarizeSseBodyForLog(bodyText: string): JsonObject {
+function summarizeSseBodyForLog(body_text: string): JsonObject {
   const eventTypes: string[] = [];
   const streamedOutputTypes: string[] = [];
   const functionCallNames: string[] = [];
@@ -111,23 +111,23 @@ function summarizeSseBodyForLog(bodyText: string): JsonObject {
       return;
     }
 
-    const parsed = safeJsonParse(rawData);
-    if (parsed && isJsonObject(parsed)) {
-      const explicitType = getStringField(parsed, "type");
+    const parsed = safe_json_parse(rawData);
+    if (parsed && is_json_object(parsed)) {
+      const explicitType = get_string_field(parsed, "type");
       const eventLabel = currentEvent || explicitType || "message";
       eventTypes.push(eventLabel);
 
-      const nestedResponse = getObjectField(parsed, "response");
+      const nestedResponse = get_object_field(parsed, "response");
       if (nestedResponse) {
         lastResponseObject = nestedResponse;
       }
 
-      const nestedItem = getObjectField(parsed, "item");
-      const itemType = getStringField(nestedItem || {}, "type");
+      const nestedItem = get_object_field(parsed, "item");
+      const itemType = get_string_field(nestedItem || {}, "type");
       if (itemType && !streamedOutputTypes.includes(itemType)) {
         streamedOutputTypes.push(itemType);
       }
-      const functionName = getStringField(nestedItem || {}, "name");
+      const functionName = get_string_field(nestedItem || {}, "name");
       if (
         itemType === "function_call" &&
         functionName &&
@@ -136,7 +136,7 @@ function summarizeSseBodyForLog(bodyText: string): JsonObject {
         functionCallNames.push(functionName);
       }
 
-      const directOutput = getArrayField(parsed, "output");
+      const directOutput = get_array_field(parsed, "output");
       for (const outputType of pickOutputTypes(directOutput)) {
         if (!streamedOutputTypes.includes(outputType)) {
           streamedOutputTypes.push(outputType);
@@ -153,7 +153,7 @@ function summarizeSseBodyForLog(bodyText: string): JsonObject {
     currentEvent = "";
   };
 
-  for (const rawLine of String(bodyText || "").split(/\r?\n/)) {
+  for (const rawLine of String(body_text || "").split(/\r?\n/)) {
     const line = String(rawLine || "");
     if (!line.trim()) {
       flushEvent();
@@ -178,7 +178,7 @@ function summarizeSseBodyForLog(bodyText: string): JsonObject {
   };
 }
 
-export async function parseFetchResponseForLog(
+export async function parse_fetch_response_for_log(
   response: ProviderResponseLike,
   opts?: {
     /**
@@ -196,16 +196,16 @@ export async function parseFetchResponseForLog(
 }> {
   const maxBodyPreviewChars = 2000;
   const contentType = String(response.headers.get("content-type") || "").trim();
-  let bodyText = "";
+  let body_text = "";
 
   try {
-    bodyText = await response.text();
+    body_text = await response.text();
   } catch (error) {
     const errorText = String(error || "unknown_error");
     return {
-      responseText: formatLogField(
+      responseText: format_log_field(
         "agent",
-        toInlineLogValue(
+        to_inline_log_value(
           `llm.response status=${response.status} ok=${response.ok} contentType=${contentType || "-"} body_read_error=${errorText}`,
           maxBodyPreviewChars,
         ),
@@ -224,29 +224,29 @@ export async function parseFetchResponseForLog(
 
   let responseSummary: JsonObject = {};
   if (contentType.includes("application/json")) {
-    const parsed = safeJsonParse(bodyText);
-    if (parsed && isJsonObject(parsed)) {
-      const nestedResponse = getObjectField(parsed, "response");
+    const parsed = safe_json_parse(body_text);
+    if (parsed && is_json_object(parsed)) {
+      const nestedResponse = get_object_field(parsed, "response");
       responseSummary = summarizeResponseObjectForLog(
         nestedResponse || parsed,
       );
     }
   } else if (contentType.includes("text/event-stream")) {
-    responseSummary = summarizeSseBodyForLog(bodyText);
+    responseSummary = summarizeSseBodyForLog(body_text);
   }
 
-  const preview = toInlineLogValue(bodyText, maxBodyPreviewChars);
+  const preview = to_inline_log_value(body_text, maxBodyPreviewChars);
   const responseTextParts = [
-    formatLogField(
+    format_log_field(
       "agent",
-      toInlineLogValue(
+      to_inline_log_value(
         `llm.response status=${response.status} ok=${response.ok} contentType=${contentType || "-"}`,
         maxBodyPreviewChars,
       ),
     ),
   ];
   if (preview) {
-    responseTextParts.push(formatLogField("response_body", preview));
+    responseTextParts.push(format_log_field("response_body", preview));
   }
 
   return {
@@ -258,7 +258,7 @@ export async function parseFetchResponseForLog(
       ...(contentType ? { contentType } : {}),
       ...(opts?.url ? { url: opts.url } : {}),
       ...(opts?.method ? { method: opts.method } : {}),
-      responseBodyLength: bodyText.length,
+      responseBodyLength: body_text.length,
       ...responseSummary,
     },
   };