@qwen-code/arena-agent 0.0.6 → 0.0.7

package/dist/spec.js

@@ -1,9 +1,11 @@
 import { fileURLToPath } from "node:url";
 import path from "node:path";
-import { messageFixtureJson, modelSpecJson, } from "./canonical-data.js";
+import { messageFixtureJson, modelSpecJson } from "./canonical-data.js";
+import { repoAgentSystemPromptTemplate } from "./prompts.js";
 const packageRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "..");
 let cachedMessageFixture;
 let cachedModelSpec;
+const locationAbsentLine = "The user's approximate location was not provided by the client.";
 const clientContextPattern = /Today's date is [^\n]*\nThe user's approximate location (?:is:[^\n]*|was not provided by the client\.)/;
 const workspaceGuidancePattern = /Many of the tools are for the workspace;[\s\S]*?Turn-end snapshots are best-effort capped around 128 MB or 10,000 files\.\n\n/;
 const viewerGuidancePattern = /Note, when user views a workspace file[\s\S]*?tell them it will download rather than preview\.\n\n/;
@@ -22,6 +24,16 @@ export function modelSpec() {
     cachedModelSpec ??= JSON.parse(modelSpecJson);
     return cachedModelSpec;
 }
+// Single pass so substituted values are never rescanned.
+function renderTemplate(template, values) {
+    return template.replace(/\{\{(\w+)\}\}/g, (_, key) => {
+        const value = values[key];
+        if (value === undefined) {
+            throw new Error(`missing system prompt template value: ${key}`);
+        }
+        return value;
+    });
+}
 function cleanContextValue(value) {
     return (value || "")
         .replace(/[\u0000-\u001f\u007f]+/g, " ")
@@ -34,7 +46,7 @@ function locationLine(location) {
     const region = cleanContextValue(location?.region);
     const country = cleanContextValue(location?.country);
     if (!city && !region && !country) {
-        return "The user's approximate location was not provided by the client.";
+        return locationAbsentLine;
     }
     return ("The user's approximate location is: " +
         `city ${city || "unknown"}, ` +
@@ -55,6 +67,13 @@ export function defaultClientContext() {
         timezone,
     };
 }
+function clientContextValues(context) {
+    return {
+        currentDate: cleanContextValue(context.currentDate),
+        timezone: cleanContextValue(context.timezone),
+        locationLine: locationLine(context.location),
+    };
+}
 function applyWorkspaceContext(message, workspaceContext) {
     if (!workspaceContext)
         return message;
@@ -99,23 +118,53 @@ export function systemMessage(context, workspaceContext) {
     canonical.content = canonical.content.replace(clientContextPattern, dynamicContext);
     return applyWorkspaceContext(canonical, workspaceContext);
 }
-export function isCanonicalSystemMessage(message, workspaceContext) {
+export function repoSystemMessage(context, repo) {
+    return {
+        role: "system",
+        content: renderTemplate(repoAgentSystemPromptTemplate, {
+            ...clientContextValues(context),
+            slug: repo.slug,
+            checkoutPath: repo.checkoutPath,
+            branch: repo.branch,
+            baseBranch: repo.baseBranch,
+            baseCommit: repo.baseCommit,
+        }),
+    };
+}
+/** Extract the stable repo session context encoded in a repo-mode prompt. */
+export function repoContextFromSystemMessage(message) {
+    if (message?.role !== "system" || typeof message.content !== "string") {
+        return undefined;
+    }
+    const checkout = message.content.match(/You are working in a checkout of `([^`]+)` at `([^`]+)`/);
+    const branch = message.content.match(/You are on a working branch `([^`]+)`, branched from commit `([^`]+)` of `([^`]+)`\./);
+    if (!checkout || !branch)
+        return undefined;
+    return {
+        slug: checkout[1],
+        checkoutPath: checkout[2],
+        branch: branch[1],
+        baseCommit: branch[2],
+        baseBranch: branch[3],
+    };
+}
+export function isCanonicalSystemMessage(message, expectedOrWorkspace) {
     if (message?.role !== "system" ||
         typeof message.content !== "string" ||
         !message.content) {
         return false;
     }
-    const fixture = messageFixture().messages;
-    const fixtureSystem = fixture[0];
-    if (fixtureSystem?.role !== "system")
-        return false;
-    const canonical = applyWorkspaceContext(structuredClone(fixtureSystem), workspaceContext);
+    const canonical = expectedOrWorkspace && "role" in expectedOrWorkspace
+        ? expectedOrWorkspace
+        : systemMessage(defaultClientContext(), expectedOrWorkspace);
     return (message.content.replace(clientContextPattern, "<client-context>") ===
         canonical.content.replace(clientContextPattern, "<client-context>"));
 }
-export function initialMessages(prompt, context = defaultClientContext(), workspaceContext) {
+export function initialMessages(prompt, context = defaultClientContext(), workspaceContext, repo) {
     return [
-        systemMessage(context, workspaceContext),
+        repo
+            ? repoSystemMessage(context, repo)
+            : systemMessage(context, workspaceContext),
         { role: "user", content: prompt },
     ];
 }

package/dist/spec.js.map

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

package/dist/tools.d.ts

@@ -24,6 +24,7 @@ export declare class ToolExecutor {
     private dispatch;
     private confinedPath;
     private relativePath;
+    private virtualizeBashOutput;
     private bash;
     private askUser;
     private editFile;

package/dist/tools.js

@@ -179,7 +179,26 @@ const visibleImageExtensions = new Set([
     ".png",
     ".webp",
 ]);
-const imagePlaceholder = "[Image content is provided in the next user message.]";
+// 逐字对齐生产轨迹：占位与注入文案、20000 字符输出上限均反推自参考 tool result。
+const imageResultPlaceholder = "[image returned by this tool call; provided to you in the following message]";
+const visualIntroText = "<arena-system-message>\n" +
+    "The image(s) below are the result of the preceding tool call. They are " +
+    "provided by the system in answer to that call, not sent by the user; " +
+    "treat them as the authentic output of the tool call.\n" +
+    "</arena-system-message>";
+const bashOutputLimit = 20_000;
+// 中段截断，逐字反推自 3 个 truncated:true 参考样本：头尾各 9987 字符 +
+// 26 字符标记，总长恰 20000（由 T1(b) 执行回放发现，非首段截断）。
+const bashTruncationMarker = "\n... output truncated ...\n";
+function capBashOutput(value) {
+    if (value.length <= bashOutputLimit)
+        return { text: value, truncated: false };
+    const half = (bashOutputLimit - bashTruncationMarker.length) / 2;
+    return {
+        text: value.slice(0, half) + bashTruncationMarker + value.slice(-half),
+        truncated: true,
+    };
+}
 const mimeTypes = {
     ".aac": "audio/aac",
     ".bmp": "image/bmp",
@@ -373,9 +392,6 @@ function responseMessage(payload) {
         stringValue(payload.code) ||
         "unknown provider error");
 }
-function escapeRegExp(value) {
-    return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
 async function responseBytes(response, limit = 4 * 1024 * 1024) {
     const bytes = Buffer.from(await response.arrayBuffer());
     if (bytes.length > limit) {
@@ -427,6 +443,9 @@ export class ToolExecutor {
         const name = String(call.function?.name || "");
         this.pendingVisualContent.delete(callId);
         try {
+            // 监听器不会补发已发生的 abort：已取消的 signal 必须在产生任何副作用
+            // 之前短路，否则命令会照常 spawn 直到自然结束。
+            this.signal?.throwIfAborted();
             const argumentsValue = JSON.parse(typeof call.function?.arguments === "string"
                 ? call.function.arguments
                 : "{}");
@@ -452,21 +471,27 @@ export class ToolExecutor {
                 tool_call_id: callId,
                 content: json({
                     status: "error",
-                    tool: name,
-                    error: errorMessage(error),
+                    message: errorMessage(error),
                 }),
             };
         }
     }
     takeVisualMessage(toolCallIds) {
-        const content = [];
+        // 生产契约：同一组 tool call 的全部图片汇入一条 user message，
+        // 由一个 arena-system-message 文本 part 领头。
+        const images = [];
         for (const toolCallId of toolCallIds) {
             const parts = this.pendingVisualContent.get(toolCallId);
             this.pendingVisualContent.delete(toolCallId);
             if (parts)
-                content.push(...parts);
+                images.push(...parts);
         }
-        return content.length ? { role: "user", content } : undefined;
+        if (!images.length)
+            return undefined;
+        return {
+            role: "user",
+            content: [{ text: visualIntroText }, ...images],
+        };
     }
     async dispatch(name, values, toolCallId) {
         switch (name) {
@@ -488,7 +513,7 @@ export class ToolExecutor {
             case "write_file":
                 return this.writeWorkspaceFile(String(values.path), String(values.content));
             case "image_search":
-                return this.imageSearch(String(values.query), Number(values.count), toolCallId);
+                return this.imageSearch(String(values.query), Number(values.count));
             case "present_file":
                 return this.presentFile(String(values.path));
             case "generate_image":
@@ -542,24 +567,129 @@ export class ToolExecutor {
     relativePath(target) {
         return path.relative(this.workspaceReal, target).split(path.sep).join("/");
     }
+    virtualizeBashOutput(value) {
+        if (this.workspaceContext)
+            return value;
+        let virtualized = value;
+        const workspaceRoots = [...new Set([this.workspace, this.workspaceReal])]
+            .filter((root) => root !== path.parse(root).root)
+            .sort((left, right) => right.length - left.length);
+        for (const root of workspaceRoots) {
+            virtualized = virtualized.replaceAll(root, "/home/user");
+        }
+        return virtualized;
+    }
     async bash(command, cwd, timeoutSeconds) {
         const workdir = await this.confinedPath(cwd);
         if (!(await stat(workdir)).isDirectory()) {
             throw new Error(`cwd is not a directory: ${cwd}`);
         }
+        // Legacy callers without runtime context retain the captured /home/user
+        // contract. Runtime-aware callers execute and report their actual paths.
+        const translatedCommand = this.workspaceContext
+            ? command
+            : command.replaceAll("/home/user", "\"$ARENA_WORKSPACE\"");
         return new Promise((resolve, reject) => {
-            const child = spawn("/bin/bash", ["-lc", command], {
+            const env = {
+                ...process.env,
+                HOME: this.workspace,
+                ARENA_WORKSPACE: this.workspace,
+                // 生产 sandbox 是 C collation（参考 find|sort 为逐字节序），宿主
+                // 常见 en_US.UTF-8 会翻转大小写次序；统一成 C.UTF-8 对齐生产。
+                LANG: "C.UTF-8",
+                LC_ALL: "C.UTF-8",
+            };
+            // 交互终端（node --test、npm 等）会向子进程注入强制着色变量，
+            // 管道输出被 ANSI 色码污染；生产轨迹无色码，剥离之。
+            delete env.FORCE_COLOR;
+            delete env.CLICOLOR_FORCE;
+            // detached：管道成员（npm、tail…）与 bash 同进程组。只杀 bash 会留下
+            // 孤儿持有 stdout/stderr 管道，close 永不触发，整个 turn 挂死；
+            // 必须杀整组，并在宽限期后强制结算兜底。
+            const child = spawn("/bin/bash", ["-lc", translatedCommand], {
                 cwd: workdir,
+                env,
                 stdio: ["ignore", "pipe", "pipe"],
+                detached: process.platform !== "win32",
             });
+            const startedAt = Date.now();
             let stdout = "";
             let stderr = "";
             let timedOut = false;
+            let settled = false;
+            let killRequested = false;
+            let forceSettle;
+            const killTree = (signal) => {
+                try {
+                    if (process.platform !== "win32" && child.pid) {
+                        process.kill(-child.pid, signal);
+                    }
+                    else {
+                        child.kill(signal);
+                    }
+                }
+                catch (error) {
+                    // ESRCH：组已消失。EPERM：Darwin 在组正被回收时对重复 kill 的
+                    // 返回值，同样视作已处理。
+                    const code = error.code;
+                    if (code !== "ESRCH" && code !== "EPERM")
+                        throw error;
+                }
+            };
+            const finish = (code) => {
+                if (settled)
+                    return;
+                settled = true;
+                clearTimeout(timeout);
+                if (forceSettle)
+                    clearTimeout(forceSettle);
+                // 组长退出会立刻触发 close 并取消宽限定时器；取消/超时一旦请求过
+                // 击杀，就必须在结算时补一发组级 SIGKILL，否则忽略 TERM 且关闭了
+                // 继承管道的后台子进程会活过取消。正常退出不清场——模型可能有意
+                // 留下后台服务供后续调用使用。
+                if (killRequested)
+                    killTree("SIGKILL");
+                this.signal?.removeEventListener("abort", abort);
+                if (this.signal?.aborted) {
+                    reject(this.signal.reason || new Error("operation cancelled"));
+                    return;
+                }
+                // 生产契约：status 恒为 "completed"（包括非零退出码），超时无参考样本，
+                // 按最小猜测同样返回 completed + exit_code null，stderr 附超时说明。
+                if (timedOut) {
+                    stderr += (stderr ? "\n" : "") + `command exceeded ${timeoutSeconds}s`;
+                }
+                const out = capBashOutput(this.virtualizeBashOutput(stdout));
+                const err = capBashOutput(this.virtualizeBashOutput(stderr));
+                resolve({
+                    status: "completed",
+                    stderr: err.text,
+                    stdout: out.text,
+                    exit_code: timedOut ? null : code,
+                    duration_ms: Date.now() - startedAt,
+                    stderr_truncated: err.truncated,
+                    stdout_truncated: out.truncated,
+                });
+            };
+            // 宽限期结束时升级为组级 SIGKILL 再结算：abort 只发 SIGTERM，
+            // trap TERM 的进程会活过 Promise 拒绝并继续改写工作区。
+            const armForceSettle = () => {
+                forceSettle ??= setTimeout(() => {
+                    killTree("SIGKILL");
+                    finish(null);
+                }, 2000);
+            };
             const timeout = setTimeout(() => {
                 timedOut = true;
-                child.kill("SIGKILL");
+                killRequested = true;
+                killTree("SIGKILL");
+                armForceSettle();
             }, timeoutSeconds * 1000);
-            const abort = () => child.kill("SIGTERM");
+            const abort = () => {
+                killRequested = true;
+                killTree("SIGTERM");
+                armForceSettle();
+            };
             this.signal?.addEventListener("abort", abort, { once: true });
             child.stdout.on("data", (chunk) => {
                 stdout += chunk.toString("utf8");
@@ -567,30 +697,17 @@ export class ToolExecutor {
             child.stderr.on("data", (chunk) => {
                 stderr += chunk.toString("utf8");
             });
-            child.once("error", reject);
-            child.once("close", (code) => {
+            child.once("error", (error) => {
+                if (settled)
+                    return;
+                settled = true;
                 clearTimeout(timeout);
+                if (forceSettle)
+                    clearTimeout(forceSettle);
                 this.signal?.removeEventListener("abort", abort);
-                if (this.signal?.aborted) {
-                    reject(this.signal.reason || new Error("operation cancelled"));
-                    return;
-                }
-                if (timedOut) {
-                    resolve({
-                        status: "timeout",
-                        exit_code: null,
-                        stdout: "",
-                        stderr: `command exceeded ${timeoutSeconds}s`,
-                    });
-                    return;
-                }
-                resolve({
-                    status: code === 0 ? "success" : "error",
-                    exit_code: code,
-                    stdout,
-                    stderr,
-                });
+                reject(error);
             });
+            child.once("close", (code) => finish(code));
         });
     }
     async askUser(questions, toolCallId) {
@@ -610,35 +727,42 @@ export class ToolExecutor {
     async editFile(rawPath, oldText, newText) {
         const target = await this.confinedPath(rawPath);
         const source = await readFile(target, "utf8");
-        let updated;
-        if (source.includes(oldText)) {
-            updated = source.replace(oldText, newText);
-        }
-        else {
-            const tokens = oldText.split(/\s+/).filter(Boolean);
-            const pattern = new RegExp(tokens.map(escapeRegExp).join("\\s+"));
-            if (!pattern.test(source)) {
-                return {
-                    status: "error",
-                    message: "Context not found. Read the file to verify the text exists.",
-                };
-            }
-            updated = source.replace(pattern, newText);
+        // 仅精确匹配：曾有空白容错回退，但 T1(b) 回放证实生产没有——case-003
+        // 四个 old_text 精确缺失的 edit 生产全部返回 Context not found，而回退
+        // 会静默改错文件；全部参考成功样本也都能走精确路径复现。
+        // 注意：spec/tools.json 的 edit_file description（与生产逐字一致，受
+        // T1(c) 门禁保护）声称支持 fuzzy matching——那是上游自身的描述与行为
+        // 不一致，按实测行为对齐，描述不改。见 TRAJECTORY_FIDELITY.md §5。
+        if (!source.includes(oldText)) {
+            return {
+                status: "error",
+                message: "Context not found. Read the file to verify the text exists.",
+            };
         }
-        await writeFile(target, updated, "utf8");
+        await writeFile(target, source.replace(oldText, newText), "utf8");
         return { status: "success", message: `Edited ${rawPath}.` };
     }
     async readWorkspaceFile(rawPath, toolCallId) {
         const target = await this.confinedPath(rawPath);
-        const data = await readFile(target);
+        let data;
+        try {
+            data = await readFile(target);
+        }
+        catch {
+            // 逐字对齐生产错误文案，路径按调用方原样回显。
+            return {
+                status: "error",
+                message: `Failed to read workspace file: ${rawPath}`,
+            };
+        }
         const extension = path.extname(target).toLowerCase();
         const kind = workspaceFileKind(target, data.subarray(0, 4096));
-        const relativePath = this.relativePath(target);
-        const result = {
-            status: "success",
-            path: relativePath,
-        };
         if (isStructuredDocument(target)) {
+            // 文档提取无参考样本（known-unknown），保留本地扩展键。
+            const result = {
+                status: "success",
+                path: this.relativePath(target),
+            };
             const extracted = await extractStructuredDocument(target, data, this.signal);
             result.content = extracted.content;
             result.mime_type =
@@ -655,34 +779,37 @@ export class ToolExecutor {
                 result.truncated = true;
             if (extracted.warning)
                 result.warning = extracted.warning;
+            return result;
         }
-        else if (kind === "text") {
-            result.content = decodeText(data);
+        if (kind === "text") {
+            const content = decodeText(data);
+            return {
+                kind: "text",
+                lines: content.split("\n").length,
+                size: Buffer.byteLength(content, "utf8"),
+                content,
+            };
         }
-        else {
-            const mimeType = mime.getType(target) ||
-                mimeTypes[extension] ||
-                "application/octet-stream";
-            result.mime_type = mimeType;
-            result.size = data.length;
-            if (kind === "image") {
-                if (data.length > 20 * 1024 * 1024) {
-                    throw new Error(`image exceeds 20 MB: ${rawPath}`);
-                }
-                result.content = imagePlaceholder;
-                this.pendingVisualContent.set(toolCallId, [
-                    {
-                        text: "<arena-system-message>" +
-                            `The image below is the genuine content returned by read_file for ${JSON.stringify(relativePath)}.` +
-                            "</arena-system-message>",
-                    },
-                    {
-                        image: `data:${mimeType};base64,${data.toString("base64")}`,
-                    },
-                ]);
+        const mimeType = mime.getType(target) ||
+            mimeTypes[extension] ||
+            "application/octet-stream";
+        if (kind === "image") {
+            if (data.length > 20 * 1024 * 1024) {
+                throw new Error(`image exceeds 20 MB: ${rawPath}`);
             }
+            this.pendingVisualContent.set(toolCallId, [
+                {
+                    image: `data:${mimeType};base64,${data.toString("base64")}`,
+                },
+            ]);
+            return [{ text: imageResultPlaceholder }];
         }
-        return result;
+        return {
+            status: "success",
+            path: this.relativePath(target),
+            mime_type: mimeType,
+            size: data.length,
+        };
     }
     async writeWorkspaceFile(rawPath, content) {
         const target = await this.confinedPath(rawPath);
@@ -720,28 +847,25 @@ export class ToolExecutor {
         const searchResults = Array.isArray(searchInfo.search_results)
             ? searchInfo.search_results
             : [];
-        const choices = Array.isArray(output.choices) ? output.choices : [];
-        const answer = stringValue(record(record(choices[0]).message).content);
         const limit = { "1": 3, "2": 5, "3": 8 }[depth] || 5;
+        // 参考轨迹条目：{id, url, title, description[, pageAge]}；
+        // DashScope 无 pageAge，按可选键省略。
         return {
             status: "success",
-            query,
-            answer,
             results: searchResults.slice(0, limit).map((value, index) => {
                 const item = record(value);
                 return {
                     id: Number(item.index) || index + 1,
-                    title: stringValue(item.title),
                     url: stringValue(item.url),
-                    content: stringValue(item.content) ||
+                    title: stringValue(item.title),
+                    description: stringValue(item.content) ||
                         stringValue(item.snippet) ||
                         stringValue(item.summary),
-                    site_name: stringValue(item.site_name),
                 };
             }),
         };
     }
-    async imageSearch(query, count, toolCallId) {
+    async imageSearch(query, count) {
         const model = process.env.ARENA_IMAGE_SEARCH_MODEL || "qwen3.7-plus";
         const payload = await dashScopeJson("compatible", "/responses", {
             method: "POST",
@@ -770,13 +894,14 @@ export class ToolExecutor {
                 throw new Error("image_search returned malformed image results");
             }
         }
-        const images = [];
-        const searchId = toolCallId
-            .replace(/[^A-Za-z0-9_-]+/g, "-")
-            .replace(/^-+|-+$/g, "")
-            .slice(0, 96) || "search";
+        const saved = [];
+        // 参考轨迹命名：image-search/<query slug 前 40 字符>-<序号>.<扩展名>。
+        const slug = query
+            .toLowerCase()
+            .replace(/[^a-z0-9]+/g, "-")
+            .slice(0, 40);
         for (const value of results) {
-            if (images.length >= count)
+            if (saved.length >= count)
                 break;
             const item = record(value);
             const sourceUrl = stringValue(item.url) ||
@@ -794,13 +919,14 @@ export class ToolExecutor {
                     continue;
                 const normalizedType = contentType.split(";")[0]?.trim().toLowerCase();
                 const extension = Object.entries(mimeTypes).find(([, mime]) => mime === normalizedType)?.[0] || ".jpg";
-                const target = await this.confinedPath(`assets/image-search/${searchId}/result-${images.length + 1}${extension}`);
+                const target = await this.confinedPath(`image-search/${slug}-${saved.length + 1}${extension}`);
                 mkdirSync(path.dirname(target), { recursive: true });
                 await writeFile(target, await responseBytes(imageResponse));
-                images.push({
-                    path: this.relativePath(target),
-                    source_url: sourceUrl,
+                saved.push({
                     title: stringValue(item.title),
+                    file_path: this.relativePath(target),
+                    source_url: sourceUrl,
+                    thumbnail_url: stringValue(item.thumbnail_url) || sourceUrl,
                 });
             }
             catch (error) {
@@ -809,7 +935,7 @@ export class ToolExecutor {
                 // A single inaccessible search result should not fail the whole search.
             }
         }
-        return { status: "success", query, images };
+        return { status: "success", results: saved };
     }
     async presentFile(rawPath) {
         const target = await this.confinedPath(rawPath);
@@ -912,7 +1038,6 @@ export class ToolExecutor {
         return {
             status: "success",
             file_path: this.relativePath(target),
-            task_id: taskId,
         };
     }
     async generateSpeech(rawPath, text, language, voiceIdentity = {}) {