diff --git a/docs/user-guide.md b/docs/user-guide.md
index 02e9ff9..385d3e5 100644
--- a/docs/user-guide.md
+++ b/docs/user-guide.md
@@ -65,7 +65,7 @@
每条会话右侧的 `⋯` 可归档、恢复或移至回收站;会话范围可切换活跃、已归档、回收站。回收站历史只读,支持恢复或经确认永久删除,没有自动清空。删除不会退回当日调用额度,独立操作审计及已延续到其他会话的上下文保留。回复/操作进行中需先停止回复或等待操作结束。继续新对话带入最近三轮上下文;父会话删除后子会话仍可继续。归档/回收站标题搜索覆盖最近 2000 个,超出时明确标注范围。
-可直接描述连接、扫描或归档异常,也可输入 `/` 打开固定命令菜单。`/help` 展示帮助,`/status` 只刷新本机授权概况;`/bpm`、`/storage`、`/archive` 选择可见目标后填入诊断草稿,发送才调用模型。输入区模型控件与 `/model` 可按供应商选择管理员已启用的模型,下一轮生效;每轮回答旁显示实际使用的供应商/模型。移除或停用所选模型后须重新选择。概况刷新不会自动检查外部连接,未知命令不会作为提示词发送。未配置模型时仍可查看授权概况。
+可直接描述连接、扫描或归档异常,也可输入 `/` 打开固定命令菜单。`/help` 展示帮助,`/status` 只刷新本机授权概况;`/bpm`、`/storage`、`/archive` 选择可见目标后填入诊断草稿,发送才调用模型。输入区模型控件与 `/model` 可按供应商选择管理员已启用的模型,下一轮生效;每轮回答旁显示实际使用的供应商/模型。移除或停用所选模型后须重新选择。模型目录会在短时间内复用,避免反复打开选择器时重复等待。若助手开关关闭,发送区会直接提示“助手已暂停”并提供设置入口,不再只显示灰色按钮。概况刷新不会自动检查外部连接,未知命令不会作为提示词发送。未配置模型时仍可查看授权概况。
过程按真实阶段推送,断线后补读,必要时回退轮询;首版回答在完整校验后显示,不逐字输出,也不展示模型内部思考。概况是最近观测,证据页是该轮实际使用的快照,两者时间和范围可能不同。停止只针对模型回复,确认进程退出前显示“正在停止”;操作中断或结果不明显示“待核验”。
diff --git a/tests/assistant/providers-ui.test.cjs b/tests/assistant/providers-ui.test.cjs
index 9ff0718..d7788e2 100644
--- a/tests/assistant/providers-ui.test.cjs
+++ b/tests/assistant/providers-ui.test.cjs
@@ -19,3 +19,10 @@ test('provider save locks mutable fields until its acknowledged response complet
test('provider cancel asks once before discarding a dirty draft',{timeout:90000},async t=>{
const {page,open}=await managementFixture(t,{browser:true});await open('#assistant-settings');await page.getByRole('button',{name:'添加供应商',exact:true}).click();await page.getByLabel('供应商名称',{exact:true}).fill('UNSAVED_NAME');await page.getByRole('button',{name:'取消',exact:true}).click();await page.getByRole('dialog',{name:'未保存的修改',exact:true}).waitFor();await page.getByRole('button',{name:'放弃并继续',exact:true}).click();await page.locator('#provider-edit-form').waitFor({state:'hidden'});assert.equal(await page.getByRole('dialog',{name:'未保存的修改',exact:true}).count(),0);
});
+test('paused assistant explains why send is unavailable and reuses the model directory',{timeout:90000},async t=>{
+ const {page,open}=await managementFixture(t,{browser:true});let providerGets=0;
+ await page.route('**/api/assistant/providers',async route=>{if(route.request().method()==='GET')providerGets++;await route.continue();});
+ await open();await page.getByRole('button',{name:/选择模型/}).click();await page.getByRole('button',{name:/选择模型/}).press('Escape');await page.getByRole('button',{name:/选择模型/}).click();
+ assert.equal(providerGets,1);assert.equal(await page.getByRole('button',{name:'发送',exact:true}).isDisabled(),true);
+ await page.getByRole('link',{name:'启用助手设置',exact:true}).waitFor();assert.match(await page.getByText('助手已暂停',{exact:false}).innerText(),/助手已暂停/);
+});
diff --git a/web/modules/assistant/layout.js b/web/modules/assistant/layout.js
index 5400dd6..4773dc4 100644
--- a/web/modules/assistant/layout.js
+++ b/web/modules/assistant/layout.js
@@ -1,6 +1,6 @@
'use strict';
window.AssistantLayout={mount(host,{settings,usage,esc}){
- host.innerHTML=`新对话
新对话
暂无匹配的可用模型。
前往助手设置';}} async function choose(row){if(!alive()||generation!==at)return;const buttons=[...options.querySelectorAll('button')];buttons.forEach(b=>b.disabled=true);try{await onSelect({providerId:row.provider.id,modelId:row.model.id});if(alive()&&generation===at){conversation=getConversation();label();close();button.focus();}}catch(error){if(alive()&&generation===at){onError(error);buttons.forEach(b=>b.disabled=false);}}} diff --git a/web/modules/assistant/view.js b/web/modules/assistant/view.js index 044ee2d..bfcfcb1 100644 --- a/web/modules/assistant/view.js +++ b/web/modules/assistant/view.js @@ -13,7 +13,7 @@ const transcript=window.AssistantConversation.mount(messages,{esc,formatDate,user,onActions:()=>panel.showActions(),onEvidence:turn=>panel.evidence(turn),onRetry:turn=>{input.value=turn.text;input.dataset.diagnostic=turn.diagnosticSnapshot?.diagnostic?JSON.stringify(turn.diagnosticSnapshot.diagnostic):'';pendingRequest=null;input.focus();error.textContent='重新诊断将创建新一轮并使用新快照;不会重新执行旧操作。';}}); const commands=window.AssistantCommands.mount(root,{getContext:()=>panel.getContext(),onStatus:async(kind,catalog)=>{error.textContent='';if(kind==='help')panel.help(catalog);else{await panel.refresh();panel.select('overview');}},onSelect:(command,row)=>{input.value=({bpm:'分析此 BPM 连接及最近扫描异常',storage:'分析此存储连接的最近状态',archive:'分析这次归档的失败原因'})[command]+':'+(row.name||row.orderNumber||row.id);input.dataset.diagnostic=JSON.stringify({command,targetId:row.id});pendingRequest=null;input.dispatchEvent(new Event('input'));input.focus();},onError:showError,onModel:()=>picker.open()}); picker=window.AssistantModelPicker.mount(root,{api,isActive:live,getConversation:()=>conversation,onError:showError,onSelect:async choice=>{const owner=await ensureConversation();if(!owner)return;const selected=await api('/assistant/conversations/'+owner.id+'/model',{version:conversation.version,...choice});if(!live()||owner.id!==currentId||owner.at!==revision)return;conversation=selected;pendingRequest=null;if(!eventClient)await select(owner.id);else draw();}}); - function updateComposer(){const running=conversation?.turns.some(t=>t.status==='running');send.disabled=creating||!!running||!data.settings.enabled||!picker.usable||!!conversation?.archived||!!conversation?.deletedAt||(conversation?.turns.length||0)>=100;input.disabled=creating||!!conversation?.archived||!!conversation?.deletedAt;stop.hidden=!running;stop.disabled=!!conversation?.turns.some(t=>t.status==='running'&&t.cancelRequested);stop.textContent=stop.disabled?'正在停止…':'停止回复';} + function updateComposer(){const running=conversation?.turns.some(t=>t.status==='running');send.disabled=creating||!!running||!data.settings.enabled||!picker.usable||!!conversation?.archived||!!conversation?.deletedAt||(conversation?.turns.length||0)>=100;input.disabled=creating||!!conversation?.archived||!!conversation?.deletedAt;const hint=root.querySelector('#assistant-send-hint');if(hint){hint.replaceChildren();if(!data.settings.enabled){hint.append('助手已暂停,');const link=document.createElement('a');link.href='#assistant-settings';link.textContent='前往助手设置启用助手';link.setAttribute('aria-label','启用助手设置');hint.append(link);}else if(!picker.usable){hint.append('还没有可用模型,');const link=document.createElement('a');link.href='#assistant-settings';link.textContent='前往助手设置添加供应商或模型';hint.append(link);}else if(conversation?.archived||conversation?.deletedAt)hint.textContent='当前会话只读,请恢复或新建对话。';else if(conversation?.turns.length>=100)hint.textContent='当前会话已达 100 轮,请继续新对话。';}stop.hidden=!running;stop.disabled=!!conversation?.turns.some(t=>t.status==='running'&&t.cancelRequested);stop.textContent=stop.disabled?'正在停止…':'停止回复';} async function confirmPurge(target){const dialog=document.createElement('dialog');dialog.className='page-leave-dialog';dialog.setAttribute('aria-label','永久删除会话');dialog.innerHTML=''+esc(target.title)+' 的消息和诊断快照将删除,无法从回收站恢复。操作审计、调用额度和已延续到其他会话的上下文保留。
';root.append(dialog);dialog.showModal();const answer=await new Promise(resolve=>{dialog.oncancel=e=>{e.preventDefault();resolve(false);};dialog.onclose=()=>resolve(false);const buttons=dialog.querySelectorAll('button');buttons[0].onclick=()=>resolve(false);buttons[1].onclick=()=>resolve(true);});dialog.close();dialog.remove();return answer;} async function manage(action,id,target){if(managing)return;const ownedTarget=id===currentId&&conversation?conversation:target,at=revision;managing=true;drawLifecycle();drawList();try{if(action==='purge'&&!await confirmPurge(ownedTarget))return;if(!live()||at!==revision)return;const path=action==='delete'?'delete':action;const result=await api('/assistant/conversations/'+id+'/'+path,{version:ownedTarget.version,...(action==='purge'?{confirm:'delete'}:{})},{managedOutcome:true});if(!live())return;if(at!==revision){if(['delete','purge'].includes(action))drafts.delete(id);await refreshList();return;}if(['delete','purge'].includes(action)){drafts.delete(id);if(id===currentId){input.value='';pendingRequest=null;currentId='';}}if(action==='continue'||action==='restore-deleted'||action==='restore'){scope=result.archived?'archived':'active';root.querySelector('#assistant-scope').value=scope;}await refreshList(1);if(!live()||at!==revision)return;const next=['continue','restore-deleted','restore'].includes(action)?result.id:data.conversations.some(c=>c.id===currentId)?currentId:data.conversations[0]?.id||'';await select(next);}catch(e){if(live()&&at===revision){showError(e);await refreshList();}}finally{managing=false;if(live()){drawLifecycle();drawList();}}} function drawLifecycle(){const box=root.querySelector('#assistant-lifecycle');box.replaceChildren();if(!conversation)return;const actions=conversation.deletedAt?[['restore-deleted','从回收站恢复'],['purge','永久删除']]:[[conversation.archived?'restore':'archive',conversation.archived?'恢复会话':'归档会话'],['continue','继续新对话'],['delete','删除会话']];for(const [action,label]of actions){const b=document.createElement('button');b.type='button';b.className='btn btn-sm'+(action==='purge'?' btn-outline-danger':'');b.textContent=label;b.disabled=managing||conversation.turns.some(t=>t.status==='running'||t.actions?.some(a=>a.status==='running'));b.onclick=()=>manage(action,currentId,conversation);box.append(b);}root.querySelector('#assistant-history-note').textContent=conversation.deletedAt?'回收站 · 历史只读,可恢复或永久删除。':conversation.archived?'已归档;恢复后可继续。':conversation.turns.length>=100?'已达100轮,继续新对话带入最近3轮。':'';} @@ -37,7 +37,7 @@ async function sendMessage(event){event.preventDefault();if(await commands.consume())return;if(send.disabled||!input.value.trim())return;send.disabled=true;error.textContent='';const text=input.value,diagnostic=input.dataset.diagnostic?JSON.parse(input.dataset.diagnostic):undefined;let owner={id:currentId,at:revision};const owns=()=>live()&¤tId===owner.id&&revision===owner.at; try{const ensured=await ensureConversation();if(!ensured)return;owner=ensured;if(!owns())return;const {id}=owner,stamp=JSON.stringify([text,diagnostic,conversation?.modelSelection]);if(!pendingRequest||pendingRequest.stamp!==stamp)pendingRequest={stamp,id:window.PageLifecycle?.requestKey?.()||crypto.randomUUID()};const requestId=pendingRequest.id; await api('/assistant/conversations/'+id+'/messages',{text,diagnostic,requestId}, {managedOutcome:true});if(!owns())return;if(input.value===text){input.value='';input.dataset.diagnostic='';}pendingRequest=null;drafts.delete(id);await refreshList();if(owns())await select(id); - }catch(e){if(owns()){showError(e);await loadCurrent().catch(()=>{});if(!owns())return;if(e.status===409)await picker.refresh().catch(()=>{});if(e.outcome==='uncertain')error.textContent='提交结果待核实,已查询当前会话;再次发送同一草稿将使用原请求编号。';updateComposer();}} + }catch(e){if(owns()){showError(e);await loadCurrent().catch(()=>{});if(!owns())return;if(e.status===409)await picker.refresh({force:true}).catch(()=>{});if(e.outcome==='uncertain')error.textContent='提交结果待核实,已查询当前会话;再次发送同一草稿将使用原请求编号。';updateComposer();}} } root.querySelector('#assistant-compose').onsubmit=sendMessage; input.onkeydown=event=>{if(event.defaultPrevented||event.isComposing)return;if(event.key==='Enter'&&!event.shiftKey){event.preventDefault();root.querySelector('#assistant-compose').requestSubmit();}};