@tiangong-lca/foundry 0.1.7 → 0.1.9
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/README.md +7 -5
- package/docs/architecture.md +7 -5
- package/docs/foundry-task-contracts.md +4 -4
- package/docs/import-profiles/worldsteel/constraints.md +3 -3
- package/docs/import-profiles/worldsteel/import-coverage.md +3 -3
- package/docs/import-profiles/worldsteel/import-plan.md +1 -1
- package/docs/import-profiles/worldsteel/profile.md +3 -3
- package/docs/package-distribution-contract.md +21 -13
- package/docs/public-runtime-contract.md +22 -6
- package/docs/runtime-context-contract.md +9 -5
- package/docs/task-authorization-contract.md +8 -4
- package/package-dist/assets/foundry-package-descriptor.json +150 -84
- package/package-dist/scripts/foundry-facade.d.ts +1 -0
- package/package-dist/scripts/foundry-facade.js +35 -4
- package/package-dist/scripts/lib/finalize-owners/commit-handoff.js +65 -10
- package/package-dist/scripts/lib/finalize-owners/finalize-reference-inputs.d.ts +12 -0
- package/package-dist/scripts/lib/finalize-owners/finalize-reference-inputs.js +57 -0
- package/package-dist/scripts/lib/finalize-owners/handoff-reference-intent.d.ts +28 -0
- package/package-dist/scripts/lib/finalize-owners/handoff-reference-intent.js +115 -0
- package/package-dist/scripts/lib/finalize-owners/native-insert-closeout.d.ts +13 -0
- package/package-dist/scripts/lib/finalize-owners/native-insert-closeout.js +99 -0
- package/package-dist/scripts/lib/finalize-owners/native-insert-handoff.d.ts +47 -0
- package/package-dist/scripts/lib/finalize-owners/native-insert-handoff.js +146 -0
- package/package-dist/scripts/lib/finalize-owners/post-authoring.js +13 -0
- package/package-dist/scripts/lib/finalize-owners/post-write-closeout.d.ts +8 -2
- package/package-dist/scripts/lib/finalize-owners/post-write-closeout.js +48 -2
- package/package-dist/scripts/lib/finalize-owners/reference-intent-closeout.d.ts +12 -0
- package/package-dist/scripts/lib/finalize-owners/reference-intent-closeout.js +77 -0
- package/package-dist/scripts/lib/foundry-authorization-input.d.ts +8 -0
- package/package-dist/scripts/lib/foundry-authorization-input.js +68 -1
- package/package-dist/scripts/lib/foundry-command-metadata.js +15 -1
- package/package-dist/scripts/lib/foundry-execution-admission.js +82 -5
- package/package-dist/scripts/lib/foundry-owner-execution-store.js +25 -2
- package/package-dist/scripts/lib/foundry-owner-readback.d.ts +2 -0
- package/package-dist/scripts/lib/foundry-owner-readback.js +65 -14
- package/package-dist/scripts/lib/foundry-package-contract.d.ts +4 -4
- package/package-dist/scripts/lib/foundry-package-contract.js +7 -5
- package/package-dist/scripts/lib/foundry-reference-input.d.ts +28 -0
- package/package-dist/scripts/lib/foundry-reference-input.js +235 -0
- package/package-dist/scripts/lib/foundry-runtime-qualification.js +2 -2
- package/package-dist/scripts/lib/foundry-runtime-utils.js +1 -1
- package/package-dist/scripts/lib/foundry-task-store.d.ts +1 -1
- package/package-dist/scripts/lib/foundry-workflow-authorization.d.ts +2 -1
- package/package-dist/scripts/lib/foundry-workflow-authorization.js +38 -2
- package/package-dist/scripts/lib/foundry-workflow-execution.js +7 -1
- package/package-dist/scripts/lib/foundry-workflow-finalize.js +43 -1
- package/package-dist/scripts/lib/foundry-workflow-state.d.ts +2 -0
- package/package-dist/scripts/lib/foundry-workflow-state.js +31 -2
- package/package-dist/scripts/lib/import-curation/internal/context-inputs.js +1 -1
- package/package-dist/scripts/public-api.d.ts +1 -0
- package/package-dist/scripts/runtime-entry.js +2 -1
- package/package.json +6 -5
- package/specs/import-profiles.json +1 -1
- package/specs/prewrite-content-policy.json +1 -1
- package/specs/schemas/foundry-authorization-input.schema.json +38 -1
- package/specs/schemas/foundry-managed-runtime.schema.json +1 -1
- package/specs/schemas/foundry-package-descriptor.schema.json +3 -2
- package/specs/schemas/foundry-reference-input.schema.json +137 -0
- package/specs/schemas/runtime-qualification.schema.json +1 -1
|
@@ -157,8 +157,8 @@ export function qualifyFoundryRuntime(context, options) {
|
|
|
157
157
|
catch {
|
|
158
158
|
return fail("runtime_cli_unqualified", "CLI runtime bytes do not match the independently selected C1 expectation.");
|
|
159
159
|
}
|
|
160
|
-
if (cli.package.version !== "0.1.
|
|
161
|
-
fail("runtime_cli_unqualified", "Foundry requires the exact CLI 0.1.
|
|
160
|
+
if (cli.package.version !== "0.1.14" || cli.platform !== context.platform)
|
|
161
|
+
fail("runtime_cli_unqualified", "Foundry requires the exact CLI 0.1.14 C1 runtime on the selected platform.");
|
|
162
162
|
const cliExpectation = Object.freeze({ ...options.cliExpectation });
|
|
163
163
|
if (cliExpectation.schema !== CLI_RUNTIME_EXPECTATION_SCHEMA)
|
|
164
164
|
fail("runtime_cli_unqualified", "CLI runtime expectation is not the supported schema.");
|
|
@@ -8,7 +8,7 @@ import { runtimeEnvFilePolicyDisabled, runtimeEnvFilePolicyKey, } from "./foundr
|
|
|
8
8
|
import { resolveFoundryRuntimePaths } from "./foundry-runtime-paths.js";
|
|
9
9
|
const require = createRequire(import.meta.url);
|
|
10
10
|
const tiangongLcaCliPackageName = "@tiangong-lca/cli";
|
|
11
|
-
const tiangongLcaCliPackageVersion = "0.1.
|
|
11
|
+
const tiangongLcaCliPackageVersion = "0.1.14";
|
|
12
12
|
const tiangongLcaCliBinName = "tiangong-lca";
|
|
13
13
|
const { repoRoot: foundryRepoRoot } = resolveFoundryRuntimePaths(import.meta.url);
|
|
14
14
|
function isRecord(value) {
|
|
@@ -11,7 +11,7 @@ export declare function assertFoundryTaskInputLineage(context: FoundryRuntimeCon
|
|
|
11
11
|
}>>;
|
|
12
12
|
/** Short local preparation transaction. Remote mutation/batch execution must not use this replay path. */
|
|
13
13
|
export declare function runFoundryTaskOperation(context: FoundryRuntimeContext, input: {
|
|
14
|
-
command: "dataset-curation-cleanup" | "dataset-tidas-import" | "dataset-context-pack" | "dataset-workflow-rows" | "dataset-workflow-assessment" | "dataset-workflow-identity" | "dataset-workflow-finalize" | "dataset-workflow-authorization" | "dataset-workflow-execution-prepare" | "dataset-workflow-execution-result" | "dataset-workflow-execution-consume" | "dataset-workflow-execution-observation" | "dataset-workflow-reference-verify" | "dataset-semantic-apply";
|
|
14
|
+
command: "dataset-curation-cleanup" | "dataset-tidas-import" | "dataset-context-pack" | "dataset-workflow-rows" | "dataset-workflow-assessment" | "dataset-workflow-identity" | "dataset-workflow-finalize" | "dataset-workflow-authorization" | "dataset-workflow-native-contract" | "dataset-workflow-reference-input" | "dataset-workflow-execution-prepare" | "dataset-workflow-execution-result" | "dataset-workflow-execution-consume" | "dataset-workflow-execution-observation" | "dataset-workflow-reference-verify" | "dataset-semantic-apply";
|
|
15
15
|
options: JsonRecord;
|
|
16
16
|
task?: FoundryTaskOptions;
|
|
17
17
|
validateCurrent?: (index: readonly ArtifactEntry[]) => void;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { type SelectedAuthorizationInput } from "./foundry-authorization-input.ts";
|
|
2
|
-
import { type FoundryRuntimeContext } from "./foundry-runtime-context.ts";
|
|
2
|
+
import { type FoundryRuntimeContext, type FoundryInputFact } from "./foundry-runtime-context.ts";
|
|
3
3
|
import { type QualifiedFoundryRuntime } from "./foundry-runtime-qualification.ts";
|
|
4
4
|
import { type FoundryAuthentication, type VerifiedFoundryIdentity } from "./foundry-runtime-identity.ts";
|
|
5
5
|
import type { ValidatedTaskAuthorization } from "./task-authorization.ts";
|
|
@@ -17,6 +17,7 @@ export declare function recordFoundryWorkflowAuthorization(context: FoundryRunti
|
|
|
17
17
|
pointer_sha256: string;
|
|
18
18
|
};
|
|
19
19
|
submissionSha256: string;
|
|
20
|
+
executionContract?: FoundryInputFact;
|
|
20
21
|
operationOptions: Record<string, unknown>;
|
|
21
22
|
validateCurrent: (index: readonly ArtifactEntry[]) => void;
|
|
22
23
|
}): Promise<import("./foundry-task-types.ts").JsonRecord>;
|
|
@@ -7,7 +7,7 @@ import { FoundryContextError, readFoundryInput, captureFoundryInput, resolveFoun
|
|
|
7
7
|
import { assertQualifiedFoundryRuntime, } from "./foundry-runtime-qualification.js";
|
|
8
8
|
import { currentWorkflowState, workflowObject } from "./foundry-workflow-state.js";
|
|
9
9
|
import { runFoundryTaskOperation } from "./foundry-task-store.js";
|
|
10
|
-
import { verifyFoundryRuntimeIdentity, } from "./foundry-runtime-identity.js";
|
|
10
|
+
import { verifyFoundryRuntimeIdentity, assertVerifiedFoundryIdentity, } from "./foundry-runtime-identity.js";
|
|
11
11
|
import { registerFoundryTaskAuthorization, loadFoundryTaskAuthorization, } from "./foundry-task-authorization.js";
|
|
12
12
|
import { createFoundryAuthenticationEnvironment } from "./foundry-authentication-environment.js";
|
|
13
13
|
import { createFoundryFinalizeOwners } from "./foundry-finalize-owners.js";
|
|
@@ -15,6 +15,7 @@ import { createFoundryExecutionCapsule } from "./foundry-execution-admission.js"
|
|
|
15
15
|
import { registerWorkflowStageFiles } from "./foundry-workflow-io.js";
|
|
16
16
|
import { createFoundryCommandSpec, createFileArtifactFact } from "./foundry-command-spec.js";
|
|
17
17
|
import { parseFoundryCommandSpec } from "@tiangong-lca/cli/command-spec";
|
|
18
|
+
import { readNativeInsertHandoff } from "./finalize-owners/native-insert-handoff.js";
|
|
18
19
|
export async function authorizeFoundryWorkflow(context, qualified, entries, selected, authentication = { mode: "oauth" }) {
|
|
19
20
|
assertSelectedAuthorizationInput(selected);
|
|
20
21
|
assertQualifiedFoundryRuntime(context, qualified);
|
|
@@ -36,6 +37,22 @@ export async function authorizeFoundryWorkflow(context, qualified, entries, sele
|
|
|
36
37
|
if (spec.input_kind === "final_rows" && scope.status !== "ready_for_remote_write")
|
|
37
38
|
throw new FoundryContextError("authorization_scope_not_ready", "Final-row approval requires a ready owner scope.");
|
|
38
39
|
const identity = verifyFoundryRuntimeIdentity(context, authentication, process.env, qualified);
|
|
40
|
+
if (selected.executionContract) {
|
|
41
|
+
try {
|
|
42
|
+
readNativeInsertHandoff({
|
|
43
|
+
contractFile: selected.executionContract.path,
|
|
44
|
+
rowsFile: inputFile,
|
|
45
|
+
datasetType: spec.dataset_type,
|
|
46
|
+
targetUserId: context.accountIntent.userId,
|
|
47
|
+
verifiedProjectRef: context.accountIntent.projectRef,
|
|
48
|
+
stateCode: "0",
|
|
49
|
+
relativePath: (file) => path.relative(context.workspaceRoot, file),
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
catch {
|
|
53
|
+
throw new FoundryContextError("authorization_execution_contract_invalid", "Native insert contract must bind the current final rows, owner, project and draft state before authorization.");
|
|
54
|
+
}
|
|
55
|
+
}
|
|
39
56
|
const grant = JSON.parse(readSelectedSemanticBytes(selected.grant).toString("utf8"));
|
|
40
57
|
const current = (index) => {
|
|
41
58
|
assertSelectedAuthorizationInput(selected);
|
|
@@ -63,6 +80,7 @@ export async function authorizeFoundryWorkflow(context, qualified, entries, sele
|
|
|
63
80
|
inputKind: spec.input_kind,
|
|
64
81
|
registration,
|
|
65
82
|
submissionSha256: selected.descriptor.sha256,
|
|
83
|
+
...(selected.executionContract ? { executionContract: selected.executionContract } : {}),
|
|
66
84
|
validateCurrent: current,
|
|
67
85
|
operationOptions: {
|
|
68
86
|
submission: selected.descriptor,
|
|
@@ -70,6 +88,7 @@ export async function authorizeFoundryWorkflow(context, qualified, entries, sele
|
|
|
70
88
|
evidence: selected.evidence,
|
|
71
89
|
finalization: spec.finalization_sha256,
|
|
72
90
|
authorization: registration.authorization_sha256,
|
|
91
|
+
...(selected.executionContract ? { execution_contract: selected.executionContract } : {}),
|
|
73
92
|
},
|
|
74
93
|
});
|
|
75
94
|
}
|
|
@@ -101,6 +120,9 @@ export async function recordFoundryWorkflowAuthorization(context, qualified, ide
|
|
|
101
120
|
taskAuthorization: authorization,
|
|
102
121
|
taskAuthorizationBinding: authorization.binding,
|
|
103
122
|
profile: authorization.binding.profile_id,
|
|
123
|
+
...(request.executionContract
|
|
124
|
+
? { executionContractFile: request.executionContract.path }
|
|
125
|
+
: {}),
|
|
104
126
|
}));
|
|
105
127
|
const commands = workflowObject(handoff.commands);
|
|
106
128
|
for (const key of ["commit", "post_write_verify"]) {
|
|
@@ -113,6 +135,12 @@ export async function recordFoundryWorkflowAuthorization(context, qualified, ide
|
|
|
113
135
|
binding: {
|
|
114
136
|
artifacts: [
|
|
115
137
|
createFileArtifactFact({ role: "final_rows", path: inputFile, filePath: inputFile }),
|
|
138
|
+
...command.binding.artifacts
|
|
139
|
+
.filter((artifact) => artifact.role !== "final_rows")
|
|
140
|
+
.map((artifact) => ({
|
|
141
|
+
...artifact,
|
|
142
|
+
path: path.resolve(context.assetRoot, artifact.path),
|
|
143
|
+
})),
|
|
116
144
|
],
|
|
117
145
|
},
|
|
118
146
|
});
|
|
@@ -126,7 +154,15 @@ export async function recordFoundryWorkflowAuthorization(context, qualified, ide
|
|
|
126
154
|
? action === `${request.datasetType}_write` ||
|
|
127
155
|
action === "canonical_support_local_mint"
|
|
128
156
|
: false);
|
|
129
|
-
|
|
157
|
+
try {
|
|
158
|
+
assertVerifiedFoundryIdentity(context, identity, qualified);
|
|
159
|
+
}
|
|
160
|
+
catch (error) {
|
|
161
|
+
if (!(error instanceof FoundryContextError) || error.code !== "identity_receipt_stale")
|
|
162
|
+
throw error;
|
|
163
|
+
}
|
|
164
|
+
const sealingIdentity = verifyFoundryRuntimeIdentity(context, authentication, process.env, qualified);
|
|
165
|
+
capsule = await createFoundryExecutionCapsule(context, qualified, sealingIdentity, {
|
|
130
166
|
command: "dataset-commit-handoff-plan",
|
|
131
167
|
approvedInputFile: request.approvedInputFile,
|
|
132
168
|
finalRowsFile: inputFile,
|
|
@@ -4,7 +4,7 @@ import { spawnSync } from "node:child_process";
|
|
|
4
4
|
import { randomUUID } from "node:crypto";
|
|
5
5
|
import { runBoundedBatch, withBatchRunLock } from "@tiangong-lca/cli/batch";
|
|
6
6
|
import { commandSpecOptionValue } from "@tiangong-lca/cli/command-spec";
|
|
7
|
-
import { captureFoundryInput, FoundryContextError, resolveFoundryOutput, writeFoundryArtifact, } from "./foundry-runtime-context.js";
|
|
7
|
+
import { captureFoundryInput, FoundryContextError, readFoundryInput, resolveFoundryOutput, writeFoundryArtifact, } from "./foundry-runtime-context.js";
|
|
8
8
|
import { assertQualifiedFoundryRuntime, } from "./foundry-runtime-qualification.js";
|
|
9
9
|
import { verifyFoundryRuntimeIdentity, } from "./foundry-runtime-identity.js";
|
|
10
10
|
import { rehydrateFoundryExecutionAdmission, assertFoundryExecutionAdmission, } from "./foundry-execution-admission.js";
|
|
@@ -51,6 +51,9 @@ export async function executeFoundryOwnerScope(context, qualified, entries, requ
|
|
|
51
51
|
capsuleFile: request.content.capsule.path,
|
|
52
52
|
commandSpec: request.content.commit,
|
|
53
53
|
});
|
|
54
|
+
// Local rehydration can consume the receipt window; the final full pass
|
|
55
|
+
// must begin with a freshly verified current account, before any attempt.
|
|
56
|
+
identity = verifyFoundryRuntimeIdentity(context, authentication, process.env, qualified);
|
|
54
57
|
await assertFoundryExecutionAdmission(context, qualified, identity, admission);
|
|
55
58
|
if (observation)
|
|
56
59
|
throw new FoundryContextError("execution_observation_invalid", "Existing dispatch evidence cannot be treated as unattempted.");
|
|
@@ -154,6 +157,9 @@ export async function executeFoundryOwnerScope(context, qualified, entries, requ
|
|
|
154
157
|
finalRowsFile: request.content.input.path,
|
|
155
158
|
expectedRows: readRows(request.content.input.path).length,
|
|
156
159
|
blockers: commitBlockers,
|
|
160
|
+
handoffPlan: JSON.parse(readFoundryInput(context, request.handoff_file).toString("utf8")),
|
|
161
|
+
targetUserId: request.policy.user_id,
|
|
162
|
+
expectedStateCode: 0,
|
|
157
163
|
});
|
|
158
164
|
}
|
|
159
165
|
const disposition = result.error || result.signal || !report || !reportFile
|
|
@@ -19,6 +19,35 @@ export async function finalizeFoundryWorkflow(context, qualified, entries, authe
|
|
|
19
19
|
const state = currentWorkflowState(context, entries), rows = state.rows;
|
|
20
20
|
if (!rows || !state.assessment)
|
|
21
21
|
throw new FoundryContextError("workflow_assessment_required", "Assess the current rows before finalization.");
|
|
22
|
+
const referenceOptions = new Map();
|
|
23
|
+
for (const set of rows.value.sets) {
|
|
24
|
+
if (executionProgress?.scopes.has(set.type))
|
|
25
|
+
continue;
|
|
26
|
+
const selection = state.referenceInputs.get(set.type);
|
|
27
|
+
if (!selection)
|
|
28
|
+
continue;
|
|
29
|
+
const intended = workflowObject(selection.value.input), current = captureFoundryInput(set.file);
|
|
30
|
+
if (current.sha256 !== intended.sha256 || current.bytes !== intended.bytes)
|
|
31
|
+
throw new FoundryContextError("reference_input_stale", "Select reference evidence for the current dataset rows before finalization.");
|
|
32
|
+
const paths = (raw) => {
|
|
33
|
+
if (!Array.isArray(raw))
|
|
34
|
+
throw new FoundryContextError("reference_input_invalid", "Registered reference file facts are invalid.");
|
|
35
|
+
return raw.map((value) => {
|
|
36
|
+
const fact = workflowObject(value);
|
|
37
|
+
if (typeof fact.path !== "string")
|
|
38
|
+
throw new FoundryContextError("reference_input_invalid", "Reference path is missing.");
|
|
39
|
+
readFoundryInput(context, fact.path);
|
|
40
|
+
return fact.path;
|
|
41
|
+
});
|
|
42
|
+
};
|
|
43
|
+
const qa = paths(selection.value.qa_files);
|
|
44
|
+
paths(selection.value.review_files);
|
|
45
|
+
const intent = selection.value.intent === null ? [] : paths([selection.value.intent]);
|
|
46
|
+
referenceOptions.set(set.type, {
|
|
47
|
+
...(qa.length ? { qaReferenceRows: qa } : {}),
|
|
48
|
+
...(intent.length ? { referenceIntentFile: intent[0] } : {}),
|
|
49
|
+
});
|
|
50
|
+
}
|
|
22
51
|
const profile = await withFoundryTaskMetadata(context, (task, index) => {
|
|
23
52
|
if (currentWorkflowState(context, index).rows?.entry.sha256 !== rows.entry.sha256)
|
|
24
53
|
throw new FoundryContextError("workflow_rows_changed", "Current rows changed before finalization.");
|
|
@@ -136,6 +165,7 @@ export async function finalizeFoundryWorkflow(context, qualified, entries, authe
|
|
|
136
165
|
const result = workflowObject(owners.invoke(() => owners.finalize.runDatasetPostAuthoringFinalize({
|
|
137
166
|
type: ["unitgroup", "flowproperty"].includes(set.type) ? "support" : set.type,
|
|
138
167
|
rowsFile: set.file,
|
|
168
|
+
...referenceOptions.get(set.type),
|
|
139
169
|
outDir: path.join(output, set.type),
|
|
140
170
|
profile,
|
|
141
171
|
...(approval?.datasetType === set.type && authorization
|
|
@@ -228,10 +258,19 @@ export async function finalizeFoundryWorkflow(context, qualified, entries, authe
|
|
|
228
258
|
assertQualifiedFoundryRuntime(context, qualified);
|
|
229
259
|
return await runFoundryTaskOperation(context, {
|
|
230
260
|
command: "dataset-workflow-finalize",
|
|
231
|
-
options: {
|
|
261
|
+
options: {
|
|
262
|
+
nonce,
|
|
263
|
+
rows_report: rows.file,
|
|
264
|
+
...(state.referenceInputsSha256
|
|
265
|
+
? { reference_inputs_sha256: state.referenceInputsSha256 }
|
|
266
|
+
: {}),
|
|
267
|
+
},
|
|
232
268
|
validateCurrent(index) {
|
|
233
269
|
if (currentWorkflowState(context, index).rows?.entry.sha256 !== rows.entry.sha256)
|
|
234
270
|
throw new FoundryContextError("workflow_rows_changed", "Rows changed during finalization.");
|
|
271
|
+
if (currentWorkflowState(context, index).referenceInputsSha256 !==
|
|
272
|
+
state.referenceInputsSha256)
|
|
273
|
+
throw new FoundryContextError("reference_input_changed", "Reference selection changed during finalization.");
|
|
235
274
|
if (authorization &&
|
|
236
275
|
(createHash("sha256")
|
|
237
276
|
.update(readTaskBytes(context, "authorization.json"))
|
|
@@ -245,6 +284,9 @@ export async function finalizeFoundryWorkflow(context, qualified, entries, authe
|
|
|
245
284
|
schema: "tiangong-foundry.finalize-stage.v1",
|
|
246
285
|
status: blockers.length ? "blocked" : "ready_for_authorization",
|
|
247
286
|
rows_report: rows.file,
|
|
287
|
+
...(state.referenceInputsSha256
|
|
288
|
+
? { reference_inputs_sha256: state.referenceInputsSha256 }
|
|
289
|
+
: {}),
|
|
248
290
|
assessment_report: state.assessment.file,
|
|
249
291
|
owner_base: context.assetRoot,
|
|
250
292
|
approval_source_sha256: approval?.sourceSha256 ?? null,
|
|
@@ -34,4 +34,6 @@ export declare function currentWorkflowState(context: FoundryRuntimeContext, ent
|
|
|
34
34
|
finalization: WorkflowArtifact<Record<string, unknown>> | null;
|
|
35
35
|
authorization: WorkflowArtifact<Record<string, unknown>> | null;
|
|
36
36
|
preparedApproval: WorkflowArtifact<Record<string, unknown>> | null;
|
|
37
|
+
referenceInputs: Map<string, WorkflowArtifact<Record<string, unknown>>>;
|
|
38
|
+
referenceInputsSha256: string | null;
|
|
37
39
|
};
|
|
@@ -110,6 +110,25 @@ export function currentWorkflowState(context, entries) {
|
|
|
110
110
|
}
|
|
111
111
|
}
|
|
112
112
|
}
|
|
113
|
+
const referenceInputs = new Map();
|
|
114
|
+
for (const entry of entries) {
|
|
115
|
+
if (entry.command !== "dataset-workflow-reference-input" ||
|
|
116
|
+
path.basename(entry.path) !== "foundry-reference-input.json")
|
|
117
|
+
continue;
|
|
118
|
+
const found = readWorkflowArtifact(context, entry);
|
|
119
|
+
if (found.value.schema !== "tiangong-foundry.reference-selection.v1" ||
|
|
120
|
+
found.value.status !== "selected" ||
|
|
121
|
+
typeof found.value.dataset_type !== "string")
|
|
122
|
+
throw new FoundryContextError("reference_input_invalid", "Registered reference selection is invalid.");
|
|
123
|
+
referenceInputs.set(found.value.dataset_type, found);
|
|
124
|
+
}
|
|
125
|
+
const referenceInputsSha256 = referenceInputs.size
|
|
126
|
+
? createHash("sha256")
|
|
127
|
+
.update(JSON.stringify([...referenceInputs]
|
|
128
|
+
.sort(([a], [b]) => a.localeCompare(b))
|
|
129
|
+
.map(([type, found]) => [type, found.entry.sha256])))
|
|
130
|
+
.digest("hex")
|
|
131
|
+
: null;
|
|
113
132
|
let finalization = null;
|
|
114
133
|
if (rows && assessment) {
|
|
115
134
|
for (const entry of [...entries].reverse()) {
|
|
@@ -122,7 +141,8 @@ export function currentWorkflowState(context, entries) {
|
|
|
122
141
|
!Array.isArray(found.value.blockers))
|
|
123
142
|
throw new FoundryContextError("workflow_finalize_invalid", "Registered finalization metadata is invalid.");
|
|
124
143
|
if (found.value.rows_report === rows.file &&
|
|
125
|
-
found.value.assessment_report === assessment.file
|
|
144
|
+
found.value.assessment_report === assessment.file &&
|
|
145
|
+
(found.value.reference_inputs_sha256 ?? null) === referenceInputsSha256) {
|
|
126
146
|
finalization = found;
|
|
127
147
|
break;
|
|
128
148
|
}
|
|
@@ -154,5 +174,14 @@ export function currentWorkflowState(context, entries) {
|
|
|
154
174
|
}
|
|
155
175
|
}
|
|
156
176
|
}
|
|
157
|
-
return {
|
|
177
|
+
return {
|
|
178
|
+
rows,
|
|
179
|
+
assessment,
|
|
180
|
+
identity,
|
|
181
|
+
finalization,
|
|
182
|
+
authorization,
|
|
183
|
+
preparedApproval,
|
|
184
|
+
referenceInputs,
|
|
185
|
+
referenceInputsSha256,
|
|
186
|
+
};
|
|
158
187
|
}
|
|
@@ -6,7 +6,7 @@ import { asText, directoryExists, ensureArray, fileExists, readJson, readText, r
|
|
|
6
6
|
function asJsonRecord(value) {
|
|
7
7
|
return value && typeof value === "object" && !Array.isArray(value) ? value : {};
|
|
8
8
|
}
|
|
9
|
-
export const tidasSchemaSearchRoots = ["@tiangong-lca/cli@0.1.
|
|
9
|
+
export const tidasSchemaSearchRoots = ["@tiangong-lca/cli@0.1.14/assets/tidas-schemas"];
|
|
10
10
|
export function tidasSchemaPath(repoRoot, schemaFile) {
|
|
11
11
|
void repoRoot;
|
|
12
12
|
const candidate = path.join(resolveInstalledTiangongLcaCliPackage().schemaDir, schemaFile);
|
|
@@ -63,6 +63,7 @@ export declare function createFoundryFacade(options: FoundryPackageFacadeOptions
|
|
|
63
63
|
actorId: string;
|
|
64
64
|
semanticInputFile?: string;
|
|
65
65
|
authorizationInputFile?: string;
|
|
66
|
+
referenceInputFile?: string;
|
|
66
67
|
}): Promise<import("./lib/foundry-operation-result.ts").FoundryOperationResult>;
|
|
67
68
|
requestBinding(input: {
|
|
68
69
|
taskId: string;
|
|
@@ -119,7 +119,7 @@ async function runPublicCommand(parsed, host) {
|
|
|
119
119
|
: parsed.operation === "task.start"
|
|
120
120
|
? ["spec"]
|
|
121
121
|
: parsed.operation === "task.resume"
|
|
122
|
-
? ["task", "actor", "semanticInput", "authorizationInput"]
|
|
122
|
+
? ["task", "actor", "semanticInput", "authorizationInput", "referenceInput"]
|
|
123
123
|
: parsed.operation === "task.status"
|
|
124
124
|
? ["task", "actor"]
|
|
125
125
|
: []),
|
|
@@ -298,6 +298,7 @@ async function runPublicCommand(parsed, host) {
|
|
|
298
298
|
taskId,
|
|
299
299
|
actorId,
|
|
300
300
|
semanticInputFile: option(parsed.args.semanticInput, "--semantic-input") ?? undefined,
|
|
301
|
+
referenceInputFile: option(parsed.args.referenceInput, "--reference-input") ?? undefined,
|
|
301
302
|
authorizationInputFile: option(parsed.args.authorizationInput, "--authorization-input") ?? undefined,
|
|
302
303
|
});
|
|
303
304
|
}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tiangong-lca/foundry",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.9",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Control plane for TianGong LCA external dataset import and TIDAS authoring work.",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
8
|
-
"url": "git+https://github.com/tiangong-lca/
|
|
8
|
+
"url": "git+https://github.com/tiangong-lca/foundry.git"
|
|
9
9
|
},
|
|
10
|
-
"homepage": "https://github.com/tiangong-lca/
|
|
10
|
+
"homepage": "https://github.com/tiangong-lca/foundry#readme",
|
|
11
11
|
"bugs": {
|
|
12
|
-
"url": "https://github.com/tiangong-lca/
|
|
12
|
+
"url": "https://github.com/tiangong-lca/foundry/issues"
|
|
13
13
|
},
|
|
14
14
|
"publishConfig": {
|
|
15
15
|
"access": "public",
|
|
@@ -42,6 +42,7 @@
|
|
|
42
42
|
"specs/schemas/foundry-task-start.schema.json",
|
|
43
43
|
"specs/schemas/foundry-semantic-input.schema.json",
|
|
44
44
|
"specs/schemas/foundry-authorization-input.schema.json",
|
|
45
|
+
"specs/schemas/foundry-reference-input.schema.json",
|
|
45
46
|
"specs/schemas/foundry-workspace-migration-plan.schema.json",
|
|
46
47
|
"specs/schemas/foundry-workspace-migration-transfer-plan.schema.json",
|
|
47
48
|
"specs/schemas/foundry-migration-transfer-receipt.schema.json",
|
|
@@ -80,7 +81,7 @@
|
|
|
80
81
|
},
|
|
81
82
|
"license": "MIT",
|
|
82
83
|
"dependencies": {
|
|
83
|
-
"@tiangong-lca/cli": "0.1.
|
|
84
|
+
"@tiangong-lca/cli": "0.1.14"
|
|
84
85
|
},
|
|
85
86
|
"foundryRuntime": {
|
|
86
87
|
"schema": "tiangong-foundry.runtime-layout.v2",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"workflow_state_markers": [
|
|
63
63
|
{
|
|
64
64
|
"id": "foundry-runtime",
|
|
65
|
-
"pattern": "(?<!\\b(?:metal|iron|steel|brass|bronze|aluminium|aluminum)\\s)\\bFoundry\\b(
|
|
65
|
+
"pattern": "\\bFoundry[\\s\\p{Pd}_:]+(?:runtimes?|workspaces?)\\b|(?<!\\b(?:metal|iron|steel|brass|bronze|aluminium|aluminum|alloys?|castings?)[\\s\\p{Pd}]+)\\bFoundry\\b(?![\\s\\p{Pd}]+(?:alloys?|castings?|moulds?|molds?|sand|works?|goods|industry|industries)\\b)",
|
|
66
66
|
"flags": "iu"
|
|
67
67
|
},
|
|
68
68
|
{
|
|
@@ -115,6 +115,43 @@
|
|
|
115
115
|
}
|
|
116
116
|
},
|
|
117
117
|
"minContains": 1
|
|
118
|
+
},
|
|
119
|
+
"execution_contract": {
|
|
120
|
+
"type": "object",
|
|
121
|
+
"additionalProperties": false,
|
|
122
|
+
"required": ["file", "sha256"],
|
|
123
|
+
"properties": {
|
|
124
|
+
"file": {
|
|
125
|
+
"type": "string",
|
|
126
|
+
"minLength": 1,
|
|
127
|
+
"maxLength": 4096,
|
|
128
|
+
"pattern": "^[^\\u0000\\r\\n]+$"
|
|
129
|
+
},
|
|
130
|
+
"sha256": {
|
|
131
|
+
"type": "string",
|
|
132
|
+
"pattern": "^[0-9a-f]{64}$"
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
},
|
|
137
|
+
"allOf": [
|
|
138
|
+
{
|
|
139
|
+
"if": {
|
|
140
|
+
"required": ["execution_contract"],
|
|
141
|
+
"properties": {
|
|
142
|
+
"execution_contract": {}
|
|
143
|
+
}
|
|
144
|
+
},
|
|
145
|
+
"then": {
|
|
146
|
+
"properties": {
|
|
147
|
+
"input_kind": {
|
|
148
|
+
"const": "final_rows"
|
|
149
|
+
},
|
|
150
|
+
"dataset_type": {
|
|
151
|
+
"enum": ["flow", "process", "source"]
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
}
|
|
118
155
|
}
|
|
119
|
-
|
|
156
|
+
]
|
|
120
157
|
}
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"const": "@tiangong-lca/foundry"
|
|
19
19
|
},
|
|
20
20
|
"version": {
|
|
21
|
-
"const": "0.1.
|
|
21
|
+
"const": "0.1.9"
|
|
22
22
|
},
|
|
23
23
|
"cli_dependency": {
|
|
24
24
|
"type": "object",
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"const": "@tiangong-lca/cli"
|
|
30
30
|
},
|
|
31
31
|
"version": {
|
|
32
|
-
"const": "0.1.
|
|
32
|
+
"const": "0.1.14"
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
},
|
|
@@ -74,6 +74,7 @@
|
|
|
74
74
|
"tiangong-foundry.task-start.v1",
|
|
75
75
|
"tiangong-foundry.semantic-input.v1",
|
|
76
76
|
"tiangong-foundry.authorization-input.v1",
|
|
77
|
+
"tiangong-foundry.reference-input.v1",
|
|
77
78
|
"tiangong-foundry.facade-request-index.v1",
|
|
78
79
|
"tiangong-foundry.workspace-migration-plan.v1",
|
|
79
80
|
"tiangong-foundry.workspace-migration-transfer-plan.v2",
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
{
|
|
2
|
+
"$schema": "https://json-schema.org/draft/2020-12/schema",
|
|
3
|
+
"title": "Foundry Reference Input v1",
|
|
4
|
+
"type": "object",
|
|
5
|
+
"additionalProperties": false,
|
|
6
|
+
"required": [
|
|
7
|
+
"schema",
|
|
8
|
+
"task_id",
|
|
9
|
+
"actor_id",
|
|
10
|
+
"rows_manifest_sha256",
|
|
11
|
+
"dataset_type",
|
|
12
|
+
"qa_reference_rows",
|
|
13
|
+
"intent",
|
|
14
|
+
"review_files"
|
|
15
|
+
],
|
|
16
|
+
"properties": {
|
|
17
|
+
"schema": {
|
|
18
|
+
"const": "tiangong-foundry.reference-input.v1"
|
|
19
|
+
},
|
|
20
|
+
"task_id": {
|
|
21
|
+
"type": "string",
|
|
22
|
+
"pattern": "^task-[0-9a-f]{64}-r[0-9]{4}$"
|
|
23
|
+
},
|
|
24
|
+
"actor_id": {
|
|
25
|
+
"type": "string",
|
|
26
|
+
"pattern": "^[a-zA-Z0-9][a-zA-Z0-9._:/-]{0,255}$"
|
|
27
|
+
},
|
|
28
|
+
"rows_manifest_sha256": {
|
|
29
|
+
"type": "string",
|
|
30
|
+
"pattern": "^[0-9a-f]{64}$"
|
|
31
|
+
},
|
|
32
|
+
"dataset_type": {
|
|
33
|
+
"enum": [
|
|
34
|
+
"process",
|
|
35
|
+
"flow",
|
|
36
|
+
"source",
|
|
37
|
+
"contact",
|
|
38
|
+
"lifecyclemodel",
|
|
39
|
+
"unitgroup",
|
|
40
|
+
"flowproperty"
|
|
41
|
+
]
|
|
42
|
+
},
|
|
43
|
+
"qa_reference_rows": {
|
|
44
|
+
"type": "array",
|
|
45
|
+
"maxItems": 128,
|
|
46
|
+
"items": {
|
|
47
|
+
"$ref": "#/$defs/file"
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
"intent": {
|
|
51
|
+
"anyOf": [
|
|
52
|
+
{
|
|
53
|
+
"type": "null"
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
"$ref": "#/$defs/file"
|
|
57
|
+
}
|
|
58
|
+
]
|
|
59
|
+
},
|
|
60
|
+
"review_files": {
|
|
61
|
+
"type": "array",
|
|
62
|
+
"maxItems": 128,
|
|
63
|
+
"items": {
|
|
64
|
+
"$ref": "#/$defs/file"
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
"$defs": {
|
|
69
|
+
"file": {
|
|
70
|
+
"type": "object",
|
|
71
|
+
"additionalProperties": false,
|
|
72
|
+
"required": ["file", "sha256"],
|
|
73
|
+
"properties": {
|
|
74
|
+
"file": {
|
|
75
|
+
"type": "string",
|
|
76
|
+
"minLength": 1,
|
|
77
|
+
"maxLength": 4096,
|
|
78
|
+
"pattern": "^[^\\u0000\\r\\n]+$"
|
|
79
|
+
},
|
|
80
|
+
"sha256": {
|
|
81
|
+
"type": "string",
|
|
82
|
+
"pattern": "^[0-9a-f]{64}$"
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
},
|
|
87
|
+
"allOf": [
|
|
88
|
+
{
|
|
89
|
+
"if": {
|
|
90
|
+
"properties": {
|
|
91
|
+
"qa_reference_rows": {
|
|
92
|
+
"minItems": 1,
|
|
93
|
+
"type": "array"
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
"required": ["qa_reference_rows"]
|
|
97
|
+
},
|
|
98
|
+
"then": {
|
|
99
|
+
"properties": {
|
|
100
|
+
"dataset_type": {
|
|
101
|
+
"const": "process"
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
},
|
|
106
|
+
{
|
|
107
|
+
"if": {
|
|
108
|
+
"properties": {
|
|
109
|
+
"intent": {
|
|
110
|
+
"type": "null"
|
|
111
|
+
}
|
|
112
|
+
},
|
|
113
|
+
"required": ["intent"]
|
|
114
|
+
},
|
|
115
|
+
"then": {
|
|
116
|
+
"properties": {
|
|
117
|
+
"qa_reference_rows": {
|
|
118
|
+
"minItems": 1,
|
|
119
|
+
"type": "array"
|
|
120
|
+
},
|
|
121
|
+
"review_files": {
|
|
122
|
+
"maxItems": 0,
|
|
123
|
+
"type": "array"
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
},
|
|
127
|
+
"else": {
|
|
128
|
+
"properties": {
|
|
129
|
+
"review_files": {
|
|
130
|
+
"minItems": 1,
|
|
131
|
+
"type": "array"
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
]
|
|
137
|
+
}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"additionalProperties": false,
|
|
15
15
|
"required": ["package_version", "platform", "content_sha256", "node_version", "node_sha256"],
|
|
16
16
|
"properties": {
|
|
17
|
-
"package_version": { "const": "0.1.
|
|
17
|
+
"package_version": { "const": "0.1.14" },
|
|
18
18
|
"platform": {
|
|
19
19
|
"enum": ["linux-x64", "linux-arm64", "darwin-arm64", "win32-x64"]
|
|
20
20
|
},
|