@doenet/assignment-viewer 0.1.0-alpha4 → 0.1.0-alpha5

package/dist/index.js

@@ -1649,12 +1649,7 @@ function isSingleDocState(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "singleDoc" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSingleDocSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && typeof attempt.variant === "number"
-      )
-    )
+    typedObj.type === "singleDoc" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSingleDocSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && typeof typedObj.attemptNumber === "number" && typeof typedObj.currentVariant === "number" && Array.isArray(typedObj.previousVariants) && typedObj.previousVariants.every((x2) => typeof x2 === "number") && typeof typedObj.initialQuestionCounter === "number" && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function isSingleDocStateNoSource(obj) {
@@ -1662,12 +1657,7 @@ function isSingleDocStateNoSource(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "singleDoc" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && typeof attempt.variant === "number"
-      )
-    )
+    typedObj.type === "singleDoc" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && typeof typedObj.attemptNumber === "number" && typeof typedObj.currentVariant === "number" && Array.isArray(typedObj.previousVariants) && typedObj.previousVariants.every((x2) => typeof x2 === "number") && typeof typedObj.initialQuestionCounter === "number" && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function initializeSingleDocState({
@@ -1684,7 +1674,11 @@ function initializeSingleDocState({
     source,
     initialVariant: variant,
     creditAchieved: 0,
-    attempts: [],
+    attemptNumber: 0,
+    currentVariant: 0,
+    previousVariants: [],
+    initialQuestionCounter: 0,
+    doenetStateIdx: null,
     restrictToVariantSlice
   };
 }
@@ -1693,16 +1687,15 @@ function generateNewSingleDocAttempt({
   numActivityVariants,
   initialQuestionCounter,
   questionCounts,
-  parentAttempt,
-  resetCredit = false
+  parentAttempt
 }) {
-  const previousVariants = state.attempts.map((a) => a.variant);
+  const previousVariants = state.previousVariants;
   const numVariants = calcNumVariantsFromState(state, numActivityVariants);
   const numPrevVariants = previousVariants.length;
   const numVariantsToExclude = numPrevVariants % numVariants;
   const numVariantOptions = numVariants - numVariantsToExclude;
   const variantsToExclude = previousVariants.slice(numPrevVariants - numVariantsToExclude, numPrevVariants).sort((a, b2) => a - b2);
-  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attempts.length.toString() + "|" + parentAttempt.toString();
+  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attemptNumber.toString() + "|" + parentAttempt.toString();
   const rng = rngClass$3(rngSeed);
   let selectedVariant = Math.floor(rng() * numVariantOptions) + 1;
   for (const excludedVariant of variantsToExclude) {
@@ -1713,40 +1706,36 @@ function generateNewSingleDocAttempt({
   if (state.restrictToVariantSlice) {
     selectedVariant = (selectedVariant - 1) * state.restrictToVariantSlice.numSlices + state.restrictToVariantSlice.idx;
   }
-  const newAttemptState = {
-    variant: selectedVariant,
-    doenetState: null,
+  const finalQuestionCounter = initialQuestionCounter + questionCounts[state.source.id];
+  const newState = {
+    ...state,
     creditAchieved: 0,
+    attemptNumber: state.attemptNumber + 1,
+    currentVariant: selectedVariant,
+    previousVariants: [...state.previousVariants, selectedVariant],
+    doenetStateIdx: null,
     initialQuestionCounter
   };
-  const finalQuestionCounter = initialQuestionCounter + questionCounts[state.source.id];
-  const newState = { ...state };
-  newState.attempts = [...newState.attempts, newAttemptState];
-  if (resetCredit) {
-    newState.creditAchieved = 0;
-  }
   return { finalQuestionCounter, state: newState };
 }
-function extractSingleDocItemCredit(activityState) {
+function extractSingleDocItemCredit(activityState, nPrevInShuffleOrder = 0) {
   if (activityState.source.isDescription) {
     return [];
   } else {
     return [
       {
         id: activityState.id,
-        score: activityState.creditAchieved
+        score: activityState.creditAchieved,
+        docId: activityState.id,
+        shuffledOrder: nPrevInShuffleOrder + 1,
+        variant: activityState.currentVariant
       }
     ];
   }
 }
-function pruneSingleDocStateForSave(activityState, clearDoenetState) {
+function pruneSingleDocStateForSave(activityState) {
   const { source: _source, ...newState } = { ...activityState };
-  const numAttempts = newState.attempts.length;
-  const attempts = newState.attempts.map((attempt, i) => ({
-    ...attempt,
-    doenetState: clearDoenetState || i !== numAttempts - 1 ? null : attempt.doenetState
-  }));
-  return { ...newState, attempts };
+  return newState;
 }
 function addSourceToSingleDocState(activityState, source) {
   return { ...activityState, source };
@@ -1765,12 +1754,7 @@ function isSelectState(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "select" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSelectSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.latestChildStates) && typedObj.latestChildStates.every(isActivityState) && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && Array.isArray(attempt.activities) && attempt.activities.every(isActivityState)
-      )
-    )
+    typedObj.type === "select" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSelectSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.allChildren) && typedObj.allChildren.every(isActivityState) && typeof typedObj.attemptNumber === "number" && Array.isArray(typedObj.selectedChildren) && typedObj.selectedChildren.every(isActivityState) && Array.isArray(typedObj.previousSelections) && typedObj.previousSelections.every((x2) => typeof x2 === "string") && typeof typedObj.initialQuestionCounter === "number" && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function isSelectStateNoSource(obj) {
@@ -1778,12 +1762,7 @@ function isSelectStateNoSource(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "select" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.latestChildStates) && typedObj.latestChildStates.every(isActivityStateNoSource) && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && Array.isArray(attempt.activities) && attempt.activities.every(isActivityStateNoSource)
-      )
-    )
+    typedObj.type === "select" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.allChildren) && typedObj.allChildren.every(isActivityStateNoSource) && typeof typedObj.attemptNumber === "number" && Array.isArray(typedObj.selectedChildren) && typedObj.selectedChildren.every(isActivityStateNoSource) && Array.isArray(typedObj.previousSelections) && typedObj.previousSelections.every((x2) => typeof x2 === "string") && typeof typedObj.initialQuestionCounter === "number" && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function initializeSelectState({
@@ -1845,8 +1824,11 @@ function initializeSelectState({
     source,
     initialVariant: variant,
     creditAchieved: 0,
-    latestChildStates: childStates,
-    attempts: [],
+    allChildren: childStates,
+    attemptNumber: 0,
+    selectedChildren: [],
+    previousSelections: [],
+    initialQuestionCounter: 0,
     restrictToVariantSlice
   };
 }
@@ -1855,16 +1837,15 @@ function generateNewSelectAttempt({
   numActivityVariants,
   initialQuestionCounter,
   questionCounts,
-  parentAttempt,
-  resetCredit = false
+  parentAttempt
 }) {
   const source = state.source;
   const numToSelect = source.numToSelect;
-  const numChildren = state.latestChildStates.length;
+  const numChildren = state.allChildren.length;
   if (numChildren === 0) {
     return { finalQuestionCounter: initialQuestionCounter, state };
   }
-  const numVariantsPerChild = state.latestChildStates.map(
+  const numVariantsPerChild = state.allChildren.map(
     (a) => calcNumVariantsFromState(a, numActivityVariants)
   );
   const totalNumOptions = source.selectByVariant ? numVariantsPerChild.reduce((a, c2) => a + c2) : numChildren;
@@ -1889,14 +1870,14 @@ function generateNewSelectAttempt({
     }
   }
   const childIdToIdx = {};
-  for (const [idx, child] of state.latestChildStates.entries()) {
+  for (const [idx, child] of state.allChildren.entries()) {
     childIdToIdx[child.id] = idx;
   }
-  const numPrevSelected = numToSelect * state.attempts.length;
+  const numPrevSelected = numToSelect * state.attemptNumber;
   const numInGroup = numPrevSelected % totalNumOptions;
   const numLeftInGroup = totalNumOptions - numInGroup;
   const childCountsInGroup = Array(numChildren).fill(0);
-  for (const childId of state.attempts.flatMap((attempt) => attempt.activities.map((activity) => activity.id)).reverse().slice(0, numInGroup)) {
+  for (const childId of [...state.previousSelections].reverse().slice(0, numInGroup)) {
     childCountsInGroup[childIdToIdx[childId]]++;
   }
   const childOptionsLeft = childCountsInGroup.flatMap((cnt, idx) => {
@@ -1913,7 +1894,7 @@ function generateNewSelectAttempt({
   if (childOptionsLeft.length !== numLeftInGroup) {
     throw Error("we did something wrong");
   }
-  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attempts.length.toString() + "|" + parentAttempt.toString();
+  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attemptNumber.toString() + "|" + parentAttempt.toString();
   const rng = rngClass$2(rngSeed);
   const childrenChosen = [];
   for (let i = 0; i < Math.min(numToSelect, numLeftInGroup); i++) {
@@ -1940,7 +1921,7 @@ function generateNewSelectAttempt({
     }
   }
   const newActivityStates = [];
-  const newActivityOptionStates = [...state.latestChildStates];
+  const newActivityOptionStates = [...state.allChildren];
   let questionCounter = initialQuestionCounter;
   for (const childIdx of childrenChosen) {
     const { finalQuestionCounter: endCounter, state: newState2 } = generateNewActivityAttempt({
@@ -1948,26 +1929,24 @@ function generateNewSelectAttempt({
       numActivityVariants,
       initialQuestionCounter: questionCounter,
       questionCounts,
-      parentAttempt: state.attempts.length + 1,
-      resetCredit: true
+      parentAttempt: state.attemptNumber + 1
     });
     questionCounter = endCounter;
     newActivityOptionStates[childIdx] = newState2;
     newActivityStates.push(newState2);
   }
-  const newAttemptState = {
-    activities: newActivityStates,
-    creditAchieved: 0,
-    initialQuestionCounter
-  };
   const newState = {
     ...state,
-    latestChildStates: newActivityOptionStates
+    creditAchieved: 0,
+    allChildren: newActivityOptionStates,
+    attemptNumber: state.attemptNumber + 1,
+    selectedChildren: newActivityStates,
+    previousSelections: [
+      ...state.previousSelections,
+      ...newActivityStates.map((s) => s.id)
+    ],
+    initialQuestionCounter
   };
-  newState.attempts = [...newState.attempts, newAttemptState];
-  if (resetCredit) {
-    newState.creditAchieved = 0;
-  }
   return { finalQuestionCounter: questionCounter, state: newState };
 }
 function generateNewSingleDocAttemptForMultiSelect({
@@ -1980,35 +1959,25 @@ function generateNewSingleDocAttemptForMultiSelect({
 }) {
   const source = state.source;
   const numToSelect = source.numToSelect;
-  if (numToSelect === 1 || state.attempts.length === 0) {
+  if (numToSelect === 1 || state.attemptNumber === 0) {
     throw Error(
       "no reason to call when selecting just one item or for first attempt"
     );
   }
-  const numChildren = state.latestChildStates.length;
+  const numChildren = state.allChildren.length;
   const childIdToIdx = {};
-  for (const [idx, child] of state.latestChildStates.entries()) {
+  for (const [idx, child] of state.allChildren.entries()) {
     childIdToIdx[child.id] = idx;
   }
-  const lastAttempt = state.attempts[state.attempts.length - 1];
-  const otherSelectedIds = lastAttempt.activities.filter((a) => a.id !== childId).map((a) => a.id);
+  const otherSelectedIds = state.selectedChildren.filter((a) => a.id !== childId).map((a) => a.id);
   if (otherSelectedIds.length !== numToSelect - 1) {
     throw Error("We made a miscalculation");
   }
-  const idOptions = state.latestChildStates.map((s) => s.id).filter((id2) => !otherSelectedIds.includes(id2));
+  const idOptions = state.allChildren.map((s) => s.id).filter((id2) => !otherSelectedIds.includes(id2));
   const numOptions = idOptions.length;
-  const prevSelectionOfOptions = state.attempts.flatMap((attempt) => {
-    if (attempt.singleItemReplacementIdx === void 0) {
-      return attempt.activities.map((activity) => activity.id).filter((id2) => !otherSelectedIds.includes(id2));
-    } else {
-      const changedId = attempt.activities[attempt.singleItemReplacementIdx].id;
-      if (otherSelectedIds.includes(changedId)) {
-        return [];
-      } else {
-        return [changedId];
-      }
-    }
-  });
+  const prevSelectionOfOptions = state.previousSelections.filter(
+    (id2) => !otherSelectedIds.includes(id2)
+  );
   const numPrevSelections = prevSelectionOfOptions.length;
   const numInGroup = numPrevSelections % numOptions;
   const additionalExcludes = prevSelectionOfOptions.slice(
@@ -2016,8 +1985,8 @@ function generateNewSingleDocAttemptForMultiSelect({
     numPrevSelections
   );
   const idxOfAllExcluded = [...otherSelectedIds, ...additionalExcludes].map((id2) => childIdToIdx[id2]).sort((a, b2) => a - b2);
-  const slotNum = lastAttempt.activities.map((a) => a.id).indexOf(childId);
-  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attempts.length.toString() + "|" + parentAttempt.toString();
+  const slotNum = state.selectedChildren.map((a) => a.id).indexOf(childId);
+  const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attemptNumber.toString() + "|" + parentAttempt.toString();
   const rng = rngClass$2(rngSeed);
   let selectedIdx = Math.floor(
     rng() * (numChildren - idxOfAllExcluded.length)
@@ -2027,86 +1996,92 @@ function generateNewSingleDocAttemptForMultiSelect({
       selectedIdx++;
     }
   }
-  const newActivityStates = [...lastAttempt.activities];
-  const newActivityOptionStates = [...state.latestChildStates];
+  const newActivityStates = [...state.selectedChildren];
+  const newActivityOptionStates = [...state.allChildren];
   const { finalQuestionCounter, state: newChildState } = generateNewActivityAttempt({
     state: newActivityOptionStates[selectedIdx],
     numActivityVariants,
     initialQuestionCounter,
     questionCounts,
-    parentAttempt: state.attempts.length + 1
+    parentAttempt: state.attemptNumber + 1
   });
-  const childStatePreserveCredit = { ...newChildState };
-  childStatePreserveCredit.creditAchieved = lastAttempt.activities[slotNum].creditAchieved;
-  newActivityOptionStates[selectedIdx] = childStatePreserveCredit;
-  newActivityStates[slotNum] = childStatePreserveCredit;
-  const newAttemptState = {
-    activities: newActivityStates,
-    creditAchieved: lastAttempt.creditAchieved,
-    // keep credit achieved the same
-    initialQuestionCounter,
-    // indicate that this select attempt is really just about replacing the child from `slotNum`
-    singleItemReplacementIdx: slotNum
-  };
+  newActivityOptionStates[selectedIdx] = newChildState;
+  newActivityStates[slotNum] = newChildState;
+  const latestOtherCreditAchieved = state.selectedChildren.filter((_2, i) => i != slotNum).map((a) => a.creditAchieved);
+  const creditAchieved = latestOtherCreditAchieved.reduce((a, c2) => a + c2, 0) / state.selectedChildren.length;
   const newState = {
     ...state,
-    latestChildStates: newActivityOptionStates,
-    attempts: [...state.attempts, newAttemptState]
+    allChildren: newActivityOptionStates,
+    selectedChildren: newActivityStates,
+    creditAchieved,
+    previousSelections: [...state.previousSelections, newChildState.id],
+    initialQuestionCounter
   };
   return { finalQuestionCounter, state: newState };
 }
-function extractSelectItemCredit(activityState) {
-  if (activityState.source.numToSelect === 1 && activityState.latestChildStates.every(
-    (child) => child.type === "singleDoc"
-  )) {
-    return [{ id: activityState.id, score: activityState.creditAchieved }];
-  } else if (activityState.attempts.length === 0) {
-    return [{ id: activityState.id, score: 0 }];
+function extractSelectItemCredit(activityState, nPrevInShuffleOrder = 0) {
+  if (activityState.attemptNumber === 0) {
+    const nChildren = activityState.allChildren.length;
+    if (nChildren === 0) {
+      return [];
+    }
+    const results = [];
+    let nPrev = nPrevInShuffleOrder;
+    for (let i = 0; i < activityState.source.numToSelect; i++) {
+      const childState = activityState.allChildren[i % nChildren];
+      const next = extractActivityItemCredit(childState, nPrev);
+      nPrev += next.length;
+      results.push(...next);
+    }
+    return results;
+  }
+  if (activityState.source.numToSelect === 1 && activityState.allChildren.every((child) => child.type === "singleDoc")) {
+    return [
+      {
+        id: activityState.id,
+        score: activityState.creditAchieved,
+        docId: activityState.selectedChildren[0].id,
+        shuffledOrder: nPrevInShuffleOrder + 1,
+        variant: activityState.selectedChildren[0].currentVariant
+      }
+    ];
   } else {
-    const latestAttempt = activityState.attempts[activityState.attempts.length - 1];
-    return latestAttempt.activities.flatMap(
-      (state) => extractActivityItemCredit(state)
-    );
+    let nPrev = nPrevInShuffleOrder;
+    return activityState.selectedChildren.flatMap((state) => {
+      const next = extractActivityItemCredit(state, nPrev);
+      nPrev += next.length;
+      return next;
+    });
   }
 }
-function pruneSelectStateForSave(activityState, clearDoenetState) {
+function pruneSelectStateForSave(activityState) {
   const { source: _source, ...newState } = { ...activityState };
-  const latestChildStates = newState.latestChildStates.map(
-    (child) => pruneActivityStateForSave(child, true)
+  const allChildren2 = newState.allChildren.map(
+    (child) => pruneActivityStateForSave(child)
   );
-  const numAttempts = newState.attempts.length;
-  const attempts = newState.attempts.map((attempt, i) => ({
-    ...attempt,
-    activities: attempt.activities.map(
-      (state) => pruneActivityStateForSave(
-        state,
-        i !== numAttempts - 1 || clearDoenetState
-      )
-    )
-  }));
-  return { ...newState, latestChildStates, attempts };
+  const selectedChildren = newState.selectedChildren.map(
+    (child) => pruneActivityStateForSave(child)
+  );
+  return { ...newState, allChildren: allChildren2, selectedChildren };
 }
 function addSourceToSelectState(activityState, source) {
-  const latestChildStates = activityState.latestChildStates.map((child) => {
+  const allChildren2 = activityState.allChildren.map((child) => {
+    const idx = source.items.findIndex(
+      (src) => src.id === extractSourceId(child.id)
+    );
+    return addSourceToActivityState(child, source.items[idx]);
+  });
+  const selectedChildren = activityState.selectedChildren.map((child) => {
     const idx = source.items.findIndex(
       (src) => src.id === extractSourceId(child.id)
     );
     return addSourceToActivityState(child, source.items[idx]);
   });
-  const attempts = activityState.attempts.map((attempt) => ({
-    ...attempt,
-    activities: attempt.activities.map((state) => {
-      const idx = source.items.findIndex(
-        (src) => src.id === extractSourceId(state.id)
-      );
-      return addSourceToActivityState(state, source.items[idx]);
-    })
-  }));
   return {
     ...activityState,
     source,
-    latestChildStates,
-    attempts
+    allChildren: allChildren2,
+    selectedChildren
   };
 }
 function calcNumVariantsSelect(source, numActivityVariants) {
@@ -2116,6 +2091,22 @@ function calcNumVariantsSelect(source, numActivityVariants) {
   );
   return Math.floor(numVariantsTot / source.numToSelect);
 }
+function getNumItemsInSelect(source) {
+  if (source.items.length === 0) {
+    return 0;
+  }
+  const numDocumentsPerItem = getNumItems(source.items[0]);
+  if (source.items.length > 1) {
+    for (const item of source.items.slice(1)) {
+      if (getNumItems(item) !== numDocumentsPerItem) {
+        throw Error(
+          "The case where a select has options with different numbers of documents is not implemented"
+        );
+      }
+    }
+  }
+  return source.numToSelect * numDocumentsPerItem;
+}
 const rngClass$1 = seedrandom$5.alea;
 function isSequenceSource(obj) {
   const typedObj = obj;
@@ -2132,12 +2123,7 @@ function isSequenceState(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "sequence" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSequenceSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.latestChildStates) && typedObj.latestChildStates.every(isActivityState) && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && Array.isArray(attempt.activities) && attempt.activities.every(isActivityState)
-      )
-    )
+    typedObj.type === "sequence" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && isSequenceSource(typedObj.source) && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.allChildren) && typedObj.allChildren.every(isActivityState) && typeof typedObj.attemptNumber === "number" && Array.isArray(typedObj.orderedChildren) && typedObj.orderedChildren.every(isActivityState) && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function isSequenceStateNoSource(obj) {
@@ -2145,12 +2131,7 @@ function isSequenceStateNoSource(obj) {
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     typedObj !== null && typeof typedObj === "object" && // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj.type === "sequence" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.latestChildStates) && typedObj.latestChildStates.every(isActivityStateNoSource) && Array.isArray(typedObj.attempts) && typedObj.attempts.every(
-      (attempt) => (
-        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-        attempt !== null && typeof attempt === "object" && typeof attempt.creditAchieved === "number" && Array.isArray(attempt.activities) && attempt.activities.every(isActivityStateNoSource)
-      )
-    )
+    typedObj.type === "sequence" && typeof typedObj.id === "string" && (typedObj.parentId === null || typeof typedObj.parentId === "string") && typeof typedObj.initialVariant === "number" && typeof typedObj.creditAchieved === "number" && Array.isArray(typedObj.allChildren) && typedObj.allChildren.every(isActivityStateNoSource) && typeof typedObj.attemptNumber === "number" && Array.isArray(typedObj.orderedChildren) && typedObj.orderedChildren.every(isActivityStateNoSource) && (typedObj.restrictToVariantSlice === void 0 || isRestrictToVariantSlice(typedObj.restrictToVariantSlice))
   );
 }
 function initializeSequenceState({
@@ -2180,8 +2161,9 @@ function initializeSequenceState({
     source,
     initialVariant: variant,
     creditAchieved: 0,
-    latestChildStates: childStates,
-    attempts: [],
+    allChildren: childStates,
+    attemptNumber: 0,
+    orderedChildren: [],
     restrictToVariantSlice
   };
 }
@@ -2190,12 +2172,11 @@ function generateNewSequenceAttempt({
   numActivityVariants,
   initialQuestionCounter,
   questionCounts,
-  parentAttempt,
-  resetCredit = false
+  parentAttempt
 }) {
   var _a;
   const source = state.source;
-  const childOrder = state.latestChildStates.map((state2) => state2.id);
+  const childOrder = state.allChildren.map((state2) => state2.id);
   if (source.shuffle) {
     let shuffle_ids = function(arr, startInd2, numItems) {
       for (let i = numItems - 1; i > 0; i--) {
@@ -2206,18 +2187,18 @@ function generateNewSequenceAttempt({
         ];
       }
     };
-    const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attempts.length.toString() + "|" + parentAttempt.toString();
+    const rngSeed = state.initialVariant.toString() + "|" + state.id.toString() + "|" + state.attemptNumber.toString() + "|" + parentAttempt.toString();
     const rng = rngClass$1(rngSeed);
     let startInd = 0;
-    while (startInd < state.latestChildStates.length) {
-      while (((_a = state.latestChildStates[startInd]) == null ? void 0 : _a.type) === "singleDoc" && state.latestChildStates[startInd].source.isDescription) {
+    while (startInd < state.allChildren.length) {
+      while (((_a = state.allChildren[startInd]) == null ? void 0 : _a.type) === "singleDoc" && state.allChildren[startInd].source.isDescription) {
         startInd++;
       }
-      if (startInd >= state.latestChildStates.length) {
+      if (startInd >= state.allChildren.length) {
         break;
       }
       let numItems = 1;
-      while (state.latestChildStates[startInd + numItems] && (state.latestChildStates[startInd + numItems].type !== "singleDoc" || !state.latestChildStates[startInd + numItems].source.isDescription)) {
+      while (state.allChildren[startInd + numItems] && (state.allChildren[startInd + numItems].type !== "singleDoc" || !state.allChildren[startInd + numItems].source.isDescription)) {
         numItems++;
       }
       if (numItems > 1) {
@@ -2227,87 +2208,88 @@ function generateNewSequenceAttempt({
     }
   }
   const orderedChildStates = [];
-  const unorderedChildStates = [...state.latestChildStates];
+  const unorderedChildStates = [...state.allChildren];
   let questionCounter = initialQuestionCounter;
   for (const childId of childOrder) {
-    const childIdx = state.latestChildStates.findIndex(
+    const childIdx = state.allChildren.findIndex(
       (child) => child.id === childId
     );
-    const originalState = state.latestChildStates[childIdx];
+    const originalState = state.allChildren[childIdx];
     const { finalQuestionCounter: endCounter, state: newState2 } = generateNewActivityAttempt({
       state: originalState,
       numActivityVariants,
       initialQuestionCounter: questionCounter,
       questionCounts,
-      parentAttempt: state.attempts.length + 1,
-      resetCredit: true
+      parentAttempt: state.attemptNumber + 1
     });
     questionCounter = endCounter;
     orderedChildStates.push(newState2);
     unorderedChildStates[childIdx] = newState2;
   }
-  const newAttemptState = {
-    activities: orderedChildStates,
-    creditAchieved: 0
-  };
   const newState = {
     ...state,
-    latestChildStates: unorderedChildStates
+    creditAchieved: 0,
+    allChildren: unorderedChildStates,
+    attemptNumber: state.attemptNumber + 1,
+    orderedChildren: orderedChildStates
   };
-  newState.attempts = [...newState.attempts, newAttemptState];
-  if (resetCredit) {
-    newState.creditAchieved = 0;
-  }
   return { finalQuestionCounter: questionCounter, state: newState };
 }
-function extractSequenceItemCredit(activityState) {
-  if (activityState.attempts.length === 0) {
-    return [{ id: activityState.id, score: 0 }];
+function extractSequenceItemCredit(activityState, nPrevInShuffleOrder = 0) {
+  if (activityState.attemptNumber === 0) {
+    let nPrev = nPrevInShuffleOrder;
+    return activityState.allChildren.flatMap((state) => {
+      const next = extractActivityItemCredit(state, nPrev);
+      nPrev += next.length;
+      return next;
+    });
   } else {
-    const latestAttempt = activityState.attempts[activityState.attempts.length - 1];
-    return latestAttempt.activities.flatMap(
-      (state) => extractActivityItemCredit(state)
-    );
+    let nPrev = nPrevInShuffleOrder;
+    const inShuffledOrder = activityState.orderedChildren.map((state) => {
+      const next = extractActivityItemCredit(state, nPrev);
+      nPrev += next.length;
+      return { childId: state.id, items: next };
+    });
+    const inOriginalOrder = activityState.allChildren.flatMap((state) => {
+      const childResults = inShuffledOrder.find(
+        (obj) => obj.childId === state.id
+      );
+      if (!childResults) {
+        throw Error("Unreachable");
+      }
+      return childResults.items;
+    });
+    return inOriginalOrder;
   }
 }
-function pruneSequenceStateForSave(activityState, clearDoenetState) {
+function pruneSequenceStateForSave(activityState) {
   const { source: _source, ...newState } = { ...activityState };
-  const latestChildStates = newState.latestChildStates.map(
-    (child) => pruneActivityStateForSave(child, true)
+  const allChildren2 = newState.allChildren.map(
+    (child) => pruneActivityStateForSave(child)
   );
-  const numAttempts = newState.attempts.length;
-  const attempts = newState.attempts.map((attempt, i) => ({
-    ...attempt,
-    activities: attempt.activities.map(
-      (state) => pruneActivityStateForSave(
-        state,
-        i !== numAttempts - 1 || clearDoenetState
-      )
-    )
-  }));
-  return { ...newState, latestChildStates, attempts };
+  const orderedChildren = newState.orderedChildren.map(
+    (child) => pruneActivityStateForSave(child)
+  );
+  return { ...newState, allChildren: allChildren2, orderedChildren };
 }
 function addSourceToSequenceState(activityState, source) {
-  const latestChildStates = activityState.latestChildStates.map((child) => {
+  const allChildren2 = activityState.allChildren.map((child) => {
+    const idx = source.items.findIndex(
+      (src) => src.id === extractSourceId(child.id)
+    );
+    return addSourceToActivityState(child, source.items[idx]);
+  });
+  const orderedChildren = activityState.orderedChildren.map((child) => {
     const idx = source.items.findIndex(
       (src) => src.id === extractSourceId(child.id)
     );
     return addSourceToActivityState(child, source.items[idx]);
   });
-  const attempts = activityState.attempts.map((attempt) => ({
-    ...attempt,
-    activities: attempt.activities.map((state) => {
-      const idx = source.items.findIndex(
-        (src) => src.id === extractSourceId(state.id)
-      );
-      return addSourceToActivityState(state, source.items[idx]);
-    })
-  }));
   return {
     ...activityState,
     source,
-    latestChildStates,
-    attempts
+    allChildren: allChildren2,
+    orderedChildren
   };
 }
 function calcNumVariantsSequence(source, numActivityVariants) {
@@ -2323,6 +2305,14 @@ function calcNumVariantsSequence(source, numActivityVariants) {
   }
   return numVariants;
 }
+function getNumItemsInSequence(source) {
+  const numDocumentsForEachItem = source.items.map(getNumItems);
+  const totalNumDocuments = numDocumentsForEachItem.reduce(
+    (a, c2) => a + c2,
+    0
+  );
+  return totalNumDocuments;
+}
 function commonjsRequire$1(path) {
   throw new Error('Could not dynamically require "' + path + '". Please configure the dynamicRequireTargets or/and ignoreDynamicRequires option of @rollup/plugin-commonjs appropriately for this require call to work.');
 }
@@ -3123,6 +3113,13 @@ function isActivitySource(obj) {
 function isActivityState(obj) {
   return isSingleDocState(obj) || isSelectState(obj) || isSequenceState(obj);
 }
+function isActivityAndDoenetState(obj) {
+  const typedObj = obj;
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    typedObj !== null && typeof typedObj === "object" && isActivityState(typedObj.activityState) && Array.isArray(typedObj.doenetStates) && Array.isArray(typedObj.itemAttemptNumbers) && typedObj.itemAttemptNumbers.every((x2) => Number.isInteger(x2) && x2 > 0)
+  );
+}
 function isActivityStateNoSource(obj) {
   return isSingleDocStateNoSource(obj) || isSelectStateNoSource(obj) || isSequenceStateNoSource(obj);
 }
@@ -3130,7 +3127,9 @@ function isExportedActivityState(obj) {
   const typedObj = obj;
   return (
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
-    typedObj !== null && typeof typedObj === "object" && isActivityStateNoSource(typedObj.state) && typeof typedObj.sourceHash === "string" && (typedObj.onSubmission === void 0 || typeof typedObj.onSubmission === "boolean")
+    typedObj !== null && typeof typedObj === "object" && isActivityStateNoSource(typedObj.activityState) && Array.isArray(typedObj.doenetStates) && Array.isArray(typedObj.itemAttemptNumbers) && typedObj.itemAttemptNumbers.every(
+      (x2) => Number.isInteger(x2) && x2 > 0
+    ) && typeof typedObj.sourceHash === "string"
   );
 }
 function initializeActivityState({
@@ -3170,13 +3169,30 @@ function initializeActivityState({
   }
   throw Error("Invalid activity type");
 }
+function initializeActivityAndDoenetState({
+  source,
+  variant,
+  parentId,
+  numActivityVariants,
+  restrictToVariantSlice
+}) {
+  const activityState = initializeActivityState({
+    source,
+    variant,
+    parentId,
+    numActivityVariants,
+    restrictToVariantSlice
+  });
+  const numItems = getNumItems(source);
+  const itemAttemptNumbers = Array(numItems).fill(1);
+  return { activityState, doenetStates: [], itemAttemptNumbers };
+}
 function generateNewActivityAttempt({
   state,
   numActivityVariants,
   initialQuestionCounter,
   questionCounts,
-  parentAttempt,
-  resetCredit = false
+  parentAttempt
 }) {
   switch (state.type) {
     case "singleDoc": {
@@ -3185,8 +3201,7 @@ function generateNewActivityAttempt({
         numActivityVariants,
         initialQuestionCounter,
         questionCounts,
-        parentAttempt,
-        resetCredit
+        parentAttempt
       });
     }
     case "select": {
@@ -3195,8 +3210,7 @@ function generateNewActivityAttempt({
         numActivityVariants,
         initialQuestionCounter,
         questionCounts,
-        parentAttempt,
-        resetCredit
+        parentAttempt
       });
     }
     case "sequence": {
@@ -3205,42 +3219,37 @@ function generateNewActivityAttempt({
         numActivityVariants,
         initialQuestionCounter,
         questionCounts,
-        parentAttempt,
-        resetCredit
+        parentAttempt
       });
     }
   }
   throw Error("Invalid activity type");
 }
-function generateNewSubActivityAttempt({
-  id: id2,
+function generateNewSingleDocSubAttempt({
+  singleDocId,
   state,
   numActivityVariants,
   initialQuestionCounter,
-  questionCounts,
-  resetCredit = false
+  questionCounts
 }) {
-  if (id2 === state.id) {
-    const { state: newActivityState } = generateNewActivityAttempt({
-      state,
-      numActivityVariants,
-      initialQuestionCounter,
-      questionCounts,
-      parentAttempt: 1,
-      resetCredit
-    });
-    return newActivityState;
+  if (singleDocId === state.id) {
+    throw Error(
+      "Should not call generateSingleDocSubActivityAttempt on entire activity"
+    );
   }
   const allStates = gatherStates(state);
-  const subActivityState = allStates[id2];
-  if (subActivityState.parentId === null) {
+  const singleDocActivityState = allStates[singleDocId];
+  if (singleDocActivityState.type !== "singleDoc") {
+    throw Error(
+      "generateNewSingleDocSubAttempt implemented only for single documents"
+    );
+  }
+  if (singleDocActivityState.parentId === null) {
     throw Error("Lower lever should have parent");
   }
-  const parentState = allStates[subActivityState.parentId];
-  if (subActivityState.type === "singleDoc" && parentState.type === "select" && parentState.latestChildStates.every(
-    (child) => child.type === "singleDoc"
-  )) {
-    const grandParentAttempt = parentState.parentId ? allStates[parentState.parentId].attempts.length : 1;
+  const parentState = allStates[singleDocActivityState.parentId];
+  if (parentState.type === "select" && parentState.allChildren.every((child) => child.type === "singleDoc")) {
+    const grandParentAttempt = parentState.parentId ? allStates[parentState.parentId].attemptNumber : 1;
     let newParentState;
     if (parentState.source.numToSelect > 1) {
       ({ state: newParentState } = generateNewSingleDocAttemptForMultiSelect({
@@ -3249,7 +3258,7 @@ function generateNewSubActivityAttempt({
         initialQuestionCounter,
         questionCounts,
         parentAttempt: grandParentAttempt,
-        childId: id2
+        childId: singleDocId
       }));
     } else {
       ({ state: newParentState } = generateNewActivityAttempt({
@@ -3267,42 +3276,48 @@ function generateNewSubActivityAttempt({
     });
   } else {
     const { state: newSubActivityState } = generateNewActivityAttempt({
-      state: allStates[id2],
+      state: allStates[singleDocId],
       numActivityVariants,
       initialQuestionCounter,
       questionCounts,
-      parentAttempt: parentState.attempts.length
+      parentAttempt: parentState.attemptNumber
     });
-    allStates[id2] = newSubActivityState;
+    allStates[singleDocId] = newSubActivityState;
     return propagateStateChangeToRoot({
       allStates,
-      id: id2
+      id: singleDocId
     });
   }
 }
-function extractActivityItemCredit(activityState) {
+function extractActivityItemCredit(activityState, nPrevInShuffleOrder = 0) {
   switch (activityState.type) {
     case "singleDoc": {
-      return extractSingleDocItemCredit(activityState);
+      return extractSingleDocItemCredit(
+        activityState,
+        nPrevInShuffleOrder
+      );
     }
     case "select": {
-      return extractSelectItemCredit(activityState);
+      return extractSelectItemCredit(activityState, nPrevInShuffleOrder);
     }
     case "sequence": {
-      return extractSequenceItemCredit(activityState);
+      return extractSequenceItemCredit(
+        activityState,
+        nPrevInShuffleOrder
+      );
     }
   }
 }
-function pruneActivityStateForSave(activityState, clearDoenetState = false) {
+function pruneActivityStateForSave(activityState) {
   switch (activityState.type) {
     case "singleDoc": {
-      return pruneSingleDocStateForSave(activityState, clearDoenetState);
+      return pruneSingleDocStateForSave(activityState);
     }
     case "select": {
-      return pruneSelectStateForSave(activityState, clearDoenetState);
+      return pruneSelectStateForSave(activityState);
     }
     case "sequence": {
-      return pruneSequenceStateForSave(activityState, clearDoenetState);
+      return pruneSequenceStateForSave(activityState);
     }
   }
 }
@@ -3338,12 +3353,12 @@ function getItemSequence(state) {
   if (state.type === "singleDoc") {
     return [state.id];
   } else {
-    const numAttempts = state.attempts.length;
+    const numAttempts = state.attemptNumber;
     if (numAttempts === 0) {
-      if (state.latestChildStates.length === 0) {
+      if (state.allChildren.length === 0) {
         return [];
       } else {
-        const prelimResult = state.latestChildStates.flatMap(
+        const prelimResult = state.allChildren.flatMap(
           (a) => getItemSequence(a)
         );
         if (state.type === "sequence") {
@@ -3353,9 +3368,11 @@ function getItemSequence(state) {
         }
       }
     }
-    return state.attempts[numAttempts - 1].activities.flatMap(
-      (a) => getItemSequence(a)
-    );
+    if (state.type === "sequence") {
+      return state.orderedChildren.flatMap((a) => getItemSequence(a));
+    } else {
+      return state.selectedChildren.flatMap((a) => getItemSequence(a));
+    }
   }
 }
 function calcNumVariants(source, numActivityVariants) {
@@ -3380,6 +3397,20 @@ function calcNumVariantsFromState(state, numActivityVariants) {
   }
   return numVariants;
 }
+function getNumItems(source) {
+  switch (source.type) {
+    case "singleDoc": {
+      return 1;
+    }
+    case "select": {
+      return getNumItemsInSelect(source);
+    }
+    case "sequence": {
+      return getNumItemsInSequence(source);
+    }
+  }
+  throw Error("Invalid activity type");
+}
 function validateIds(source) {
   if (source.id.includes("|")) {
     throw Error(`Id "${source.id}" contains a "|".`);
@@ -3426,7 +3457,7 @@ function gatherStates(state) {
     [state.id]: state
   };
   if (state.type !== "singleDoc") {
-    for (const child of state.latestChildStates) {
+    for (const child of state.allChildren) {
       Object.assign(allStates, gatherStates(child));
     }
   }
@@ -3446,31 +3477,25 @@ function propagateStateChangeToRoot({
   if (newParentState.type === "singleDoc") {
     throw Error("Single doc activity cannot be a parent");
   }
-  const childIdx = newParentState.latestChildStates.map((child) => child.id).indexOf(id2);
+  const childIdx = newParentState.allChildren.map((child) => child.id).indexOf(id2);
   if (childIdx === -1) {
     throw Error("Something went wrong as parent didn't have child.");
   } else {
-    newParentState.latestChildStates = [
-      ...newParentState.latestChildStates
-    ];
-    newParentState.latestChildStates[childIdx] = activityState;
+    newParentState.allChildren = [...newParentState.allChildren];
+    newParentState.allChildren[childIdx] = activityState;
   }
-  newParentState.attempts = [...newParentState.attempts];
-  const numAttempts = newParentState.attempts.length;
-  const lastAttempt = newParentState.attempts[numAttempts - 1] = {
-    ...newParentState.attempts[numAttempts - 1]
-  };
-  const childIdx2 = lastAttempt.activities.map((child) => child.id).indexOf(id2);
+  const childActivities = newParentState.type === "sequence" ? [...newParentState.orderedChildren] : [...newParentState.selectedChildren];
+  const childIdx2 = childActivities.map((child) => child.id).indexOf(id2);
   if (childIdx2 === -1) {
     throw Error(
       "Something went wrong as parent didn't have child in last attempt."
     );
   }
-  lastAttempt.activities = [...lastAttempt.activities];
-  lastAttempt.activities[childIdx2] = activityState;
-  let credit;
+  childActivities[childIdx2] = activityState;
+  let creditAchieved;
   if (newParentState.type === "sequence") {
-    const nonDescriptions = newParentState.latestChildStates.filter(
+    newParentState.orderedChildren = childActivities;
+    const nonDescriptions = newParentState.allChildren.filter(
       (activityState2) => activityState2.type !== "singleDoc" || !activityState2.source.isDescription
     );
     let creditWeights = [...newParentState.source.creditWeights ?? []];
@@ -3484,18 +3509,15 @@ function propagateStateChangeToRoot({
     creditWeights = creditWeights.slice(0, nonDescriptions.length);
     const totWeights = creditWeights.reduce((a, c2) => a + c2);
     creditWeights = creditWeights.map((w2) => w2 / totWeights);
-    credit = nonDescriptions.reduce(
+    creditAchieved = nonDescriptions.reduce(
       (a, c2, i) => a + c2.creditAchieved * creditWeights[i],
       0
     );
   } else {
-    credit = lastAttempt.activities.reduce((a, c2) => a + c2.creditAchieved, 0) / lastAttempt.activities.length;
+    newParentState.selectedChildren = childActivities;
+    creditAchieved = childActivities.reduce((a, c2) => a + c2.creditAchieved, 0) / childActivities.length;
   }
-  lastAttempt.creditAchieved = Math.max(lastAttempt.creditAchieved, credit);
-  newParentState.creditAchieved = Math.max(
-    newParentState.creditAchieved,
-    credit
-  );
+  newParentState.creditAchieved = creditAchieved;
   return propagateStateChangeToRoot({
     allStates,
     id: newParentState.id
@@ -3508,6 +3530,13 @@ function isSingleDocReportStateMessage(obj) {
     typeObj !== null && typeof typeObj === "object" && typeof typeObj.activityId === "string" && typeof typeObj.docId === "string" && typeof typeObj.score === "number"
   );
 }
+function isRestrictToVariantSlice(obj) {
+  const typeObj = obj;
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    typeObj !== null && typeof typeObj === "object" && typeof typeObj.idx === "number" && typeof typeObj.numSlices === "number"
+  );
+}
 const urlAlphabet = "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict";
 let nanoid = (size2 = 21) => {
   let id2 = "";
@@ -3653,14 +3682,17 @@ function MdError(props) {
 function SelectActivity({
   flags,
   baseId,
+  maxAttemptsAllowed,
   forceDisable = false,
   forceShowCorrectness = false,
   forceShowSolution = false,
   forceUnsuppressCheckwork = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   state,
+  doenetStates,
   reportScoreAndStateCallback,
   checkRender,
   checkHidden,
@@ -3668,66 +3700,62 @@ function SelectActivity({
   generateNewItemAttempt,
   hasRenderedCallback,
   reportVisibility = false,
-  reportVisibilityCallback
+  reportVisibilityCallback,
+  itemAttemptNumbers,
+  itemSequence
 }) {
-  const latestAttempt = state.attempts.length > 0 ? state.attempts[state.attempts.length - 1] : null;
   const selectedActivities = [];
   const selectedIds = [];
-  if (latestAttempt) {
-    for (const activity of latestAttempt.activities) {
-      selectedActivities.push(
-        /* @__PURE__ */ jsxRuntimeExports$1.jsx(
-          Activity,
-          {
-            state: activity,
-            flags,
-            baseId,
-            forceDisable,
-            forceShowCorrectness,
-            forceShowSolution,
-            forceUnsuppressCheckwork,
-            linkSettings,
-            darkMode,
-            showAnswerTitles,
-            reportScoreAndStateCallback,
-            checkRender,
-            checkHidden,
-            allowItemAttemptButtons,
-            generateNewItemAttempt,
-            hasRenderedCallback,
-            reportVisibility,
-            reportVisibilityCallback
-          },
-          activity.id
-        )
-      );
-      selectedIds.push(activity.id);
-    }
+  for (const activity of state.selectedChildren) {
+    selectedActivities.push(
+      /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+        Activity,
+        {
+          state: activity,
+          doenetStates,
+          flags,
+          baseId,
+          maxAttemptsAllowed,
+          forceDisable,
+          forceShowCorrectness,
+          forceShowSolution,
+          forceUnsuppressCheckwork,
+          linkSettings,
+          darkMode,
+          showAnswerResponseMenu,
+          answerResponseCountsByItem,
+          reportScoreAndStateCallback,
+          checkRender,
+          checkHidden,
+          allowItemAttemptButtons,
+          generateNewItemAttempt,
+          hasRenderedCallback,
+          reportVisibility,
+          reportVisibilityCallback,
+          itemAttemptNumbers,
+          itemSequence
+        },
+        activity.id
+      )
+    );
+    selectedIds.push(activity.id);
   }
-  return /* @__PURE__ */ jsxRuntimeExports$1.jsx(
-    "div",
-    {
-      hidden: !checkRender(state),
-      children: /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { children: selectedActivities })
-    },
-    // Replace the activity in the DOM when a new attempt is created,
-    // except preserve it if just a single item was replaced with the other items staying unchanged.
-    state.attempts.filter(
-      (x2) => x2.singleItemReplacementIdx === void 0
-    ).length
-  );
+  return /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { hidden: !checkRender(state), children: /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { children: selectedActivities }) }, state.attemptNumber);
 }
 function SequenceActivity({
   flags,
   baseId,
+  maxAttemptsAllowed,
   forceDisable = false,
   forceShowCorrectness = false,
   forceShowSolution = false,
   forceUnsuppressCheckwork = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   state,
+  doenetStates,
   reportScoreAndStateCallback,
   checkRender,
   checkHidden,
@@ -3735,41 +3763,45 @@ function SequenceActivity({
   generateNewItemAttempt,
   hasRenderedCallback,
   reportVisibility = false,
-  reportVisibilityCallback
+  reportVisibilityCallback,
+  itemAttemptNumbers,
+  itemSequence
 }) {
-  const latestAttempt = state.attempts.length > 0 ? state.attempts[state.attempts.length - 1] : null;
   const activityList = [];
-  if (latestAttempt) {
-    for (const activity of latestAttempt.activities) {
-      activityList.push(
-        /* @__PURE__ */ jsxRuntimeExports$1.jsx(
-          Activity,
-          {
-            state: activity,
-            flags,
-            baseId,
-            forceDisable,
-            forceShowCorrectness,
-            forceShowSolution,
-            forceUnsuppressCheckwork,
-            linkSettings,
-            darkMode,
-            showAnswerTitles,
-            reportScoreAndStateCallback,
-            checkRender,
-            checkHidden,
-            allowItemAttemptButtons,
-            generateNewItemAttempt,
-            hasRenderedCallback,
-            reportVisibility,
-            reportVisibilityCallback
-          },
-          activity.id
-        )
-      );
-    }
+  for (const activity of state.orderedChildren) {
+    activityList.push(
+      /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+        Activity,
+        {
+          state: activity,
+          doenetStates,
+          flags,
+          baseId,
+          maxAttemptsAllowed,
+          forceDisable,
+          forceShowCorrectness,
+          forceShowSolution,
+          forceUnsuppressCheckwork,
+          linkSettings,
+          darkMode,
+          showAnswerResponseMenu,
+          answerResponseCountsByItem,
+          reportScoreAndStateCallback,
+          checkRender,
+          checkHidden,
+          allowItemAttemptButtons,
+          generateNewItemAttempt,
+          hasRenderedCallback,
+          reportVisibility,
+          reportVisibilityCallback,
+          itemAttemptNumbers,
+          itemSequence
+        },
+        activity.id
+      )
+    );
   }
-  return /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { hidden: !checkRender(state), children: activityList }, state.attempts.length);
+  return /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { hidden: !checkRender(state), children: activityList }, state.attemptNumber);
 }
 var __defProp3 = Object.defineProperty;
 var __defNormalProp2 = (obj, key, value) => key in obj ? __defProp3(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
@@ -30569,7 +30601,7 @@ var encBase64 = { exports: {} };
     return CryptoJS.enc.Base64;
   });
 })(encBase64);
-const viewerIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", () => {\n    if (typeof window.renderDoenetViewerToContainer !== "function") {\n      return messageParentFromViewer({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n    const callbackOverrides = {};\n    const callbackNames = [\n      "reportScoreAndStateCallback",\n      "setIsInErrorState",\n      "generatedVariantCallback",\n      "documentStructureCallback",\n      "initializedCallback",\n      "setErrorsAndWarningsCallback"\n    ];\n    for (const callback of callbackNames) {\n      callbackOverrides[callback] = haveCallbacks.includes(callback) ? (args) => {\n        messageParentFromViewer({\n          callback,\n          args\n        });\n      } : void 0;\n    }\n    window.renderDoenetViewerToContainer(\n      document.getElementById("root"),\n      void 0,\n      {\n        ...doenetViewerProps,\n        externalVirtualKeyboardProvided: true,\n        ...callbackOverrides\n      }\n    );\n  });\n  window.addEventListener("message", (e) => {\n    var _a, _b;\n    if (e.origin !== window.parent.location.origin) {\n      return;\n    }\n    if (((_a = e.data.subject) == null ? void 0 : _a.startsWith("SPLICE")) && !((_b = e.data.subject) == null ? void 0 : _b.endsWith("response"))) {\n      window.parent.postMessage(e.data);\n    }\n  });\n  function messageParentFromViewer(data) {\n    window.parent.postMessage(\n      {\n        origin: viewerId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
+const viewerIframeJsSource = '(function() {\n  "use strict";\n  document.addEventListener("DOMContentLoaded", async () => {\n    let pause100 = function() {\n      return new Promise((resolve, _reject) => {\n        setTimeout(resolve, 100);\n      });\n    };\n    for (let i = 0; i < 10; i++) {\n      if (typeof window.renderDoenetViewerToContainer === "function") {\n        break;\n      }\n      await pause100();\n    }\n    if (typeof window.renderDoenetViewerToContainer !== "function") {\n      return messageParentFromViewer({\n        error: "Invalid DoenetML version or DoenetML package not found"\n      });\n    }\n    const callbackOverrides = {};\n    const callbackNames = [\n      "reportScoreAndStateCallback",\n      "setIsInErrorState",\n      "generatedVariantCallback",\n      "documentStructureCallback",\n      "initializedCallback",\n      "setErrorsAndWarningsCallback"\n    ];\n    for (const callback of callbackNames) {\n      callbackOverrides[callback] = haveViewerCallbacks.includes(callback) ? (args) => {\n        messageParentFromViewer({\n          callback,\n          args\n        });\n      } : void 0;\n    }\n    window.renderDoenetViewerToContainer(\n      document.getElementById("root"),\n      void 0,\n      {\n        ...doenetViewerProps,\n        externalVirtualKeyboardProvided: true,\n        ...callbackOverrides\n      }\n    );\n  });\n  window.addEventListener("message", (e) => {\n    var _a, _b;\n    if (e.origin !== window.parent.location.origin) {\n      return;\n    }\n    if (((_a = e.data.subject) == null ? void 0 : _a.startsWith("SPLICE")) && !((_b = e.data.subject) == null ? void 0 : _b.endsWith("response"))) {\n      window.parent.postMessage(e.data);\n    } else if (e.data.subject === "requestAnswerResponses") {\n      window.parent.postMessage(e.data);\n    }\n  });\n  function messageParentFromViewer(data) {\n    window.parent.postMessage(\n      {\n        origin: viewerId,\n        data\n      },\n      window.parent.origin\n    );\n  }\n})();\n';
 var __defProp$2 = Object.defineProperty;
 var __defNormalProp$2 = (obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp$2(obj, key + "", value);
@@ -43813,7 +43845,7 @@ var utils = {
   canBreak
 };
 function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneUrl, cssUrl) {
-  const haveCallbacks = [];
+  const haveViewerCallbacks = [];
   const callbackNames = [
     "reportScoreAndStateCallback",
     "setIsInErrorState",
@@ -43824,7 +43856,7 @@ function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneU
   ];
   for (const callback of callbackNames) {
     if (callback in doenetViewerProps) {
-      haveCallbacks.push(callback);
+      haveViewerCallbacks.push(callback);
     }
   }
   return `
@@ -43837,10 +43869,10 @@ function createHtmlForDoenetViewer(id2, doenetML, doenetViewerProps, standaloneU
         <script type="module">
             const viewerId = "${id2}";
             const doenetViewerProps = ${JSON.stringify(doenetViewerProps)};
-            const haveCallbacks = ${JSON.stringify(haveCallbacks)};
+            const haveViewerCallbacks = ${JSON.stringify(haveViewerCallbacks)};
             
             // This source code has been compiled by vite and should be directly included.
-            // It assumes that viewerId, doenetViewerProps, and haveCallbacks are defined in the global scope.
+            // It assumes that viewerId, doenetViewerProps, and haveViewerCallbacks are defined in the global scope.
             ${viewerIframeJsSource}
         <\/script>
         <div id="root">
@@ -53236,7 +53268,7 @@ function ExternalVirtualKeyboard() {
     }
   );
 }
-const version = "0.7.0-alpha30";
+const version = "0.7.0-alpha32";
 const latestDoenetmlVersion = version;
 function DoenetViewer({
   doenetML,
@@ -53378,14 +53410,17 @@ function DoenetViewer({
 function SingleDocActivity({
   flags,
   baseId,
+  maxAttemptsAllowed,
   forceDisable = false,
   forceShowCorrectness = false,
   forceShowSolution = false,
   forceUnsuppressCheckwork = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   state,
+  doenetStates,
   reportScoreAndStateCallback,
   checkRender,
   checkHidden,
@@ -53393,21 +53428,24 @@ function SingleDocActivity({
   generateNewItemAttempt,
   hasRenderedCallback,
   reportVisibility = false,
-  reportVisibilityCallback
+  reportVisibilityCallback,
+  itemAttemptNumbers,
+  itemSequence
 }) {
   const [rendered, setRendered] = useState$3(false);
-  const latestAttempt = state.attempts.length > 0 ? state.attempts[state.attempts.length - 1] : null;
-  const [attemptNumber, setAttemptNumber] = useState$3(state.attempts.length);
+  const [attemptNumber, setAttemptNumber] = useState$3(state.attemptNumber);
   const [initialDoenetState, setInitialDoenetState] = useState$3(
-    latestAttempt ? (
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      latestAttempt.doenetState
-    ) : null
+    state.doenetStateIdx === null ? null : doenetStates[state.doenetStateIdx] ?? null
   );
   const [requestedVariantIndex, setRequestedVariantIndex] = useState$3(
-    latestAttempt ? latestAttempt.variant : state.initialVariant
+    state.currentVariant
   );
   const ref = useRef$6(null);
+  const itemIdx = useMemo$4(
+    () => itemSequence.indexOf(state.id),
+    [itemSequence, state.id]
+  );
+  const itemAttemptNumber = itemAttemptNumbers[itemIdx];
   useEffect$5(() => {
     if (reportVisibility && ref.current) {
       const observer = new IntersectionObserver(
@@ -53422,25 +53460,20 @@ function SingleDocActivity({
       };
     }
   }, [reportVisibility, ref, reportVisibilityCallback, state.id]);
-  if (state.attempts.length !== attemptNumber) {
-    setAttemptNumber(state.attempts.length);
+  if (state.attemptNumber !== attemptNumber) {
+    setAttemptNumber(state.attemptNumber);
     setInitialDoenetState(
-      latestAttempt ? (
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        latestAttempt.doenetState
-      ) : null
-    );
-    setRequestedVariantIndex(
-      latestAttempt ? latestAttempt.variant : state.initialVariant
+      state.doenetStateIdx === null ? null : doenetStates[state.doenetStateIdx] ?? null
     );
+    setRequestedVariantIndex(state.currentVariant);
   }
-  const initialCounters = latestAttempt ? {
-    question: latestAttempt.initialQuestionCounter,
-    problem: latestAttempt.initialQuestionCounter,
-    exercise: latestAttempt.initialQuestionCounter
-  } : void 0;
+  const initialCounters = {
+    question: state.initialQuestionCounter,
+    problem: state.initialQuestionCounter,
+    exercise: state.initialQuestionCounter
+  };
   const source = state.source;
-  const showAttemptButton = allowItemAttemptButtons && generateNewItemAttempt !== void 0 && !source.isDescription;
+  const showAttemptButton = allowItemAttemptButtons && generateNewItemAttempt !== void 0 && !source.isDescription && maxAttemptsAllowed !== 1;
   const render3 = checkRender(state);
   const hidden = checkHidden(state);
   return /* @__PURE__ */ jsxRuntimeExports$1.jsx("div", { ref, children: /* @__PURE__ */ jsxRuntimeExports$1.jsxs("div", { hidden: !render3 || hidden, style: { minHeight: "100px" }, children: [
@@ -53461,7 +53494,8 @@ function SingleDocActivity({
         forceUnsuppressCheckwork,
         linkSettings,
         darkMode,
-        showAnswerTitles,
+        showAnswerResponseMenu,
+        answerResponseCounts: answerResponseCountsByItem[itemIdx],
         addVirtualKeyboard: false,
         initialState: initialDoenetState,
         initializeCounters: initialCounters,
@@ -53471,25 +53505,30 @@ function SingleDocActivity({
           hasRenderedCallback(state.id);
         }
       },
-      state.attempts.length
+      state.attemptNumber
     ),
-    showAttemptButton ? /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+    showAttemptButton ? /* @__PURE__ */ jsxRuntimeExports$1.jsxs(
       "button",
       {
         hidden: !rendered,
         onClick: () => {
           generateNewItemAttempt(
             state.id,
-            (latestAttempt == null ? void 0 : latestAttempt.initialQuestionCounter) ?? 1
+            state.initialQuestionCounter
           );
         },
+        disabled: maxAttemptsAllowed > 0 && itemAttemptNumber >= maxAttemptsAllowed,
         style: {
           marginLeft: "20px",
           backgroundColor: "lightgray",
           borderRadius: "10px",
           padding: "5px 20px"
         },
-        children: "New item attempt"
+        children: [
+          "New item attempt",
+          " ",
+          maxAttemptsAllowed > 0 ? `(${(maxAttemptsAllowed - itemAttemptNumber).toString()} left)` : null
+        ]
       }
     ) : null
   ] }) });
@@ -53497,14 +53536,17 @@ function SingleDocActivity({
 function Activity({
   flags,
   baseId,
+  maxAttemptsAllowed,
   forceDisable = false,
   forceShowCorrectness = false,
   forceShowSolution = false,
   forceUnsuppressCheckwork = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   state,
+  doenetStates,
   reportScoreAndStateCallback,
   checkRender,
   checkHidden,
@@ -53512,7 +53554,9 @@ function Activity({
   generateNewItemAttempt,
   hasRenderedCallback,
   reportVisibility = false,
-  reportVisibilityCallback
+  reportVisibilityCallback,
+  itemAttemptNumbers,
+  itemSequence
 }) {
   switch (state.type) {
     case "singleDoc": {
@@ -53521,14 +53565,17 @@ function Activity({
         {
           flags,
           baseId,
+          maxAttemptsAllowed,
           forceDisable,
           forceShowCorrectness,
           forceShowSolution,
           forceUnsuppressCheckwork,
           linkSettings,
           darkMode,
-          showAnswerTitles,
+          showAnswerResponseMenu,
+          answerResponseCountsByItem,
           state,
+          doenetStates,
           reportScoreAndStateCallback,
           checkRender,
           checkHidden,
@@ -53536,7 +53583,9 @@ function Activity({
           generateNewItemAttempt,
           hasRenderedCallback,
           reportVisibility,
-          reportVisibilityCallback
+          reportVisibilityCallback,
+          itemAttemptNumbers,
+          itemSequence
         }
       );
     }
@@ -53546,14 +53595,17 @@ function Activity({
         {
           flags,
           baseId,
+          maxAttemptsAllowed,
           forceDisable,
           forceShowCorrectness,
           forceShowSolution,
           forceUnsuppressCheckwork,
           linkSettings,
           darkMode,
-          showAnswerTitles,
+          showAnswerResponseMenu,
+          answerResponseCountsByItem,
           state,
+          doenetStates,
           reportScoreAndStateCallback,
           checkRender,
           checkHidden,
@@ -53561,7 +53613,9 @@ function Activity({
           generateNewItemAttempt,
           hasRenderedCallback,
           reportVisibility,
-          reportVisibilityCallback
+          reportVisibilityCallback,
+          itemAttemptNumbers,
+          itemSequence
         }
       );
     }
@@ -53571,14 +53625,17 @@ function Activity({
         {
           flags,
           baseId,
+          maxAttemptsAllowed,
           forceDisable,
           forceShowCorrectness,
           forceShowSolution,
           forceUnsuppressCheckwork,
           linkSettings,
           darkMode,
-          showAnswerTitles,
+          showAnswerResponseMenu,
+          answerResponseCountsByItem,
           state,
+          doenetStates,
           reportScoreAndStateCallback,
           checkRender,
           checkHidden,
@@ -53586,155 +53643,182 @@ function Activity({
           generateNewItemAttempt,
           hasRenderedCallback,
           reportVisibility,
-          reportVisibilityCallback
+          reportVisibilityCallback,
+          itemAttemptNumbers,
+          itemSequence
         }
       );
     }
   }
 }
-function activityStateReducer(state, action) {
+function activityDoenetStateReducer(state, action) {
+  const activityState = state.activityState;
   switch (action.type) {
     case "initialize": {
-      return initializeActivityState({
-        source: state.source,
-        variant: action.variantIndex,
-        parentId: null,
-        numActivityVariants: action.numActivityVariants
-      });
+      const numItems = getNumItems(action.source);
+      return {
+        activityState: initializeActivityState({
+          source: action.source,
+          variant: action.variantIndex,
+          parentId: null,
+          numActivityVariants: action.numActivityVariants
+        }),
+        doenetStates: [],
+        itemAttemptNumbers: Array(numItems).fill(1)
+      };
     }
     case "set": {
-      const scoreByItem = extractActivityItemCredit(action.state);
       if (action.allowSaveState) {
-        window.postMessage({
-          score: action.state.creditAchieved,
-          scoreByItem,
+        const itemScores = extractActivityItemCredit(
+          action.state.activityState
+        );
+        const message = {
+          score: action.state.activityState.creditAchieved,
+          itemScores,
           subject: "SPLICE.reportScoreByItem",
           activityId: action.baseId
-        });
+        };
+        window.postMessage(message);
       }
       return action.state;
     }
     case "generateNewActivityAttempt": {
-      let newActivityState;
-      let firstAttempt = false;
-      if (!action.id || action.id === state.id) {
-        if (state.attempts.length === 0) {
-          firstAttempt = true;
-        }
-        ({ state: newActivityState } = generateNewActivityAttempt({
-          state,
-          numActivityVariants: action.numActivityVariants,
-          initialQuestionCounter: action.initialQuestionCounter,
-          questionCounts: action.questionCounts,
-          parentAttempt: 1
-        }));
-      } else {
-        newActivityState = generateNewSubActivityAttempt({
-          id: action.id,
-          state,
-          numActivityVariants: action.numActivityVariants,
-          initialQuestionCounter: action.initialQuestionCounter,
-          questionCounts: action.questionCounts
-        });
+      const { state: newActivityState } = generateNewActivityAttempt({
+        state: activityState,
+        numActivityVariants: action.numActivityVariants,
+        initialQuestionCounter: action.initialQuestionCounter,
+        questionCounts: action.questionCounts,
+        parentAttempt: 1
+      });
+      const newItemAttemptNumbers = state.itemAttemptNumbers.map(() => 1);
+      if (action.allowSaveState) {
+        const itemScores = extractActivityItemCredit(newActivityState);
+        const message = {
+          state: {
+            activityState: pruneActivityStateForSave(newActivityState),
+            doenetStates: [],
+            itemAttemptNumbers: newItemAttemptNumbers,
+            sourceHash: action.sourceHash
+          },
+          score: newActivityState.creditAchieved,
+          itemScores,
+          subject: "SPLICE.reportScoreAndState",
+          activityId: action.baseId,
+          newAttempt: true
+        };
+        window.postMessage(message);
       }
+      return {
+        activityState: newActivityState,
+        doenetStates: [],
+        itemAttemptNumbers: newItemAttemptNumbers
+      };
+    }
+    case "generateSingleDocSubActivityAttempt": {
+      if (action.docId === activityState.id) {
+        throw Error(
+          "Should not call generateSingleDocSubActivityAttempt on entire activity"
+        );
+      }
+      const newActivityState = generateNewSingleDocSubAttempt({
+        singleDocId: action.docId,
+        state: activityState,
+        numActivityVariants: action.numActivityVariants,
+        initialQuestionCounter: action.initialQuestionCounter,
+        questionCounts: action.questionCounts
+      });
+      const newDoenetMLStates = [...state.doenetStates];
+      newDoenetMLStates[action.doenetStateIdx] = null;
+      const itemIdx = action.itemSequence.indexOf(action.docId);
+      const newItemAttemptNumbers = [...state.itemAttemptNumbers];
+      newItemAttemptNumbers[itemIdx]++;
       if (action.allowSaveState) {
-        const scoreByItem = extractActivityItemCredit(newActivityState);
-        if (firstAttempt) {
-          window.postMessage({
-            score: newActivityState.creditAchieved,
-            scoreByItem,
-            subject: "SPLICE.reportScoreByItem",
-            activityId: action.baseId
-          });
-        } else {
-          const sourceHash = hash(newActivityState.source);
-          window.postMessage({
-            state: {
-              state: pruneActivityStateForSave(
-                newActivityState,
-                false
-              ),
-              sourceHash
-            },
-            score: newActivityState.creditAchieved,
-            scoreByItem,
-            subject: "SPLICE.reportScoreAndState",
-            activityId: action.baseId
-          });
-        }
+        const itemScores = extractActivityItemCredit(newActivityState);
+        const itemScoresOld = extractActivityItemCredit(activityState);
+        const newAttemptForItem = itemScoresOld.findIndex(
+          (s) => s.id === action.docId || s.docId === action.docId
+        ) + 1;
+        const message = {
+          state: {
+            activityState: pruneActivityStateForSave(newActivityState),
+            doenetStates: newDoenetMLStates,
+            itemAttemptNumbers: newItemAttemptNumbers,
+            sourceHash: action.sourceHash
+          },
+          score: newActivityState.creditAchieved,
+          itemScores,
+          newDoenetStateIdx: action.doenetStateIdx,
+          subject: "SPLICE.reportScoreAndState",
+          activityId: action.baseId,
+          newAttempt: true,
+          newAttemptForItem
+        };
+        window.postMessage(message);
       }
-      return newActivityState;
+      return {
+        activityState: newActivityState,
+        doenetStates: newDoenetMLStates,
+        itemAttemptNumbers: newItemAttemptNumbers
+      };
     }
     case "updateSingleState": {
-      const newActivityState = updateSingleDocState(action, state);
+      const newActivityDoenetState = updateSingleDocState(action, state);
       if (action.allowSaveState) {
-        const scoreByItem = extractActivityItemCredit(newActivityState);
-        const sourceHash = hash(newActivityState.source);
-        let onSubmission = false;
-        const doenetState = action.doenetState;
-        if (typeof doenetState === "object" && doenetState !== null && "onSubmission" in doenetState && typeof doenetState.onSubmission === "boolean") {
-          onSubmission = doenetState.onSubmission;
-        }
-        window.postMessage({
+        const newActivityState = newActivityDoenetState.activityState;
+        const itemScores = extractActivityItemCredit(newActivityState);
+        const itemUpdated = action.itemSequence.indexOf(action.docId) + 1;
+        const message = {
           state: {
-            state: pruneActivityStateForSave(
-              newActivityState,
-              false
-            ),
-            sourceHash,
-            onSubmission
+            activityState: pruneActivityStateForSave(newActivityState),
+            sourceHash: action.sourceHash,
+            doenetStates: newActivityDoenetState.doenetStates,
+            itemAttemptNumbers: state.itemAttemptNumbers
           },
           score: newActivityState.creditAchieved,
-          scoreByItem,
+          itemScores,
+          itemUpdated,
+          newDoenetStateIdx: action.doenetStateIdx,
           subject: "SPLICE.reportScoreAndState",
           activityId: action.baseId
-        });
+        };
+        window.postMessage(message);
       }
-      return newActivityState;
+      return newActivityDoenetState;
     }
   }
   throw Error("Invalid activity action");
 }
-function updateSingleDocState(action, state) {
-  const allStates = gatherStates(state);
-  const newSingleDocState = allStates[action.id] = {
-    ...allStates[action.id]
+function updateSingleDocState(action, activityDoenetState) {
+  const allStates = gatherStates(activityDoenetState.activityState);
+  const newSingleDocState = allStates[action.docId] = {
+    ...allStates[action.docId]
   };
   if (newSingleDocState.type !== "singleDoc") {
     throw Error(
       "Received the wrong type of activity for updateSingleDocState"
     );
   }
-  newSingleDocState.creditAchieved = Math.max(
-    newSingleDocState.creditAchieved,
-    action.creditAchieved
-  );
-  const newAttempts = newSingleDocState.attempts = [
-    ...newSingleDocState.attempts
-  ];
-  const lastAttempt = {
-    ...newAttempts[newSingleDocState.attempts.length - 1],
-    doenetState: action.doenetState
-  };
-  lastAttempt.creditAchieved = Math.max(
-    lastAttempt.creditAchieved,
-    action.creditAchieved
-  );
-  newAttempts[newSingleDocState.attempts.length - 1] = lastAttempt;
+  newSingleDocState.creditAchieved = action.creditAchieved;
+  const doenetStates = [...activityDoenetState.doenetStates];
+  doenetStates[action.doenetStateIdx] = action.doenetState;
+  newSingleDocState.doenetStateIdx = action.doenetStateIdx;
   const rootActivityState = propagateStateChangeToRoot({
     allStates,
     id: newSingleDocState.id
   });
-  return rootActivityState;
+  return {
+    activityState: rootActivityState,
+    doenetStates,
+    itemAttemptNumbers: activityDoenetState.itemAttemptNumbers
+  };
 }
 function Viewer({
   source,
   flags,
   activityId,
-  userId,
-  attemptNumber: _attemptNumber = 1,
-  variantIndex: initialVariantIndex,
-  maxAttemptsAllowed: _maxAttemptsAllowed = Infinity,
+  userId = null,
+  initialVariantIndex,
+  maxAttemptsAllowed = 1,
   itemLevelAttempts = false,
   activityLevelAttempts = false,
   paginate = true,
@@ -53747,38 +53831,48 @@ function Viewer({
   externalVirtualKeyboardProvided: _externalVirtualKeyboardProvided = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   showTitle = true
 }) {
   const [errMsg, setErrMsg] = useState$3(null);
   const initialPass = useRef$6(true);
-  const { numActivityVariants, questionCounts } = useMemo$4(() => {
+  const { numActivityVariants, questionCounts, sourceHash, numItems } = useMemo$4(() => {
     try {
       validateIds(source);
-      return gatherDocumentStructure(source);
+      const docStructure = gatherDocumentStructure(source);
+      const sourceHash2 = hash(source);
+      const numItems2 = getNumItems(source);
+      return { ...docStructure, sourceHash: sourceHash2, numItems: numItems2 };
     } catch (e2) {
       const message = e2 instanceof Error ? e2.message : "";
       setErrMsg(`Error in activity source: ${message}`);
-      return { numActivityVariants: {}, questionCounts: {} };
+      return {
+        numActivityVariants: {},
+        questionCounts: {},
+        sourceHash: "",
+        numItems: 0
+      };
     }
   }, [source]);
-  const [activityState, activityStateDispatch] = useReducer(
-    activityStateReducer,
+  const [activityDoenetState, activityDoenetStateDispatch] = useReducer(
+    activityDoenetStateReducer,
     {
       source,
       variant: initialVariantIndex,
       parentId: null,
       numActivityVariants
     },
-    initializeActivityState
+    initializeActivityAndDoenetState
   );
+  const activityState = activityDoenetState.activityState;
   const itemSequence = getItemSequence(activityState);
-  const numItems = itemSequence.length;
   const [currentItemIdx, setCurrentItemIdx] = useState$3(0);
   const currentItemId = itemSequence[currentItemIdx];
   const [itemsRendered, setItemsRendered] = useState$3([]);
   const [itemsToRender, setItemsToRender] = useState$3([]);
   const [itemsVisible, setItemsVisible] = useState$3([]);
+  const attemptNumber = activityState.attemptNumber;
   function addItemToRender(id2) {
     if (!itemsToRender.includes(id2)) {
       setItemsToRender((was) => {
@@ -53815,7 +53909,7 @@ function Viewer({
     if (initialPass.current) {
       initialPass.current = false;
     } else {
-      activityStateDispatch({
+      activityDoenetStateDispatch({
         type: "initialize",
         source,
         variantIndex: initialVariantIndex,
@@ -53827,79 +53921,86 @@ function Viewer({
     const listenersAdded = [];
     const timeoutIdsAdded = [];
     function loadState() {
-      return new Promise((resolve, reject2) => {
-        const messageId = nanoid();
-        window.postMessage({
-          subject: "SPLICE.getState",
-          messageId,
-          activityId,
-          userId
-        });
-        let waitingToLoadState = true;
-        let timeoutId = -1;
-        const loadStateListener = function(event) {
-          if (event.origin !== window.location.origin) {
-            return;
-          }
-          if (event.data.subject === "SPLICE.getState.response" && event.data.messageId === messageId) {
-            waitingToLoadState = false;
-            if (event.data.success) {
-              if (event.data.loadedState) {
-                const exportedState = event.data.state;
-                if (isExportedActivityState(exportedState)) {
-                  if (validateStateAndSource(
-                    exportedState,
-                    source
-                  )) {
-                    const state = addSourceToActivityState(
-                      exportedState.state,
+      return new Promise(
+        (resolve, reject2) => {
+          const messageId = nanoid();
+          window.postMessage({
+            subject: "SPLICE.getState",
+            messageId,
+            activityId,
+            userId
+          });
+          let waitingToLoadState = true;
+          let timeoutId = -1;
+          const loadStateListener = function(event) {
+            if (event.origin !== window.location.origin) {
+              return;
+            }
+            if (event.data.subject === "SPLICE.getState.response" && event.data.messageId === messageId) {
+              waitingToLoadState = false;
+              if (event.data.success) {
+                if (event.data.loadedState) {
+                  const exportedState = event.data.state;
+                  if (isExportedActivityState(exportedState)) {
+                    if (validateStateAndSource(
+                      exportedState,
                       source
-                    );
-                    resolve(state);
+                    )) {
+                      const state = addSourceToActivityState(
+                        exportedState.activityState,
+                        source
+                      );
+                      resolve({
+                        activityState: state,
+                        doenetStates: exportedState.doenetStates,
+                        itemAttemptNumbers: exportedState.itemAttemptNumbers
+                      });
+                    } else {
+                      reject2(
+                        Error(
+                          "Received state did not match source"
+                        )
+                      );
+                    }
                   } else {
-                    reject2(
-                      Error(
-                        "Received state did not match source"
-                      )
-                    );
+                    reject2(Error("Received invalid state"));
                   }
                 } else {
-                  reject2(Error("Received invalid state"));
+                  resolve(null);
                 }
               } else {
-                resolve(null);
+                reject2(Error("Error loading assignment state"));
               }
-            } else {
-              reject2(Error("Error loading assignment state"));
+              window.removeEventListener(
+                "message",
+                loadStateListener
+              );
+              clearTimeout(timeoutId);
             }
-            window.removeEventListener(
-              "message",
-              loadStateListener
-            );
-            clearTimeout(timeoutId);
-          }
-        };
-        window.addEventListener("message", loadStateListener);
-        listenersAdded.push(loadStateListener);
-        const MESSAGE_TIMEOUT = 15e3;
-        timeoutId = setTimeout(() => {
-          if (!waitingToLoadState) {
-            return;
-          }
-          reject2(Error("Time out loading assignment state"));
-        }, MESSAGE_TIMEOUT);
-        timeoutIdsAdded.push(timeoutId);
-      });
+          };
+          window.addEventListener("message", loadStateListener);
+          listenersAdded.push(loadStateListener);
+          const MESSAGE_TIMEOUT = 15e3;
+          timeoutId = setTimeout(() => {
+            if (!waitingToLoadState) {
+              return;
+            }
+            reject2(Error("Time out loading assignment state"));
+          }, MESSAGE_TIMEOUT);
+          timeoutIdsAdded.push(timeoutId);
+        }
+      );
     }
     function getNewActivityState() {
       try {
-        activityStateDispatch({
+        activityDoenetStateDispatch({
           type: "generateNewActivityAttempt",
           numActivityVariants,
           initialQuestionCounter: 1,
           questionCounts,
           allowSaveState: flags.allowSaveState,
-          baseId: activityId
+          baseId: activityId,
+          sourceHash
         });
       } catch (e2) {
         const message = e2 instanceof Error ? e2.message : "";
@@ -53908,8 +54009,8 @@ function Viewer({
     }
     if (flags.allowLoadState) {
       loadState().then((state) => {
-        if (isActivityState(state)) {
-          activityStateDispatch({
+        if (isActivityAndDoenetState(state)) {
+          activityDoenetStateDispatch({
             type: "set",
             state,
             allowSaveState: flags.allowSaveState,
@@ -53943,7 +54044,8 @@ function Viewer({
     userId,
     source,
     numActivityVariants,
-    questionCounts
+    questionCounts,
+    sourceHash
   ]);
   function clickNext() {
     setCurrentItemIdx((was) => Math.min(numItems - 1, was + 1));
@@ -53953,25 +54055,31 @@ function Viewer({
   }
   function reportScoreAndStateCallback(msg) {
     if (isSingleDocReportStateMessage(msg)) {
-      activityStateDispatch({
+      activityDoenetStateDispatch({
         type: "updateSingleState",
-        id: msg.docId,
+        docId: msg.docId,
         doenetState: msg.state,
+        doenetStateIdx: itemSequence.indexOf(msg.docId),
+        itemSequence,
         creditAchieved: msg.score,
         allowSaveState: flags.allowSaveState,
-        baseId: activityId
+        baseId: activityId,
+        sourceHash
       });
     }
   }
   function generateNewItemAttempt(id2, initialQuestionCounter) {
-    activityStateDispatch({
-      type: "generateNewActivityAttempt",
-      id: id2,
+    activityDoenetStateDispatch({
+      type: "generateSingleDocSubActivityAttempt",
+      docId: id2,
+      doenetStateIdx: itemSequence.indexOf(id2),
+      itemSequence,
       numActivityVariants,
       initialQuestionCounter,
       questionCounts,
       allowSaveState: flags.allowSaveState,
-      baseId: activityId
+      baseId: activityId,
+      sourceHash
     });
     setItemsRendered((was) => {
       const idx = was.indexOf(id2);
@@ -54027,13 +54135,14 @@ function Viewer({
     });
   }
   function generateActivityAttempt() {
-    activityStateDispatch({
+    activityDoenetStateDispatch({
       type: "generateNewActivityAttempt",
       numActivityVariants,
       initialQuestionCounter: 1,
       questionCounts,
       allowSaveState: flags.allowSaveState,
-      baseId: activityId
+      baseId: activityId,
+      sourceHash
     });
     setItemsRendered([]);
     setCurrentItemIdx(0);
@@ -54116,18 +54225,22 @@ function Viewer({
           }
         )
       ] }),
-      activityLevelAttempts ? /* @__PURE__ */ jsxRuntimeExports$1.jsx(
+      activityLevelAttempts && maxAttemptsAllowed !== 1 ? /* @__PURE__ */ jsxRuntimeExports$1.jsxs(
         "button",
         {
           onClick: generateActivityAttempt,
-          disabled: numItems === 0,
+          disabled: numItems === 0 || maxAttemptsAllowed > 0 && attemptNumber >= maxAttemptsAllowed,
           style: {
             marginLeft: "30px",
             backgroundColor: "lightgray",
             borderRadius: "10px",
             padding: "5px 20px"
           },
-          children: "New attempt"
+          children: [
+            "New attempt",
+            " ",
+            maxAttemptsAllowed > 0 ? `(${(maxAttemptsAllowed - attemptNumber).toString()} left)` : null
+          ]
         }
       ) : null
     ] }) }),
@@ -54144,14 +54257,17 @@ function Viewer({
       {
         flags,
         baseId: activityId,
+        maxAttemptsAllowed,
         forceDisable,
         forceShowCorrectness,
         forceShowSolution,
         forceUnsuppressCheckwork,
         linkSettings,
         darkMode,
-        showAnswerTitles,
+        showAnswerResponseMenu,
+        answerResponseCountsByItem,
         state: activityState,
+        doenetStates: activityDoenetState.doenetStates,
         reportScoreAndStateCallback,
         checkRender,
         checkHidden,
@@ -54159,7 +54275,9 @@ function Viewer({
         generateNewItemAttempt,
         hasRenderedCallback,
         reportVisibility: !paginate,
-        reportVisibilityCallback
+        reportVisibilityCallback,
+        itemAttemptNumbers: activityDoenetState.itemAttemptNumbers,
+        itemSequence
       }
     )
   ] });
@@ -54182,10 +54300,9 @@ function ActivityViewer({
   source,
   flags: specifiedFlags = {},
   activityId = "a",
-  userId,
-  attemptNumber = 1,
+  userId = null,
   requestedVariantIndex,
-  maxAttemptsAllowed = Infinity,
+  maxAttemptsAllowed = 1,
   itemLevelAttempts = false,
   activityLevelAttempts = false,
   paginate = true,
@@ -54198,11 +54315,12 @@ function ActivityViewer({
   externalVirtualKeyboardProvided = false,
   linkSettings,
   darkMode = "light",
-  showAnswerTitles = false,
+  showAnswerResponseMenu = false,
+  answerResponseCountsByItem = [],
   includeVariantSelector: _includeVariantSelector = false,
   showTitle = true
 }) {
-  const [variantIndex, setVariantIndex] = useState$3(null);
+  const [initialVariantIndex, setInitialVariantIndex] = useState$3(null);
   const thisPropSet = {
     source: JSON.stringify(source),
     activityId,
@@ -54221,14 +54339,14 @@ function ActivityViewer({
   if (foundPropChange) {
     if (requestedVariantIndex === void 0) {
       const rng = rngClass((/* @__PURE__ */ new Date()).toString());
-      setVariantIndex(Math.floor(rng() * 1e6) + 1);
+      setInitialVariantIndex(Math.floor(rng() * 1e6) + 1);
     } else {
-      setVariantIndex(
+      setInitialVariantIndex(
         Number.isInteger(requestedVariantIndex) ? requestedVariantIndex : 1
       );
     }
   }
-  if (variantIndex === null) {
+  if (initialVariantIndex === null) {
     return null;
   }
   return /* @__PURE__ */ jsxRuntimeExports$1.jsx(ErrorBoundary, { children: /* @__PURE__ */ jsxRuntimeExports$1.jsx(
@@ -54238,8 +54356,7 @@ function ActivityViewer({
       flags,
       activityId,
       userId,
-      attemptNumber,
-      variantIndex,
+      initialVariantIndex,
       maxAttemptsAllowed,
       itemLevelAttempts,
       activityLevelAttempts,
@@ -54253,7 +54370,8 @@ function ActivityViewer({
       externalVirtualKeyboardProvided,
       linkSettings,
       darkMode,
-      showAnswerTitles,
+      showAnswerResponseMenu,
+      answerResponseCountsByItem,
       showTitle
     }
   ) });