= ({
允许裁剪的文档可选择是否纳入人工审批。关闭后仍会生成并进入版本账本，只是不走三权。
+ {!liveEdit && !needsGovernedDocument(plan) && (
+
+ {NO_GOVERNED_DOCUMENT_MESSAGE}。请勾选「纳入人工审批」并指定负责人；成员不足三人时可用「由编制人兼任审核、批准」。
+
+ )}
{needsThreeMembersForDuties(plan, requireApprovalKeys) && members.length < 3 && (
},
) => void;
handlePassReview: () => Promise;
handleApprove: () => Promise;
@@ -472,6 +473,7 @@ export function useSendMessage(input: SendMessageInput) {
userMsgId: userMsg.id,
clientTurnId,
quote: quotes && quotes.length > 0 ? quotes[0] : undefined,
+ attachments: turnAttachmentRefs(processedAttachments),
});
return { accepted: true };
}
diff --git a/web/src/hooks/useTaskRunAttempts.ts b/web/src/hooks/useTaskRunAttempts.ts
index ab26a266..3367ec47 100644
--- a/web/src/hooks/useTaskRunAttempts.ts
+++ b/web/src/hooks/useTaskRunAttempts.ts
@@ -51,6 +51,7 @@ import type {
QuotedMessage,
TaskRunContext,
} from '../types/workbench';
+import { turnAttachmentRefs, type TurnAttachmentRef } from '../lib/turnAttachments';
import { useTaskRunStream } from './useTaskRunStream';
import { useTurnRuntime } from './useTurnRuntime';
@@ -124,6 +125,7 @@ export function useTaskRunAttempts(input: TaskRunAttemptsInput) {
userMsgId?: string;
clientTurnId?: string;
quote?: QuotedMessage;
+ attachments?: TurnAttachmentRef[];
};
const runStreamAttempt = (
@@ -232,6 +234,7 @@ export function useTaskRunAttempts(input: TaskRunAttemptsInput) {
message: userText,
client_turn_id: opts?.clientTurnId,
quote: quote,
+ attachments: opts?.attachments,
},
{
onEvent: (ev) => {
@@ -973,11 +976,13 @@ export function useTaskRunAttempts(input: TaskRunAttemptsInput) {
const sourceMsg = target.sourceUserMessageId
? messages.find((m) => m.id === target.sourceUserMessageId)
: undefined;
- const originalText = sourceMsg?.content?.trim();
- if (!originalText) return;
+ const originalText = sourceMsg?.content?.trim() || '';
+ const retryAttachments = turnAttachmentRefs(sourceMsg?.attachments);
+ if (!originalText && retryAttachments.length === 0) return;
runStreamAttempt(originalText, messageId, 0, {
userMsgId: sourceMsg?.id,
clientTurnId: target.clientTurnId || sourceMsg?.clientTurnId,
+ attachments: retryAttachments,
});
};
diff --git a/web/src/lib/projectSettingsDuties.test.ts b/web/src/lib/projectSettingsDuties.test.ts
index b902a82d..5c747e27 100644
--- a/web/src/lib/projectSettingsDuties.test.ts
+++ b/web/src/lib/projectSettingsDuties.test.ts
@@ -6,6 +6,7 @@ import {
classifyClientDuty,
clientDutyIssues,
locateDutyIssue,
+ needsGovernedDocument,
needsThreeMembersForDuties,
resolveClientDocTaskDuty,
toggleAuthorOnly,
@@ -67,6 +68,36 @@ describe('projectSettingsDuties', () => {
assert.equal(locateDutyIssue(switchedOn, 'research')?.code, 'DUTY_ASSIGNMENT_REQUIRED');
});
+ it('blocks activation preview when no document is under human approval', () => {
+ const unmanaged = plan([
+ { task_key: 'research', enabled: true, approval_configurable: true, duties: {} },
+ { task_key: 'quote', enabled: true, approval_configurable: true, duties: {} },
+ ]);
+ assert.equal(needsGovernedDocument(unmanaged), false);
+ assert.deepEqual(clientDutyIssues(unmanaged, [{ userId: 1 }]), []);
+
+ const authorOnly = plan([
+ {
+ task_key: 'intake',
+ enabled: true,
+ approval_configurable: true,
+ duty_policy: 'author_only',
+ duties: { author_user_id: 7 },
+ },
+ ]);
+ assert.equal(needsGovernedDocument(authorOnly), true);
+
+ const separated = plan([
+ {
+ task_key: 'intake',
+ enabled: true,
+ approval_configurable: true,
+ duties: { author_user_id: 1, reviewer_user_id: 2, approver_user_id: 3 },
+ },
+ ]);
+ assert.equal(needsGovernedDocument(separated), true);
+ });
+
it('allows an all-none configurable draft without three members', () => {
const draft = plan([
{ task_key: 'research', enabled: true, approval_configurable: true, duties: {} },
diff --git a/web/src/lib/projectSettingsDuties.ts b/web/src/lib/projectSettingsDuties.ts
index a6c08abd..0baf14ff 100644
--- a/web/src/lib/projectSettingsDuties.ts
+++ b/web/src/lib/projectSettingsDuties.ts
@@ -189,6 +189,17 @@ export function clientDutyIssues(
return issues;
}
+/** 对齐服务端 validateActivationPlan：激活前至少一份文档为完整人工审批（含兼任派生的 A/A/A）。 */
+export const NO_GOVERNED_DOCUMENT_MESSAGE = '至少一份文档必须纳入人工审批才能激活工作流';
+
+export function needsGovernedDocument(plan: WorkflowPlan): boolean {
+ return plan.stages.some(
+ (stage) =>
+ stage.enabled &&
+ stage.doc_tasks.some((task) => task.enabled && resolveClientDocTaskDuty(task).mode === 'full'),
+ );
+}
+
export function needsThreeMembersForDuties(plan: WorkflowPlan, requireApprovalKeys: string[] = []): boolean {
return plan.stages.some(
(stage) =>
diff --git a/web/src/lib/taskRunErrorInfo.ts b/web/src/lib/taskRunErrorInfo.ts
index 27d53d97..23f68dba 100644
--- a/web/src/lib/taskRunErrorInfo.ts
+++ b/web/src/lib/taskRunErrorInfo.ts
@@ -132,9 +132,13 @@ export function buildNetworkErrorInfo(
}
if (httpStatus !== undefined && httpStatus >= 400 && httpStatus < 500) {
const shown = code || `HTTP_${httpStatus}`;
+ const validationDetail =
+ (code === 'VALIDATION' || code === 'message cannot be empty') && detail
+ ? humanizeValidationDetail(detail)
+ : '';
return {
- userMessage: detail || `请求失败（${shown}），请重试或联系管理员`,
- code: shown,
+ userMessage: validationDetail || detail || `请求失败（${shown}），请重试或联系管理员`,
+ code: code === 'message cannot be empty' ? 'VALIDATION' : shown,
class: 'fatal',
actions: ['retry'],
};
@@ -147,6 +151,13 @@ export function buildNetworkErrorInfo(
};
}
+function humanizeValidationDetail(detail: string): string {
+ if (detail === 'message cannot be empty') {
+ return '请输入文字，或上传文档后再发送';
+ }
+ return detail;
+}
+
/** interrupted 且有工作区时可继续；否则只允许按原请求重开。 */
export function buildInterruptedTaskErrorInfo(errorMessage: string, workspaceId: string): ChatErrorInfo {
const message = errorMessage.trim() || '任务执行中断，可继续或重新开始';
diff --git a/web/src/lib/turnAttachments.test.ts b/web/src/lib/turnAttachments.test.ts
new file mode 100644
index 00000000..984ba7bb
--- /dev/null
+++ b/web/src/lib/turnAttachments.test.ts
@@ -0,0 +1,38 @@
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { turnAttachmentRefs } from './turnAttachments';
+import { describeChatHttpFailure } from '../api/chatStream';
+import { buildNetworkErrorInfo } from './taskRunErrorInfo';
+
+test('turnAttachmentRefs keeps doc and parse facts', () => {
+ const refs = turnAttachmentRefs([
+ { name: 'F-030-PIR.pdf', docId: 'doc-1', assetId: 8, parseState: 'pending' },
+ { name: ' ' },
+ ]);
+ assert.deepEqual(refs, [
+ {
+ filename: 'F-030-PIR.pdf',
+ doc_id: 'doc-1',
+ asset_id: 8,
+ parse_state: 'pending',
+ },
+ ]);
+});
+
+test('describeChatHttpFailure prefers the public validation error', () => {
+ const failure = describeChatHttpFailure(
+ JSON.stringify({
+ code: 'VALIDATION',
+ message: '请求参数无效',
+ error: 'message cannot be empty',
+ }),
+ );
+ assert.equal(failure.code, 'VALIDATION');
+ assert.equal(failure.detail, 'message cannot be empty');
+ const info = buildNetworkErrorInfo(400, {
+ errorCode: failure.code,
+ detail: failure.detail,
+ });
+ assert.equal(info.userMessage, '请输入文字，或上传文档后再发送');
+ assert.equal(info.code, 'VALIDATION');
+});
diff --git a/web/src/lib/turnAttachments.ts b/web/src/lib/turnAttachments.ts
new file mode 100644
index 00000000..477461a8
--- /dev/null
+++ b/web/src/lib/turnAttachments.ts
@@ -0,0 +1,32 @@
+export type TurnAttachmentRef = {
+ filename: string;
+ doc_id?: string;
+ asset_id?: number;
+ parse_state?: string;
+};
+
+type AttachmentLike = {
+ name?: string;
+ docId?: string;
+ assetId?: number;
+ parseState?: string;
+};
+
+/** 把输入区附件收成对话回合引用。没有文件名的占位项不进入请求。 */
+export function turnAttachmentRefs(
+ attachments: AttachmentLike[] | undefined,
+): TurnAttachmentRef[] {
+ if (!attachments?.length) return [];
+ const refs: TurnAttachmentRef[] = [];
+ for (const att of attachments) {
+ const filename = att.name?.trim() || '';
+ if (!filename && !att.docId && !(att.assetId && att.assetId > 0)) continue;
+ refs.push({
+ filename: filename || '未命名文档',
+ ...(att.docId ? { doc_id: att.docId } : {}),
+ ...(att.assetId && att.assetId > 0 ? { asset_id: att.assetId } : {}),
+ ...(att.parseState ? { parse_state: att.parseState } : {}),
+ });
+ }
+ return refs;
+}
diff --git a/web/src/types/systemAdmin.ts b/web/src/types/systemAdmin.ts
index 33854ee5..16ac5349 100644
--- a/web/src/types/systemAdmin.ts
+++ b/web/src/types/systemAdmin.ts
@@ -69,3 +69,23 @@ export interface SystemSetting {
applyStatus?: string;
applyError?: string;
}
+
+export interface ErrorEventRecord {
+ id: number;
+ code: string;
+ class?: string;
+ httpStatus?: number;
+ requestId?: string;
+ sessionId?: string;
+ workspaceId?: string;
+ module?: string;
+ phaseId?: string;
+ path?: string;
+ method?: string;
+ source?: string;
+ upstream?: string;
+ actorUserId?: number;
+ retryable?: boolean;
+ userMessage?: string;
+ createdAt?: string;
+}
diff --git a/web/src/types/workbench.ts b/web/src/types/workbench.ts
index 5ad08d74..8014966d 100644
--- a/web/src/types/workbench.ts
+++ b/web/src/types/workbench.ts
@@ -160,6 +160,7 @@ export interface ChatErrorInfo {
requestId?: string;
sessionId?: string;
workspaceId?: string;
+ guide?: string;
actions: Array<'retry' | 'continue' | 'restart'>;
}