rig-review 1.14.1 → 1.15.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/docs/REVIEW_PACKAGE.md +15 -0
- package/docs/WORKFLOWS.md +6 -0
- package/package.json +1 -1
- package/src/cli.ts +26 -14
- package/src/correction-handoff.ts +9 -2
- package/src/direction-inspection.ts +7 -0
- package/src/front.ts +8 -4
- package/src/joined-project.ts +63 -8
- package/src/open.ts +1 -1
- package/src/reference.ts +10 -0
- package/src/server.ts +2 -2
- package/web/catalog-en.ts +2 -0
- package/web/catalog-ko.ts +2 -0
- package/web/direction-panel.ts +3 -0
- package/web/main.ts +6 -1
package/docs/REVIEW_PACKAGE.md
CHANGED
|
@@ -932,6 +932,21 @@ inspection context. To import into Create:
|
|
|
932
932
|
`on.model` and `on.direction`, and an open description (`outcome: null`).
|
|
933
933
|
Create retains `source` as opaque text. Review runs no Create command.
|
|
934
934
|
|
|
935
|
+
For a joined Create project, `--project-version` selects the recorded rig
|
|
936
|
+
package and optional `--post-version` selects its authored post. Review checks
|
|
937
|
+
the package inventory and derives the exact project-relative path from the
|
|
938
|
+
inspected package model inside that inventory. The direction document must
|
|
939
|
+
bind this path and its SHA-256. The project's direction stays outside the
|
|
940
|
+
package asset routes. The joined session source binds the project digest,
|
|
941
|
+
package source, rig version, selected post and direction file. Reopen if any
|
|
942
|
+
of these inputs change.
|
|
943
|
+
|
|
944
|
+
In Review's correction form use the selected post and the inspected
|
|
945
|
+
package-relative model path. In the issue export, `selectorArgs` and
|
|
946
|
+
`createSource.model` use the original Create project-relative model path.
|
|
947
|
+
`createSource.inspectedModel` retains the package-relative binding. Use the
|
|
948
|
+
same joined arguments on the feedback command to retrieve the joined session.
|
|
949
|
+
|
|
935
950
|
Packages without authored direction continue to use their explicit legacy
|
|
936
951
|
selector. Direction patch Apply is unavailable. Existing supported rig and
|
|
937
952
|
draft Apply records keep their producer and result evidence.
|
package/docs/WORKFLOWS.md
CHANGED
|
@@ -378,6 +378,12 @@ requires reopening and a project without interview content reports
|
|
|
378
378
|
Use **Save explicit picks** to persist pending choices. Historical answers
|
|
379
379
|
remain read-only and opening or saving picks does not sign off any stage.
|
|
380
380
|
|
|
381
|
+
To inspect authored direction in **4 Direction**, add `--post-version <post>`
|
|
382
|
+
to the joined command. The post must explicitly name the selected
|
|
383
|
+
`--project-version` rig and bind an authored direction document. Reuse the
|
|
384
|
+
printed feedback command, including the project, rig, post and picks arguments,
|
|
385
|
+
to export from that session.
|
|
386
|
+
|
|
381
387
|
From a create project with retained choice sets, create a dedicated output
|
|
382
388
|
directory and open the foreground Stage 2 view:
|
|
383
389
|
|
package/package.json
CHANGED
package/src/cli.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
import {requireFeedbackFrames} from './stage-comment.ts';
|
|
3
3
|
import {commentCropPaths} from './comment-crops.ts';
|
|
4
4
|
import {randomBytes} from 'node:crypto';
|
|
5
|
+
import {joinProject} from './joined-project.ts';
|
|
5
6
|
import {appliedValue,parseCorrection,projectPartsDescription,projectSessionCorrection} from './correction-handoff.ts';
|
|
6
7
|
import {createRebuilds} from './rebuild.ts';
|
|
7
8
|
import {readFile} from 'node:fs/promises';
|
|
@@ -24,7 +25,7 @@ import { readCompareSession } from './compare-session.ts';
|
|
|
24
25
|
import { exportReviewStrip, exportCompareStrip, stripJson, writeStripOutput, validateStripOutput } from './strip-export.ts';
|
|
25
26
|
import type { StripInterval, StripRequest } from './strip.ts';
|
|
26
27
|
const handoffUsage='[--config <path> [--parts <dir>] [--source <png> --full <dir> [--head <dir>]] [--keypoints <file>]]';
|
|
27
|
-
const usage='Usage: rig-review open <dir> [--reference <video>] [--compare <dir>] [--animation <name>] [--control] [--direct] [--view-only] [--project <create-root> --project-version <
|
|
28
|
+
const usage='Usage: rig-review open <dir> [--reference <video>] [--compare <dir>] [--animation <name>] [--control] [--direct] [--view-only] [--project <create-root> --project-version <rig> --picks-dir <dir> [--post-version <post>]] '+handoffUsage+'\n --config declares the producer handoff (wins over the review.json "producer" block and discovery of config.json, rig/config.json, ../config.json beside an opened out/); feedback and control take the same flags; --view-only opens without a producer handoff.\n open is managed by default: one loopback front at 127.0.0.1:4318 (RIG_REVIEW_FRONT_PORT overrides) serves /instances/<key>/; --direct serves the worker on its own port.\n rig-review control <dir> [--reference <video>] [--compare <dir>] [--animation <name>] '+handoffUsage+' [--project <create-root> --project-version <rig> --picks-dir <dir> [--post-version <post>]] [--page <id> --expected-revision <n> --command <JSON> --wait-ms <n>]\n rig-review feedback <dir> [--reference <video>] [--compare <dir>] [--animation <name>] '+handoffUsage+' [--project <create-root> --project-version <rig> --picks-dir <dir> [--post-version <post>]] [--format json|issue] [--correction <item id>]\n Usage: bun run review -- <review.json|output-directory> [--port 4317] [--checkpoint ID] [--view-only]\n bun run check -- <review.json|output-directory>\n bun run feedback -- <review.json|output-directory>\n bun run review -- compare <a> <b> --reference <video> --animation <name> [--port 4317]\n bun run check -- compare <a> <b> --reference <video> --animation <name>\n bun run feedback -- compare <a> <b> --reference <video> --animation <name>\n rig-review parts <build root | parts dir | review package> [--rig <file>] [--mesh-report <file>] [--check <file>] [--verdict <file>] [--painting <png>] [--format json|issue] [--correction <item id> --parts-file <inventory> [--part-note <part>]] [--port <n>]\n rig-review interview <create-root> --picks-dir <project-relative directory> [--port <n>]\n rig-review --version';
|
|
28
29
|
async function stripCommand(args:string[],options:{stateDir?:string}){
|
|
29
30
|
const compare=args[0]==='compare';if(compare)args.shift();const a=args.shift(),b=compare?args.shift():undefined;if(!a||compare&&!b)throw new Error('strip: expected package input(s)');
|
|
30
31
|
let reference:string|undefined,referenceVideo:string|undefined,animation:string|undefined,basis:'a'|'b'|undefined,range:string|undefined,output:string|undefined,jsonOnly=false,all=false;
|
|
@@ -44,17 +45,23 @@ async function stripCommand(args:string[],options:{stateDir?:string}){
|
|
|
44
45
|
}
|
|
45
46
|
/** `--config` → `config` for the producer handoff flags (#101), else null. */
|
|
46
47
|
function handoffOption(flag:string):(typeof HANDOFF_FLAGS)[number]|null {const name=flag.slice(2);return flag.startsWith('--')&&(HANDOFF_FLAGS as readonly string[]).includes(name)?name as (typeof HANDOFF_FLAGS)[number]:null;}
|
|
47
|
-
const projectFlags = ['--project','--project-version','--picks-dir'];
|
|
48
|
+
const projectFlags = ['--project','--project-version','--picks-dir','--post-version'];
|
|
48
49
|
/** The retrieval words for the handoff flags, in their fixed order. */
|
|
50
|
+
const projectWords=(inputs:OpenInputs)=>{const p=inputs.project;return p?[
|
|
51
|
+
'--project',p.root,'--project-version',String(p.version),'--picks-dir',p.picksDir,
|
|
52
|
+
...(p.postVersion===undefined?[]:['--post-version',String(p.postVersion)]),
|
|
53
|
+
]:[];};
|
|
49
54
|
const handoffWords=(inputs:OpenInputs)=>HANDOFF_FLAGS.flatMap(f=>inputs[f]!==undefined?['--'+f,inputs[f]!]:[]);
|
|
50
55
|
export function parseOpenInputs(args:string[]):OpenInputs {
|
|
51
56
|
const input=args.shift();if(!input||input.startsWith('--'))throw new Error(usage);const result:OpenInputs={input},seen=new Set<string>();
|
|
52
|
-
let root:string|undefined,version:string|undefined,picksDir:string|undefined;
|
|
53
|
-
while(args.length){const flag=args.shift()!;if(seen.has(flag))throw new Error(`OPEN_OPTION_INVALID ${flag}: Duplicate open option ${flag}`);seen.add(flag);if(flag==='--control'){result.control=true;continue;}if(flag==='--direct'){result.direct=true;continue;}if(flag==='--view-only'){result.viewOnly=true;continue;}const value=args.shift();if(value===undefined||value==='')throw new Error(`OPEN_OPTION_INVALID ${flag}: Missing value for ${flag}`);if(flag==='--reference')result.reference=value;else if(flag==='--compare')result.compare=value;else if(flag==='--animation')result.animation=value;else if(flag==='--project')root=value;else if(flag==='--project-version')version=value;else if(flag==='--picks-dir')picksDir=value;else if(handoffOption(flag))result[handoffOption(flag)!]=value;else throw new Error(`OPEN_OPTION_INVALID ${flag}: Unknown open option ${flag}`);}
|
|
54
|
-
if(root!==undefined||version!==undefined||picksDir!==undefined){
|
|
57
|
+
let root:string|undefined,version:string|undefined,postVersion:string|undefined,picksDir:string|undefined;
|
|
58
|
+
while(args.length){const flag=args.shift()!;if(seen.has(flag))throw new Error(`OPEN_OPTION_INVALID ${flag}: Duplicate open option ${flag}`);seen.add(flag);if(flag==='--control'){result.control=true;continue;}if(flag==='--direct'){result.direct=true;continue;}if(flag==='--view-only'){result.viewOnly=true;continue;}const value=args.shift();if(value===undefined||value==='')throw new Error(`OPEN_OPTION_INVALID ${flag}: Missing value for ${flag}`);if(flag==='--reference')result.reference=value;else if(flag==='--compare')result.compare=value;else if(flag==='--animation')result.animation=value;else if(flag==='--project')root=value;else if(flag==='--project-version')version=value;else if(flag==='--picks-dir')picksDir=value;else if(flag==='--post-version')postVersion=value;else if(handoffOption(flag))result[handoffOption(flag)!]=value;else throw new Error(`OPEN_OPTION_INVALID ${flag}: Unknown open option ${flag}`);}
|
|
59
|
+
if(root!==undefined||version!==undefined||picksDir!==undefined||postVersion!==undefined){
|
|
55
60
|
if(!root||!picksDir||!version||!/^\d+$/.test(version)||!Number.isSafeInteger(Number(version))||Number(version)<1||result.compare!==undefined)
|
|
56
61
|
throw new Error('OPEN_OPTION_INVALID --project: single-package open requires --project, --project-version and --picks-dir together');
|
|
57
|
-
|
|
62
|
+
if(postVersion!==undefined&&(!/^\d+$/.test(postVersion)||!Number.isSafeInteger(Number(postVersion))||Number(postVersion)<1))
|
|
63
|
+
throw new Error('OPEN_OPTION_INVALID --post-version: expected a positive Create post version');
|
|
64
|
+
result.project={root,version:Number(version),picksDir,...(postVersion!==undefined?{postVersion:Number(postVersion)}:{})};
|
|
58
65
|
}
|
|
59
66
|
const problem=checkHandoffFlags(result);if(problem)throw new Error(`OPEN_OPTION_INVALID ${problem.split(':')[0]}: ${problem.slice(problem.indexOf(':')+2)}`);
|
|
60
67
|
if(result.compare!==undefined&&handoffFlags(result))throw new Error('OPEN_OPTION_INVALID --config: compare takes no producer handoff; open one package with --config');
|
|
@@ -104,7 +111,7 @@ export function feedbackFormat(args:string[]):{args:string[];format:'json'|'issu
|
|
|
104
111
|
function commandHelpRequested(args:readonly string[],command:'open'|'review'|'check'|'feedback'):boolean {
|
|
105
112
|
if(args[0]==='--help'||args[0]==='-h')return true;
|
|
106
113
|
const compare=command!=='open'&&args[0]==='compare';
|
|
107
|
-
const handoff=HANDOFF_FLAGS.map(f=>'--'+f),flags=command==='open'?['--reference','--compare','--animation',...projectFlags,...handoff]:compare?['--reference','--animation','--port']:['--port','--checkpoint','--reference','--compare','--animation',...handoff];
|
|
114
|
+
const handoff=HANDOFF_FLAGS.map(f=>'--'+f),flags=command==='open'?['--reference','--compare','--animation',...projectFlags,...handoff]:compare?['--reference','--animation','--port']:['--port','--checkpoint','--reference','--compare','--animation',...handoff,...(command==='feedback'?projectFlags:[])];
|
|
108
115
|
for(let i=compare?3:1;i<args.length;){
|
|
109
116
|
const flag=args[i];if(flag==='--help'||flag==='-h')return true;
|
|
110
117
|
if((command==='open'&&(flag==='--control'||flag==='--direct'||flag==='--view-only'))||(command==='review'&&flag==='--view-only')){i++;continue;}if(!flags.includes(flag!))return false;i+=2;
|
|
@@ -143,7 +150,7 @@ export async function main(args:string[],options:{stateDir?:string}={}){
|
|
|
143
150
|
if(args[0]==='--version'||args[0]==='-v'){console.log((JSON.parse(await readFile(new URL('../package.json',import.meta.url),'utf8')) as {version:string}).version);return;}
|
|
144
151
|
if(args[0]==='control')return controlCommand(args.slice(1),options.stateDir);
|
|
145
152
|
if(args[0]==='open'){const openArgs=args.slice(1);if(commandHelpRequested(openArgs,'open')){console.log(usage);return;}const inputs=parseOpenInputs(openArgs);const result=await openReview(inputs,options);// Launcher contract (README): stdout is the URL line alone; stderr is diagnostic, control notice, retrieval, in that order.
|
|
146
|
-
console.log(result.url);if(result.build)console.error(buildOpenDiagnostic(result.build));if(result.selection)console.error(animationDiagnostic(result.selection));if(inputs.control)console.error('Inspection control enabled; query the current connected page with rig-review control and the same inputs.');console.error(`Review ${result.reused?'reused':'started'}; feedback: rig-review feedback ${[result.inputs.input,...(result.inputs.compare?['--compare',result.inputs.compare]:[]),...(result.inputs.reference?['--reference',result.inputs.reference]:[]),...(result.inputs.animation?['--animation',result.inputs.animation]:[]),...handoffWords(result.inputs)].map(shellWord).join(' ')}`);return;}
|
|
153
|
+
console.log(result.url);if(result.build)console.error(buildOpenDiagnostic(result.build));if(result.selection)console.error(animationDiagnostic(result.selection));if(inputs.control)console.error('Inspection control enabled; query the current connected page with rig-review control and the same inputs.');console.error(`Review ${result.reused?'reused':'started'}; feedback: rig-review feedback ${[result.inputs.input,...(result.inputs.compare?['--compare',result.inputs.compare]:[]),...(result.inputs.reference?['--reference',result.inputs.reference]:[]),...(result.inputs.animation?['--animation',result.inputs.animation]:[]),...handoffWords(result.inputs),...projectWords(result.inputs)].map(shellWord).join(' ')}`);return;}
|
|
147
154
|
if(args[0]==='parts')return partsCommand(args.slice(1));
|
|
148
155
|
if(args[0]==='interview')return (await import('./interview-server.ts')).interviewCommand(args.slice(1));
|
|
149
156
|
if(args[0]==='strip'){args.shift();if(args.includes('--help')){console.log(usage+'\nStrip: strip <package> --reference <declared-video-id> --animation <name> (--frames FIRST:LAST | --all-feedback) [--json] [--out path]\n strip compare <a> <b> --reference <video> --animation <name> --basis a|b (--frames FIRST:LAST | --all-feedback) [--json] [--out path]');return;}return stripCommand(args,options);}let command:'review'|'check'|'feedback'='review';if(args[0]==='check'||args[0]==='feedback'){command=args.shift() as 'check'|'feedback';}
|
|
@@ -166,13 +173,18 @@ export async function main(args:string[],options:{stateDir?:string}={}){
|
|
|
166
173
|
const stop=(sig:string)=>{server.stop(true);console.log(`review compare: exiting — received ${sig}.`);process.exit(0);};process.once('SIGINT',()=>stop('SIGINT'));process.once('SIGTERM',()=>stop('SIGTERM'));
|
|
167
174
|
console.log(`Compare ready: http://127.0.0.1:${server.port}/#cap=${capability}\nComparison: ${p.response.title}\nSource SHA-256: ${p.response.sourceHash}\nPress Ctrl+C to stop.`);return;
|
|
168
175
|
}
|
|
169
|
-
const input=args.shift();if(!input)throw new Error(usage);let port=4317;let checkpoint:string|undefined,reference:string|undefined,compare:string|undefined,animation:string|undefined,viewOnly=false;const handoff:OpenInputs={input};
|
|
170
|
-
while(args.length){const flag=args.shift();if(flag==='--view-only'){if(command!=='review')throw new Error(`Unknown option ${flag}\n${usage}`);viewOnly=true;continue;}const value=args.shift();if(!value)throw new Error(`Missing value for ${flag}`);if(handoffOption(flag!)){handoff[handoffOption(flag!)!]=value;continue;}if(flag==='--port'){port=Number(value);if(!Number.isInteger(port)||port<0||port>65535)throw new Error('--port: expected integer 0…65535');}else if(flag==='--checkpoint')checkpoint=value;else if(flag==='--reference')reference=value;else if(flag==='--compare')compare=value;else if(flag==='--animation')animation=value;else throw new Error(`Unknown option ${flag}\n${usage}`);}
|
|
176
|
+
const input=args.shift();if(!input)throw new Error(usage);let port=4317;let checkpoint:string|undefined,reference:string|undefined,compare:string|undefined,animation:string|undefined,viewOnly=false;const handoff:OpenInputs={input},projectOptions:string[]=[];
|
|
177
|
+
while(args.length){const flag=args.shift();if(flag==='--view-only'){if(command!=='review')throw new Error(`Unknown option ${flag}\n${usage}`);viewOnly=true;continue;}const value=args.shift();if(!value)throw new Error(`Missing value for ${flag}`);if(command==='feedback'&&projectFlags.includes(flag!)){projectOptions.push(flag!,value);continue;}if(handoffOption(flag!)){handoff[handoffOption(flag!)!]=value;continue;}if(flag==='--port'){port=Number(value);if(!Number.isInteger(port)||port<0||port>65535)throw new Error('--port: expected integer 0…65535');}else if(flag==='--checkpoint')checkpoint=value;else if(flag==='--reference')reference=value;else if(flag==='--compare')compare=value;else if(flag==='--animation')animation=value;else throw new Error(`Unknown option ${flag}\n${usage}`);}
|
|
171
178
|
const handoffProblem=checkHandoffFlags(handoff);if(handoffProblem)throw new Error(handoffProblem);if(compare&&handoffFlags(handoff))throw new Error('--config: compare takes no producer handoff');
|
|
179
|
+
if(projectOptions.length)handoff.project=parseOpenInputs([input,...projectOptions,...(compare?['--compare',compare]:[])]).project;
|
|
172
180
|
if(compare){if(correctionId)throw new Error('CORRECTION_COMPARE_UNSUPPORTED: select a single reviewed package');if(command!=='feedback')throw new Error('--compare: use open or feedback');const loaded=await loadOpenPackage({input,compare,reference,animation});if(loaded.mode!=='compare')throw new Error('Expected comparison');printFeedback(await readFeedbackCompareSession(loaded.p,options.stateDir));return;}
|
|
173
|
-
const
|
|
181
|
+
const base=await loadReferencedReview(input,reference,handoffFlags(handoff));
|
|
182
|
+
const joined=handoff.project?joinProject(base,handoff.project):undefined,p=joined?.review??base;
|
|
183
|
+
const unchanged=()=>joined?.assertCurrent()??assertReviewUnchanged(p);
|
|
184
|
+
if(viewOnly)p.viewOnly=true;// Serving starts on the report's clip when it names one; check and feedback validate only an explicit flag.
|
|
174
185
|
const fromReport=command==='review'&&animation===undefined&&p.report?.animation!==undefined;
|
|
175
186
|
const selection=animation!==undefined||fromReport?selectAnimation([{label:'single',catalog:p.feedbackCatalog,report:p.report}],animation,true):null;const initialAnimation=selection?.name;if(command==='feedback'&&correctionId){
|
|
187
|
+
await unchanged();
|
|
176
188
|
const stateDir=options.stateDir!;
|
|
177
189
|
const bytes=await readFile(sessionFile(p,stateDir)).catch(error=>{if(error.code==='ENOENT')throw new Error('CORRECTION_ITEM_INVALID: save a correction first');throw error;});
|
|
178
190
|
const session=parseSession(JSON.parse(bytes.toString('utf8')),p,false);
|
|
@@ -180,15 +192,15 @@ export async function main(args:string[],options:{stateDir?:string}={}){
|
|
|
180
192
|
const correction=parseCorrection((item?.context as any)?.correction);
|
|
181
193
|
if(!item||!correction||session.feedbackWarnings.some(warning=>warning.id===item.id))throw new Error('CORRECTION_ITEM_INVALID: expected a valid saved correction');
|
|
182
194
|
const source={id:p.manifest.id,revision:p.manifest.revision,sourceHash:p.sourceHash,reviewedSource:p.reviewedSource};
|
|
183
|
-
|
|
184
|
-
const rebuilds=createRebuilds(p,{stateDir,starts:[p.root,process.cwd()],unchanged:()=>assertReviewUnchanged(p),bones:p.feedbackCatalog.bones});
|
|
195
|
+
const rebuilds=createRebuilds(p,{stateDir,starts:[p.root,process.cwd()],unchanged,bones:p.feedbackCatalog.bones});
|
|
185
196
|
const settled=correction.path==='made'&&correction.selector.kind!=='post'?await rebuilds.correctionEvidence(appliedValue(item)):undefined;
|
|
186
197
|
const projected=projectSessionCorrection({...correction,session,sessionBytes:bytes,source,itemId:item.id,settled,direction:p.direction});
|
|
198
|
+
await unchanged();
|
|
187
199
|
if(projected.kind==='unsupported')console.error('CORRECTION_OPERATION_UNSUPPORTED: '+projected.operation);
|
|
188
200
|
process.stdout.write(format==='json'?bytes:formatCorrectionIssue(projected,item.context)+'\n');
|
|
189
201
|
return;
|
|
190
202
|
}
|
|
191
|
-
if(command==='feedback'){const saved=await readFeedbackSession(p,options.stateDir);await
|
|
203
|
+
if(command==='feedback'){const saved=await readFeedbackSession(p,options.stateDir);await unchanged();printFeedback(saved);return;}if(command==='check'){console.log(`Package valid: ${p.manifest.title}\nRevision: ${p.manifest.revision}\nSource SHA-256: ${p.sourceHash}\nDeclared files: ${p.files.size}\nPlayback: ${p.manifest.model?'compiled model present':'unavailable (no model)'}`);return;}
|
|
192
204
|
if(checkpoint&&!p.manifest.checkpoints.some(v=>v.id===checkpoint))throw new Error(`Unknown checkpoint ${checkpoint}`);
|
|
193
205
|
// Foreground serving uses the same `#cap=` fragment handoff as open: the printed link alone can submit.
|
|
194
206
|
const capability=randomBytes(32).toString('hex'),server=await startServer(p,{port,stateDir:options.stateDir,initialAnimation,capability,exitOnClose:true,viewOnly});const url=new URL(`http://127.0.0.1:${server.port}/`);if(checkpoint)url.searchParams.set('checkpoint',checkpoint);url.hash='cap='+capability;
|
|
@@ -110,6 +110,11 @@ function unsupportedOperation(schema: string): string {
|
|
|
110
110
|
|
|
111
111
|
export function projectSessionCorrection(input: SessionInput) {
|
|
112
112
|
const { session, sessionBytes, selector, source, itemId } = input;
|
|
113
|
+
const joined = input.direction?.joined;
|
|
114
|
+
if (selector.kind === 'post' && joined && selector.version !== joined.postVersion)
|
|
115
|
+
return refuse('CORRECTION_DIRECTION_SOURCE', 'select the joined Create post version');
|
|
116
|
+
if (selector.kind === 'post' && joined && input.path === 'made')
|
|
117
|
+
return refuse('CAMERA_APPLY_UNSUPPORTED', 'joined direction supports described requests only');
|
|
113
118
|
const on = selectorArgs(selector);
|
|
114
119
|
if (!hash(source.sourceHash) || !isDeepStrictEqual(sessionSource(session), source)) {
|
|
115
120
|
return refuse('CORRECTION_SOURCE_STALE', 'saved session differs from verified source');
|
|
@@ -129,7 +134,8 @@ export function projectSessionCorrection(input: SessionInput) {
|
|
|
129
134
|
const context = item.context as Record<string, unknown> | undefined;
|
|
130
135
|
const comment = hasStageComment(context?.comment) ? parseStageComment(context?.comment) : null;
|
|
131
136
|
const createSource = JSON.stringify({
|
|
132
|
-
source, post: selector.version, model, direction,
|
|
137
|
+
source, post: selector.version, model: joined?.projectModel ?? model, direction,
|
|
138
|
+
...(joined ? {binding: joined, rigVersion: input.direction!.rigVersion, inspectedModel: model} : {}),
|
|
133
139
|
animation: comment ? comment.animation : context?.animation,
|
|
134
140
|
time: comment ? comment.time : context?.time,
|
|
135
141
|
sourceTime: context?.sourceTime,
|
|
@@ -144,7 +150,8 @@ export function projectSessionCorrection(input: SessionInput) {
|
|
|
144
150
|
if (Buffer.byteLength(createSource) > 32 * 1024) {
|
|
145
151
|
return refuse('CORRECTION_DIRECTION_CONTEXT_SIZE', 'direction correction source exceeds 32 KiB');
|
|
146
152
|
}
|
|
147
|
-
return { ...common,
|
|
153
|
+
return { ...common, on: joined ? selectorArgs({...selector, modelFile: joined.projectModel.path}) : on,
|
|
154
|
+
kind: 'described' as const, outcome: null, createSource };
|
|
148
155
|
}
|
|
149
156
|
|
|
150
157
|
const value = appliedValue(item);
|
|
@@ -5,6 +5,13 @@ export const DIRECTION_MAX_BYTES = 256 * 1024;
|
|
|
5
5
|
type Binding = { path: string; sha256: string };
|
|
6
6
|
export interface DirectionInspection {
|
|
7
7
|
file: Binding;
|
|
8
|
+
joined?: {
|
|
9
|
+
postVersion: number;
|
|
10
|
+
projectHash: string;
|
|
11
|
+
packageSourceHash: string;
|
|
12
|
+
packageRoot: string;
|
|
13
|
+
projectModel: Binding;
|
|
14
|
+
};
|
|
8
15
|
rigVersion: number;
|
|
9
16
|
camera: { space: 'rig-world-y-up'; keys: { time: number; easing: string; box: { x: number; y: number; width: number; height: number } }[] };
|
|
10
17
|
take: { duration: number; loop: boolean };
|
package/src/front.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { interviewRefusals, interviewRequest } from './interview-routes.ts';
|
|
2
|
-
import { interviewStale } from './joined-project.ts';
|
|
2
|
+
import { directionStale, interviewStale } from './joined-project.ts';
|
|
3
3
|
import { picksLimit } from './interview-picks.ts';
|
|
4
4
|
import {stageDraftRefusals} from './stage-parts.ts';
|
|
5
5
|
/** Managed loopback front: one stable origin (127.0.0.1:4318 by default) routing `/instances/<key>/…` to the
|
|
@@ -107,10 +107,13 @@ export function stageFrameQuery(mode:'single'|'compare',search:string):boolean {
|
|
|
107
107
|
return keys.length===allowed.length&&new Set(keys).size===keys.length&&keys.every(k=>allowed.includes(k))&¶ms.get('stageEmbed')==='1'&&['en','ko'].includes(params.get('lang')??'')&&(mode==='single'||['a','b'].includes(params.get('side')??''));
|
|
108
108
|
}
|
|
109
109
|
/** Preserve only closed, bounded inspection refusals. */
|
|
110
|
-
async function inspectionRefusal(mode:'single'|'compare',method:string,path:string,response:Response):Promise<string|null>{
|
|
110
|
+
async function inspectionRefusal(mode:'single'|'compare',method:string,path:string,response:Response,sameFingerprint:boolean):Promise<string|null>{
|
|
111
111
|
const stageData=mode==='single'?path==='/api/stage-parts':/^\/api\/compare\/(?:a|b)\/stage-parts$/.test(path);
|
|
112
112
|
const interview=mode==='single'&&interviewRequest(path)&&[400,404,409].includes(response.status);
|
|
113
|
-
|
|
113
|
+
// Both reads race during the single-package page bootstrap.
|
|
114
|
+
const direction=sameFingerprint&&mode==='single'&&method==='GET'&&response.status===409&&
|
|
115
|
+
(path==='/api/review'||path==='/api/session');
|
|
116
|
+
if(!(direction||interview||stageData&&method==='GET'&&response.status===409)||!/^application\/json(?:\s*;|$)/i.test(response.headers.get('content-type')??''))return null;
|
|
114
117
|
const limit=512,declared=response.headers.get('content-length');if(declared!==null&&(!/^\d+$/.test(declared)||Number(declared)>limit))return null;
|
|
115
118
|
const reader=response.body?.getReader();if(!reader)return null;
|
|
116
119
|
try{
|
|
@@ -120,6 +123,7 @@ async function inspectionRefusal(mode:'single'|'compare',method:string,path:stri
|
|
|
120
123
|
const data:unknown=JSON.parse(new TextDecoder().decode(body)),named='PARTS_ATLAS_UNAVAILABLE: the inspected package has no usable atlas or its source changed.';
|
|
121
124
|
if(data===null||typeof data!=='object'||Array.isArray(data)||Object.keys(data).length!==1)return null;
|
|
122
125
|
const error=(data as {error?:unknown}).error;
|
|
126
|
+
if(direction)return error===directionStale?directionStale:null;
|
|
123
127
|
return typeof error==='string'&&(interview?[...interviewRefusals]:[named,interviewStale,...Object.values(stageDraftRefusals)] as readonly string[]).some(code=>code===error)?error:null;
|
|
124
128
|
}catch{return null;}finally{reader.releaseLock();}
|
|
125
129
|
}
|
|
@@ -190,7 +194,7 @@ export function startFront(options:{control:string;port:number;nonce:string;fing
|
|
|
190
194
|
try{upstream=await fetch(record.origin+path+(landing||stageFrame?url.search:''),{method:req.method,headers,...(body?{body}:{}),redirect:'manual',signal:abort.signal});}
|
|
191
195
|
catch{release();return abort.signal.aborted&&!req.signal.aborted?refuse('FRONT_UPSTREAM_TIMEOUT',504):refuse('FRONT_INSTANCE_EXPIRED: reopen with rig-review open',410);}
|
|
192
196
|
if(upstream.headers.get(openKeyHeader)!==key){void upstream.body?.cancel().catch(()=>{});release();return refuse('FRONT_INSTANCE_REPLACED: reopen with rig-review open',410);}
|
|
193
|
-
if(upstream.status>=400&&upstream.status!==416){const named=await inspectionRefusal(record.mode,req.method,path,upstream);void upstream.body?.cancel().catch(()=>{});release();if(named)return refuse(named,upstream.status);const code=upstreamFailure[upstream.status];return refuse(code??'FRONT_UPSTREAM_FAILED',code?upstream.status:502);}
|
|
197
|
+
if(upstream.status>=400&&upstream.status!==416){const named=await inspectionRefusal(record.mode,req.method,path,upstream,record.fingerprint===options.fingerprint);void upstream.body?.cancel().catch(()=>{});release();if(named)return refuse(named,upstream.status);const code=upstreamFailure[upstream.status];return refuse(code??'FRONT_UPSTREAM_FAILED',code?upstream.status:502);}
|
|
194
198
|
const out=new Headers();for(const name of responseHeaders){const value=upstream.headers.get(name);if(value!==null)out.set(name,value);}
|
|
195
199
|
if(!upstream.body||req.method==='HEAD'){void upstream.body?.cancel().catch(()=>{});release();return new Response(null,{status:upstream.status,headers:out});}
|
|
196
200
|
if(timer)clearTimeout(timer);const reader=upstream.body.getReader();
|
package/src/joined-project.ts
CHANGED
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
import { readdirSync } from 'node:fs';
|
|
2
2
|
import { join, relative, sep } from 'node:path';
|
|
3
|
-
import { boundBytes, checkedPath, digest, literalPath, object, readProject, readRegular } from './interview-project.ts';
|
|
3
|
+
import { boundBytes, checkedPath, digest, jsonObject, literalPath, object, readProject, readRegular } from './interview-project.ts';
|
|
4
|
+
import { DIRECTION_MAX_BYTES, readDirectionInspection } from './direction-inspection.ts';
|
|
4
5
|
import { outputDirectory } from './interview-picks.ts';
|
|
5
6
|
import { packagePath, type ReviewPackage } from './manifest.ts';
|
|
6
|
-
import { assertReviewUnchanged } from './reference.ts';
|
|
7
|
+
import { assertReviewUnchanged, withReviewAssertion } from './reference.ts';
|
|
7
8
|
|
|
8
|
-
export interface ProjectDesignation {root: string; version: number; picksDir: string}
|
|
9
|
+
export interface ProjectDesignation {root: string; version: number; postVersion?: number; picksDir: string}
|
|
9
10
|
export const interviewUnavailable = 'INTERVIEW_UNAVAILABLE';
|
|
10
11
|
export const interviewMismatch = 'INTERVIEW_SOURCE_MISMATCH';
|
|
11
12
|
export const interviewStale = 'INTERVIEW_OPTIONS_STALE';
|
|
13
|
+
export const directionStale = 'DIRECTION_SOURCE_STALE';
|
|
12
14
|
|
|
13
15
|
export function joinProject(p: ReviewPackage, designation: ProjectDesignation) {
|
|
14
16
|
const opened = readProject(designation.root);
|
|
@@ -16,8 +18,8 @@ export function joinProject(p: ReviewPackage, designation: ProjectDesignation) {
|
|
|
16
18
|
const {version} = designation;
|
|
17
19
|
const fail = (): never => {throw new Error(interviewMismatch + ': expected the designated Create version’s recorded review package');};
|
|
18
20
|
if (!Number.isSafeInteger(version) || version < 1) return fail();
|
|
19
|
-
const
|
|
20
|
-
|
|
21
|
+
const versions = (Array.isArray(project.versions) ? project.versions : []).map(object);
|
|
22
|
+
const matches = versions.filter(entry => entry.n === version && entry.kind === 'rig');
|
|
21
23
|
const record = object(matches[0]?.review_package);
|
|
22
24
|
const path = 'derived/review/v' + version;
|
|
23
25
|
const files = new Map<string, string>();
|
|
@@ -37,9 +39,9 @@ export function joinProject(p: ReviewPackage, designation: ProjectDesignation) {
|
|
|
37
39
|
const expected = files.get(relative(pkg, absolute).split(sep).join('/'));
|
|
38
40
|
return expected !== undefined && (sha256 === undefined || sha256 === expected);
|
|
39
41
|
};
|
|
40
|
-
if (![...p.files].every(file => covered(join(p.root, file))) ||
|
|
42
|
+
if (!p.reviewedSource.rig || ![...p.files].every(file => covered(join(p.root, file))) ||
|
|
41
43
|
!p.handoff.record.files.every(file => covered(join(p.root, file.path), file.sha256)) ||
|
|
42
|
-
!covered(join(p.root, p.manifest.model), p.reviewedSource.rig
|
|
44
|
+
!covered(join(p.root, p.manifest.model), p.reviewedSource.rig.sha256) ||
|
|
43
45
|
!files.has('out/parts.json') || ![...files.keys()].some(file => file.startsWith('out/parts/'))) return fail();
|
|
44
46
|
} catch {return fail();}
|
|
45
47
|
|
|
@@ -62,14 +64,67 @@ export function joinProject(p: ReviewPackage, designation: ProjectDesignation) {
|
|
|
62
64
|
try {assertInventory();} catch {return fail();}
|
|
63
65
|
outputDirectory(root, designation.picksDir, project);
|
|
64
66
|
|
|
67
|
+
// The existing join has already matched the exact recorded package inventory.
|
|
68
|
+
// Derive the project-relative model from the inspected asset, never from a SHA search.
|
|
69
|
+
let direction: ReviewPackage['direction'];
|
|
70
|
+
const postVersion = designation.postVersion;
|
|
71
|
+
const readDirection = (path: string) => readRegular(checkedPath(root, path), DIRECTION_MAX_BYTES);
|
|
72
|
+
if (postVersion !== undefined) {
|
|
73
|
+
const posts = versions.filter(entry => entry.n === postVersion);
|
|
74
|
+
const post = posts[0];
|
|
75
|
+
if (!Number.isSafeInteger(postVersion) || postVersion < 1 || posts.length !== 1 || post?.kind !== 'post')
|
|
76
|
+
throw new Error('DIRECTION_VERSION: select a recorded Create post version');
|
|
77
|
+
if (post.rig_version !== version)
|
|
78
|
+
throw new Error('DIRECTION_RIG_MISMATCH: selected post names a different rig version');
|
|
79
|
+
const provenance = object(post.provenance);
|
|
80
|
+
if (provenance.direction === undefined)
|
|
81
|
+
throw new Error('DIRECTION_DOCUMENT_REQUIRED: selected post has no authored direction');
|
|
82
|
+
const {path: directionPath, sha256} = object(provenance.direction);
|
|
83
|
+
const bindsDirection = (value: unknown) => {
|
|
84
|
+
const binding = object(value);
|
|
85
|
+
return binding.path === directionPath && binding.sha256 === sha256;
|
|
86
|
+
};
|
|
87
|
+
if (directionPath !== `evidence/direction/v${postVersion}.json` ||
|
|
88
|
+
typeof sha256 !== 'string' || !/^[a-f0-9]{64}$/.test(sha256) ||
|
|
89
|
+
!bindsDirection(provenance.config) || !Array.isArray(post.outputs) || !post.outputs.some(bindsDirection))
|
|
90
|
+
throw new Error('DIRECTION_VERSION: selected post must bind its exact direction document');
|
|
91
|
+
const file = {path: directionPath, sha256};
|
|
92
|
+
let bytes: Buffer;
|
|
93
|
+
try {
|
|
94
|
+
bytes = readDirection(file.path);
|
|
95
|
+
if (digest(bytes) !== file.sha256) throw new Error('SHA mismatch');
|
|
96
|
+
} catch {
|
|
97
|
+
throw new Error('DIRECTION_SOURCE_MISMATCH: selected direction is missing, unsafe or differs from its recorded SHA-256');
|
|
98
|
+
}
|
|
99
|
+
const model = p.reviewedSource.rig!;
|
|
100
|
+
const projectModel = {...model, path: relative(root, join(p.root, model.path)).split(sep).join('/')};
|
|
101
|
+
let document: unknown;
|
|
102
|
+
try { document = jsonObject(bytes); }
|
|
103
|
+
catch { throw new Error('DIRECTION_SCHEMA: expected a UTF-8 JSON direction object'); }
|
|
104
|
+
const inspected = readDirectionInspection(document, file, projectModel);
|
|
105
|
+
if (inspected.rigVersion !== version)
|
|
106
|
+
throw new Error('DIRECTION_RIG_MISMATCH: authored direction names a different rig version');
|
|
107
|
+
direction = {...inspected, joined: {postVersion, projectHash:hash, packageSourceHash:p.sourceHash, packageRoot:path, projectModel}};
|
|
108
|
+
}
|
|
65
109
|
const assertCurrent = async () => {
|
|
66
110
|
try {
|
|
67
111
|
await assertReviewUnchanged(p);
|
|
68
112
|
assertInventory();
|
|
69
113
|
if (digest(readRegular(checkedPath(root, 'project.json'), 8 * 1024 * 1024)) !== hash) throw new Error('Project changed');
|
|
70
114
|
} catch {throw new Error(interviewStale + ': project or review package changed; reopen the project');}
|
|
115
|
+
if (direction) {
|
|
116
|
+
try {
|
|
117
|
+
if (digest(readDirection(direction.file.path)) !== direction.file.sha256) throw new Error('SHA mismatch');
|
|
118
|
+
} catch {
|
|
119
|
+
throw new Error(directionStale);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
71
122
|
};
|
|
72
|
-
|
|
123
|
+
const review = direction ? withReviewAssertion({
|
|
124
|
+
...p, direction,
|
|
125
|
+
sourceHash:digest(JSON.stringify({schema:'rig-review-joined-direction/1', direction:direction.file, rigVersion:version, ...direction.joined})),
|
|
126
|
+
}, assertCurrent) : p;
|
|
127
|
+
return {review, opened, designation:{...designation, root}, assertCurrent,
|
|
73
128
|
available:opened.questions.length > 0 || opened.historical.length > 0};
|
|
74
129
|
}
|
|
75
130
|
export type JoinedProject = ReturnType<typeof joinProject>;
|
package/src/open.ts
CHANGED
|
@@ -44,7 +44,7 @@ const sleep=(ms:number)=>new Promise(resolveSleep=>setTimeout(resolveSleep,ms));
|
|
|
44
44
|
export const defaultStateDir=()=>process.env.RIG_REVIEW_STATE_DIR??join(homedir(),'.local','state','rig-c-review');
|
|
45
45
|
export async function loadOpenPackage(inputs:OpenInputs):Promise<OpenPackage>{
|
|
46
46
|
// Handoff flags become canonical absolute paths here, so the worker and every reload read exactly these files.
|
|
47
|
-
if(!inputs.compare){const
|
|
47
|
+
if(!inputs.compare){const base=await loadReferencedReview(inputs.input,inputs.reference,handoffFlags(inputs));const joined=inputs.project?joinProject(base,inputs.project):undefined;const p=joined?.review??base,selection=selectAnimation([{label:'single',catalog:p.feedbackCatalog,report:p.report}],inputs.animation,true);if(inputs.viewOnly)p.viewOnly=true;return {mode:'single',p,selection,contentHash:p.sourceHash,...(joined?{joined}:{}),inputs:{input:p.manifestPath,...(joined?{project:joined.designation}:{}),...(selectedReference(p)?{reference:selectedReference(p)!.path}:{}),...(selection?{animation:selection.name}:{}),...(inputs.control?{control:true}:{}),...(p.handoffInputs??{})}};}
|
|
48
48
|
if(inputs.project)throw new Error('INTERVIEW_SOURCE_MISMATCH: compare takes no joined project');
|
|
49
49
|
if(handoffFlags(inputs))throw new HandoffError('HANDOFF_FLAGS_INVALID','--config','compare takes no producer handoff; open one package with --config');
|
|
50
50
|
if(!inputs.reference)throw new Error('open compare: explicit --reference required');
|
package/src/reference.ts
CHANGED
|
@@ -9,6 +9,14 @@ import type {HandoffFlags} from './handoff.ts';
|
|
|
9
9
|
export interface ReferenceBinding {packageSourceHash:string;reference:{id:string;name:string;sha256:string}}
|
|
10
10
|
export interface PinnedReference {path:string;binding:ReferenceBinding}
|
|
11
11
|
const pinned=Symbol('explicit CLI reference');
|
|
12
|
+
const sourceAssertion=Symbol('joined source assertion');
|
|
13
|
+
type BoundPackage=ReviewPackage&{[sourceAssertion]?:()=>Promise<void>};
|
|
14
|
+
|
|
15
|
+
/** A composed source verifies its original package and the additional pinned inputs together. */
|
|
16
|
+
export function withReviewAssertion(p:ReviewPackage,assertCurrent:()=>Promise<void>):ReviewPackage {
|
|
17
|
+
const bound:BoundPackage={...p,[sourceAssertion]:assertCurrent};
|
|
18
|
+
return bound;
|
|
19
|
+
}
|
|
12
20
|
type ReferencedPackage=ReviewPackage&{[pinned]?:PinnedReference};
|
|
13
21
|
export const selectedReference=(p:ReviewPackage):PinnedReference|undefined=>(p as ReferencedPackage)[pinned];
|
|
14
22
|
export const referenceBinding=(p:ReviewPackage):ReferenceBinding|undefined=>selectedReference(p)?.binding;
|
|
@@ -29,6 +37,8 @@ export async function loadReferencedReview(input:string,reference?:string,handof
|
|
|
29
37
|
return {...base,sourceHash,manifest:{...base.manifest,references:[{id,label:video.name+' · selected reference',type:'video',path:'__review_selected_reference__.mp4'},...base.manifest.references]},[pinned]:{path:video.path,binding}} as ReferencedPackage;
|
|
30
38
|
}
|
|
31
39
|
export async function assertReviewUnchanged(p:ReviewPackage):Promise<void>{
|
|
40
|
+
const assertCurrent=(p as BoundPackage)[sourceAssertion];
|
|
41
|
+
if(assertCurrent)return assertCurrent();
|
|
32
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');}
|
|
33
43
|
catch{throw new Error('Package inputs changed or are unavailable. Restart review to bind feedback to current inputs.');}
|
|
34
44
|
}
|
package/src/server.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { interviewHeaders, interviewRequest, interviewRoutes } from './interview-routes.ts';
|
|
2
|
-
import { interviewUnavailable, interviewStale, type JoinedProject } from './joined-project.ts';
|
|
2
|
+
import { directionStale, interviewUnavailable, interviewStale, type JoinedProject } from './joined-project.ts';
|
|
3
3
|
import {isDeepStrictEqual} from 'node:util';
|
|
4
4
|
import {appliedValue,parseCorrection,projectSessionCorrection} from './correction-handoff.ts';
|
|
5
5
|
import {stagePartsRoutes} from './stage-parts.ts';
|
|
@@ -218,7 +218,7 @@ export async function startServer(p:ReviewPackage,options:{port?:number;stateDir
|
|
|
218
218
|
if(url.pathname==='/styles.css')return new Response(req.method==='HEAD'?null:await readFile(appRoot+'web/styles.css'),{headers:{...headers,'Content-Type':'text/css'}});
|
|
219
219
|
return json({error:'Not found'},404);
|
|
220
220
|
} finally { live.onRequestEnd(url.pathname); }
|
|
221
|
-
}catch(e){const message=e instanceof Error?e.message:'Request failed';return json({error:message},message.includes('inputs changed')?409:400);}};
|
|
221
|
+
}catch(e){const message=e instanceof Error?e.message:'Request failed';return json({error:message},message===directionStale || message.startsWith(interviewStale) || message.includes('inputs changed')?409:400);}};
|
|
222
222
|
const server=Bun.serve({hostname:'127.0.0.1',port:options.port??4317,websocket:live.websocket,async fetch(req,srv){const res=await handle(req,srv.port,srv);if(!res)return undefined as unknown as Response;return stampOpen(req,res,options.open);}});
|
|
223
223
|
rawStop=server.stop.bind(server);
|
|
224
224
|
server.stop=((closeActiveConnections?:boolean)=>{live.stop();return rawStop!(closeActiveConnections);}) as typeof server.stop;
|
package/web/catalog-en.ts
CHANGED
|
@@ -98,6 +98,8 @@ export const enCatalog: Readonly<Record<string, string>> = {
|
|
|
98
98
|
"direction.authored": "Authored direction · rig v{0} · {1} · SHA-256 {2}",
|
|
99
99
|
"direction.authoredUnavailable": "DIRECTION_METADATA_UNAVAILABLE · No authored direction bound to this model on stage.",
|
|
100
100
|
"direction.runtimeCameraUnavailable": "CAMERA_PLAYBACK_UNAVAILABLE · Authored camera and timing are read-only here. Pan and zoom adjust the inspection viewport.",
|
|
101
|
+
"direction.joined": "Create post {0} · project-relative model {1} · recorded package {2} · project SHA-256 {3} · package source SHA-256 {4}",
|
|
102
|
+
"Choose the joined Create post version.": "Choose the joined Create post version.",
|
|
101
103
|
"direction.cameraApplyUnavailable": "CAMERA_APPLY_UNSUPPORTED · Camera Apply is unavailable.",
|
|
102
104
|
"direction.keys": "Authored camera and timing keys",
|
|
103
105
|
"DIRECTION_UNAVAILABLE: no direction inspection contract is installed.": "DIRECTION_UNAVAILABLE: no direction inspection contract is installed.",
|
package/web/catalog-ko.ts
CHANGED
|
@@ -98,6 +98,8 @@ export const koCatalog: Readonly<Record<string, string>> = {
|
|
|
98
98
|
"direction.authored": "작성된 연출 · 리그 v{0} · {1} · SHA-256 {2}",
|
|
99
99
|
"direction.authoredUnavailable": "DIRECTION_METADATA_UNAVAILABLE · 화면의 모델에 연결된 연출 데이터가 없습니다.",
|
|
100
100
|
"direction.runtimeCameraUnavailable": "CAMERA_PLAYBACK_UNAVAILABLE · 작성된 카메라와 타이밍은 여기서 읽기 전용입니다. 이동과 확대는 검사 화면에만 적용됩니다.",
|
|
101
|
+
"direction.joined": "Create 포스트 {0} · 프로젝트 기준 모델 {1} · 기록된 패키지 {2} · 프로젝트 SHA-256 {3} · 패키지 소스 SHA-256 {4}",
|
|
102
|
+
"Choose the joined Create post version.": "연결된 Create 포스트 버전을 선택하세요.",
|
|
101
103
|
"direction.cameraApplyUnavailable": "CAMERA_APPLY_UNSUPPORTED · 카메라 적용을 지원하지 않습니다.",
|
|
102
104
|
"direction.keys": "작성된 카메라 및 타이밍 키",
|
|
103
105
|
"DIRECTION_UNAVAILABLE: no direction inspection contract is installed.": "DIRECTION_UNAVAILABLE: 연출 검사 계약이 설치되어 있지 않습니다.",
|
package/web/direction-panel.ts
CHANGED
|
@@ -15,6 +15,7 @@ export interface DirectionView {
|
|
|
15
15
|
|
|
16
16
|
export function directionRows(view: DirectionView): { key: string; values?: string[] }[] {
|
|
17
17
|
const model = view.model;
|
|
18
|
+
const joined = model?.inspected ? view.authored?.joined : undefined;
|
|
18
19
|
return [
|
|
19
20
|
model ? { key: model.inspected ? 'direction.inspected' : 'direction.scratch', values: [model.path, model.sha256] }
|
|
20
21
|
: { key: 'direction.modelUnavailable' },
|
|
@@ -26,6 +27,8 @@ export function directionRows(view: DirectionView): { key: string; values?: stri
|
|
|
26
27
|
model?.inspected && view.authored
|
|
27
28
|
? { key: 'direction.authored', values: [String(view.authored.rigVersion), view.authored.file.path, view.authored.file.sha256] }
|
|
28
29
|
: { key: 'direction.authoredUnavailable' },
|
|
30
|
+
...(joined ? [{ key: 'direction.joined', values: [String(joined.postVersion), joined.projectModel.path,
|
|
31
|
+
joined.packageRoot, joined.projectHash, joined.packageSourceHash] }] : []),
|
|
29
32
|
{ key: 'direction.runtimeCameraUnavailable' },
|
|
30
33
|
{ key: 'direction.cameraApplyUnavailable' },
|
|
31
34
|
];
|
package/web/main.ts
CHANGED
|
@@ -35,7 +35,7 @@ import {historyRow,isPatchJob,recordFor,refusedText,restoredOutcomeForJob,retarg
|
|
|
35
35
|
import {meshEditBinding,meshEditText,type MeshEditDocument} from '../src/mesh-edit.ts';
|
|
36
36
|
import {chestRegionsBinding,cropWorldMapping,type CropWorldMapping} from '../src/chest-regions.ts';
|
|
37
37
|
import {bindWorkspaceUI,selectedInspector,type WorkspaceUI} from './workspace-ui.ts';
|
|
38
|
-
import {setSourceAttribute,setSourceText,sourceTextContent,tr} from './i18n.ts';
|
|
38
|
+
import {setSourceAttribute,setSourceText,sourceTextContent,t,tr} from './i18n.ts';
|
|
39
39
|
import {holdScrubBox,releaseScrubBox,scrubBox} from './scrub-box.ts';
|
|
40
40
|
import {bindInspectorBlocks,activeBlocksUI,restoreActiveBlocksUI,type InspectorBlocks} from './inspector-blocks.ts';
|
|
41
41
|
import {connectControl} from './control.ts';
|
|
@@ -794,6 +794,11 @@ function syncCorrectionStage(): void {
|
|
|
794
794
|
|
|
795
795
|
function correctionSelection(path: 'described' | 'made'): Json {
|
|
796
796
|
const stage = select('correction-stage').value, identity = input('correction-selector').value;
|
|
797
|
+
const joined = data.direction?.joined;
|
|
798
|
+
if (stage === 'direction-review' && joined) {
|
|
799
|
+
if (path === 'made') throw new Error(t('direction.cameraApplyUnavailable'));
|
|
800
|
+
if (identity !== String(joined.postVersion)) throw new Error(tr('Choose the joined Create post version.'));
|
|
801
|
+
}
|
|
797
802
|
if (stage === 'parts-review' && /^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$/.test(identity)) {
|
|
798
803
|
return { path, selector: { stage, kind: 'draft', id: identity } };
|
|
799
804
|
}
|