rig-review 2.7.0 → 2.8.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/src/reference.ts CHANGED
@@ -28,8 +28,8 @@ export async function hashLocalVideo(input:string):Promise<{path:string;name:str
28
28
  const after=await stat(path);if(await realpath(input)!==path||before.dev!==after.dev||before.ino!==after.ino||before.size!==after.size||before.mtimeMs!==after.mtimeMs||before.ctimeMs!==after.ctimeMs)throw new Error('Reference inputs changed while hashing');
29
29
  return {path,name:basename(path),sha256:hash.digest('hex')};
30
30
  }
31
- export async function loadReferencedReview(input:string,reference?:string,handoff?:HandoffFlags):Promise<ReviewPackage>{
32
- const base=await loadReview(input,{handoff});if(reference===undefined)return base;
31
+ export async function loadReferencedReview(input:string,reference?:string,handoff?:HandoffFlags,cwd?:string):Promise<ReviewPackage>{
32
+ const base=await loadReview(input,{handoff,...(cwd?{cwd}:{})});if(reference===undefined)return base;
33
33
  const video=await hashLocalVideo(reference),id='open-reference-'+video.sha256;
34
34
  if(base.manifest.references.some(r=>r.id===id))throw new Error('reference: selected reference id collides with package reference');
35
35
  const binding:ReferenceBinding={packageSourceHash:base.sourceHash,reference:{id,name:video.name,sha256:video.sha256}};
@@ -39,7 +39,7 @@ export async function loadReferencedReview(input:string,reference?:string,handof
39
39
  export async function assertReviewUnchanged(p:ReviewPackage):Promise<void>{
40
40
  const assertCurrent=(p as BoundPackage)[sourceAssertion];
41
41
  if(assertCurrent)return assertCurrent();
42
- try{const current=await loadReferencedReview(p.manifestPath,selectedReference(p)?.path,p.handoffInputs);if(current.sourceHash!==p.sourceHash||!isDeepStrictEqual(current.reviewedSource,p.reviewedSource)||!isDeepStrictEqual(referenceBinding(current),referenceBinding(p)))throw new Error('source binding differs');}
42
+ try{const current=await loadReferencedReview(p.manifestPath,selectedReference(p)?.path,p.handoffInputs,p.cwd);if(current.sourceHash!==p.sourceHash||!isDeepStrictEqual(current.reviewedSource,p.reviewedSource)||!isDeepStrictEqual(referenceBinding(current),referenceBinding(p)))throw new Error('source binding differs');}
43
43
  catch{throw new Error('Package inputs changed or are unavailable. Restart review to bind feedback to current inputs.');}
44
44
  }
45
45
  export async function safeSelectedReference(p:ReviewPackage):Promise<string>{
package/src/server.ts CHANGED
@@ -11,7 +11,7 @@ import { exportReviewStrip, stripJson } from './strip-export.ts';
11
11
  import {assertReviewUnchanged,referenceBinding,selectedReference,safeSelectedReference,serveReference} from './reference.ts';
12
12
  import {openGate,staleOpenStatus,accessGate,openNonceGate,openNonceHeader,sameSecret,stampOpen,type OpenIdentity} from './open-protocol.ts';
13
13
  import { readSession, saveSession } from './session.ts';
14
- import { createRebuilds, RebuildError } from './rebuild.ts';
14
+ import { createRebuilds, draftRebuildOption, RebuildError } from './rebuild.ts';
15
15
  import { DENSITY_STRIP_LIMIT } from './density-strip.ts';
16
16
  import { createReadings } from './readings-run.ts';
17
17
  import { ReadingsError } from './readings.ts';
@@ -70,7 +70,7 @@ export async function createReviewRequestContext(p: ReviewPackage, options: Revi
70
70
  const bundle=options.bundle??await buildWeb();
71
71
  const unchanged=()=>assertReviewUnchanged(p);
72
72
  const stateDir=options.stateDir??process.env.RIG_REVIEW_STATE_DIR??join(homedir(),'.local','state','rig-c-review'),starts=[p.root,options.cwd??process.cwd()];
73
- const rebuilds=createRebuilds(p,{stateDir,starts,unchanged,bones:p.feedbackCatalog.bones,...(options.stripConcurrency?{stripConcurrency:options.stripConcurrency}:{}),...(options.viewOnly??p.viewOnly?{viewOnly:true}:{})});
73
+ const rebuilds=createRebuilds(p,{stateDir,starts,unchanged,bones:p.feedbackCatalog.bones,...(options.stripConcurrency?{stripConcurrency:options.stripConcurrency}:{}),...(options.viewOnly??p.viewOnly?{viewOnly:true}:{}),...(joined?.draft?{draft:draftRebuildOption(joined,starts)}:{})});
74
74
  const stageParts=stagePartsRoutes({single:p},undefined,rebuilds.stageDraft,joined?.draft?{
75
75
  joined,viewOnly:options.viewOnly??p.viewOnly??false,readInput:async req=>{
76
76
  try{return await bodyJson(req,stageVerdictLimit,'PARTS_VERDICT_BODY_LIMIT');}
@@ -22,7 +22,7 @@ interface JoinedVerdictOptions {
22
22
  }
23
23
 
24
24
  export function stagePartsRoutes(packages:{single:ReviewPackage}|{a:ReviewPackage;b:ReviewPackage},loadAtlas:typeof loadPartsAtlas=loadPartsAtlas,draft?:DraftReader,verdictOptions?:JoinedVerdictOptions) {
25
- const corrections=new Map<string,Promise<{pkg:PartsViewPackage;metadata:unknown}>>();
25
+ const corrections=new Map<string,Promise<{pkg:PartsViewPackage;modelPath:string;modelSha256:string;metadata:Record<string,unknown>|null}>>();
26
26
  const loaded=new Map<string,ReturnType<typeof loadPartsAtlas>>();let bundle:Promise<Blob>|undefined;
27
27
  const headers={'X-Content-Type-Options':'nosniff','Cache-Control':'no-store','Referrer-Policy':'no-referrer','Content-Security-Policy':"default-src 'none'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' blob: data:; connect-src 'self'; base-uri 'none'; form-action 'none'; frame-ancestors 'self'"};
28
28
  return async(req:Request):Promise<Response|null>=>{
@@ -47,34 +47,66 @@ export function stagePartsRoutes(packages:{single:ReviewPackage}|{a:ReviewPackag
47
47
  // Single-package Stage 1 uses the declared handoff's real separated parts, not the atlas names.
48
48
  const recorded=verdictOptions?.joined.draft;
49
49
  if ('single' in packages && (recorded||p.handoff?.parts&&p.handoff.rig)) {
50
+ await verdictOptions?.joined.assertCurrent();
50
51
  await assertReviewUnchanged(p);
51
52
  const build=req.headers.get('X-Review-Stage-Build')??'inspected';
52
53
  if(build!=='inspected'&&!/^[a-f0-9]{64}$/.test(build))throw new Error('STAGE_DRAFT_STALE');
54
+ if(build!=='inspected'&&recorded&&(!recorded.editable||verdictOptions?.viewOnly))throw new Error('STAGE_DRAFT_UNAVAILABLE');
53
55
  const applied=build==='inspected'?null:await draft?.(build);
54
56
  if(build!=='inspected'&&!applied)throw new Error('STAGE_DRAFT_UNAVAILABLE');
55
- const model=recorded?.model??applied?.model??(p.manifest.model?join(p.root,p.manifest.model):null);
57
+ const model=applied?.model??recorded?.model??(p.manifest.model?join(p.root,p.manifest.model):null);
56
58
  if(!model)throw new Error('STAGE_DRAFT_UNAVAILABLE');
57
59
  let promise=corrections.get(build);
58
60
  if(!promise){
59
- promise=(async()=>{
60
- const rig=recorded?.rig??join(applied?.spec??p.handoff!.rig!,'rig.json');
61
- const meshReport=recorded?.meshReport??join(applied?.spec??p.handoff!.rig!,'mesh_report.json');
61
+ const loading=(async()=>{
62
+ const rig=applied?join(applied.spec,'rig.json'):(recorded?.rig??join(p.handoff!.rig!,'rig.json'));
63
+ const meshReport=applied?join(applied.spec,'mesh_report.json'):(recorded?.meshReport??join(p.handoff!.rig!,'mesh_report.json'));
62
64
  const pkg=await loadPartsView(recorded?.parts??p.handoff!.parts!,{rig,meshReport});
63
- if(recorded&&[...pkg.files,...pkg.flagFiles].some(file=>recorded.files.get(file.abs)!==file.sha256))
64
- throw new Error('PARTS_VERDICT_SOURCE_MISMATCH');
65
- const mappings=await draftMappings(model,rig,pkg,recorded?.files);
65
+ if(recorded){
66
+ const partsPrefix=recorded.parts.replace(/\/+$/,'')+'/';
67
+ const pinned=applied?pkg.files.filter(file=>file.abs.startsWith(partsPrefix)):[...pkg.files,...pkg.flagFiles];
68
+ if(pinned.some(file=>recorded.files.get(file.abs)!==file.sha256))
69
+ throw new Error(applied?'STAGE_DRAFT_CHANGED':'PARTS_VERDICT_SOURCE_MISMATCH');
70
+ }
71
+ const mappings=await draftMappings(model,rig,pkg,applied?undefined:recorded?.files);
72
+ const modelSha256=digest(await readFile(model));
73
+ await verdictOptions?.joined.assertCurrent();
66
74
  await assertReviewUnchanged(p);await assertPartsUnchanged(pkg);
67
- return {pkg,metadata:mappings.length?{label:'Draft rig · structure evidence only',buildId:build,inspectionSourceHash:p.sourceHash,mappings,evidence:applied?.evidence??null,...(recorded?{inspectionOnly:true}:{})}:null};
68
- })();corrections.set(build,promise);
75
+ const inspectionOnly=Boolean(recorded&&(!recorded.editable||verdictOptions?.viewOnly));
76
+ return {pkg,modelPath:model,modelSha256,metadata:mappings.length?{label:'Draft rig · structure evidence only',buildId:build,inspectionSourceHash:p.sourceHash,mappings,evidence:applied?.evidence??null,...(inspectionOnly?{inspectionOnly:true}:{})}:null};
77
+ })();
78
+ promise=loading.catch(error=>{if(corrections.get(build)===promise)corrections.delete(build);throw error;});
79
+ corrections.set(build,promise);
69
80
  }
70
- const {pkg,metadata}=await promise;
71
- // Every image is served against the same full pinned draft, including geometry and flags.
72
- await assertReviewUnchanged(p);await assertPartsUnchanged(pkg);
73
- if(kind){const file=servedImage(pkg,kind,Number(index));if(!file)return Response.json({error:'PARTS_IMAGE_UNAVAILABLE'},{status:404,headers});const pinned=pkg.files.find(f=>f.abs===file)!;return serveReference(req,file,pinned.sha256,headers);}
81
+ const {pkg,modelPath,modelSha256,metadata}=await promise;
82
+ // Every response and image is served against the revalidated source, active scratch build and model/parts pins.
83
+ let latestApplied:DraftSnapshot|null=null;
84
+ let imageResponse:Response|null=null;
85
+ try{
86
+ await verdictOptions?.joined.assertCurrent();
87
+ await assertReviewUnchanged(p);await assertPartsUnchanged(pkg);
88
+ const currentModelSha256=digest(await readFile(modelPath).catch(()=>{throw new Error('STAGE_DRAFT_CHANGED');}));
89
+ if(currentModelSha256!==modelSha256)throw new Error('STAGE_DRAFT_CHANGED');
90
+ if(kind){
91
+ const file=servedImage(pkg,kind,Number(index));
92
+ if(!file)return Response.json({error:'PARTS_IMAGE_UNAVAILABLE'},{status:404,headers});
93
+ const pinned=pkg.files.find(f=>f.abs===file)!;
94
+ imageResponse=await serveReference(req,file,pinned.sha256,headers);
95
+ }
96
+ await verdictOptions?.joined.assertCurrent();
97
+ await assertReviewUnchanged(p);
98
+ latestApplied=build==='inspected'?null:(await draft?.(build))??null;
99
+ if(build!=='inspected'&&(!latestApplied||latestApplied.model!==modelPath))throw new Error('STAGE_DRAFT_STALE');
100
+ }catch(error){
101
+ if(build!=='inspected')corrections.delete(build);
102
+ throw error;
103
+ }
104
+ if(imageResponse)return imageResponse;
74
105
  const writable=build==='inspected'&&verdictOptions?.joined.verdictDirectory&&!verdictOptions.viewOnly;
75
106
  const saved=writable?await joinedVerdict(req,p,pkg,verdictOptions,save,format,headers):null;
76
107
  if(saved instanceof Response)return saved;
77
- return Response.json({...partsViewJson(pkg,saved??{verdict:null,stale:null}),differenceAvailable:false,readOnly:!writable,...(recorded&&!writable?{verdictReadOnlyReason:'PARTS_VERDICT_READ_ONLY: a pending parts review and an explicit verdict output directory are required.'}:{}),inspectionSourceHash:p.sourceHash,...(saved?{joinedVerdictBinding:saved.binding,verdictFile:saved.filename}:{}),...(metadata?{draft:metadata}:{draftUnavailable:stageDraftRefusals.STAGE_DRAFT_NO_MESH})},{headers});
108
+ const activeMetadata=metadata&&latestApplied?{...metadata,evidence:latestApplied.evidence}:metadata;
109
+ return Response.json({...partsViewJson(pkg,saved??{verdict:null,stale:null}),differenceAvailable:false,readOnly:!writable,...(recorded&&!writable?{verdictReadOnlyReason:'PARTS_VERDICT_READ_ONLY: a pending parts review and an explicit verdict output directory are required.'}:{}),inspectionSourceHash:p.sourceHash,...(saved?{joinedVerdictBinding:saved.binding,verdictFile:saved.filename}:{}),...(activeMetadata?{draft:activeMetadata}:{draftUnavailable:stageDraftRefusals.STAGE_DRAFT_NO_MESH})},{headers});
78
110
  }
79
111
  let promise=loaded.get(key);
80
112
  const initializing=!promise;
package/web/catalog-en.ts CHANGED
@@ -124,6 +124,7 @@ export const enCatalog: Readonly<Record<string, string>> = {
124
124
  "STAGE_DRAFT_MISMATCH: separated parts and draft mesh identity differ.": "STAGE_DRAFT_MISMATCH: separated parts and draft mesh identity differ.",
125
125
  "STAGE_DRAFT_STALE: the requested revision is pending or no longer applied.": "STAGE_DRAFT_STALE: the requested revision is pending or no longer applied.",
126
126
  "STAGE_DRAFT_CHANGED: scratch inputs changed after Apply.": "STAGE_DRAFT_CHANGED: scratch inputs changed after Apply.",
127
+ "MESH_DELTA_APPLIED_SOURCE: Edit Mesh starts from the inspected draft. Export the delta and rebuild the prior revision (including any Mesh Parameters patch) first.": "MESH_DELTA_APPLIED_SOURCE: Edit Mesh starts from the inspected draft. Export the delta and rebuild the prior revision (including any Mesh Parameters patch) first.",
127
128
  "STAGE_DRAFT_UNCHECKED: this revision has no successful producer check.": "STAGE_DRAFT_UNCHECKED: this revision has no successful producer check.",
128
129
  "STAGE_DRAFT_OPERATION: this applied operation is not a mesh correction.": "STAGE_DRAFT_OPERATION: this applied operation is not a mesh correction.",
129
130
  "Approve all": "Approve all",
@@ -3351,6 +3352,7 @@ export const enCatalog: Readonly<Record<string, string>> = {
3351
3352
  "job.savePartsVerdict": "Save parts verdict",
3352
3353
  "job.saved": "Human action saved.",
3353
3354
  "job.signoff": "Save stage approval",
3355
+ "job.reopen": "Reopen stage",
3354
3356
  "job.time": "Inspection time (s)",
3355
3357
  "job.title": "Live review job",
3356
3358
  "job.updated": "Updated from {0} to {1}.",
@@ -3454,4 +3456,8 @@ export const enCatalog: Readonly<Record<string, string>> = {
3454
3456
  "KEY_TIME_OUT_OF_DOMAIN": "KEY_TIME_OUT_OF_DOMAIN",
3455
3457
  "MODEL_UNAVAILABLE": "MODEL_UNAVAILABLE",
3456
3458
  "REFERENCE_OUT_OF_DOMAIN": "REFERENCE_OUT_OF_DOMAIN",
3459
+ " · installed {0} {1} · {2} {3}": " · installed {0} {1} · {2} {3}",
3460
+ "Draft {0} ({1} {2}): {3} sha256 {4}… · parts {5}{6}": "Draft {0} ({1} {2}): {3} sha256 {4}… · parts {5}{6}",
3461
+ "PARTS_VERDICT_READ_ONLY: Stage 1 draft is inspection-only": "PARTS_VERDICT_READ_ONLY: Stage 1 draft is inspection-only",
3462
+ "STAGE_DRAFT_OPERATION: only applied mesh corrections belong to this inspection": "STAGE_DRAFT_OPERATION: only applied mesh corrections belong to this inspection",
3457
3463
  };
package/web/catalog-ko.ts CHANGED
@@ -124,6 +124,7 @@ export const koCatalog: Readonly<Record<string, string>> = {
124
124
  "STAGE_DRAFT_MISMATCH: separated parts and draft mesh identity differ.": "STAGE_DRAFT_MISMATCH: 분리 파츠와 초안 메시의 식별 정보가 달라요.",
125
125
  "STAGE_DRAFT_STALE: the requested revision is pending or no longer applied.": "STAGE_DRAFT_STALE: 요청한 리비전이 대기 중이거나 더 이상 적용 상태가 아니에요.",
126
126
  "STAGE_DRAFT_CHANGED: scratch inputs changed after Apply.": "STAGE_DRAFT_CHANGED: 적용 후 작업 사본의 입력이 변경됐어요.",
127
+ "MESH_DELTA_APPLIED_SOURCE: Edit Mesh starts from the inspected draft. Export the delta and rebuild the prior revision (including any Mesh Parameters patch) first.": "MESH_DELTA_APPLIED_SOURCE: 메시 편집은 검사 중인 원본 초안에서 시작해요. 델타를 내보내고 메시 파라미터 변경을 포함한 이전 리비전을 먼저 다시 빌드하세요.",
127
128
  "STAGE_DRAFT_UNCHECKED: this revision has no successful producer check.": "STAGE_DRAFT_UNCHECKED: 이 리비전에는 성공한 제작기 검사 근거가 없어요.",
128
129
  "STAGE_DRAFT_OPERATION: this applied operation is not a mesh correction.": "STAGE_DRAFT_OPERATION: 적용된 작업이 메시 보정이 아니에요.",
129
130
  "Approve all": "모두 승인",
@@ -3351,6 +3352,7 @@ export const koCatalog: Readonly<Record<string, string>> = {
3351
3352
  "job.savePartsVerdict": "파츠 판정 저장",
3352
3353
  "job.saved": "사용자 작업을 저장했습니다.",
3353
3354
  "job.signoff": "단계 승인 저장",
3355
+ "job.reopen": "단계 다시 열기",
3354
3356
  "job.time": "검사 시간 (초)",
3355
3357
  "job.title": "실시간 리뷰 작업",
3356
3358
  "job.updated": "{0}에서 {1}(으)로 업데이트되었습니다.",
@@ -3454,4 +3456,8 @@ export const koCatalog: Readonly<Record<string, string>> = {
3454
3456
  "KEY_TIME_OUT_OF_DOMAIN": "KEY_TIME_OUT_OF_DOMAIN",
3455
3457
  "MODEL_UNAVAILABLE": "MODEL_UNAVAILABLE",
3456
3458
  "REFERENCE_OUT_OF_DOMAIN": "REFERENCE_OUT_OF_DOMAIN",
3459
+ " · installed {0} {1} · {2} {3}": " · 설치됨 {0} {1} · {2} {3}",
3460
+ "Draft {0} ({1} {2}): {3} sha256 {4}… · parts {5}{6}": "초안 {0} ({1} {2}): {3} sha256 {4}… · 파츠 {5}{6}",
3461
+ "PARTS_VERDICT_READ_ONLY: Stage 1 draft is inspection-only": "PARTS_VERDICT_READ_ONLY: 1단계 초안은 살펴보기 전용입니다",
3462
+ "STAGE_DRAFT_OPERATION: only applied mesh corrections belong to this inspection": "STAGE_DRAFT_OPERATION: 이 점검에서는 적용된 메시 보정만 지원합니다",
3457
3463
  };