fix(assistant): enforce DSH terminal order and preserve mapping outcome
This commit is contained in:
1 parent
465f72a526
commit
9d51676d7b
4 files changed
+21
-2
No files matched your search
@@ -1,6 +1,7 @@
|
||||
'use strict';
|
||||
const fail=(message,status=400)=>Object.assign(Error(message),{status});
|
||||
const statuses=new Set(['running','proposed','success','error','cancelled','interrupted','needs_review','ready_for_review','rolled_back','checked','blocked','unknown']);
|
||||
const resultStatuses=new Set([...statuses,'needs-selection']);
|
||||
const terminal=new Set(['completed','error','cancel_requested','cancelled','interrupted','needs_review','proposal','awaiting_confirmation','action_result']);
|
||||
const kinds=new Set(['queued','snapshot','runtime','model','validation','completed','error','cancel_requested','cancelled','interrupted','needs_review','proposal','awaiting_confirmation','action_running','action_progress','action_result']);
|
||||
function safeData(kind,input={}){
|
||||
@@ -10,7 +11,7 @@ function safeData(kind,input={}){
|
||||
if(kind==='runtime'&&input.phase==='ready')data.phase='ready';
|
||||
if(kind==='model'){if(!['turn_start','step_start','step_end','turn_end'].includes(input.phase))throw fail('助手模型阶段无效。');data.phase=input.phase;number('turn');number('step');}
|
||||
if(['proposal','awaiting_confirmation'].includes(kind))number('count');
|
||||
if(kind.startsWith('action_')){if(typeof input.actionId!=='string'||!/^[-\w]{1,100}$/.test(input.actionId))throw fail('助手操作事件无效。');data.actionId=input.actionId;for(const key of ['completed','total','captured','failed'])number(key);if(statuses.has(input.resultStatus))data.resultStatus=input.resultStatus;}
|
||||
if(kind.startsWith('action_')){if(typeof input.actionId!=='string'||!/^[-\w]{1,100}$/.test(input.actionId))throw fail('助手操作事件无效。');data.actionId=input.actionId;for(const key of ['completed','total','captured','failed'])number(key);if(resultStatuses.has(input.resultStatus))data.resultStatus=input.resultStatus;}
|
||||
if(statuses.has(input.status))data.status=input.status;
|
||||
if(['error','needs_review'].includes(kind)&&['runtime_error','stop_unconfirmed','audit_unavailable'].includes(input.code))data.code=input.code;
|
||||
return data;
|
||||
|
||||
@@ -6,7 +6,7 @@ const invalid=()=>Object.assign(Error('DSH 未返回完整有效的诊断结果
|
||||
function createDecoder(onEvent){
|
||||
const decoder=new StringDecoder('utf8');let pending='',final,reason,sessionId,ended=false;const maxLine=1024*1024;
|
||||
const line=value=>{if(!value.trim())return;let event;try{event=JSON.parse(value);}catch{throw invalid();}if(!event||Array.isArray(event)||typeof event!=='object'||event.version!==undefined&&event.version!==1||event.schemaVersion!==undefined&&event.schemaVersion!==1)throw invalid();
|
||||
if(sessionId&&event.sessionId!==undefined&&event.sessionId!==sessionId)throw invalid();
|
||||
if(final||reason&&event.type!=='final'||sessionId&&event.sessionId!==undefined&&event.sessionId!==sessionId)throw invalid();
|
||||
switch(event.type){
|
||||
case 'session':if(sessionId||typeof event.sessionId!=='string'||!event.sessionId||event.sessionId.length>200)throw invalid();sessionId=event.sessionId;return;
|
||||
case 'thinking':case 'text':return;
|
||||
|
||||
@@ -11,6 +11,16 @@ test('native tools, unknown events, invalid statuses, duplicate final and incomp
|
||||
for(const output of ['{"type":"final","text":"partial"}','{"type":"final","reason":{"kind":"completed"},"text":"ok"}\n{"type":"final","reason":{"kind":"completed"},"text":"again"}','{"type":"status","phase":"turn_end","reason":{"kind":"cancelled"}}\n{"type":"final","reason":{"kind":"completed"},"text":"ok"}']){const decoder=createDecoder();assert.throws(()=>{decoder.write(Buffer.from(output));decoder.end();});}
|
||||
const decoder=createDecoder();assert.throws(()=>decoder.write(Buffer.from('x'.repeat(1024*1024+1))),{status:502});
|
||||
});
|
||||
test('terminal turn_end only permits its final and never permits renewed model activity',()=>{
|
||||
const {createDecoder}=events(),terminal={type:'status',phase:'turn_end',reason:{kind:'completed'}},final={type:'final',text:'checked'};
|
||||
for(const later of [{type:'status',phase:'turn_start'},{type:'status',phase:'step_start',step:2},{type:'status',phase:'step_end',step:2},{type:'text',text:'unfinished response'},{type:'thinking',text:'unfinished reasoning'},{type:'session',sessionId:'later-session'}]){
|
||||
const seen=[],decoder=createDecoder(event=>seen.push(event));decoder.write(Buffer.from(JSON.stringify(terminal)+'\n'));
|
||||
assert.throws(()=>decoder.write(Buffer.from([later,final].map(JSON.stringify).join('\n')+'\n')),{status:502},later.type+':'+(later.phase||''));
|
||||
assert.deepEqual(seen,[{kind:'model',data:{phase:'turn_end'}}]);
|
||||
}
|
||||
const completed=createDecoder();completed.write(Buffer.from([terminal,final].map(JSON.stringify).join('\n')+'\n'));
|
||||
assert.throws(()=>completed.write(Buffer.from('{"type":"text","text":"extra response"}\n')),{status:502});
|
||||
});
|
||||
test('runtime publishes sanitized native status before child exit and rejects a forbidden tool immediately',async t=>{
|
||||
const fs=require('node:fs/promises'),os=require('node:os'),path=require('node:path'),{invoke,environment}=require('../../src/modules/assistant/dsh-runtime.cjs'),dir=await fs.mkdtemp(path.join(os.tmpdir(),'dsh-progress-'));
|
||||
t.after(()=>fs.rm(dir,{recursive:true,force:true}));const file=path.join(dir,'child.cjs'),controller=new AbortController(),seen=[];
|
||||
|
||||
@@ -49,3 +49,11 @@ test('cancellation remains pending until child exit and uncertain stop stays nee
|
||||
const pending=store.conversation(c.id,'alice').turns[0];rejectRun(Object.assign(Error('stop uncertain'),{status:502,stopUnconfirmed:true}));await service.running.get(turn.id).task;
|
||||
assert.equal(pending.status,'running');assert.equal(pending.cancelRequested,true);const saved=store.conversation(c.id,'alice').turns[0];assert.equal(saved.status,'needs_review');assert.equal(saved.cancelRequested,false);assert.equal(store.events(c.id,'alice',{}).events.at(-1).kind,'needs_review');
|
||||
});
|
||||
test('an ambiguous real mapping preparation keeps needs-selection in its durable action result',async t=>{
|
||||
const {store,service}=fixture(t);enable(store);store.saveSettings({...store.settings(),apiKey:'',allowActions:true});
|
||||
const sample={id:'sample-1',evidenceHash:'evidence-hash',processName:'fixture-process',processVersion:'1',sample:{connectionId:'source-1'}};
|
||||
Object.assign(service.deps,{workspace:{getConnection:()=>({status:'connected'}),record(){}},orderExecution:{},orderRules:{get:kind=>kind==='capture-samples'?sample:undefined,proposeMapping:()=>({mapping:{sources:{}},blockedReasons:['请选择订单号来源'],fields:[{state:'ambiguous'}]})}});
|
||||
const c=store.create('alice'),turn=store.beginTurn(c.id,'alice','prepare mapping');store.updateTurn(turn.id,'success',{reply:'review proposal',actions:[{id:'mapping-action',kind:'prepare_field_mapping',targetId:'sample-1',status:'proposed',guard:{sampleHash:'evidence-hash',draftVersion:0}}]});
|
||||
const result=await service.executeAction(c.id,'mapping-action',{...principal,sessionId:'fixture-session'});assert.equal(result.status,'success');assert.equal(result.result.status,'needs-selection');
|
||||
const event=store.events(c.id,'alice',{}).events.find(e=>e.kind==='action_result');assert.equal(event.actionId,'mapping-action');assert.equal(event.data.status,'success');assert.equal(event.data.resultStatus,'needs-selection');assert.doesNotMatch(JSON.stringify(event),/请选择订单号来源/);
|
||||
});
|
||||
Reference in new issue
Block a user