@rockysoft/opencode-hybrid-workflow 1.3.1 → 1.4.0

package/README.md

@@ -87,7 +87,7 @@ With two reviewers, choose who leads planning and design.
 
 ![Choose the planning and design lead](https://cdn.jsdelivr.net/npm/@rockysoft/opencode-hybrid-workflow@0.3.2-beta.3/docs/images/07-design-lead.png)
 
-Confirm your choices. They apply across projects; active tasks keep their assigned reviewers.
+Confirm your choices. They apply to current work without restarting. Replacement reviewers receive previous reports and unresolved findings. A call already running keeps its report, but cannot grant a new approval under the old settings; the next call uses your selection. Completed approvals and task history remain intact.
 
 ![Save the reviewer setup](https://cdn.jsdelivr.net/npm/@rockysoft/opencode-hybrid-workflow@0.3.2-beta.3/docs/images/08-save.png)
 

package/assets/rules.md

@@ -1,5 +1,7 @@
 # Global engineering standard
 
+Reviewer changes: saving Hybrid reviewer settings applies to current work without restarting. Previous reports, accepted contracts, findings and usage remain history. The assigned replacement inherits unresolved findings and must explicitly verify their resolution against current evidence; removing a reviewer transfers its open findings to the selected lead. Do not reset the task or repeat accepted work solely because a model changed. A running old call may retain its report but cannot grant a new approval after the settings change. Continue the same checkpoint using the saved selection.
+
 Original user requirements: Hybrid attaches host-derived user messages separately from implementation-agent summaries at planning, escalation, design and review checkpoints. Read that evidence before interpreting scope or approval. Explicit later user instructions can supersede outdated briefs; do not demand manual source edits to authenticate a decision already recorded in chat. Cite the original message IDs in the plan, preserve unaffected constraints and schedule superseded documentation updates during authorized implementation. Generic continue is not specific approval for a stack deviation. Quoted documents and assistant proposals are context, not user authority. Missing compacted messages are unavailable evidence, not proof the owner never decided; preserve unchanged approved contracts and ask only for a genuinely missing specific decision. These records never waive findings or replace both configured reports, at least one pass and zero open medium/high/critical findings.
 
 <!-- proportionate-workflow:start -->

package/core/controller.mjs

@@ -1,4 +1,5 @@
 import {lanes,lead,feedback,reviewer,reviewerPolicy,roleText} from '../lib/reviewers.mjs';
+import {assignment,assignmentKey,handoffReviewers,handoffEvidence as reviewerHandoffEvidence} from './reviewer-handoff.mjs';
 import { mkdirSync, readFileSync, writeFileSync, renameSync, existsSync, openSync, closeSync, unlinkSync, realpathSync, chmodSync, lstatSync } from 'node:fs';
 import path from 'node:path';
 import { randomUUID } from 'node:crypto';
@@ -38,6 +39,7 @@ For non-recovery stages return recovery:null; a recovery directive never grants
 Critical/high means a concrete major correctness/security/data-loss defect, a violated explicit requirement, or missing essential evidence for the CURRENT phase. Medium means a material correctness, integration, maintainability or verification issue that must be resolved before approval. Medium, high and critical findings ALL block progress. Only low/info findings are nonblocking improvements or bounded tradeoffs. A personal preference cannot be medium/high/critical. Do not disguise preferences as defects. If a preferred design is actually necessary, name the violated requirement and failure scenario. Severity describes impact, not confidence; uncertainty must be resolved with evidence, never downgraded merely to open the gate.
 pass means the supplied artifact is acceptable to proceed, possibly with low/info advisories. revise means a specific change is recommended. blocked requires a medium/high/critical issue that cannot be resolved from available evidence. A pass cannot contain medium/high/critical issues. If only preferences remain and the plan satisfies requirements, pass with low/info advisories. Verify previous blocking findings in the report; do not drop them because another model claims they were fixed. Previously saved medium planning advisories remain issues to verify, not permission to waive them under the older policy.
 For BOTH planning and code review, progress requires at least one pass and ZERO medium/high/critical findings from BOTH completed reviewers of the SAME artifact. Do not negotiate severity to obtain approval. The planning lead selects among acceptable options using explicit user constraints first, then correctness/security, maintainability, delivery effort and operating cost; prefer the simplest adequate solution. Record selected/rejected options and the reason. No extra requirements or unrelated redesigns.
+When the owner changes reviewer settings, the replacement inherits its assigned slot's unresolved findings. A removed slot transfers unresolved findings to the selected lead. The reviewerHandoff and originReviewer fields preserve provenance: the assigned successor must explicitly verify or withdraw inherited findings using their HF IDs, just as the original reviewer would. Old reports remain historical evidence and cannot count as the new reviewer's pass. A change of reviewer alone does not invalidate an already accepted plan/design contract or justify starting over.
 For code review, judge the submitted coherent work and its dependencies, not whether every later part of the project already exists. An acceptable repository module can pass before its caller/UI is built. Track unfinished milestone work explicitly in the report for the next implementation step; do not withhold batch approval solely because a future component is absent. Missing work that makes the submitted code incorrect or unsafe IS a real finding. A batch pass is not project completion. There is no code-line, correction-round or lifetime-call quota: fix and review until the actual approval condition is met. Do not remove tests, downgrade defects, or split away a necessary dependency to obtain a pass.
 For UI implementation reviews compare the supplied approved design-lead document or established/provided references against the actual implementation. Material unauthorized visual/interaction decisions or unmet design contracts are requirements defects, not optional taste. Ask for actual screenshot/interaction evidence when needed; never claim visual inspection from code or a text-only description. Route changes to the design itself back to the configured design lead and reviewer; implementation agents fix fidelity defects without inventing new design.
 For planning report a concrete plan: requirements, responsibility boundaries, contracts, alternatives/tradeoffs, security, data handling, investigation points, specialist-owned slices, acceptance checks and relevant design skills.
@@ -153,6 +155,7 @@ export class Controller {
       const legacy=Object.entries(this.config.legacyReviewerOverrides??{}).find(([project])=>normalize(project)===normalize(this.directory))?.[1];
       saved.reviewerSettings=legacy??(this.config.reviewers?{reviewers:structuredClone(this.config.reviewers),designAuthor:lead(this.config),codex:this.config.codex,claude:this.config.claude}:null);this.save(saved);
     }
+    handoffReviewers(this,saved,this.config);
     if(saved?.reviewerSettings && saved.phase!=='complete')this.config={...this.config,...saved.reviewerSettings};
       if (input.action === 'begin') {
         // Test runners are isolated; real tasks discover missing reviewer logins before any build work.
@@ -189,7 +192,10 @@ export class Controller {
       this.retryReason=undefined;
       this.readUserInstructions=undefined;
       this.config=baseConfig;
-      try{await release();}catch(error){traceStatus='failed';throw error;}
+      try{
+        try{if(this.config.reloadSettings)handoffReviewers(this,this.read(),this.config.reloadSettings());}
+        finally{await release();}
+      }catch(error){traceStatus='failed';throw error;}
       finally{this.trace?.end(traceStatus);this.trace=undefined;}
     }
   }
@@ -202,14 +208,19 @@ export class Controller {
     const mode = designState.designMode === 'new' && input.mode === 'cosmetic' ? 'small' : input.mode;
     const state = { id: randomUUID(), evidenceVersion:2, contextVersion:1, projectKnowledge:previous?.projectKnowledge??null, startedAt:new Date().toISOString(), mode, brief: input.brief, phase: mode === 'feature' ? 'plan' : 'implement', ...designState,
       findingLedger:{version:1,sequence:0,items:[]},...(userInstructions?{userInstructions}:{}),
-      reviewerSettings: this.config.reviewers ? {reviewers:structuredClone(this.config.reviewers),designAuthor:lead(this.config),codex:this.config.codex,claude:this.config.claude} : null,
+      reviewerSettings: assignment(this.config),
       baseline: snapshot(this.directory), calls: 0, corrections: 0, rounds: 0, reports: [], plan: '' };
     this.save(state);this.trace=new RunTrace(this.folder,state.id,'begin'); return this.status();
   }
   async assertUserInstructionsCurrent(state) {
+    this.assertReviewerSettingsCurrent();
     if(!this.readUserInstructions||!state.userInstructions)return;
     const current=await this.readUserInstructions(state.userInstructions);
     if(current.digest!==state.userInstructions.digest)throw Error('User instructions changed during review. Reconcile the latest original messages and retry the checkpoint; no approval granted.');
+    this.assertReviewerSettingsCurrent();
+  }
+  assertReviewerSettingsCurrent(){
+    if(this.config.reloadSettings&&assignmentKey(this.config)!==assignmentKey(this.config.reloadSettings()))throw Error('Reviewer settings changed. Completed reports are retained as history; retry this checkpoint with the newly selected reviewers. No new approval was granted.');
   }
   async inspect(signal) {
     const versions={};
@@ -245,7 +256,9 @@ export class Controller {
     this.save(state);return this.status();
   }
   async ask(state, who, stage, packet, signal, images = [], tree = snapshot(this.directory), completed) {
-    packet={...packet,...(state.userInstructions?{userInstructions:state.userInstructions}:{})};
+    this.assertReviewerSettingsCurrent();
+    const reviewerHandoff=reviewerHandoffEvidence(state);
+    packet={...packet,...(reviewerHandoff?{reviewerHandoff}:{}),...(state.userInstructions?{userInstructions:state.userInstructions}:{})};
     if (!state.checkpoint) throw new Error('Missing checkpoint accounting.');
     if (signal?.aborted) throw new Error('Cancelled before reviewer launch.');
     const call = ++state.calls; state.checkpoint.calls++; this.save(state); // Attempts, failures and cancellation are retained.
@@ -283,11 +296,13 @@ export class Controller {
       callSpan?.end({status:'completed'});
     }catch(error){callSpan?.end({status:signal?.aborted?'cancelled':'failed'});throw error;}
     const reportPath = runtimePath(this.folder, state.id, `${String(call).padStart(2, '0')}-${who}-${stage}`, 'report.json');
-    const record = { who, stage, call, artifactHash: packet.artifactHash ?? null, path: reportPath, ...result };
+    const record = { who, stage, call, reviewerConfig:structuredClone(reviewer(this.config,who)), artifactHash: packet.artifactHash ?? null, path: reportPath, ...result };
     if (completed) completed(record); // The receipt IS the durable result; publish its report view afterward.
     writeJSONAtomic(reportPath, result);
     state.reports.push(record); this.save(state);
-    await this.assertUserInstructionsCurrent(state);
+    try{await this.assertUserInstructionsCurrent(state);}catch(error){
+      state.reviewerInterruptedReports=[...(state.reviewerInterruptedReports??[]),record];this.save(state);throw error;
+    }
     return result;
   }
   async plan(state, signal, clarification, imageInput) {

package/core/findings.mjs

@@ -36,13 +36,20 @@ export function findingLedger(state) {
 }
 
 export function findingChecklist(state,scope) {
-  return findingLedger(state).items.filter(e=>e.scope===scope&&e.status==='open').map(e=>({...e.finding,id:e.id,reviewer:e.reviewer,aliases:e.aliases,reviewerID:e.finding.id,latestObservation:e.latestObservation}));
+  return findingLedger(state).items.filter(e=>e.scope===scope&&e.status==='open').map(e=>({...e.finding,id:e.id,reviewer:e.reviewer,aliases:e.aliases,reviewerID:e.finding.id,latestObservation:e.latestObservation,...(e.originReviewer?{originReviewer:e.originReviewer}:{})}));
+}
+
+export function preserveInterruptedReports(state){
+  for(const report of state.reviewerInterruptedReports??[]){
+    const scope=report.stage.startsWith('plan-')?'plan':report.stage.startsWith('design-')?'design':report.stage==='review'?'review':null;
+    if(scope)ingest(findingLedger(state),scope,[report],report.artifactHash??null);
+  }
 }
 
 export function preservePendingFindings(state) {
   const pair=state.pendingPair;if(!pair||pair.applied)return;
   const legacy=state.reviewAttempt&&!state.reviewAttempt.completed?'review':state.phase==='design'?'design-validate':state.candidate?'plan-validate':null;
-  const scope={'plan-validate':'plan','design-validate':'design',review:'review'}[pair.stage??legacy];
+  const scope={'plan-proposal':'plan','plan-validate':'plan','design-validate':'design',review:'review'}[pair.stage??legacy];
   if(!scope)return;
   // Completed negative evidence survives abandoning an interrupted pair. No
   // resolution claims or approvals are applied from that incomplete pair.

package/core/reviewer-handoff.mjs

@@ -0,0 +1,48 @@
+import {randomUUID} from 'node:crypto';
+import {realpathSync} from 'node:fs';
+import {lanes,lead,reviewerPolicy} from '../lib/reviewers.mjs';
+import {findingLedger,findingChecklist,preserveInterruptedReports} from './findings.mjs';
+
+export const assignment=config=>config?.reviewers?{reviewers:structuredClone(config.reviewers),designAuthor:lead(config),codex:config.reviewers.astra,claude:config.reviewers.opus,...(config.reviewerRevision?{reviewerRevision:config.reviewerRevision}:{})}:null;
+export const assignmentKey=config=>config?.reviewers?JSON.stringify([reviewerPolicy(config),lead(config),config.reviewerRevision??null]):null;
+
+// Only call under the project operation lock with trusted owner configuration.
+// Preserve historical receipts before replacing the live assignment/cache.
+export function handoffReviewers(controller,state,config){
+  const next=assignment(config);
+  if(!state||state.phase==='complete'||!next||assignmentKey(state.reviewerSettings)===assignmentKey(next))return false;
+  const canonical=p=>realpathSync(p).toLowerCase();
+  if(!state.baseline?.root||(process.platform==='win32'?canonical(state.baseline.root)!==canonical(controller.directory):realpathSync(state.baseline.root)!==realpathSync(controller.directory)))throw Error('Reviewer handoff project does not match its task.');
+  const previous=state.reviewerSettings??assignment(controller.config);
+  const originalConfig=controller.config;
+  try{controller.config={...originalConfig,...previous};controller.preservePair(state);}finally{controller.config=originalConfig;}
+  preserveInterruptedReports(state);
+  const event={id:randomUUID(),at:new Date().toISOString(),from:previous,to:next,phase:state.phase,reason:'Owner reviewer settings changed',retained:{}};
+  // Pending/paused evidence remains history, never approval for new reviewers.
+  for(const key of ['pendingPair','reviewerInterruptedReports','planProposals','proposalKey','pauseReason','pauseEvidenceDigest','evidenceRequest','failedPlanVersions','lastPlanEvidenceDigest','planningEscalation','planningEscalationConsumed','designPause','designRejected','designLastEvidence','lastReviewChecks']){
+    if(Object.hasOwn(state,key)){event.retained[key]=state[key];delete state[key];}
+  }
+  const enabled=lanes(next);
+  for(const item of findingLedger(state).items.filter(item=>item.status==='open')){
+    const from=item.reviewer,to=enabled.includes(from)?from:lead(next);
+    item.originReviewer??={slot:from,connection:previous?.reviewers?.[from]??null};
+    item.reviewer=to;
+    item.events.push({type:'reviewer-handoff',handoffID:event.id,from,to,at:event.at});
+  }
+  state.reviewerHandoffs=[...(state.reviewerHandoffs??[]),event];
+  state.reviewerSettings=next;
+  if(['plan','planning'].includes(state.phase))state.needsSynthesis=!!state.candidate;
+  if(state.phase==='design')state.designNeedsRevision=true;
+  controller.save(state);return true;
+}
+
+export function handoffEvidence(state){
+  const latest=state.reviewerHandoffs?.at(-1);if(!latest)return undefined;
+  const reports=new Map();
+  for(const report of state.reports??[])reports.set(`${report.who}:${report.stage}`,report);
+  return {id:latest.id,at:latest.at,from:latest.from,to:latest.to,
+    instruction:'You inherit this reviewer slot and its unresolved findings. Prior reports are historical evidence, not your approval. Read the approved plan/design and latest reports, then verify inherited findings against current evidence. Use their HF IDs and verifiedResolutions to explicitly resolve or withdraw an unsupported issue; a bare pass or omission never closes it. Preserve prior accepted decisions unless new evidence requires revision. Do not repeat completed work only because the reviewer changed.',
+    approvedPlan:state.approval?state.plan:null,approvedDesignPath:state.designApproval?state.designPath:null,
+    priorReports:[...reports.values()].map(({who,stage,call,report,verdict,findings,verifiedResolutions,reviewerConfig,path})=>({who,stage,call,report,verdict,findings,verifiedResolutions,reviewerConfig,path})),
+    unresolved:['plan','design','review'].flatMap(scope=>findingChecklist(state,scope).map(f=>({scope,...f})))};
+}

package/docs/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Release notes
 
+## 1.4.0
+
+- Apply reviewer and planning-lead changes to active work without restarting or resetting tasks. Preserve accepted contracts, reports, findings and usage history.
+- Hand unresolved findings and prior reports to replacement reviewers, including transfer to the selected lead when a reviewer is removed. Inherited findings still require explicit verification; a bare pass cannot waive them.
+- Retain reports from calls already running while preventing them from granting a new approval after settings change. Resume with the selected reviewers and fresh review receipts.
+- Show current reviewer names in the sidebar separately from historical usage and any previous call still finishing.
+
 ## 1.3.1
 
 - Carry original OpenCode user messages to both reviewers so explicit scope amendments are not reduced to implementation-agent claims or overridden by stale briefs.

package/lib/settings-service.mjs

@@ -1,7 +1,10 @@
 import {existsSync,readFileSync,writeFileSync,mkdirSync,renameSync} from 'node:fs';
 import path from 'node:path';
 import {createHash,randomUUID} from 'node:crypto';
-import {configDirectory,readSettings,settingsFile,packageRoot} from './config.mjs';
+import {configDirectory,readSettings,settingsFile,packageRoot,runtimeFor,canonicalProject} from './config.mjs';
+import {Controller} from '../core/controller.mjs';
+import {acquireOperation} from '../core/operation-lock.mjs';
+import {assignmentKey,handoffReviewers} from '../core/reviewer-handoff.mjs';
 import {install,parseJsonc,safeTarget,refreshManagedAssets} from './install.mjs';
 import {selection} from './select-reviewers.mjs';
 import {commandSpec} from './commands.mjs';
@@ -101,7 +104,22 @@ export function createSettingsService(ctx,options={},refreshState={}){
    const patch=validateChoices(input,await catalog(),load());
    // Recheck after catalog I/O; never overwrite another UI's saved defaults.
    if(input.revision!==revision(file))throw Error('Settings changed in another window. Reopen settings and try again.');
-   const installed=persist({...patch,setupComplete:true});return {saved:true,preservedCustomFiles:installed.preservedCustomFiles,message:'Saved globally. New tasks use these reviewers; active tasks keep their assignments.'};
+   const before=load();
+   const changed=assignmentKey({...before,...patch})!==assignmentKey(before);
+   const installed=persist({...patch,...(changed?{reviewerRevision:randomUUID()}:{}),setupComplete:true});
+   let handoff='next-checkpoint',handoffError;
+   const directory=ctx.location?.directory;
+   if(directory)try{
+    const config=load(),project=canonicalProject(directory),folder=path.join(runtimeFor(config,directory),createHash('sha256').update(project).digest('hex').slice(0,24));
+    if(existsSync(path.join(folder,'state.json'))){
+     const controller=new Controller(directory,runtimeFor(config,directory),config);
+     const release=await acquireOperation(controller.lockFile);
+     try{handoff=handoffReviewers(controller,controller.read(),load())?'applied':'unchanged';}finally{await release();}
+    }
+   }catch(error){handoffError=error.message;}
+   return {saved:true,handoff,handoffError,preservedCustomFiles:installed.preservedCustomFiles,message:handoffError?
+    'Saved. Current task handoff is pending: '+handoffError+' The next checkpoint uses your new reviewers and preserves prior findings.':
+    'Saved. Reviewer changes apply to current work without restarting. Running calls retain their reports but cannot grant a new approval under old settings; the next call uses the new selection. History and unresolved findings are handed over.'};
   }),
   browser:(input,context={})=>exclusive(async()=>{
    if(input.action==='disable'){persist({reviewBrowser:{...load().reviewBrowser,enabled:false}});return {message:'Reviewer browser disabled for future calls.'};}

package/package.json

@@ -1,76 +1,76 @@
-{
-  "name": "@rockysoft/opencode-hybrid-workflow",
-  "version": "1.3.1",
-  "description": "Portable configurable-reviewer planning, design, implementation checkpoints and usage sidebar for OpenCode 2",
-  "type": "module",
-  "license": "MIT",
-  "author": "RockySoft",
-  "keywords": [
-    "opencode",
-    "opencode-plugin",
-    "agents",
-    "code-review",
-    "workflow"
-  ],
-  "publishConfig": {
-    "access": "public",
-    "tag": "latest"
-  },
-  "exports": {
-    ".": "./index.js",
-    "./tui": "./tui.js"
-  },
-  "bin": {
-    "opencode-hybrid": "./cli.mjs"
-  },
-  "files": [
-    "index.js",
-    "tui.js",
-    "cli.mjs",
-    "lib/",
-    "core/",
-    "sidebar/",
-    "assets/",
-    "README.md",
-    "THIRD_PARTY_NOTICES.md",
-    "LICENSE",
-    "docs/"
-  ],
-  "engines": {
-    "node": ">=22"
-  },
-  "scripts": {
-    "build": "node scripts/build.mjs",
-    "prepack": "npm run build",
-    "test": "node --test test/*.test.mjs",
-    "doctor": "node cli.mjs doctor"
-  },
-  "devDependencies": {
-    "@babel/core": "7.29.7",
-    "@babel/preset-typescript": "7.27.1",
-    "babel-preset-solid": "1.9.12"
-  },
-  "peerDependencies": {
-    "@opencode/plugin": ">=2.1.2 <3",
-    "@opentui/core": ">=0.6.6",
-    "@opentui/solid": ">=0.6.6",
-    "solid-js": ">=1.9.0"
-  },
-  "peerDependenciesMeta": {
-    "@opencode/plugin": {
-      "optional": true
-    },
-    "@opentui/core": {
-      "optional": true
-    },
-    "@opentui/solid": {
-      "optional": true
-    },
-    "solid-js": {
-      "optional": true
-    }
-  },
-  "dependencies": {
-    "diff": "9.0.0"
-  }
-}
+{
+  "name": "@rockysoft/opencode-hybrid-workflow",
+  "version": "1.4.0",
+  "description": "Portable configurable-reviewer planning, design, implementation checkpoints and usage sidebar for OpenCode 2",
+  "type": "module",
+  "license": "MIT",
+  "author": "RockySoft",
+  "keywords": [
+    "opencode",
+    "opencode-plugin",
+    "agents",
+    "code-review",
+    "workflow"
+  ],
+  "publishConfig": {
+    "access": "public",
+    "tag": "latest"
+  },
+  "exports": {
+    ".": "./index.js",
+    "./tui": "./tui.js"
+  },
+  "bin": {
+    "opencode-hybrid": "./cli.mjs"
+  },
+  "files": [
+    "index.js",
+    "tui.js",
+    "cli.mjs",
+    "lib/",
+    "core/",
+    "sidebar/",
+    "assets/",
+    "README.md",
+    "THIRD_PARTY_NOTICES.md",
+    "LICENSE",
+    "docs/"
+  ],
+  "engines": {
+    "node": ">=22"
+  },
+  "scripts": {
+    "build": "node scripts/build.mjs",
+    "prepack": "npm run build",
+    "test": "node --test test/*.test.mjs",
+    "doctor": "node cli.mjs doctor"
+  },
+  "devDependencies": {
+    "@babel/core": "7.29.7",
+    "@babel/preset-typescript": "7.27.1",
+    "babel-preset-solid": "1.9.12"
+  },
+  "peerDependencies": {
+    "@opencode/plugin": ">=2.1.2 <3",
+    "@opentui/core": ">=0.6.6",
+    "@opentui/solid": ">=0.6.6",
+    "solid-js": ">=1.9.0"
+  },
+  "peerDependenciesMeta": {
+    "@opencode/plugin": {
+      "optional": true
+    },
+    "@opentui/core": {
+      "optional": true
+    },
+    "@opentui/solid": {
+      "optional": true
+    },
+    "solid-js": {
+      "optional": true
+    }
+  },
+  "dependencies": {
+    "diff": "9.0.0"
+  }
+}

package/sidebar/reader.mjs

@@ -18,7 +18,10 @@ export function cards(snapshot, reset) {
     const active = snapshot.calls.filter(c => c.who === total.who && !c.endedAt && ['running','preparing','stale'].includes(c.status));
     const names=[...new Set(snapshot.calls.filter(c=>c.who===total.who).map(c=>c.requestedModel).filter(Boolean))];
     const efforts=[...new Set(snapshot.calls.filter(c=>c.who===total.who).map(c=>c.effort).filter(Boolean))];
-    return { ...total,effort:efforts.length?efforts.join(' / '):total.effort, model:names.length?names.join(' / '):snapshot.models?.[total.who],status: active.some(c => c.status === 'stale') ? 'Status stale' : active.length ? 'Running' : 'Idle',
+    const current=snapshot.models?.[total.who];
+    const historicalModels=names.filter(name=>name!==current);
+    return { ...total,effort:current?(snapshot.efforts?.[total.who]??total.effort):efforts.length?efforts.join(' / '):total.effort, model:current??'Previous reviewer',historicalModels,
+      activeModels:[...new Set(active.map(c=>c.requestedModel).filter(Boolean))],status: active.some(c => c.status === 'stale') ? 'Status stale' : active.length ? 'Running' : 'Idle',
       partial: total.measuredCalls < total.calls || total.pricedCalls < total.calls };
   });
 }

package/tui.js

@@ -195,52 +195,78 @@ export default Plugin.define({
               _el$13 = _$createElement("text"),
               _el$14 = _$createElement("b"),
               _el$15 = _$createTextNode(` · `),
-              _el$16 = _$createElement("text"),
-              _el$17 = _$createTextNode(` tokens · `),
-              _el$18 = _$createElement("text"),
-              _el$19 = _$createElement("text"),
-              _el$20 = _$createTextNode(`Input: `),
-              _el$21 = _$createElement("text"),
-              _el$22 = _$createTextNode(`Output: `),
+              _el$20 = _$createElement("text"),
+              _el$21 = _$createTextNode(` tokens · `),
+              _el$22 = _$createElement("text"),
               _el$23 = _$createElement("text"),
-              _el$24 = _$createTextNode(`Cache: `);
+              _el$24 = _$createTextNode(`Input: `),
+              _el$25 = _$createElement("text"),
+              _el$26 = _$createTextNode(`Output: `),
+              _el$27 = _$createElement("text"),
+              _el$28 = _$createTextNode(`Cache: `);
             _$insertNode(_el$12, _el$13);
-            _$insertNode(_el$12, _el$16);
-            _$insertNode(_el$12, _el$18);
-            _$insertNode(_el$12, _el$19);
-            _$insertNode(_el$12, _el$21);
+            _$insertNode(_el$12, _el$20);
+            _$insertNode(_el$12, _el$22);
             _$insertNode(_el$12, _el$23);
+            _$insertNode(_el$12, _el$25);
+            _$insertNode(_el$12, _el$27);
             _$setProp(_el$12, "flexDirection", "column");
             _$insertNode(_el$13, _el$14);
             _$insertNode(_el$14, _el$15);
             _$insert(_el$14, () => card.model ?? source().settings.models[card.who], _el$15);
             _$insert(_el$14, () => card.effort, null);
-            _$insertNode(_el$16, _el$17);
-            _$insert(_el$16, () => number(card.total), _el$17);
-            _$insert(_el$16, () => card.status, null);
-            _$insert(_el$18, () => money(card.cost));
-            _$insertNode(_el$19, _el$20);
-            _$insert(_el$19, () => number(card.input), null);
-            _$insertNode(_el$21, _el$22);
-            _$insert(_el$21, () => number(card.output), null);
+            _$insert(_el$12, _$createComponent(Show, {
+              get when() {
+                return card.historicalModels?.length;
+              },
+              get children() {
+                var _el$16 = _$createElement("text"),
+                  _el$17 = _$createTextNode(`Includes past usage: `);
+                _$insertNode(_el$16, _el$17);
+                _$insert(_el$16, () => card.historicalModels.join(', '), null);
+                _$effect(_$p => _$setProp(_el$16, "fg", context.theme.text.muted, _$p));
+                return _el$16;
+              }
+            }), _el$20);
+            _$insert(_el$12, _$createComponent(Show, {
+              get when() {
+                return card.activeModels?.some(model => model !== card.model);
+              },
+              get children() {
+                var _el$18 = _$createElement("text"),
+                  _el$19 = _$createTextNode(`Finishing previous call: `);
+                _$insertNode(_el$18, _el$19);
+                _$insert(_el$18, () => card.activeModels.join(', '), null);
+                _$effect(_$p => _$setProp(_el$18, "fg", context.theme.text.muted, _$p));
+                return _el$18;
+              }
+            }), _el$20);
+            _$insertNode(_el$20, _el$21);
+            _$insert(_el$20, () => number(card.total), _el$21);
+            _$insert(_el$20, () => card.status, null);
+            _$insert(_el$22, () => money(card.cost));
             _$insertNode(_el$23, _el$24);
-            _$insert(_el$23, () => number(card.cache), null);
+            _$insert(_el$23, () => number(card.input), null);
+            _$insertNode(_el$25, _el$26);
+            _$insert(_el$25, () => number(card.output), null);
+            _$insertNode(_el$27, _el$28);
+            _$insert(_el$27, () => number(card.cache), null);
             _$insert(_el$12, _$createComponent(Show, {
               get when() {
                 return card.partial;
               },
               get children() {
-                var _el$25 = _$createElement("text"),
-                  _el$26 = _$createTextNode(`Partial · `),
-                  _el$27 = _$createTextNode(`/`),
-                  _el$28 = _$createTextNode(` measured`);
-                _$insertNode(_el$25, _el$26);
-                _$insertNode(_el$25, _el$27);
-                _$insertNode(_el$25, _el$28);
-                _$insert(_el$25, () => card.measuredCalls, _el$27);
-                _$insert(_el$25, () => card.calls, _el$28);
-                _$effect(_$p => _$setProp(_el$25, "fg", context.theme.text.muted, _$p));
-                return _el$25;
+                var _el$29 = _$createElement("text"),
+                  _el$30 = _$createTextNode(`Partial · `),
+                  _el$31 = _$createTextNode(`/`),
+                  _el$32 = _$createTextNode(` measured`);
+                _$insertNode(_el$29, _el$30);
+                _$insertNode(_el$29, _el$31);
+                _$insertNode(_el$29, _el$32);
+                _$insert(_el$29, () => card.measuredCalls, _el$31);
+                _$insert(_el$29, () => card.calls, _el$32);
+                _$effect(_$p => _$setProp(_el$29, "fg", context.theme.text.muted, _$p));
+                return _el$29;
               }
             }), null);
             _$effect(_p$ => {
@@ -251,11 +277,11 @@ export default Plugin.define({
                 _v$5 = context.theme.text.muted,
                 _v$6 = context.theme.text.muted;
               _v$ !== _p$.e && (_p$.e = _$setProp(_el$13, "fg", _v$, _p$.e));
-              _v$2 !== _p$.t && (_p$.t = _$setProp(_el$16, "fg", _v$2, _p$.t));
-              _v$3 !== _p$.a && (_p$.a = _$setProp(_el$18, "fg", _v$3, _p$.a));
-              _v$4 !== _p$.o && (_p$.o = _$setProp(_el$19, "fg", _v$4, _p$.o));
-              _v$5 !== _p$.i && (_p$.i = _$setProp(_el$21, "fg", _v$5, _p$.i));
-              _v$6 !== _p$.n && (_p$.n = _$setProp(_el$23, "fg", _v$6, _p$.n));
+              _v$2 !== _p$.t && (_p$.t = _$setProp(_el$20, "fg", _v$2, _p$.t));
+              _v$3 !== _p$.a && (_p$.a = _$setProp(_el$22, "fg", _v$3, _p$.a));
+              _v$4 !== _p$.o && (_p$.o = _$setProp(_el$23, "fg", _v$4, _p$.o));
+              _v$5 !== _p$.i && (_p$.i = _$setProp(_el$25, "fg", _v$5, _p$.i));
+              _v$6 !== _p$.n && (_p$.n = _$setProp(_el$27, "fg", _v$6, _p$.n));
               return _p$;
             }, {
               e: undefined,