From c7cc0bc9dace365cf2ae5a51ad6c3d772f64eaad Mon Sep 17 00:00:00 2001 From: RuoJi6 <79234113+RuoJi6@users.noreply.github.com> Date: Wed, 19 Aug 2026 13:31:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=B7=A5=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=95=BF=E5=86=85=E5=AE=B9=E9=81=AE=E6=8C=A1=E5=8F=8A?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=AE=A1=E6=89=B9=E4=BA=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=20(#263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs(hitl): remove stale asm_list_resources references * fix(hitl): constrain approval layout and preserve reviewer --- web/static/css/style.css | 57 +++++++++++++++++++--- web/static/i18n/en-US.json | 2 + web/static/i18n/zh-CN.json | 2 + web/static/js/chat-scroll-refresh.test.cjs | 6 +-- web/static/js/chat.js | 30 +++++++++++- web/static/js/hitl-approval-ui.test.cjs | 35 +++++++++++-- web/static/js/hitl.js | 47 +++++++++++------- web/static/js/monitor.js | 23 ++++++++- web/templates/index.html | 8 +-- 9 files changed, 172 insertions(+), 38 deletions(-) diff --git a/web/static/css/style.css b/web/static/css/style.css index dcb8b92b..c56d4667 100644 --- a/web/static/css/style.css +++ b/web/static/css/style.css @@ -46811,6 +46811,7 @@ html[data-theme="dark"] .chat-composer-surface > .chat-session-settings-popover line-height: 1.5; white-space: pre-wrap; overflow-wrap: anywhere; + scrollbar-gutter: stable; } .hitl-approval-countdown { @@ -46936,7 +46937,11 @@ html[data-theme="dark"] .chat-composer-surface > .chat-session-settings-popover display: block; width: 100%; min-height: 158px; - padding: 18px 20px 16px; + max-height: min(62vh, 560px); + max-height: min(62dvh, 560px); + padding: 18px 20px 74px; + overflow: hidden; + overscroll-behavior: contain; border: 1px solid rgba(15, 23, 42, 0.14); border-radius: 24px; background: rgba(255, 255, 255, 0.985); @@ -46945,6 +46950,16 @@ html[data-theme="dark"] .chat-composer-surface > .chat-session-settings-popover outline: none; } +.chat-hitl-approval-scroll-region { + min-height: 0; + max-height: max(76px, calc(min(62vh, 560px) - 94px)); + max-height: max(76px, calc(min(62dvh, 560px) - 94px)); + overflow-y: auto; + overscroll-behavior: contain; + scroll-padding-bottom: 12px; + scrollbar-gutter: stable; +} + .chat-hitl-approval-dock .hitl-codex-tool-row { font-size: 0.92rem; } @@ -46958,8 +46973,12 @@ html[data-theme="dark"] .chat-composer-surface > .chat-session-settings-popover } .chat-hitl-approval-dock .hitl-approval-heading h3 { + display: -webkit-box; max-width: 900px; + overflow: hidden; font-size: 1rem; + -webkit-box-orient: vertical; + -webkit-line-clamp: 3; } .chat-hitl-approval-dock .hitl-inline-body { @@ -46968,13 +46987,28 @@ html[data-theme="dark"] .chat-composer-surface > .chat-session-settings-popover padding: 0; } +.chat-hitl-approval-dock .hitl-edit-args { + max-height: min(28vh, 220px); + max-height: min(28dvh, 220px); + overflow: auto; + resize: vertical; +} + .chat-hitl-approval-dock .hitl-inline-actions { + position: absolute; + right: 20px; + bottom: 16px; + left: 20px; + z-index: 2; + min-height: 48px; justify-content: flex-end; gap: 8px; - margin-top: 12px; - padding: 0; + margin-top: 0; + padding: 10px 0 0; border: 0; - background: transparent; + border-top: 1px solid color-mix(in srgb, var(--border-color) 70%, transparent); + background: rgba(255, 255, 255, 0.985); + box-shadow: none; } .chat-hitl-approval-dock .hitl-inline-status { @@ -47010,8 +47044,9 @@ html[data-theme="dark"] .chat-hitl-approval-dock { } html[data-theme="dark"] .chat-hitl-approval-dock .hitl-inline-actions { - border-color: transparent !important; - background: transparent !important; + border-color: color-mix(in srgb, var(--border-color) 70%, transparent) !important; + background: color-mix(in srgb, var(--bg-primary) 97%, transparent) !important; + box-shadow: none; } html[data-theme="dark"] .hitl-approval-primary code, @@ -47136,10 +47171,15 @@ html[data-theme="dark"] .hitl-inline-approval.hitl-inline-approval--merged { } .chat-hitl-approval-dock { - padding: 16px; + padding: 16px 16px 116px; border-radius: 18px; } + .chat-hitl-approval-scroll-region { + max-height: max(76px, calc(min(62vh, 560px) - 134px)); + max-height: max(76px, calc(min(62dvh, 560px) - 134px)); + } + .chat-hitl-approval-dock .hitl-approval-heading, .chat-hitl-approval-dock .hitl-approval-primary, .chat-hitl-approval-dock .hitl-approval-countdown, @@ -47149,6 +47189,9 @@ html[data-theme="dark"] .hitl-inline-approval.hitl-inline-approval--merged { } .chat-hitl-approval-dock .hitl-inline-actions { + right: 16px; + bottom: 16px; + left: 16px; flex-wrap: wrap; } diff --git a/web/static/i18n/en-US.json b/web/static/i18n/en-US.json index ba8a69d3..41fbf538 100644 --- a/web/static/i18n/en-US.json +++ b/web/static/i18n/en-US.json @@ -878,6 +878,8 @@ "approvalUrgencyWithinOne": "Earliest approval expires within 1 minute", "requestGeneric": "Allow CyberStrikeAI to call {{tool}}?", "requestVisitUrl": "Allow CyberStrikeAI to visit {{url}}?", + "requestVisitLongUrl": "Allow CyberStrikeAI to visit this address?", + "requestModifyLongPath": "Allow CyberStrikeAI to modify this file?", "requestBrowser": "Allow CyberStrikeAI to use the browser?", "requestCommand": "Allow CyberStrikeAI to run this command?", "requestFile": "Allow CyberStrikeAI to modify {{path}}?", diff --git a/web/static/i18n/zh-CN.json b/web/static/i18n/zh-CN.json index 5b0fb38e..42d99610 100644 --- a/web/static/i18n/zh-CN.json +++ b/web/static/i18n/zh-CN.json @@ -866,6 +866,8 @@ "approvalUrgencyWithinOne": "最早审批将在 1 分钟内到期", "requestGeneric": "允许 CyberStrikeAI 调用 {{tool}}？", "requestVisitUrl": "允许 CyberStrikeAI 访问 {{url}}？", + "requestVisitLongUrl": "允许 CyberStrikeAI 访问此地址？", + "requestModifyLongPath": "允许 CyberStrikeAI 修改此文件？", "requestBrowser": "允许 CyberStrikeAI 使用浏览器？", "requestCommand": "允许 CyberStrikeAI 执行这条命令？", "requestFile": "允许 CyberStrikeAI 修改 {{path}}？", diff --git a/web/static/js/chat-scroll-refresh.test.cjs b/web/static/js/chat-scroll-refresh.test.cjs index 7472ac7c..d0f24e37 100644 --- a/web/static/js/chat-scroll-refresh.test.cjs +++ b/web/static/js/chat-scroll-refresh.test.cjs @@ -340,7 +340,7 @@ test('消息气泡内部流式增高时仅在跟随模式继续粘底', () => { test('页面在任务补流脚本之前加载智能滚动控制器', () => { const scrollIndex = html.indexOf('/static/js/chat-scroll.js?v=20260815-1'); - const monitorIndex = html.indexOf('/static/js/monitor.js?v=20260815-2'); + const monitorIndex = html.indexOf('/static/js/monitor.js?v=20260819-3'); assert.notEqual(scrollIndex, -1); assert.notEqual(monitorIndex, -1); @@ -398,7 +398,7 @@ test('刷新指定对话时立即恢复且加载完成前不闪出无项目状 assert.match(css, /\.chat-container\.is-conversation-restoring #chat-messages/); assert.match(css, /\.chat-container\.is-conversation-restoring #chat-input-container/); assert.match(html, /router\.js\?v=20260813-2/); - assert.match(html, /chat\.js\?v=20260818-3/); + assert.match(html, /chat\.js\?v=20260819-1/); }); test('刷新运行中回复会复用已持久化 planning 并继续追加未来增量', () => { @@ -462,5 +462,5 @@ test('暗色模式对话三点悬浮不会触发浅色父行背景', () => { const css = fs.readFileSync('web/static/css/style.css', 'utf8'); assert.match(css, /html\[data-theme="dark"\] \.project-conversation-row:hover \.project-conversation-item/); assert.match(css, /html\[data-theme="dark"\] \.project-folder-action:hover,[\s\S]*?background: rgba\(71, 85, 105, 0\.28\);[\s\S]*?box-shadow: none;/); - assert.match(html, /style\.css\?v=20260818-3/); + assert.match(html, /style\.css\?v=20260819-4/); }); diff --git a/web/static/js/chat.js b/web/static/js/chat.js index 3e9f518a..565b1ae2 100644 --- a/web/static/js/chat.js +++ b/web/static/js/chat.js @@ -130,6 +130,8 @@ const DEFAULT_HITL_TIMEOUT_SECONDS = 300; const DEFAULT_HITL_SESSION_TOOL_WHITELIST = 'tool_search, skill, task, write_todos, transfer_to_agent, exit, TaskCreate, TaskGet, TaskUpdate, TaskList, upsert_project_fact, get_project_fact'; let hitlApplyFeedbackTimer = null; let hitlAutoSaveTimer = null; +let hitlConfigSyncConversationId = ''; +let hitlConfigSyncPromise = Promise.resolve(); const sessionSettingsSelects = new Map(); let sessionSettingsSelectDocBound = false; @@ -706,6 +708,18 @@ function refreshHitlConfigByCurrentConversation() { applyHitlConfigToUI(cfg); } +async function waitForHitlConfigReady(conversationId) { + const cid = String(conversationId || '').trim(); + if (cid && hitlConfigSyncConversationId === cid) { + await hitlConfigSyncPromise; + return; + } + if (!cid && window.csaiHitlDefaultReviewerReady && typeof window.csaiHitlDefaultReviewerReady.then === 'function') { + await window.csaiHitlDefaultReviewerReady.catch(function () {}); + if (!currentConversationId) refreshHitlConfigByCurrentConversation(); + } +} + function showHitlApplyFeedback(text, isError, partial) { const el = document.getElementById('hitl-apply-feedback'); if (hitlApplyFeedbackTimer) { @@ -2199,6 +2213,15 @@ async function sendMessage() { return; } + // A restored conversation renders from the local cache first, while its + // authoritative HITL config is fetched separately. Do not let a fast send + // reuse the temporary/default reviewer (historically "human") before that + // fetch completes, otherwise refreshing could turn Audit Agent review into + // a human approval for the next tool call. + const hitlConversationAtSendStart = String(currentConversationId || '').trim(); + await waitForHitlConfigReady(hitlConversationAtSendStart); + if (String(currentConversationId || '').trim() !== hitlConversationAtSendStart) return; + // Enter 会直接调用 sendMessage；同一会话在其他标签页已启动任务时， // 必须在渲染用户气泡和发起 POST 前做一次权威状态同步，避免生成一轮“已有任务执行中”伪对话。 if (currentConversationId && typeof loadActiveTasks === 'function') { @@ -6178,7 +6201,12 @@ async function loadConversation(conversationId) { } }).catch(() => {}) : Promise.resolve(); - void hitlSyncPromise; + hitlConfigSyncConversationId = conversationId; + hitlConfigSyncPromise = Promise.resolve(hitlSyncPromise); + await hitlConfigSyncPromise; + if (seq !== loadConversationRequestSeq || currentConversationId !== conversationId) { + return; + } updateActiveConversation(); // 如果攻击链模态框打开且显示的不是当前对话，关闭它 diff --git a/web/static/js/hitl-approval-ui.test.cjs b/web/static/js/hitl-approval-ui.test.cjs index 05bf9218..c540b102 100644 --- a/web/static/js/hitl-approval-ui.test.cjs +++ b/web/static/js/hitl-approval-ui.test.cjs @@ -22,6 +22,35 @@ test('输入区提供独立审批入口并暴露可配置等待时限', () => { assert.match(chat, /body\.hitl = \{[\s\S]*?timeoutSeconds: normalizeHitlTimeoutForChat\(hitlCfg\.timeoutSeconds/); }); +test('超长人工审批内容在限高区域内滚动且操作按钮始终可见', () => { + assert.match(styles, /\.chat-hitl-approval-dock \{[\s\S]*?max-height: min\(62dvh, 560px\);[\s\S]*?padding: 18px 20px 74px;[\s\S]*?overflow: hidden;/); + assert.match(styles, /\.chat-hitl-approval-scroll-region \{[\s\S]*?max-height: max\(76px, calc\(min\(62dvh, 560px\) - 94px\)\);[\s\S]*?overflow-y: auto;[\s\S]*?overscroll-behavior: contain;/); + assert.match(styles, /\.chat-hitl-approval-dock \.hitl-edit-args \{[\s\S]*?max-height: min\(28dvh, 220px\);[\s\S]*?overflow: auto;/); + assert.match(styles, /\.chat-hitl-approval-dock \.hitl-inline-actions \{[\s\S]*?position: absolute;[\s\S]*?bottom: 16px;[\s\S]*?box-shadow: none;/); + assert.match(styles, /\.chat-hitl-approval-dock \.hitl-approval-heading h3 \{[\s\S]*?-webkit-line-clamp: 3;/); + assert.match(monitor, /function wrapChatHitlApprovalScrollRegion\(dock\)/); + assert.match(monitor, /while \(dock\.firstChild && dock\.firstChild !== actions\)/); + assert.match(monitor, /wrapChatHitlApprovalScrollRegion\(dock\);/); + assert.match(monitor, /url\.length > 160[\s\S]*?requestVisitLongUrl/); + assert.equal(zh.hitl.requestVisitLongUrl, '允许 CyberStrikeAI 访问此地址？'); + assert.equal(en.hitl.requestVisitLongUrl, 'Allow CyberStrikeAI to visit this address?'); +}); + +test('刷新恢复会话时先完成权威审批配置同步再允许发送', () => { + assert.match(chat, /function waitForHitlConfigReady\(conversationId\)/); + assert.match(chat, /await waitForHitlConfigReady\(hitlConversationAtSendStart\)/); + assert.match(chat, /hitlConfigSyncConversationId = conversationId;[\s\S]{0,240}await hitlConfigSyncPromise;/); + assert.match(chat, /await hitlConfigSyncPromise;[\s\S]{0,220}seq !== loadConversationRequestSeq/); + assert.match(fs.readFileSync('web/static/js/hitl.js', 'utf8'), /window\.csaiHitlDefaultReviewerReady = initHitlDefaultReviewerFromServer\(\)/); +}); + +test('同一会话的审批配置写入串行化以防止旧请求后到覆盖新选择', () => { + const hitlPage = fs.readFileSync('web/static/js/hitl.js', 'utf8'); + assert.match(hitlPage, /const hitlConversationConfigSaveQueues = new Map\(\)/); + assert.match(hitlPage, /const previous = hitlConversationConfigSaveQueues\.get\(normalizedConversationId\) \|\| Promise\.resolve\(\)/); + assert.match(hitlPage, /const queued = previous\.catch\(function \(\) \{\}\)\.then\(async function \(\)/); +}); + test('输入框可按会话通道获取模型并双向同步会话推理且审批模型只出现在审计 Agent 入口', () => { assert.match(chat, /function currentSystemModelLabel\(\)/); assert.match(chat, /chatDefaultAIChannel \? chatAIChannels\[chatDefaultAIChannel\]/); @@ -262,10 +291,10 @@ test('多对话并发时释放隐藏主流且旧请求不能覆盖新对话状 assert.match(chat, /let loadConversationAbortController = null/); assert.match(chat, /cancelPendingConversationLoad\(\);[\s\S]{0,220}const conversationLoadController = new AbortController\(\)/); assert.match(chat, /signal: conversationLoadController\.signal/); - assert.match(template, /monitor\.js\?v=20260815-2/); + assert.match(template, /monitor\.js\?v=20260819-3/); assert.match(template, /chat-scroll\.js\?v=20260815-1/); - assert.match(template, /chat\.js\?v=20260818-3/); - assert.match(template, /style\.css\?v=20260818-3/); + assert.match(template, /chat\.js\?v=20260819-1/); + assert.match(template, /style\.css\?v=20260819-4/); }); test('输入区 Agent 审查文字保留足够行高且不会裁切字形', () => { diff --git a/web/static/js/hitl.js b/web/static/js/hitl.js index 95694db5..800763c9 100644 --- a/web/static/js/hitl.js +++ b/web/static/js/hitl.js @@ -100,6 +100,7 @@ const HITL_LOGS_PAGE_SIZE_KEY = 'cyberstrike_hitl_logs_page_size'; const HITL_PENDING_PAGE_SIZE_KEY = 'cyberstrike_hitl_pending_page_size'; const HITL_TIMEOUT_DEFAULT_MIGRATION_PREFIX = 'cyberstrike-hitl-timeout-default-v1:'; const HITL_PAGE_SIZE_OPTIONS = [10, 20, 50, 100]; +const hitlConversationConfigSaveQueues = new Map(); function hitlPaginationT(key, opts, fallback) { if (typeof window.t === 'function') { @@ -495,29 +496,39 @@ async function saveHitlPageWhitelist() { async function saveHitlConversationConfig(conversationId, config) { if (!conversationId || !config) return false; + const normalizedConversationId = String(conversationId).trim(); const mode = hitlModeNormalize(config.mode || 'off'); const enabled = typeof config.enabled === 'boolean' ? config.enabled : (mode !== 'off'); const sensitiveTools = hitlSensitiveToolsToArray(config); const timeoutSeconds = normalizeHitlTimeoutSeconds(config.timeoutSeconds, 0); const reviewer = hitlReviewerNormalize(config.reviewer || 'human'); - const resp = await hitlApiFetch('/api/hitl/config', { - method: 'PUT', - credentials: 'same-origin', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify({ - conversationId: conversationId, - enabled: enabled, - mode: mode, - reviewer: reviewer, - sensitiveTools: sensitiveTools, - timeoutSeconds: timeoutSeconds - }) + const previous = hitlConversationConfigSaveQueues.get(normalizedConversationId) || Promise.resolve(); + const queued = previous.catch(function () {}).then(async function () { + const resp = await hitlApiFetch('/api/hitl/config', { + method: 'PUT', + credentials: 'same-origin', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify({ + conversationId: normalizedConversationId, + enabled: enabled, + mode: mode, + reviewer: reviewer, + sensitiveTools: sensitiveTools, + timeoutSeconds: timeoutSeconds + }) + }); + if (!resp.ok) { + const msg = await readHitlApiError(resp); + throw new Error(msg || ('HTTP ' + resp.status)); + } + return true; + }); + hitlConversationConfigSaveQueues.set(normalizedConversationId, queued); + return queued.finally(function () { + if (hitlConversationConfigSaveQueues.get(normalizedConversationId) === queued) { + hitlConversationConfigSaveQueues.delete(normalizedConversationId); + } }); - if (!resp.ok) { - const msg = await readHitlApiError(resp); - throw new Error(msg || ('HTTP ' + resp.status)); - } - return true; } async function syncHitlConfigFromServer(conversationId) { @@ -1809,7 +1820,7 @@ document.addEventListener('DOMContentLoaded', function () { if (typeof window.bindHitlReviewerToggleListeners === 'function') { window.bindHitlReviewerToggleListeners(); } - initHitlDefaultReviewerFromServer(); + window.csaiHitlDefaultReviewerReady = initHitlDefaultReviewerFromServer(); setTimeout(reconcileHitlUiState, 0); }); diff --git a/web/static/js/monitor.js b/web/static/js/monitor.js index 0c26a66c..b84af16f 100644 --- a/web/static/js/monitor.js +++ b/web/static/js/monitor.js @@ -4282,7 +4282,9 @@ function describeHitlApprovalRequest(data) { if (isBrowser) { kind = 'browser'; question = url - ? hitlApprovalTemplate('hitl.requestVisitUrl', '允许 CyberStrikeAI 访问 {{url}}？', { url: url }) + ? (url.length > 160 + ? hitlApprovalTranslate('hitl.requestVisitLongUrl', '允许 CyberStrikeAI 访问此地址？') + : hitlApprovalTemplate('hitl.requestVisitUrl', '允许 CyberStrikeAI 访问 {{url}}？', { url: url })) : hitlApprovalTranslate('hitl.requestBrowser', '允许 CyberStrikeAI 使用浏览器？'); primary = url; } else if (isCommand) { @@ -4292,7 +4294,9 @@ function describeHitlApprovalRequest(data) { } else if (isFile) { kind = 'file'; question = path - ? hitlApprovalTemplate('hitl.requestFile', '允许 CyberStrikeAI 修改 {{path}}？', { path: path }) + ? (path.length > 160 + ? hitlApprovalTranslate('hitl.requestModifyLongPath', '允许 CyberStrikeAI 修改此文件？') + : hitlApprovalTemplate('hitl.requestFile', '允许 CyberStrikeAI 修改 {{path}}？', { path: path })) : hitlApprovalTranslate('hitl.requestFiles', '允许 CyberStrikeAI 修改文件？'); primary = path; } @@ -4835,6 +4839,20 @@ function clearChatHitlApprovalDock(interruptId) { if (container) container.classList.remove('has-hitl-approval'); } +function wrapChatHitlApprovalScrollRegion(dock) { + if (!dock) return; + const actions = Array.prototype.find.call(dock.children, function (child) { + return child.classList && child.classList.contains('hitl-inline-actions'); + }); + if (!actions) return; + const scrollRegion = document.createElement('div'); + scrollRegion.className = 'chat-hitl-approval-scroll-region'; + while (dock.firstChild && dock.firstChild !== actions) { + scrollRegion.appendChild(dock.firstChild); + } + dock.insertBefore(scrollRegion, actions); +} + function renderChatHitlApprovalDock(data) { const dock = document.getElementById('chat-hitl-approval-dock'); if (!dock || !data || !data.interruptId) return false; @@ -4855,6 +4873,7 @@ function renderChatHitlApprovalDock(data) { allowEdit: allowEdit, argsJSON: JSON.stringify(hitlApprovalArguments(data), null, 2) }); + wrapChatHitlApprovalScrollRegion(dock); dock.hidden = false; const container = dock.closest('.chat-input-container'); if (container) container.classList.add('has-hitl-approval'); diff --git a/web/templates/index.html b/web/templates/index.html index 5bbd28ae..86545065 100644 --- a/web/templates/index.html +++ b/web/templates/index.html @@ -31,7 +31,7 @@ } })(); - + @@ -6844,10 +6844,10 @@ - - + + - +