From 33a289046cb7f3be064a8d7e5957ba73b46d5c61 Mon Sep 17 00:00:00 2001
From: Nick Gerace <nick@systeminit.com>
Date: Thu, 18 Jul 2024 16:22:31 -0400
Subject: [PATCH 1/2] Respect schema-to-asset relationship when contributing
 assets

This commit contains various changes related to respecting the
one-to-one, schema-to-asset relationship that's presently in place.
Normally, this commit description would be more detailed, but here is a
rundown of the changes:

- Move module-related information in "app/web" to its own file in
  "api/sdf/dal/module.ts" (this is reflected in the frontend types
  crate)
- Move module syncing to the module store
- Convert ModuleExportModal to AssetContributeModal (the user domain
  language now understands _assets_ to be upgradeable, installable and
  contribute-able)
- Ensure AssetContributeModal only operates on what is passed down to
  it (avoids unnecessary computation since AssetListPanel is going to
  figure out what assets have "canContribute" set to "true" anyway)
- Reduce new contribution modal functionality to not have the ability to
  add or remove assets (I'm iffy on this one, but the "automatic")
  nature of preparing the request and the 1:1 nature of
  schemas-to-assets nudges me towards contracting and reducing failure
  modes in the interim... I'd add this with more time)
- Replace "module/export_module" with "v2/module/contribute" (we should
  consider a longer-term vision here domain wise... maybe this is all
  part of the asset concept and sdf should speak in assets?)
- Use 207 MULTI STATUS error for partial module contribution success
  when the dal is not at fault (e.g. 2 of 5 succeeded and the failures
  were only at the upload step)
- Use 502 BAD GATEWAY for total module contribution failure, but the dal
  was not at fault (e.g. 0 of 5 succeeded, but only at the upload step)
- Use 400 BAD REQUEST for malformed module contribution inpit
- Undo accidental buck2 support sync deps script commented out code
  on main
- Loosen "canContribute" constraints

Signed-off-by: Nick Gerace <nick@systeminit.com>
---
 app/web/src/api/sdf/dal/module.ts             |  25 +++
 app/web/src/api/sdf/dal/schema.ts             |  13 --
 app/web/src/components/AssetCard.vue          |  50 ++++-
 .../src/components/AssetContributeModal.vue   | 114 ++++++++++
 app/web/src/components/AssetListItem.vue      |   5 +-
 app/web/src/components/AssetListPanel.vue     |  89 ++++----
 app/web/src/components/CustomizeTabs.vue      |   5 +-
 app/web/src/components/InstallAsset.vue       |   2 +-
 app/web/src/components/InstallAssetsPanel.vue |  20 +-
 .../Workspace/WorkspaceCustomizeAssets.vue    |   4 +-
 .../components/modules/ModuleExportModal.vue  | 205 ------------------
 app/web/src/store/asset.store.ts              | 108 ++++-----
 app/web/src/store/module.store.ts             |  60 +++--
 app/web/src/store/workspaces.store.ts         |   2 +-
 lib/dal/src/module.rs                         |  77 ++++++-
 lib/dal/src/pkg/export.rs                     |  55 +++--
 lib/dal/src/schema/variant.rs                 |  22 +-
 lib/dal/tests/integration_test/module.rs      |  36 ++-
 lib/sdf-server/src/server/service/module.rs   |   4 +-
 .../server/service/module/export_module.rs    | 139 ------------
 .../src/server/service/v2/module.rs           |  27 ++-
 .../server/service/v2/module/contribute.rs    |  96 ++++++++
 lib/si-frontend-types-rs/src/lib.rs           |   6 +-
 .../src/{synced_modules.rs => module.rs}      |  16 +-
 .../src/schema_variant.rs                     |   2 -
 support/buck2/buck2-sync-cargo-deps.py        |  21 +-
 26 files changed, 633 insertions(+), 570 deletions(-)
 create mode 100644 app/web/src/api/sdf/dal/module.ts
 create mode 100644 app/web/src/components/AssetContributeModal.vue
 delete mode 100644 app/web/src/components/modules/ModuleExportModal.vue
 delete mode 100644 lib/sdf-server/src/server/service/module/export_module.rs
 create mode 100644 lib/sdf-server/src/server/service/v2/module/contribute.rs
 rename lib/si-frontend-types-rs/src/{synced_modules.rs => module.rs} (50%)

diff --git a/app/web/src/api/sdf/dal/module.ts b/app/web/src/api/sdf/dal/module.ts
new file mode 100644
index 0000000000..db82254003
--- /dev/null
+++ b/app/web/src/api/sdf/dal/module.ts
@@ -0,0 +1,25 @@
+import { SchemaId } from "./schema";
+
+export type ModuleId = string;
+
+export interface LatestModule {
+  id: ModuleId;
+  name: string;
+  description: string;
+  ownerUserId: string;
+  ownerDisplayName: string;
+  metadata: object;
+  latestHash: string;
+  latestHashCreatedAt: IsoDateString;
+  schemaId: SchemaId;
+}
+
+export interface ModuleContributeRequest {
+  modules: ModuleContributeRequestItem[];
+}
+
+export interface ModuleContributeRequestItem {
+  name: string;
+  version: string;
+  schemaId: SchemaId;
+}
diff --git a/app/web/src/api/sdf/dal/schema.ts b/app/web/src/api/sdf/dal/schema.ts
index 31d2f96784..ccfdacb029 100644
--- a/app/web/src/api/sdf/dal/schema.ts
+++ b/app/web/src/api/sdf/dal/schema.ts
@@ -70,19 +70,6 @@ export interface SchemaVariant {
   canContribute: boolean;
 }
 
-export type ModuleId = string;
-export interface Module {
-  id: ModuleId;
-  name: string;
-  description: string;
-  ownerUserId: string;
-  ownerDisplayName: string;
-  metadata: object;
-  latestHash: string;
-  latestHashCreatedAt: IsoDateString;
-  schemaId: SchemaId;
-}
-
 export const outputSocketsAndPropsFor = (schemaVariant: SchemaVariant) => {
   const socketOptions = schemaVariant.outputSockets.map((socket) => ({
     label: `Output Socket: ${socket.name}`,
diff --git a/app/web/src/components/AssetCard.vue b/app/web/src/components/AssetCard.vue
index f9380bbd9b..d37181183e 100644
--- a/app/web/src/components/AssetCard.vue
+++ b/app/web/src/components/AssetCard.vue
@@ -32,11 +32,13 @@
           <EditingPill v-if="!asset.isLocked" :color="asset.color" />
           <IconButton
             v-if="asset.canContribute"
+            :selected="contributeAssetModalRef?.isOpen || false"
             class="hover:scale-125"
             icon="cloud-upload"
             tooltip="Contribute"
             tooltipPlacement="top"
             variant="simple"
+            @click="contributeAsset"
           />
 
           <IconButton
@@ -95,6 +97,26 @@
         </template>
       </ErrorMessage>
     </div>
+    <!-- FIXME(nick): this probably needs to be moved and de-duped with logic in AssetListPanel -->
+    <AssetContributeModal
+      ref="contributeAssetModalRef"
+      :contributeRequest="contributeRequest"
+      @contribute-success="onContributeAsset"
+    />
+    <Modal
+      ref="contributeAssetSuccessModalRef"
+      size="sm"
+      title="Contribution sent"
+    >
+      <p>
+        Thanks for contributing! We will review your contribution, and reach out
+        via email or on our
+        <a class="text-action-500" href="https://discord.com/invite/system-init"
+          >Discord Server</a
+        >
+        if you have any questions.
+      </p>
+    </Modal>
   </div>
 </template>
 
@@ -110,6 +132,10 @@ import { getAssetIcon } from "@/store/components.store";
 import { useModuleStore } from "@/store/module.store";
 import IconButton from "./IconButton.vue";
 import EditingPill from "./EditingPill.vue";
+import AssetContributeModal from "./AssetContributeModal.vue";
+import { Modal } from "@si/vue-lib/design-system";
+import { ModuleContributeRequest } from "@/api/sdf/dal/module";
+import { format as dateFormat, parseISO } from "date-fns";
 
 const props = defineProps({
   titleCard: { type: Boolean },
@@ -121,6 +147,26 @@ const moduleStore = useModuleStore();
 const router = useRouter();
 const { theme } = useTheme();
 
+const contributeAssetModalRef =
+  ref<InstanceType<typeof AssetContributeModal>>();
+const contributeAssetSuccessModalRef = ref<InstanceType<typeof Modal>>();
+
+const contributeAsset = () => contributeAssetModalRef.value?.open();
+const onContributeAsset = () => contributeAssetSuccessModalRef.value?.open();
+
+const contributeRequest = computed((): ModuleContributeRequest => {
+  const modules = [];
+  if (asset.value) {
+    const version = dateFormat(Date.now(), "yyyyMMddkkmmss");
+    modules.push({
+      name: `${asset.value.schemaName} ${version}`,
+      version,
+      schemaId: asset.value.schemaId,
+    });
+  }
+  return { modules };
+});
+
 const editingVersionDoesNotExist = computed<boolean>(
   () =>
     assetStore.unlockedVariantIdForId[asset.value?.schemaVariantId ?? ""] ===
@@ -139,7 +185,7 @@ const asset = computed(
 );
 
 const canUpdate = computed(
-  () => !!assetStore.upgradeableModules[props.assetId],
+  () => !!moduleStore.upgradeableModules[props.assetId],
 );
 
 const updateAsset = () => {
@@ -148,7 +194,7 @@ const updateAsset = () => {
     throw new Error("cannot update asset: no asset selected");
   }
 
-  const module = assetStore.upgradeableModules[schemaVariantId];
+  const module = moduleStore.upgradeableModules[schemaVariantId];
   if (!module) {
     throw new Error("cannot update asset: no upgradeable module for asset");
   }
diff --git a/app/web/src/components/AssetContributeModal.vue b/app/web/src/components/AssetContributeModal.vue
new file mode 100644
index 0000000000..9340694f32
--- /dev/null
+++ b/app/web/src/components/AssetContributeModal.vue
@@ -0,0 +1,114 @@
+<template>
+  <Modal ref="modalRef" title="Contribute Assets">
+    <Stack>
+      <ul
+        v-if="enableContributeButton"
+        class="flex flex-col gap-2xs max-h-72 overflow-auto"
+      >
+        <li
+          v-for="module in props.contributeRequest.modules"
+          :key="module.schemaId"
+          class="flex px-1 items-center"
+        >
+          <span class="pr-2 select-none">•</span>
+          {{ module.name }}
+        </li>
+      </ul>
+      <ErrorMessage
+        v-if="contributeModuleReqStatus.isError"
+        :requestStatus="contributeModuleReqStatus"
+      />
+      <p>
+        Everything you contribute will receive a code review, and we will reach
+        out if we have any questions or concerns. Assuming things look good, we
+        will then include your asset in a future version of System Initiative!
+      </p>
+      <p>
+        By clicking the 'Contribute to System Initiative' button, you agree to
+        license any code submitted under the terms of the
+        <a
+          class="text-action-500"
+          href="https://www.apache.org/licenses/LICENSE-2.0"
+          >Apache License, Version 2.0</a
+        >, and that you intend for System Initiative, Inc. to distribute it.
+      </p>
+      <VButton
+        :disabled="!enableContributeButton"
+        :loadingText="_.sample(contributeLoadingTexts)"
+        :requestStatus="contributeModuleReqStatus"
+        label="Contribute to System Initiative"
+        icon="cloud-upload"
+        size="sm"
+        tone="action"
+        @click="contributeAssets"
+      />
+    </Stack>
+  </Modal>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed } from "vue";
+import {
+  Modal,
+  VButton,
+  VormInput,
+  useModal,
+  Stack,
+  ErrorMessage,
+} from "@si/vue-lib/design-system";
+import { format as dateFormat, parseISO } from "date-fns";
+import * as _ from "lodash-es";
+import { useModuleStore } from "@/store/module.store";
+import { ModuleContributeRequest } from "@/api/sdf/dal/module";
+
+const moduleStore = useModuleStore();
+const modalRef = ref<InstanceType<typeof Modal>>();
+const contributeModuleReqStatus = moduleStore.getRequestStatus("CONTRIBUTE");
+
+const props = defineProps<{ contributeRequest: ModuleContributeRequest }>();
+
+const emits = defineEmits(["contributeSuccess"]);
+
+const contributeLoadingTexts = [
+  "Engaging Photon Torpedos...",
+  "Reticulating Splines...",
+  "Revolutionizing DevOps...",
+  "Calibrating Hyperspace Matrix...",
+  "Syncing Neural Circuitry...",
+  "Optimizing Tachyon Weave...",
+  "Tuning Fractal Harmonics...",
+  "Reshuffling Multiverse Threads...",
+  "Harmonizing Subspace Arrays...",
+  "Modulating Cybernetic Matrices...",
+  "Configuring Exo-Geometric Arrays...",
+  "Initializing Flux Capacitors...",
+  "Balancing Subatomic Resonance...",
+  "Fine-tuning Quantum Entanglement...",
+  "Matrixing Hyperdimensional Grids...",
+  "Coalescing Esoteric Code...",
+  "Syncopating Quantum Flux...",
+  "Reformatting Reality Lattice...",
+  "Fine-tuning Temporal Flux...",
+  "Syncing Cosmic Harmonics...",
+];
+
+const { open: openModal, close } = useModal(modalRef);
+const open = () => openModal();
+
+const isOpen = computed(() => modalRef.value?.isOpen);
+
+defineExpose({ open, close, isOpen });
+
+const enableContributeButton = computed(() => {
+  return props.contributeRequest.modules.length > 0;
+});
+
+const contributeAssets = async () => {
+  const result = await moduleStore.CONTRIBUTE(props.contributeRequest);
+  if (result.result.success) {
+    emits("contributeSuccess");
+    close();
+    await moduleStore.LOAD_LOCAL_MODULES();
+  }
+};
+</script>
diff --git a/app/web/src/components/AssetListItem.vue b/app/web/src/components/AssetListItem.vue
index 6bb7dd17b3..1fa4eed894 100644
--- a/app/web/src/components/AssetListItem.vue
+++ b/app/web/src/components/AssetListItem.vue
@@ -54,6 +54,7 @@ import { TreeNode, Icon } from "@si/vue-lib/design-system";
 import clsx from "clsx";
 import { SchemaVariant } from "@/api/sdf/dal/schema";
 import { useAssetStore, schemaVariantDisplayName } from "@/store/asset.store";
+import { useModuleStore } from "@/store/module.store";
 import EditingPill from "./EditingPill.vue";
 
 const props = defineProps({
@@ -62,10 +63,12 @@ const props = defineProps({
 });
 
 const assetStore = useAssetStore();
+const moduleStore = useModuleStore();
+
 const { selectedSchemaVariants: selectedAssets } = storeToRefs(assetStore);
 
 const canUpdate = computed(
-  () => !!assetStore.upgradeableModules[props.a.schemaVariantId],
+  () => !!moduleStore.upgradeableModules[props.a.schemaVariantId],
 );
 
 const onClick = (e: MouseEvent) => {
diff --git a/app/web/src/components/AssetListPanel.vue b/app/web/src/components/AssetListPanel.vue
index e94c1f5538..0c5c6582d4 100644
--- a/app/web/src/components/AssetListPanel.vue
+++ b/app/web/src/components/AssetListPanel.vue
@@ -3,7 +3,7 @@
     <RequestStatusMessage
       v-if="loadAssetsReqStatus.isPending && assetStore.variantList.length < 1"
       :requestStatus="loadAssetsReqStatus"
-      loadingMessage="Loading assets..."
+      loadingMessage="Loading Assets..."
     />
     <template #top>
       <SidebarSubpanelTitle icon="component">
@@ -15,16 +15,16 @@
         </template>
         <div class="flex flex-row gap-xs items-center">
           <IconButton
-            :requestStatus="loadModulesReqStatus"
+            :requestStatus="syncModulesReqStatus"
             class="hover:scale-125"
             icon="refresh"
             loadingIcon="loader"
-            loadingTooltip="Loading Modules..."
+            loadingTooltip="Checking For Asset Updates And For New Assets..."
             size="sm"
-            tooltip="Check for upgradeable or new modules"
+            tooltip="Check For Asset Updates Or Install New Assets"
             tooltipPlacement="top"
             variant="simple"
-            @click="loadModules"
+            @click="syncModules"
           />
           <IconButton
             :requestStatus="createAssetReqStatus"
@@ -113,17 +113,16 @@
         />
       </TreeNode>
     </template>
-    <ModuleExportModal
+    <AssetContributeModal
       ref="contributeAssetModalRef"
-      :loadingText="_.sample(contributeLoadingTexts)"
-      :preSelectedSchemaVariantId="
-        assetStore.selectedSchemaVariant?.schemaVariantId
-      "
-      label="Contribute to System Initiative"
-      title="Contribute Assets"
-      @export-success="onExport"
+      :contributeRequest="contributeRequest"
+      @contribute-success="onContributeAsset"
     />
-    <Modal ref="exportSuccessModalRef" size="sm" title="Contribution sent">
+    <Modal
+      ref="contributeAssetSuccessModalRef"
+      size="sm"
+      title="Contribution sent"
+    >
       <p>
         Thanks for contributing! We will review your contribution, and reach out
         via email or on our
@@ -148,14 +147,19 @@ import {
   PillCounter,
 } from "@si/vue-lib/design-system";
 import { useRouter } from "vue-router";
+import { format as dateFormat, parseISO } from "date-fns";
 import SiSearch, { Filter } from "@/components/SiSearch.vue";
+import {
+  ModuleContributeRequest,
+  ModuleContributeRequestItem,
+} from "@/api/sdf/dal/module";
 import { useAssetStore } from "@/store/asset.store";
 import { SchemaVariant } from "@/api/sdf/dal/schema";
 import { getAssetIcon } from "@/store/components.store";
 import { useModuleStore } from "@/store/module.store";
 import AssetNameModal from "./AssetNameModal.vue";
 import AssetListItem from "./AssetListItem.vue";
-import ModuleExportModal from "./modules/ModuleExportModal.vue";
+import AssetContributeModal from "./AssetContributeModal.vue";
 import SidebarSubpanelTitle from "./SidebarSubpanelTitle.vue";
 import IconButton from "./IconButton.vue";
 
@@ -169,35 +173,13 @@ const createAssetReqStatus = assetStore.getRequestStatus("CREATE_VARIANT");
 const loadAssetsReqStatus = assetStore.getRequestStatus(
   "LOAD_SCHEMA_VARIANT_LIST",
 );
-const loadModulesReqStatus = assetStore.getRequestStatus("LOAD_MODULES");
+const syncModulesReqStatus = moduleStore.getRequestStatus("SYNC");
 
-const contributeAssetModalRef = ref<InstanceType<typeof ModuleExportModal>>();
-const exportSuccessModalRef = ref<InstanceType<typeof Modal>>();
+const contributeAssetModalRef =
+  ref<InstanceType<typeof AssetContributeModal>>();
+const contributeAssetSuccessModalRef = ref<InstanceType<typeof Modal>>();
 const newAssetModalRef = ref<InstanceType<typeof AssetNameModal>>();
 
-const contributeLoadingTexts = [
-  "Engaging Photon Torpedos...",
-  "Reticulating Splines...",
-  "Revolutionizing DevOps...",
-  "Calibrating Hyperspace Matrix...",
-  "Syncing Neural Circuitry...",
-  "Optimizing Tachyon Weave...",
-  "Tuning Fractal Harmonics...",
-  "Reshuffling Multiverse Threads...",
-  "Harmonizing Subspace Arrays...",
-  "Modulating Cybernetic Matrices...",
-  "Configuring Exo-Geometric Arrays...",
-  "Initializing Flux Capacitors...",
-  "Balancing Subatomic Resonance...",
-  "Fine-tuning Quantum Entanglement...",
-  "Matrixing Hyperdimensional Grids...",
-  "Coalescing Esoteric Code...",
-  "Syncopating Quantum Flux...",
-  "Reformatting Reality Lattice...",
-  "Fine-tuning Temporal Flux...",
-  "Syncing Cosmic Harmonics...",
-];
-
 const searchRef = ref<InstanceType<typeof SiSearch>>();
 const searchString = ref("");
 
@@ -205,11 +187,26 @@ const onSearch = (search: string) => {
   searchString.value = search.trim().toLocaleLowerCase();
 };
 
+const contributeRequest = computed((): ModuleContributeRequest => {
+  let modules = [] as ModuleContributeRequestItem[];
+  const filteredSchemaVariants = _.filter(
+    assetStore.schemaVariants,
+    (schemaVariant) => schemaVariant.canContribute,
+  );
+  const version = dateFormat(Date.now(), "yyyyMMddkkmmss");
+  modules = _.map(filteredSchemaVariants, (filteredSchemaVariant) => ({
+    name: `${filteredSchemaVariant.schemaName} ${version}`,
+    version,
+    schemaId: filteredSchemaVariant.schemaId,
+  }));
+  return { modules };
+});
+
 const canContribute = computed(() =>
   assetList.value.some((a) => a.canContribute),
 );
 const canUpdate = computed(
-  () => Object.keys(assetStore.upgradeableModules).length > 0,
+  () => Object.keys(moduleStore.upgradeableModules).length !== 0,
 );
 
 const categorizedAssets = computed(() =>
@@ -263,7 +260,7 @@ const categoryColor = (category: string) => {
   return "#000";
 };
 
-const loadModules = async () => assetStore.LOAD_MODULES();
+const syncModules = async () => moduleStore.SYNC();
 
 const newAsset = async (newAssetName: string) => {
   const result = await assetStore.CREATE_VARIANT(newAssetName);
@@ -277,7 +274,7 @@ const newAsset = async (newAssetName: string) => {
 };
 
 const updateAllAssets = () => {
-  Object.values(assetStore.upgradeableModules).forEach((module) => {
+  Object.values(moduleStore.upgradeableModules).forEach((module) => {
     moduleStore.INSTALL_REMOTE_MODULE(module.id);
   });
   router.replace({
@@ -286,12 +283,12 @@ const updateAllAssets = () => {
 };
 
 const contributeAsset = () => contributeAssetModalRef.value?.open();
-const onExport = () => exportSuccessModalRef.value?.open();
+const onContributeAsset = () => contributeAssetSuccessModalRef.value?.open();
 
 const filters = computed(() => [
   assetList.value.filter((a) => a.canContribute),
   assetList.value.filter(
-    (a) => !!assetStore.upgradeableModules[a.schemaVariantId],
+    (a) => !!moduleStore.upgradeableModules[a.schemaVariantId],
   ),
   assetList.value.filter((a) => !a.isLocked),
 ]);
diff --git a/app/web/src/components/CustomizeTabs.vue b/app/web/src/components/CustomizeTabs.vue
index 21421dd3e6..643f6b38eb 100644
--- a/app/web/src/components/CustomizeTabs.vue
+++ b/app/web/src/components/CustomizeTabs.vue
@@ -11,7 +11,8 @@
     </TabGroupItem>
     <TabGroupItem slug="newassets">
       <template #label>
-        NEW ASSETS <PillCounter :count="assetStore.installableModules.length" />
+        NEW ASSETS
+        <PillCounter :count="moduleStore.installableModules.length" />
       </template>
       <slot name="newassets" />
     </TabGroupItem>
@@ -31,11 +32,13 @@ import { PropType, ref } from "vue";
 import { TabGroup, TabGroupItem, PillCounter } from "@si/vue-lib/design-system";
 import { useFeatureFlagsStore } from "@/store/feature_flags.store";
 import { useAssetStore } from "@/store/asset.store";
+import { useModuleStore } from "@/store/module.store";
 
 const router = useRouter();
 const route = useRoute();
 const featureFlagsStore = useFeatureFlagsStore();
 const assetStore = useAssetStore();
+const moduleStore = useModuleStore();
 
 const group = ref<InstanceType<typeof TabGroup>>();
 
diff --git a/app/web/src/components/InstallAsset.vue b/app/web/src/components/InstallAsset.vue
index 64772e8dfb..92321e5185 100644
--- a/app/web/src/components/InstallAsset.vue
+++ b/app/web/src/components/InstallAsset.vue
@@ -88,8 +88,8 @@ import {
   Icon,
 } from "@si/vue-lib/design-system";
 import { useModuleStore, ModuleSpec } from "@/store/module.store";
-import { ModuleId } from "@/api/sdf/dal/schema";
 import { nilId } from "@/utils/nilId";
+import { ModuleId } from "@/api/sdf/dal/module";
 import TruncateWithTooltip from "./TruncateWithTooltip.vue";
 import CodeEditor from "./CodeEditor.vue";
 
diff --git a/app/web/src/components/InstallAssetsPanel.vue b/app/web/src/components/InstallAssetsPanel.vue
index 7957b25da0..be603ca1d4 100644
--- a/app/web/src/components/InstallAssetsPanel.vue
+++ b/app/web/src/components/InstallAssetsPanel.vue
@@ -1,8 +1,8 @@
 <template>
   <ScrollArea>
     <RequestStatusMessage
-      v-if="loadModulesReqStatus.isPending"
-      :requestStatus="loadModulesReqStatus"
+      v-if="syncModulesReqStatus.isPending"
+      :requestStatus="syncModulesReqStatus"
       loadingMessage="Loading modules..."
     />
     <template #top>
@@ -16,7 +16,7 @@
       />
     </template>
     <ul
-      v-if="assetStore.installableModules.length > 0"
+      v-if="moduleStore.installableModules.length > 0"
       :class="
         clsx(
           'dark:text-white text-black dark:bg-neutral-800 py-[1px]',
@@ -61,13 +61,13 @@ import {
   themeClasses,
 } from "@si/vue-lib/design-system";
 import SiSearch from "@/components/SiSearch.vue";
-import { useAssetStore } from "@/store/asset.store";
-import { Module } from "@/api/sdf/dal/schema";
 import router from "@/router";
+import { useModuleStore } from "@/store/module.store";
+import { LatestModule } from "@/api/sdf/dal/module";
 import EmptyStateCard from "./EmptyStateCard.vue";
 import SidebarSubpanelTitle from "./SidebarSubpanelTitle.vue";
 
-const assetStore = useAssetStore();
+const moduleStore = useModuleStore();
 
 const searchRef = ref<InstanceType<typeof SiSearch>>();
 const searchString = ref("");
@@ -77,16 +77,16 @@ const onSearch = (search: string) => {
 };
 
 const filteredModules = computed(() =>
-  assetStore.installableModules.filter((m) =>
+  moduleStore.installableModules.filter((m) =>
     m.name.toLocaleLowerCase().includes(searchString.value),
   ),
 );
 
-const loadModulesReqStatus = assetStore.getRequestStatus("LOAD_MODULES");
+const syncModulesReqStatus = moduleStore.getRequestStatus("SYNC");
 
-const selectedModule = ref<Module | undefined>();
+const selectedModule = ref<LatestModule | undefined>();
 
-const selectModule = (module: Module) => {
+const selectModule = (module: LatestModule) => {
   selectedModule.value = module;
   const newQueryObj = {
     ...{ m: module.id },
diff --git a/app/web/src/components/Workspace/WorkspaceCustomizeAssets.vue b/app/web/src/components/Workspace/WorkspaceCustomizeAssets.vue
index b1052350ec..853e570b80 100644
--- a/app/web/src/components/Workspace/WorkspaceCustomizeAssets.vue
+++ b/app/web/src/components/Workspace/WorkspaceCustomizeAssets.vue
@@ -144,6 +144,7 @@ import {
 import { useRoute } from "vue-router";
 import { useAssetStore } from "@/store/asset.store";
 import { useFuncStore } from "@/store/func/funcs.store";
+import { useModuleStore } from "@/store/module.store";
 import router from "@/router";
 import AssetCard from "../AssetCard.vue";
 import AssetListPanel from "../AssetListPanel.vue";
@@ -162,6 +163,7 @@ import WorkspaceCustomizeEmptyState from "../WorkspaceCustomizeEmptyState.vue";
 
 const assetStore = useAssetStore();
 const funcStore = useFuncStore();
+const moduleStore = useModuleStore();
 
 const selectedVariantId = computed(() => assetStore.selectedVariantId);
 const selectedFuncId = computed(() => funcStore.selectedFuncId);
@@ -186,7 +188,7 @@ const rightClickMenuItems = computed(() => {
   const canUpdate = [];
   assetStore.selectedSchemaVariantRecords.forEach((asset) => {
     if (asset.canContribute) canContribute.push(asset);
-    if (assetStore.upgradeableModules[asset.schemaVariantId])
+    if (moduleStore.upgradeableModules[asset.schemaVariantId])
       canUpdate.push(asset);
   });
 
diff --git a/app/web/src/components/modules/ModuleExportModal.vue b/app/web/src/components/modules/ModuleExportModal.vue
deleted file mode 100644
index 9dedde3ca4..0000000000
--- a/app/web/src/components/modules/ModuleExportModal.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-  <Modal ref="modalRef" :title="title">
-    <Stack>
-      <VormInput
-        v-model="packageExportReq.name"
-        label="Name"
-        placeholder="The name of this module..."
-        required
-      />
-      <VormInput
-        v-model="packageExportReq.description"
-        label="Description"
-        placeholder="Give this module a short description..."
-        type="textarea"
-      />
-      <div class="flex flex-row items-end gap-sm">
-        <VormInput
-          v-model="selectedSchemaVariant"
-          :options="schemaVariantOptions"
-          class="flex-1"
-          label="Assets"
-          type="dropdown"
-        />
-        <VButton
-          class="mb-1"
-          icon="plus"
-          label="Add"
-          size="xs"
-          tone="action"
-          @click="addSchemaVariantToExport"
-        />
-      </div>
-      <ul class="flex flex-col gap-2xs max-h-72">
-        <li
-          v-for="svId in schemaVariantsForExport"
-          :key="svId"
-          class="flex px-1 items-center"
-        >
-          <span class="pr-2 select-none">•</span>
-          {{ schemaVariantsById?.[svId]?.schemaName }}
-          <span class="text-2xs italic text-neutral-500 ml-xs">
-            {{ schemaVariantsById?.[svId]?.displayName }}
-            {{ svTimestampStringById[svId] }}
-          </span>
-          <VButton
-            class="ml-auto"
-            icon="trash"
-            size="xs"
-            @click="removeSchemaVariant(svId)"
-          />
-        </li>
-      </ul>
-      <ErrorMessage
-        v-if="exportPkgReqStatus.isError"
-        :requestStatus="exportPkgReqStatus"
-      />
-      <p>
-        Everything you contribute will receive a code review, and we will reach
-        out if we have any questions or concerns. Assuming things look good, we
-        will then include your asset in a future version of System Initiative!
-      </p>
-      <p>
-        By clicking the 'Contribute to System Initiative' button, you agree to
-        license any code submitted under the terms of the
-        <a
-          class="text-green-500"
-          href="https://www.apache.org/licenses/LICENSE-2.0"
-          >Apache License, Version 2.0</a
-        >, and that you intend for System Initiative, Inc. to distribute it.
-      </p>
-      <VButton
-        :disabled="!enableExportButton"
-        :label="label"
-        :loadingText="loadingText"
-        :requestStatus="exportPkgReqStatus"
-        icon="cloud-upload"
-        size="sm"
-        tone="action"
-        @click="exportPkg"
-      />
-    </Stack>
-  </Modal>
-</template>
-
-<script lang="ts" setup>
-import { ref, computed } from "vue";
-import {
-  Modal,
-  VButton,
-  VormInput,
-  useModal,
-  Stack,
-  ErrorMessage,
-} from "@si/vue-lib/design-system";
-import { format as dateFormat, parseISO } from "date-fns";
-import * as _ from "lodash-es";
-import { useComponentsStore } from "@/store/components.store";
-import { useModuleStore, ModuleExportRequest } from "@/store/module.store";
-
-const moduleStore = useModuleStore();
-const componentStore = useComponentsStore();
-const modalRef = ref<InstanceType<typeof Modal>>();
-const exportPkgReqStatus = moduleStore.getRequestStatus("EXPORT_MODULE");
-
-const props = withDefaults(
-  defineProps<{
-    title?: string;
-    label?: string;
-    loadingText?: string;
-    preSelectedSchemaVariantId?: string;
-  }>(),
-  {
-    title: "Export Module",
-    label: "Export",
-    loadingText: "Exporting...",
-  },
-);
-
-const emits = defineEmits(["exportSuccess"]);
-
-const emptyExportPackageReq: ModuleExportRequest = {
-  name: "",
-  description: undefined,
-  version: "",
-  schemaVariants: [],
-};
-
-const selectedSchemaVariant = ref();
-const schemaVariantsForExport = ref<string[]>([]);
-
-const packageExportReq = ref<ModuleExportRequest>({ ...emptyExportPackageReq });
-
-const addSchemaVariantToExport = () => {
-  if (!selectedSchemaVariant.value) {
-    return;
-  }
-  schemaVariantsForExport.value.push(selectedSchemaVariant.value);
-  selectedSchemaVariant.value = undefined;
-};
-
-const removeSchemaVariant = (idToRemove: string) => {
-  schemaVariantsForExport.value = schemaVariantsForExport.value.filter(
-    (svId) => svId !== idToRemove,
-  );
-};
-
-const { open: openModal, close } = useModal(modalRef);
-const open = () => {
-  selectedSchemaVariant.value = undefined;
-  schemaVariantsForExport.value = [];
-  if (props.preSelectedSchemaVariantId) {
-    schemaVariantsForExport.value = [props.preSelectedSchemaVariantId];
-  }
-  packageExportReq.value = { ...emptyExportPackageReq };
-  openModal();
-};
-
-const isOpen = computed(() => modalRef.value?.isOpen);
-
-defineExpose({ open, close, isOpen });
-
-const schemaVariantsById = computed(() => componentStore.schemaVariantsById);
-
-const svTimestampStringById = computed(() =>
-  _.reduce(
-    componentStore.schemaVariantsById,
-    (acc, sv, id) => ({
-      ...acc,
-      [id]: dateFormat(parseISO(sv.created_at), "M/d/y h:mm:ss a"),
-    }),
-    {} as Record<string, string>,
-  ),
-);
-
-const schemaVariantOptions = computed(() =>
-  componentStore.schemaVariants
-    .filter((sv) => !schemaVariantsForExport.value.includes(sv.schemaVariantId))
-    // .filter((sv) => sv.isDefault)
-    .map((sv) => ({
-      label: `${sv.schemaName}: ${sv.displayName} ${
-        svTimestampStringById.value[sv.schemaVariantId]
-      }`,
-      value: sv.schemaVariantId,
-    })),
-);
-
-const getVersionTimestamp = () => dateFormat(Date.now(), "yyyyMMddkkmmss");
-
-const enableExportButton = computed(() => {
-  return packageExportReq.value?.name?.trim().length !== 0;
-});
-
-const exportPkg = async () => {
-  packageExportReq.value.version = getVersionTimestamp();
-  const result = await moduleStore.EXPORT_MODULE({
-    ...packageExportReq.value,
-    schemaVariants: schemaVariantsForExport.value,
-  });
-  if (result.result.success) {
-    emits("exportSuccess");
-    close();
-    await moduleStore.LOAD_LOCAL_MODULES();
-  }
-};
-</script>
diff --git a/app/web/src/store/asset.store.ts b/app/web/src/store/asset.store.ts
index 44487f65cd..c24943ba9d 100644
--- a/app/web/src/store/asset.store.ts
+++ b/app/web/src/store/asset.store.ts
@@ -4,13 +4,7 @@ import * as _ from "lodash-es";
 import { addStoreHooks, ApiRequest } from "@si/vue-lib/pinia";
 import { useWorkspacesStore } from "@/store/workspaces.store";
 import { FuncId, FuncKind } from "@/api/sdf/dal/func";
-import {
-  Module,
-  ModuleId,
-  SchemaId,
-  SchemaVariant,
-  SchemaVariantId,
-} from "@/api/sdf/dal/schema";
+import { SchemaId, SchemaVariant, SchemaVariantId } from "@/api/sdf/dal/schema";
 import { Visibility } from "@/api/sdf/dal/visibility";
 import keyedDebouncer from "@/utils/keyedDebouncer";
 import router from "@/router";
@@ -18,6 +12,7 @@ import { PropKind } from "@/api/sdf/dal/prop";
 import { nonNullable } from "@/utils/typescriptLinter";
 import { useFuncStore } from "./func/funcs.store";
 import { useChangeSetsStore } from "./change_sets.store";
+import { useModuleStore } from "./module.store";
 import { useRealtimeStore } from "./realtime/realtime.store";
 import handleStoreError from "./errors";
 import { useComponentsStore } from "./components.store";
@@ -80,18 +75,19 @@ export const schemaVariantDisplayName = (schemaVariant: SchemaVariant) =>
     : schemaVariant.displayName;
 
 export const useAssetStore = () => {
-  const changeSetsStore = useChangeSetsStore();
-  const changeSetId = changeSetsStore.selectedChangeSetId;
+  const changeSetStore = useChangeSetsStore();
+  const changeSetId = changeSetStore.selectedChangeSetId;
   const visibility = {
     // changeSetId should not be empty if we are actually using this store
     // so we can give it a bad value and let it throw an error
     visibility_change_set_pk: changeSetId || "XXX",
   };
 
-  const workspacesStore = useWorkspacesStore();
-  const workspaceId = workspacesStore.selectedWorkspacePk;
+  const workspaceStore = useWorkspacesStore();
+  const workspaceId = workspaceStore.selectedWorkspacePk;
 
-  const funcsStore = useFuncStore();
+  const funcStore = useFuncStore();
+  const moduleStore = useModuleStore();
 
   let assetSaveDebouncer: ReturnType<typeof keyedDebouncer> | undefined;
 
@@ -100,8 +96,6 @@ export const useAssetStore = () => {
       state: () => ({
         variantList: [] as SchemaVariant[],
         variantsById: {} as Record<SchemaVariantId, SchemaVariant>,
-        upgradeableModules: {} as Record<SchemaVariantId, Module>,
-        installableModulesById: {} as Record<ModuleId, Module>,
 
         executeSchemaVariantTaskId: undefined as string | undefined,
         executeSchemaVariantTaskRunning: false as boolean,
@@ -129,8 +123,6 @@ export const useAssetStore = () => {
             return state.selectedSchemaVariants[0];
           else return undefined;
         },
-        installableModules: (state) =>
-          Object.values(state.installableModulesById),
         selectedSchemaVariant(): SchemaVariant | undefined {
           if (this.selectedVariantId)
             return this.variantFromListById[this.selectedVariantId];
@@ -183,13 +175,13 @@ export const useAssetStore = () => {
           this.selectedSchemaVariants = [id];
           this.syncSelectionIntoUrl();
           const variant = this.variantFromListById[id];
-          if (variant?.assetFuncId) funcsStore.FETCH_CODE(variant.assetFuncId);
+          if (variant?.assetFuncId) funcStore.FETCH_CODE(variant.assetFuncId);
         },
         async setFuncSelection(id?: FuncId) {
           // ignore the old func selections and replace with one func or no funcs
-          funcsStore.selectedFuncId = id;
+          funcStore.selectedFuncId = id;
           if (id) {
-            await funcsStore.FETCH_CODE(id);
+            await funcStore.FETCH_CODE(id);
             this.selectedFuncs = [id];
           } else {
             this.selectedFuncs = [];
@@ -198,8 +190,8 @@ export const useAssetStore = () => {
         },
         async addFuncSelection(id: FuncId) {
           if (!this.selectedFuncs.includes(id)) this.selectedFuncs.push(id);
-          await funcsStore.FETCH_CODE(id);
-          funcsStore.selectedFuncId = id;
+          await funcStore.FETCH_CODE(id);
+          funcStore.selectedFuncId = id;
           this.syncSelectionIntoUrl();
         },
         removeFuncSelection(id: FuncId) {
@@ -228,7 +220,7 @@ export const useAssetStore = () => {
         async syncUrlIntoSelection() {
           this.selectedSchemaVariants = [];
           this.selectedFuncs = [];
-          funcsStore.selectedFuncId = undefined;
+          funcStore.selectedFuncId = undefined;
           const ids = ((router.currentRoute.value.query?.s as string) || "")
             .split("|")
             .filter(Boolean);
@@ -242,16 +234,16 @@ export const useAssetStore = () => {
                 this.selectedSchemaVariants.push(id);
                 const variant = this.variantFromListById[id];
                 if (variant?.assetFuncId)
-                  promises.push(funcsStore.FETCH_CODE(variant.assetFuncId));
+                  promises.push(funcStore.FETCH_CODE(variant.assetFuncId));
               } else if (id.startsWith("f_")) {
                 id = id.substring(2);
                 this.selectedFuncs.push(id);
-                promises.push(funcsStore.FETCH_CODE(id));
+                promises.push(funcStore.FETCH_CODE(id));
                 fnIds.push(id);
               }
             });
             await Promise.all(promises);
-            funcsStore.selectedFuncId = fnIds[fnIds.length - 1];
+            funcStore.selectedFuncId = fnIds[fnIds.length - 1];
           }
         },
 
@@ -301,10 +293,10 @@ export const useAssetStore = () => {
         },
 
         async CREATE_VARIANT(name: string) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetId === changeSetsStore.headChangeSetId)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetId === changeSetStore.headChangeSetId)
+            changeSetStore.creatingChangeSet = true;
           return new ApiRequest<SchemaVariant, SchemaVariantCreateRequest>({
             method: "post",
             url: "/variant/create_variant",
@@ -324,10 +316,10 @@ export const useAssetStore = () => {
         },
 
         async CLONE_VARIANT(schemaVariantId: SchemaVariantId, name: string) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetsStore.headSelected)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetStore.headSelected)
+            changeSetStore.creatingChangeSet = true;
 
           return new ApiRequest<
             { id: SchemaVariantId; success: boolean },
@@ -384,10 +376,10 @@ export const useAssetStore = () => {
         },
 
         async SAVE_SCHEMA_VARIANT(schemaVariant: SchemaVariant, code?: string) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetsStore.headSelected)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetStore.headSelected)
+            changeSetStore.creatingChangeSet = true;
 
           if (schemaVariant.isLocked)
             throw new Error(
@@ -408,17 +400,17 @@ export const useAssetStore = () => {
             },
             onSuccess: () => {
               if (code) {
-                const f = funcsStore.funcCodeById[schemaVariant.assetFuncId];
+                const f = funcStore.funcCodeById[schemaVariant.assetFuncId];
                 if (f) f.code = code;
               }
             },
           });
         },
         async REGENERATE_VARIANT(schemaVariantId: SchemaVariantId) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetsStore.headSelected)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetStore.headSelected)
+            changeSetStore.creatingChangeSet = true;
 
           this.detachmentWarnings = [];
           const variant = this.variantFromListById[schemaVariantId];
@@ -438,26 +430,6 @@ export const useAssetStore = () => {
           });
         },
 
-        async LOAD_MODULES() {
-          return new ApiRequest<
-            {
-              upgradeable: Record<SchemaVariantId, Module>;
-              installable: Module[];
-            },
-            Visibility
-          >({
-            url: `v2/workspaces/${workspaceId}/change-sets/${changeSetId}/modules/sync`,
-            params: { ...visibility },
-            onSuccess: (response) => {
-              this.upgradeableModules = response.upgradeable;
-              this.installableModulesById = _.keyBy(
-                response.installable,
-                (m) => m.id,
-              );
-            },
-          });
-        },
-
         async LOAD_SCHEMA_VARIANT_LIST() {
           return new ApiRequest<SchemaVariant[], Visibility>({
             url: `v2/workspaces/${workspaceId}/change-sets/${changeSetId}/schema-variants`,
@@ -469,10 +441,10 @@ export const useAssetStore = () => {
         },
 
         async CREATE_UNLOCKED_COPY(id: SchemaVariantId) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetsStore.headSelected)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetStore.headSelected)
+            changeSetStore.creatingChangeSet = true;
 
           this.detachmentWarnings = [];
 
@@ -495,10 +467,10 @@ export const useAssetStore = () => {
           });
         },
         async DELETE_UNLOCKED_VARIANT(id: SchemaVariantId) {
-          if (changeSetsStore.creatingChangeSet)
+          if (changeSetStore.creatingChangeSet)
             throw new Error("race, wait until the change set is created");
-          if (changeSetsStore.headSelected)
-            changeSetsStore.creatingChangeSet = true;
+          if (changeSetStore.headSelected)
+            changeSetStore.creatingChangeSet = true;
 
           return new ApiRequest<SchemaVariant>({
             method: "post",
@@ -520,7 +492,7 @@ export const useAssetStore = () => {
       async onActivated() {
         await Promise.all([
           this.LOAD_SCHEMA_VARIANT_LIST(),
-          this.LOAD_MODULES(),
+          moduleStore.SYNC(),
         ]);
         const stopWatchingUrl = watch(
           () => {
@@ -567,7 +539,7 @@ export const useAssetStore = () => {
             callback: (data) => {
               if (data.changeSetId !== changeSetId) return;
               this.LOAD_SCHEMA_VARIANT_LIST();
-              this.LOAD_MODULES();
+              moduleStore.SYNC();
             },
           },
           {
@@ -605,7 +577,7 @@ export const useAssetStore = () => {
             callback: async (data) => {
               if (data.changeSetId !== changeSetId) return;
               this.LOAD_SCHEMA_VARIANT_LIST();
-              this.LOAD_MODULES();
+              moduleStore.SYNC();
               useComponentsStore().FETCH_AVAILABLE_SCHEMAS();
             },
           },
@@ -623,7 +595,7 @@ export const useAssetStore = () => {
             eventType: "ChangeSetApplied",
             callback: () => {
               this.LOAD_SCHEMA_VARIANT_LIST();
-              this.LOAD_MODULES();
+              moduleStore.SYNC();
             },
           },
           // For the async api endpoints
diff --git a/app/web/src/store/module.store.ts b/app/web/src/store/module.store.ts
index 1a2c88a7ae..62d1a400f9 100644
--- a/app/web/src/store/module.store.ts
+++ b/app/web/src/store/module.store.ts
@@ -4,12 +4,18 @@ import { addStoreHooks, ApiRequest } from "@si/vue-lib/pinia";
 import { useWorkspacesStore } from "@/store/workspaces.store";
 import { ChangeSetId } from "@/api/sdf/dal/change_set";
 import router from "@/router";
+import { SchemaVariantId } from "@/api/sdf/dal/schema";
+import { Visibility } from "@/api/sdf/dal/visibility";
+import {
+  LatestModule,
+  ModuleContributeRequest,
+  ModuleId,
+} from "@/api/sdf/dal/module";
 import { useChangeSetsStore } from "./change_sets.store";
 import { useRouterStore } from "./router.store";
 import { useRealtimeStore } from "./realtime/realtime.store";
 import { ModuleIndexApiRequest } from ".";
 
-export type ModuleId = string;
 export type ModuleName = string;
 export type ModuleHash = string;
 export type ModuleSlug = ModuleHash;
@@ -20,13 +26,6 @@ export interface ModuleFuncView {
   description?: string;
 }
 
-export interface ModuleExportRequest {
-  name: string;
-  version: string;
-  description?: string;
-  schemaVariants: string[];
-}
-
 export interface LocalModuleSummary {
   name: string;
   hash: ModuleHash;
@@ -118,6 +117,11 @@ function getVisibilityParams(forceChangeSetId?: ChangeSetId) {
 export const useModuleStore = () => {
   const changeSetsStore = useChangeSetsStore();
   const changeSetId = changeSetsStore.selectedChangeSetId;
+  const visibility = {
+    // changeSetId should not be empty if we are actually using this store
+    // so we can give it a bad value and let it throw an error
+    visibility_change_set_pk: changeSetId || "XXX",
+  };
 
   const workspacesStore = useWorkspacesStore();
   const workspaceId = workspacesStore.selectedWorkspacePk;
@@ -127,6 +131,8 @@ export const useModuleStore = () => {
       `ws${workspaceId || "NONE"}/cs${changeSetId || "NONE"}/modules`,
       {
         state: () => ({
+          upgradeableModules: {} as Record<SchemaVariantId, LatestModule>,
+          installableModulesById: {} as Record<ModuleId, LatestModule>,
           localModulesByName: {} as Record<ModuleName, LocalModuleSummary>,
           localModuleDetailsByName: {} as Record<
             ModuleName,
@@ -146,6 +152,8 @@ export const useModuleStore = () => {
           exportingWorkspaceOperationRunning: false as boolean,
         }),
         getters: {
+          installableModules: (state) =>
+            Object.values(state.installableModulesById),
           urlSelectedModuleSlug: () => {
             const route = useRouterStore().currentRoute;
             return route?.params?.moduleSlug as ModuleSlug | undefined;
@@ -200,6 +208,34 @@ export const useModuleStore = () => {
           },
         },
         actions: {
+          async SYNC() {
+            return new ApiRequest<
+              {
+                upgradeable: Record<SchemaVariantId, LatestModule>;
+                installable: LatestModule[];
+              },
+              Visibility
+            >({
+              url: `v2/workspaces/${workspaceId}/change-sets/${changeSetId}/modules/sync`,
+              params: { ...visibility },
+              onSuccess: (response) => {
+                this.upgradeableModules = response.upgradeable;
+                this.installableModulesById = _.keyBy(
+                  response.installable,
+                  (m) => m.id,
+                );
+              },
+            });
+          },
+
+          async CONTRIBUTE(request: ModuleContributeRequest) {
+            return new ApiRequest({
+              method: "post",
+              url: `v2/workspaces/${workspaceId}/change-sets/${changeSetId}/modules/contribute`,
+              params: { ...visibility, ...request },
+            });
+          },
+
           async LOAD_LOCAL_MODULES() {
             return new ApiRequest<{ modules: LocalModuleSummary[] }>({
               url: "/module/list_modules",
@@ -409,14 +445,6 @@ export const useModuleStore = () => {
             this.exportingWorkspaceOperationId = null;
             this.exportingWorkspaceOperationError = undefined;
           },
-
-          async EXPORT_MODULE(exportRequest: ModuleExportRequest) {
-            return new ApiRequest({
-              method: "post",
-              url: "/module/export_module",
-              params: { ...exportRequest, ...getVisibilityParams() },
-            });
-          },
         },
         onActivated() {
           // This store is activated very early, and we might not have a change
diff --git a/app/web/src/store/workspaces.store.ts b/app/web/src/store/workspaces.store.ts
index adcb8f6116..2a9daf510f 100644
--- a/app/web/src/store/workspaces.store.ts
+++ b/app/web/src/store/workspaces.store.ts
@@ -4,8 +4,8 @@ import { watch } from "vue";
 import { addStoreHooks, ApiRequest } from "@si/vue-lib/pinia";
 import storage from "local-storage-fallback";
 import { useRealtimeStore } from "@/store/realtime/realtime.store";
-import { ModuleId } from "@/store/module.store";
 import router from "@/router";
+import { ModuleId } from "@/api/sdf/dal/module";
 import { useAuthStore, UserId } from "./auth.store";
 import { useRouterStore } from "./router.store";
 import handleStoreError from "./errors";
diff --git a/lib/dal/src/module.rs b/lib/dal/src/module.rs
index a8b107a43e..99464c3600 100644
--- a/lib/dal/src/module.rs
+++ b/lib/dal/src/module.rs
@@ -14,6 +14,8 @@ use tokio::sync::TryLockError;
 use tokio::time::Instant;
 
 use crate::layer_db_types::{ModuleContent, ModuleContentV2};
+use crate::pkg::export::PkgExporter;
+use crate::pkg::PkgError;
 use crate::workspace_snapshot::content_address::{ContentAddress, ContentAddressDiscriminants};
 use crate::workspace_snapshot::edge_weight::{
     EdgeWeight, EdgeWeightError, EdgeWeightKind, EdgeWeightKindDiscriminants,
@@ -22,8 +24,9 @@ use crate::workspace_snapshot::node_weight::category_node_weight::CategoryNodeKi
 use crate::workspace_snapshot::node_weight::{NodeWeight, NodeWeightError};
 use crate::workspace_snapshot::WorkspaceSnapshotError;
 use crate::{
-    pk, ChangeSetError, DalContext, Func, FuncError, Schema, SchemaError, SchemaId, SchemaVariant,
-    SchemaVariantError, SchemaVariantId, Timestamp, TransactionsError,
+    pk, ChangeSetError, DalContext, Func, FuncError, HistoryActor, Schema, SchemaError, SchemaId,
+    SchemaVariant, SchemaVariantError, SchemaVariantId, Timestamp, TransactionsError, User,
+    UserError,
 };
 
 #[remain::sorted]
@@ -33,6 +36,8 @@ pub enum ModuleError {
     ChangeSet(#[from] ChangeSetError),
     #[error("edge weight error: {0}")]
     EdgeWeight(#[from] EdgeWeightError),
+    #[error("found empty metadata (name: '{0}') (version: '{1}')")]
+    EmptyMetadata(String, String),
     #[error("func error: {0}")]
     Func(#[from] FuncError),
     #[error("layer db error: {0}")]
@@ -41,6 +46,8 @@ pub enum ModuleError {
     MissingSchemaId(String, String),
     #[error("node weight error: {0}")]
     NodeWeight(#[from] NodeWeightError),
+    #[error("pkg error: {0}")]
+    Pkg(#[from] Box<PkgError>),
     #[error("schema error: {0}")]
     Schema(#[from] SchemaError),
     #[error("schema variant error: {0}")]
@@ -51,6 +58,8 @@ pub enum ModuleError {
     Transactions(#[from] TransactionsError),
     #[error("try lock error: {0}")]
     TryLock(#[from] TryLockError),
+    #[error("user error: {0}")]
+    User(#[from] UserError),
     #[error("workspace snapshot error: {0}")]
     WorkspaceSnapshot(#[from] WorkspaceSnapshotError),
 }
@@ -511,4 +520,68 @@ impl Module {
 
         Ok(synced_modules)
     }
+
+    /// Prepares a given [`SchemaId`] and its corresponding [`Module`] for contribution.
+    #[allow(clippy::type_complexity)]
+    #[instrument(
+        name = "module.prepare_contribution"
+        level = "info",
+        skip_all,
+        fields(
+            name = name.as_ref(),
+            version = version.as_ref(),
+            %schema_id
+        )
+    )]
+    pub async fn prepare_contribution(
+        ctx: &DalContext,
+        name: impl AsRef<str>,
+        version: impl AsRef<str>,
+        schema_id: SchemaId,
+    ) -> ModuleResult<(String, String, Option<String>, Option<SchemaId>, Vec<u8>)> {
+        let user = match ctx.history_actor() {
+            HistoryActor::User(user_pk) => User::get_by_pk(ctx, *user_pk).await?,
+            _ => None,
+        };
+        let (created_by_name, created_by_email) = user
+            .map(|user| (user.name().to_owned(), user.email().to_owned()))
+            .unwrap_or((
+                "unauthenticated user name".into(),
+                "unauthenticated user email".into(),
+            ));
+        debug!(%created_by_name, %created_by_email, "preparing module contribution");
+
+        // Sanitize and validate metadata.
+        let name = name.as_ref().trim();
+        let version = version.as_ref().trim();
+        if name.is_empty() || version.is_empty() {
+            return Err(ModuleError::EmptyMetadata(
+                name.to_string(),
+                version.to_string(),
+            ));
+        }
+
+        // Create module payload.
+        let mut exporter =
+            PkgExporter::new_for_module_contribution(name, version, &created_by_email, schema_id);
+        let module_payload = exporter.export_as_bytes(ctx).await.map_err(Box::new)?;
+
+        // Check if local information exists for contribution metadata.
+        let (local_module_based_on_hash, local_module_schema_id) =
+            match Module::find_for_member_id(ctx, schema_id).await? {
+                Some(module) => (
+                    Some(module.root_hash().to_string()),
+                    module.schema_id().map(|id| id.into()),
+                ),
+                None => (None, None),
+            };
+
+        Ok((
+            name.to_string(),
+            version.to_string(),
+            local_module_based_on_hash,
+            local_module_schema_id,
+            module_payload,
+        ))
+    }
 }
diff --git a/lib/dal/src/pkg/export.rs b/lib/dal/src/pkg/export.rs
index 79e5425509..a374529c47 100644
--- a/lib/dal/src/pkg/export.rs
+++ b/lib/dal/src/pkg/export.rs
@@ -45,7 +45,11 @@ pub struct PkgExporter {
 }
 
 impl PkgExporter {
-    pub fn new_module_exporter(
+    /// Creates an unopinionated [`PkgExporter`].
+    ///
+    /// _Note:_ if you are unsure which constructor method to use, you likely want
+    /// [`Self::new_for_module_contribution`].
+    pub fn new(
         name: impl Into<String>,
         version: impl Into<String>,
         description: Option<impl Into<String>>,
@@ -64,8 +68,18 @@ impl PkgExporter {
         }
     }
 
+    /// Creates a new [`PkgExporter`] for contributing an individual module.
+    pub fn new_for_module_contribution(
+        name: impl Into<String>,
+        version: impl Into<String>,
+        created_by: impl Into<String>,
+        schema_id: SchemaId,
+    ) -> Self {
+        Self::new(name, version, None::<String>, created_by, vec![schema_id])
+    }
+
     fn new_standalone_variant_exporter(schema_name: &str) -> Self {
-        Self::new_module_exporter(schema_name, "", None::<String>, "", vec![])
+        Self::new(schema_name, "", None::<String>, "", vec![])
     }
 
     pub async fn export_as_bytes(&mut self, ctx: &DalContext) -> PkgResult<Vec<u8>> {
@@ -184,7 +198,7 @@ impl PkgExporter {
         }
         data_builder.display_name(variant.display_name());
 
-        data_builder.component_type(get_component_type(ctx, variant).await?);
+        data_builder.component_type(Self::get_component_type(ctx, variant).await?);
         data_builder.description(variant.description());
 
         if let Some(authoring_func_id) =
@@ -1045,24 +1059,25 @@ impl PkgExporter {
 
         Ok(funcs)
     }
-}
 
-pub async fn get_component_type(
-    ctx: &DalContext,
-    variant: &SchemaVariant,
-) -> Result<SchemaVariantSpecComponentType, PkgError> {
-    let type_prop =
-        Prop::find_prop_by_path(ctx, variant.id(), &PropPath::new(["root", "si", "type"])).await?;
-
-    if let Some(av_id) = Prop::attribute_values_for_prop_id(ctx, type_prop.id())
-        .await?
-        .pop()
-    {
-        let av = AttributeValue::get_by_id_or_error(ctx, av_id).await?;
-        if let Some(type_value) = av.view(ctx).await? {
-            let component_type: ComponentType = serde_json::from_value(type_value)?;
-            return Ok(component_type.into());
+    async fn get_component_type(
+        ctx: &DalContext,
+        variant: &SchemaVariant,
+    ) -> Result<SchemaVariantSpecComponentType, PkgError> {
+        let type_prop =
+            Prop::find_prop_by_path(ctx, variant.id(), &PropPath::new(["root", "si", "type"]))
+                .await?;
+
+        if let Some(av_id) = Prop::attribute_values_for_prop_id(ctx, type_prop.id())
+            .await?
+            .pop()
+        {
+            let av = AttributeValue::get_by_id_or_error(ctx, av_id).await?;
+            if let Some(type_value) = av.view(ctx).await? {
+                let component_type: ComponentType = serde_json::from_value(type_value)?;
+                return Ok(component_type.into());
+            }
         }
+        Ok(variant.component_type().into())
     }
-    Ok(variant.component_type().into())
 }
diff --git a/lib/dal/src/schema/variant.rs b/lib/dal/src/schema/variant.rs
index 5af4158f5a..710a12162c 100644
--- a/lib/dal/src/schema/variant.rs
+++ b/lib/dal/src/schema/variant.rs
@@ -13,6 +13,7 @@ use telemetry::prelude::*;
 use thiserror::Error;
 use url::ParseError;
 
+use crate::action::prototype::{ActionKind, ActionPrototype};
 use crate::attribute::prototype::argument::{
     AttributePrototypeArgument, AttributePrototypeArgumentError,
 };
@@ -49,16 +50,13 @@ use crate::{AttributeValue, Component, ComponentError, FuncBackendResponseType,
 
 use self::root_prop::RootPropChild;
 
+pub mod authoring;
 mod json;
 pub mod leaves;
 mod metadata_view;
 pub mod root_prop;
 mod value_from;
 
-pub mod authoring;
-
-use crate::action::prototype::{ActionKind, ActionPrototype};
-use crate::module::Module;
 pub use json::SchemaVariantJson;
 pub use json::SchemaVariantMetadataJson;
 pub use metadata_view::SchemaVariantMetadataView;
@@ -117,8 +115,6 @@ pub enum SchemaVariantError {
     LeafMapPropNotFound(PropId),
     #[error("schema variant missing asset func id; schema_variant_id={0}")]
     MissingAssetFuncId(SchemaVariantId),
-    #[error("module error: {0}")]
-    Module(String),
     #[error("more than one schema found for schema variant: {0}")]
     MoreThanOneSchemaFound(SchemaVariantId),
     #[error("node weight error: {0}")]
@@ -263,8 +259,6 @@ impl SchemaVariant {
             props: front_end_props,
             can_create_new_components: is_default || !self.is_locked,
             can_contribute,
-            // FIXME(nick): this needs to be dropped once the v2 modules sync route is in use.
-            can_update: false,
         })
     }
 }
@@ -783,18 +777,14 @@ impl SchemaVariant {
         }
     }
 
-    /// A schema variant can be contributed if it is default, locked and does not belong to
-    /// a module, which means it has been updated locally
+    // NOTE(nick): we've determined that a module can be contributed if it is the default. For now, we are allowing
+    // unlocked variants to be contributed. Ask Paul for more information. I hate leaving Linear issues here since
+    // the community cannot see them, but ENG-2607 for context.
     pub async fn can_be_contributed_by_id(
         ctx: &DalContext,
         id: SchemaVariantId,
     ) -> SchemaVariantResult<bool> {
-        Ok(Self::is_default_by_id(ctx, id).await?
-            && Self::is_locked_by_id(ctx, id).await?
-            && Module::find_for_member_id(ctx, id)
-                .await
-                .map_err(|e| SchemaVariantError::Module(e.to_string()))?
-                .is_none())
+        Ok(Self::is_default_by_id(ctx, id).await?)
     }
 
     pub async fn get_latest_for_schema(
diff --git a/lib/dal/tests/integration_test/module.rs b/lib/dal/tests/integration_test/module.rs
index 37b56c34a2..7ced4f60d3 100644
--- a/lib/dal/tests/integration_test/module.rs
+++ b/lib/dal/tests/integration_test/module.rs
@@ -3,6 +3,7 @@ use dal::module::Module;
 use dal::pkg::export::PkgExporter;
 use dal::{DalContext, Schema};
 use dal_test::test;
+use pretty_assertions_sorted::assert_eq;
 use si_pkg::{SocketSpecArity, SocketSpecKind};
 use std::collections::HashMap;
 use ulid::Ulid;
@@ -89,16 +90,10 @@ async fn module_export_simple(ctx: &mut DalContext) {
     assert!(default_schema_variant.is_some());
 
     let name = "Paul's Test Pkg".to_string();
-    let description = "The Bison".to_string();
     let version = "2019-06-03".to_string();
     let user = "System Initiative".to_string();
-    let mut exporter = PkgExporter::new_module_exporter(
-        name.clone(),
-        version.clone(),
-        Some(description.clone()),
-        &user,
-        vec![schema.id()],
-    );
+    let mut exporter =
+        PkgExporter::new_for_module_contribution(name.clone(), version.clone(), &user, schema.id());
 
     let exported_pkg = exporter
         .export_as_spec(ctx)
@@ -106,7 +101,6 @@ async fn module_export_simple(ctx: &mut DalContext) {
         .expect("unable to get the pkg spec");
 
     assert_eq!(exported_pkg.name, name.clone());
-    assert_eq!(exported_pkg.description, description.clone());
     assert_eq!(exported_pkg.version, version.clone());
     assert_eq!(exported_pkg.created_by, user.clone());
     assert_eq!(exported_pkg.funcs.len(), 14);
@@ -242,3 +236,27 @@ async fn dummy_sync(ctx: &DalContext) {
         actual    // actual
     );
 }
+
+#[test]
+async fn prepare_contribution_works(ctx: &DalContext) {
+    let schema = Schema::find_by_name(ctx, "swifty")
+        .await
+        .expect("could not find by name")
+        .expect("schema not found");
+    let name = "Paul's Test Pkg With Extra Spaces At The End    ";
+    let version = "    Version With Spaces At The Beginning 2019-06-03";
+
+    let (actual_name, actual_version, _, _, _) =
+        Module::prepare_contribution(ctx, name, version, schema.id())
+            .await
+            .expect("could not prepare contribution");
+
+    assert_eq!(
+        name.trim().to_string(), // expected
+        actual_name              // actual
+    );
+    assert_eq!(
+        version.trim().to_string(), // expected
+        actual_version              // actual
+    );
+}
diff --git a/lib/sdf-server/src/server/service/module.rs b/lib/sdf-server/src/server/service/module.rs
index 11fa64db95..4148eca9b7 100644
--- a/lib/sdf-server/src/server/service/module.rs
+++ b/lib/sdf-server/src/server/service/module.rs
@@ -19,12 +19,12 @@ use si_std::CanonicalFileError;
 use std::path::{Path, PathBuf};
 use thiserror::Error;
 use tokio::fs::read_dir;
+
 const PKG_EXTENSION: &str = "sipkg";
 const MAX_NAME_SEARCH_ATTEMPTS: usize = 100;
 
 pub mod approval_process;
 pub mod builtin_module_spec;
-pub mod export_module;
 mod export_workspace;
 pub mod get_module;
 pub mod import_workspace_vote;
@@ -43,7 +43,6 @@ pub enum ModuleError {
     ChangeSet(#[from] ChangeSetError),
     #[error("Changeset not found: {0}")]
     ChangeSetNotFound(ChangeSetId),
-
     #[error(transparent)]
     DalPkg(#[from] DalPkgError),
     #[error("Trying to export from/import into root tenancy")]
@@ -232,7 +231,6 @@ pub async fn pkg_open(builder: &DalContextBuilder, file_name: &str) -> ModuleRes
 
 pub fn routes() -> Router<AppState> {
     Router::new()
-        .route("/export_module", post(export_module::export_module))
         .route(
             "/export_workspace",
             post(export_workspace::export_workspace),
diff --git a/lib/sdf-server/src/server/service/module/export_module.rs b/lib/sdf-server/src/server/service/module/export_module.rs
deleted file mode 100644
index 3f3e15b242..0000000000
--- a/lib/sdf-server/src/server/service/module/export_module.rs
+++ /dev/null
@@ -1,139 +0,0 @@
-use crate::server::extract::{AccessBuilder, HandlerContext, PosthogClient, RawAccessToken};
-use crate::server::tracking::track;
-use crate::service::module::{ModuleError, ModuleResult};
-use axum::extract::OriginalUri;
-use axum::Json;
-use dal::module::Module;
-use dal::pkg::export::PkgExporter;
-use dal::{HistoryActor, SchemaVariant, SchemaVariantId, User, Visibility};
-use serde::{Deserialize, Serialize};
-use telemetry::prelude::*;
-
-#[derive(Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct ExportModuleRequest {
-    pub name: String,
-    pub version: String,
-    pub description: Option<String>,
-    pub schema_variants: Vec<SchemaVariantId>,
-    #[serde(flatten)]
-    pub visibility: Visibility,
-}
-
-#[derive(Deserialize, Serialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub struct ExportModuleResponse {
-    pub success: bool,
-    pub full_path: String,
-}
-
-pub async fn export_module(
-    HandlerContext(builder): HandlerContext,
-    AccessBuilder(request_ctx): AccessBuilder,
-    RawAccessToken(raw_access_token): RawAccessToken,
-    PosthogClient(posthog_client): PosthogClient,
-    OriginalUri(original_uri): OriginalUri,
-    Json(request): Json<ExportModuleRequest>,
-) -> ModuleResult<Json<ExportModuleResponse>> {
-    let ctx = builder.build(request_ctx.build(request.visibility)).await?;
-
-    if request.name.trim().is_empty() {
-        return Err(ModuleError::PackageNameEmpty);
-    }
-
-    if request.version.trim().is_empty() {
-        return Err(ModuleError::PackageVersionEmpty);
-    }
-
-    if request.schema_variants.is_empty() {
-        return Err(ModuleError::PackageExportEmpty);
-    }
-
-    let module_index_url = match ctx.module_index_url() {
-        Some(url) => url,
-        None => return Err(ModuleError::ModuleIndexNotConfigured),
-    };
-
-    let user = match ctx.history_actor() {
-        HistoryActor::User(user_pk) => User::get_by_pk(&ctx, *user_pk).await?,
-        _ => None,
-    };
-
-    let (created_by_name, created_by_email) = user
-        .map(|user| (user.name().to_owned(), user.email().to_owned()))
-        .unwrap_or((
-            "unauthenticated user name".into(),
-            "unauthenticated user email".into(),
-        ));
-
-    info!("Packaging module");
-
-    // XXX:rework frontend to send schema ids
-    let mut schema_ids = vec![];
-    for variant_id in &request.schema_variants {
-        let schema = SchemaVariant::get_by_id_or_error(&ctx, *variant_id)
-            .await?
-            .schema(&ctx)
-            .await?;
-        schema_ids.push(schema.id());
-    }
-
-    let (based_on_hash, module_schema_id) = if schema_ids.len() == 1 {
-        match schema_ids.first().copied() {
-            None => (None, None),
-            Some(schema_id) => match Module::find_for_member_id(&ctx, schema_id).await? {
-                Some(module) => (Some(module.root_hash().to_string()), module.schema_id()),
-                None => (None, None),
-            },
-        }
-    } else {
-        (None, None)
-    };
-
-    let mut exporter = PkgExporter::new_module_exporter(
-        &request.name,
-        &request.version,
-        request.description.as_ref(),
-        &created_by_email,
-        schema_ids,
-    );
-
-    let module_payload = exporter.export_as_bytes(&ctx).await?;
-
-    let index_client = module_index_client::ModuleIndexClient::new(
-        module_index_url.try_into()?,
-        &raw_access_token,
-    );
-    let response = index_client
-        .upload_module(
-            request.name.trim(),
-            request.version.trim(),
-            based_on_hash,
-            module_schema_id.map(|id| id.to_string()),
-            module_payload,
-        )
-        .await?;
-
-    track(
-        &posthog_client,
-        &ctx,
-        &original_uri,
-        "export_module",
-        serde_json::json!({
-                    "pkg_name": request.name,
-                    "pkg_version": request.version,
-                    "pkg_description": request.description,
-                    "pkg_created_by_name": created_by_name,
-                    "pkg_created_by_email": created_by_email,
-                    "pkg_schema_count": request.schema_variants.len(),
-                    "pkg_hash": response.latest_hash,
-        }),
-    );
-
-    ctx.commit().await?;
-
-    Ok(Json(ExportModuleResponse {
-        success: true,
-        full_path: "Get this from module-index service".to_owned(),
-    }))
-}
diff --git a/lib/sdf-server/src/server/service/v2/module.rs b/lib/sdf-server/src/server/service/v2/module.rs
index bcf781023c..0942fda684 100644
--- a/lib/sdf-server/src/server/service/v2/module.rs
+++ b/lib/sdf-server/src/server/service/v2/module.rs
@@ -1,19 +1,37 @@
 use axum::{
     http::StatusCode,
     response::{IntoResponse, Response},
-    routing::get,
+    routing::{get, post},
     Router,
 };
+use si_frontend_types as frontend_types;
 use telemetry::prelude::*;
 use thiserror::Error;
 
 use crate::{server::state::AppState, service::ApiError};
 
+mod contribute;
 mod sync;
 
 #[remain::sorted]
 #[derive(Debug, Error)]
 pub enum ModulesAPIError {
+    #[error("axum http error: {0}")]
+    AxumHttp(#[from] axum::http::Error),
+    #[error("one or many module(s) were not contributed: {0:?}")]
+    ContributionPartialFailure(
+        Vec<(
+            frontend_types::ModuleContributeRequestItem,
+            module_index_client::ModuleIndexClientError,
+        )>,
+    ),
+    #[error("all module(s) were not contributed: {0:?}")]
+    ContributionTotalFailure(
+        Vec<(
+            frontend_types::ModuleContributeRequestItem,
+            module_index_client::ModuleIndexClientError,
+        )>,
+    ),
     #[error("module error: {0}")]
     Module(#[from] dal::module::ModuleError),
     #[error("module index client error: {0}")]
@@ -41,6 +59,9 @@ impl IntoResponse for ModulesAPIError {
                 error!(%schema_variant_id, "schema variant not found");
                 StatusCode::NOT_FOUND
             }
+            Self::Module(dal::module::ModuleError::EmptyMetadata(_, _)) => StatusCode::BAD_REQUEST,
+            Self::ContributionPartialFailure(_) => StatusCode::MULTI_STATUS,
+            Self::ContributionTotalFailure(_) => StatusCode::BAD_GATEWAY,
             _ => ApiError::DEFAULT_ERROR_STATUS_CODE,
         };
 
@@ -49,5 +70,7 @@ impl IntoResponse for ModulesAPIError {
 }
 
 pub fn v2_routes() -> Router<AppState> {
-    Router::new().route("/sync", get(sync::sync))
+    Router::new()
+        .route("/contribute", post(contribute::contribute))
+        .route("/sync", get(sync::sync))
 }
diff --git a/lib/sdf-server/src/server/service/v2/module/contribute.rs b/lib/sdf-server/src/server/service/v2/module/contribute.rs
new file mode 100644
index 0000000000..75595c42ac
--- /dev/null
+++ b/lib/sdf-server/src/server/service/v2/module/contribute.rs
@@ -0,0 +1,96 @@
+use axum::{
+    extract::{OriginalUri, Path, Query},
+    response::IntoResponse,
+};
+
+use dal::{module::Module, ChangeSetId, WorkspacePk};
+use module_index_client::ModuleIndexClient;
+use si_frontend_types as frontend_types;
+use telemetry::prelude::*;
+
+use crate::server::{
+    extract::{AccessBuilder, HandlerContext, PosthogClient, RawAccessToken},
+    tracking::track,
+};
+
+use super::ModulesAPIError;
+
+pub async fn contribute(
+    HandlerContext(builder): HandlerContext,
+    AccessBuilder(access_builder): AccessBuilder,
+    RawAccessToken(raw_access_token): RawAccessToken,
+    PosthogClient(posthog_client): PosthogClient,
+    OriginalUri(original_uri): OriginalUri,
+    Path((_workspace_pk, change_set_id)): Path<(WorkspacePk, ChangeSetId)>,
+    Query(request): Query<frontend_types::ModuleContributeRequest>,
+) -> Result<impl IntoResponse, ModulesAPIError> {
+    let ctx = builder
+        .build(access_builder.build(change_set_id.into()))
+        .await?;
+
+    // Prepare a module index client. We'll re-use it for every request.
+    let module_index_url = match ctx.module_index_url() {
+        Some(url) => url,
+        None => return Err(ModulesAPIError::ModuleIndexNotConfigured),
+    };
+    let index_client = ModuleIndexClient::new(module_index_url.try_into()?, &raw_access_token);
+
+    // Prepare data for determining http status code.
+    let item_count = request.modules.len();
+    let mut errors = Vec::new();
+
+    // NOTE(nick): right now, we contribute modules individually. Perhaps, we should do one of two things: send them in
+    // bulk OR create a module index route that takes them in bulk.
+    for module in &request.modules {
+        let (name, version, based_on_hash, schema_id, payload) = Module::prepare_contribution(
+            &ctx,
+            module.name.as_str(),
+            module.version.as_str(),
+            module.schema_id.into(),
+        )
+        .await?;
+
+        match index_client
+            .upload_module(
+                name.as_str(),
+                version.as_str(),
+                based_on_hash,
+                schema_id.map(|id| id.to_string()),
+                payload,
+            )
+            .await
+        {
+            Ok(response) => {
+                debug!(?response, "contribution complete");
+            }
+            Err(err) => {
+                error!(?err);
+                errors.push((module.to_owned(), err));
+            }
+        }
+    }
+
+    // NOTE(nick): if you are reading this, you may have noticed we do not commit here... well, at least I hope so
+    // until this comment is deleted. This is because the module index's database is the only persistent storage layer
+    // that will be mutated when contributing modules. In other words, we can process partial failures because
+    // successful contributions _will_ be successful... regardless of how the other contributions fared. There's likely
+    // some noodling and tuning to do, but this should hopefully help.
+    if errors.is_empty() {
+        if errors.len() == item_count {
+            return Err(ModulesAPIError::ContributionTotalFailure(errors));
+        }
+        return Err(ModulesAPIError::ContributionPartialFailure(errors));
+    }
+
+    track(
+        &posthog_client,
+        &ctx,
+        &original_uri,
+        "contribute",
+        serde_json::json!({
+            "modules": request.modules,
+        }),
+    );
+
+    Ok(axum::response::Response::builder().body(axum::body::Empty::new())?)
+}
diff --git a/lib/si-frontend-types-rs/src/lib.rs b/lib/si-frontend-types-rs/src/lib.rs
index 5dd019bebd..d74f42f218 100644
--- a/lib/si-frontend-types-rs/src/lib.rs
+++ b/lib/si-frontend-types-rs/src/lib.rs
@@ -1,12 +1,14 @@
 mod func;
+mod module;
 mod schema_variant;
-mod synced_modules;
 
 pub use crate::func::{
     AttributeArgumentBinding, FuncArgument, FuncArgumentKind, FuncBinding, FuncBindings, FuncCode,
     FuncSummary, LeafInputLocation,
 };
+pub use crate::module::{
+    LatestModule, ModuleContributeRequest, ModuleContributeRequestItem, SyncedModules,
+};
 pub use crate::schema_variant::{
     ComponentType, InputSocket, OutputSocket, Prop, PropKind, SchemaVariant,
 };
-pub use crate::synced_modules::{LatestModule, SyncedModules};
diff --git a/lib/si-frontend-types-rs/src/synced_modules.rs b/lib/si-frontend-types-rs/src/module.rs
similarity index 50%
rename from lib/si-frontend-types-rs/src/synced_modules.rs
rename to lib/si-frontend-types-rs/src/module.rs
index 1bce1bde9a..d33b625374 100644
--- a/lib/si-frontend-types-rs/src/synced_modules.rs
+++ b/lib/si-frontend-types-rs/src/module.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
-use si_events::SchemaVariantId;
+use si_events::{SchemaId, SchemaVariantId};
 
 pub use module_index_types::LatestModuleResponse as LatestModule;
 
@@ -17,3 +17,17 @@ impl SyncedModules {
         Self::default()
     }
 }
+
+#[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct ModuleContributeRequest {
+    pub modules: Vec<ModuleContributeRequestItem>,
+}
+
+#[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq)]
+#[serde(rename_all = "camelCase")]
+pub struct ModuleContributeRequestItem {
+    pub name: String,
+    pub version: String,
+    pub schema_id: SchemaId,
+}
diff --git a/lib/si-frontend-types-rs/src/schema_variant.rs b/lib/si-frontend-types-rs/src/schema_variant.rs
index 6ba9b54db6..603e682f68 100644
--- a/lib/si-frontend-types-rs/src/schema_variant.rs
+++ b/lib/si-frontend-types-rs/src/schema_variant.rs
@@ -27,8 +27,6 @@ pub struct SchemaVariant {
     pub timestamp: Timestamp,
     pub can_create_new_components: bool, // if yes, show in modeling screen, if not, only show in customize
     pub can_contribute: bool,
-    // FIXME(nick): this needs to be dropped once the v2 modules sync route is in use.
-    pub can_update: bool,
 }
 
 #[remain::sorted]
diff --git a/support/buck2/buck2-sync-cargo-deps.py b/support/buck2/buck2-sync-cargo-deps.py
index 44b56ebcaa..093a57a22d 100755
--- a/support/buck2/buck2-sync-cargo-deps.py
+++ b/support/buck2/buck2-sync-cargo-deps.py
@@ -39,15 +39,18 @@ def parse_args() -> argparse.Namespace:
 def main() -> int:
     args = parse_args()
 
-    # cargo_lock_updated = update_cargo_lock(
-    #     Path("Cargo.toml"),
-    #     Path("Cargo.lock"),
-    #     args.check,
-    # )
-    # if cargo_lock_updated and args.check:
-    #     print("xxx Rust Cargo.lock is not in sync with Cargo.toml")
-    #     print(REMEDIATE_MSG)
-    #     return 1
+    # TODO(nick): make it so that lockfile generation does not update deps. We probably need to use "--locked" or
+    # something analogous. If you are reading this and do not know what I am talking about, reach out to Fletcher. If
+    # you are Fletcher... hi Fletcher!
+    cargo_lock_updated = update_cargo_lock(
+        Path("Cargo.toml"),
+        Path("Cargo.lock"),
+        args.check,
+    )
+    if cargo_lock_updated and args.check:
+        print("xxx Rust Cargo.lock is not in sync with Cargo.toml")
+        print(REMEDIATE_MSG)
+        return 1
 
     cargo_toml_updated = update_third_party_rust_cargo_toml(
         Path("Cargo.toml"),

From 0918e02b716efa3388becfad2e3fdff9e739a6e4 Mon Sep 17 00:00:00 2001
From: stack72 <public@paulstack.co.uk>
Date: Thu, 25 Jul 2024 23:33:27 +0100
Subject: [PATCH 2/2] fix(dal, sdf): Change contribute workflow to work for
 single modules only

---
 app/web/src/api/sdf/dal/module.ts             |  8 +--
 app/web/src/components/AssetCard.vue          | 23 +++---
 .../src/components/AssetContributeModal.vue   | 17 ++---
 app/web/src/components/AssetListPanel.vue     | 45 ------------
 app/web/src/store/module.store.ts             |  6 +-
 lib/dal/src/module.rs                         | 20 ++++--
 lib/dal/src/schema/variant.rs                 | 13 ++--
 lib/dal/tests/integration_test/module.rs      |  8 ++-
 .../src/server/service/v2/module.rs           | 19 +----
 .../server/service/v2/module/contribute.rs    | 70 +++++++------------
 lib/si-frontend-types-rs/src/lib.rs           |  4 +-
 lib/si-frontend-types-rs/src/module.rs        | 10 +--
 12 files changed, 85 insertions(+), 158 deletions(-)

diff --git a/app/web/src/api/sdf/dal/module.ts b/app/web/src/api/sdf/dal/module.ts
index db82254003..dd3db35349 100644
--- a/app/web/src/api/sdf/dal/module.ts
+++ b/app/web/src/api/sdf/dal/module.ts
@@ -1,4 +1,4 @@
-import { SchemaId } from "./schema";
+import { SchemaId, SchemaVariantId } from "./schema";
 
 export type ModuleId = string;
 
@@ -15,11 +15,7 @@ export interface LatestModule {
 }
 
 export interface ModuleContributeRequest {
-  modules: ModuleContributeRequestItem[];
-}
-
-export interface ModuleContributeRequestItem {
   name: string;
   version: string;
-  schemaId: SchemaId;
+  schemaVariantId: SchemaVariantId;
 }
diff --git a/app/web/src/components/AssetCard.vue b/app/web/src/components/AssetCard.vue
index d37181183e..68d17e7d9b 100644
--- a/app/web/src/components/AssetCard.vue
+++ b/app/web/src/components/AssetCard.vue
@@ -124,18 +124,23 @@
 import { computed, PropType, ref } from "vue";
 import tinycolor from "tinycolor2";
 import clsx from "clsx";
-import { useTheme, Stack, Icon, ErrorMessage } from "@si/vue-lib/design-system";
+import {
+  useTheme,
+  Modal,
+  Stack,
+  Icon,
+  ErrorMessage,
+} from "@si/vue-lib/design-system";
 import { useRouter } from "vue-router";
+import { format as dateFormat } from "date-fns";
 import { useAssetStore } from "@/store/asset.store";
 import { SchemaVariantId, SchemaVariant } from "@/api/sdf/dal/schema";
 import { getAssetIcon } from "@/store/components.store";
 import { useModuleStore } from "@/store/module.store";
+import { ModuleContributeRequest } from "@/api/sdf/dal/module";
 import IconButton from "./IconButton.vue";
 import EditingPill from "./EditingPill.vue";
 import AssetContributeModal from "./AssetContributeModal.vue";
-import { Modal } from "@si/vue-lib/design-system";
-import { ModuleContributeRequest } from "@/api/sdf/dal/module";
-import { format as dateFormat, parseISO } from "date-fns";
 
 const props = defineProps({
   titleCard: { type: Boolean },
@@ -155,16 +160,14 @@ const contributeAsset = () => contributeAssetModalRef.value?.open();
 const onContributeAsset = () => contributeAssetSuccessModalRef.value?.open();
 
 const contributeRequest = computed((): ModuleContributeRequest => {
-  const modules = [];
   if (asset.value) {
     const version = dateFormat(Date.now(), "yyyyMMddkkmmss");
-    modules.push({
+    return {
       name: `${asset.value.schemaName} ${version}`,
       version,
-      schemaId: asset.value.schemaId,
-    });
-  }
-  return { modules };
+      schemaVariantId: asset.value.schemaVariantId,
+    };
+  } else throw new Error("cannot contribute: no asset selected");
 });
 
 const editingVersionDoesNotExist = computed<boolean>(
diff --git a/app/web/src/components/AssetContributeModal.vue b/app/web/src/components/AssetContributeModal.vue
index 9340694f32..3489d81507 100644
--- a/app/web/src/components/AssetContributeModal.vue
+++ b/app/web/src/components/AssetContributeModal.vue
@@ -1,19 +1,12 @@
 <template>
   <Modal ref="modalRef" title="Contribute Assets">
     <Stack>
-      <ul
+      <div
         v-if="enableContributeButton"
         class="flex flex-col gap-2xs max-h-72 overflow-auto"
       >
-        <li
-          v-for="module in props.contributeRequest.modules"
-          :key="module.schemaId"
-          class="flex px-1 items-center"
-        >
-          <span class="pr-2 select-none">•</span>
-          {{ module.name }}
-        </li>
-      </ul>
+        {{ props.contributeRequest.name }}
+      </div>
       <ErrorMessage
         v-if="contributeModuleReqStatus.isError"
         :requestStatus="contributeModuleReqStatus"
@@ -51,12 +44,10 @@ import { ref, computed } from "vue";
 import {
   Modal,
   VButton,
-  VormInput,
   useModal,
   Stack,
   ErrorMessage,
 } from "@si/vue-lib/design-system";
-import { format as dateFormat, parseISO } from "date-fns";
 import * as _ from "lodash-es";
 import { useModuleStore } from "@/store/module.store";
 import { ModuleContributeRequest } from "@/api/sdf/dal/module";
@@ -100,7 +91,7 @@ const isOpen = computed(() => modalRef.value?.isOpen);
 defineExpose({ open, close, isOpen });
 
 const enableContributeButton = computed(() => {
-  return props.contributeRequest.modules.length > 0;
+  return props.contributeRequest;
 });
 
 const contributeAssets = async () => {
diff --git a/app/web/src/components/AssetListPanel.vue b/app/web/src/components/AssetListPanel.vue
index 0c5c6582d4..312cb4ed5e 100644
--- a/app/web/src/components/AssetListPanel.vue
+++ b/app/web/src/components/AssetListPanel.vue
@@ -38,17 +38,6 @@
             variant="simple"
             @click="() => newAssetModalRef?.modal?.open()"
           />
-          <IconButton
-            v-if="canContribute || true"
-            :selected="contributeAssetModalRef?.isOpen || false"
-            class="hover:scale-125"
-            icon="cloud-upload"
-            size="sm"
-            tooltip="Contribute All"
-            tooltipPlacement="top"
-            variant="simple"
-            @click="contributeAsset"
-          />
           <IconButton
             v-if="canUpdate"
             class="hover:scale-125"
@@ -113,11 +102,6 @@
         />
       </TreeNode>
     </template>
-    <AssetContributeModal
-      ref="contributeAssetModalRef"
-      :contributeRequest="contributeRequest"
-      @contribute-success="onContributeAsset"
-    />
     <Modal
       ref="contributeAssetSuccessModalRef"
       size="sm"
@@ -147,19 +131,13 @@ import {
   PillCounter,
 } from "@si/vue-lib/design-system";
 import { useRouter } from "vue-router";
-import { format as dateFormat, parseISO } from "date-fns";
 import SiSearch, { Filter } from "@/components/SiSearch.vue";
-import {
-  ModuleContributeRequest,
-  ModuleContributeRequestItem,
-} from "@/api/sdf/dal/module";
 import { useAssetStore } from "@/store/asset.store";
 import { SchemaVariant } from "@/api/sdf/dal/schema";
 import { getAssetIcon } from "@/store/components.store";
 import { useModuleStore } from "@/store/module.store";
 import AssetNameModal from "./AssetNameModal.vue";
 import AssetListItem from "./AssetListItem.vue";
-import AssetContributeModal from "./AssetContributeModal.vue";
 import SidebarSubpanelTitle from "./SidebarSubpanelTitle.vue";
 import IconButton from "./IconButton.vue";
 
@@ -175,8 +153,6 @@ const loadAssetsReqStatus = assetStore.getRequestStatus(
 );
 const syncModulesReqStatus = moduleStore.getRequestStatus("SYNC");
 
-const contributeAssetModalRef =
-  ref<InstanceType<typeof AssetContributeModal>>();
 const contributeAssetSuccessModalRef = ref<InstanceType<typeof Modal>>();
 const newAssetModalRef = ref<InstanceType<typeof AssetNameModal>>();
 
@@ -187,24 +163,6 @@ const onSearch = (search: string) => {
   searchString.value = search.trim().toLocaleLowerCase();
 };
 
-const contributeRequest = computed((): ModuleContributeRequest => {
-  let modules = [] as ModuleContributeRequestItem[];
-  const filteredSchemaVariants = _.filter(
-    assetStore.schemaVariants,
-    (schemaVariant) => schemaVariant.canContribute,
-  );
-  const version = dateFormat(Date.now(), "yyyyMMddkkmmss");
-  modules = _.map(filteredSchemaVariants, (filteredSchemaVariant) => ({
-    name: `${filteredSchemaVariant.schemaName} ${version}`,
-    version,
-    schemaId: filteredSchemaVariant.schemaId,
-  }));
-  return { modules };
-});
-
-const canContribute = computed(() =>
-  assetList.value.some((a) => a.canContribute),
-);
 const canUpdate = computed(
   () => Object.keys(moduleStore.upgradeableModules).length !== 0,
 );
@@ -282,9 +240,6 @@ const updateAllAssets = () => {
   });
 };
 
-const contributeAsset = () => contributeAssetModalRef.value?.open();
-const onContributeAsset = () => contributeAssetSuccessModalRef.value?.open();
-
 const filters = computed(() => [
   assetList.value.filter((a) => a.canContribute),
   assetList.value.filter(
diff --git a/app/web/src/store/module.store.ts b/app/web/src/store/module.store.ts
index 62d1a400f9..24541c6605 100644
--- a/app/web/src/store/module.store.ts
+++ b/app/web/src/store/module.store.ts
@@ -232,7 +232,11 @@ export const useModuleStore = () => {
             return new ApiRequest({
               method: "post",
               url: `v2/workspaces/${workspaceId}/change-sets/${changeSetId}/modules/contribute`,
-              params: { ...visibility, ...request },
+              params: {
+                name: request.name,
+                version: request.version,
+                schemaVariantId: request.schemaVariantId,
+              },
             });
           },
 
diff --git a/lib/dal/src/module.rs b/lib/dal/src/module.rs
index 99464c3600..f2b4b82f3f 100644
--- a/lib/dal/src/module.rs
+++ b/lib/dal/src/module.rs
@@ -530,14 +530,14 @@ impl Module {
         fields(
             name = name.as_ref(),
             version = version.as_ref(),
-            %schema_id
+            %schema_variant_id
         )
     )]
     pub async fn prepare_contribution(
         ctx: &DalContext,
         name: impl AsRef<str>,
         version: impl AsRef<str>,
-        schema_id: SchemaId,
+        schema_variant_id: SchemaVariantId,
     ) -> ModuleResult<(String, String, Option<String>, Option<SchemaId>, Vec<u8>)> {
         let user = match ctx.history_actor() {
             HistoryActor::User(user_pk) => User::get_by_pk(ctx, *user_pk).await?,
@@ -561,14 +561,24 @@ impl Module {
             ));
         }
 
+        // The frontend will send us the schema variant as this is what we care about from
+        // there. We can then use that schema variant to be able to understand the associated
+        // schema for it.
+        let variant = SchemaVariant::get_by_id_or_error(ctx, schema_variant_id).await?;
+        let associated_schema = variant.schema(ctx).await?;
+
         // Create module payload.
-        let mut exporter =
-            PkgExporter::new_for_module_contribution(name, version, &created_by_email, schema_id);
+        let mut exporter = PkgExporter::new_for_module_contribution(
+            name,
+            version,
+            &created_by_email,
+            associated_schema.id(),
+        );
         let module_payload = exporter.export_as_bytes(ctx).await.map_err(Box::new)?;
 
         // Check if local information exists for contribution metadata.
         let (local_module_based_on_hash, local_module_schema_id) =
-            match Module::find_for_member_id(ctx, schema_id).await? {
+            match Module::find_for_member_id(ctx, associated_schema.id()).await? {
                 Some(module) => (
                     Some(module.root_hash().to_string()),
                     module.schema_id().map(|id| id.into()),
diff --git a/lib/dal/src/schema/variant.rs b/lib/dal/src/schema/variant.rs
index 710a12162c..0a1f9f32ec 100644
--- a/lib/dal/src/schema/variant.rs
+++ b/lib/dal/src/schema/variant.rs
@@ -27,6 +27,7 @@ use crate::layer_db_types::{
     ContentTypeError, InputSocketContent, OutputSocketContent, SchemaVariantContent,
     SchemaVariantContentV2,
 };
+use crate::module::Module;
 use crate::prop::{PropError, PropPath};
 use crate::schema::variant::root_prop::RootProp;
 use crate::socket::input::InputSocketError;
@@ -115,6 +116,8 @@ pub enum SchemaVariantError {
     LeafMapPropNotFound(PropId),
     #[error("schema variant missing asset func id; schema_variant_id={0}")]
     MissingAssetFuncId(SchemaVariantId),
+    #[error("module error: {0}")]
+    Module(String),
     #[error("more than one schema found for schema variant: {0}")]
     MoreThanOneSchemaFound(SchemaVariantId),
     #[error("node weight error: {0}")]
@@ -777,14 +780,16 @@ impl SchemaVariant {
         }
     }
 
-    // NOTE(nick): we've determined that a module can be contributed if it is the default. For now, we are allowing
-    // unlocked variants to be contributed. Ask Paul for more information. I hate leaving Linear issues here since
-    // the community cannot see them, but ENG-2607 for context.
     pub async fn can_be_contributed_by_id(
         ctx: &DalContext,
         id: SchemaVariantId,
     ) -> SchemaVariantResult<bool> {
-        Ok(Self::is_default_by_id(ctx, id).await?)
+        Ok(Self::is_default_by_id(ctx, id).await?
+            && Self::is_locked_by_id(ctx, id).await?
+            && Module::find_for_member_id(ctx, id)
+                .await
+                .map_err(|e| SchemaVariantError::Module(e.to_string()))?
+                .is_none())
     }
 
     pub async fn get_latest_for_schema(
diff --git a/lib/dal/tests/integration_test/module.rs b/lib/dal/tests/integration_test/module.rs
index 7ced4f60d3..c4dca3d6e9 100644
--- a/lib/dal/tests/integration_test/module.rs
+++ b/lib/dal/tests/integration_test/module.rs
@@ -246,8 +246,14 @@ async fn prepare_contribution_works(ctx: &DalContext) {
     let name = "Paul's Test Pkg With Extra Spaces At The End    ";
     let version = "    Version With Spaces At The Beginning 2019-06-03";
 
+    let default_variant_id = schema
+        .get_default_schema_variant_id(ctx)
+        .await
+        .expect("unable to get a default variant")
+        .expect("error getting the default variant id");
+
     let (actual_name, actual_version, _, _, _) =
-        Module::prepare_contribution(ctx, name, version, schema.id())
+        Module::prepare_contribution(ctx, name, version, default_variant_id)
             .await
             .expect("could not prepare contribution");
 
diff --git a/lib/sdf-server/src/server/service/v2/module.rs b/lib/sdf-server/src/server/service/v2/module.rs
index 0942fda684..8e49a9fa31 100644
--- a/lib/sdf-server/src/server/service/v2/module.rs
+++ b/lib/sdf-server/src/server/service/v2/module.rs
@@ -18,20 +18,8 @@ mod sync;
 pub enum ModulesAPIError {
     #[error("axum http error: {0}")]
     AxumHttp(#[from] axum::http::Error),
-    #[error("one or many module(s) were not contributed: {0:?}")]
-    ContributionPartialFailure(
-        Vec<(
-            frontend_types::ModuleContributeRequestItem,
-            module_index_client::ModuleIndexClientError,
-        )>,
-    ),
-    #[error("all module(s) were not contributed: {0:?}")]
-    ContributionTotalFailure(
-        Vec<(
-            frontend_types::ModuleContributeRequestItem,
-            module_index_client::ModuleIndexClientError,
-        )>,
-    ),
+    #[error("module not contributed: {0:?}")]
+    ContributionFailure(frontend_types::ModuleContributeRequest),
     #[error("module error: {0}")]
     Module(#[from] dal::module::ModuleError),
     #[error("module index client error: {0}")]
@@ -60,8 +48,7 @@ impl IntoResponse for ModulesAPIError {
                 StatusCode::NOT_FOUND
             }
             Self::Module(dal::module::ModuleError::EmptyMetadata(_, _)) => StatusCode::BAD_REQUEST,
-            Self::ContributionPartialFailure(_) => StatusCode::MULTI_STATUS,
-            Self::ContributionTotalFailure(_) => StatusCode::BAD_GATEWAY,
+            Self::ContributionFailure(_) => StatusCode::BAD_REQUEST,
             _ => ApiError::DEFAULT_ERROR_STATUS_CODE,
         };
 
diff --git a/lib/sdf-server/src/server/service/v2/module/contribute.rs b/lib/sdf-server/src/server/service/v2/module/contribute.rs
index 75595c42ac..9be281d166 100644
--- a/lib/sdf-server/src/server/service/v2/module/contribute.rs
+++ b/lib/sdf-server/src/server/service/v2/module/contribute.rs
@@ -1,12 +1,12 @@
 use axum::{
-    extract::{OriginalUri, Path, Query},
+    extract::{OriginalUri, Path},
     response::IntoResponse,
+    Json,
 };
 
 use dal::{module::Module, ChangeSetId, WorkspacePk};
 use module_index_client::ModuleIndexClient;
 use si_frontend_types as frontend_types;
-use telemetry::prelude::*;
 
 use crate::server::{
     extract::{AccessBuilder, HandlerContext, PosthogClient, RawAccessToken},
@@ -22,7 +22,7 @@ pub async fn contribute(
     PosthogClient(posthog_client): PosthogClient,
     OriginalUri(original_uri): OriginalUri,
     Path((_workspace_pk, change_set_id)): Path<(WorkspacePk, ChangeSetId)>,
-    Query(request): Query<frontend_types::ModuleContributeRequest>,
+    Json(request): Json<frontend_types::ModuleContributeRequest>,
 ) -> Result<impl IntoResponse, ModulesAPIError> {
     let ctx = builder
         .build(access_builder.build(change_set_id.into()))
@@ -35,52 +35,25 @@ pub async fn contribute(
     };
     let index_client = ModuleIndexClient::new(module_index_url.try_into()?, &raw_access_token);
 
-    // Prepare data for determining http status code.
-    let item_count = request.modules.len();
-    let mut errors = Vec::new();
+    let (name, version, based_on_hash, schema_id, payload) = Module::prepare_contribution(
+        &ctx,
+        request.name.as_str(),
+        request.version.as_str(),
+        request.schema_variant_id.into(),
+    )
+    .await?;
 
-    // NOTE(nick): right now, we contribute modules individually. Perhaps, we should do one of two things: send them in
-    // bulk OR create a module index route that takes them in bulk.
-    for module in &request.modules {
-        let (name, version, based_on_hash, schema_id, payload) = Module::prepare_contribution(
-            &ctx,
-            module.name.as_str(),
-            module.version.as_str(),
-            module.schema_id.into(),
+    let response = index_client
+        .upload_module(
+            name.as_str(),
+            version.as_str(),
+            based_on_hash.clone(),
+            schema_id.map(|id| id.to_string()),
+            payload,
         )
         .await?;
 
-        match index_client
-            .upload_module(
-                name.as_str(),
-                version.as_str(),
-                based_on_hash,
-                schema_id.map(|id| id.to_string()),
-                payload,
-            )
-            .await
-        {
-            Ok(response) => {
-                debug!(?response, "contribution complete");
-            }
-            Err(err) => {
-                error!(?err);
-                errors.push((module.to_owned(), err));
-            }
-        }
-    }
-
-    // NOTE(nick): if you are reading this, you may have noticed we do not commit here... well, at least I hope so
-    // until this comment is deleted. This is because the module index's database is the only persistent storage layer
-    // that will be mutated when contributing modules. In other words, we can process partial failures because
-    // successful contributions _will_ be successful... regardless of how the other contributions fared. There's likely
-    // some noodling and tuning to do, but this should hopefully help.
-    if errors.is_empty() {
-        if errors.len() == item_count {
-            return Err(ModulesAPIError::ContributionTotalFailure(errors));
-        }
-        return Err(ModulesAPIError::ContributionPartialFailure(errors));
-    }
+    ctx.commit().await?;
 
     track(
         &posthog_client,
@@ -88,7 +61,12 @@ pub async fn contribute(
         &original_uri,
         "contribute",
         serde_json::json!({
-            "modules": request.modules,
+            "name": name,
+            "version": version,
+            "based_on_hash": based_on_hash,
+            "schema_variant_id": request.schema_variant_id,
+            "schema_id": schema_id,
+            "pkg_hash": response.latest_hash,
         }),
     );
 
diff --git a/lib/si-frontend-types-rs/src/lib.rs b/lib/si-frontend-types-rs/src/lib.rs
index d74f42f218..719f84f326 100644
--- a/lib/si-frontend-types-rs/src/lib.rs
+++ b/lib/si-frontend-types-rs/src/lib.rs
@@ -6,9 +6,7 @@ pub use crate::func::{
     AttributeArgumentBinding, FuncArgument, FuncArgumentKind, FuncBinding, FuncBindings, FuncCode,
     FuncSummary, LeafInputLocation,
 };
-pub use crate::module::{
-    LatestModule, ModuleContributeRequest, ModuleContributeRequestItem, SyncedModules,
-};
+pub use crate::module::{LatestModule, ModuleContributeRequest, SyncedModules};
 pub use crate::schema_variant::{
     ComponentType, InputSocket, OutputSocket, Prop, PropKind, SchemaVariant,
 };
diff --git a/lib/si-frontend-types-rs/src/module.rs b/lib/si-frontend-types-rs/src/module.rs
index d33b625374..95d9e332c8 100644
--- a/lib/si-frontend-types-rs/src/module.rs
+++ b/lib/si-frontend-types-rs/src/module.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
 use serde::{Deserialize, Serialize};
-use si_events::{SchemaId, SchemaVariantId};
+use si_events::SchemaVariantId;
 
 pub use module_index_types::LatestModuleResponse as LatestModule;
 
@@ -21,13 +21,7 @@ impl SyncedModules {
 #[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq)]
 #[serde(rename_all = "camelCase")]
 pub struct ModuleContributeRequest {
-    pub modules: Vec<ModuleContributeRequestItem>,
-}
-
-#[derive(Clone, Debug, Deserialize, Eq, Serialize, PartialEq)]
-#[serde(rename_all = "camelCase")]
-pub struct ModuleContributeRequestItem {
     pub name: String,
     pub version: String,
-    pub schema_id: SchemaId,
+    pub schema_variant_id: SchemaVariantId,
 }