deadbyte-mcp 0.11.2 → 0.12.0

package/test/remote-r24-catalog.test.mjs

@@ -66,17 +66,26 @@ test('R32 remote gate accepts observation only with machine plus coding configur
   assert.match(source, /observation_runtime: observationRuntime/);
 });
 
-test('R36 remote smoke accepts only the exact compact production catalog and uses read-only gateway proof', async () => {
+test('R40 remote smoke preserves exact R36 compact compatibility and accepts only exact attested R40 compact catalog', async () => {
   const source = await readFile(sourcePath, 'utf8');
   assert.match(source, /const r36CompactTools = \[/);
   assert.match(source, /r36CompactTools\.length !== 41/);
-  assert.match(source, /const compactProfile = JSON\.stringify\(names\) === JSON\.stringify\(r36CompactTools\)/);
+  assert.match(source, /const r40CompactTools = \[\.\.\.r36CompactTools, 'desktop_control'\]\.sort\(\)/);
+  assert.match(source, /r40CompactTools\.length !== 42/);
+  assert.match(source, /const exactR36Compact = JSON\.stringify\(names\) === JSON\.stringify\(r36CompactTools\)/);
+  assert.match(source, /const exactR40Compact = JSON\.stringify\(names\) === JSON\.stringify\(r40CompactTools\)/);
+  assert.match(source, /const compactProfile = exactR36Compact \|\| exactR40Compact/);
+  assert.match(source, /deadbyte\.capability-manifest\.v1/);
+  assert.match(source, /deadbyte\.capability-manifest\.v2/);
+  assert.match(source, /manifest\.tool_count !== names\.length/);
+  assert.match(source, /JSON\.stringify\(manifest\.tool_catalog\) !== JSON\.stringify\(names\)/);
+  assert.match(source, /manifest\.catalog_sha256 !== expectedCatalogSha/);
   assert.match(source, /capability_manifest/);
   assert.match(source, /machine_observe/);
   assert.match(source, /op: 'machine_status'/);
   assert.match(source, /op: 'machine_ping'/);
   assert.match(source, /if \(compactProfile\) \{[\s\S]*?\} else \{[\s\S]*?workspace_open/);
-  assert.doesNotMatch(source, /r36CompactTools\.includes\(name\).*extras/s);
+  assert.doesNotMatch(source, /r40CompactTools\.includes\(name\).*extras/s);
 });
 
 test('R34 disarmed public gate requires the exact canonical 73-tool catalog', async () => {

package/test/remote-result-journal.test.mjs

@@ -56,3 +56,18 @@ test('cursor parser rejects foreign sessions and malformed cursors',async()=>{
     await assert.rejects(journal.replayAfter('r1:'+'b'.repeat(24)+':0',{limit:8}),/cursor session mismatch/);
   }finally{await rm(root,{recursive:true,force:true});}
 });
+
+
+test('remote result journal preserves explicit unknown side-effect state across restart and replay',async()=>{
+  const root=await mkdtemp(path.join(os.tmpdir(),'deadbyte-r40-remote-unknown-'));
+  const file=path.join(root,'journal.json');
+  try{
+    let journal=await openRemoteResultJournal({filePath:file,sessionId:session,maxEntries:8});
+    await journal.recordTerminal({...item('req-unknown',H('4'),'error'),side_effect_state:'unknown',reason:'runtime_restart'});
+    journal=await openRemoteResultJournal({filePath:file,sessionId:session,maxEntries:8});
+    const replay=await journal.replayAfter('r1:'+session+':0',{limit:8});
+    assert.equal(replay.events[0].side_effect_state,'unknown');
+    assert.equal(replay.events[0].reason,'runtime_restart');
+    await assert.rejects(journal.recordTerminal({...item('req-invalid',H('5'),'error'),side_effect_state:'committed'}),/side_effect_state invalid/);
+  }finally{await rm(root,{recursive:true,force:true});}
+});

package/test/remote-session-cli.test.mjs

@@ -16,11 +16,15 @@ async function fixture({failCommand='',statusOnline=false}={}){
   const state=path.join(dir,'state');
   const bin=path.join(state,'bin');
   const trace=path.join(dir,'trace.txt');
+  const startedMarker=path.join(dir,'started.txt');
+  const spawnedStdout=path.join(dir,'spawned.stdout.log');
+  const spawnedStderr=path.join(dir,'spawned.stderr.log');
+  const spawnedPid=path.join(dir,'spawned.pid');
   await mkdir(bin,{recursive:true});
   const launcher=path.join(bin,'DEADBYTE-MCP.ps1');
-  const ps1=`param([string]$Command)\n$ErrorActionPreference='Stop'\nfor($i=0;$i -lt 20;$i++){ try { [IO.File]::AppendAllText($env:DEADBYTE_REMOTE_TEST_TRACE,(\"$Command\" + [Environment]::NewLine),[Text.Encoding]::UTF8); break } catch { if($i -eq 19){ throw }; Start-Sleep -Milliseconds 10 } }\nif ($env:DEADBYTE_REMOTE_TEST_FAIL -and $Command -eq $env:DEADBYTE_REMOTE_TEST_FAIL) { Write-Error \"forced $Command failure\"; exit 9 }\nswitch ($Command) {\n  'start' { Write-Host 'DEADBYTE MCP = ONLINE' }\n  'status' { if ($env:DEADBYTE_REMOTE_TEST_STATUS_ONLINE -eq '1') { Write-Host 'DEADBYTE MCP = ONLINE'; Write-Host 'Bridge PID   : 1001 [verified]'; Write-Host 'Cloud PID    : 1002 [verified]'; Write-Host 'Local ready  : True'; Write-Host 'Loop supervisor: RUNNING [verified]' } else { Write-Host 'DEADBYTE MCP = OFFLINE' } }\n  'processstatus' { Write-Host 'Process plane  : ARMED [standing-grant]' }\n  'codingstatus' { Write-Host 'Coding plane  : ARMED [standing-grant]' }\n  'autonomousstatus' { Write-Host 'Autonomous     : ARMED [standing-grant]' }\n  'hoststatus' { Write-Host 'Host plane    : DISARMED [disarmed]' }\n  'park' { Write-Host 'DEADBYTE MCP = PARKED' }\n  default { Write-Host \"$Command OK\" }\n}\nexit 0\n`;
+  const ps1=`param([string]$Command)\n$ErrorActionPreference='Stop'\nfor($i=0;$i -lt 20;$i++){ try { [IO.File]::AppendAllText($env:DEADBYTE_REMOTE_TEST_TRACE,(\"$Command\" + [Environment]::NewLine),[Text.Encoding]::UTF8); break } catch { if($i -eq 19){ throw }; Start-Sleep -Milliseconds 10 } }\nif ($env:DEADBYTE_REMOTE_TEST_FAIL -and $Command -eq $env:DEADBYTE_REMOTE_TEST_FAIL) { Write-Error \"forced $Command failure\"; exit 9 }\nswitch ($Command) {\n  'start' { if ($env:DEADBYTE_REMOTE_TEST_SPAWN_CHILD -eq '1') { $node=(Get-Command node.exe).Source; $spawned=Start-Process -FilePath $node -ArgumentList @('-e','setTimeout(()=>process.exit(0),10000)') -PassThru -WindowStyle Hidden -RedirectStandardOutput $env:DEADBYTE_REMOTE_TEST_SPAWN_STDOUT -RedirectStandardError $env:DEADBYTE_REMOTE_TEST_SPAWN_STDERR; if ($env:DEADBYTE_REMOTE_TEST_SPAWN_PID) { [IO.File]::WriteAllText($env:DEADBYTE_REMOTE_TEST_SPAWN_PID,[string]$spawned.Id,[Text.Encoding]::UTF8) } }; if ($env:DEADBYTE_REMOTE_TEST_STARTED) { [IO.File]::WriteAllText($env:DEADBYTE_REMOTE_TEST_STARTED,'1',[Text.Encoding]::UTF8) }; Write-Host 'DEADBYTE MCP = ONLINE' }\n  'status' { if ($env:DEADBYTE_REMOTE_TEST_STATUS_ONLINE -eq '1' -or ($env:DEADBYTE_REMOTE_TEST_STARTED -and (Test-Path -LiteralPath $env:DEADBYTE_REMOTE_TEST_STARTED))) { Write-Host 'DEADBYTE MCP = ONLINE'; Write-Host 'Bridge PID   : 1001 [verified]'; Write-Host 'Cloud PID    : 1002 [verified]'; Write-Host 'Local ready  : True'; Write-Host 'Loop supervisor: RUNNING [verified]' } else { Write-Host 'DEADBYTE MCP = OFFLINE' } }\n  'processstatus' { Write-Host 'Process plane  : ARMED [standing-grant]' }\n  'codingstatus' { Write-Host 'Coding plane  : ARMED [standing-grant]' }\n  'autonomousstatus' { Write-Host 'Autonomous     : ARMED [standing-grant]' }\n  'hoststatus' { Write-Host 'Host plane    : DISARMED [disarmed]' }\n  'park' { if ($env:DEADBYTE_REMOTE_TEST_STARTED) { Remove-Item -LiteralPath $env:DEADBYTE_REMOTE_TEST_STARTED -Force -ErrorAction SilentlyContinue }; Write-Host 'DEADBYTE MCP = PARKED' }\n  default { Write-Host \"$Command OK\" }\n}\nexit 0\n`;
   await writeFile(launcher,ps1,'utf8');
-  return {dir,state,trace,env:{...process.env,DEADBYTE_STATE_ROOT:state,DEADBYTE_REMOTE_TEST_TRACE:trace,DEADBYTE_REMOTE_TEST_FAIL:failCommand,DEADBYTE_REMOTE_TEST_STATUS_ONLINE:statusOnline?'1':'0'}};
+  return {dir,state,trace,env:{...process.env,DEADBYTE_STATE_ROOT:state,DEADBYTE_REMOTE_TEST_TRACE:trace,DEADBYTE_REMOTE_TEST_FAIL:failCommand,DEADBYTE_REMOTE_TEST_STATUS_ONLINE:statusOnline?'1':'0',DEADBYTE_REMOTE_TEST_STARTED:startedMarker,DEADBYTE_REMOTE_TEST_SPAWN_STDOUT:spawnedStdout,DEADBYTE_REMOTE_TEST_SPAWN_STDERR:spawnedStderr,DEADBYTE_REMOTE_TEST_SPAWN_PID:spawnedPid},spawnedPid};
 }
 
 async function traceCommands(file,{read=readFile,retryDelayMs=10,maxAttempts=20}={}){
@@ -80,8 +84,9 @@ winTest('bare remote reuses a fully verified ONLINE runtime without invoking blo
     assert.equal(child.exitCode,null,'remote session must remain foreground after reusing ONLINE runtime');
     assert.match(output.stdout,/Runtime already ONLINE; reusing verified bridge\/cloud\/supervisor/);
     const authDeadline=Date.now()+3000;
-    while(Date.now()<authDeadline&&!/🔐 \[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/.test(output.stdout)) await sleep(50);
-    assert.match(output.stdout,/🔐 \[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/);
+    while(Date.now()<authDeadline&&!/\[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/.test(output.stdout)) await sleep(50);
+    assert.match(output.stdout,/\[DISPLAY\] ASCII fallback: stdout_not_tty/);
+    assert.match(output.stdout,/\[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/);
     child.kill('SIGINT');
     await output.closed;
   }finally{
@@ -90,29 +95,60 @@ winTest('bare remote reuses a fully verified ONLINE runtime without invoking blo
   }
 });
 
+winTest('bare remote PARKED startup does not wait for a long-lived child holding inherited pipe handles',async()=>{
+  const fx=await fixture();
+  fx.env.DEADBYTE_REMOTE_TEST_SPAWN_CHILD='1';
+  let child=null;
+  try{
+    const startedAt=Date.now();
+    child=spawn(process.execPath,[cliPath,'remote'],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
+    const output=await collect(child);
+    const ready=await waitFor(fx.trace,commands=>commands.includes('hoststatus'),{timeoutMs:8000});
+    const elapsed=Date.now()-startedAt;
+    assert.deepEqual(ready.slice(0,10),[
+      'status','start','status','armprocess','armcoding','armautonomous',
+      'processstatus','codingstatus','autonomousstatus','hoststatus'
+    ]);
+    assert.ok(elapsed<7000,`PARKED startup waited on inherited child pipe handles: ${elapsed}ms`);
+    assert.equal(child.exitCode,null,'remote session must remain foreground after PARKED startup');
+    assert.match(output.stdout,/\[BOOT\] Starting bridge\/runtime\.\.\./);
+    assert.match(output.stdout,/\[OK\] ONLINE/);
+    child.stdin.end();
+    const ended=await Promise.race([output.closed,sleep(6000).then(()=>({timeout:true}))]);
+    assert.equal(ended.timeout,undefined,'remote session did not exit after PARKED startup proof');
+    assert.equal(ended.code,0,output.stderr);
+  }finally{
+    if(child?.exitCode===null) child.kill('SIGKILL');
+    try{const pid=Number((await readFile(fx.spawnedPid,'utf8')).trim());if(Number.isInteger(pid)&&pid>0) process.kill(pid,'SIGKILL');}catch{}
+    await sleep(100);
+    await rm(fx.dir,{recursive:true,force:true});
+  }
+});
+
 winTest('bare remote uses one unified live timeline, keeps authority semantics, then disarms and parks when the foreground session ends',async()=>{
   const fx=await fixture();
   let child=null;
   try{
     child=spawn(process.execPath,[cliPath,'remote'],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
     const output=await collect(child);
-    const ready=await waitFor(fx.trace,commands=>commands.slice(0,9).join(',')==='status,start,armprocess,armcoding,armautonomous,processstatus,codingstatus,autonomousstatus,hoststatus');
-    assert.deepEqual(ready.slice(0,9),[
-      'status','start','armprocess','armcoding','armautonomous',
+    const ready=await waitFor(fx.trace,commands=>commands.slice(0,10).join(',')==='status,start,status,armprocess,armcoding,armautonomous,processstatus,codingstatus,autonomousstatus,hoststatus');
+    assert.deepEqual(ready.slice(0,10),[
+      'status','start','status','armprocess','armcoding','armautonomous',
       'processstatus','codingstatus','autonomousstatus','hoststatus'
     ]);
     assert.equal(child.exitCode,null,'remote session must remain foreground after becoming ready');
     const tailDeadline=Date.now()+3000;
-    while(Date.now()<tailDeadline&&!/🔐 \[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/.test(output.stdout)) await sleep(50);
-    assert.match(output.stdout,/🚀 \[DEVICE\] Starting DEADBYTE MCP/);
-    assert.match(output.stdout,/🔌 \[BRIDGE\] Local bridge connected/);
-    assert.match(output.stdout,/🔌 \[CLOUD\] Remote MCP connected/);
+    while(Date.now()<tailDeadline&&!/\[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/.test(output.stdout)) await sleep(50);
+    assert.match(output.stdout,/\[DISPLAY\] ASCII fallback: stdout_not_tty/);
+    assert.match(output.stdout,/\[DEVICE\] Starting DEADBYTE MCP/);
+    assert.match(output.stdout,/\[BRIDGE\] Local bridge connected/);
+    assert.match(output.stdout,/\[CLOUD\] Remote MCP connected/);
     assert.match(output.stdout,/\[SESSION\] New foreground session/);
     assert.match(output.stdout,/\[BOOT\] Starting local \+ remote runtime/);
     assert.match(output.stdout,/\[OK\] ONLINE/);
-    assert.match(output.stdout,/✅ \[READY\] DEADBYTE MCP online/);
-    assert.match(output.stdout,/🔐 \[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/);
-    assert.match(output.stdout,/\[LOG\] Unified live timeline\. Ctrl\+C disconnects and revokes authority\./);
+    assert.match(output.stdout,/\[READY\] DEADBYTE MCP online/);
+    assert.match(output.stdout,/\[AUTH\] ARMED: process, coding, autonomous \| host DISARMED/);
+    assert.match(output.stdout,/\[LOG\] Human live timeline\. Transport IN\/OUT hidden; full replay\/audit detail remains on disk\./);
     assert.doesNotMatch(output.stdout,/Process plane\s*:/);
     assert.doesNotMatch(output.stdout,/Coding plane\s*:/);
     const auditDir=path.join(fx.state,'audit');
@@ -135,12 +171,12 @@ winTest('bare remote uses one unified live timeline, keeps authority semantics,
       '[TOOL OUT] 2026-09-16T00:00:00.002Z #000002 coding_file_read {"is_error":true}'
     ].join('\n')+'\n','utf8');
     const logDeadline=Date.now()+3000;
-    while(Date.now()<logDeadline&&!/✗ \[fedcba98\] ERR coding_file_read 1\.73s/.test(output.stdout)) await sleep(50);
-    assert.match(output.stdout,/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}Z \| coding_tree\s+\| Arguments: .*\"path\":\"src\".*\"root_id\":\"projects\".*\[cursor r1:[0-9a-f]{24}:1\]$/m);
-    assert.match(output.stdout,/✓ \[abcdef12\] OK  coding_tree 42ms \[cursor r1:[0-9a-f]{24}:2\]/);
-    assert.match(output.stdout,/^[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}\.[0-9]{3}Z \| coding_file_read\s+\| Arguments: \{\"path\":\"src\/deadbyte-cli\.mjs\",\"root_id\":\"projects\"\} \[cursor r1:[0-9a-f]{24}:3\]$/m);
-    assert.match(output.stdout,/✗ \[fedcba98\] ERR coding_file_read 1\.73s \[cursor r1:[0-9a-f]{24}:4\]/);
-    assert.equal((output.stdout.match(/✓ \[abcdef12\] OK  coding_tree 42ms/g)||[]).length,1,'duplicate terminal result must print once');
+    while(Date.now()<logDeadline&&!/^R  .*#4  \[fedcba98\]  coding_file_read  projects:src\/deadbyte-cli\.mjs  1\.73s  ERR$/m.test(output.stdout)) await sleep(50);
+    assert.doesNotMatch(output.stdout,/\| Arguments:/,'default human view must not print request JSON');
+    assert.match(output.stdout,/^S  .*#2  \[abcdef12\]  coding_tree  projects:src  42ms  OK$/m);
+    assert.match(output.stdout,/^R  .*#4  \[fedcba98\]  coding_file_read  projects:src\/deadbyte-cli\.mjs  1\.73s  ERR$/m);
+    assert.equal((output.stdout.match(/\[abcdef12\].*coding_tree.*42ms.*OK/g)||[]).length,1,'duplicate terminal result must print once');
+    assert.doesNotMatch(output.stdout,/\[cursor r1:/,'full replay cursor belongs in the journal, not every human line');
     const resultJournal=JSON.parse(await readFile(path.join(fx.state,'runtime','remote-results',`${marker.result_session_id}.json`),'utf8'));
     assert.deepEqual(resultJournal.events.map(event=>event.seq),[1,2,3,4]);
     assert.deepEqual(resultJournal.events.map(event=>event.event_type),['tool.call','tool.result','tool.call','tool.result']);
@@ -150,9 +186,7 @@ winTest('bare remote uses one unified live timeline, keeps authority semantics,
     assert.match(output.stdout,/abcdef12/);
     assert.match(output.stdout,/fedcba98/);
     assert.doesNotMatch(output.stdout,/DO_NOT_PRINT_PAYLOAD|DO_NOT_PRINT_TOKEN/);
-    assert.match(output.stdout,/\[BRIDGE\.STDOUT\] IN  coding_tree/);
-    assert.match(output.stdout,/\[BRIDGE\.STDOUT\] OUT coding_tree/);
-    assert.match(output.stdout,/\[BRIDGE\.STDOUT\] ERR coding_file_read/);
+    assert.doesNotMatch(output.stdout,/\[BRIDGE\.(?:STDOUT|DEBUG)\]/,'transport diagnostics are hidden in default human mode');
     assert.doesNotMatch(output.stdout,/\[TOOL IN \]|\[TOOL OUT\]/);
     assert.doesNotMatch(output.stdout,/payload bytes=/);
     child.stdin.end();
@@ -161,11 +195,10 @@ winTest('bare remote uses one unified live timeline, keeps authority semantics,
     const commands=await traceCommands(fx.trace);
     assert.deepEqual(commands.slice(-5),['disarmautonomous','disarmcoding','disarmprocess','disarmhost','park']);
     assert.match(output.stdout,/^DEADBYTE MCP$/m);
-    assert.match(output.stdout,/Unified live timeline/i);
-    assert.match(output.stdout,/🔐 \[AUTH\] Revoking session authority/);
+    assert.match(output.stdout,/Human live timeline/i);
+    assert.match(output.stdout,/\[AUTH\] Revoking session authority/);
     assert.doesNotMatch(output.stdout,/disarmautonomous OK|disarmcoding OK|disarmprocess OK|disarmhost OK|DEADBYTE MCP = PARKED/);
-    const withoutApprovedEmoji=output.stdout.replace(/[📜📥📤✅❌⚠♻🛡▶🔐🚀🔌]/gu,'');
-    assert.doesNotMatch(withoutApprovedEmoji,/\p{Extended_Pictographic}/u,'human live stream may use only the approved semantic emoji set');
+    assert.doesNotMatch(output.stdout,/\p{Extended_Pictographic}/u,'piped Windows fallback must remain ASCII-safe');
   }finally{
     if(child?.exitCode===null) child.kill();
     await rm(fx.dir,{recursive:true,force:true});
@@ -180,7 +213,9 @@ winTest('remote --resume replays sanitized tool-call and terminal result events
     const firstOutput=await collect(first);
     await waitFor(fx.trace,commands=>commands.includes('hoststatus'));
     const liveDeadline=Date.now()+3000;
-    while(Date.now()<liveDeadline&&!/\[LOG\] Unified live timeline/.test(firstOutput.stdout)) await sleep(50);
+    while(Date.now()<liveDeadline&&!/\[LOG\] Human live timeline/.test(firstOutput.stdout)) await sleep(50);
+    const marker=JSON.parse(await readFile(path.join(fx.state,'runtime','remote-session.json'),'utf8'));
+    assert.match(String(marker.result_session_id||''),/^[0-9a-f]{24}$/);
     const auditDir=path.join(fx.state,'audit');await mkdir(auditDir,{recursive:true});
     const auditFile=path.join(auditDir,'segment-00000001.jsonl');
     const firstBatch=[
@@ -189,16 +224,19 @@ winTest('remote --resume replays sanitized tool-call and terminal result events
     ];
     await writeFile(auditFile,firstBatch.map(JSON.stringify).join('\n')+'\n','utf8');
     let deadline=Date.now()+3000;
-    while(Date.now()<deadline&&!/coding_tree .*\[cursor r1:[0-9a-f]{24}:2\]/.test(firstOutput.stdout)) await sleep(50);
-    const cursor1=firstOutput.stdout.match(/coding_tree .*\[cursor (r1:[0-9a-f]{24}:2)\]/)?.[1];
-    assert.ok(cursor1,'first result cursor missing');
+    while(Date.now()<deadline&&!/^S  .*#2  \[resume-r\]  coding_tree  projects:src.*OK$/m.test(firstOutput.stdout)) await sleep(50);
+    const journalFile=path.join(fx.state,'runtime','remote-results',`${marker.result_session_id}.json`);
+    const firstJournal=JSON.parse(await readFile(journalFile,'utf8'));
+    assert.deepEqual(firstJournal.events.map(event=>event.seq),[1,2]);
+    const cursor1=`r1:${marker.result_session_id}:2`;
+    assert.doesNotMatch(firstOutput.stdout,/\[cursor r1:/);
     const secondBatch=[
       {seq:3,event_type:'tool.request',tool:'coding_file_read',request_id:'resume-request-2',created_at_utc:'2026-09-18T16:30:01.000Z',args:{root_id:'projects',path:'src/deadbyte-cli.mjs',token:'DO_NOT_REPLAY_SECRET'}},
       {seq:4,event_type:'tool.result',tool:'coding_file_read',request_id:'resume-request-2',created_at_utc:'2026-09-18T16:30:01.100Z',outcome:{is_error:false}}
     ];
     await writeFile(auditFile,secondBatch.map(JSON.stringify).join('\n')+'\n',{encoding:'utf8',flag:'a'});
     deadline=Date.now()+3000;
-    while(Date.now()<deadline&&!/coding_file_read .*\[cursor r1:[0-9a-f]{24}:4\]/.test(firstOutput.stdout)) await sleep(50);
+    while(Date.now()<deadline&&!/^R  .*#4  \[resume-r\]  coding_file_read  projects:src\/deadbyte-cli\.mjs.*OK$/m.test(firstOutput.stdout)) await sleep(50);
     first.stdin.end();
     const firstEnded=await Promise.race([firstOutput.closed,sleep(6000).then(()=>({timeout:true}))]);
     assert.equal(firstEnded.timeout,undefined);
@@ -206,19 +244,19 @@ winTest('remote --resume replays sanitized tool-call and terminal result events
     second=spawn(process.execPath,[cliPath,'remote','--resume',cursor1],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
     const secondOutput=await collect(second);
     deadline=Date.now()+5000;
-    while(Date.now()<deadline&&(!/coding_file_read\s+\| Arguments: .*REPLAY cursor r1:[0-9a-f]{24}:3/.test(secondOutput.stdout)||
-      !/\[REPLAY\] \[OK\] coding_file_read \[cursor r1:[0-9a-f]{24}:4\]/.test(secondOutput.stdout)||
-      !/\[LOG\] Unified live timeline/.test(secondOutput.stdout))) await sleep(50);
-    assert.match(secondOutput.stdout,/^2026-09-18T16:30:01\.000Z \| coding_file_read\s+\| Arguments: .*\"path\":\"src\/deadbyte-cli\.mjs\".*REPLAY cursor r1:[0-9a-f]{24}:3$/m);
-    assert.match(secondOutput.stdout,/\[REPLAY\] \[OK\] coding_file_read \[cursor r1:[0-9a-f]{24}:4\]/);
-    assert.match(secondOutput.stdout,/♻️ \[SESSION\] Previous result stream replayed/);
+    while(Date.now()<deadline&&(!/coding_file_read\s+\| Arguments: .*\| REPLAY #3/.test(secondOutput.stdout)||
+      !/\[REPLAY\] #4 coding_file_read OK/.test(secondOutput.stdout)||
+      !/\[LOG\] Human live timeline/.test(secondOutput.stdout))) await sleep(50);
+    assert.match(secondOutput.stdout,/^2026-09-18T23:30:01\.000\+07:00 \| coding_file_read\s+\| Arguments: .*"path":"src\/deadbyte-cli\.mjs".*\| REPLAY #3$/m);
+    assert.match(secondOutput.stdout,/\[REPLAY\] #4 coding_file_read OK/);
+    assert.match(secondOutput.stdout,/\[SESSION\] Previous result stream replayed/);
     assert.doesNotMatch(secondOutput.stdout,/DO_NOT_REPLAY_SECRET/);
-    assert.doesNotMatch(secondOutput.stdout,/\[REPLAY\] \[OK\] coding_tree/);
+    assert.doesNotMatch(secondOutput.stdout,/\[REPLAY\].*coding_tree/);
     assert.equal((secondOutput.stdout.match(/\| coding_file_read\s+\| Arguments:/g)||[]).length,1,'tool-call replay duplicated');
-    assert.equal((secondOutput.stdout.match(/\[REPLAY\] \[OK\] coding_file_read/g)||[]).length,1,'terminal replay duplicated');
+    assert.equal((secondOutput.stdout.match(/\[REPLAY\] #4 coding_file_read OK/g)||[]).length,1,'terminal replay duplicated');
     const callReplayIndex=secondOutput.stdout.indexOf('| coding_file_read');
-    const resultReplayIndex=secondOutput.stdout.indexOf('[REPLAY] [OK] coding_file_read');
-    const liveIndex=secondOutput.stdout.indexOf('[LOG] Unified live timeline');
+    const resultReplayIndex=secondOutput.stdout.indexOf('[REPLAY] #4 coding_file_read OK');
+    const liveIndex=secondOutput.stdout.indexOf('[LOG] Human live timeline');
     assert.ok(callReplayIndex>=0&&resultReplayIndex>callReplayIndex&&liveIndex>resultReplayIndex,'resume ordering must be call -> result -> live tail');
     second.stdin.end();
     const secondEnded=await Promise.race([secondOutput.closed,sleep(6000).then(()=>({timeout:true}))]);
@@ -230,17 +268,35 @@ winTest('remote --resume replays sanitized tool-call and terminal result events
   }
 });
 
-winTest('remote --verbose is rejected because R37 has one unified remote mode',async()=>{
+winTest('remote --verbose enables sanitized request detail while preserving foreground authority cleanup',async()=>{
   const fx=await fixture();
+  let child=null;
   try{
-    const child=spawn(process.execPath,[cliPath,'remote','--verbose'],{env:fx.env,stdio:['ignore','pipe','pipe'],windowsHide:true});
+    child=spawn(process.execPath,[cliPath,'remote','--verbose'],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
     const output=await collect(child);
+    await waitFor(fx.trace,commands=>commands.includes('hoststatus'));
+    assert.equal(child.exitCode,null,'verbose remote remains a foreground session');
+    assert.match(output.stdout,/\[LOG\] Verbose live timeline\. Full sanitized request detail enabled/);
+    const auditDir=path.join(fx.state,'audit');await mkdir(auditDir,{recursive:true});
+    const audit=[
+      {event_type:'tool.request',tool:'coding_tree',request_id:'verbose-request-1',created_at_utc:'2026-09-19T00:00:00.000Z',args:{root_id:'projects',path:'src',token:'DO_NOT_PRINT_VERBOSE_SECRET'}},
+      {event_type:'tool.result',tool:'coding_tree',request_id:'verbose-request-1',created_at_utc:'2026-09-19T00:00:00.050Z',outcome:{is_error:false,duration_ms:50}}
+    ];
+    await writeFile(path.join(auditDir,'segment-00000001.jsonl'),audit.map(JSON.stringify).join('\n')+'\n','utf8');
+    const deadline=Date.now()+3000;
+    while(Date.now()<deadline&&!/coding_tree\s+\| Arguments:/.test(output.stdout)) await sleep(50);
+    assert.match(output.stdout,/coding_tree\s+\| Arguments: .*"path":"src".*"root_id":"projects"/);
+    assert.doesNotMatch(output.stdout,/DO_NOT_PRINT_VERBOSE_SECRET/);
+    child.stdin.end();
     const ended=await Promise.race([output.closed,sleep(6000).then(()=>({timeout:true}))]);
     assert.equal(ended.timeout,undefined);
-    assert.notEqual(ended.code,0);
-    assert.match(output.stderr,/unsupported remote command '--verbose'/i);
-    assert.deepEqual(await traceCommands(fx.trace),[],'rejected legacy flag must not touch runtime authority');
-  }finally{await rm(fx.dir,{recursive:true,force:true});}
+    assert.equal(ended.code,0,output.stderr);
+    const commands=await traceCommands(fx.trace);
+    assert.deepEqual(commands.slice(-5),['disarmautonomous','disarmcoding','disarmprocess','disarmhost','park']);
+  }finally{
+    if(child?.exitCode===null) child.kill('SIGKILL');
+    await rm(fx.dir,{recursive:true,force:true});
+  }
 });
 
 winTest('detached guardian revokes authority, parks, and removes the session marker after the owner is hard-killed',async()=>{
@@ -249,9 +305,9 @@ winTest('detached guardian revokes authority, parks, and removes the session mar
   try{
     child=spawn(process.execPath,[cliPath,'remote'],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
     const output=await collect(child);
-    const ready=await waitFor(fx.trace,commands=>commands.slice(0,8).join(',')==='start,armprocess,armcoding,armautonomous,processstatus,codingstatus,autonomousstatus,hoststatus');
-    assert.deepEqual(ready.slice(0,9),[
-      'status','start','armprocess','armcoding','armautonomous',
+    const ready=await waitFor(fx.trace,commands=>commands.slice(0,10).join(',')==='status,start,status,armprocess,armcoding,armautonomous,processstatus,codingstatus,autonomousstatus,hoststatus');
+    assert.deepEqual(ready.slice(0,10),[
+      'status','start','status','armprocess','armcoding','armautonomous',
       'processstatus','codingstatus','autonomousstatus','hoststatus'
     ]);
     const markerPath=path.join(fx.state,'runtime','remote-session.json');
@@ -294,7 +350,7 @@ winTest('bare remote rolls back authority and parks if one plane fails to arm',a
     assert.equal(ended.timeout,undefined,'failed startup did not terminate');
     assert.notEqual(ended.code,0);
     const commands=await traceCommands(fx.trace);
-    assert.deepEqual(commands.slice(0,4),['status','start','armprocess','armcoding']);
+    assert.deepEqual(commands.slice(0,5),['status','start','status','armprocess','armcoding']);
     assert.deepEqual(commands.slice(-5),['disarmautonomous','disarmcoding','disarmprocess','disarmhost','park']);
     assert.doesNotMatch(output.stdout,/Live logs/i);
   }finally{await rm(fx.dir,{recursive:true,force:true});}
@@ -313,7 +369,7 @@ winTest('bare remote recovers a stale crashed session before arming a new one',a
     assert.deepEqual(ready.slice(0,5),['disarmautonomous','disarmcoding','disarmprocess','disarmhost','park']);
     assert.equal(ready[5],'status');
     assert.equal(ready[6],'start');
-    assert.match(output.stdout,/♻️ \[RECOVERY\] Stale remote session pid=2147483000; revoking authority before restart\./);
+    assert.match(output.stdout,/\[RECOVERY\] Stale remote session pid=2147483000; revoking authority before restart\./);
     child.stdin.end();
     const ended=await Promise.race([output.closed,sleep(6000).then(()=>({timeout:true}))]);
     assert.equal(ended.timeout,undefined);
@@ -324,7 +380,7 @@ winTest('bare remote recovers a stale crashed session before arming a new one',a
   }
 });
 
-winTest('remote warning lines use the approved warning emoji without changing the warning token',async()=>{
+winTest('remote warning lines use deterministic ASCII fallback on piped Windows output',async()=>{
   const fx=await fixture();
   let child=null;
   try{
@@ -336,7 +392,8 @@ winTest('remote warning lines use the approved warning emoji without changing th
     child.stdin.end();
     const ended=await Promise.race([output.closed,sleep(6000).then(()=>({timeout:true}))]);
     assert.equal(ended.timeout,undefined,'remote session did not exit after warning fixture');
-    assert.match(output.stderr,/⚠️ \[WARN\] remote session marker cleanup:/);
+    assert.match(output.stderr,/^\[WARN\] remote session marker cleanup:/m);
+    assert.doesNotMatch(output.stderr,/\p{Extended_Pictographic}/u);
   }finally{
     if(child?.exitCode===null) child.kill();
     await rm(fx.dir,{recursive:true,force:true});

package/test/runtime-self-update.test.mjs

@@ -263,6 +263,50 @@ test('R31 slot-update CLI binds process-policy bootstrap and machine-FS enable e
   assert.equal(parsed.enableMachineFs,true);
 });
 
+test('R40 slot-update CLI binds Desktop policy as one exact pair and enables runtime only explicitly', () => {
+  const base=['--stage','stage','--development-root','dev','--expected-version','0.12.0','--expected-manifest',hex('a')];
+  assert.throws(()=>parseUpdateArgs([...base,'--desktop-policy','C:/candidate/desktop.json']),/desktop policy.*pair/i);
+  assert.throws(()=>parseUpdateArgs([...base,'--desktop-policy-sha256',hex('b')]),/desktop policy.*pair/i);
+  const plain=parseUpdateArgs([...base,'--desktop-policy','C:/candidate/desktop.json','--desktop-policy-sha256',hex('b')]);
+  assert.equal(plain.desktopPolicyBootstrap.path,path.resolve('C:/candidate/desktop.json'));
+  assert.equal(plain.desktopPolicyBootstrap.sha256,hex('b'));
+  assert.equal(plain.enableDesktop,false);
+  const enabled=parseUpdateArgs([...base,'--desktop-policy','C:/candidate/desktop.json','--desktop-policy-sha256',hex('b'),'--enable-desktop']);
+  assert.equal(enabled.enableDesktop,true);
+  assert.throws(()=>parseUpdateArgs([...base,'--enable-desktop','--enable-desktop']),/duplicate self-update argument/i);
+});
+
+test('R40 Desktop policy bootstrap accepts only exact pinned enabled policy bytes',async()=>{
+  const root=await mkdtemp(path.join(os.tmpdir(),'deadbyte-r40-desktop-bootstrap-'));
+  const file=path.join(root,'desktop.json');
+  const policy={schema:'deadbyte.desktop-policy.v1',enabled:true,grant_file:'C:/old/grant.json',evidence_dir:'C:/old/evidence',
+    allowed_actions:['click_primary'],allowed_input_desktops:['Default'],limits:{},
+    observer:{executable:'C:/old/observer.exe',sha256:hex('1')},
+    input:{executable:'C:/old/input.exe',sha256:hex('2')},
+    grounder:{executable:'C:/old/uia.exe',sha256:hex('3')}};
+  const bytes=Buffer.from(JSON.stringify(policy)+'\n','utf8');await writeFile(file,bytes);
+  assert.equal(typeof runtimeUpdate.prepareDesktopPolicyBootstrap,'function');
+  const accepted=await runtimeUpdate.prepareDesktopPolicyBootstrap({path:file,sha256:sha(bytes)});
+  assert.equal(accepted.sha256,sha(bytes));assert.deepEqual(accepted.policy,policy);
+  await assert.rejects(runtimeUpdate.prepareDesktopPolicyBootstrap({path:file,sha256:hex('f')}),/desktop policy.*SHA-256 mismatch/i);
+  const bad=path.join(root,'bad.json');await writeFile(bad,JSON.stringify({...policy,enabled:false}));
+  await assert.rejects(runtimeUpdate.prepareDesktopPolicyBootstrap({path:bad,sha256:sha(await readFile(bad))}),/desktop policy schema\/enabled/i);
+});
+
+test('R40 updater threads Desktop policy into generation and never restores Desktop authority automatically',async()=>{
+  const source=await readFile(new URL('../src/runtime-update.mjs',import.meta.url),'utf8');
+  assert.match(source,/prepareDesktopPolicyBootstrap\(desktopPolicyBootstrap\)/);
+  assert.match(source,/control\.desktopPolicy=desktopBootstrap\.policy/);
+  assert.match(source,/control\.config\.DesktopRuntimeEnabled=true/);
+  assert.match(source,/desktopPolicy:control\.desktopPolicy/);
+  assert.match(source,/desktopPolicyBootstrap:args\.desktopPolicyBootstrap/);
+  assert.match(source,/enableDesktop:args\.enableDesktop/);
+  assert.match(source,/controllerCaptured\(ctx,'disarmdesktop',15000\)/);
+  assert.doesNotMatch(source,/controllerCaptured\(ctx,'armdesktop',15000\)/);
+  assert.match(source,/desktop plane must remain disarmed after slot switch/);
+  assert.match(source,/desktop_restore_policy:'explicit-rearm-required'/);
+});
+
 test('R35 slot-update CLI binds semantic LSP config as one exact path plus SHA-256 pair', () => {
   const base=['--stage','stage','--development-root','dev','--expected-version','0.9.0','--expected-manifest',hex('a')];
   assert.throws(() => parseUpdateArgs([...base,'--semantic-lsp-config','C:/candidate/semantic.json']), /semantic LSP config.*pair/i);