@slicedearth/whoisleuth-cli 1.45.0 → 2.0.0

package/cli/input.mjs

@@ -0,0 +1,62 @@
+import { Buffer } from 'node:buffer';
+import { decodeBoundedUtf8, readBoundedRegularTextFile } from "../lib/bounded-file.mjs";
+import { CliUsageError } from "./errors.mjs";
+function abortError(signal) {
+    return signal.reason instanceof Error
+        ? signal.reason
+        : new DOMException('The operation was aborted.', 'AbortError');
+}
+export async function readCliTextInput(source, stdin, options) {
+    if (options.signal?.aborted)
+        throw abortError(options.signal);
+    if (source) {
+        try {
+            return await readBoundedRegularTextFile(source, {
+                maximumBytes: options.maximumBytes,
+                label: options.label,
+                allowSymbolicLink: true,
+                ...(options.signal ? { signal: options.signal } : {}),
+            });
+        }
+        catch (error) {
+            if (options.signal?.aborted)
+                throw abortError(options.signal);
+            if (error instanceof CliUsageError)
+                throw error;
+            const message = error instanceof Error ? error.message : `${options.label} could not be read.`;
+            throw new CliUsageError(message);
+        }
+    }
+    if (!stdin || stdin.isTTY)
+        return '';
+    let bytes = 0;
+    const chunks = [];
+    const onAbort = () => {
+        if ('destroy' in stdin && typeof stdin.destroy === 'function')
+            stdin.destroy(abortError(options.signal));
+    };
+    options.signal?.addEventListener('abort', onAbort, { once: true });
+    try {
+        for await (const chunk of stdin) {
+            if (options.signal?.aborted)
+                throw abortError(options.signal);
+            const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+            bytes += buffer.length;
+            if (bytes > options.maximumBytes) {
+                throw new CliUsageError(`${options.label} is limited to ${options.maximumBytes} bytes.`);
+            }
+            chunks.push(buffer);
+        }
+        if (options.signal?.aborted)
+            throw abortError(options.signal);
+        try {
+            return decodeBoundedUtf8(Buffer.concat(chunks, bytes), options.label);
+        }
+        catch (cause) {
+            throw new CliUsageError(cause instanceof Error ? cause.message : `${options.label} must contain valid UTF-8 text.`);
+        }
+    }
+    finally {
+        options.signal?.removeEventListener('abort', onAbort);
+    }
+}

package/cli/interactive-launcher.mjs

@@ -0,0 +1,226 @@
+import { classifyQuery, isDirectLookupTarget } from "../lib/classify.mjs";
+import { StringDecoder } from 'node:string_decoder';
+import { boundedCliErrorMessage, CliUsageError, hasUnsafeCliText } from "./errors.mjs";
+import { INVESTIGATION_PLAN_RECIPE_LABELS, INVESTIGATION_PLAN_RECIPES, } from "./investigation-plan.mjs";
+import { buildCliLookupPlan, formatCliLookupPlan } from "./lookup-plan.mjs";
+import { canBrowseLookup, } from "./lookup-browser.mjs";
+const MAX_INTERACTIVE_ANSWER_SCALARS = 1_024;
+const MAX_INTERACTIVE_ANSWER_BYTES = 4_096;
+function canLaunchInteractiveCli(input, output, environment = process.env) {
+    return input?.isTTY === true
+        && canBrowseLookup(input, output, environment);
+}
+function boundedInteractiveAnswer(value) {
+    const supplied = typeof value === 'string' ? value : '';
+    if (Buffer.byteLength(supplied, 'utf8') > MAX_INTERACTIVE_ANSWER_BYTES
+        || Array.from(supplied).length > MAX_INTERACTIVE_ANSWER_SCALARS
+        || hasUnsafeCliText(supplied)) {
+        throw new CliUsageError('Interactive input must be bounded text without control characters.');
+    }
+    return supplied.trim();
+}
+function abortError() {
+    return new DOMException('Aborted', 'AbortError');
+}
+function readBoundedInteractiveLine(prompt, options) {
+    const { input, output, signal } = options;
+    if (signal?.aborted)
+        return Promise.reject(signal.reason || abortError());
+    const previousRaw = input.isRaw === true;
+    const wasPaused = input.isPaused?.() === true;
+    let receivedBytes = 0;
+    let receivedScalars = 0;
+    let settled = false;
+    let characters = [];
+    const decoder = new StringDecoder('utf8');
+    return new Promise((resolve, reject) => {
+        const cleanup = () => {
+            let failure = null;
+            const attempt = (operation) => {
+                try {
+                    operation();
+                }
+                catch (error) {
+                    failure ||= error instanceof Error ? error : new Error('Interactive terminal cleanup failed.');
+                }
+            };
+            attempt(() => input.off?.('data', onData));
+            attempt(() => input.off?.('end', onEnd));
+            attempt(() => signal?.removeEventListener('abort', onAbort));
+            attempt(() => input.setRawMode?.(previousRaw));
+            if (wasPaused)
+                attempt(() => input.pause?.());
+            return failure;
+        };
+        const finish = (value, error) => {
+            if (settled)
+                return;
+            settled = true;
+            const cleanupFailure = cleanup();
+            characters = [];
+            if (error && cleanupFailure) {
+                reject(new AggregateError([error, cleanupFailure], `${error.message}; terminal cleanup also failed: ${cleanupFailure.message}`));
+            }
+            else if (error || cleanupFailure)
+                reject(error || cleanupFailure);
+            else
+                resolve(value || '');
+        };
+        const rejectUsage = () => finish(undefined, new CliUsageError('Interactive input must be bounded text without control characters.'));
+        const onData = (chunk) => {
+            if (settled)
+                return;
+            let rawChunk;
+            if (Buffer.isBuffer(chunk)) {
+                if (chunk.length > MAX_INTERACTIVE_ANSWER_BYTES - receivedBytes) {
+                    rejectUsage();
+                    return;
+                }
+                rawChunk = chunk;
+            }
+            else {
+                const supplied = String(chunk ?? '');
+                if (supplied.length > MAX_INTERACTIVE_ANSWER_BYTES - receivedBytes
+                    || Buffer.byteLength(supplied, 'utf8') > MAX_INTERACTIVE_ANSWER_BYTES - receivedBytes) {
+                    rejectUsage();
+                    return;
+                }
+                rawChunk = Buffer.from(supplied, 'utf8');
+            }
+            receivedBytes += rawChunk.length;
+            const value = decoder.write(rawChunk);
+            receivedScalars += Array.from(value).length;
+            if (receivedBytes > MAX_INTERACTIVE_ANSWER_BYTES
+                || receivedScalars > MAX_INTERACTIVE_ANSWER_SCALARS
+                || value.includes('\ufffd')) {
+                rejectUsage();
+                return;
+            }
+            for (const character of value) {
+                if (character === '\r' || character === '\n') {
+                    try {
+                        output.write('\n');
+                    }
+                    catch (error) {
+                        finish(undefined, error instanceof Error ? error : new Error('Interactive terminal output failed.'));
+                        return;
+                    }
+                    finish(characters.join(''));
+                    return;
+                }
+                if (character === '\u0003' || character === '\u0004' || character === '\u001b') {
+                    finish(undefined, abortError());
+                    return;
+                }
+                if (character === '\u0008' || character === '\u007f') {
+                    if (characters.length) {
+                        characters.pop();
+                        try {
+                            output.write('\b \b');
+                        }
+                        catch (error) {
+                            finish(undefined, error instanceof Error ? error : new Error('Interactive terminal output failed.'));
+                            return;
+                        }
+                    }
+                    continue;
+                }
+                if (hasUnsafeCliText(character)) {
+                    rejectUsage();
+                    return;
+                }
+                characters.push(character);
+                try {
+                    output.write(character);
+                }
+                catch (error) {
+                    finish(undefined, error instanceof Error ? error : new Error('Interactive terminal output failed.'));
+                    return;
+                }
+            }
+        };
+        const onEnd = () => {
+            const remainder = decoder.end();
+            if (remainder)
+                rejectUsage();
+            else
+                finish(undefined, abortError());
+        };
+        const onAbort = () => finish(undefined, signal?.reason instanceof Error ? signal.reason : abortError());
+        try {
+            output.write(prompt);
+            input.on?.('data', onData);
+            input.on?.('end', onEnd);
+            signal?.addEventListener('abort', onAbort, { once: true });
+            if (signal?.aborted) {
+                onAbort();
+                return;
+            }
+            input.setRawMode?.(true);
+            if (settled)
+                return;
+            input.resume?.();
+        }
+        catch (error) {
+            finish(undefined, error instanceof Error ? error : new Error('Interactive terminal input failed.'));
+        }
+    });
+}
+async function launchInteractiveCli(options) {
+    const environment = options.environment || process.env;
+    if (!canLaunchInteractiveCli(options.input, options.output, environment)) {
+        throw new CliUsageError('Interactive launch requires terminal input and output.');
+    }
+    if (options.signal?.aborted)
+        throw options.signal.reason || new DOMException('Aborted', 'AbortError');
+    const question = options.question || ((prompt) => readBoundedInteractiveLine(prompt, options));
+    const ask = async (prompt) => boundedInteractiveAnswer(await question(prompt));
+    const write = (value) => options.output.write(value);
+    write([
+        'WHOISleuth interactive launch',
+        '',
+        '  1  Fast Lookup',
+        '  2  Deep Lookup',
+        '  3  Build an investigation workflow plan (offline)',
+        '  4  List commands',
+        '  q  Exit',
+        '',
+    ].join('\n'));
+    const selection = (await ask('Select: ')).toLowerCase();
+    if (selection === 'q' || selection === 'quit' || selection === 'exit' || selection === '')
+        return null;
+    if (selection === '4')
+        return ['commands'];
+    if (selection === '3') {
+        write(`\n${INVESTIGATION_PLAN_RECIPES.map((recipe, index) => `  ${index + 1}  ${INVESTIGATION_PLAN_RECIPE_LABELS[recipe]}`).join('\n')}\n\n`);
+        const recipeSelection = await ask('Workflow: ');
+        const recipe = INVESTIGATION_PLAN_RECIPES[Number(recipeSelection) - 1];
+        if (!recipe)
+            throw new CliUsageError('Choose one listed workflow number.');
+        const subject = await ask('Domain or brand subject: ');
+        if (!subject)
+            throw new CliUsageError('A workflow plan requires one domain or brand subject.');
+        return ['workflow-plan', recipe, subject];
+    }
+    if (selection !== '1' && selection !== '2')
+        throw new CliUsageError('Choose 1, 2, 3, 4, or q.');
+    const query = await ask('Domain, IP address, or ASN: ');
+    if (!isDirectLookupTarget(query)) {
+        throw new CliUsageError('Interactive Lookup requires an unambiguous domain with a recognised public suffix, public IP, or ASN.');
+    }
+    const deep = selection === '2';
+    let classified;
+    try {
+        classified = classifyQuery(query);
+    }
+    catch (error) {
+        throw new CliUsageError(boundedCliErrorMessage(error, 'Invalid Lookup target'));
+    }
+    const plan = buildCliLookupPlan(query, classified, deep);
+    write(`\n${formatCliLookupPlan(plan)}\n`);
+    const confirmed = (await ask('Start this collection and open the evidence browser? [y/N] ')).toLowerCase();
+    if (confirmed !== 'y' && confirmed !== 'yes')
+        return null;
+    return ['lookup', query, deep ? '--deep' : '--fast', '--browse'];
+}
+export { MAX_INTERACTIVE_ANSWER_BYTES, MAX_INTERACTIVE_ANSWER_SCALARS, boundedInteractiveAnswer, canLaunchInteractiveCli, launchInteractiveCli, readBoundedInteractiveLine, };

package/cli/interchange-report.mjs

@@ -0,0 +1,226 @@
+import { Buffer } from 'node:buffer';
+import { INTERCHANGE_ARTIFACT_CONTRACTS, } from "../lib/interchange-fidelity-registry.mjs";
+import { offlineArtifactSatisfiesAssurance, verifyOfflineArtifact, } from "./artifact-verify.mjs";
+import { mergeBrandProfiles, } from "../packages/workspace/brand-profile-model.mjs";
+import { parseBoundedJsonObject } from "./bounded-json.mjs";
+import { normalizeExplicitIsoTimestamp } from "../packages/evidence/observation.mjs";
+export const INTERCHANGE_FIDELITY_REPORT_SCHEMA = 'whoisleuth.interchange-fidelity-report';
+export const INTERCHANGE_FIDELITY_REPORT_VERSION = 2;
+export const MAX_INTERCHANGE_REPORT_BYTES = 15 * 1024 * 1024;
+function record(value) {
+    return value && typeof value === 'object' && !Array.isArray(value)
+        ? value
+        : null;
+}
+function parseInput(raw) {
+    if (typeof raw !== 'string')
+        throw new TypeError('Interchange input must be UTF-8 JSON text.');
+    const bytes = Buffer.byteLength(raw, 'utf8');
+    if (bytes < 1 || bytes > MAX_INTERCHANGE_REPORT_BYTES) {
+        throw new TypeError(`Interchange input must be between 1 byte and ${MAX_INTERCHANGE_REPORT_BYTES} bytes.`);
+    }
+    return parseBoundedJsonObject(raw.replace(/^\uFEFF/u, ''), {
+        label: 'Interchange input',
+        maximumBytes: MAX_INTERCHANGE_REPORT_BYTES,
+    });
+}
+function nestedRecord(value, path) {
+    let current = value;
+    for (const part of path)
+        current = record(current?.[part]);
+    return current;
+}
+function identify(value) {
+    for (const contract of INTERCHANGE_ARTIFACT_CONTRACTS) {
+        const container = nestedRecord(value, contract.nestedSchemaPath);
+        if (container?.schema !== contract.schema)
+            continue;
+        const declared = container[contract.versionField];
+        return {
+            contract,
+            version: Number.isSafeInteger(declared) && Number(declared) > 0 && Number(declared) <= 1000
+                ? Number(declared)
+                : null,
+        };
+    }
+    return null;
+}
+function timestamp(value) {
+    const normalized = normalizeExplicitIsoTimestamp(value);
+    if (!normalized)
+        throw new TypeError('Interchange report time is invalid.');
+    return normalized;
+}
+function validateBrandProfileExport(value, version) {
+    const profiles = value.profiles;
+    if (!Array.isArray(profiles) || profiles.length > 100) {
+        throw new TypeError('Brand Profile export does not contain a bounded profiles collection.');
+    }
+    const exportedAt = timestamp(value.exportedAt);
+    let nextId = 0;
+    const result = mergeBrandProfiles([], value, {
+        nowIso: exportedAt,
+        makeId: () => `interchange-profile-${++nextId}`,
+    });
+    return Object.freeze({ accepted: result.profiles.length, skipped: result.skipped });
+}
+export async function buildInterchangeFidelityReport(raw, options = {}) {
+    const inputBytes = Buffer.byteLength(raw, 'utf8');
+    const value = parseInput(raw);
+    const identified = identify(value);
+    const generatedAt = timestamp(options.generatedAt ?? new Date().toISOString());
+    if (!identified)
+        return Object.freeze({
+            schema: INTERCHANGE_FIDELITY_REPORT_SCHEMA,
+            version: INTERCHANGE_FIDELITY_REPORT_VERSION,
+            generatedAt,
+            recognised: false,
+            artifact: Object.freeze({ id: null, schema: null, version: null, versionSupported: false }),
+            verification: Object.freeze({ state: 'not_verified', requiredAssurance: null, assuranceSatisfied: false }),
+            compatibility: Object.freeze({
+                browser: null,
+                cli: null,
+                fidelity: 'not_verified',
+                preservedFieldGroups: Object.freeze([]),
+                excludedFieldGroups: Object.freeze([]),
+                futureVersionBehaviour: null,
+                fullyImportable: null,
+            }),
+            summary: Object.freeze({
+                inputBytes, recordCount: null, sectionCount: null, encryptedContentVerified: null,
+                acceptedRecordCount: null, skippedRecordCount: null, unsupportedSectionCount: null,
+                blockedSectionCount: null, prunedRecordCount: null,
+            }),
+            limitations: Object.freeze([
+                'The file did not match a registered interchange contract. Its supplied schema text and contents are not echoed.',
+                'This report makes no request and does not establish that evidence is accurate, current, complete, or safe to share.',
+            ]),
+        });
+    const { contract, version } = identified;
+    const supported = version !== null && contract.versions.includes(version);
+    let verificationState = supported ? 'not_verified' : 'unsupported_version';
+    let assuranceSatisfied = false;
+    let recordCount = null;
+    let sectionCount = null;
+    let encryptedContentVerified = contract.id === 'encrypted_workspace' ? false : null;
+    let acceptedRecordCount = null;
+    let skippedRecordCount = null;
+    let unsupportedSectionCount = null;
+    let blockedSectionCount = null;
+    let prunedRecordCount = null;
+    let fullyImportable = null;
+    if (supported && contract.fidelity !== 'unsupported') {
+        try {
+            if (contract.id === 'brand_profiles') {
+                if (version === null)
+                    throw new TypeError('Brand Profile export version is invalid.');
+                const validation = validateBrandProfileExport(value, version);
+                recordCount = validation.accepted;
+                acceptedRecordCount = validation.accepted;
+                skippedRecordCount = validation.skipped;
+                verificationState = validation.skipped === 0 ? 'structure_valid' : 'not_verified';
+                assuranceSatisfied = validation.skipped === 0 && contract.requiredAssurance === 'structure';
+            }
+            else {
+                const verification = await verifyOfflineArtifact(raw, { passphrase: options.passphrase ?? null });
+                verificationState = verification.state;
+                assuranceSatisfied = contract.requiredAssurance === 'whole_integrity'
+                    ? offlineArtifactSatisfiesAssurance(verification, 'whole_integrity')
+                    : contract.requiredAssurance === 'applicable_integrity'
+                        ? offlineArtifactSatisfiesAssurance(verification, 'applicable_integrity')
+                        : contract.requiredAssurance === 'structure'
+                            ? offlineArtifactSatisfiesAssurance(verification, 'structure')
+                            : contract.requiredAssurance === 'authenticated_whole_integrity'
+                                ? offlineArtifactSatisfiesAssurance(verification, 'whole_integrity')
+                                    && verification.checks.authenticatedEncryption === 'verified'
+                                : false;
+                recordCount = verification.summary.recordCount;
+                sectionCount = verification.summary.sectionCount;
+                const unsupportedSections = verification.summary.unsupportedSectionCount ?? 0;
+                unsupportedSectionCount = unsupportedSections;
+                blockedSectionCount = verification.summary.blockedSectionCount ?? null;
+                skippedRecordCount = verification.summary.skippedRecordCount ?? skippedRecordCount;
+                prunedRecordCount = verification.summary.prunedRecordCount ?? null;
+                if (verification.summary.fullyImportable !== undefined
+                    && verification.summary.fullyImportable !== null) {
+                    fullyImportable = assuranceSatisfied && verification.summary.fullyImportable;
+                }
+                if (contract.id === 'encrypted_workspace')
+                    encryptedContentVerified = verification.state === 'verified'
+                        && verification.checks.authenticatedEncryption === 'verified';
+            }
+        }
+        catch {
+            verificationState = 'not_verified';
+            assuranceSatisfied = false;
+        }
+    }
+    const fidelityEligible = assuranceSatisfied && fullyImportable !== false;
+    const fidelity = !supported
+        ? 'unsupported'
+        : fidelityEligible
+            ? contract.fidelity
+            : contract.fidelity === 'unsupported'
+                ? 'unsupported'
+                : 'not_verified';
+    return Object.freeze({
+        schema: INTERCHANGE_FIDELITY_REPORT_SCHEMA,
+        version: INTERCHANGE_FIDELITY_REPORT_VERSION,
+        generatedAt,
+        recognised: true,
+        artifact: Object.freeze({ id: contract.id, schema: contract.schema, version, versionSupported: supported }),
+        verification: Object.freeze({
+            state: verificationState,
+            requiredAssurance: contract.requiredAssurance,
+            assuranceSatisfied,
+        }),
+        compatibility: Object.freeze({
+            browser: contract.browser,
+            cli: contract.cli,
+            fidelity,
+            preservedFieldGroups: contract.preservedFieldGroups,
+            excludedFieldGroups: contract.excludedFieldGroups,
+            futureVersionBehaviour: contract.futureVersionBehaviour,
+            fullyImportable,
+        }),
+        summary: Object.freeze({
+            inputBytes, recordCount, sectionCount, encryptedContentVerified,
+            acceptedRecordCount, skippedRecordCount, unsupportedSectionCount,
+            blockedSectionCount, prunedRecordCount,
+        }),
+        limitations: Object.freeze([
+            'Compatibility describes declared field groups and supported operations, not byte-for-byte equality or evidence truth.',
+            'The report emits only registered metadata, counts, and fixed field-group identifiers. Targets, notes, contacts, passphrases, and evidence values are not included.',
+            'A verified integrity envelope detects file changes but does not establish author identity, source accuracy, currency, completeness, or sharing authority.',
+        ]),
+    });
+}
+export function formatInterchangeFidelityReport(report) {
+    const browser = report.compatibility.browser;
+    const cli = report.compatibility.cli;
+    return [
+        'Interchange fidelity report',
+        `Recognised     ${report.recognised ? 'yes' : 'no'}`,
+        `Artifact       ${report.artifact.id ?? 'unrecognised'}`,
+        `Version        ${report.artifact.version ?? 'unavailable'}${report.artifact.versionSupported ? '' : ' (unsupported)'}`,
+        `Verification   ${report.verification.state}`,
+        `Assurance      ${report.verification.requiredAssurance ?? 'unregistered'} · ${report.verification.assuranceSatisfied ? 'satisfied' : 'withheld'}`,
+        `Fidelity       ${report.compatibility.fidelity}`,
+        ...(report.compatibility.fullyImportable === null ? [] : [`Importability  ${report.compatibility.fullyImportable ? 'complete' : 'partial'}`]),
+        `Browser        import ${browser?.import ?? 'unknown'} · export ${browser?.export ?? 'unknown'}`,
+        `CLI            read ${cli?.read ?? 'unknown'} · write ${cli?.write ?? 'unknown'} · verify ${cli?.verify ?? 'unknown'}`,
+        `Records        ${report.summary.recordCount ?? 'not disclosed'}`,
+        `Sections       ${report.summary.sectionCount ?? 'not disclosed'}`,
+        ...(report.summary.acceptedRecordCount === null ? [] : [`Accepted       ${report.summary.acceptedRecordCount}`]),
+        ...(report.summary.skippedRecordCount === null ? [] : [`Skipped        ${report.summary.skippedRecordCount}`]),
+        ...(report.summary.unsupportedSectionCount === null ? [] : [`Unsupported    ${report.summary.unsupportedSectionCount}`]),
+        ...(report.summary.blockedSectionCount === null ? [] : [`Blocked        ${report.summary.blockedSectionCount}`]),
+        ...(report.summary.prunedRecordCount === null ? [] : [`Pruned         ${report.summary.prunedRecordCount}`]),
+        '',
+        `Preserved      ${report.compatibility.preservedFieldGroups.join(', ') || 'none declared'}`,
+        `Excluded       ${report.compatibility.excludedFieldGroups.join(', ') || 'none declared'}`,
+        '',
+        ...report.limitations.map((item) => `Limitation: ${item}`),
+        '',
+    ].join('\n');
+}

package/cli/investigation-manifest.mjs

@@ -1,10 +1,11 @@
 import { Buffer } from 'node:buffer';
 import { createHash } from 'node:crypto';
-import { canonicalArtifactJson, sha256ArtifactDigest, } from "../frontend/src/lib/analysis/artifact-integrity.js";
-import { recordOrNull, requireBoundedString, requireIsoTimestamp, } from "../lib/bounded-contract-normalizers.mjs";
+import { canonicalArtifactJsonV2, SORTED_JSON_V2, sha256ArtifactDigestV2, } from "../packages/evidence/artifact-integrity.mjs";
+import { requireBoundedString, requireIsoTimestamp, } from "../lib/bounded-contract-normalizers.mjs";
 import { normalizeBoundedSemanticVersion } from "../lib/semantic-version.mjs";
+import { parseBoundedJsonObject } from "./bounded-json.mjs";
 export const INVESTIGATION_MANIFEST_SCHEMA = 'whoisleuth.investigation-manifest';
-export const INVESTIGATION_MANIFEST_VERSION = 1;
+export const INVESTIGATION_MANIFEST_VERSION = 2;
 export const MAX_INVESTIGATION_MANIFEST_ARTIFACTS = 16;
 export const MAX_INVESTIGATION_MANIFEST_ARTIFACT_BYTES = 15 * 1024 * 1024;
 export const MAX_INVESTIGATION_MANIFEST_TOTAL_BYTES = 32 * 1024 * 1024;
@@ -40,20 +41,17 @@ export async function buildInvestigationManifest(input, generatedAtValue, applic
         if (byteLength < 1 || byteLength > MAX_INVESTIGATION_MANIFEST_ARTIFACT_BYTES) {
             throw new TypeError(`Artifact ${index + 1} must be between 1 byte and ${MAX_INVESTIGATION_MANIFEST_ARTIFACT_BYTES} bytes.`);
         }
-        let parsed;
-        try {
-            parsed = JSON.parse(artifact.content);
+        if (totalBytes > MAX_INVESTIGATION_MANIFEST_TOTAL_BYTES) {
+            throw new TypeError(`Manifest artefacts exceed the ${MAX_INVESTIGATION_MANIFEST_TOTAL_BYTES}-byte combined limit.`);
         }
-        catch {
-            throw new TypeError(`Artifact ${index + 1} must be valid JSON.`);
-        }
-        const value = recordOrNull(parsed);
-        if (!value)
-            throw new TypeError(`Artifact ${index + 1} must contain one JSON object.`);
+        const value = parseBoundedJsonObject(artifact.content, {
+            label: `Artifact ${index + 1}`,
+            maximumBytes: MAX_INVESTIGATION_MANIFEST_ARTIFACT_BYTES,
+        });
         const schema = value.schema === undefined
             ? null
             : requireBoundedString(value.schema, `Artifact ${index + 1} schema`, 160);
-        const canonical = canonicalArtifactJson(value);
+        const canonical = canonicalArtifactJsonV2(value);
         const contentDigestSha256 = digest(artifact.content);
         return Object.freeze({
             sequence: index + 1,
@@ -65,9 +63,6 @@ export async function buildInvestigationManifest(input, generatedAtValue, applic
             canonicalDigestSha256: digest(canonical),
         });
     });
-    if (totalBytes > MAX_INVESTIGATION_MANIFEST_TOTAL_BYTES) {
-        throw new TypeError(`Manifest artefacts exceed the ${MAX_INVESTIGATION_MANIFEST_TOTAL_BYTES}-byte combined limit.`);
-    }
     const unsigned = Object.freeze({
         schema: INVESTIGATION_MANIFEST_SCHEMA,
         version: INVESTIGATION_MANIFEST_VERSION,
@@ -90,7 +85,11 @@ export async function buildInvestigationManifest(input, generatedAtValue, applic
     });
     return Object.freeze({
         ...unsigned,
-        integrity: Object.freeze({ algorithm: 'SHA-256', digestSha256: await sha256ArtifactDigest(unsigned) }),
+        integrity: Object.freeze({
+            algorithm: 'SHA-256',
+            canonicalization: SORTED_JSON_V2,
+            digestSha256: await sha256ArtifactDigestV2(unsigned),
+        }),
     });
 }
 export function formatInvestigationManifest(manifest) {