@bf-meishijian/aip 0.0.31 → 0.0.32

package/dist/qa-http-validation.js

@@ -1,107 +1,8 @@
-import { Ajv } from "ajv";
+import { qaEvidenceReferencesSchema, qaHttpExchangeSchema } from "./generated/qa-schemas.js";
+import { createQaAjv } from "./qa-ajv.js";
                                               
-export const qaHttpExchangeSchema = {
-  type: "object",
-  additionalProperties: false,
-  properties: {
-    step: { type: "string", minLength: 1 },
-    id: {
-      type: "string",
-    },
-    sequence: {
-      type: "integer",
-      minimum: 1,
-    },
-    startedAt: {
-      type: "string",
-    },
-    durationMs: {
-      type: "integer",
-      minimum: 0,
-    },
-    request: {
-      type: "object",
-      additionalProperties: false,
-      properties: {
-        method: {
-          type: "string",
-        },
-        url: {
-          type: "string",
-        },
-        headers: {
-          type: "object",
-          additionalProperties: {
-            type: "array",
-            items: {
-              type: "string",
-            },
-          },
-        },
-        body: {
-          anyOf: [
-            {
-              type: "string",
-            },
-            {
-              type: "null",
-            },
-          ],
-        },
-        bodyAttachment: {
-          type: "string",
-        },
-      },
-      required: ["method", "url", "headers", "body"],
-    },
-    response: {
-      anyOf: [
-        {
-          type: "object",
-          additionalProperties: false,
-          properties: {
-            status: {
-              type: "integer",
-              minimum: 100,
-              maximum: 599,
-            },
-            headers: {
-              type: "object",
-              additionalProperties: {
-                type: "array",
-                items: {
-                  type: "string",
-                },
-              },
-            },
-            body: {
-              anyOf: [
-                {
-                  type: "string",
-                },
-                {
-                  type: "null",
-                },
-              ],
-            },
-            bodyAttachment: {
-              type: "string",
-            },
-          },
-          required: ["status", "headers", "body"],
-        },
-        {
-          type: "null",
-        },
-      ],
-    },
-    error: {
-      type: "string",
-    },
-  },
-  required: ["id", "sequence", "startedAt", "durationMs", "request", "response"],
-}         ;
-const ajv = new Ajv({ allErrors: true, strict: false });
+export { qaEvidenceReferencesSchema, qaHttpExchangeSchema } from "./generated/qa-schemas.js";
+const ajv = createQaAjv();
 const validate = ajv.compile(qaHttpExchangeSchema);
 export function parseQaHttpExchange(value         )                 {
   if (!validate(value))
@@ -109,36 +10,7 @@ export function parseQaHttpExchange(value         )                 {
   return value                  ;
 }
 
-export const qaEvidenceReferencesSchema = {
-  type: "array",
-  items: {
-    oneOf: [
-      {
-        type: "object",
-        additionalProperties: false,
-        required: ["kind", "exchangeId", "side", "label"],
-        properties: {
-          kind: { const: "http" },
-          exchangeId: { type: "string", minLength: 1 },
-          side: { enum: ["request", "response"] },
-          label: { type: "string" },
-        },
-      },
-      {
-        type: "object",
-        additionalProperties: false,
-        required: ["kind", "filename", "label"],
-        properties: {
-          kind: { const: "attachment" },
-          filename: { type: "string", minLength: 1 },
-          label: { type: "string" },
-        },
-      },
-    ],
-  },
-}         ;
-
-const validateReferences = new Ajv({ strict: false }).compile(qaEvidenceReferencesSchema);
+const validateReferences = createQaAjv().compile(qaEvidenceReferencesSchema);
 export function parseQaEvidenceReferences(value         )                                          {
   if (!validateReferences(value)) throw new Error("QA_EVIDENCE_REFERENCES_INVALID");
   return value                                           ;

package/dist/qa-project-checkout.d.ts

@@ -1,12 +1,16 @@
 import type { QaHostCommandPayload } from "@ai-platform/api-contracts";
 type Project = Omit<NonNullable<QaHostCommandPayload["project"]>, "mainBranch">;
 export declare function qaProjectDirectory(project: Project): string;
-export declare function gitQa(args: string[], cwd?: string): Promise<string>;
+/** QA 检出复用平台受控 Git 执行器：超时、中断清理与输出上限同公共实现，不自动重试。 */
+export declare function gitQa(args: string[], cwd?: string, signal?: AbortSignal): Promise<string>;
 /** 同一 Host 的同项目任务排队；文件锁同时保护 CLI 与 daemon。 */
 export declare function withQaProject<T>(project: Project, work: () => Promise<T>): Promise<T>;
 /** 仅更新 Host 专用检出，不接触开发者工作目录。调用期间必须持有项目锁。 */
 export declare function prepareQaCheckout({ project }: {
     project: Project;
-}): Promise<string>;
+}): Promise<{
+    directory: string;
+    commitSha: string;
+}>;
 export {};
 //# sourceMappingURL=qa-project-checkout.d.ts.map

package/dist/qa-project-checkout.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qa-project-checkout.d.ts","sourceRoot":"","sources":["../src/qa-project-checkout.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAKvE,KAAK,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AAGhF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAGlD;AACD,wBAAsB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,mBAIvD;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAoB3F;AAED,4CAA4C;AAC5C,wBAAsB,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,mBAyBxE"}
+{"version":3,"file":"qa-project-checkout.d.ts","sourceRoot":"","sources":["../src/qa-project-checkout.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAOvE,KAAK,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AAEhF,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,UAGlD;AACD,mDAAmD;AACnD,wBAAsB,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,mBAe7E;AAED,6CAA6C;AAC7C,wBAAsB,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAoB3F;AAED,4CAA4C;AAC5C,wBAAsB,iBAAiB,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE;;;GAqBxE"}

package/dist/qa-project-checkout.js

@@ -1,19 +1,30 @@
-import { execFile } from "node:child_process";
 import { access, mkdir, realpath } from "node:fs/promises";
 import { join, resolve } from "node:path";
-import { promisify } from "node:util";
 import lockfile from "proper-lockfile";
+import { execGitFile, GitProcessError, gitFailure } from "./git-process.js";
 import { ensureSshOrigin, gitTransportUrl } from "./git-transport.js";
+import { sanitizeGitOutput } from "./host-log.js";
 import { paths } from "./paths.js";
-const exec = promisify(execFile);
 const pending = new Map();
 export function qaProjectDirectory(project) {
     if (!/^[a-zA-Z0-9_-]+$/u.test(project.id))
         throw new Error("QA_PROJECT_ID_INVALID");
     return join(paths().workspaceRoot, "qa-projects", project.id);
 }
-export async function gitQa(args, cwd) {
-    return (await exec("git", args, { cwd, encoding: "utf8", maxBuffer: 1024 * 1024, timeout: 60_000 })).stdout.trim();
+/** QA 检出复用平台受控 Git 执行器：超时、中断清理与输出上限同公共实现，不自动重试。 */
+export async function gitQa(args, cwd, signal) {
+    try {
+        const { stdout } = await execGitFile("git", args, {
+            ...(cwd ? { cwd } : {}),
+            ...(signal ? { signal } : {}),
+        });
+        return stdout.trim();
+    }
+    catch (error) {
+        // 失败信息保留脱敏后的 Git 输出，只带子命令名，不回显参数或仓库地址。
+        const stderr = error instanceof GitProcessError ? sanitizeGitOutput(error.stderr).trim() : "";
+        throw gitFailure(`QA_REPOSITORY_GIT_FAILED（git ${args[0] ?? ""}）${stderr ? `：${stderr.slice(-2000)}` : ""}`, error);
+    }
 }
 /** 同一 Host 的同项目任务排队；文件锁同时保护 CLI 与 daemon。 */
 export async function withQaProject(project, work) {
@@ -42,8 +53,6 @@ export async function withQaProject(project, work) {
 }
 /** 仅更新 Host 专用检出，不接触开发者工作目录。调用期间必须持有项目锁。 */
 export async function prepareQaCheckout({ project }) {
-    if (!project.commitSha || !/^[a-f\d]{40}$/iu.test(project.commitSha))
-        throw new Error("QA_COMMIT_REQUIRED");
     if (!project.remoteUrl || project.remoteUrl.startsWith("-"))
         throw new Error("QA_REMOTE_INVALID");
     const transport = gitTransportUrl(project.remoteUrl, project.sshRemoteUrl);
@@ -62,12 +71,10 @@ export async function prepareQaCheckout({ project }) {
     if ((await realpath(resolve(repository, common))) !== (await realpath(join(repository, ".git"))))
         throw new Error("QA_REPOSITORY_NOT_ISOLATED");
     await ensureSshOrigin(repository, project.remoteUrl, project.sshRemoteUrl);
-    await gitQa(["fetch", "--no-tags", "origin", project.commitSha], repository);
+    await gitQa(["fetch", "--no-tags", "origin", `refs/heads/${project.branch}`], repository);
     // 上一次报告已独立保存；清理专用仓库内产物，避免将旧结果当成本次结果。
     await gitQa(["clean", "-ffdx"], repository);
-    await gitQa(["checkout", "--detach", "--force", project.commitSha], repository);
-    if ((await gitQa(["rev-parse", "HEAD"], repository)) !== project.commitSha.toLowerCase())
-        throw new Error("QA_CHECKOUT_MISMATCH");
-    return repository;
+    await gitQa(["checkout", "--detach", "--force", "FETCH_HEAD"], repository);
+    return { directory: repository, commitSha: await gitQa(["rev-parse", "HEAD"], repository) };
 }
 //# sourceMappingURL=qa-project-checkout.js.map

package/dist/qa-project-checkout.js.map

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

package/dist/qa-session-manager.d.ts

@@ -43,6 +43,8 @@ export interface QaSessionClient {
         contentBase64: string;
     }): Promise<QaAttachmentView>;
     qaSubmitVerification: PlatformClient["qaSubmitVerification"];
+    qaReuseVerification: PlatformClient["qaReuseVerification"];
+    qaRequestWaiver: PlatformClient["qaRequestWaiver"];
     qaSubmitConclusion: PlatformClient["qaSubmitConclusion"];
 }
 export declare class QaSessionManager {
@@ -66,13 +68,8 @@ export declare function readQaAssetState(cwd: string, remoteUrl: string, expecte
     sourceCommitSha: string;
     mainCommitSha: string;
     hasChanges: boolean;
+    hasLocalChanges: boolean;
 }>;
-export declare function verifyQaAssetMerge(cwd: string, remoteUrl: string, expectedBranch: string, mainBranch: string, sshRemoteUrl?: string | null): Promise<{
-    sourceCommitSha: string;
-    mainCommitSha: string;
-}>;
-/** 对照批准内容及实际合入结果；主分支其他文件的并行改动不属于本次 QA。 */
-export declare function qaAssetContentChanged(cwd: string, approvedSource: string, approvedMain: string, source: string, main: string): Promise<boolean>;
 export declare function readQaScreenshot(cwd: string, filename: string): Promise<{
     filename: string;
     mediaType: string;

package/dist/qa-session-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qa-session-manager.d.ts","sourceRoot":"","sources":["../src/qa-session-manager.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAgB,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AAatF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,KAAK,cAAc,EAAuB,MAAM,sBAAsB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIlD,KAAK,cAAc,GAAG,IAAI,CAAC,oBAAoB,EAAE,UAAU,CAAC,CAAC;AAC7D,KAAK,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACvE,KAAK,YAAY,GAAG;IAClB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACnC,CAAC;AACF,MAAM,WAAW,eAAe;IAC9B,cAAc,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IACjD,gBAAgB,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;IACrD,gBAAgB,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;IACrD,aAAa,EAAE,cAAc,CAAC,eAAe,CAAC,CAAC;IAC/C,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACnD,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACnD,eAAe,EAAE,cAAc,CAAC,iBAAiB,CAAC,CAAC;IACnD,gBAAgB,EAAE,cAAc,CAAC,kBAAkB,CAAC,CAAC;IACrD,kBAAkB,EAAE,cAAc,CAAC,oBAAoB,CAAC,CAAC;IACzD,gBAAgB,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IACnD,cAAc,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC;IAC/C,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG;QAAE,MAAM,EAAE,YAAY,EAAE,CAAA;KAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3F,kBAAkB,CAChB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,QAAQ,GAAG;QACf,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,GACA,OAAO,CAAC,OAAO,CAAC,CAAC;IACpB,yBAAyB,CACvB,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,QAAQ,GAAG;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,GAC9E,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC7B,oBAAoB,EAAE,cAAc,CAAC,sBAAsB,CAAC,CAAC;IAC7D,kBAAkB,EAAE,cAAc,CAAC,oBAAoB,CAAC,CAAC;CAC1D;AAeD,qBAAa,gBAAgB;IAGf,OAAO,CAAC,QAAQ,CAAC,EAAE;IAF/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAoC;gBAC7B,EAAE,EAAE,cAAc;IAC/C,MAAM;IAGN,OAAO,CAAC,SAAS,EAAE,MAAM;IAInB,OAAO,CACX,MAAM,EAAE,eAAe,EACvB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAC9D,OAAO,EAAE,6BAA6B;YAsG1B,GAAG;CAuMlB;AAuCD,wBAAsB,gBAAgB,CAAC,KAAK,EAAE,cAAc,mBAgF3D;AAED,wBAAsB,kBAAkB,CACtC,KAAK,EAAE,cAAc,EACrB,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,mBAAmB,CAAC,CAuB9B;AAeD,wBAAsB,eAAe,CAAC,GAAG,EAAE,MAAM,mBAKhD;AAED,6CAA6C;AAC7C,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;;;;GAkC7B;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,EACjB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI;;;GAY7B;AAED,0CAA0C;AAC1C,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,MAAM,EACX,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,oBAuBb;AAED,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;;;;GA4BnE;AAED,wBAAgB,OAAO,CACrB,MAAM,EAAE,eAAe,EACvB,KAAK,EAAE,cAAc,EACrB,OAAO,EAAE,QAAQ,EACjB,GAAG,EAAE,MAAM,EACX,WAAW,EAAE,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,GAC9C,gBAAgB,CAiVlB"}
+{"version":3,"file":"qa-session-manager.d.ts","sourceRoot":"","sources":["../src/qa-session-manager.ts"],"names":[],"mappings":"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"}

package/dist/qa-session-manager.js

@@ -2,13 +2,14 @@ import { execFile } from "node:child_process";
 import { createHash, randomUUID } from "node:crypto";
 import { constants } from "node:fs";
 import { mkdir, open, realpath, stat } from "node:fs/promises";
-import { basename, isAbsolute, join, relative, resolve } from "node:path";
+import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { promisify } from "node:util";
 import { openPiSession, prepareDeploymentProjects, redactHostText } from "./coding-run-manager.js";
 import { ensureSshOrigin, gitTransportUrl, matchesRepository, SSH_ACCESS_HINT, } from "./git-transport.js";
 import { logGitPreparationFailure, logHostEvent } from "./host-log.js";
 import { liveEmployee } from "./live-employee.js";
 import { localModelUsage } from "./local-model-usage.js";
+import { prepareMergeRequest } from "./merge-requests.js";
 import { paths } from "./paths.js";
 import { PiMessageQueue } from "./pi-message-queue.js";
 import { PlatformClientError } from "./platform-client.js";
@@ -97,11 +98,22 @@ export class QaSessionManager {
                 return;
             }
             if (previous.session && !previous.session.isIdle && previous.queue) {
-                await previous.emit?.("MESSAGE_QUEUE_UPDATED", "", {
-                    messageId: input.message.id,
-                    deliveryStatus: "QUEUED",
-                });
-                await previous.queue.submit(input.message.id, input.message.mode, input.message.contentMarkdown);
+                const queue = previous.queue;
+                const mode = input.message.mode;
+                const submission = (async () => {
+                    await previous.emit?.("MESSAGE_QUEUE_UPDATED", "", {
+                        messageId: input.message.id,
+                        deliveryStatus: "QUEUED",
+                    });
+                    await queue.submit(input.message.id, mode, input.message.contentMarkdown);
+                })();
+                previous.submissions.add(submission);
+                try {
+                    await submission;
+                }
+                finally {
+                    previous.submissions.delete(submission);
+                }
                 return;
             }
             await previous.done;
@@ -112,6 +124,7 @@ export class QaSessionManager {
         });
         const active = {
             stopping: false,
+            submissions: new Set(),
             done: Promise.resolve(),
             ready,
             markReady,
@@ -187,7 +200,7 @@ export class QaSessionManager {
             const live = liveEmployee({
                 employeeConfig: client.qaEmployeeConfig.bind(client),
                 employeeTool: client.qaEmployeeTool.bind(client),
-            }, id, employeeBinding, initial, cwd, false, false, "DEVELOPMENT", () => active.stopping, () => `工单：${workItem.key} ${workItem.title}\n验证方式：${input.verificationMode ?? "AUTO"}\n测试仓库：${preparedWorkspace.testProject?.projectName ?? "未准备；当前目录用于工单证据"}\n当前目录：${cwd}\n业务源码参考（测试分支独立副本，不代表部署环境的运行版本）：\n${preparedWorkspace.sourceProjects.map((p) => `${p.projectName}：${p.directory}，分支 ${p.branch}，提交 ${p.commitSha}`).join("\n") || "未配置业务项目"}`, () => { }, {});
+            }, id, employeeBinding, initial, cwd, false, false, "DEVELOPMENT", () => active.stopping, () => `工单：${workItem.key} ${workItem.title}\n当前任务：${input.releaseAssetTask ? `上线准备，仅处理测试资产 ${input.releaseAssetTask.sourceBranch} → ${input.releaseAssetTask.targetBranch}，通过 report_qa_asset_merge 提交 MR；不启动 QA 测试。` : "QA 验证"}\n验证方式：${input.verificationMode ?? "AUTO"}\n测试仓库：${preparedWorkspace.testProject?.projectName ?? "未准备；当前目录用于工单证据"}\n当前目录：${cwd}\n业务源码参考（测试分支独立副本，不代表部署环境的运行版本）：\n${preparedWorkspace.sourceProjects.map((p) => `${p.projectName}：${p.directory}，分支 ${p.branch}，提交 ${p.commitSha}`).join("\n") || "未配置业务项目"}`, () => { }, {});
             const opened = await openPiSession({
                 cwd,
                 sessionDir: join(paths().piSessions, "qa"),
@@ -275,6 +288,23 @@ export class QaSessionManager {
                 const prompted = opened.session.prompt(message.contentMarkdown);
                 active.markReady();
                 await prompted;
+                // Pi 1.4.0 只在本次运行收尾前续跑已入队消息；运行中判定后才入队的补充消息会留在
+                // 空闲会话队列里。按空闲会话的既有处理方式由同一 QA 继续处理，不取消、不另建队列。
+                for (;;) {
+                    await Promise.allSettled([...active.submissions]);
+                    const unread = active.stopping ? [] : (active.queue?.takeUnread() ?? []);
+                    if (!unread.length)
+                        break;
+                    for (const item of unread) {
+                        if (active.stopping)
+                            break;
+                        await emit("MESSAGE_QUEUE_UPDATED", "", {
+                            messageId: item.id,
+                            deliveryStatus: "READ",
+                        });
+                        await opened.session.prompt(item.text);
+                    }
+                }
             }
             await pending;
             if (modelError && !active.stopping)
@@ -286,6 +316,8 @@ export class QaSessionManager {
             throw error;
         }
         finally {
+            // 停止或失败时在途补充消息也须先进入 Pi，再如实标记未执行，不遗留为已排队。
+            await Promise.allSettled([...active.submissions]);
             for (const messageId of active.queue?.recall() ?? [])
                 await emit("MESSAGE_QUEUE_UPDATED", "", { messageId, deliveryStatus: "CANCELLED" }).catch(() => undefined);
             unsubscribe?.();
@@ -342,15 +374,15 @@ export async function prepareQaProject(input) {
         workspaceId: input.workspaceId,
         workItemId: input.workItem.id,
     });
-    const cwd = join(workRoot, input.project && input.verificationMode !== "AGENT" ? qaProjectName(input.project) : "evidence");
+    const cwd = join(workRoot, input.project ? qaProjectName(input.project) : "evidence");
     await claimQaDirectory(cwd, {
-        projectId: input.project && input.verificationMode !== "AGENT" ? input.project.id : "evidence",
+        projectId: input.project ? input.project.id : "evidence",
     });
-    if (!input.project || input.verificationMode === "AGENT") {
+    if (!input.project) {
         await mkdir(cwd, { recursive: true, mode: 0o700 });
         return cwd;
     }
-    const branch = `qa/${input.workItem.key}`;
+    const branch = `aip/${input.workItem.key}`;
     await git("git", ["check-ref-format", "--branch", branch]);
     if (!input.project.mainBranch)
         throw new Error("QA_MAIN_BRANCH_REQUIRED");
@@ -419,7 +451,7 @@ export async function prepareQaWorkspace(input, cwd) {
         sourceProjects.push(await readPreparedProject(project.id, project.name, directory));
     }
     return {
-        testProject: input.project && input.verificationMode !== "AGENT"
+        testProject: input.project
             ? await readPreparedProject(input.project.id, input.project.name, cwd)
             : null,
         sourceProjects,
@@ -465,47 +497,26 @@ export async function readQaAssetState(cwd, remoteUrl, expectedBranch, mainBranc
     const sourceCommitSha = source.trim();
     const mainCommitSha = main.trim();
     const remoteSource = remote.trim().split(/\s+/)[0];
-    let hasChanges = Boolean(status.trim()) || remoteSource !== sourceCommitSha;
-    if (!hasChanges) {
-        try {
-            await git("git", ["merge-base", "--is-ancestor", sourceCommitSha, mainCommitSha], { cwd });
-        }
-        catch (error) {
-            if (error.code !== 1)
-                throw error;
-            hasChanges = true;
-        }
+    let hasChanges = false;
+    try {
+        await git("git", ["merge-base", "--is-ancestor", sourceCommitSha, mainCommitSha], { cwd });
     }
-    return { sourceCommitSha, mainCommitSha, hasChanges };
-}
-export async function verifyQaAssetMerge(cwd, remoteUrl, expectedBranch, mainBranch, sshRemoteUrl) {
-    const { hasChanges, ...commits } = await readQaAssetState(cwd, remoteUrl, expectedBranch, mainBranch, sshRemoteUrl);
-    if (hasChanges)
-        throw new Error("QA_TEST_ASSET_NOT_MERGED：存在未提交、未推送或远端主分支尚未包含的测试资产");
-    return commits;
-}
-/** 对照批准内容及实际合入结果；主分支其他文件的并行改动不属于本次 QA。 */
-export async function qaAssetContentChanged(cwd, approvedSource, approvedMain, source, main) {
-    async function differs(from, to, files = []) {
+    catch (error) {
+        if (error.code !== 1)
+            throw error;
         try {
-            await git("git", ["--literal-pathspecs", "diff", "--quiet", from, to, "--", ...files], {
-                cwd,
-            });
-            return false;
+            await git("git", ["diff", "--quiet", `${mainCommitSha}...${sourceCommitSha}`, "--"], { cwd });
         }
         catch (error) {
             if (error.code !== 1)
                 throw error;
-            return true;
+            hasChanges = true;
         }
     }
-    if (await differs(approvedSource, source))
-        return true;
-    const { stdout: base } = await git("git", ["merge-base", approvedSource, approvedMain], { cwd });
-    // 禁用 rename 检测，保留旧路径和新路径；-z 与 literal pathspec 避免特殊文件名变成模式。
-    const { stdout } = await git("git", ["diff", "--name-only", "--no-renames", "-z", base.trim(), approvedSource, "--"], { cwd });
-    const files = stdout.split("\0").filter(Boolean);
-    return files.length > 0 && (await differs(approvedSource, main, files));
+    const hasLocalChanges = Boolean(status.trim()) ||
+        Boolean(remoteSource && remoteSource !== sourceCommitSha) ||
+        (!remoteSource && hasChanges);
+    return { sourceCommitSha, mainCommitSha, hasChanges, hasLocalChanges };
 }
 export async function readQaScreenshot(cwd, filename) {
     const root = await realpath(cwd), path = await realpath(resolve(cwd, filename));
@@ -541,7 +552,7 @@ export function qaTools(client, input, binding, cwd, definitions) {
         throw new Error("QA_SESSION_COMMAND_INVALID");
     const workItem = input.workItem;
     const requireTestProject = () => {
-        if (!input.project || input.verificationMode === "AGENT")
+        if (!input.project)
             throw new Error("QA_TEST_PROJECT_REQUIRED：当前会话未准备测试项目，请补齐配置后继续");
         return cwd;
     };
@@ -594,45 +605,47 @@ export function qaTools(client, input, binding, cwd, definitions) {
             }));
         }, api));
         api.registerTool(bindHostTool(definitions, "submit_qa_verification", async (callId, args) => {
-            if (args.sourceVerificationId)
-                return result(await client.qaSubmitVerification(id, {
-                    ...binding,
-                    toolCallId: callId,
-                    sourceVerificationId: args.sourceVerificationId,
-                    testItemIds: args.testItemIds,
-                    ...(args.content === undefined ? {} : { content: args.content }),
-                }));
-            if (!args.content?.trim() || !args.conclusion)
-                throw new Error("QA_VERIFICATION_INVALID：请填写真实验证说明与结论，或引用 sourceVerificationId");
             if (args.conclusion === "UNVERIFIABLE" && !args.unverifiableReason?.trim())
-                throw new Error("QA_VERIFICATION_DETAILS_REQUIRED：无法验证时须填写真实原因");
-            if (args.conclusion === "WAIVER_REQUESTED" &&
-                (!args.waiverReason?.trim() || !args.waiverRisk?.trim() || !args.waiverScope?.trim()))
-                throw new Error("QA_WAIVER_DETAILS_REQUIRED：申请豁免须说明理由、未覆盖风险和影响范围");
+                throw new Error("QA_VERIFICATION_DETAILS_REQUIRED：unverifiableReason 无法验证时须填写真实原因");
+            const screenshots = [];
+            for (const [index, file] of args.screenshots.entries()) {
+                try {
+                    screenshots.push(await readQaScreenshot(cwd, file));
+                }
+                catch (error) {
+                    const code = error.code ?? error.message;
+                    const feedback = {
+                        ENOENT: "文件不存在，请确认截图已保存并填写当前工作目录中的真实路径。",
+                        EACCES: "文件不可读，请检查当前 Host 的文件读取权限。",
+                        EPERM: "文件不可读，请检查当前 Host 的文件读取权限。",
+                        QA_SCREENSHOT_OUTSIDE_WORKSPACE: "路径不在当前工作目录中，请先将真实截图保存在当前工作目录内。",
+                        QA_SCREENSHOT_TYPE_INVALID: "文件类型不支持，请提供 PNG、JPEG 或 WebP 截图。",
+                        QA_SCREENSHOT_SIZE_INVALID: "不是普通文件或超过 10 MiB，请提供符合大小限制的截图文件。",
+                    };
+                    if (code && feedback[code])
+                        throw new Error(`QA_SCREENSHOT_INVALID：screenshots[${index}] ${feedback[code]}`);
+                    throw error;
+                }
+            }
             const attachmentIds = [];
-            for (const file of args.screenshots ?? [])
-                attachmentIds.push((await client.qaUploadSessionAttachment(id, {
-                    ...binding,
-                    ...(await readQaScreenshot(cwd, file)),
-                })).id);
+            for (const screenshot of screenshots)
+                attachmentIds.push((await client.qaUploadSessionAttachment(id, { ...binding, ...screenshot })).id);
             return result(await client.qaSubmitVerification(id, {
                 ...binding,
                 toolCallId: callId,
-                content: args.content,
+                ...(args.content === undefined ? {} : { content: args.content }),
                 testItemIds: args.testItemIds,
-                ...(args.expected === undefined ? {} : { expected: args.expected }),
-                ...(args.actual === undefined ? {} : { actual: args.actual }),
+                expected: args.expected,
+                actual: args.actual,
                 ...(args.checkpoints === undefined ? {} : { checkpoints: args.checkpoints }),
-                ...(args.waiverReason === undefined ? {} : { waiverReason: args.waiverReason }),
-                ...(args.waiverRisk === undefined ? {} : { waiverRisk: args.waiverRisk }),
-                ...(args.waiverScope === undefined ? {} : { waiverScope: args.waiverScope }),
                 ...(args.unverifiableReason ? { unverifiableReason: args.unverifiableReason } : {}),
-                ...(args.steps === undefined ? {} : { steps: args.steps }),
+                steps: args.steps,
                 conclusion: args.conclusion,
                 attachmentIds,
-                ...(args.ac ? { ac: args.ac } : {}),
             }));
         }, api));
+        api.registerTool(bindHostTool(definitions, "reuse_qa_verification", async (callId, args) => result(await client.qaReuseVerification(id, { ...args, ...binding, toolCallId: callId })), api));
+        api.registerTool(bindHostTool(definitions, "request_qa_waiver", async (callId, args) => result(await client.qaRequestWaiver(id, { ...args, ...binding, toolCallId: callId })), api));
         api.registerTool(bindHostTool(definitions, "report_qa_defects", async (callId, args) => {
             return result(await client.qaReportDefects(id, {
                 defects: args.defects,
@@ -657,9 +670,9 @@ export function qaTools(client, input, binding, cwd, definitions) {
         api.registerTool(bindHostTool(definitions, "complete_qa_review", async (callId, args) => {
             return result(await client.qaCompleteReview(id, {
                 summary: args.summary,
-                ...(input.project && input.verificationMode !== "AGENT"
+                ...(input.project
                     ? {
-                        assetState: await readQaAssetState(cwd, input.project.remoteUrl, `qa/${workItem.key}`, requireQaMainBranch(input), input.project.sshRemoteUrl),
+                        assetState: await readQaAssetState(cwd, input.project.remoteUrl, `aip/${workItem.key}`, requireQaMainBranch(input), input.project.sshRemoteUrl),
                     }
                     : {}),
                 ...binding,
@@ -667,26 +680,39 @@ export function qaTools(client, input, binding, cwd, definitions) {
             }));
         }, api));
         api.registerTool(bindHostTool(definitions, "report_qa_asset_merge", async (callId, args) => {
-            if (!input.acceptanceDeliveryId)
-                throw new Error("QA_ACCEPTANCE_CONFIRMATION_REQUIRED");
             requireTestProject();
-            if (!input.project)
-                throw new Error("QA_TEST_PROJECT_REQUIRED");
-            const commits = args.status === "SUCCEEDED"
-                ? await verifyQaAssetMerge(cwd, input.project.remoteUrl, `qa/${workItem.key}`, requireQaMainBranch(input), input.project.sshRemoteUrl)
-                : null;
-            let contentChanged = false;
-            if (commits) {
-                if (!input.approvedSourceCommitSha || !input.approvedMainCommitSha)
-                    throw new Error("QA_ACCEPTANCE_SOURCE_REQUIRED");
-                contentChanged = await qaAssetContentChanged(cwd, input.approvedSourceCommitSha, input.approvedMainCommitSha, commits.sourceCommitSha, commits.mainCommitSha);
+            const task = input.releaseAssetTask;
+            if (!input.project || !task)
+                throw new Error("QA_RELEASE_TASK_REQUIRED：当前没有测试资产上线准备任务");
+            if (task.projectId !== input.project.id)
+                throw new Error("QA_RELEASE_PROJECT_MISMATCH");
+            let mergeRequest;
+            if (args.status === "SUCCEEDED") {
+                const status = await git("git", ["status", "--porcelain", "--untracked-files=all"], {
+                    cwd,
+                });
+                if (status.stdout.trim())
+                    throw new Error("QA_RELEASE_WORKTREE_DIRTY：请提交测试资产修改后再准备 MR");
+                mergeRequest = await prepareMergeRequest({
+                    project: {
+                        id: task.projectId,
+                        name: input.project.name,
+                        repositoryUrl: input.project.remoteUrl,
+                        devBranch: task.sourceBranch,
+                        baselineBranch: task.targetBranch,
+                    },
+                    cwd,
+                    title: args.title ?? `${workItem.key} 测试资产`,
+                    description: args.description ?? args.summary,
+                    updateExisting: args.updateExisting === true,
+                    pendingFile: join(dirname(cwd), `release-mr-${task.id}.json`),
+                });
             }
             return result(await client.qaReportAssetMerge(id, {
-                deliveryId: input.acceptanceDeliveryId,
-                ...(args.status === "SUCCEEDED" ? { contentChanged } : {}),
+                releaseAssetTaskId: task.id,
                 status: args.status,
                 summary: args.summary,
-                ...commits,
+                ...(mergeRequest ? { mergeRequest } : {}),
                 ...binding,
                 toolCallId: callId,
             }));