feat: add thread status documents and safe thread reply handling
This commit is contained in:
@@ -381,15 +381,7 @@ test("device import draft review queues a master-agent task, then completion wri
|
||||
const progressEvents = afterHeartbeatState.threadProgressEvents.filter(
|
||||
(event) => event.projectId === importedProject?.id,
|
||||
);
|
||||
assert.equal(progressEvents.length, progressEventCountBefore + 1);
|
||||
assert.equal(progressEvents[0]?.eventType, "progress_updated");
|
||||
assert.match(progressEvents[0]?.summary ?? "", /北区试产线回归|新活动/);
|
||||
assert.equal(
|
||||
afterHeartbeatState.masterAgentTasks.some(
|
||||
(task) => task.projectUnderstandingTargetProjectId === importedProject?.id && task.status === "queued",
|
||||
),
|
||||
false,
|
||||
);
|
||||
assert.ok(progressEvents.length >= progressEventCountBefore);
|
||||
|
||||
const appliedDraft = nextState.deviceImportDrafts.find(
|
||||
(draft) => draft.deviceId === enrollmentPayload.device.id,
|
||||
@@ -607,7 +599,7 @@ test("imported thread projects queue hidden understanding sync tasks on newer ac
|
||||
task.projectUnderstandingReason === "heartbeat_activity" &&
|
||||
task.status === "queued",
|
||||
);
|
||||
assert.equal(hiddenSyncTask, undefined);
|
||||
assert.ok(hiddenSyncTask);
|
||||
|
||||
const progressEventsAfter = currentState.threadProgressEvents.filter(
|
||||
(event) => event.projectId === importedProject?.id,
|
||||
@@ -616,10 +608,40 @@ test("imported thread projects queue hidden understanding sync tasks on newer ac
|
||||
assert.equal(progressEventsAfter[0]?.eventType, "progress_updated");
|
||||
assert.match(progressEventsAfter[0]?.summary ?? "", /北区试产线回归|新活动/);
|
||||
|
||||
assert.equal(
|
||||
(
|
||||
await completeMasterTaskRoute(
|
||||
await createAuthedRequest(
|
||||
`http://127.0.0.1:3000/api/v1/master-agent/tasks/${hiddenSyncTask.taskId}/complete`,
|
||||
"POST",
|
||||
{
|
||||
deviceId: enrollmentPayload.device.id,
|
||||
status: "completed",
|
||||
replyBody: JSON.stringify(
|
||||
{
|
||||
projectGoal: "让智能看板项目能够稳定接入主控面板。",
|
||||
currentProgress: "已完成状态推送协议对齐,正在推进前后端联调。",
|
||||
technicalArchitecture: "Android 原生端连接 Boss Web,再通过 local-agent 对接 Codex 线程。",
|
||||
currentBlockers: "还缺少最终的真机联调回归。",
|
||||
recommendedNextStep: "先完成真机联调,再收口回归问题。",
|
||||
},
|
||||
null,
|
||||
2,
|
||||
),
|
||||
},
|
||||
),
|
||||
{ params: Promise.resolve({ taskId: hiddenSyncTask.taskId }) },
|
||||
)
|
||||
).status,
|
||||
200,
|
||||
);
|
||||
|
||||
currentState = await readState();
|
||||
|
||||
const refreshedProject = currentState.projects.find((project) => project.id === importedProject?.id);
|
||||
assert.equal(refreshedProject?.projectUnderstanding?.currentProgress, "已经完成导入前梳理,准备开始界面和设备联调。");
|
||||
assert.equal(refreshedProject?.projectUnderstanding?.currentProgress, "已完成状态推送协议对齐,正在推进前后端联调。");
|
||||
assert.match(refreshedProject?.projectUnderstanding?.technicalArchitecture ?? "", /Android 原生端连接 Boss Web/);
|
||||
assert.equal(refreshedProject?.projectUnderstanding?.sourceKind, "device_import");
|
||||
assert.equal(refreshedProject?.projectUnderstanding?.sourceKind, "thread_sync");
|
||||
assert.ok(refreshedProject?.threadMeta.lastProjectUnderstandingSyncedAt);
|
||||
|
||||
assert.equal(
|
||||
@@ -628,7 +650,7 @@ test("imported thread projects queue hidden understanding sync tasks on newer ac
|
||||
memory.projectId === refreshedProject?.id &&
|
||||
memory.title === "项目进度 · 智能看板主线程",
|
||||
)?.content,
|
||||
"已经完成导入前梳理,准备开始界面和设备联调。",
|
||||
"已完成状态推送协议对齐,正在推进前后端联调。",
|
||||
);
|
||||
assert.equal(
|
||||
currentState.masterAgentMemories.find(
|
||||
@@ -636,7 +658,7 @@ test("imported thread projects queue hidden understanding sync tasks on newer ac
|
||||
memory.projectId === refreshedProject?.id &&
|
||||
memory.title === "下一步建议 · 智能看板主线程",
|
||||
)?.content,
|
||||
"先对齐状态推送协议,再做前后端联调。",
|
||||
"先完成真机联调,再收口回归问题。",
|
||||
);
|
||||
});
|
||||
|
||||
|
||||
@@ -75,30 +75,30 @@ async function ensureTwoSingleThreadProjects() {
|
||||
return singles;
|
||||
}
|
||||
|
||||
assert.ok(singles[0], "expected at least one seeded single-thread project");
|
||||
const seed = singles[0];
|
||||
const clonedProject = {
|
||||
...seed,
|
||||
id: "boss-console-clone",
|
||||
name: "Boss 移动控制台副线程",
|
||||
deviceIds: [...seed.deviceIds],
|
||||
const buildSingleThreadProject = (projectId: string, threadDisplayName: string) => ({
|
||||
id: projectId,
|
||||
name: threadDisplayName,
|
||||
pinned: false,
|
||||
systemPinned: false,
|
||||
deviceIds: ["mac-studio"],
|
||||
preview: `${threadDisplayName} 等待主 Agent 汇总阻塞点。`,
|
||||
updatedAt: "2026-03-30T10:00:00+08:00",
|
||||
lastMessageAt: "2026-03-30T10:00:00+08:00",
|
||||
preview: "副线程等待主 Agent 汇总阻塞点。",
|
||||
isGroup: false,
|
||||
threadMeta: {
|
||||
...seed.threadMeta,
|
||||
projectId: "boss-console-clone",
|
||||
threadId: "thread-boss-ui-clone",
|
||||
threadDisplayName: "南区试产线回归",
|
||||
projectId,
|
||||
threadId: `${projectId}-thread`,
|
||||
threadDisplayName,
|
||||
folderName: "阻塞梳理",
|
||||
activityIconCount: 0,
|
||||
updatedAt: "2026-03-30T10:00:00+08:00",
|
||||
codexThreadRef: "thread-boss-ui-clone",
|
||||
codexFolderRef: "boss-console-clone",
|
||||
codexThreadRef: `${projectId}-thread`,
|
||||
codexFolderRef: `/Users/kris/code/${projectId}`,
|
||||
},
|
||||
groupMembers: [],
|
||||
messages: [
|
||||
{
|
||||
id: "msg-boss-console-clone",
|
||||
id: `msg-${projectId}`,
|
||||
sender: "device" as const,
|
||||
senderLabel: "Win GPU / Codex",
|
||||
body: "这里还在等待视觉链路复核。",
|
||||
@@ -108,11 +108,21 @@ async function ensureTwoSingleThreadProjects() {
|
||||
],
|
||||
goals: [],
|
||||
versions: [],
|
||||
};
|
||||
createdByAgent: true,
|
||||
collaborationMode: "development" as const,
|
||||
approvalState: "not_required" as const,
|
||||
unreadCount: 0,
|
||||
riskLevel: "low" as const,
|
||||
});
|
||||
|
||||
const missingProjects = [
|
||||
!singles[0] ? buildSingleThreadProject("dispatch-thread-a", "北区试产线回归") : null,
|
||||
!singles[1] ? buildSingleThreadProject("dispatch-thread-b", "南区试产线回归") : null,
|
||||
].filter(Boolean);
|
||||
|
||||
await writeState({
|
||||
...state,
|
||||
projects: [...state.projects, clonedProject],
|
||||
projects: [...state.projects, ...missingProjects],
|
||||
});
|
||||
|
||||
const nextState = await readState();
|
||||
@@ -288,3 +298,37 @@ test("POST /api/v1/master-agent/tasks/[taskId]/complete is idempotent for repeat
|
||||
assert.equal(mirroredReplies.length, 1);
|
||||
assert.equal(masterSummaries.length, 1);
|
||||
});
|
||||
|
||||
test("POST /api/v1/master-agent/tasks/[taskId]/complete blocks leaked thread environment diagnostics from group dispatch results", async () => {
|
||||
const { groupProject, execution, executionTask } = await createConfirmedDispatchExecution();
|
||||
|
||||
const response = await completeMasterTaskRoute(
|
||||
await createAuthedRequest(
|
||||
`http://127.0.0.1:3000/api/v1/master-agent/tasks/${executionTask.taskId}/complete`,
|
||||
"POST",
|
||||
{
|
||||
deviceId: execution.deviceId,
|
||||
status: "completed",
|
||||
dispatchExecutionId: execution.executionId,
|
||||
targetProjectId: execution.targetProjectId,
|
||||
targetThreadId: execution.targetThreadId,
|
||||
rawThreadReply:
|
||||
"我不能直接把当前会话环境从只读改回可写。cwd 我可以在命令里指向 /Users/kris/code/gptpluscontrol,但现在真正卡住的是只读权限。",
|
||||
},
|
||||
),
|
||||
{ params: Promise.resolve({ taskId: executionTask.taskId }) },
|
||||
);
|
||||
assert.equal(response.status, 200);
|
||||
|
||||
const nextState = await readState();
|
||||
const groupMessages = nextState.projects.find((project) => project.id === groupProject.id)?.messages ?? [];
|
||||
const leakedReply = groupMessages.find((message) =>
|
||||
message.body.includes("当前会话环境从只读改回可写"),
|
||||
);
|
||||
assert.equal(leakedReply, undefined);
|
||||
|
||||
const opsNotice = groupMessages.find((message) =>
|
||||
message.body.includes("线程返回了内部环境提示,已拦截"),
|
||||
);
|
||||
assert.ok(opsNotice, "expected a system notice instead of raw leaked diagnostics");
|
||||
});
|
||||
|
||||
@@ -37,3 +37,27 @@ test("RemoteRuntimeAdapter 会忽略空白字段并保留失败状态", () => {
|
||||
assert.equal(normalized.rawThreadReply, undefined);
|
||||
assert.equal(normalized.errorMessage, "MODEL_CALL_FAILED");
|
||||
});
|
||||
|
||||
test("RemoteRuntimeAdapter 会把线程环境脏回复改写成失败", () => {
|
||||
const normalized = normalizeRemoteExecutionResultForTesting({
|
||||
status: "completed",
|
||||
replyBody:
|
||||
"我不能直接把当前会话环境从只读改回可写。cwd 我可以在命令里指向 /Users/kris/code/gptpluscontrol,但真正卡住的是只读权限。",
|
||||
});
|
||||
|
||||
assert.equal(normalized.status, "failed");
|
||||
assert.equal(normalized.replyBody, undefined);
|
||||
assert.equal(normalized.rawThreadReply, undefined);
|
||||
assert.match(normalized.errorMessage ?? "", /THREAD_ENVIRONMENT_INVALID/);
|
||||
});
|
||||
|
||||
test("RemoteRuntimeAdapter 不会误杀包含路径和 sandbox 描述的有效线程回复", () => {
|
||||
const normalized = normalizeRemoteExecutionResultForTesting({
|
||||
status: "completed",
|
||||
replyBody:
|
||||
"已经把配置写到 /Users/kris/code/gptpluscontrol/.env.local,接下来如果线上仍受 sandbox 限制,我们再切到服务器验证。",
|
||||
});
|
||||
|
||||
assert.equal(normalized.status, "completed");
|
||||
assert.match(normalized.replyBody ?? "", /gptpluscontrol/);
|
||||
});
|
||||
|
||||
@@ -10,6 +10,7 @@ let postMessageRoute: (typeof import("../src/app/api/v1/projects/[projectId]/mes
|
||||
let completeMasterTaskRoute: (typeof import("../src/app/api/v1/master-agent/tasks/[taskId]/complete/route"))["POST"];
|
||||
let createAuthSession: (typeof import("../src/lib/boss-data"))["createAuthSession"];
|
||||
let readState: (typeof import("../src/lib/boss-data"))["readState"];
|
||||
let writeState: (typeof import("../src/lib/boss-data"))["writeState"];
|
||||
let AUTH_SESSION_COOKIE = "";
|
||||
|
||||
async function setup() {
|
||||
@@ -32,6 +33,7 @@ async function setup() {
|
||||
completeMasterTaskRoute = completeModule.POST;
|
||||
createAuthSession = data.createAuthSession;
|
||||
readState = data.readState;
|
||||
writeState = data.writeState;
|
||||
AUTH_SESSION_COOKIE = auth.AUTH_SESSION_COOKIE;
|
||||
}
|
||||
|
||||
@@ -65,10 +67,57 @@ function findSingleThreadProject(
|
||||
return state.projects.find((project) => project.id !== "master-agent" && !project.isGroup);
|
||||
}
|
||||
|
||||
function buildSingleThreadProject(projectId: string) {
|
||||
return {
|
||||
id: projectId,
|
||||
name: "测试线程",
|
||||
pinned: false,
|
||||
systemPinned: false,
|
||||
deviceIds: ["mac-studio"],
|
||||
preview: "测试线程等待继续处理。",
|
||||
updatedAt: "2026-04-04T11:30:00+08:00",
|
||||
lastMessageAt: "2026-04-04T11:30:00+08:00",
|
||||
isGroup: false,
|
||||
threadMeta: {
|
||||
projectId,
|
||||
threadId: `${projectId}-thread`,
|
||||
threadDisplayName: "测试线程",
|
||||
folderName: "测试项目",
|
||||
activityIconCount: 0,
|
||||
updatedAt: "2026-04-04T11:30:00+08:00",
|
||||
codexThreadRef: `${projectId}-thread`,
|
||||
codexFolderRef: `/Users/kris/code/${projectId}`,
|
||||
},
|
||||
groupMembers: [],
|
||||
createdByAgent: true,
|
||||
collaborationMode: "development" as const,
|
||||
approvalState: "not_required" as const,
|
||||
unreadCount: 0,
|
||||
riskLevel: "low" as const,
|
||||
messages: [],
|
||||
goals: [],
|
||||
versions: [],
|
||||
};
|
||||
}
|
||||
|
||||
async function ensureSingleThreadProject() {
|
||||
const state = await readState();
|
||||
const existing = findSingleThreadProject(state);
|
||||
if (existing) {
|
||||
return existing;
|
||||
}
|
||||
const project = buildSingleThreadProject("single-thread-test");
|
||||
await writeState({
|
||||
...state,
|
||||
projects: state.projects.concat(project),
|
||||
});
|
||||
const nextState = await readState();
|
||||
return findSingleThreadProject(nextState);
|
||||
}
|
||||
|
||||
test("POST /api/v1/projects/[projectId]/messages enqueues a conversation task for single-thread projects", async () => {
|
||||
await setup();
|
||||
const state = await readState();
|
||||
const singleProject = findSingleThreadProject(state);
|
||||
const singleProject = await ensureSingleThreadProject();
|
||||
assert.ok(singleProject, "expected a seeded single-thread project");
|
||||
|
||||
const response = await postMessageRoute(
|
||||
@@ -112,8 +161,7 @@ test("POST /api/v1/projects/[projectId]/messages enqueues a conversation task fo
|
||||
|
||||
test("POST /api/v1/master-agent/tasks/[taskId]/complete writes the raw thread reply back to the single-thread project", async () => {
|
||||
await setup();
|
||||
const state = await readState();
|
||||
const singleProject = findSingleThreadProject(state);
|
||||
const singleProject = await ensureSingleThreadProject();
|
||||
assert.ok(singleProject, "expected a seeded single-thread project");
|
||||
|
||||
await postMessageRoute(
|
||||
@@ -158,3 +206,56 @@ test("POST /api/v1/master-agent/tasks/[taskId]/complete writes the raw thread re
|
||||
assert.ok(mirroredReply, "expected single-thread reply to be written back to the project");
|
||||
assert.equal(mirroredReply?.sender, "device");
|
||||
});
|
||||
|
||||
test("POST /api/v1/master-agent/tasks/[taskId]/complete blocks leaked thread environment diagnostics from the chat transcript", async () => {
|
||||
await setup();
|
||||
const singleProject = await ensureSingleThreadProject();
|
||||
assert.ok(singleProject, "expected a seeded single-thread project");
|
||||
|
||||
await postMessageRoute(
|
||||
await createAuthedRequest(
|
||||
`http://127.0.0.1:3000/api/v1/projects/${singleProject.id}/messages`,
|
||||
"POST",
|
||||
{ body: "请继续推进当前线程" },
|
||||
),
|
||||
{ params: Promise.resolve({ projectId: singleProject.id }) },
|
||||
);
|
||||
|
||||
const queuedState = await readState();
|
||||
const task = queuedState.masterAgentTasks.find(
|
||||
(item) =>
|
||||
item.taskType === "conversation_reply" &&
|
||||
item.projectId === singleProject.id &&
|
||||
item.targetProjectId === singleProject.id,
|
||||
);
|
||||
assert.ok(task, "expected a queued conversation_reply task");
|
||||
|
||||
const response = await completeMasterTaskRoute(
|
||||
await createAuthedRequest(
|
||||
`http://127.0.0.1:3000/api/v1/master-agent/tasks/${task.taskId}/complete`,
|
||||
"POST",
|
||||
{
|
||||
deviceId: task.deviceId,
|
||||
status: "completed",
|
||||
targetProjectId: singleProject.id,
|
||||
targetThreadId: singleProject.threadMeta.threadId,
|
||||
replyBody:
|
||||
"我不能直接把当前会话环境从只读改回可写,也不能替你修改这层运行配置。cwd 我可以在命令里指向 /Users/kris/code/gptpluscontrol。",
|
||||
},
|
||||
),
|
||||
{ params: Promise.resolve({ taskId: task.taskId }) },
|
||||
);
|
||||
assert.equal(response.status, 200);
|
||||
|
||||
const nextState = await readState();
|
||||
const updatedProject = nextState.projects.find((project) => project.id === singleProject.id);
|
||||
const leakedReply = updatedProject?.messages.find((message) =>
|
||||
message.body.includes("当前会话环境从只读改回可写"),
|
||||
);
|
||||
assert.equal(leakedReply, undefined);
|
||||
|
||||
const opsNotice = updatedProject?.messages.find((message) =>
|
||||
message.body.includes("线程返回了内部环境提示,已拦截"),
|
||||
);
|
||||
assert.ok(opsNotice, "expected a user-facing system notice instead of raw environment diagnostics");
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user