@downcity/agent 1.1.337 → 1.1.399

package/bin/executor/messages/SessionAttachmentMapper.js

@@ -1,255 +1,24 @@
 /**
- * SessionAttachmentMapper：把 `<file>` 附件描述映射为模型可消费的 file parts。
+ * Session 附件持久化模块。
  *
- * 关键点（中文）
- * - 兼容 Telegram / Feishu / TUI 等统一的 `<file>` 协议入口。
- * - Data URL 附件先由 Session Attachment Store 落盘，Message 只保存文件路径。
- * - 模型执行阶段再读取本地文件，并转换为模型可消费的数据格式。
- * - 历史中的相对路径与旧版 `file://` 会在喂给模型前临时 hydrate。
- *
- * 输入到输出（中文）：
- * `file.url = data:<media-type>;base64,...`
- *   → Session Attachment Store 解码并写入附件文件
- *   → `file.url = .downcity/.../attachments/att_<id>.<ext>`
- *   → Message 持久化路径引用
- *   → 模型执行前读取文件并恢复为 Data URL
- *   → `convertToModelMessages()` 生成最终 ModelMessage。
- */
-import fs from "fs-extra";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import { isFileUIPart, isTextUIPart, } from "ai";
-import { parse_chat_message_markup } from "../../executor/messages/ChatMessageMarkup.js";
-/**
- * 从 `<file>` 标签中解析附件描述。
- */
-function parseAttachmentLinesFromText(text) {
-    const raw = String(text || "");
-    if (!raw.trim())
-        return [];
-    return parse_chat_message_markup(raw).files.map((file) => ({
-        type: file.type,
-        path: file.path,
-        ...(typeof file.caption === "string" && file.caption.trim()
-            ? { caption: file.caption.trim() }
-            : {}),
-    }));
-}
-function guessAttachmentMediaTypeFromPath(filePath) {
-    const ext = (path.extname(filePath) || "").toLowerCase();
-    if (ext === ".png")
-        return "image/png";
-    if (ext === ".jpg" || ext === ".jpeg")
-        return "image/jpeg";
-    if (ext === ".webp")
-        return "image/webp";
-    if (ext === ".gif")
-        return "image/gif";
-    if (ext === ".pdf")
-        return "application/pdf";
-    if (ext === ".zip")
-        return "application/zip";
-    if (ext === ".mp3")
-        return "audio/mpeg";
-    if (ext === ".m4a")
-        return "audio/mp4";
-    if (ext === ".ogg")
-        return "audio/ogg";
-    if (ext === ".opus")
-        return "audio/opus";
-    if (ext === ".mp4")
-        return "video/mp4";
-    if (ext === ".mov")
-        return "video/quicktime";
-    if (ext === ".webm")
-        return "video/webm";
-    if (ext === ".m4v")
-        return "video/x-m4v";
-    return undefined;
-}
-function buildDataUrl(mediaType, buffer) {
-    const base64 = buffer.toString("base64");
-    const safeType = mediaType || "application/octet-stream";
-    return `data:${safeType};base64,${base64}`;
-}
-function resolveHydratableFilePath(project_root, rawPath) {
-    const raw = String(rawPath || "").trim();
-    if (!raw || raw.startsWith("data:") || /^https?:\/\//i.test(raw))
-        return null;
-    if (raw.startsWith("file://"))
-        return fileURLToPath(raw);
-    if (path.isAbsolute(raw))
-        return path.resolve(raw);
-    const root = path.resolve(String(project_root || "").trim() || process.cwd());
-    const absPath = path.resolve(root, raw);
-    const rel = path.relative(root, absPath);
-    if (rel === "" || rel.startsWith("..") || path.isAbsolute(rel))
-        return null;
-    return absPath;
-}
-async function hydrateFileUrlPart(part, project_root) {
-    const url = String(part.url || "").trim();
-    const filePath = resolveHydratableFilePath(project_root, url);
-    if (!filePath)
-        return part;
-    try {
-        const buffer = await fs.readFile(filePath);
-        const mediaType = String(part.mediaType || "").trim() ||
-            guessAttachmentMediaTypeFromPath(filePath) ||
-            "application/octet-stream";
-        return {
-            ...part,
-            mediaType,
-            url: buildDataUrl(mediaType, buffer),
-        };
-    }
-    catch {
-        return part;
-    }
-}
-/**
- * 在用户 prompt 入库前，将 Data URL file part 保存为 Session 附件路径。
- *
- * 关键点（中文）
- * - 只有 Data URL 会在此处落盘；远程 URL 和本地路径保持引用不变。
- * - 附件成功落盘后才把 URL 替换为相对 Workspace 根目录的路径。
- * - canonical filename 保留调用侧传入的用户可见文件名；真实落盘路径只写入 url。
+ * 本模块只负责在 User Message 入库前把 Data URL 写入 Session Attachment Store。
+ * 模型执行阶段的文件读取与 `ModelFileContent` 转换由 `SessionModelMessages` 负责。
  */
+/** 在用户 prompt 入库前持久化 Data URL 文件。 */
 export async function persist_user_prompt_file_parts(parts, attachment_store) {
-    if (!Array.isArray(parts) || parts.length === 0)
-        return [];
-    const out = [];
+    const output = [];
     for (const part of parts) {
-        if (!isFileUIPart(part)) {
-            out.push(part);
-            continue;
-        }
-        const file_part = part;
-        const url = String(file_part.url || "").trim();
-        if (!url.startsWith("data:")) {
-            out.push(part);
+        if (part.type !== "file" || !part.url.startsWith("data:")) {
+            output.push(part);
             continue;
         }
         const stored_path = await attachment_store.persist_data_url({
-            data_url: url,
-            media_type: String(file_part.mediaType || "").trim(),
-            ...(file_part.filename ? { filename: file_part.filename } : {}),
-        });
-        out.push({ ...file_part, url: stored_path });
-    }
-    return out;
-}
-/**
- * 将历史中的本地 file part 临时转换为模型可消费的 data URL。
- *
- * 关键点（中文）
- * - 该函数只修改本轮内存消息，不回写历史。
- * - 新历史保留 Agent 根目录相对路径，旧历史的 `file://` 仍继续兼容。
- */
-export async function hydrate_file_url_parts_for_model(messages, project_root) {
-    if (!Array.isArray(messages) || messages.length === 0)
-        return messages;
-    const out = [];
-    for (const message of messages) {
-        const parts = Array.isArray(message?.parts) ? message.parts : [];
-        if (!parts.some((part) => isFileUIPart(part))) {
-            out.push(message);
-            continue;
-        }
-        const nextParts = [];
-        let changed = false;
-        for (const part of parts) {
-            if (!isFileUIPart(part)) {
-                nextParts.push(part);
-                continue;
-            }
-            const nextPart = await hydrateFileUrlPart(part, project_root);
-            if (nextPart !== part)
-                changed = true;
-            nextParts.push(nextPart);
-        }
-        out.push(changed ? { ...message, parts: nextParts } : message);
-    }
-    return out;
-}
-/**
- * 在 user 消息上注入 FileUIPart，以便多模态模型直接消费本地附件。
- */
-export async function inject_file_parts_from_attachments(messages, project_root) {
-    if (!Array.isArray(messages) || messages.length === 0)
-        return messages;
-    const root = path.resolve(String(project_root || "").trim() || process.cwd());
-    const out = [];
-    for (const message of messages) {
-        if (!message || typeof message !== "object" || message.role !== "user") {
-            out.push(message);
-            continue;
-        }
-        const parts = Array.isArray(message.parts) ? message.parts : [];
-        if (parts.length === 0) {
-            out.push(message);
-            continue;
-        }
-        if (parts.some((part) => isFileUIPart(part))) {
-            out.push(message);
-            continue;
-        }
-        const fullText = parts
-            .map((part) => {
-            const candidate = part;
-            if (!isTextUIPart(candidate))
-                return "";
-            const value = candidate.text;
-            return typeof value === "string" ? value : "";
-        })
-            .filter((text) => text)
-            .join("\n");
-        if (!fullText.trim()) {
-            out.push(message);
-            continue;
-        }
-        const attachments = parseAttachmentLinesFromText(fullText);
-        if (attachments.length === 0) {
-            out.push(message);
-            continue;
-        }
-        const fileParts = [];
-        for (const attachment of attachments) {
-            const mediaTypeGuess = guessAttachmentMediaTypeFromPath(attachment.path);
-            if (!mediaTypeGuess ||
-                (!mediaTypeGuess.startsWith("image/") && mediaTypeGuess !== "application/pdf")) {
-                continue;
-            }
-            const absPath = path.isAbsolute(attachment.path)
-                ? attachment.path
-                : path.resolve(root, attachment.path);
-            try {
-                const exists = await fs.pathExists(absPath);
-                if (!exists)
-                    continue;
-                const buffer = await fs.readFile(absPath);
-                const dataUrl = buildDataUrl(mediaTypeGuess, buffer);
-                const filename = path.basename(absPath) || "image";
-                fileParts.push({
-                    type: "file",
-                    mediaType: mediaTypeGuess,
-                    filename,
-                    url: dataUrl,
-                });
-            }
-            catch {
-                continue;
-            }
-        }
-        if (fileParts.length === 0) {
-            out.push(message);
-            continue;
-        }
-        out.push({
-            ...message,
-            parts: [...parts, ...fileParts],
+            data_url: part.url,
+            media_type: part.media_type,
+            ...(part.filename ? { filename: part.filename } : {}),
         });
+        output.push({ ...part, url: stored_path });
     }
-    return out;
+    return output;
 }
 //# sourceMappingURL=SessionAttachmentMapper.js.map

package/bin/executor/messages/SessionAttachmentMapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionAttachmentMapper.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionAttachmentMapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SessionAttachmentMapper.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionAttachmentMapper.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,qCAAqC;AACrC,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAClD,KAA0B,EAC1B,gBAAwC;IAExC,MAAM,MAAM,GAAwB,EAAE,CAAC;IACvC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAClB,SAAS;QACX,CAAC;QACD,MAAM,WAAW,GAAG,MAAM,gBAAgB,CAAC,gBAAgB,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,GAAG;YAClB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtD,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/bin/executor/messages/SessionMessageLog.d.ts

@@ -1,19 +1,12 @@
 /**
- * SessionMessageLog：assistant 消息日志提取与输出辅助模块。
+ * Canonical Assistant Part 日志输出辅助。
  *
- * 关键点（中文）
- * - 只负责从 session message 中提取可读文本。
- * - 只负责把最终 assistant 文本稳定写入统一 logger。
- * - 不参与模型消息转换，也不感知附件注入逻辑。
+ * 该模块只提取可见文本并写入统一 Logger，不参与协议转换或持久化。
  */
+import type { SessionAssistantMessagePart } from "../../types/session/SessionMessage.js";
 import type { Logger } from "../../utils/logger/Logger.js";
-import type { SessionMessageRecordV1 } from "../../executor/types/SessionRecords.js";
-/**
- * 从 UI message 中提取 assistant 文本部分。
- */
-export declare function extract_assistant_text_for_log(message: SessionMessageRecordV1): string;
-/**
- * 立即输出 assistant 文本日志。
- */
-export declare function log_assistant_message_now(logger: Logger, message: SessionMessageRecordV1): Promise<void>;
+/** 从 canonical Assistant Parts 提取可见文本。 */
+export declare function extract_assistant_text_for_log(parts: readonly SessionAssistantMessagePart[]): string;
+/** 立即输出 Assistant 文本日志。 */
+export declare function log_assistant_message_now(logger: Logger, parts: readonly SessionAssistantMessagePart[]): Promise<void>;
 //# sourceMappingURL=SessionMessageLog.d.ts.map

package/bin/executor/messages/SessionMessageLog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageLog.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEjF;;GAEG;AACH,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,sBAAsB,GAC9B,MAAM,CAOR;AAED;;GAEG;AACH,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,sBAAsB,GAC9B,OAAO,CAAC,IAAI,CAAC,CAOf"}
+{"version":3,"file":"SessionMessageLog.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAEvD,0CAA0C;AAC1C,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,SAAS,2BAA2B,EAAE,GAC5C,MAAM,CAKR;AAED,2BAA2B;AAC3B,wBAAsB,yBAAyB,CAC7C,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,SAAS,2BAA2B,EAAE,GAC5C,OAAO,CAAC,IAAI,CAAC,CAIf"}

package/bin/executor/messages/SessionMessageLog.js

@@ -1,34 +1,19 @@
 /**
- * SessionMessageLog：assistant 消息日志提取与输出辅助模块。
+ * Canonical Assistant Part 日志输出辅助。
  *
- * 关键点（中文）
- * - 只负责从 session message 中提取可读文本。
- * - 只负责把最终 assistant 文本稳定写入统一 logger。
- * - 不参与模型消息转换，也不感知附件注入逻辑。
+ * 该模块只提取可见文本并写入统一 Logger，不参与协议转换或持久化。
  */
-import { isTextUIPart } from "ai";
-/**
- * 从 UI message 中提取 assistant 文本部分。
- */
-export function extract_assistant_text_for_log(message) {
-    if (!Array.isArray(message.parts))
-        return "";
-    return message.parts
-        .filter(isTextUIPart)
-        .map((part) => String(part.text ?? ""))
+/** 从 canonical Assistant Parts 提取可见文本。 */
+export function extract_assistant_text_for_log(parts) {
+    return parts
+        .flatMap((part) => part.type === "text" ? [part.text] : [])
         .join("\n")
         .trim();
 }
-/**
- * 立即输出 assistant 文本日志。
- */
-export async function log_assistant_message_now(logger, message) {
-    const text = extract_assistant_text_for_log(message) || "-";
-    const normalized = text.replace(/\r\n/g, "\n");
-    const lines = normalized.split("\n");
-    const out = [`[assistant] ${lines[0] || "-"}`];
-    if (lines.length > 1)
-        out.push(...lines.slice(1));
-    await logger.log("info", out.join("\n"));
+/** 立即输出 Assistant 文本日志。 */
+export async function log_assistant_message_now(logger, parts) {
+    const text = extract_assistant_text_for_log(parts) || "-";
+    const lines = text.replace(/\r\n/gu, "\n").split("\n");
+    await logger.log("info", [`[assistant] ${lines[0] || "-"}`, ...lines.slice(1)].join("\n"));
 }
 //# sourceMappingURL=SessionMessageLog.js.map

package/bin/executor/messages/SessionMessageLog.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionMessageLog.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,IAAI,CAAC;AAIlC;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAC5C,OAA+B;IAE/B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7C,OAAO,OAAO,CAAC,KAAK;SACjB,MAAM,CAAC,YAAY,CAAC;SACpB,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;SACtC,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,OAA+B;IAE/B,MAAM,IAAI,GAAG,8BAA8B,CAAC,OAAO,CAAC,IAAI,GAAG,CAAC;IAC5D,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,GAAG,GAAG,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;IAC/C,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAClD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC"}
+{"version":3,"file":"SessionMessageLog.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionMessageLog.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,0CAA0C;AAC1C,MAAM,UAAU,8BAA8B,CAC5C,KAA6C;IAE7C,OAAO,KAAK;SACT,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1D,IAAI,CAAC,IAAI,CAAC;SACV,IAAI,EAAE,CAAC;AACZ,CAAC;AAED,2BAA2B;AAC3B,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,MAAc,EACd,KAA6C;IAE7C,MAAM,IAAI,GAAG,8BAA8B,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;IAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACvD,MAAM,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,eAAe,KAAK,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7F,CAAC"}

package/bin/executor/messages/SessionModelMessages.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Canonical Session Message 到 Downcity ModelMessage 的转换模块。
+ *
+ * SessionMessage 是持久化事实，ModelMessage 是模型上下文。该模块是两者之间的唯一转换边界，
+ * 不经过 UI Message、Executor Record 或 Provider 私有格式。
+ */
+import type { ModelMessage } from "@downcity/type";
+import type { SessionMessage } from "../../types/session/SessionMessage.js";
+import type { SessionContextSnapshot } from "../../types/session/SessionSegment.js";
+/** 把完整 Session 上下文快照转换为模型消息。 */
+export declare function session_context_to_model_messages(snapshot: Readonly<SessionContextSnapshot>, project_root?: string): Promise<ModelMessage[]>;
+/** 把一组 canonical Session Message 转换为模型消息。 */
+export declare function session_messages_to_model_messages(messages: readonly SessionMessage[], project_root?: string): Promise<ModelMessage[]>;
+//# sourceMappingURL=SessionModelMessages.d.ts.map

package/bin/executor/messages/SessionModelMessages.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionModelMessages.d.ts","sourceRoot":"","sources":["../../../src/executor/messages/SessionModelMessages.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,KAAK,EAIV,YAAY,EACb,MAAM,gBAAgB,CAAC;AAExB,OAAO,KAAK,EAGV,cAAc,EAGf,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAEhF,gCAAgC;AAChC,wBAAsB,iCAAiC,CACrD,QAAQ,EAAE,QAAQ,CAAC,sBAAsB,CAAC,EAC1C,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAazB;AAED,6CAA6C;AAC7C,wBAAsB,kCAAkC,CACtD,QAAQ,EAAE,SAAS,cAAc,EAAE,EACnC,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,YAAY,EAAE,CAAC,CAUzB"}

package/bin/executor/messages/SessionModelMessages.js

@@ -0,0 +1,187 @@
+/**
+ * Canonical Session Message 到 Downcity ModelMessage 的转换模块。
+ *
+ * SessionMessage 是持久化事实，ModelMessage 是模型上下文。该模块是两者之间的唯一转换边界，
+ * 不经过 UI Message、Executor Record 或 Provider 私有格式。
+ */
+import fs from "fs-extra";
+import path from "node:path";
+import { parse_chat_message_markup } from "./ChatMessageMarkup.js";
+/** 把完整 Session 上下文快照转换为模型消息。 */
+export async function session_context_to_model_messages(snapshot, project_root) {
+    const messages = await session_messages_to_model_messages(snapshot.messages, project_root);
+    if (!snapshot.summary?.text.trim())
+        return messages;
+    return [
+        {
+            role: "assistant",
+            content: [{ type: "text", text: snapshot.summary.text }],
+        },
+        ...messages,
+    ];
+}
+/** 把一组 canonical Session Message 转换为模型消息。 */
+export async function session_messages_to_model_messages(messages, project_root) {
+    const output = [];
+    for (const message of messages) {
+        if (message.type === "user") {
+            output.push(...await convert_user_message(message, project_root));
+        }
+        else if (message.type === "assistant") {
+            output.push(...convert_assistant_message(message));
+        }
+    }
+    return output;
+}
+/** 把单条 canonical User Message 转换为模型消息。 */
+async function convert_user_message(message, project_root) {
+    const content = [];
+    const has_explicit_file = message.parts.some((part) => part.type === "file");
+    for (const part of message.parts) {
+        if (part.type === "text" && part.text.trim()) {
+            content.push({ type: "text", text: part.text });
+        }
+        else if (part.type === "file") {
+            content.push(await convert_file_part(part, project_root));
+        }
+    }
+    if (!has_explicit_file) {
+        content.push(...await read_markup_files(message, project_root));
+    }
+    return content.length > 0 ? [{ role: "user", content }] : [];
+}
+/** 把单条 canonical Assistant Message 转换为 assistant 与 tool 消息。 */
+function convert_assistant_message(message) {
+    const content = [];
+    const tool_results = [];
+    for (const part of message.parts) {
+        if (part.type === "text" && part.text.trim()) {
+            content.push({ type: "text", text: part.text });
+        }
+        else if (part.type === "reasoning" && part.text.trim()) {
+            content.push({
+                type: "reasoning",
+                text: part.text,
+                ...(part.reasoning_signature
+                    ? { signature: part.reasoning_signature }
+                    : {}),
+            });
+        }
+        else if (part.type === "tool" && part.input !== undefined) {
+            append_tool_content(part, content, tool_results);
+        }
+    }
+    return [
+        ...(content.length > 0 ? [{ role: "assistant", content }] : []),
+        ...(tool_results.length > 0
+            ? [{ role: "tool", content: tool_results }]
+            : []),
+    ];
+}
+/** 把 canonical Tool Part 投影为模型工具调用和可选工具结果。 */
+function append_tool_content(part, content, tool_results) {
+    content.push({
+        type: "tool_call",
+        tool_call_id: part.tool_call_id,
+        tool_name: part.tool_name,
+        input: part.input ?? null,
+    });
+    if (part.state !== "completed" && part.state !== "failed")
+        return;
+    tool_results.push({
+        type: "tool_result",
+        tool_call_id: part.tool_call_id,
+        tool_name: part.tool_name,
+        outcome: part.state === "completed" ? "succeeded" : "failed",
+        content: [{
+                type: "json",
+                value: to_model_json_value(part.output ?? part.error ?? null),
+            }],
+    });
+}
+/** 把 Session 文件引用转换为单一来源的模型文件。 */
+async function convert_file_part(part, project_root) {
+    const data_match = /^data:[^;,]+;base64,(.*)$/isu.exec(part.url);
+    if (data_match) {
+        return build_model_file(part, {
+            type: "base64",
+            data: data_match[1] ?? "",
+        });
+    }
+    if (/^https?:\/\//iu.test(part.url)) {
+        return build_model_file(part, { type: "url", url: part.url });
+    }
+    const file_path = resolve_local_file_path(part.url, project_root);
+    const data = (await fs.readFile(file_path)).toString("base64");
+    return build_model_file(part, { type: "base64", data });
+}
+/** 构造标准模型文件内容。 */
+function build_model_file(part, source) {
+    return {
+        type: "file",
+        media_type: part.media_type,
+        source,
+        ...(part.filename ? { filename: part.filename } : {}),
+    };
+}
+/** 解析兼容聊天入口写入文本中的附件标记。 */
+async function read_markup_files(message, project_root) {
+    const text = message.parts
+        .filter((part) => part.type === "text")
+        .map((part) => part.text)
+        .join("\n");
+    const output = [];
+    for (const file of parse_chat_message_markup(text).files) {
+        const media_type = guess_media_type(file.path);
+        if (!media_type || (!media_type.startsWith("image/") && media_type !== "application/pdf")) {
+            continue;
+        }
+        const file_path = resolve_local_file_path(file.path, project_root);
+        if (!await fs.pathExists(file_path))
+            continue;
+        output.push({
+            type: "file",
+            media_type,
+            source: {
+                type: "base64",
+                data: (await fs.readFile(file_path)).toString("base64"),
+            },
+            filename: path.basename(file_path),
+        });
+    }
+    return output;
+}
+/** 把本地文件引用限制在项目根目录内，绝对附件路径保持可读。 */
+function resolve_local_file_path(raw_path, project_root) {
+    if (path.isAbsolute(raw_path))
+        return path.resolve(raw_path);
+    const root = path.resolve(String(project_root || "").trim() || process.cwd());
+    const file_path = path.resolve(root, raw_path);
+    const relative_path = path.relative(root, file_path);
+    if (relative_path.startsWith("..") || path.isAbsolute(relative_path)) {
+        throw new Error(`Session file escapes project root: ${raw_path}`);
+    }
+    return file_path;
+}
+/** 根据文件扩展名解析模型可用的 MIME type。 */
+function guess_media_type(file_path) {
+    const extension = path.extname(file_path).toLowerCase();
+    if (extension === ".png")
+        return "image/png";
+    if (extension === ".jpg" || extension === ".jpeg")
+        return "image/jpeg";
+    if (extension === ".webp")
+        return "image/webp";
+    if (extension === ".gif")
+        return "image/gif";
+    if (extension === ".pdf")
+        return "application/pdf";
+    return undefined;
+}
+/** 将未知值限制为可传输 JSON。 */
+function to_model_json_value(value) {
+    if (value === undefined)
+        return null;
+    return JSON.parse(JSON.stringify(value));
+}
+//# sourceMappingURL=SessionModelMessages.js.map

package/bin/executor/messages/SessionModelMessages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SessionModelMessages.js","sourceRoot":"","sources":["../../../src/executor/messages/SessionModelMessages.ts"],"names":[],"mappings":"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"}

package/bin/executor/model/ModelGenerate.d.ts

@@ -0,0 +1,22 @@
+/**
+ * Downcity ModelClient 非交互生成辅助模块。
+ *
+ * 标题、压缩和调度等旁路复用同一标准协议，不建立第二套模型运行时。
+ */
+import type { ModelCall, ModelClient, ModelFinishReason, ModelMessage, ModelToolCallContent, ModelUsage } from "@downcity/type";
+/** 单次非交互模型生成结果。 */
+export interface ModelGenerateResult {
+    /** 聚合后的普通文本。 */
+    text: string;
+    /** 聚合后的工具调用。 */
+    tool_calls: ModelToolCallContent[];
+    /** 标准完成原因。 */
+    finish_reason: ModelFinishReason;
+    /** Provider 返回的可选 usage。 */
+    usage?: ModelUsage;
+}
+/** 执行一次不包含 Agent 工具循环的模型调用。 */
+export declare function generate_model(model: ModelClient, call: ModelCall, signal?: AbortSignal): Promise<ModelGenerateResult>;
+/** 构造单轮 system + user 文本消息。 */
+export declare function build_text_model_messages(system: string, prompt: string): ModelMessage[];
+//# sourceMappingURL=ModelGenerate.d.ts.map

package/bin/executor/model/ModelGenerate.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ModelGenerate.d.ts","sourceRoot":"","sources":["../../../src/executor/model/ModelGenerate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,SAAS,EACT,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,oBAAoB,EACpB,UAAU,EACX,MAAM,gBAAgB,CAAC;AAGxB,mBAAmB;AACnB,MAAM,WAAW,mBAAmB;IAClC,gBAAgB;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,UAAU,EAAE,oBAAoB,EAAE,CAAC;IACnC,cAAc;IACd,aAAa,EAAE,iBAAiB,CAAC;IACjC,4BAA4B;IAC5B,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB;AAED,+BAA+B;AAC/B,wBAAsB,cAAc,CAClC,KAAK,EAAE,WAAW,EAClB,IAAI,EAAE,SAAS,EACf,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,mBAAmB,CAAC,CA2B9B;AAED,+BAA+B;AAC/B,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,YAAY,EAAE,CAOxF"}