@angelmsger/fx 0.0.0-stage → 0.10.1

package/dist/application/contribution/plan-existing.js

@@ -0,0 +1,216 @@
+// Existing operations are reused from authoritative PR/branch evidence. An
+// uncertain create is an association handoff, never another automatic create.
+import { buildContributionCandidate } from '../../domain/contribution/candidate.js';
+import { displayContributionPaths } from '../../domain/contribution/display-paths.js';
+import { decideContributionReuse } from '../../domain/contribution/pending.js';
+import { DevkitError } from '../../domain/errors.js';
+export async function planExistingOperation(context) {
+    const { input, plan } = context;
+    if (input.forceNew)
+        return plan;
+    const retired = [];
+    for (const operation of [...plan.records]
+        .reverse()
+        .filter((record) => record.remoteIdentity === plan.identity)) {
+        const candidate = await planOperation({ ...context, operation });
+        if (!candidate) {
+            retired.push(operation.id);
+            continue;
+        }
+        return { ...candidate, output: { ...candidate.output, retired } };
+    }
+    if (input.prRef)
+        throw associationInvalid();
+    return { ...plan, output: { ...plan.output, retired } };
+}
+async function planOperation(context) {
+    const { deps, input, plan, operation } = context;
+    const pr = operation.pullRequestId
+        ? await plan.host.pullRequest({ repo: plan.remote.target, id: operation.pullRequestId })
+        : null;
+    if (operation.pullRequestId && (!pr || pr.state !== 'open'))
+        return null;
+    if (pr)
+        assertMatchingPr(pr, operation, plan);
+    const head = await deps.transport.head({
+        ...deps.source,
+        remote: plan.remote,
+        branch: operation.branch,
+    });
+    const current = {
+        ...plan,
+        operation,
+        output: {
+            ...plan.output,
+            branch: operation.branch,
+            commit: operation.commit,
+            tree: operation.tree,
+            files: operation.files,
+            pull_request: pr,
+        },
+    };
+    if (input.prRef && operation.phase !== 'open')
+        return associate({ ...context, plan: current }, head);
+    if (head === null && ['open', 'pushed', 'creating_pr'].includes(operation.phase))
+        return null;
+    if (operation.phase !== 'open')
+        return resume({ ...context, plan: current }, head);
+    if (input.prRef)
+        throw associationInvalid();
+    return updatePlan({ ...context, plan: current }, head);
+}
+async function updatePlan(context, head) {
+    const { deps, input, plan, operation } = context;
+    const snapshot = await deps.git.capture({
+        ...deps.source,
+        base: plan.upstream.sha,
+        paths: input.paths,
+    });
+    const decision = decideContributionReuse({
+        pending: operation,
+        remoteIdentity: plan.identity,
+        files: displayContributionPaths(snapshot.files.map((file) => file.path)),
+        tree: snapshot.tree,
+        remoteHead: head,
+        pullRequestState: 'open',
+        forceNew: false,
+    });
+    if (decision === 'conflict')
+        throw divergedError();
+    if (decision === 'new')
+        return {
+            ...plan,
+            operation: null,
+            output: {
+                ...plan.output,
+                action: 'needs-fetch',
+                branch: `fx/contribution/${plan.allocatedId}`,
+                commit: null,
+                pull_request: null,
+            },
+        };
+    const validation = await deps.validator.execute({
+        files: buildContributionCandidate({ base: snapshot.baseFiles, changes: snapshot.files }),
+        changes: snapshot.files,
+        cliVersion: input.cliVersion,
+    });
+    return {
+        ...plan,
+        snapshot,
+        output: {
+            ...plan.output,
+            action: decision === 'unchanged' ? 'unchanged' : 'update',
+            message: decision === 'unchanged' ? null : plan.output.message,
+            title: null,
+            tree: snapshot.tree,
+            files: displayContributionPaths(snapshot.files.map((file) => file.path)),
+            findings: validation.findings,
+            validated: validation.ok,
+        },
+    };
+}
+async function resume(context, head) {
+    const { deps, input, plan, operation } = context;
+    assertResumeSelection(input, operation);
+    if (head !== operation.commit && head !== operation.previousHead)
+        throw divergedError();
+    const action = operation.phase === 'creating_pr' ? 'recover' : 'resume';
+    if (operation.phase !== 'prepared') {
+        const commit = operation.commit && (await deps.git.inspect({ ...deps.source, ref: operation.commit }));
+        if (!commit ||
+            commit.tree !== operation.tree ||
+            commit.parents.length !== 1 ||
+            commit.parents[0] !== operation.parent)
+            throw operationInvalidError(deps.source.dir, operation);
+        return {
+            ...plan,
+            output: {
+                ...plan.output,
+                action,
+                message: null,
+                title: operation.pullRequestId ? null : plan.output.title,
+                validated: true,
+            },
+        };
+    }
+    const snapshot = await deps.git.capture({
+        ...deps.source,
+        base: operation.base,
+        paths: operation.paths,
+    });
+    if (snapshot.fingerprint !== operation.sourceFingerprint)
+        throw snapshotChangedError(deps.source.dir, operation);
+    const validation = await deps.validator.execute({
+        files: buildContributionCandidate({ base: snapshot.baseFiles, changes: snapshot.files }),
+        changes: snapshot.files,
+        cliVersion: input.cliVersion,
+    });
+    return {
+        ...plan,
+        snapshot,
+        output: { ...plan.output, action, validated: validation.ok, findings: validation.findings },
+    };
+}
+async function associate({ input, plan, operation }, head) {
+    assertResumeSelection(input, operation);
+    if (operation.phase !== 'creating_pr' && operation.phase !== 'pushed')
+        throw associationInvalid();
+    const pr = await plan.host.pullRequest({ repo: plan.remote.target, id: input.prRef });
+    if (!pr || (pr.state === 'open' && head !== operation.commit))
+        throw associationInvalid();
+    assertMatchingPr(pr, operation, plan);
+    return {
+        ...plan,
+        output: {
+            ...plan.output,
+            action: 'associate',
+            message: null,
+            title: null,
+            validated: true,
+            pull_request: pr,
+        },
+    };
+}
+function assertResumeSelection(input, operation) {
+    if (input.paths.length !== operation.paths.length ||
+        input.paths.some((path) => !operation.paths.includes(path)))
+        throw new DevkitError('conflict', 'SOURCE_RECOVERY_REQUIRED', 'Resume with the original path selection or use --new', {
+            nextSteps: [
+                `Re-run with the recorded paths: ${operation.paths.join(' ')}`,
+                'Or start a separate contribution with --new.',
+            ],
+        });
+}
+export function assertMatchingPr(pr, operation, plan) {
+    const remote = plan.remote;
+    if (pr.source.branch !== operation.branch ||
+        pr.target.branch !== operation.baseBranch ||
+        pr.source.repo.project !== remote.source.project ||
+        pr.source.repo.name !== remote.source.name ||
+        pr.target.repo.project !== remote.target.project ||
+        pr.target.repo.name !== remote.target.name)
+        throw associationInvalid();
+}
+function operationInvalidError(dir, operation) {
+    return new DevkitError('conflict', 'SOURCE_OPERATION_INVALID', 'The recorded commit no longer matches the prepared contribution', {
+        nextSteps: [
+            `git -C ${dir} show --stat ${operation.commit ?? operation.tree}`,
+            'Start a separate contribution with --new.',
+        ],
+    });
+}
+function snapshotChangedError(dir, operation) {
+    return new DevkitError('conflict', 'SOURCE_SNAPSHOT_CHANGED', 'Prepared source content changed; review a new contribution', {
+        nextSteps: [
+            `git -C ${dir} diff -- ${operation.paths.join(' ')}`,
+            'Contribute the current content with --new.',
+        ],
+    });
+}
+export function divergedError() {
+    return new DevkitError('conflict', 'SOURCE_REMOTE_DIVERGED', 'The contribution branch advanced outside this operation', { nextSteps: ['Review the remote branch and use --new for a separate contribution.'] });
+}
+function associationInvalid() {
+    return new DevkitError('conflict', 'SOURCE_PR_ASSOCIATION_INVALID', 'The known PR does not match this recorded contribution', { nextSteps: ['Verify the PR repository, source branch and target before using --pr.'] });
+}
+//# sourceMappingURL=plan-existing.js.map

package/dist/application/contribution/plan-existing.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-existing.js","sourceRoot":"","sources":["../../../src/application/contribution/plan-existing.ts"],"names":[],"mappings":"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"}

package/dist/application/contribution/plan-source.js

@@ -0,0 +1,186 @@
+// Plans read the upstream's committed provider configuration, never unrelated
+// dirty configuration in source. Missing base objects produce an honest preview.
+import { createHash } from 'node:crypto';
+import { scanBoundary } from '../../domain/boundary/scan.js';
+import { buildContributionCandidate } from '../../domain/contribution/candidate.js';
+import { displayContributionPaths } from '../../domain/contribution/display-paths.js';
+import { verifyContributionRemote } from '../../domain/contribution/remote.js';
+import { DevkitError } from '../../domain/errors.js';
+import { refFromUrl } from '../../domain/workspace/ref.js';
+import { planExistingOperation } from './plan-existing.js';
+export async function planSource(context) {
+    const { deps, input } = context;
+    assertInput(deps, input);
+    let plan = await initialPlan(context);
+    if (!(await deps.git.inspect({ dir: deps.source.dir, ref: plan.upstream.sha })))
+        return finish(plan);
+    plan = await connectHost(deps, plan);
+    plan = await planExistingOperation({ deps, input, plan });
+    if (plan.output.action === 'needs-fetch')
+        plan = await newCandidate(deps, input, plan);
+    return finish(plan);
+}
+async function initialPlan(context) {
+    const { deps, allocatedId } = context;
+    const records = await deps.records.read(deps.source.workspace);
+    const settings = await deps.transport.inspect(deps.source);
+    if (settings.originUrls.length !== 1 ||
+        settings.pushUrls.length !== 1 ||
+        settings.upstreamUrls.length !== 1 ||
+        settings.hasRewrite ||
+        settings.isMirror ||
+        settings.receivePack !== null)
+        throw new DevkitError('conflict', 'SOURCE_REMOTE_UNSAFE', 'Source remotes must identify one origin and upstream without routing overrides', {
+            nextSteps: [
+                `git -C ${deps.source.dir} remote -v`,
+                'Leave one origin and one upstream URL and remove insteadOf rewrites, mirror and receive-pack overrides, then retry.',
+            ],
+        });
+    const source = refFromUrl(settings.originUrls[0]);
+    const target = refFromUrl(settings.upstreamUrls[0]);
+    if (!source || !target)
+        throw new DevkitError('config', 'SOURCE_REF_REQUIRED', 'Source remotes must identify repository references', {
+            nextSteps: [
+                `git -C ${deps.source.dir} remote -v`,
+                'Point origin at your personal fork and upstream at the shared source repository, then retry.',
+            ],
+        });
+    const upstream = await deps.transport.upstream(deps.source);
+    const output = initialOutput({ ...context, upstream, source, target });
+    return {
+        output,
+        allocatedId,
+        records,
+        settings,
+        upstream,
+        operation: null,
+        snapshot: null,
+        remote: null,
+        identity: '',
+        host: null,
+        key: '',
+    };
+}
+function initialOutput({ deps, input, allocatedId, upstream, source, target, }) {
+    return {
+        workspace: deps.source.workspace,
+        action: 'needs-fetch',
+        files: input.paths,
+        branch: `fx/contribution/${allocatedId}`,
+        base: upstream.sha,
+        tree: null,
+        commit: null,
+        source,
+        target,
+        target_branch: upstream.branch,
+        message: `docs: ${input.issue} ${input.message ?? 'update selected workspace resources'}`,
+        title: input.title,
+        pull_request: null,
+        findings: [],
+        validated: false,
+        written: false,
+        fetched: false,
+        retired: [],
+    };
+}
+async function connectHost(deps, plan) {
+    const host = deps.hostFor(await deps.git.readBase({ dir: deps.source.dir, ref: plan.upstream.sha }));
+    if (!host.supportsContributions)
+        throw new DevkitError('config', 'SOURCE_CONTRIBUTION_UNSUPPORTED', 'The selected code host has no contribution PR service', {
+            nextSteps: ['fx manifest providers', 'Open the pull request on the code host directly.'],
+        });
+    const origin = await host.repositoryIdentity(refFromUrl(plan.settings.originUrls[0]));
+    const official = await host.repositoryIdentity(plan.output.target);
+    const remote = verifyContributionRemote({
+        settings: plan.settings,
+        origin,
+        upstream: official,
+        user: deps.user ?? (await host.whoami()).user,
+        branch: plan.output.branch,
+    });
+    if (remote.targetBranch !== plan.upstream.branch)
+        throw sourceChangedError();
+    const identity = createHash('sha256').update(JSON.stringify(remote)).digest('hex');
+    return {
+        ...plan,
+        remote,
+        identity,
+        host,
+        output: {
+            ...plan.output,
+            source: remote.source,
+            target: remote.target,
+            target_branch: remote.targetBranch,
+        },
+    };
+}
+async function newCandidate(deps, input, plan) {
+    const snapshot = await deps.git.capture({
+        dir: deps.source.dir,
+        base: plan.upstream.sha,
+        paths: input.paths,
+    });
+    const validation = await deps.validator.execute({
+        files: buildContributionCandidate({ base: snapshot.baseFiles, changes: snapshot.files }),
+        changes: snapshot.files,
+        cliVersion: input.cliVersion,
+    });
+    return {
+        ...plan,
+        snapshot,
+        output: {
+            ...plan.output,
+            action: 'create',
+            files: displayContributionPaths(snapshot.files.map((file) => file.path)),
+            tree: snapshot.tree,
+            findings: validation.findings,
+            validated: validation.ok,
+        },
+    };
+}
+export function finish(plan) {
+    return {
+        ...plan,
+        key: JSON.stringify({
+            output: plan.output,
+            records: plan.records,
+            identity: plan.identity,
+            fingerprint: plan.snapshot?.fingerprint ?? null,
+        }),
+    };
+}
+export function sourceChangedError() {
+    return new DevkitError('conflict', 'SOURCE_PLAN_CHANGED', 'Source contribution evidence changed after planning', {
+        nextSteps: [
+            'Re-run the same source push command with --dry-run, then review the updated plan.',
+        ],
+    });
+}
+function assertInput(deps, input) {
+    if (deps.source.kind !== 'repo')
+        throw new DevkitError('config', 'SOURCE_NOT_GIT', 'Only a registered Git source can contribute', { nextSteps: ['Register the workspace from its manifest repository URL.'] });
+    if (!input.paths.length || !input.issue.trim() || !input.title.trim())
+        throw new DevkitError('usage', 'INPUT_REQUIRED', 'Select paths and supply an issue ID and PR title', { nextSteps: ['fx source push <path>... --issue <issue-id> --title "<pr title>"'] });
+    if (!/^g-[0-9]+$/.test(input.issue) ||
+        /[\r\n]/.test(input.title) ||
+        (input.message !== undefined && /[\r\n]/.test(input.message)))
+        throw new DevkitError('usage', 'SOURCE_METADATA_INVALID', 'Use an issue ID and single-line title and commit summary', {
+            nextSteps: ['Pass --issue as g-<digits> and keep --title and --message on one line.'],
+        });
+    if (scanBoundary({
+        text: [...input.paths, input.title, input.message ?? '', input.prRef ?? ''].join('\n'),
+        policy: 'manifest',
+    }).length)
+        throw new DevkitError('usage', 'SOURCE_CONTENT_SENSITIVE', 'Contribution metadata contains protected content', {
+            nextSteps: [
+                'Remove credentials, personal names and email addresses from the selected paths, --title and --message, then retry.',
+            ],
+        });
+    if (input.forceNew && input.prRef)
+        throw new DevkitError('usage', 'SOURCE_OPTIONS_CONFLICT', '--new cannot be combined with --pr', {
+            nextSteps: [
+                'Associate the known PR with --pr <id>, or start a separate contribution with --new.',
+            ],
+        });
+}
+//# sourceMappingURL=plan-source.js.map

package/dist/application/contribution/plan-source.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plan-source.js","sourceRoot":"","sources":["../../../src/application/contribution/plan-source.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAC9E,iFAAiF;AAEjF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,0BAA0B,EAAE,MAAM,wCAAwC,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,4CAA4C,CAAC;AACtF,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,UAAU,EAAgB,MAAM,+BAA+B,CAAC;AAGzE,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAc3D,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,OAAuB;IACtD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAChC,WAAW,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzB,IAAI,IAAI,GAAG,MAAM,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC;QAC7E,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;IACtB,IAAI,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrC,IAAI,GAAG,MAAM,qBAAqB,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,KAAK,aAAa;QAAE,IAAI,GAAG,MAAM,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACvF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,OAAuB;IAChD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IAC/D,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC3D,IACE,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QAChC,QAAQ,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAC9B,QAAQ,CAAC,YAAY,CAAC,MAAM,KAAK,CAAC;QAClC,QAAQ,CAAC,UAAU;QACnB,QAAQ,CAAC,QAAQ;QACjB,QAAQ,CAAC,WAAW,KAAK,IAAI;QAE7B,MAAM,IAAI,WAAW,CACnB,UAAU,EACV,sBAAsB,EACtB,gFAAgF,EAChF;YACE,SAAS,EAAE;gBACT,UAAU,IAAI,CAAC,MAAM,CAAC,GAAG,YAAY;gBACrC,qHAAqH;aACtH;SACF,CACF,CAAC;IACJ,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAE,CAAC,CAAC;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAE,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM;QACpB,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,qBAAqB,EACrB,oDAAoD,EACpD;YACE,SAAS,EAAE;gBACT,UAAU,IAAI,CAAC,MAAM,CAAC,GAAG,YAAY;gBACrC,8FAA8F;aAC/F;SACF,CACF,CAAC;IACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,GAAG,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACvE,OAAO;QACL,MAAM;QACN,WAAW;QACX,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;QACZ,QAAQ,EAAE,EAAE;QACZ,IAAI,EAAE,IAAI;QACV,GAAG,EAAE,EAAE;KACR,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,EACrB,IAAI,EACJ,KAAK,EACL,WAAW,EACX,QAAQ,EACR,MAAM,EACN,MAAM,GAKP;IACC,OAAO;QACL,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS;QAChC,MAAM,EAAE,aAAa;QACrB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,mBAAmB,WAAW,EAAE;QACxC,IAAI,EAAE,QAAQ,CAAC,GAAG;QAClB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,IAAI;QACZ,MAAM;QACN,MAAM;QACN,aAAa,EAAE,QAAQ,CAAC,MAAM;QAC9B,OAAO,EAAE,SAAS,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,qCAAqC,EAAE;QACzF,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,YAAY,EAAE,IAAI;QAClB,QAAQ,EAAE,EAAE;QACZ,SAAS,EAAE,KAAK;QAChB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,WAAW,CAAC,IAAoB,EAAE,IAAgB;IAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CACvB,MAAM,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAC1E,CAAC;IACF,IAAI,CAAC,IAAI,CAAC,qBAAqB;QAC7B,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,iCAAiC,EACjC,uDAAuD,EACvD;YACE,SAAS,EAAE,CAAC,uBAAuB,EAAE,kDAAkD,CAAC;SACzF,CACF,CAAC;IACJ,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAE,CAAE,CAAC,CAAC;IACxF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,GAAG,wBAAwB,CAAC;QACtC,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,MAAM;QACN,QAAQ,EAAE,QAAQ;QAClB,IAAI,EAAE,IAAI,CAAC,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI;QAC7C,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM;KAC3B,CAAC,CAAC;IACH,IAAI,MAAM,CAAC,YAAY,KAAK,IAAI,CAAC,QAAQ,CAAC,MAAM;QAAE,MAAM,kBAAkB,EAAE,CAAC;IAC7E,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnF,OAAO;QACL,GAAG,IAAI;QACP,MAAM;QACN,QAAQ;QACR,IAAI;QACJ,MAAM,EAAE;YACN,GAAG,IAAI,CAAC,MAAM;YACd,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,aAAa,EAAE,MAAM,CAAC,YAAY;SACnC;KACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,YAAY,CACzB,IAAoB,EACpB,KAAsB,EACtB,IAAgB;IAEhB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QACtC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG;QACpB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG;QACvB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;QAC9C,KAAK,EAAE,0BAA0B,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC;QACxF,OAAO,EAAE,QAAQ,CAAC,KAAK;QACvB,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC,CAAC;IACH,OAAO;QACL,GAAG,IAAI;QACP,QAAQ;QACR,MAAM,EAAE;YACN,GAAG,IAAI,CAAC,MAAM;YACd,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,wBAAwB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACxE,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,SAAS,EAAE,UAAU,CAAC,EAAE;SACzB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,IAAgB;IACrC,OAAO;QACL,GAAG,IAAI;QACP,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;YAClB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,WAAW,EAAE,IAAI,CAAC,QAAQ,EAAE,WAAW,IAAI,IAAI;SAChD,CAAC;KACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,OAAO,IAAI,WAAW,CACpB,UAAU,EACV,qBAAqB,EACrB,qDAAqD,EACrD;QACE,SAAS,EAAE;YACT,mFAAmF;SACpF;KACF,CACF,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,IAAoB,EAAE,KAAsB;IAC/D,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM;QAC7B,MAAM,IAAI,WAAW,CACnB,QAAQ,EACR,gBAAgB,EAChB,6CAA6C,EAC7C,EAAE,SAAS,EAAE,CAAC,0DAA0D,CAAC,EAAE,CAC5E,CAAC;IACJ,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE;QACnE,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,gBAAgB,EAChB,kDAAkD,EAClD,EAAE,SAAS,EAAE,CAAC,kEAAkE,CAAC,EAAE,CACpF,CAAC;IACJ,IACE,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC/B,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAE7D,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,yBAAyB,EACzB,0DAA0D,EAC1D;YACE,SAAS,EAAE,CAAC,wEAAwE,CAAC;SACtF,CACF,CAAC;IACJ,IACE,YAAY,CAAC;QACX,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,IAAI,EAAE,EAAE,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QACtF,MAAM,EAAE,UAAU;KACnB,CAAC,CAAC,MAAM;QAET,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,0BAA0B,EAC1B,kDAAkD,EAClD;YACE,SAAS,EAAE;gBACT,oHAAoH;aACrH;SACF,CACF,CAAC;IACJ,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,KAAK;QAC/B,MAAM,IAAI,WAAW,CACnB,OAAO,EACP,yBAAyB,EACzB,oCAAoC,EACpC;YACE,SAAS,EAAE;gBACT,qFAAqF;aACtF;SACF,CACF,CAAC;AACN,CAAC"}

package/dist/application/contribution/push-types.js

@@ -0,0 +1,4 @@
+// Public plans carry reviewable names and results, not captured file bodies.
+// Private planning state retains the evidence needed for locked revalidation.
+export {};
+//# sourceMappingURL=push-types.js.map

package/dist/application/contribution/push-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push-types.js","sourceRoot":"","sources":["../../../src/application/contribution/push-types.ts"],"names":[],"mappings":"AAAA,6EAA6E;AAC7E,8EAA8E"}

package/dist/application/contribution/push.js

@@ -0,0 +1,95 @@
+// Source pushes plan before their write gate and prompt outside leases. The
+// locked plan is re-read before journal, object, ref or network writes begin.
+import { busyError, DevkitError } from '../../domain/errors.js';
+import { assertWritable } from '../safety/posture.js';
+import { acquireWorkspaceOperation } from '../workspace/operation.js';
+import { applySource } from './apply-source.js';
+import { assertContributionIdentity } from './identity.js';
+import { sourceChangedError, planSource } from './plan-source.js';
+export class PushSource {
+    deps;
+    constructor(deps) {
+        this.deps = deps;
+    }
+    async execute(input) {
+        await assertContributionIdentity(this.deps);
+        const allocatedId = this.deps.ids.next();
+        let plan = await planSource({ deps: this.deps, input, allocatedId });
+        if (input.dryRun)
+            return plan.output;
+        assertWritable(input.posture, 'source push');
+        let fetched = false;
+        if (plan.output.action === 'needs-fetch') {
+            await withLeases(this.deps, async () => this.deps.transport.fetch({
+                ...this.deps.source,
+                settings: plan.settings,
+                branch: plan.upstream.branch,
+            }));
+            fetched = true;
+            plan = await planSource({ deps: this.deps, input, allocatedId });
+        }
+        assertReady(plan);
+        if (!input.yes && plan.output.action !== 'unchanged' && !(await confirm(this.deps, plan)))
+            return { ...plan.output, action: 'cancelled', written: fetched, fetched };
+        const result = await withLeases(this.deps, async () => {
+            const current = await planSource({ deps: this.deps, input, allocatedId });
+            if (current.key !== plan.key)
+                throw sourceChangedError();
+            return applySource({ deps: this.deps, input, plan: current });
+        });
+        return { ...result, fetched, written: result.written || fetched };
+    }
+}
+async function withLeases(deps, work) {
+    const leases = [];
+    try {
+        leases.push(await acquireWorkspaceOperation(deps.lock, deps.source.workspace));
+        await assertContributionIdentity(deps);
+        for (const key of [`workspace:${deps.source.workspace}`, `source:${deps.source.dir}`]) {
+            const lease = await deps.lock.acquire({ key, waitMs: 2000 });
+            if (!lease)
+                throw busyError('SOURCE_BUSY', 'The contribution source');
+            leases.push(lease);
+        }
+        // Again, now that every lease is held: waiting for one can outlast the identity
+        // checked before it.
+        await assertContributionIdentity(deps);
+        return await work();
+    }
+    finally {
+        for (const lease of leases.reverse())
+            await lease.release();
+    }
+}
+async function confirm(deps, plan) {
+    try {
+        return await deps.prompter.confirm(`Contribute ${plan.output.files.length} selected file(s) from ${plan.output.source.project}/${plan.output.source.name} on ${plan.output.branch} to ${plan.output.target.project}/${plan.output.target.name}?`, { commands: ['Re-run with --yes to confirm this contribution.'] });
+    }
+    catch (error) {
+        if (error instanceof DevkitError && error.code === 'INPUT_REQUIRED')
+            throw new DevkitError('config', 'CONFIRM_REQUIRED', 'Confirm the source contribution with --yes', { nextSteps: ['Re-run the same fx source push command with --yes.'] });
+        throw error;
+    }
+}
+function assertReady(plan) {
+    if (!plan.output.validated)
+        throw new DevkitError('config', 'SOURCE_VALIDATION_FAILED', 'The contribution candidate has not passed validation', { nextSteps: ['Re-run the same command with --dry-run and address its findings.'] });
+    if (plan.output.action === 'recover')
+        throw new DevkitError('conflict', 'SOURCE_PR_CONFIRM_REQUIRED', 'PR creation may already have succeeded', {
+            nextSteps: [
+                'Inspect the remote PR and resume with its ID or URL using --pr.',
+                'If no PR was created, use --new for a separately identified contribution.',
+            ],
+            handoff: {
+                summary: 'Confirm the PR before resuming.',
+                userSteps: [
+                    {
+                        id: 'source-pr',
+                        kind: 'manual',
+                        title: 'Find the PR for the recorded branch and supply its ID with --pr.',
+                    },
+                ],
+            },
+        });
+}
+//# sourceMappingURL=push.js.map

package/dist/application/contribution/push.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/application/contribution/push.ts"],"names":[],"mappings":"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"}

package/dist/application/contribution/validate.js

@@ -0,0 +1,60 @@
+// Contributions validate their captured candidate with the existing manifest
+// inspectors. Boundary checks precede parsing; reports omit untrusted values.
+import path from 'node:path';
+import { scanBoundary } from '../../domain/boundary/scan.js';
+import { MANIFEST_FILES } from '../../domain/manifest/files.js';
+import { LintManifest } from '../manifest/lint.js';
+import { ValidateManifest } from '../manifest/validate.js';
+export class ValidateContribution {
+    views;
+    bundledTools;
+    providers;
+    describeProvider;
+    constructor(views, bundledTools, providers, describeProvider = () => undefined) {
+        this.views = views;
+        this.bundledTools = bundledTools;
+        this.providers = providers;
+        this.describeProvider = describeProvider;
+    }
+    async execute(input) {
+        const names = input.changes.flatMap((file, index) => scanBoundary({ text: file.path, policy: 'manifest' }).map((item) => ({
+            ...item,
+            path: `(protected path ${index + 1})`,
+        })));
+        if (names.length)
+            return { ok: false, findings: names };
+        const mismatch = input.changes.find((file) => (input.files[file.path] ?? null) !== file.content);
+        if (mismatch)
+            return { ok: false, findings: [finding(mismatch.path, 'snapshot-mismatch')] };
+        const findings = input.changes.flatMap((file) => scanBoundary({ text: file.content ?? '', policy: 'manifest' }).map((finding) => ({
+            ...finding,
+            path: file.path,
+        })));
+        if (findings.length > 0)
+            return { ok: false, findings };
+        const view = this.views.open(input.files);
+        if (!(await view.reader.exists(path.join(view.root, MANIFEST_FILES.workspace))))
+            return { ok: false, findings: [finding(MANIFEST_FILES.workspace, 'manifest-missing')] };
+        const options = { dir: view.root, cliVersion: input.cliVersion, providers: this.providers };
+        const validation = await new ValidateManifest(view.reader, this.bundledTools).execute({
+            ...options,
+            strict: true,
+        });
+        for (const document of validation.documents) {
+            if (document.problems.length > 0 ||
+                document.unknown.length > 0 ||
+                document.dropped.length > 0)
+                findings.push(finding(document.path, 'manifest-invalid'));
+        }
+        if (findings.length > 0)
+            return { ok: false, findings };
+        const lint = await new LintManifest(view.reader, this.bundledTools, this.describeProvider).execute(options);
+        for (const item of lint)
+            findings.push(finding(item.kind, 'manifest-lint'));
+        return { ok: findings.length === 0, findings };
+    }
+}
+function finding(path, rule) {
+    return { path, rule, line: null, column: null };
+}
+//# sourceMappingURL=validate.js.map

package/dist/application/contribution/validate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../src/application/contribution/validate.ts"],"names":[],"mappings":"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"}