deadbyte-mcp 0.10.0 → 0.11.1

package/test/r37-remote-tool-call-timeline.test.mjs

@@ -0,0 +1,94 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { mkdtemp, readFile, rm } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { createLiveTimelineTracker, formatRemoteToolCall } from '../src/remote-live-log.mjs';
+import { openRemoteResultJournal } from '../src/remote-result-journal.mjs';
+
+const H=c=>c.repeat(64);
+const session='c'.repeat(24);
+
+test('R37 unified timeline renders one sanitized tool-call line with ISO timestamp, padded tool name, and JSON arguments',()=>{
+  const event={
+    event_type:'tool.request',
+    request_id:'abcdef1234567890',
+    tool:'coding_file_write',
+    created_at_utc:'2026-09-18T16:24:30.125Z',
+    args:{
+      root_id:'projects',
+      path:'src/example.mjs',
+      content:'TOP_SECRET_PAYLOAD',
+      token:'TOP_SECRET_TOKEN',
+      nested:{authorization:'Bearer abc.def.ghi',safe:true}
+    }
+  };
+  const line=formatRemoteToolCall(event);
+  assert.match(line,/^2026-09-18T16:24:30\.125Z \| coding_file_write\s+\| Arguments: \{/);
+  assert.match(line,/"root_id":"projects"/);
+  assert.match(line,/"path":"src\/example\.mjs"/);
+  assert.match(line,/"reason":"payload"/);
+  assert.match(line,/"reason":"secret"/);
+  assert.doesNotMatch(line,/TOP_SECRET_PAYLOAD|TOP_SECRET_TOKEN|Bearer abc\.def\.ghi/);
+});
+
+test('R37 live tracker uses the tool-call line for request and keeps correlated terminal result',()=>{
+  let now=Date.parse('2026-09-18T16:24:30.125Z');
+  const tracker=createLiveTimelineTracker({clock:()=>now});
+  const call=tracker.observe({event_type:'tool.request',request_id:'abcdef1234567890',tool:'coding_tree',
+    created_at_utc:'2026-09-18T16:24:30.125Z',args:{root_id:'projects',path:'src'}});
+  assert.match(call,/^2026-09-18T16:24:30\.125Z \| coding_tree\s+\| Arguments: \{"path":"src","root_id":"projects"\}$/);
+  now+=250;
+  assert.equal(tracker.observe({event_type:'tool.result',request_id:'abcdef1234567890',tool:'coding_tree',
+    outcome:{is_error:false,duration_ms:250}}),'✓ [abcdef12] OK  coding_tree 250ms');
+});
+
+test('R37 remote result journal persists sanitized tool-call and result in one monotonic cursor stream',async()=>{
+  const root=await mkdtemp(path.join(os.tmpdir(),'deadbyte-r37-toolcall-journal-'));
+  const file=path.join(root,'journal.json');
+  try{
+    const journal=await openRemoteResultJournal({filePath:file,sessionId:session,maxEntries:16});
+    const call=await journal.recordCall({
+      request_id:'req-1',tool:'coding_file_write',observed_at_utc:'2026-09-18T16:24:30.125Z',
+      arguments:{root_id:'projects',path:'x.txt',content:'DO_NOT_STORE_PAYLOAD',token:'DO_NOT_STORE_TOKEN'},
+      payload_sha256:H('1')
+    });
+    const duplicate=await journal.recordCall({
+      request_id:'req-1',tool:'coding_file_write',observed_at_utc:'2026-09-18T16:24:30.125Z',
+      arguments:{root_id:'projects',path:'x.txt',content:'DO_NOT_STORE_PAYLOAD',token:'DO_NOT_STORE_TOKEN'},
+      payload_sha256:H('1')
+    });
+    const result=await journal.recordTerminal({
+      request_id:'req-1',tool:'coding_file_write',status:'ok',observed_at_utc:'2026-09-18T16:24:30.500Z',
+      payload_sha256:H('2')
+    });
+    assert.equal(call.event.seq,1);
+    assert.equal(call.event.event_type,'tool.call');
+    assert.equal(duplicate.duplicate,true);
+    assert.equal(result.event.seq,2);
+    assert.equal(result.event.event_type,'tool.result');
+    assert.equal(journal.cursor(),'r1:'+session+':2');
+    const replay=await journal.replayAfter('r1:'+session+':0',{limit:8});
+    assert.deepEqual(replay.events.map(e=>[e.seq,e.event_type]),[[1,'tool.call'],[2,'tool.result']]);
+    const disk=await readFile(file,'utf8');
+    assert.doesNotMatch(disk,/DO_NOT_STORE_PAYLOAD|DO_NOT_STORE_TOKEN/);
+    assert.match(disk,/"reason":"payload"/);
+    assert.match(disk,/"reason":"secret"/);
+  }finally{await rm(root,{recursive:true,force:true});}
+});
+
+test('R37 journal remains backward-compatible with pre-tool-call result-only events',async()=>{
+  const root=await mkdtemp(path.join(os.tmpdir(),'deadbyte-r37-old-result-journal-'));
+  const file=path.join(root,'journal.json');
+  try{
+    await import('node:fs/promises').then(({writeFile})=>writeFile(file,JSON.stringify({
+      schema:'deadbyte.remote-result-journal.v1',session_id:session,next_seq:2,
+      events:[{session_id:session,seq:1,request_id:'old-1',tool:'coding_tree',status:'ok',
+        observed_at_utc:'2026-09-17T00:00:00.000Z',payload_sha256:H('3')}]
+    })+'\n','utf8'));
+    const journal=await openRemoteResultJournal({filePath:file,sessionId:session,maxEntries:16});
+    const replay=await journal.replayAfter('r1:'+session+':0',{limit:8});
+    assert.equal(replay.events[0].event_type,'tool.result');
+    assert.equal(replay.events[0].status,'ok');
+  }finally{await rm(root,{recursive:true,force:true});}
+});

package/test/release-version.test.mjs

@@ -3,43 +3,42 @@ import assert from 'node:assert/strict';
 import { readFile } from 'node:fs/promises';
 import { createHash } from 'node:crypto';
 
-const root = new URL('../', import.meta.url);
-const text = rel => readFile(new URL(rel, root), 'utf8');
+const root=new URL('../',import.meta.url);
+const text=rel=>readFile(new URL(rel,root),'utf8');
+const R37_PREDECESSOR_RELEASE_ID='v0.11.0-08c2a0008b1f84c9';
+const R37_PREDECESSOR_MANIFEST='08c2a0008b1f84c90f7ce7faa1e3decbd03f33612bc0fdc7d1ba591b548798e8';
 
-test('R36 successor release authority agrees on V0.10.0 / R36 full+compact identity', async () => {
-  const pkg = JSON.parse(await text('package.json'));
-  const [version, controller, gate, readme, architecture, controllerReadme, deferred, parity, closure, closureVerify, windowsGate, semanticConfig] = await Promise.all([
-    text('src/version.mjs'),
-    text('controller/deadbyte-controller.ps1'),
-    text('scripts/gate-windows.ps1'),
-    text('README.txt'),
-    text('docs/ARCHITECTURE.md'),
-    text('controller/README.TXT'),
-    text('scripts/deferred-slot-operation.mjs'),
-    text('src/remote-mcp-r36-parity-client.mjs'),
-    text('scripts/final-closure.mjs'),
-    text('scripts/final-closure-verify.mjs'),
-    text('scripts/windows-gate-evidence.mjs'),
+test('R37 patch release authority agrees on V0.11.1 and preserves exact public 0.11.0 predecessor',async()=>{
+  const pkg=JSON.parse(await text('package.json'));
+  const [version,controller,gate,readme,architecture,controllerReadme,deferred,parity,closure,closureVerify,windowsGate,semanticConfig]=await Promise.all([
+    text('src/version.mjs'),text('controller/deadbyte-controller.ps1'),text('scripts/gate-windows.ps1'),
+    text('README.txt'),text('docs/ARCHITECTURE.md'),text('controller/README.TXT'),
+    text('scripts/deferred-slot-operation.mjs'),text('scripts/release-parity.mjs'),text('scripts/final-closure.mjs'),
+    text('scripts/final-closure-verify.mjs'),text('scripts/windows-gate-evidence.mjs'),
     text('controller/deadbyte-semantic-lsp-config.json')
   ]);
-  assert.equal(pkg.version, '0.10.0');
-  assert.match(version, /DEADBYTE_VERSION = '0\.10\.0'/);
-  assert.match(controller, /CONTROLLER V0\.10\.0 \/ R36/);
-  assert.match(gate, /DEADBYTE V0\.10\.0 \/ R36 WINDOWS BATCH GATE: PASS/);
-  assert.match(readme, /^DEADBYTE MCP V0\.10\.0 \/ R36 PRODUCTION BASELINE$/m);
-  assert.match(architecture, /^# DEADBYTE MCP V0\.10\.0 \/ R36 ARCHITECTURE$/m);
-  assert.match(controllerReadme, /^DEADBYTE MCP V0\.10\.0 \/ R36 CONTROLLER$/m);
-  assert.match(controllerReadme, /full 76-tool (?:profile|catalog)/);
-  assert.match(controllerReadme, /compact capability profile[^\n]*<=42 tools/);
-  assert.match(deferred, /--expected-version','0\.10\.0'/);
-  assert.match(parity, /version:'0\.10\.0'/);
-  assert.match(parity, /R36_EXPECTED_TOOLS\.length !== 76/);
-  assert.match(parity, /R36_COMPACT_TOOL_LIMIT=42/);
-  assert.match(closure, /version:'0\.10\.0'/);
-  assert.match(closureVerify, /DEADBYTE V0\.10\.0 \/ R36 WINDOWS BATCH GATE: PASS/);
-  assert.match(windowsGate, /schema:'deadbyte\.r36-windows-gate\.v1'/);
-  assert.equal(createHash('sha256').update(Buffer.from(semanticConfig,'utf8')).digest('hex'), 'd274b099a298c1033fea8f1e8849751693bbc0448778d619400acb82d4f53a3b');
-  assert.match(deferred, /--semantic-lsp-config/);
-  assert.match(deferred, /--semantic-lsp-config-sha256/);
-  assert.match(deferred, /deadbyte-semantic-lsp-config\.json/);
+  assert.equal(pkg.version,'0.11.1');
+  assert.match(version,/DEADBYTE_VERSION = '0\.11\.1'/);
+  assert.match(controller,/CONTROLLER V0\.11\.1 \/ R37/);
+  assert.match(gate,/DEADBYTE V0\.11\.1 \/ R37 WINDOWS BATCH GATE: PASS/);
+  assert.match(readme,/^DEADBYTE MCP V0\.11\.1 \/ R37 PRODUCTION BASELINE$/m);
+  assert.match(architecture,/^# DEADBYTE MCP V0\.11\.1 \/ R37 ARCHITECTURE$/m);
+  assert.match(controllerReadme,/^DEADBYTE MCP V0\.11\.1 \/ R37 CONTROLLER$/m);
+  assert.match(deferred,/--expected-version','0\.11\.1'/);
+  assert.match(parity,/R37_PREDECESSOR_RELEASE_ID='v0\.11\.0-08c2a0008b1f84c9'/);
+  assert.match(parity,new RegExp(R37_PREDECESSOR_MANIFEST));
+  assert.match(parity,/version==='0\.11\.1'|version:'0\.11\.1'/);
+  assert.match(closure,/version:'0\.11\.1'/);
+  assert.match(closureVerify,/DEADBYTE V0\.11\.1 \/ R37 WINDOWS BATCH GATE: PASS/);
+  assert.match(windowsGate,/version:'0\.11\.1'/);
+  assert.equal(createHash('sha256').update(Buffer.from(semanticConfig,'utf8')).digest('hex'),'d274b099a298c1033fea8f1e8849751693bbc0448778d619400acb82d4f53a3b');
+});
+
+test('R37 patch keeps capability surface and fixes ONLINE remote startup without restoring verbose mode',async()=>{
+  const [parity,cli]=await Promise.all([text('src/remote-mcp-r36-parity-client.mjs'),text('src/deadbyte-cli.mjs')]);
+  assert.match(parity,/R36_EXPECTED_TOOLS\.length !== 76/);
+  assert.match(parity,/R36_COMPACT_TOOL_LIMIT=42/);
+  assert.match(cli,/controllerRuntimeReady/);
+  assert.match(cli,/Runtime already ONLINE; reusing verified bridge\/cloud\/supervisor/);
+  assert.doesNotMatch(cli,/remote --verbose/);
 });

package/test/remote-live-log-r37.test.mjs

@@ -0,0 +1,50 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { createLiveTimelineTracker } from '../src/remote-live-log.mjs';
+
+test('R37 live timeline renders sanitized tool-call detail and correlates terminal result with stable short span id',()=>{
+  let now=1000;
+  const tracker=createLiveTimelineTracker({clock:()=>now});
+  const run=tracker.observe({event_type:'tool.request',tool:'coding_file_read',request_id:'abcdef1234567890',
+    args:{root_id:'projects',path:'src/a.mjs',content:'SECRET',token:'SECRET'}});
+  assert.match(run,/^1970-01-01T00:00:01\.000Z \| coding_file_read\s+\| Arguments: \{/);
+  assert.match(run,/\"path\":\"src\/a\.mjs\"/);
+  assert.match(run,/\"reason\":\"payload\"/);
+  assert.match(run,/\"reason\":\"secret\"/);
+  now=1250;
+  const done=tracker.observe({event_type:'tool.result',tool:'coding_file_read',request_id:'abcdef1234567890',
+    outcome:{is_error:false,duration_ms:250}});
+  assert.equal(done,'✓ [abcdef12] OK  coding_file_read 250ms');
+  assert.deepEqual(tracker.pending(),[]);
+  assert.doesNotMatch(run+done,/SECRET/);
+});
+
+test('R37 live timeline distinguishes result whose request was outside live tail',()=>{
+  const tracker=createLiveTimelineTracker();
+  const line=tracker.observe({event_type:'tool.result',tool:'coding_tree',request_id:'old-request-12345678',
+    outcome:{is_error:false,duration_ms:15}});
+  assert.equal(line,'↩ [old-requ] OK  coding_tree 15ms (request before live window)');
+});
+
+test('R37 live timeline deduplicates terminal result and reports interrupted spans with ids',()=>{
+  const tracker=createLiveTimelineTracker();
+  tracker.observe({event_type:'tool.request',tool:'coding_command_run',request_id:'request-23456789',args:{command_id:'node_script'}});
+  const first=tracker.observe({event_type:'tool.result',tool:'coding_command_run',request_id:'request-23456789',outcome:{is_error:true,duration_ms:900}});
+  const duplicate=tracker.observe({event_type:'tool.result',tool:'coding_command_run',request_id:'request-23456789',outcome:{is_error:true,duration_ms:900}});
+  assert.equal(first,'✗ [request-] ERR coding_command_run 900ms');
+  assert.equal(duplicate,null);
+
+  tracker.observe({event_type:'tool.request',tool:'coding_file_read',request_id:'pending-12345678',args:{path:'src/a.mjs'}});
+  assert.deepEqual(tracker.reconcileInterrupted('recovery'),[
+    '⚠ [pending-] INTERRUPTED coding_file_read — recovery ended before terminal result'
+  ]);
+});
+
+test('R37 CLI uses timeline tracker for compact live mode while keeping legacy formatter API',async()=>{
+  const {readFile}=await import('node:fs/promises');
+  const src=await readFile(new URL('../src/deadbyte-cli.mjs',import.meta.url),'utf8');
+  assert.match(src,/createLiveTimelineTracker/);
+  assert.match(src,/const activityTracker=createLiveTimelineTracker\(\)/);
+  assert.doesNotMatch(src,/remote --verbose/);
+  assert.doesNotMatch(src,/args\[0\]==='--verbose'/);
+});

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

@@ -11,16 +11,16 @@ const cliPath=path.join(root,'src','deadbyte-cli.mjs');
 const isWindows=process.platform==='win32';
 const sleep=ms=>new Promise(resolve=>setTimeout(resolve,ms));
 
-async function fixture({failCommand=''}={}){
+async function fixture({failCommand='',statusOnline=false}={}){
   const dir=await mkdtemp(path.join(os.tmpdir(),'deadbyte-remote-session-'));
   const state=path.join(dir,'state');
   const bin=path.join(state,'bin');
   const trace=path.join(dir,'trace.txt');
   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  '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' { 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`;
   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}};
+  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'}};
 }
 
 async function traceCommands(file,{read=readFile,retryDelayMs=10,maxAttempts=20}={}){
@@ -65,15 +65,40 @@ async function collect(child){
 
 const winTest=isWindows?test:test.skip;
 
-winTest('bare remote uses compact human logs by default, keeps authority semantics, then disarms and parks when the foreground session ends',async()=>{
-  const fx=await fixture();
+winTest('bare remote reuses a fully verified ONLINE runtime without invoking blocking start',async()=>{
+  const fx=await fixture({failCommand:'start',statusOnline:true});
   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,8).join(',')==='start,armprocess,armcoding,armautonomous,processstatus,codingstatus,autonomousstatus,hoststatus');
+    const ready=await waitFor(fx.trace,commands=>commands.includes('hoststatus'),{timeoutMs:8000});
     assert.deepEqual(ready.slice(0,8),[
-      'start','armprocess','armcoding','armautonomous',
+      'status','armprocess','armcoding','armautonomous',
+      'processstatus','codingstatus','autonomousstatus','hoststatus'
+    ]);
+    assert.doesNotMatch(ready.join(','),/(^|,)start(,|$)/);
+    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/);
+    child.kill('SIGINT');
+    await output.closed;
+  }finally{
+    if(child&&child.exitCode===null) child.kill('SIGKILL');
+    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',
       'processstatus','codingstatus','autonomousstatus','hoststatus'
     ]);
     assert.equal(child.exitCode,null,'remote session must remain foreground after becoming ready');
@@ -87,7 +112,7 @@ winTest('bare remote uses compact human logs by default, keeps authority semanti
     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\] Live activity\. Ctrl\+C disconnects and revokes authority\./);
+    assert.match(output.stdout,/\[LOG\] Unified live timeline\. Ctrl\+C disconnects and revokes authority\./);
     assert.doesNotMatch(output.stdout,/Process plane\s*:/);
     assert.doesNotMatch(output.stdout,/Coding plane\s*:/);
     const auditDir=path.join(fx.state,'audit');
@@ -110,20 +135,24 @@ winTest('bare remote uses compact human logs by default, keeps authority semanti
       '[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&&!/❌ ERR coding_file_read 1\.73s/.test(output.stdout)) await sleep(50);
-    assert.match(output.stdout,/▶ RUN coding_tree root=projects path=src/);
-    assert.match(output.stdout,/✅ OK coding_tree 42ms \[cursor r1:[0-9a-f]{24}:1\]/);
-    assert.match(output.stdout,/▶ RUN coding_file_read root=projects path=src\/deadbyte-cli\.mjs/);
-    assert.match(output.stdout,/❌ ERR coding_file_read 1\.73s \[cursor r1:[0-9a-f]{24}:2\]/);
-    assert.equal((output.stdout.match(/✅ OK coding_tree 42ms/g)||[]).length,1,'duplicate terminal result must print once');
+    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');
     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]);
+    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']);
     assert.equal(resultJournal.events[0].request_id,'abcdef1234567890');
     assert.ok(resultJournal.events.every(event=>/^[0-9a-f]{64}$/.test(event.payload_sha256)));
     assert.doesNotMatch(JSON.stringify(resultJournal),/TOOL IN|TOOL OUT|stdout_excerpt|stderr_excerpt/);
-    assert.doesNotMatch(output.stdout,/abcdef12|fedcba98/);
+    assert.match(output.stdout,/abcdef12/);
+    assert.match(output.stdout,/fedcba98/);
     assert.doesNotMatch(output.stdout,/DO_NOT_PRINT_PAYLOAD|DO_NOT_PRINT_TOKEN/);
-    assert.doesNotMatch(output.stdout,/BRIDGE\.STDOUT/);
+    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,/\[TOOL IN \]|\[TOOL OUT\]/);
     assert.doesNotMatch(output.stdout,/payload bytes=/);
     child.stdin.end();
@@ -132,7 +161,7 @@ winTest('bare remote uses compact human logs by default, keeps authority semanti
     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,/Live activity/i);
+    assert.match(output.stdout,/Unified 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,'');
@@ -143,7 +172,7 @@ winTest('bare remote uses compact human logs by default, keeps authority semanti
   }
 });
 
-winTest('remote --resume replays only terminal results after the cursor before starting a new live session',async()=>{
+winTest('remote --resume replays sanitized tool-call and terminal result events after the cursor without duplicates or loss',async()=>{
   const fx=await fixture();
   let first=null,second=null;
   try{
@@ -151,17 +180,25 @@ winTest('remote --resume replays only terminal results after the cursor before s
     const firstOutput=await collect(first);
     await waitFor(fx.trace,commands=>commands.includes('hoststatus'));
     const liveDeadline=Date.now()+3000;
-    while(Date.now()<liveDeadline&&!/\[LOG\] Live activity/.test(firstOutput.stdout)) await sleep(50);
+    while(Date.now()<liveDeadline&&!/\[LOG\] Unified live timeline/.test(firstOutput.stdout)) await sleep(50);
     const auditDir=path.join(fx.state,'audit');await mkdir(auditDir,{recursive:true});
     const auditFile=path.join(auditDir,'segment-00000001.jsonl');
-    await writeFile(auditFile,JSON.stringify({seq:1,event_type:'tool.result',tool:'coding_tree',request_id:'resume-request-1',outcome:{is_error:false}})+'\n','utf8');
+    const firstBatch=[
+      {seq:1,event_type:'tool.request',tool:'coding_tree',request_id:'resume-request-1',created_at_utc:'2026-09-18T16:30:00.000Z',args:{root_id:'projects',path:'src'}},
+      {seq:2,event_type:'tool.result',tool:'coding_tree',request_id:'resume-request-1',created_at_utc:'2026-09-18T16:30:00.100Z',outcome:{is_error:false}}
+    ];
+    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}:1\]/.test(firstOutput.stdout)) await sleep(50);
-    const cursor1=firstOutput.stdout.match(/coding_tree \[cursor (r1:[0-9a-f]{24}:1)\]/)?.[1];
+    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');
-    await writeFile(auditFile,JSON.stringify({seq:2,event_type:'tool.result',tool:'coding_file_read',request_id:'resume-request-2',outcome:{is_error:false}})+'\n',{encoding:'utf8',flag:'a'});
+    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}:2\]/.test(firstOutput.stdout)) await sleep(50);
+    while(Date.now()<deadline&&!/coding_file_read .*\[cursor r1:[0-9a-f]{24}:4\]/.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);
@@ -169,14 +206,20 @@ winTest('remote --resume replays only terminal results after the cursor before s
     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&&(!/\[REPLAY\] \[OK\] coding_file_read \[cursor r1:[0-9a-f]{24}:2\]/.test(secondOutput.stdout)||
-      !/\[LOG\] Live activity/.test(secondOutput.stdout))) await sleep(50);
-    assert.match(secondOutput.stdout,/\[REPLAY\] \[OK\] coding_file_read \[cursor r1:[0-9a-f]{24}:2\]/);
+    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/);
+    assert.doesNotMatch(secondOutput.stdout,/DO_NOT_REPLAY_SECRET/);
     assert.doesNotMatch(secondOutput.stdout,/\[REPLAY\] \[OK\] coding_tree/);
-    const replayIndex=secondOutput.stdout.indexOf('[REPLAY]');
-    const liveIndex=secondOutput.stdout.indexOf('[LOG] Live activity');
-    assert.ok(replayIndex>=0&&liveIndex>replayIndex,'resume replay must happen before new live tail');
+    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');
+    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');
+    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}))]);
     assert.equal(secondEnded.timeout,undefined);
@@ -187,43 +230,17 @@ winTest('remote --resume replays only terminal results after the cursor before s
   }
 });
 
-winTest('remote --verbose preserves detailed audit and bridge log streaming for debugging',async()=>{
+winTest('remote --verbose is rejected because R37 has one unified remote mode',async()=>{
   const fx=await fixture();
-  let child=null;
   try{
-    child=spawn(process.execPath,[cliPath,'remote','--verbose'],{env:fx.env,stdio:['pipe','pipe','pipe'],windowsHide:true});
+    const child=spawn(process.execPath,[cliPath,'remote','--verbose'],{env:fx.env,stdio:['ignore','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.equal(ready.length>=8,true);
-    const liveDeadline=Date.now()+3000;
-    while(Date.now()<liveDeadline&&!/Live logs active/.test(output.stdout)) await sleep(50);
-    assert.match(output.stdout,/Live logs active/);
-    const auditDir=path.join(fx.state,'audit');
-    const runtimeLogs=path.join(fx.state,'runtime','logs');
-    await mkdir(auditDir,{recursive:true});
-    await mkdir(runtimeLogs,{recursive:true});
-    await writeFile(path.join(auditDir,'segment-00000001.jsonl'),[
-      JSON.stringify({seq:1,event_type:'tool.request',tool:'coding_tree',request_id:'abcdef1234567890'}),
-      JSON.stringify({seq:2,event_type:'tool.result',tool:'coding_tree',request_id:'abcdef1234567890',outcome:{is_error:false}})
-    ].join('\n')+'\n','utf8');
-    await writeFile(path.join(runtimeLogs,'bridge.stdout.log'),[
-      '[TOOL IN ] 2026-09-16T00:00:00.000Z #000001 coding_tree {}',
-      '[TOOL OUT] 2026-09-16T00:00:00.001Z #000001 coding_tree {"is_error":false}'
-    ].join('\n')+'\n','utf8');
-    const deadline=Date.now()+3000;
-    while(Date.now()<deadline&&(!/\[AUDIT #2\] tool\.result coding_tree abcdef12/.test(output.stdout)||!/\[BRIDGE\.STDOUT\] \[TOOL OUT\].*coding_tree/.test(output.stdout))) await sleep(50);
-    assert.match(output.stdout,/\[AUDIT #1\] tool\.request coding_tree abcdef12/);
-    assert.match(output.stdout,/\[AUDIT #2\] tool\.result coding_tree abcdef12/);
-    assert.match(output.stdout,/\[BRIDGE\.STDOUT\] \[TOOL IN \].*coding_tree/);
-    assert.match(output.stdout,/\[BRIDGE\.STDOUT\] \[TOOL OUT\].*coding_tree/);
-    child.stdin.end();
     const ended=await Promise.race([output.closed,sleep(6000).then(()=>({timeout:true}))]);
-    assert.equal(ended.timeout,undefined,'verbose remote session did not exit after input closed');
-    assert.equal(ended.code,0,output.stderr);
-  }finally{
-    if(child?.exitCode===null) child.kill();
-    await rm(fx.dir,{recursive:true,force: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});}
 });
 
 winTest('detached guardian revokes authority, parks, and removes the session marker after the owner is hard-killed',async()=>{
@@ -233,8 +250,8 @@ winTest('detached guardian revokes authority, parks, and removes the session mar
     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,8),[
-      'start','armprocess','armcoding','armautonomous',
+    assert.deepEqual(ready.slice(0,9),[
+      'status','start','armprocess','armcoding','armautonomous',
       'processstatus','codingstatus','autonomousstatus','hoststatus'
     ]);
     const markerPath=path.join(fx.state,'runtime','remote-session.json');
@@ -277,7 +294,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,3),['start','armprocess','armcoding']);
+    assert.deepEqual(commands.slice(0,4),['status','start','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});}
@@ -294,7 +311,8 @@ winTest('bare remote recovers a stale crashed session before arming a new one',a
     const output=await collect(child);
     const ready=await waitFor(fx.trace,commands=>commands.includes('hoststatus'));
     assert.deepEqual(ready.slice(0,5),['disarmautonomous','disarmcoding','disarmprocess','disarmhost','park']);
-    assert.equal(ready[5],'start');
+    assert.equal(ready[5],'status');
+    assert.equal(ready[6],'start');
     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}))]);