@flyteorg/flyteidl2 2.0.46 → 2.0.48

package/flyteidl2/artifact/artifact_pb.ts

@@ -9,7 +9,7 @@ import type { ActionIdentifier } from "../common/identifier_pb.ts";
 import { file_flyteidl2_common_identifier } from "../common/identifier_pb.ts";
 import type { EnrichedIdentity } from "../common/identity_pb.ts";
 import { file_flyteidl2_common_identity } from "../common/identity_pb.ts";
-import type { ArtifactInfo } from "../core/artifact_id_pb.ts";
+import type { ArtifactInfo, ArtifactVersionId } from "../core/artifact_id_pb.ts";
 import { file_flyteidl2_core_artifact_id } from "../core/artifact_id_pb.ts";
 import type { Literal } from "../core/literals_pb.ts";
 import { file_flyteidl2_core_literals } from "../core/literals_pb.ts";
@@ -23,7 +23,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file flyteidl2/artifact/artifact.proto.
  */
 export const file_flyteidl2_artifact_artifact: GenFile = /*@__PURE__*/
-  fileDesc("CiFmbHl0ZWlkbDIvYXJ0aWZhY3QvYXJ0aWZhY3QucHJvdG8SEmZseXRlaWRsMi5hcnRpZmFjdCJ1CgxBcnRpZmFjdE5hbWUSFAoDb3JnGAEgASgJQge6SARyAhg/EhoKB3Byb2plY3QYAiABKAlCCbpIBnIEEAEYQBIZCgZkb21haW4YAyABKAlCCbpIBnIEEAEYQBIYCgRuYW1lGAQgASgJQgq6SAdyBRABGP8BImkKEkFydGlmYWN0SWRlbnRpZmllchI2CgRuYW1lGAEgASgLMiAuZmx5dGVpZGwyLmFydGlmYWN0LkFydGlmYWN0TmFtZUIGukgDyAEBEhsKB3ZlcnNpb24YAiABKAlCCrpIB3IFEAEY/wEiXwoQVGFza0FjdGlvblNvdXJjZRI6CgZhY3Rpb24YASABKAsyIi5mbHl0ZWlkbDIuY29tbW9uLkFjdGlvbklkZW50aWZpZXJCBrpIA8gBARIPCgdhdHRlbXB0GAIgASgNInkKDkFydGlmYWN0U291cmNlEjsKC3Rhc2tfYWN0aW9uGAEgASgLMiQuZmx5dGVpZGwyLmFydGlmYWN0LlRhc2tBY3Rpb25Tb3VyY2VIABIgCgxleHRlcm5hbF9yZWYYAiABKAlCCLpIBXIDGIAISABCCAoGc291cmNlIvMBCgxBcnRpZmFjdFNwZWMSLgoFdmFsdWUYASABKAsyFy5mbHl0ZWlkbDIuY29yZS5MaXRlcmFsQga6SAPIAQESMQoEdHlwZRgCIAEoCzIbLmZseXRlaWRsMi5jb3JlLkxpdGVyYWxUeXBlQga6SAPIAQESKgoEaW5mbxgDIAEoCzIcLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0SW5mbxIyCgZzb3VyY2UYBiABKAsyIi5mbHl0ZWlkbDIuYXJ0aWZhY3QuQXJ0aWZhY3RTb3VyY2USIAoOcGFyZW50X3ZlcnNpb24YByABKAlCCLpIBXIDGP8BIt8BCghBcnRpZmFjdBI7CgthcnRpZmFjdF9pZBgBIAEoCzImLmZseXRlaWRsMi5hcnRpZmFjdC5BcnRpZmFjdElkZW50aWZpZXISLgoEc3BlYxgCIAEoCzIgLmZseXRlaWRsMi5hcnRpZmFjdC5BcnRpZmFjdFNwZWMSLgoKY3JlYXRlZF9hdBgDIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXASNgoKY3JlYXRlZF9ieRgEIAEoCzIiLmZseXRlaWRsMi5jb21tb24uRW5yaWNoZWRJZGVudGl0eULKAQoWY29tLmZseXRlaWRsMi5hcnRpZmFjdEINQXJ0aWZhY3RQcm90b0gCUAFaNmdpdGh1Yi5jb20vZmx5dGVvcmcvZmx5dGUvdjIvZ2VuL2dvL2ZseXRlaWRsMi9hcnRpZmFjdKICA0ZBWKoCEkZseXRlaWRsMi5BcnRpZmFjdMoCEkZseXRlaWRsMlxBcnRpZmFjdOICHkZseXRlaWRsMlxBcnRpZmFjdFxHUEJNZXRhZGF0YeoCE0ZseXRlaWRsMjo6QXJ0aWZhY3RiBnByb3RvMw", [file_buf_validate_validate, file_flyteidl2_common_identifier, file_flyteidl2_common_identity, file_flyteidl2_core_artifact_id, file_flyteidl2_core_literals, file_flyteidl2_core_types, file_google_protobuf_timestamp]);
+  fileDesc("CiFmbHl0ZWlkbDIvYXJ0aWZhY3QvYXJ0aWZhY3QucHJvdG8SEmZseXRlaWRsMi5hcnRpZmFjdCJ1CgxBcnRpZmFjdE5hbWUSFAoDb3JnGAEgASgJQge6SARyAhg/EhoKB3Byb2plY3QYAiABKAlCCbpIBnIEEAEYQBIZCgZkb21haW4YAyABKAlCCbpIBnIEEAEYQBIYCgRuYW1lGAQgASgJQgq6SAdyBRABGP8BImkKEkFydGlmYWN0SWRlbnRpZmllchI2CgRuYW1lGAEgASgLMiAuZmx5dGVpZGwyLmFydGlmYWN0LkFydGlmYWN0TmFtZUIGukgDyAEBEhsKB3ZlcnNpb24YAiABKAlCCrpIB3IFEAEY/wEiXwoQVGFza0FjdGlvblNvdXJjZRI6CgZhY3Rpb24YASABKAsyIi5mbHl0ZWlkbDIuY29tbW9uLkFjdGlvbklkZW50aWZpZXJCBrpIA8gBARIPCgdhdHRlbXB0GAIgASgNInkKDkFydGlmYWN0U291cmNlEjsKC3Rhc2tfYWN0aW9uGAEgASgLMiQuZmx5dGVpZGwyLmFydGlmYWN0LlRhc2tBY3Rpb25Tb3VyY2VIABIgCgxleHRlcm5hbF9yZWYYAiABKAlCCLpIBXIDGIAISABCCAoGc291cmNlIpgCCgxBcnRpZmFjdFNwZWMSLgoFdmFsdWUYASABKAsyFy5mbHl0ZWlkbDIuY29yZS5MaXRlcmFsQga6SAPIAQESMQoEdHlwZRgCIAEoCzIbLmZseXRlaWRsMi5jb3JlLkxpdGVyYWxUeXBlQga6SAPIAQESKgoEaW5mbxgDIAEoCzIcLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0SW5mbxIyCgZzb3VyY2UYBiABKAsyIi5mbHl0ZWlkbDIuYXJ0aWZhY3QuQXJ0aWZhY3RTb3VyY2USRQoQcGFyZW50X2FydGlmYWN0cxgHIAMoCzIhLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0VmVyc2lvbklkQgi6SAWSAQIQICLfAQoIQXJ0aWZhY3QSOwoLYXJ0aWZhY3RfaWQYASABKAsyJi5mbHl0ZWlkbDIuYXJ0aWZhY3QuQXJ0aWZhY3RJZGVudGlmaWVyEi4KBHNwZWMYAiABKAsyIC5mbHl0ZWlkbDIuYXJ0aWZhY3QuQXJ0aWZhY3RTcGVjEi4KCmNyZWF0ZWRfYXQYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wEjYKCmNyZWF0ZWRfYnkYBCABKAsyIi5mbHl0ZWlkbDIuY29tbW9uLkVucmljaGVkSWRlbnRpdHlCygEKFmNvbS5mbHl0ZWlkbDIuYXJ0aWZhY3RCDUFydGlmYWN0UHJvdG9IAlABWjZnaXRodWIuY29tL2ZseXRlb3JnL2ZseXRlL3YyL2dlbi9nby9mbHl0ZWlkbDIvYXJ0aWZhY3SiAgNGQViqAhJGbHl0ZWlkbDIuQXJ0aWZhY3TKAhJGbHl0ZWlkbDJcQXJ0aWZhY3TiAh5GbHl0ZWlkbDJcQXJ0aWZhY3RcR1BCTWV0YWRhdGHqAhNGbHl0ZWlkbDI6OkFydGlmYWN0YgZwcm90bzM", [file_buf_validate_validate, file_flyteidl2_common_identifier, file_flyteidl2_common_identity, file_flyteidl2_core_artifact_id, file_flyteidl2_core_literals, file_flyteidl2_core_types, file_google_protobuf_timestamp]);
 
 /**
  * Identifies an artifact name within an org, project and domain.
@@ -203,23 +203,33 @@ export type ArtifactSpec = Message<"flyteidl2.artifact.ArtifactSpec"> & {
   source?: ArtifactSource;
 
   /**
-   * Optional lineage: the version of THIS artifact (same org/project/domain/
-   * name) that this version was derived from. Empty means no declared parent,
-   * which is the normal case for a first version or an independently produced
-   * one.
+   * Optional lineage: the artifact versions this one was derived from. Empty
+   * means no declared parents, which is the normal case for a first version or
+   * an independently produced one. One entry is plain derivation; several
+   * entries record a merge (git-style), making version history a DAG rather
+   * than a chain: a new version may branch off any earlier version — or
+   * combine more than one — so two versions derived from the same ancestor
+   * are siblings rather than one appearing to descend from the other.
    *
-   * Recording the parent explicitly is what makes version history a forest
-   * rather than a chain: a new version may branch off any earlier version, not
-   * just the most recently created one, so two versions derived from the same
-   * ancestor are siblings rather than one appearing to descend from the other.
+   * Order is preserved and meaningful: the first entry is the primary parent
+   * (the version this one is "a new revision of"), later entries are the
+   * versions merged in. Duplicate parents (after inheritance is applied) are
+   * rejected.
    *
-   * Stored as given and never resolved: the referenced version is not required
+   * Every parent must live in this artifact's own org/project/domain; empty
+   * scope fields on a key inherit the artifact's own scope, and an empty
+   * key name inherits the artifact's own name — so a bare {version: "v1"}
+   * declares the previous version of this same artifact as a parent. The name
+   * MAY differ, so lineage can express derivation across artifacts (a model
+   * deriving from a dataset version).
+   *
+   * Stored as given and never resolved: referenced versions are not required
    * to exist (publication order is not guaranteed), so readers walking lineage
-   * must tolerate a dangling parent. Immutable after creation.
+   * must tolerate dangling parents. Immutable after creation.
    *
-   * @generated from field: string parent_version = 7;
+   * @generated from field: repeated flyteidl2.core.ArtifactVersionId parent_artifacts = 7;
    */
-  parentVersion: string;
+  parentArtifacts: ArtifactVersionId[];
 };
 
 /**

package/flyteidl2/artifact/artifact_service_pb.ts

@@ -126,11 +126,11 @@ export type ListArtifactsRequest = Message<"flyteidl2.artifact.ListArtifactsRequ
    * Common list request parameters (limit, token, filters).
    * Supported filters: field "name" with CONTAINS,
    * field "created_at" with GREATER_THAN (RFC3339 timestamp value),
-   * field "parent_version" with EQUAL, which lists the versions that declare
-   * the given version as their parent — the downward direction of lineage,
-   * which the stored pointer alone cannot be followed in. Because a parent
-   * version is only unique within one artifact name, that filter requires
-   * `name` below to be set.
+   * and the pair "parent_name" + "parent_version", each with EQUAL and always
+   * together, which lists the versions (of any name in the project) that
+   * declare the given artifact version among their parents. This serves the
+   * downward direction of lineage: the stored parent pointers only walk
+   * upwards, so finding a version's children requires this filter.
    *
    * @generated from field: flyteidl2.common.ListRequest request = 1;
    */

package/flyteidl2/core/artifact_id_pb.ts

@@ -13,14 +13,18 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file flyteidl2/core/artifact_id.proto.
  */
 export const file_flyteidl2_core_artifact_id: GenFile = /*@__PURE__*/
-  fileDesc("CiBmbHl0ZWlkbDIvY29yZS9hcnRpZmFjdF9pZC5wcm90bxIOZmx5dGVpZGwyLmNvcmUiSQoLQXJ0aWZhY3RLZXkSDwoHcHJvamVjdBgBIAEoCRIOCgZkb21haW4YAiABKAkSDAoEbmFtZRgDIAEoCRILCgNvcmcYBCABKAkiTgoRQXJ0aWZhY3RWZXJzaW9uSWQSKAoDa2V5GAEgASgLMhsuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RLZXkSDwoHdmVyc2lvbhgCIAEoCSJVCgxBcnRpZmFjdENhcmQSFQoDdXJpGAEgASgJQgi6SAVyAxiACBIXCgZmb3JtYXQYAiABKAlCB7pIBHICGBASFQoEdHlwZRgDIAEoCUIHukgEcgIYECLVAQoMQXJ0aWZhY3RJbmZvEh0KC2Rlc2NyaXB0aW9uGAEgASgJQgi6SAVyAxj/ARJFCg11c2VyX21ldGFkYXRhGAIgAygLMi4uZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RJbmZvLlVzZXJNZXRhZGF0YUVudHJ5EioKBGNhcmQYAyABKAsyHC5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdENhcmQaMwoRVXNlck1ldGFkYXRhRW50cnkSCwoDa2V5GAEgASgJEg0KBXZhbHVlGAIgASgJOgI4ASKfAQoTQXJ0aWZhY3RCaW5kaW5nRGF0YRIXCg1wYXJ0aXRpb25fa2V5GAUgASgJSAASIAoWYmluZF90b190aW1lX3BhcnRpdGlvbhgGIAEoCEgAEjUKDnRpbWVfdHJhbnNmb3JtGAcgASgLMh0uZmx5dGVpZGwyLmNvcmUuVGltZVRyYW5zZm9ybUIQCg5wYXJ0aXRpb25fZGF0YUoECAEQBSJICg1UaW1lVHJhbnNmb3JtEhEKCXRyYW5zZm9ybRgBIAEoCRIkCgJvcBgCIAEoDjIYLmZseXRlaWRsMi5jb3JlLk9wZXJhdG9yIh8KEElucHV0QmluZGluZ0RhdGESCwoDdmFyGAEgASgJIhAKDlJ1bnRpbWVCaW5kaW5nIpcCCgpMYWJlbFZhbHVlEhYKDHN0YXRpY192YWx1ZRgBIAEoCUgAEjAKCnRpbWVfdmFsdWUYAiABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wSAASQAoRdHJpZ2dlcmVkX2JpbmRpbmcYAyABKAsyIy5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdEJpbmRpbmdEYXRhSAASOQoNaW5wdXRfYmluZGluZxgEIAEoCzIgLmZseXRlaWRsMi5jb3JlLklucHV0QmluZGluZ0RhdGFIABI5Cg9ydW50aW1lX2JpbmRpbmcYBSABKAsyHi5mbHl0ZWlkbDIuY29yZS5SdW50aW1lQmluZGluZ0gAQgcKBXZhbHVlIowBCgpQYXJ0aXRpb25zEjQKBXZhbHVlGAEgAygLMiUuZmx5dGVpZGwyLmNvcmUuUGFydGl0aW9ucy5WYWx1ZUVudHJ5GkgKClZhbHVlRW50cnkSCwoDa2V5GAEgASgJEikKBXZhbHVlGAIgASgLMhouZmx5dGVpZGwyLmNvcmUuTGFiZWxWYWx1ZToCOAEibAoNVGltZVBhcnRpdGlvbhIpCgV2YWx1ZRgBIAEoCzIaLmZseXRlaWRsMi5jb3JlLkxhYmVsVmFsdWUSMAoLZ3JhbnVsYXJpdHkYAiABKA4yGy5mbHl0ZWlkbDIuY29yZS5HcmFudWxhcml0eSK3AQoKQXJ0aWZhY3RJRBIxCgxhcnRpZmFjdF9rZXkYASABKAsyGy5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdEtleRIPCgd2ZXJzaW9uGAIgASgJEi4KCnBhcnRpdGlvbnMYAyABKAsyGi5mbHl0ZWlkbDIuY29yZS5QYXJ0aXRpb25zEjUKDnRpbWVfcGFydGl0aW9uGAQgASgLMh0uZmx5dGVpZGwyLmNvcmUuVGltZVBhcnRpdGlvbiJrCgtBcnRpZmFjdFRhZxIxCgxhcnRpZmFjdF9rZXkYASABKAsyGy5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdEtleRIpCgV2YWx1ZRgCIAEoCzIaLmZseXRlaWRsMi5jb3JlLkxhYmVsVmFsdWUizAEKDUFydGlmYWN0UXVlcnkSMQoLYXJ0aWZhY3RfaWQYASABKAsyGi5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdElESAASMwoMYXJ0aWZhY3RfdGFnGAIgASgLMhsuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RUYWdIABINCgN1cmkYAyABKAlIABI2CgdiaW5kaW5nGAQgASgLMiMuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RCaW5kaW5nRGF0YUgAQgwKCmlkZW50aWZpZXIqQgoLR3JhbnVsYXJpdHkSCQoFVU5TRVQQABIKCgZNSU5VVEUQARIICgRIT1VSEAISBwoDREFZEAMSCQoFTU9OVEgQBCofCghPcGVyYXRvchIJCgVNSU5VUxAAEggKBFBMVVMQAUK0AQoSY29tLmZseXRlaWRsMi5jb3JlQg9BcnRpZmFjdElkUHJvdG9IAlABWjJnaXRodWIuY29tL2ZseXRlb3JnL2ZseXRlL3YyL2dlbi9nby9mbHl0ZWlkbDIvY29yZaICA0ZDWKoCDkZseXRlaWRsMi5Db3JlygIORmx5dGVpZGwyXENvcmXiAhpGbHl0ZWlkbDJcQ29yZVxHUEJNZXRhZGF0YeoCD0ZseXRlaWRsMjo6Q29yZWIGcHJvdG8z", [file_buf_validate_validate, file_google_protobuf_timestamp]);
+  fileDesc("CiBmbHl0ZWlkbDIvY29yZS9hcnRpZmFjdF9pZC5wcm90bxIOZmx5dGVpZGwyLmNvcmUibgoLQXJ0aWZhY3RLZXkSGAoHcHJvamVjdBgBIAEoCUIHukgEcgIYQBIXCgZkb21haW4YAiABKAlCB7pIBHICGEASFgoEbmFtZRgDIAEoCUIIukgFcgMY/wESFAoDb3JnGAQgASgJQge6SARyAhg/IlgKEUFydGlmYWN0VmVyc2lvbklkEigKA2tleRgBIAEoCzIbLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0S2V5EhkKB3ZlcnNpb24YAiABKAlCCLpIBXIDGP8BIlUKDEFydGlmYWN0Q2FyZBIVCgN1cmkYASABKAlCCLpIBXIDGIAIEhcKBmZvcm1hdBgCIAEoCUIHukgEcgIYEBIVCgR0eXBlGAMgASgJQge6SARyAhgQItUBCgxBcnRpZmFjdEluZm8SHQoLZGVzY3JpcHRpb24YASABKAlCCLpIBXIDGP8BEkUKDXVzZXJfbWV0YWRhdGEYAiADKAsyLi5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdEluZm8uVXNlck1ldGFkYXRhRW50cnkSKgoEY2FyZBgDIAEoCzIcLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0Q2FyZBozChFVc2VyTWV0YWRhdGFFbnRyeRILCgNrZXkYASABKAkSDQoFdmFsdWUYAiABKAk6AjgBIp8BChNBcnRpZmFjdEJpbmRpbmdEYXRhEhcKDXBhcnRpdGlvbl9rZXkYBSABKAlIABIgChZiaW5kX3RvX3RpbWVfcGFydGl0aW9uGAYgASgISAASNQoOdGltZV90cmFuc2Zvcm0YByABKAsyHS5mbHl0ZWlkbDIuY29yZS5UaW1lVHJhbnNmb3JtQhAKDnBhcnRpdGlvbl9kYXRhSgQIARAFIkgKDVRpbWVUcmFuc2Zvcm0SEQoJdHJhbnNmb3JtGAEgASgJEiQKAm9wGAIgASgOMhguZmx5dGVpZGwyLmNvcmUuT3BlcmF0b3IiHwoQSW5wdXRCaW5kaW5nRGF0YRILCgN2YXIYASABKAkiEAoOUnVudGltZUJpbmRpbmcilwIKCkxhYmVsVmFsdWUSFgoMc3RhdGljX3ZhbHVlGAEgASgJSAASMAoKdGltZV92YWx1ZRgCIAEoCzIaLmdvb2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBIABJAChF0cmlnZ2VyZWRfYmluZGluZxgDIAEoCzIjLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0QmluZGluZ0RhdGFIABI5Cg1pbnB1dF9iaW5kaW5nGAQgASgLMiAuZmx5dGVpZGwyLmNvcmUuSW5wdXRCaW5kaW5nRGF0YUgAEjkKD3J1bnRpbWVfYmluZGluZxgFIAEoCzIeLmZseXRlaWRsMi5jb3JlLlJ1bnRpbWVCaW5kaW5nSABCBwoFdmFsdWUijAEKClBhcnRpdGlvbnMSNAoFdmFsdWUYASADKAsyJS5mbHl0ZWlkbDIuY29yZS5QYXJ0aXRpb25zLlZhbHVlRW50cnkaSAoKVmFsdWVFbnRyeRILCgNrZXkYASABKAkSKQoFdmFsdWUYAiABKAsyGi5mbHl0ZWlkbDIuY29yZS5MYWJlbFZhbHVlOgI4ASJsCg1UaW1lUGFydGl0aW9uEikKBXZhbHVlGAEgASgLMhouZmx5dGVpZGwyLmNvcmUuTGFiZWxWYWx1ZRIwCgtncmFudWxhcml0eRgCIAEoDjIbLmZseXRlaWRsMi5jb3JlLkdyYW51bGFyaXR5IrcBCgpBcnRpZmFjdElEEjEKDGFydGlmYWN0X2tleRgBIAEoCzIbLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0S2V5Eg8KB3ZlcnNpb24YAiABKAkSLgoKcGFydGl0aW9ucxgDIAEoCzIaLmZseXRlaWRsMi5jb3JlLlBhcnRpdGlvbnMSNQoOdGltZV9wYXJ0aXRpb24YBCABKAsyHS5mbHl0ZWlkbDIuY29yZS5UaW1lUGFydGl0aW9uImsKC0FydGlmYWN0VGFnEjEKDGFydGlmYWN0X2tleRgBIAEoCzIbLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0S2V5EikKBXZhbHVlGAIgASgLMhouZmx5dGVpZGwyLmNvcmUuTGFiZWxWYWx1ZSLMAQoNQXJ0aWZhY3RRdWVyeRIxCgthcnRpZmFjdF9pZBgBIAEoCzIaLmZseXRlaWRsMi5jb3JlLkFydGlmYWN0SURIABIzCgxhcnRpZmFjdF90YWcYAiABKAsyGy5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdFRhZ0gAEg0KA3VyaRgDIAEoCUgAEjYKB2JpbmRpbmcYBCABKAsyIy5mbHl0ZWlkbDIuY29yZS5BcnRpZmFjdEJpbmRpbmdEYXRhSABCDAoKaWRlbnRpZmllcipCCgtHcmFudWxhcml0eRIJCgVVTlNFVBAAEgoKBk1JTlVURRABEggKBEhPVVIQAhIHCgNEQVkQAxIJCgVNT05USBAEKh8KCE9wZXJhdG9yEgkKBU1JTlVTEAASCAoEUExVUxABQrQBChJjb20uZmx5dGVpZGwyLmNvcmVCD0FydGlmYWN0SWRQcm90b0gCUAFaMmdpdGh1Yi5jb20vZmx5dGVvcmcvZmx5dGUvdjIvZ2VuL2dvL2ZseXRlaWRsMi9jb3JlogIDRkNYqgIORmx5dGVpZGwyLkNvcmXKAg5GbHl0ZWlkbDJcQ29yZeICGkZseXRlaWRsMlxDb3JlXEdQQk1ldGFkYXRh6gIPRmx5dGVpZGwyOjpDb3JlYgZwcm90bzM", [file_buf_validate_validate, file_google_protobuf_timestamp]);
 
 /**
  * @generated from message flyteidl2.core.ArtifactKey
  */
 export type ArtifactKey = Message<"flyteidl2.core.ArtifactKey"> & {
   /**
-   * Project and domain and suffix needs to be unique across a given artifact store.
+   * Identifies one artifact within an artifact store: the (org, project,
+   * domain, name) tuple must be unique. Length bounds match
+   * artifact.ArtifactName; fields stay optional because an empty field means
+   * "inherit from context" in several uses (e.g.
+   * artifact.ArtifactSpec.parent_artifacts).
    *
    * @generated from field: string project = 1;
    */

package/flyteidl2/task/common_pb.ts

@@ -5,7 +5,7 @@
 import type { GenEnum, GenFile, GenMessage } from "@bufbuild/protobuf/codegenv1";
 import { enumDesc, fileDesc, messageDesc } from "@bufbuild/protobuf/codegenv1";
 import { file_buf_validate_validate } from "../../buf/validate/validate_pb.ts";
-import type { ArtifactInfo } from "../core/artifact_id_pb.ts";
+import type { ArtifactInfo, ArtifactVersionId } from "../core/artifact_id_pb.ts";
 import { file_flyteidl2_core_artifact_id } from "../core/artifact_id_pb.ts";
 import type { Parameter } from "../core/interface_pb.ts";
 import { file_flyteidl2_core_interface } from "../core/interface_pb.ts";
@@ -21,7 +21,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file flyteidl2/task/common.proto.
  */
 export const file_flyteidl2_task_common: GenFile = /*@__PURE__*/
-  fileDesc("ChtmbHl0ZWlkbDIvdGFzay9jb21tb24ucHJvdG8SDmZseXRlaWRsMi50YXNrIkwKDk5hbWVkUGFyYW1ldGVyEgwKBG5hbWUYASABKAkSLAoJcGFyYW1ldGVyGAIgASgLMhkuZmx5dGVpZGwyLmNvcmUuUGFyYW1ldGVyIooBCglGaXhlZFJhdGUSFgoFdmFsdWUYASABKA1CB7pIBCoCIAASNQoEdW5pdBgCIAEoDjIdLmZseXRlaWRsMi50YXNrLkZpeGVkUmF0ZVVuaXRCCLpIBYIBAiAAEi4KCnN0YXJ0X3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wIjUKBENyb24SGwoKZXhwcmVzc2lvbhgBIAEoCUIHukgEcgIQARIQCgh0aW1lem9uZRgCIAEoCSKvAQoIU2NoZWR1bGUSKQoEcmF0ZRgBIAEoCzIZLmZseXRlaWRsMi50YXNrLkZpeGVkUmF0ZUgAEh0KD2Nyb25fZXhwcmVzc2lvbhgCIAEoCUICGAFIABIkCgRjcm9uGAQgASgLMhQuZmx5dGVpZGwyLnRhc2suQ3JvbkgAEh4KFmtpY2tvZmZfdGltZV9pbnB1dF9hcmcYAyABKAlCEwoKZXhwcmVzc2lvbhIFukgCCAEiVQoPQXJ0aWZhY3RUcmlnZ2VyEh4KDWFydGlmYWN0X25hbWUYASABKAlCB7pIBHICEAESDwoHdmVyc2lvbhgCIAEoCRIRCglpbnB1dF9hcmcYAyABKAkiywEKFVRyaWdnZXJBdXRvbWF0aW9uU3BlYxJBCgR0eXBlGAEgASgOMikuZmx5dGVpZGwyLnRhc2suVHJpZ2dlckF1dG9tYXRpb25TcGVjVHlwZUIIukgFggECIAASLAoIc2NoZWR1bGUYAiABKAsyGC5mbHl0ZWlkbDIudGFzay5TY2hlZHVsZUgAEjMKCGFydGlmYWN0GAMgASgLMh8uZmx5dGVpZGwyLnRhc2suQXJ0aWZhY3RUcmlnZ2VySABCDAoKYXV0b21hdGlvbiJECgxOYW1lZExpdGVyYWwSDAoEbmFtZRgBIAEoCRImCgV2YWx1ZRgCIAEoCzIXLmZseXRlaWRsMi5jb3JlLkxpdGVyYWwiOgoQT3V0cHV0UmVmZXJlbmNlcxISCgpvdXRwdXRfdXJpGAEgASgJEhIKCnJlcG9ydF91cmkYAiABKAkiZwoGSW5wdXRzEi4KCGxpdGVyYWxzGAEgAygLMhwuZmx5dGVpZGwyLnRhc2suTmFtZWRMaXRlcmFsEi0KB2NvbnRleHQYAiADKAsyHC5mbHl0ZWlkbDIuY29yZS5LZXlWYWx1ZVBhaXIizAEKEFByb2R1Y2VkQXJ0aWZhY3QSFwoGb3V0cHV0GAEgASgJQge6SARyAhABEhUKBG5hbWUYAiABKAlCB7pIBHICEAESDwoHdmVyc2lvbhgDIAEoCRIqCgRpbmZvGAQgASgLMhwuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RJbmZvEikKBHR5cGUYBSABKAsyGy5mbHl0ZWlkbDIuY29yZS5MaXRlcmFsVHlwZRIgCg5wYXJlbnRfdmVyc2lvbhgGIAEoCUIIukgFcgMY/wEidwoHT3V0cHV0cxIuCghsaXRlcmFscxgBIAMoCzIcLmZseXRlaWRsMi50YXNrLk5hbWVkTGl0ZXJhbBI8ChJwcm9kdWNlZF9hcnRpZmFjdHMYAyADKAsyIC5mbHl0ZWlkbDIudGFzay5Qcm9kdWNlZEFydGlmYWN0Kn8KDUZpeGVkUmF0ZVVuaXQSHwobRklYRURfUkFURV9VTklUX1VOU1BFQ0lGSUVEEAASGgoWRklYRURfUkFURV9VTklUX01JTlVURRABEhgKFEZJWEVEX1JBVEVfVU5JVF9IT1VSEAISFwoTRklYRURfUkFURV9VTklUX0RBWRADKmYKGVRyaWdnZXJBdXRvbWF0aW9uU3BlY1R5cGUSFAoQVFlQRV9VTlNQRUNJRklFRBAAEg0KCVRZUEVfTk9ORRABEhEKDVRZUEVfU0NIRURVTEUQAhIRCg1UWVBFX0FSVElGQUNUEANCsAEKEmNvbS5mbHl0ZWlkbDIudGFza0ILQ29tbW9uUHJvdG9IAlABWjJnaXRodWIuY29tL2ZseXRlb3JnL2ZseXRlL3YyL2dlbi9nby9mbHl0ZWlkbDIvdGFza6ICA0ZUWKoCDkZseXRlaWRsMi5UYXNrygIORmx5dGVpZGwyXFRhc2viAhpGbHl0ZWlkbDJcVGFza1xHUEJNZXRhZGF0YeoCD0ZseXRlaWRsMjo6VGFza2IGcHJvdG8z", [file_buf_validate_validate, file_flyteidl2_core_artifact_id, file_flyteidl2_core_interface, file_flyteidl2_core_literals, file_flyteidl2_core_types, file_google_protobuf_timestamp]);
+  fileDesc("ChtmbHl0ZWlkbDIvdGFzay9jb21tb24ucHJvdG8SDmZseXRlaWRsMi50YXNrIkwKDk5hbWVkUGFyYW1ldGVyEgwKBG5hbWUYASABKAkSLAoJcGFyYW1ldGVyGAIgASgLMhkuZmx5dGVpZGwyLmNvcmUuUGFyYW1ldGVyIooBCglGaXhlZFJhdGUSFgoFdmFsdWUYASABKA1CB7pIBCoCIAASNQoEdW5pdBgCIAEoDjIdLmZseXRlaWRsMi50YXNrLkZpeGVkUmF0ZVVuaXRCCLpIBYIBAiAAEi4KCnN0YXJ0X3RpbWUYAyABKAsyGi5nb29nbGUucHJvdG9idWYuVGltZXN0YW1wIjUKBENyb24SGwoKZXhwcmVzc2lvbhgBIAEoCUIHukgEcgIQARIQCgh0aW1lem9uZRgCIAEoCSKvAQoIU2NoZWR1bGUSKQoEcmF0ZRgBIAEoCzIZLmZseXRlaWRsMi50YXNrLkZpeGVkUmF0ZUgAEh0KD2Nyb25fZXhwcmVzc2lvbhgCIAEoCUICGAFIABIkCgRjcm9uGAQgASgLMhQuZmx5dGVpZGwyLnRhc2suQ3JvbkgAEh4KFmtpY2tvZmZfdGltZV9pbnB1dF9hcmcYAyABKAlCEwoKZXhwcmVzc2lvbhIFukgCCAEiVQoPQXJ0aWZhY3RUcmlnZ2VyEh4KDWFydGlmYWN0X25hbWUYASABKAlCB7pIBHICEAESDwoHdmVyc2lvbhgCIAEoCRIRCglpbnB1dF9hcmcYAyABKAkiywEKFVRyaWdnZXJBdXRvbWF0aW9uU3BlYxJBCgR0eXBlGAEgASgOMikuZmx5dGVpZGwyLnRhc2suVHJpZ2dlckF1dG9tYXRpb25TcGVjVHlwZUIIukgFggECIAASLAoIc2NoZWR1bGUYAiABKAsyGC5mbHl0ZWlkbDIudGFzay5TY2hlZHVsZUgAEjMKCGFydGlmYWN0GAMgASgLMh8uZmx5dGVpZGwyLnRhc2suQXJ0aWZhY3RUcmlnZ2VySABCDAoKYXV0b21hdGlvbiJECgxOYW1lZExpdGVyYWwSDAoEbmFtZRgBIAEoCRImCgV2YWx1ZRgCIAEoCzIXLmZseXRlaWRsMi5jb3JlLkxpdGVyYWwiOgoQT3V0cHV0UmVmZXJlbmNlcxISCgpvdXRwdXRfdXJpGAEgASgJEhIKCnJlcG9ydF91cmkYAiABKAkiZwoGSW5wdXRzEi4KCGxpdGVyYWxzGAEgAygLMhwuZmx5dGVpZGwyLnRhc2suTmFtZWRMaXRlcmFsEi0KB2NvbnRleHQYAiADKAsyHC5mbHl0ZWlkbDIuY29yZS5LZXlWYWx1ZVBhaXIi8QEKEFByb2R1Y2VkQXJ0aWZhY3QSFwoGb3V0cHV0GAEgASgJQge6SARyAhABEhUKBG5hbWUYAiABKAlCB7pIBHICEAESDwoHdmVyc2lvbhgDIAEoCRIqCgRpbmZvGAQgASgLMhwuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RJbmZvEikKBHR5cGUYBSABKAsyGy5mbHl0ZWlkbDIuY29yZS5MaXRlcmFsVHlwZRJFChBwYXJlbnRfYXJ0aWZhY3RzGAYgAygLMiEuZmx5dGVpZGwyLmNvcmUuQXJ0aWZhY3RWZXJzaW9uSWRCCLpIBZIBAhAgIncKB091dHB1dHMSLgoIbGl0ZXJhbHMYASADKAsyHC5mbHl0ZWlkbDIudGFzay5OYW1lZExpdGVyYWwSPAoScHJvZHVjZWRfYXJ0aWZhY3RzGAMgAygLMiAuZmx5dGVpZGwyLnRhc2suUHJvZHVjZWRBcnRpZmFjdCp/Cg1GaXhlZFJhdGVVbml0Eh8KG0ZJWEVEX1JBVEVfVU5JVF9VTlNQRUNJRklFRBAAEhoKFkZJWEVEX1JBVEVfVU5JVF9NSU5VVEUQARIYChRGSVhFRF9SQVRFX1VOSVRfSE9VUhACEhcKE0ZJWEVEX1JBVEVfVU5JVF9EQVkQAypmChlUcmlnZ2VyQXV0b21hdGlvblNwZWNUeXBlEhQKEFRZUEVfVU5TUEVDSUZJRUQQABINCglUWVBFX05PTkUQARIRCg1UWVBFX1NDSEVEVUxFEAISEQoNVFlQRV9BUlRJRkFDVBADQrABChJjb20uZmx5dGVpZGwyLnRhc2tCC0NvbW1vblByb3RvSAJQAVoyZ2l0aHViLmNvbS9mbHl0ZW9yZy9mbHl0ZS92Mi9nZW4vZ28vZmx5dGVpZGwyL3Rhc2uiAgNGVFiqAg5GbHl0ZWlkbDIuVGFza8oCDkZseXRlaWRsMlxUYXNr4gIaRmx5dGVpZGwyXFRhc2tcR1BCTWV0YWRhdGHqAg9GbHl0ZWlkbDI6OlRhc2tiBnByb3RvMw", [file_buf_validate_validate, file_flyteidl2_core_artifact_id, file_flyteidl2_core_interface, file_flyteidl2_core_literals, file_flyteidl2_core_types, file_google_protobuf_timestamp]);
 
 /**
  * @generated from message flyteidl2.task.NamedParameter
@@ -359,14 +359,20 @@ export type ProducedArtifact = Message<"flyteidl2.task.ProducedArtifact"> & {
   type?: LiteralType;
 
   /**
-   * Optional version of this same artifact name that the produced version was
-   * derived from, copied verbatim into ArtifactSpec.parent_version. Set by the
-   * producing task when it derives a new version from one it consumed, so the
-   * resulting lineage branches instead of reading as a linear chain.
+   * Optional artifact versions the produced version was derived from, copied
+   * verbatim into ArtifactSpec.parent_artifacts. Set by the producing task
+   * when it derives a new version from versions it consumed; one entry is
+   * plain derivation, several record a merge, so the resulting lineage forms
+   * a DAG instead of reading as a linear chain. Order is preserved: the first
+   * entry is the primary parent. Empty key fields inherit the produced
+   * artifact's own scope and name, so a bare {version: "v1"} declares the
+   * previous version of this same artifact as a parent; a set name records
+   * cross-artifact derivation. Only the name may differ: non-empty scope
+   * fields (org/project/domain) must match the produced artifact's own scope.
    *
-   * @generated from field: string parent_version = 6;
+   * @generated from field: repeated flyteidl2.core.ArtifactVersionId parent_artifacts = 6;
    */
-  parentVersion: string;
+  parentArtifacts: ArtifactVersionId[];
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flyteorg/flyteidl2",
-  "version":  "2.0.46",
+  "version":  "2.0.48",
   "description": "Compiled protocol buffers and gRPC service and connect clients/servers for Flyte IDLs",
   "repository": {
     "type": "git",