lerna 2.1.0__tar.gz → 2.2.0__tar.gz

{lerna-2.1.0 → lerna-2.2.0}/.gitignore

@@ -160,5 +160,7 @@ emsdk
 # AI
 ROADMAP.md
 AGENTS.md
+CHANGES.md
+/hydra/
 .github/hooks/sdlc.json
 .superpowers

{lerna-2.1.0 → lerna-2.2.0}/Cargo.lock

@@ -10,9 +10,9 @@ checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600"
 
 [[package]]
 name = "getrandom"
@@ -59,7 +59,7 @@ dependencies = [
 
 [[package]]
 name = "lerna"
-version = "2.1.0"
+version = "2.2.0"
 dependencies = [
  "rand",
  "serde",
@@ -68,7 +68,7 @@ dependencies = [
 
 [[package]]
 name = "lerna_py"
-version = "2.1.0"
+version = "2.2.0"
 dependencies = [
  "lerna",
  "pyo3",
@@ -256,7 +256,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 3.0.4",
+ "syn 3.0.6",
 ]
 
 [[package]]
@@ -284,9 +284,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6275cddf4610d1775e6d1fe9469b2e77d0f39fd98fb7450901b821e0c53649f"
+checksum = "8593e8e72159ed2257d083c7a454a85cbf854f37a0966d8d483aff8c8a3ebcee"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -301,9 +301,9 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
+checksum = "d245f478577f809a851594d02313b640fb437e0bb33866753cff937863096954"
 
 [[package]]
 name = "wasip2"
@@ -331,18 +331,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.56"
+version = "0.8.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556764e583adb45a9f8d413c2a147fa7e8d821e48e12b14fd560b607998b75eb"
+checksum = "d35102a9f36d089ccae9e4c6802bc118be4487b80aaffc0ab4e0cf5ce92d2873"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.56"
+version = "0.8.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2ab42fc20575779bd240faa45f94a74256f755c0fa9e89f0ede20d91d0cdfc1"
+checksum = "146c01f5ab44258da43cf276c74a2763db2ff3969c9c652c3f2de07041d0b2bc"
 dependencies = [
  "proc-macro2",
  "quote",

{lerna-2.1.0 → lerna-2.2.0}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lerna_py"
-version = "2.1.0"
+version = "2.2.0"
 edition = "2021"
 publish = false
 
@@ -11,7 +11,7 @@ crate-type = ["cdylib"]
 
 [dependencies]
 lerna = { path = "./rust", version = "*" }
-pyo3 = { version = "0.29.0", features = ["abi3", "extension-module", "multiple-pymethods"] }
+pyo3 = { version = "0.29.2", features = ["abi3", "extension-module", "multiple-pymethods"] }
 
 [profile.release]
 panic = 'abort'

{lerna-2.1.0 → lerna-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lerna
-Version: 2.1.0
+Version: 2.2.0
 Summary: Lerna is a framework for elegantly configuring complex applications
 Project-URL: Repository, https://github.com/1kbgz/lerna
 Project-URL: Homepage, https://github.com/1kbgz/lerna
@@ -19,8 +19,7 @@ Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: Rust
 Requires-Python: >=3.10
-Requires-Dist: omegaconf<2.4,>=2.2.3
-Requires-Dist: packaging
+Requires-Dist: omegaconf<3,>=2.2.3
 Provides-Extra: develop
 Requires-Dist: build; extra == 'develop'
 Requires-Dist: bump-my-version; extra == 'develop'
@@ -32,6 +31,7 @@ Requires-Dist: hatchling; extra == 'develop'
 Requires-Dist: hydra-core; extra == 'develop'
 Requires-Dist: mdformat; extra == 'develop'
 Requires-Dist: mdformat-tables>=1; extra == 'develop'
+Requires-Dist: packaging; extra == 'develop'
 Requires-Dist: pytest; extra == 'develop'
 Requires-Dist: pytest-cov; extra == 'develop'
 Requires-Dist: ruff; extra == 'develop'
@@ -163,25 +163,37 @@ python app.py 'tags=prepend(first)'
 # Insert at specific index
 python app.py 'tags=insert(0,first_item)'
 
+# Extend from another config list
+python app.py 'tags=extend(${defaults.tags})'
+
 # Remove by index
-python app.py 'tags=remove_at(0)'      # Remove first
-python app.py 'tags=remove_at(-1)'     # Remove last
+python app.py 'tags=pop(0)'      # Remove first
+python app.py 'tags=pop(-1)'     # Remove last
 
 # Remove by value
-python app.py 'tags=remove_value(old_tag)'
+python app.py 'tags=remove(old_tag)'
+
+# Delete a slice (equivalent to del tags[1:3])
+python app.py 'tags=delete_slice(1,3)'
 
 # Clear entire list
-python app.py 'tags=list_clear()'
+python app.py 'tags=clear()'
 ```
 
-| Function            | Description            | Example Result         |
-| ------------------- | ---------------------- | ---------------------- |
-| `append(...)`       | Add items to end       | `[a, b]` → `[a, b, c]` |
-| `prepend(...)`      | Add items to beginning | `[b, c]` → `[a, b, c]` |
-| `insert(idx, val)`  | Insert at index        | `[a, c]` → `[a, b, c]` |
-| `remove_at(idx)`    | Remove by index        | `[a, b, c]` → `[b, c]` |
-| `remove_value(val)` | Remove first match     | `[a, b, c]` → `[a, c]` |
-| `list_clear()`      | Clear all items        | `[a, b, c]` → `[]`     |
+| Function                     | Description                             | Example result         |
+| ---------------------------- | --------------------------------------- | ---------------------- |
+| `append(value)`              | Add value to end                        | `[a, b]` → `[a, b, c]` |
+| `extend(${path})`            | Add items from another config list      | `[a]` → `[a, b, c]`    |
+| `insert(index, value)`       | Insert value at index                   | `[a, c]` → `[a, b, c]` |
+| `pop(index)`                 | Remove item at index                    | `[a, b, c]` → `[b, c]` |
+| `remove(value)`              | Remove first matching value             | `[a, b, c]` → `[a, c]` |
+| `clear()`                    | Remove all items                        | `[a, b, c]` → `[]`     |
+| `prepend(...)`               | Add values to beginning                 | `[b, c]` → `[a, b, c]` |
+| `append_unique(...)`         | Append values not already present       | `[a, b]` → `[a, b, c]` |
+| `remove_all(...)`            | Remove every match                      | `[a, b, a]` → `[b]`    |
+| `delete_slice(start, stop?)` | Delete a range using Python slice rules | `[a, b, c]` → `[a]`    |
+
+`remove_at`, `remove_value`, `list_clear`, and `extend_from` remain available as compatibility aliases for `pop`, `remove`, `clear`, and `extend`, respectively.
 
 These functions use shell-safe syntax (quote the entire override) and work on bash, zsh, fish, PowerShell, and cmd.
 
@@ -266,8 +278,8 @@ defaults:
   - _patch_:
     - ~unwanted_key                # delete a key
     - ~status=deprecated           # delete key only if value matches
-    - items=remove_value(stale)    # remove a list item by value
-    - items=remove_at(0)           # remove a list item by index
+    - items=remove(stale)          # remove a list item by value
+    - items=pop(0)                 # remove a list item by index
     - +new_key=injected            # add a new key
     - setting=new_value            # change a value
 ```
@@ -283,21 +295,47 @@ defaults:
 
 For root-level configs (no `@` package), bare keys and `_here_` are equivalent since the parent package is empty.
 
-**Supported operations** (uses lerna's full override syntax):
-
-| Operation            | Syntax                | Description                              |
-| -------------------- | --------------------- | ---------------------------------------- |
-| Delete key           | `~key`                | Remove key from config                   |
-| Conditional delete   | `~key=value`          | Remove key only if current value matches |
-| Change value         | `key=value`           | Set key to new value                     |
-| Add key              | `+key=value`          | Add new key (error if exists)            |
-| Force-add key        | `++key=value`         | Set key (create if missing)              |
-| List append          | `key=append(v)`       | Add item to end of list                  |
-| List prepend         | `key=prepend(v)`      | Add item to start of list                |
-| List insert          | `key=insert(i,v)`     | Insert item at index                     |
-| List remove by index | `key=remove_at(i)`    | Remove item at index                     |
-| List remove by value | `key=remove_value(v)` | Remove first matching item               |
-| List clear           | `key=list_clear()`    | Remove all list items                    |
+Patch entries accept the existing override string syntax or a structured mapping. Both forms execute in sequence and use the same package-scoping rules.
+
+| Operation            | String entry                  | Structured entry                                    |
+| -------------------- | ----------------------------- | --------------------------------------------------- |
+| Change value         | `key=value`                   | `{op: change, path: key, value: value}`             |
+| Add key              | `+key=value`                  | `{op: add, path: key, value: value}`                |
+| Force-add key        | `++key=value`                 | `{op: force_add, path: key, value: value}`          |
+| Delete key           | `~key`                        | `{op: delete, path: key}`                           |
+| Conditional delete   | `~key=value`                  | `{op: delete, path: key, value: value}`             |
+| List append          | `key=append(a,b)`             | `{op: append, path: key, values: [a, b]}`           |
+| List extend          | `key=extend(${source.items})` | `{op: extend, path: key, value: "${source.items}"}` |
+| List prepend         | `key=prepend(a,b)`            | `{op: prepend, path: key, values: [a, b]}`          |
+| List insert          | `key=insert(1,a,b)`           | `{op: insert, path: key, index: 1, values: [a, b]}` |
+| Remove first match   | `key=remove(a)`               | `{op: remove, path: key, value: a}`                 |
+| Remove by index      | `key=pop(1)`                  | `{op: pop, path: key, index: 1}`                    |
+| Clear list           | `key=clear()`                 | `{op: clear, path: key}`                            |
+| Append unique values | `key=append_unique(a,b)`      | `{op: append_unique, path: key, values: [a, b]}`    |
+| Remove all matches   | `key=remove_all(a,b)`         | `{op: remove_all, path: key, values: [a, b]}`       |
+| Delete slice         | `key=delete_slice(1,3)`       | `{op: delete_slice, path: key, start: 1, stop: 3}`  |
+
+In `delete_slice(start, stop?)`, omitting `stop` deletes from `start` through the end. Negative and out-of-range indexes follow Python slice behavior.
+
+Structured `value` and `values` fields preserve YAML mappings, lists, booleans, nulls, and interpolations without serializing them through the override grammar. A mapping or list in `values` is one item. `extend()` is the operation that splices the selected source list into the destination; nested lists inside the source remain nested.
+
+```yaml
+defaults:
+  - _patch_@gateway:
+    - op: append
+      path: modules
+      values:
+        - /modules/rest
+        - /modules/outputs
+    - op: change
+      path: settings
+      value:
+        enabled: true
+        retries: 3
+        label: null
+```
+
+`append_unique()` resolves values for structural comparison but preserves the unresolved value when it appends it. Existing duplicates remain. `remove_all()` removes every occurrence of each argument. `extend()` snapshots its source before copying, so extending a list from itself is well-defined.
 
 **Example with packaged config:**
 
@@ -308,7 +346,7 @@ defaults:
   - _self_
   - _patch_@vendor:
     - ~debug_mode           # bare key → targets vendor.debug_mode
-    - items=remove_value(x) # bare key → targets vendor.items
+    - items=remove(x)       # bare key → targets vendor.items
 
 # Multiple scoped patches can target different packages:
 # - _patch_@db:
@@ -319,6 +357,27 @@ defaults:
 
 **Nested patches:** `_patch_` directives in sub-configs accumulate naturally. If `lib/refined.yaml` has its own `_patch_` that removes `beta`, and your root config adds `_patch_@lib:` to remove `gamma`, both patches apply — `beta` and `gamma` are both removed from the final config.
 
+#### Composition provenance
+
+`compose_with_provenance()` returns a `CompositionResult` containing the unresolved composed config and its composition metadata. Consumers such as [csp-gateway](https://github.com/Point72/csp-gateway) and [ccflow](https://github.com/Point72/ccflow) can build configuration explanations without importing from `lerna._internal`, patching YAML loaders, or disabling Rust YAML parsing.
+
+```python
+from lerna import compose_with_provenance, initialize_config_dir
+
+with initialize_config_dir(config_dir="conf"):
+  result = compose_with_provenance("config", overrides=["gateway.modules=append(metrics)"])
+
+print(result.config)                         # unresolved DictConfig
+print(result.resolved_copy())                # independently resolved copy
+print(result.selected_defaults)              # composition order and sources
+print(result.available_options["gateway"])  # options seen for the group
+print(result.provenance("gateway.modules[0]"))
+print(result.patch_operations)               # config-authored operations
+print(result.cli_overrides)                  # command-line operations
+```
+
+Node provenance includes the source identifier, source config, package, source key, origin, and operation index. List-item provenance follows surviving items as list operations move their indexes. Patch history retains removed items and their provenance.
+
 #### Relative Path in Defaults Fix ([#2878](https://github.com/facebookresearch/hydra/issues/2878))
 
 Hydra produces empty string keys when using `..` in defaults list paths:

{lerna-2.1.0 → lerna-2.2.0}/README.md

@@ -120,25 +120,37 @@ python app.py 'tags=prepend(first)'
 # Insert at specific index
 python app.py 'tags=insert(0,first_item)'
 
+# Extend from another config list
+python app.py 'tags=extend(${defaults.tags})'
+
 # Remove by index
-python app.py 'tags=remove_at(0)'      # Remove first
-python app.py 'tags=remove_at(-1)'     # Remove last
+python app.py 'tags=pop(0)'      # Remove first
+python app.py 'tags=pop(-1)'     # Remove last
 
 # Remove by value
-python app.py 'tags=remove_value(old_tag)'
+python app.py 'tags=remove(old_tag)'
+
+# Delete a slice (equivalent to del tags[1:3])
+python app.py 'tags=delete_slice(1,3)'
 
 # Clear entire list
-python app.py 'tags=list_clear()'
+python app.py 'tags=clear()'
 ```
 
-| Function            | Description            | Example Result         |
-| ------------------- | ---------------------- | ---------------------- |
-| `append(...)`       | Add items to end       | `[a, b]` → `[a, b, c]` |
-| `prepend(...)`      | Add items to beginning | `[b, c]` → `[a, b, c]` |
-| `insert(idx, val)`  | Insert at index        | `[a, c]` → `[a, b, c]` |
-| `remove_at(idx)`    | Remove by index        | `[a, b, c]` → `[b, c]` |
-| `remove_value(val)` | Remove first match     | `[a, b, c]` → `[a, c]` |
-| `list_clear()`      | Clear all items        | `[a, b, c]` → `[]`     |
+| Function                     | Description                             | Example result         |
+| ---------------------------- | --------------------------------------- | ---------------------- |
+| `append(value)`              | Add value to end                        | `[a, b]` → `[a, b, c]` |
+| `extend(${path})`            | Add items from another config list      | `[a]` → `[a, b, c]`    |
+| `insert(index, value)`       | Insert value at index                   | `[a, c]` → `[a, b, c]` |
+| `pop(index)`                 | Remove item at index                    | `[a, b, c]` → `[b, c]` |
+| `remove(value)`              | Remove first matching value             | `[a, b, c]` → `[a, c]` |
+| `clear()`                    | Remove all items                        | `[a, b, c]` → `[]`     |
+| `prepend(...)`               | Add values to beginning                 | `[b, c]` → `[a, b, c]` |
+| `append_unique(...)`         | Append values not already present       | `[a, b]` → `[a, b, c]` |
+| `remove_all(...)`            | Remove every match                      | `[a, b, a]` → `[b]`    |
+| `delete_slice(start, stop?)` | Delete a range using Python slice rules | `[a, b, c]` → `[a]`    |
+
+`remove_at`, `remove_value`, `list_clear`, and `extend_from` remain available as compatibility aliases for `pop`, `remove`, `clear`, and `extend`, respectively.
 
 These functions use shell-safe syntax (quote the entire override) and work on bash, zsh, fish, PowerShell, and cmd.
 
@@ -223,8 +235,8 @@ defaults:
   - _patch_:
     - ~unwanted_key                # delete a key
     - ~status=deprecated           # delete key only if value matches
-    - items=remove_value(stale)    # remove a list item by value
-    - items=remove_at(0)           # remove a list item by index
+    - items=remove(stale)          # remove a list item by value
+    - items=pop(0)                 # remove a list item by index
     - +new_key=injected            # add a new key
     - setting=new_value            # change a value
 ```
@@ -240,21 +252,47 @@ defaults:
 
 For root-level configs (no `@` package), bare keys and `_here_` are equivalent since the parent package is empty.
 
-**Supported operations** (uses lerna's full override syntax):
-
-| Operation            | Syntax                | Description                              |
-| -------------------- | --------------------- | ---------------------------------------- |
-| Delete key           | `~key`                | Remove key from config                   |
-| Conditional delete   | `~key=value`          | Remove key only if current value matches |
-| Change value         | `key=value`           | Set key to new value                     |
-| Add key              | `+key=value`          | Add new key (error if exists)            |
-| Force-add key        | `++key=value`         | Set key (create if missing)              |
-| List append          | `key=append(v)`       | Add item to end of list                  |
-| List prepend         | `key=prepend(v)`      | Add item to start of list                |
-| List insert          | `key=insert(i,v)`     | Insert item at index                     |
-| List remove by index | `key=remove_at(i)`    | Remove item at index                     |
-| List remove by value | `key=remove_value(v)` | Remove first matching item               |
-| List clear           | `key=list_clear()`    | Remove all list items                    |
+Patch entries accept the existing override string syntax or a structured mapping. Both forms execute in sequence and use the same package-scoping rules.
+
+| Operation            | String entry                  | Structured entry                                    |
+| -------------------- | ----------------------------- | --------------------------------------------------- |
+| Change value         | `key=value`                   | `{op: change, path: key, value: value}`             |
+| Add key              | `+key=value`                  | `{op: add, path: key, value: value}`                |
+| Force-add key        | `++key=value`                 | `{op: force_add, path: key, value: value}`          |
+| Delete key           | `~key`                        | `{op: delete, path: key}`                           |
+| Conditional delete   | `~key=value`                  | `{op: delete, path: key, value: value}`             |
+| List append          | `key=append(a,b)`             | `{op: append, path: key, values: [a, b]}`           |
+| List extend          | `key=extend(${source.items})` | `{op: extend, path: key, value: "${source.items}"}` |
+| List prepend         | `key=prepend(a,b)`            | `{op: prepend, path: key, values: [a, b]}`          |
+| List insert          | `key=insert(1,a,b)`           | `{op: insert, path: key, index: 1, values: [a, b]}` |
+| Remove first match   | `key=remove(a)`               | `{op: remove, path: key, value: a}`                 |
+| Remove by index      | `key=pop(1)`                  | `{op: pop, path: key, index: 1}`                    |
+| Clear list           | `key=clear()`                 | `{op: clear, path: key}`                            |
+| Append unique values | `key=append_unique(a,b)`      | `{op: append_unique, path: key, values: [a, b]}`    |
+| Remove all matches   | `key=remove_all(a,b)`         | `{op: remove_all, path: key, values: [a, b]}`       |
+| Delete slice         | `key=delete_slice(1,3)`       | `{op: delete_slice, path: key, start: 1, stop: 3}`  |
+
+In `delete_slice(start, stop?)`, omitting `stop` deletes from `start` through the end. Negative and out-of-range indexes follow Python slice behavior.
+
+Structured `value` and `values` fields preserve YAML mappings, lists, booleans, nulls, and interpolations without serializing them through the override grammar. A mapping or list in `values` is one item. `extend()` is the operation that splices the selected source list into the destination; nested lists inside the source remain nested.
+
+```yaml
+defaults:
+  - _patch_@gateway:
+    - op: append
+      path: modules
+      values:
+        - /modules/rest
+        - /modules/outputs
+    - op: change
+      path: settings
+      value:
+        enabled: true
+        retries: 3
+        label: null
+```
+
+`append_unique()` resolves values for structural comparison but preserves the unresolved value when it appends it. Existing duplicates remain. `remove_all()` removes every occurrence of each argument. `extend()` snapshots its source before copying, so extending a list from itself is well-defined.
 
 **Example with packaged config:**
 
@@ -265,7 +303,7 @@ defaults:
   - _self_
   - _patch_@vendor:
     - ~debug_mode           # bare key → targets vendor.debug_mode
-    - items=remove_value(x) # bare key → targets vendor.items
+    - items=remove(x)       # bare key → targets vendor.items
 
 # Multiple scoped patches can target different packages:
 # - _patch_@db:
@@ -276,6 +314,27 @@ defaults:
 
 **Nested patches:** `_patch_` directives in sub-configs accumulate naturally. If `lib/refined.yaml` has its own `_patch_` that removes `beta`, and your root config adds `_patch_@lib:` to remove `gamma`, both patches apply — `beta` and `gamma` are both removed from the final config.
 
+#### Composition provenance
+
+`compose_with_provenance()` returns a `CompositionResult` containing the unresolved composed config and its composition metadata. Consumers such as [csp-gateway](https://github.com/Point72/csp-gateway) and [ccflow](https://github.com/Point72/ccflow) can build configuration explanations without importing from `lerna._internal`, patching YAML loaders, or disabling Rust YAML parsing.
+
+```python
+from lerna import compose_with_provenance, initialize_config_dir
+
+with initialize_config_dir(config_dir="conf"):
+  result = compose_with_provenance("config", overrides=["gateway.modules=append(metrics)"])
+
+print(result.config)                         # unresolved DictConfig
+print(result.resolved_copy())                # independently resolved copy
+print(result.selected_defaults)              # composition order and sources
+print(result.available_options["gateway"])  # options seen for the group
+print(result.provenance("gateway.modules[0]"))
+print(result.patch_operations)               # config-authored operations
+print(result.cli_overrides)                  # command-line operations
+```
+
+Node provenance includes the source identifier, source config, package, source key, origin, and operation index. List-item provenance follows surviving items as list operations move their indexes. Patch history retains removed items and their provenance.
+
 #### Relative Path in Defaults Fix ([#2878](https://github.com/facebookresearch/hydra/issues/2878))
 
 Hydra produces empty string keys when using `..` in defaults list paths:

{lerna-2.1.0 → lerna-2.2.0}/lerna/__init__.py

@@ -1,7 +1,7 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
 
 # Source of truth for Lerna's version (Hydra-compatible API)
-__version__ = "2.1.0"
+__version__ = "2.2.0"
 
 # Callback support from Rust
 from lerna import lerna as _rust, utils
@@ -9,8 +9,16 @@ from lerna.errors import MissingConfigException
 from lerna.main import main
 from lerna.types import TaskFunction
 
-from .compose import compose
+from .compose import compose, compose_with_provenance
 from .initialize import initialize, initialize_config_dir, initialize_config_module
+from .provenance import (
+    CompositionOperation,
+    CompositionResult,
+    CompositionSource,
+    NodeProvenance,
+    RemovedItem,
+    SelectedDefault,
+)
 
 CallbackManager = _rust.CallbackManager
 JobReturn = _rust.JobReturn
@@ -30,18 +38,25 @@ SweeperManager = _rust.SweeperManager
 
 __all__ = [
     "CallbackManager",
+    "CompositionOperation",
+    "CompositionResult",
+    "CompositionSource",
     "ConfigResult",
     "ConfigSourceManager",
     "JobReturn",
     "LauncherManager",
     "MissingConfigException",
+    "NodeProvenance",
+    "RemovedItem",
     "RustBasicLauncher",
     "RustBasicSweeper",
     "RustFileConfigSource",
+    "SelectedDefault",
     "SweeperManager",
     "TaskFunction",
     "__version__",
     "compose",
+    "compose_with_provenance",
     "initialize",
     "initialize_config_dir",
     "initialize_config_module",