@rig-c/review 4.9.0 → 4.10.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/DESIGN.md +4 -4
- package/docs/REVIEW_PACKAGE.md +90 -16
- package/docs/STABILITY.md +100 -3
- package/package.json +2 -2
- package/src/chest-landmarks.ts +9 -4
- package/src/compare-html.ts +1 -1
- package/src/feedback-export.ts +2 -2
- package/src/feedback-validation.ts +11 -6
- package/src/frame-clock.ts +20 -4
- package/src/job-act.ts +60 -71
- package/src/job-api.ts +286 -40
- package/src/job-cli.ts +3 -2
- package/src/job-contract.ts +92 -5
- package/src/job-front.ts +19 -8
- package/src/job-host.ts +7 -1
- package/src/job-session.ts +136 -26
- package/src/job-source.ts +109 -14
- package/src/job-store.ts +7 -4
- package/src/manifest.ts +59 -7
- package/src/rebuild.ts +1 -1
- package/src/session.ts +9 -4
- package/src/stage-comment.ts +2 -1
- package/web/catalog-en.ts +26 -6
- package/web/catalog-ko.ts +49 -29
- package/web/chest-editor.ts +236 -31
- package/web/compare.css +2 -2
- package/web/i18n.ts +1 -3
- package/web/inspection-persistence.ts +19 -6
- package/web/interview-panel.ts +13 -80
- package/web/job-rig-screen.ts +59 -33
- package/web/job-session.ts +175 -40
- package/web/label-placement.ts +25 -8
- package/web/main.ts +314 -89
- package/web/part-selection.ts +2 -1
- package/web/parts-viewport-provider.ts +19 -6
- package/web/rebuild-client.ts +2 -4
- package/web/rig-host.ts +5 -4
- package/web/rig-overlays.ts +3 -2
- package/web/rig-viewport-provider.ts +6 -1
- package/web/stage-comments.ts +22 -21
- package/web/styles.css +21 -49
- package/web/workspace-layout.ts +4 -4
- package/web/workspace-ui.ts +5 -3
package/src/job-cli.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { randomUUID } from 'node:crypto';
|
|
2
2
|
import {closeSync, constants, fstatSync, fsyncSync, lstatSync, openSync, readFileSync, renameSync, unlinkSync, writeSync} from 'node:fs';
|
|
3
3
|
import {join} from 'node:path';
|
|
4
|
-
import { JOB_API_SCHEMA, JOB_ACT_SCHEMA, JOB_PARTS_VERDICT_ACT_SCHEMA, JOB_RIG_REVIEW_ACT_SCHEMA, JOB_COMMENTS_ACT_SCHEMA, JOB_COMMENT_CONTEXT_ACT_SCHEMA, JOB_MESH_EDITS_ACT_SCHEMA, JOB_ENABLED_ACT_KINDS, jobRawActMediaType, jobStillByteLimit, jobActDeliveryLimit, jobResponseBodyLimit,
|
|
4
|
+
import { JOB_API_SCHEMA, JOB_ACT_SCHEMA, JOB_PARTS_VERDICT_ACT_SCHEMA, JOB_RIG_REVIEW_ACT_SCHEMA, JOB_COMMENTS_ACT_SCHEMA, JOB_COMMENT_CONTEXT_ACT_SCHEMA, JOB_MESH_EDITS_ACT_SCHEMA, JOB_CHEST_LANDMARKS_ACT_SCHEMA, JOB_ENABLED_ACT_KINDS, jobRawActMediaType, jobStillByteLimit, jobActDeliveryLimit, jobResponseBodyLimit,
|
|
5
5
|
JOB_RECORD_ACT_KINDS, JOB_RECORD_ACT_SCHEMA,
|
|
6
6
|
type JobAct, type JobMeshEditsAct, type JobAgentRequest, type JobApiSchema, type JobNextRequest, type JobNextRequestV3, type JobNextValue } from './job-contract.ts';
|
|
7
|
-
import { assertJobApiSchema, jobFailure, jobHash, jobId, jobInteger, jobObject, jobWaitLimitMs, parseJobRequest, parseCommentsAct, parseContextCommentsAct, parseMeshEditsAct, parseRecordAct } from './job-api.ts';
|
|
7
|
+
import { assertJobApiSchema, jobFailure, jobHash, jobId, jobInteger, jobObject, jobWaitLimitMs, parseJobRequest, parseCommentsAct, parseContextCommentsAct, parseMeshEditsAct, parseChestLandmarksAct, parseRecordAct } from './job-api.ts';
|
|
8
8
|
import { JobError } from './job-store.ts';
|
|
9
9
|
import {validatePngBytes} from './comment-crops.ts';
|
|
10
10
|
import {destinationDirectory} from './destination-directory.ts';
|
|
@@ -152,6 +152,7 @@ const consumerCommentsDecoders = {
|
|
|
152
152
|
[JOB_COMMENTS_ACT_SCHEMA]: parseCommentsAct,
|
|
153
153
|
[JOB_COMMENT_CONTEXT_ACT_SCHEMA]: parseContextCommentsAct,
|
|
154
154
|
[JOB_MESH_EDITS_ACT_SCHEMA]: parseMeshEditsAct,
|
|
155
|
+
[JOB_CHEST_LANDMARKS_ACT_SCHEMA]: parseChestLandmarksAct,
|
|
155
156
|
} as const;
|
|
156
157
|
|
|
157
158
|
function parseConsumerAct(bytes: Buffer, job: string, actId: string): ConsumerAct {
|
package/src/job-contract.ts
CHANGED
|
@@ -19,6 +19,7 @@ import type { MarkRegion } from './stage-comment.ts';
|
|
|
19
19
|
import type { PartsVerdict } from './parts-view.ts';
|
|
20
20
|
import type { ControlNumericCamera, ControlPart } from './control.ts';
|
|
21
21
|
import type { MeshOp, Vec } from './mesh-edit.ts';
|
|
22
|
+
import type { BustLandmarks } from './chest-landmarks.ts';
|
|
22
23
|
|
|
23
24
|
export const JOB_API_SCHEMA = 'rig-review/job-api@2' as const;
|
|
24
25
|
export const JOB_API_V3_SCHEMA = 'rig-review/job-api@3' as const;
|
|
@@ -35,6 +36,8 @@ export const JOB_COMMENTS_ACT_SCHEMA = 'rig-review/act@6' as const;
|
|
|
35
36
|
export const JOB_COMMENT_CONTEXT_ACT_SCHEMA = 'rig-review/act@7' as const;
|
|
36
37
|
/** @7 plus a mesh payload on a compiled rig's Request changes (#952). */
|
|
37
38
|
export const JOB_MESH_EDITS_ACT_SCHEMA = 'rig-review/act@8' as const;
|
|
39
|
+
/** A compiled rig's Request changes carrying chest landmarks (#990). */
|
|
40
|
+
export const JOB_CHEST_LANDMARKS_ACT_SCHEMA = 'rig-review/act@9' as const;
|
|
38
41
|
export const REVIEW_COMMENTS_SESSION_SCHEMA = 'rig-review-session/2' as const;
|
|
39
42
|
export const REVIEW_COMMENTS_COMPARE_SESSION_SCHEMA = 'rig-review-compare-session/2' as const;
|
|
40
43
|
export const PARTS_COMMENTS_VERDICT_SCHEMA = 'rig-review-parts-verdict/5' as const;
|
|
@@ -142,6 +145,29 @@ export type JobMeshEditsAct = JobRigMeshEditsAct | {
|
|
|
142
145
|
readonly value: Extract<JobContextCommentsAct, {kind: Kind}>['value'] & {readonly meshEdits?: never};
|
|
143
146
|
}
|
|
144
147
|
}[keyof JobCommentsActValues];
|
|
148
|
+
|
|
149
|
+
/** Setup-pose rig px in the retained model's stage, shared by the seed and the edit. */
|
|
150
|
+
export type JobChestLandmarkValue = Pick<JobMeshEditValue, 'slot' | 'skin' | 'attachment' | 'basis'> & {
|
|
151
|
+
readonly source: Pick<JobMeshEditValue['source'], 'hash' | 'frame'>;
|
|
152
|
+
readonly bust: Readonly<BustLandmarks>;
|
|
153
|
+
};
|
|
154
|
+
|
|
155
|
+
export type JobPublishedChestLandmark = JobChestLandmarkValue & {
|
|
156
|
+
readonly source: JobChestLandmarkValue['source'] & {readonly configHash: JobSha256};
|
|
157
|
+
};
|
|
158
|
+
|
|
159
|
+
export interface JobChestLandmarkEdit {
|
|
160
|
+
readonly edit: JobChestLandmarkValue;
|
|
161
|
+
readonly sha256: JobSha256;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
export type JobChestLandmarksAct = Omit<JobRigMeshEditsAct, 'schema' | 'value'> & {
|
|
165
|
+
readonly schema: typeof JOB_CHEST_LANDMARKS_ACT_SCHEMA;
|
|
166
|
+
readonly value: Omit<JobRigMeshEditsAct['value'], 'meshEdits'> & {
|
|
167
|
+
readonly meshEdits?: readonly JobMeshEdit[];
|
|
168
|
+
readonly chestLandmarks: readonly JobChestLandmarkEdit[];
|
|
169
|
+
};
|
|
170
|
+
};
|
|
145
171
|
export type ReviewCommentsSession = Omit<ReviewSession, 'schema' | 'feedback' | 'checkpoints'> & {
|
|
146
172
|
schema: typeof REVIEW_COMMENTS_SESSION_SCHEMA;
|
|
147
173
|
checkpoints: Record<string, { outcome: 'pending' | 'pass' | 'fail' }>;
|
|
@@ -557,6 +583,7 @@ export type JobUIActValues = Omit<JobActValues, 'checkpoint' | 'parts-verdict' |
|
|
|
557
583
|
readonly feedback?: readonly Feedback[];
|
|
558
584
|
readonly general?: readonly string[];
|
|
559
585
|
readonly meshEdits?: readonly JobMeshEdit[];
|
|
586
|
+
readonly chestLandmarks?: readonly JobChestLandmarkEdit[];
|
|
560
587
|
});
|
|
561
588
|
};
|
|
562
589
|
|
|
@@ -571,7 +598,7 @@ export interface JobActSources {
|
|
|
571
598
|
readonly parts: JobPartsIdentity;
|
|
572
599
|
};
|
|
573
600
|
readonly 'review-verdict': (JobModelSourceBinding & {
|
|
574
|
-
readonly selector: Extract<JobSelector, { kind: 'rig' | 'post' }>;
|
|
601
|
+
readonly selector: Extract<JobSelector, { kind: 'rig' | 'post' | 'draft' }>;
|
|
575
602
|
readonly model: JobFileIdentity;
|
|
576
603
|
});
|
|
577
604
|
readonly signoff: JobModelSourceBinding;
|
|
@@ -626,7 +653,7 @@ export type JobPartsVerdictAct = Omit<Extract<JobLegacyAct, {kind: 'parts-verdic
|
|
|
626
653
|
|
|
627
654
|
/** Historical @2 acts remain readable without being backfilled or relabelled.
|
|
628
655
|
* Fresh comments use @6, live rig comments carrying context use @7, and rig verdicts carrying mesh edits use @8. */
|
|
629
|
-
export type JobAct = JobLegacyAct | JobRigReviewAct | JobPartsVerdictAct | JobCommentsAct | JobContextCommentsAct | JobRigMeshEditsAct;
|
|
656
|
+
export type JobAct = JobLegacyAct | JobRigReviewAct | JobPartsVerdictAct | JobCommentsAct | JobContextCommentsAct | JobRigMeshEditsAct | JobChestLandmarksAct;
|
|
630
657
|
|
|
631
658
|
/** Authenticated browser provenance. The daemon validates identity and hashes PNG bytes. */
|
|
632
659
|
export interface JobRigCapture {
|
|
@@ -727,6 +754,8 @@ export interface JobPublication {
|
|
|
727
754
|
readonly code: string;
|
|
728
755
|
};
|
|
729
756
|
readonly interview?: JobInterviewDiagnostics | null;
|
|
757
|
+
/** Producer-declared contour.bust for the displayed rig, sealed in source.sourceHash. */
|
|
758
|
+
readonly chestLandmarks?: readonly JobPublishedChestLandmark[];
|
|
730
759
|
}
|
|
731
760
|
|
|
732
761
|
export interface JobStatus {
|
|
@@ -830,6 +859,8 @@ export const JOB_ERROR_CODES = [
|
|
|
830
859
|
'JOB_CURSOR_INVALID',
|
|
831
860
|
'JOB_STORAGE_FAILED',
|
|
832
861
|
'JOB_AGENT_ISOLATION_HOLE',
|
|
862
|
+
/** #1004: an option-set publication names one set twice (two subjects or two `sets` rows for one set). */
|
|
863
|
+
'JOB_OPTION_SET_DUPLICATE',
|
|
833
864
|
] as const;
|
|
834
865
|
export type JobErrorCode = typeof JOB_ERROR_CODES[number];
|
|
835
866
|
|
|
@@ -913,6 +944,8 @@ export interface JobDisplayReceipt {
|
|
|
913
944
|
|
|
914
945
|
export interface JobDisplayPublication {
|
|
915
946
|
readonly publication: JobPublication;
|
|
947
|
+
/** A declared rig draft verdict selects the rig screen even when parts are retained. */
|
|
948
|
+
readonly rigDraftVerdict?: true;
|
|
916
949
|
/** Same-origin routes pinned to this publication and instance. No current alias. */
|
|
917
950
|
readonly routes: {
|
|
918
951
|
readonly entry: string;
|
|
@@ -934,6 +967,8 @@ export interface JobHostPorts {
|
|
|
934
967
|
readonly after: JobCursor | null;
|
|
935
968
|
readonly signal: AbortSignal;
|
|
936
969
|
}): AsyncIterable<EventV3>;
|
|
970
|
+
/** Front-only opt-in. Semantic subscribers keep the durable event stream above. */
|
|
971
|
+
subscribeJobPage?(input: Parameters<JobHostPorts['subscribeJob']>[0]): AsyncIterable<EventV3 | JobProgressLineV3>;
|
|
937
972
|
readPublication(jobId: JobId, publicationId: JobPublicationId): Promise<JobResult<DisplayPublicationV3>>;
|
|
938
973
|
commitUIAct(jobId: JobId, request: Request): Promise<JobResult<ActV3>>;
|
|
939
974
|
ackDisplayed(jobId: JobId, request: Request): Promise<JobResult<JobDisplayReceipt>>;
|
|
@@ -977,10 +1012,18 @@ export interface JobConsumerGrant {
|
|
|
977
1012
|
readonly lifetime: 'until-explicit-close';
|
|
978
1013
|
}
|
|
979
1014
|
|
|
1015
|
+
/** One option set of a publication: the question it answers and the set's id. */
|
|
1016
|
+
export interface RecordOptionSetRef {
|
|
1017
|
+
readonly questionId: string;
|
|
1018
|
+
readonly setId: string;
|
|
1019
|
+
}
|
|
1020
|
+
|
|
980
1021
|
export interface RecordOptionResult {
|
|
981
1022
|
readonly kind: 'option-set';
|
|
982
1023
|
readonly questionId: string;
|
|
983
1024
|
readonly setId: string;
|
|
1025
|
+
/** #1004: 2–64 sets published together, one ask each; `sets[0]` repeats `questionId`/`setId`. Absent for one set. */
|
|
1026
|
+
readonly sets?: readonly RecordOptionSetRef[];
|
|
984
1027
|
}
|
|
985
1028
|
|
|
986
1029
|
export interface RecordPlanResult {
|
|
@@ -1032,6 +1075,34 @@ export interface AskBatchValueV3 {
|
|
|
1032
1075
|
readonly asks: readonly PendingAskV3[];
|
|
1033
1076
|
}
|
|
1034
1077
|
|
|
1078
|
+
export interface JobProgressV3 {
|
|
1079
|
+
readonly seq: number;
|
|
1080
|
+
readonly phase: 'ingest' | 'build' | 'measure' | 'publish' | 'other';
|
|
1081
|
+
readonly text?: string;
|
|
1082
|
+
readonly step?: { readonly i: number; readonly n: number };
|
|
1083
|
+
readonly at: string;
|
|
1084
|
+
readonly generation: number;
|
|
1085
|
+
}
|
|
1086
|
+
|
|
1087
|
+
export type JobProgressRequestV3 = Omit<JobRequestBase, 'schema'> & Omit<JobProgressV3, 'at' | 'generation'> & {
|
|
1088
|
+
readonly schema: typeof JOB_API_V3_SCHEMA;
|
|
1089
|
+
readonly verb: 'progress';
|
|
1090
|
+
};
|
|
1091
|
+
|
|
1092
|
+
export interface JobProgressValueV3 {
|
|
1093
|
+
readonly status: 'accepted' | 'ignored';
|
|
1094
|
+
readonly seq: number;
|
|
1095
|
+
readonly at: string;
|
|
1096
|
+
}
|
|
1097
|
+
|
|
1098
|
+
/** Current host progress delivered only on the page stream. */
|
|
1099
|
+
export interface JobProgressLineV3 {
|
|
1100
|
+
readonly type: 'progress';
|
|
1101
|
+
readonly jobId: JobId;
|
|
1102
|
+
readonly progress: JobProgressV3 | null;
|
|
1103
|
+
readonly now: string;
|
|
1104
|
+
}
|
|
1105
|
+
|
|
1035
1106
|
export type NextRequestV3 = Omit<JobNextRequest, 'schema'> & {
|
|
1036
1107
|
readonly schema: typeof JOB_API_V3_SCHEMA;
|
|
1037
1108
|
};
|
|
@@ -1044,6 +1115,7 @@ export type AgentRequestV3 =
|
|
|
1044
1115
|
| PublishRequestV3
|
|
1045
1116
|
| AskRequestV3
|
|
1046
1117
|
| AskBatchRequestV3
|
|
1118
|
+
| JobProgressRequestV3
|
|
1047
1119
|
| NextRequestV3
|
|
1048
1120
|
| CloseRequestV3;
|
|
1049
1121
|
|
|
@@ -1093,7 +1165,8 @@ export interface RecordContextBase {
|
|
|
1093
1165
|
export type OptionContext = RecordContextBase & {
|
|
1094
1166
|
readonly checkpointEvidence?: never;
|
|
1095
1167
|
readonly plan: null;
|
|
1096
|
-
|
|
1168
|
+
/** One `interview-picks` subject per published set, in set order. */
|
|
1169
|
+
readonly subjects: readonly RecordPicksSubject[];
|
|
1097
1170
|
};
|
|
1098
1171
|
|
|
1099
1172
|
export type PlanContext = RecordContextBase & {
|
|
@@ -1147,9 +1220,20 @@ export type OptionSource = RecordSourceBase & {
|
|
|
1147
1220
|
readonly optionSet: { readonly id: string; readonly sha256: JobSha256 };
|
|
1148
1221
|
readonly optionSetFile: JobFileIdentity;
|
|
1149
1222
|
readonly plan: null;
|
|
1150
|
-
readonly subjects: readonly [
|
|
1223
|
+
readonly subjects: readonly RecordPicksSubject[];
|
|
1224
|
+
/** #1004: present only when the publication carries 2–64 sets; row i binds `selection.sets[i]`.
|
|
1225
|
+
* On a publication the singular `selection`/`optionSet`/`optionSetFile` name the first set; on an act they name the act's set. */
|
|
1226
|
+
readonly optionSets?: readonly RecordOptionSetBinding[];
|
|
1151
1227
|
};
|
|
1152
1228
|
|
|
1229
|
+
/** One published set's identity and the sealed file it was read from. */
|
|
1230
|
+
export interface RecordOptionSetBinding {
|
|
1231
|
+
readonly questionId: string;
|
|
1232
|
+
readonly setId: string;
|
|
1233
|
+
readonly optionSet: { readonly id: string; readonly sha256: JobSha256 };
|
|
1234
|
+
readonly optionSetFile: JobFileIdentity;
|
|
1235
|
+
}
|
|
1236
|
+
|
|
1153
1237
|
export type PlanSource = RecordSourceBase & {
|
|
1154
1238
|
readonly checkpointEvidence?: readonly JobCheckpointEvidence[];
|
|
1155
1239
|
readonly subject: 'plan';
|
|
@@ -1224,7 +1308,7 @@ export type SourceV3 = JobSourceBinding | RecordSource;
|
|
|
1224
1308
|
export type ActV3 = JobAct | RecordAct;
|
|
1225
1309
|
|
|
1226
1310
|
/**
|
|
1227
|
-
* `recordPublication`, `recordActSchema` and `
|
|
1311
|
+
* `recordPublication`, `recordActSchema`, `askBatch` and `progress` describe the host, not the current head.
|
|
1228
1312
|
* `ask-batch` applies only to a record-retained head publication; a package head refuses `JOB_REQUEST_INVALID`,
|
|
1229
1313
|
* so a consumer checks the publication's mode as well as the flag (#972).
|
|
1230
1314
|
*/
|
|
@@ -1232,12 +1316,14 @@ export interface JobCapabilitiesV3 extends JobCapabilities {
|
|
|
1232
1316
|
readonly recordPublication: true;
|
|
1233
1317
|
readonly recordActSchema: typeof JOB_RECORD_ACT_SCHEMA;
|
|
1234
1318
|
readonly askBatch: true;
|
|
1319
|
+
readonly progress: true;
|
|
1235
1320
|
}
|
|
1236
1321
|
|
|
1237
1322
|
export const JOB_CAPABILITIES_V3: JobCapabilitiesV3 = Object.freeze({
|
|
1238
1323
|
recordPublication: true,
|
|
1239
1324
|
recordActSchema: JOB_RECORD_ACT_SCHEMA,
|
|
1240
1325
|
askBatch: true,
|
|
1326
|
+
progress: true,
|
|
1241
1327
|
});
|
|
1242
1328
|
|
|
1243
1329
|
export interface PendingAskV3 extends Omit<JobPendingAsk, 'subject' | 'source'> {
|
|
@@ -1280,6 +1366,7 @@ export interface ResponseValuesV3 {
|
|
|
1280
1366
|
readonly publish: PublicationV3;
|
|
1281
1367
|
readonly ask: PendingAskV3;
|
|
1282
1368
|
readonly 'ask-batch': AskBatchValueV3;
|
|
1369
|
+
readonly progress: JobProgressValueV3;
|
|
1283
1370
|
readonly next: NextValueV3;
|
|
1284
1371
|
readonly close: { readonly status: 'closed'; readonly cursor: JobCursor | null };
|
|
1285
1372
|
readonly 'fetch-act': ActV3;
|
package/src/job-front.ts
CHANGED
|
@@ -5,7 +5,7 @@ import {checkpointEvidenceMetadata, readCheckpointEvidenceBytes} from './job-che
|
|
|
5
5
|
import { JOB_API_SCHEMA, JOB_ACT_SCHEMA, type JobErrorCode, type JobHostPorts, type JobId, type JobPublicationMode, type JobResult, type JobReviewerBinding } from './job-contract.ts';
|
|
6
6
|
import { createJobHostPorts, jobBody, jobHash, jobId, jobObject, jobPartsEnumeratorVersion } from './job-api.ts';
|
|
7
7
|
import { JobSession } from './job-session.ts';
|
|
8
|
-
import { assertJobRoot, assertRetainedSnapshotIntact, captureJobRoot, planTextMetadata, isRetainedRecordSource, loadRetainedJobReview, loadRetainedRecordRig, readPreviousDraftBytes, type JobRootIdentity } from './job-source.ts';
|
|
8
|
+
import { assertJobRoot, assertRetainedSnapshotIntact, captureJobRoot, planTextMetadata, isRetainedRecordSource, loadRetainedJobReview, loadRetainedRecordRig, retainedRecordPainting, readPreviousDraftBytes, retainedRigDraftVerdict, type JobRootIdentity } from './job-source.ts';
|
|
9
9
|
import { checkedPath } from './interview-project.ts';
|
|
10
10
|
import type { JobWorkerOptions } from './job-worker.ts';
|
|
11
11
|
import { JobError, JobStore, jobCropReferences } from './job-store.ts';
|
|
@@ -162,7 +162,8 @@ export function createJobFront(options: {
|
|
|
162
162
|
request.signal.addEventListener('abort', stop, { once: true });
|
|
163
163
|
if (request.signal.aborted)
|
|
164
164
|
stop();
|
|
165
|
-
const
|
|
165
|
+
const subscription = { jobId, after, signal: abort.signal };
|
|
166
|
+
const iterator = (options.ports.subscribeJobPage?.(subscription) ?? options.ports.subscribeJob(subscription))[Symbol.asyncIterator]();
|
|
166
167
|
const encoder = new TextEncoder();
|
|
167
168
|
const body = new ReadableStream<Uint8Array>({
|
|
168
169
|
async pull(controller) {
|
|
@@ -289,15 +290,15 @@ export function retainedPublicationRoutes(session: JobSession) {
|
|
|
289
290
|
capabilities: {playback: !!review?.manifest.model,
|
|
290
291
|
interview: questions.length > 0 || (retained.interview?.records.length ?? 0) > 0 ||
|
|
291
292
|
(retained.interview?.diagnostics.length ?? 0) > 0,
|
|
292
|
-
preRig: retained.source.selector?.kind === 'draft', modeling: false, motion: false, feedback: true, audio: false},
|
|
293
|
+
preRig: retained.source.selector?.kind === 'draft' && !retainedRigDraftVerdict(retained), modeling: false, motion: false, feedback: true, audio: false},
|
|
293
294
|
});
|
|
294
|
-
const interviewMetadata = (rigPicture = false) => {
|
|
295
|
+
const interviewMetadata = (rigPicture = false, painting?: NonNullable<ReturnType<typeof retainedRecordPainting>>) => {
|
|
295
296
|
const interview = isRetainedRecordSource(retained) ? undefined :
|
|
296
297
|
retained.interview !== undefined ? retained.interview : display.publication.interview;
|
|
297
298
|
return json({
|
|
298
299
|
questions: questions.map(question => ({...question,
|
|
299
300
|
...(rigPicture && question.missingPicture === 'rig' ? {missingPicture: undefined} : {}),
|
|
300
|
-
images: question.images.map((image, index) => ({name: image.name,
|
|
301
|
+
images: (painting && question.missingPicture ? [painting] : question.images).map((image, index) => ({name: image.name,
|
|
301
302
|
url: `/api/interview/image/${question.ref.sha256}/${index}`})),
|
|
302
303
|
})),
|
|
303
304
|
...(interview === undefined ? {} : {interview}),
|
|
@@ -349,7 +350,7 @@ export function retainedPublicationRoutes(session: JobSession) {
|
|
|
349
350
|
const file = servedImage(parts, image[1] as 'image'|'page', Number(image[2]));
|
|
350
351
|
return file ? await sealedFile(relative(retained.snapshotRoot,file).split('\\').join('/')) : failure('JOB_SOURCE_UNRETAINABLE',404);
|
|
351
352
|
}
|
|
352
|
-
if (path === 'api/review' || path === 'api/interview' || path.startsWith('assets/')) {
|
|
353
|
+
if (path === 'api/review' || path === 'api/interview' || path.startsWith('assets/') || interview) {
|
|
353
354
|
let review: ReviewPackage | null = null;
|
|
354
355
|
if (!question) {
|
|
355
356
|
let pending = views.get(publicationId);
|
|
@@ -360,11 +361,21 @@ export function retainedPublicationRoutes(session: JobSession) {
|
|
|
360
361
|
({review} = await pending);
|
|
361
362
|
}
|
|
362
363
|
if (path === 'api/review') return reviewMetadata(review);
|
|
363
|
-
if (path === 'api/interview'
|
|
364
|
+
if (path === 'api/interview' || interview) {
|
|
365
|
+
const fallback = !review && questions.find(item => item.missingPicture);
|
|
366
|
+
const painting = fallback ? retainedRecordPainting(retained) : null;
|
|
367
|
+
if (fallback && !painting && !interview)
|
|
368
|
+
return failure('JOB_SOURCE_UNRETAINABLE', 409);
|
|
369
|
+
if (interview) {
|
|
370
|
+
if (painting && fallback && interview[1] === fallback.ref.sha256 && interview[2] === '0')
|
|
371
|
+
return await sealedFile(painting.ref.path);
|
|
372
|
+
return await interviewImage(interview);
|
|
373
|
+
}
|
|
374
|
+
return interviewMetadata(!!review, painting ?? undefined);
|
|
375
|
+
}
|
|
364
376
|
try {return await reviewAsset(review);}
|
|
365
377
|
catch {return failure('JOB_SOURCE_UNRETAINABLE', 404);}
|
|
366
378
|
}
|
|
367
|
-
if (interview) return await interviewImage(interview);
|
|
368
379
|
return failure('JOB_REQUEST_INVALID', 404);
|
|
369
380
|
}
|
|
370
381
|
let pending = views.get(publicationId);
|
package/src/job-host.ts
CHANGED
|
@@ -23,7 +23,7 @@ export type {
|
|
|
23
23
|
JobRootIdentity,
|
|
24
24
|
} from './job-source.ts';
|
|
25
25
|
export {parseRecordAct} from './job-api.ts';
|
|
26
|
-
export {parseCommentsAct, parseContextCommentsAct, parseMeshEditsAct} from './job-api.ts';
|
|
26
|
+
export {parseCommentsAct, parseContextCommentsAct, parseMeshEditsAct, parseChestLandmarksAct} from './job-api.ts';
|
|
27
27
|
export {projectComments} from './stage-comment.ts';
|
|
28
28
|
export {parseCommentsSession} from './session.ts';
|
|
29
29
|
export {parseCommentsCompareSession} from './compare-session.ts';
|
|
@@ -31,12 +31,14 @@ export {parseCommentsPartsVerdict} from './parts-view.ts';
|
|
|
31
31
|
export {projectSelectedCommentsFeedback} from './feedback-export.ts';
|
|
32
32
|
export {
|
|
33
33
|
JOB_COMMENTS_ACT_SCHEMA, JOB_COMMENT_CONTEXT_ACT_SCHEMA, JOB_MESH_EDITS_ACT_SCHEMA, REVIEW_COMMENTS_SESSION_SCHEMA,
|
|
34
|
+
JOB_CHEST_LANDMARKS_ACT_SCHEMA,
|
|
34
35
|
REVIEW_COMMENTS_COMPARE_SESSION_SCHEMA, PARTS_COMMENTS_VERDICT_SCHEMA,
|
|
35
36
|
} from './job-contract.ts';
|
|
36
37
|
export type {
|
|
37
38
|
JobComment, JobCommentAnchor, JobCommentFeedbackAnchor, JobCommentPartsAnchor, JobCommentImageAnchor,
|
|
38
39
|
JobCommentsAct, JobCommentsActValues, ReviewCommentsSession,
|
|
39
40
|
JobMeshEditValue, JobMeshEdit, JobMeshEditsAct,
|
|
41
|
+
JobChestLandmarkValue, JobPublishedChestLandmark, JobChestLandmarkEdit, JobChestLandmarksAct,
|
|
40
42
|
JobCommentContext, JobContextComment, JobContextCommentsAct, CompareCommentsSession, PartsCommentsVerdict,
|
|
41
43
|
} from './job-contract.ts';
|
|
42
44
|
export {prepareJobRecordAct} from './job-act.ts';
|
|
@@ -128,6 +130,10 @@ export type {
|
|
|
128
130
|
JobAskRequestV3,
|
|
129
131
|
JobAskBatchRequestV3,
|
|
130
132
|
JobAskBatchValueV3,
|
|
133
|
+
JobProgressRequestV3,
|
|
134
|
+
JobProgressValueV3,
|
|
135
|
+
JobProgressV3,
|
|
136
|
+
JobProgressLineV3,
|
|
131
137
|
JobNextRequest,
|
|
132
138
|
JobNextRequestV3,
|
|
133
139
|
JobCloseRequest,
|