@cubingcenter/scrambler 0.1.0 → 0.2.0

package/dist/puzzles/cube3/scrambler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrambler.d.ts","sourceRoot":"","sources":["../../../src/puzzles/cube3/scrambler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAW9F,eAAO,MAAM,sBAAsB,EAAE,iBAYpC,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,GAAE,eAAe,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3D,OAAO,CAAC,cAAc,CAAC,CA+CzB"}
+{"version":3,"file":"scrambler.d.ts","sourceRoot":"","sources":["../../../src/puzzles/cube3/scrambler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAW9F,eAAO,MAAM,sBAAsB,EAAE,iBAYpC,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,OAAO,GAAE,eAAe,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3D,OAAO,CAAC,cAAc,CAAC,CAgDzB"}

package/dist/puzzles/cube3/scrambler.js

@@ -42,6 +42,7 @@ export async function generateCube3Scramble(options = {}) {
         metadata: {
             generator: "cube3-two-phase",
             generatorVersion: "1.0.0",
+            facelets,
             faceletString: formatCube3Facelets(facelets),
             state: JSON.parse(JSON.stringify(state)),
             solutionMoves: solution.moves,

package/dist/puzzles/cube4/scrambler.js

@@ -7,9 +7,9 @@ export const cube4ScrambleGenerator = {
         eventId: "444",
         name: "4x4x4 Cube",
         puzzle: "cube-4x4",
-        quality: "random-move",
-        generator: "cube4-random-move",
-        description: "Random-move 4x4 scramble with 40 moves."
+        quality: "random-state",
+        generator: "cubing-scramble",
+        description: "Random-state 4x4 scramble generated by cubing.js."
     },
     generate(options = {}) {
         return generateCube4Scramble(options);

package/dist/puzzles/pyraminx/facelets.d.ts

@@ -0,0 +1,7 @@
+import type { PyraminxState } from "./types.js";
+export type PyraminxFacelets = Record<"F" | "L" | "R" | "D", readonly string[]>;
+export declare function createSolvedPyraminxFacelets(): PyraminxFacelets;
+export declare function toPyraminxFacelets(state: PyraminxState): PyraminxFacelets;
+export declare function formatPyraminxFacelets(facelets: PyraminxFacelets): string;
+export declare function getPyraminxFaceOrder(): readonly ("F" | "L" | "R" | "D")[];
+//# sourceMappingURL=facelets.d.ts.map

package/dist/puzzles/pyraminx/facelets.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"facelets.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/facelets.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAUhD,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC;AA6DhF,wBAAgB,4BAA4B,IAAI,gBAAgB,CAO/D;AAyBD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,aAAa,GAAG,gBAAgB,CAiCzE;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAEzE;AAED,wBAAgB,oBAAoB,IAAI,SAAS,CAAC,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC,EAAE,CAEzE"}

package/dist/puzzles/pyraminx/facelets.js

@@ -0,0 +1,97 @@
+const FACE_ORDER = ["F", "L", "R", "D"];
+// positionId -> sticker slots (each slot = one triangle cell of the grid).
+// Positions follow the scrambler piece model (moves.ts):
+//   edges 0..5 = UL, UR, UB, LR, LB, RB
+//   centers 0..3 = U, L, R, B
+//   tips 0..3 = U, L, R, B
+//
+// The slot layout is validated against the piece model by
+// test/pyraminx-facelets.test.ts (single moves + randomized sequences).
+const EDGE_POSITION_SLOTS = [
+    [["F", 1], ["L", 7]], // 0 UL
+    [["F", 3], ["R", 5]], // 1 UR
+    [["L", 2], ["R", 2]], // 2 UB
+    [["F", 6], ["D", 2]], // 3 LR
+    [["L", 5], ["D", 5]], // 4 LB
+    [["R", 7], ["D", 7]], // 5 RB
+];
+const CENTER_POSITION_SLOTS = [
+    [["F", 2], ["L", 3], ["R", 1]], // 0 U
+    [["F", 5], ["L", 6], ["D", 1]], // 1 L
+    [["F", 7], ["R", 6], ["D", 3]], // 2 R
+    [["L", 1], ["R", 3], ["D", 6]], // 3 B
+];
+const TIP_POSITION_SLOTS = [
+    [["F", 0], ["L", 4], ["R", 0]], // 0 U
+    [["F", 4], ["D", 0], ["L", 8]], // 1 L
+    [["F", 8], ["R", 8], ["D", 4]], // 2 R
+    [["L", 0], ["D", 8], ["R", 4]], // 3 B
+];
+// pieceId -> sticker colors (canonical order aligned with the role order above)
+const EDGE_PIECE_STICKERS = [
+    ["F", "L"], // 0 UL
+    ["F", "R"], // 1 UR
+    ["L", "R"], // 2 UB
+    ["F", "D"], // 3 LR
+    ["L", "D"], // 4 LB
+    ["R", "D"], // 5 RB
+];
+const CENTER_PIECE_STICKERS = [
+    ["F", "L", "R"], // 0 U
+    ["F", "L", "D"], // 1 L
+    ["F", "R", "D"], // 2 R
+    ["L", "R", "D"], // 3 B
+];
+const TIP_PIECE_STICKERS = [
+    ["F", "L", "R"], // 0 U
+    ["F", "D", "L"], // 1 L
+    ["F", "R", "D"], // 2 R
+    ["L", "D", "R"], // 3 B
+];
+export function createSolvedPyraminxFacelets() {
+    return {
+        F: Array.from({ length: 9 }, () => "F"),
+        L: Array.from({ length: 9 }, () => "L"),
+        R: Array.from({ length: 9 }, () => "R"),
+        D: Array.from({ length: 9 }, () => "D"),
+    };
+}
+function createEmptyPyraminxFacelets() {
+    return {
+        F: Array(9).fill("?"),
+        L: Array(9).fill("?"),
+        R: Array(9).fill("?"),
+        D: Array(9).fill("?"),
+    };
+}
+function placeOrientedStickers(facelets, slots, stickers, orientation) {
+    for (let index = 0; index < slots.length; index += 1) {
+        const [face, stickerIndex] = slots[index];
+        const sticker = stickers[(index - orientation + stickers.length) % stickers.length];
+        const arr = facelets[face];
+        arr[stickerIndex] = sticker;
+    }
+}
+export function toPyraminxFacelets(state) {
+    const facelets = createEmptyPyraminxFacelets();
+    for (let position = 0; position < 6; position += 1) {
+        const piece = state.edgesPerm[position];
+        const orientation = state.edgesOrient[position];
+        placeOrientedStickers(facelets, EDGE_POSITION_SLOTS[position], EDGE_PIECE_STICKERS[piece], orientation);
+    }
+    for (let position = 0; position < 4; position += 1) {
+        const orientation = state.centers[position];
+        placeOrientedStickers(facelets, CENTER_POSITION_SLOTS[position], CENTER_PIECE_STICKERS[position], orientation);
+    }
+    for (let position = 0; position < 4; position += 1) {
+        const orientation = state.tips[position];
+        placeOrientedStickers(facelets, TIP_POSITION_SLOTS[position], TIP_PIECE_STICKERS[position], orientation);
+    }
+    return facelets;
+}
+export function formatPyraminxFacelets(facelets) {
+    return FACE_ORDER.map((face) => facelets[face].join("")).join("");
+}
+export function getPyraminxFaceOrder() {
+    return FACE_ORDER;
+}

package/dist/puzzles/pyraminx/index.d.ts

@@ -5,5 +5,7 @@ export { clonePyraminxState, createSolvedPyraminxState, pyraminxStatesEqual, isS
 export { permutationParity, validatePyraminxState, isAllowedRandomPyraminxState } from "./validation.js";
 export { generateRandomPyraminxState } from "./random-state.js";
 export { pyraminxScrambleGenerator, generatePyraminxScramble } from "./scrambler.js";
+export { createSolvedPyraminxFacelets, formatPyraminxFacelets, getPyraminxFaceOrder, toPyraminxFacelets } from "./facelets.js";
+export type { PyraminxFacelets } from "./facelets.js";
 export { solvePyraminx } from "./solver.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/puzzles/pyraminx/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACd,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,2BAA2B,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,aAAa,EACd,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EACnB,aAAa,EACd,MAAM,YAAY,CAAC;AACpB,YAAY,EACV,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,eAAe,EACf,0BAA0B,EAC3B,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,uBAAuB,EACvB,uBAAuB,EACvB,kBAAkB,EAClB,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,kBAAkB,EAClB,yBAAyB,EACzB,mBAAmB,EACnB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EACrB,4BAA4B,EAC7B,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,2BAA2B,EAC5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,yBAAyB,EACzB,wBAAwB,EACzB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,4BAA4B,EAC5B,sBAAsB,EACtB,oBAAoB,EACpB,kBAAkB,EACnB,MAAM,eAAe,CAAC;AACvB,YAAY,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,aAAa,EACd,MAAM,aAAa,CAAC"}

package/dist/puzzles/pyraminx/index.js

@@ -4,4 +4,5 @@ export { clonePyraminxState, createSolvedPyraminxState, pyraminxStatesEqual, isS
 export { permutationParity, validatePyraminxState, isAllowedRandomPyraminxState } from "./validation.js";
 export { generateRandomPyraminxState } from "./random-state.js";
 export { pyraminxScrambleGenerator, generatePyraminxScramble } from "./scrambler.js";
+export { createSolvedPyraminxFacelets, formatPyraminxFacelets, getPyraminxFaceOrder, toPyraminxFacelets } from "./facelets.js";
 export { solvePyraminx } from "./solver.js";

package/dist/puzzles/pyraminx/moves.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moves.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/moves.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAqC,MAAM,YAAY,CAAC;AAKjG,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,GAAG,aAAa,CA4BzF;AA8DD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,aAAa,CAE1G;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE,CAEtF;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAMxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAE9E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAU7D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAKnE"}
+{"version":3,"file":"moves.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/moves.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAqC,MAAM,YAAY,CAAC;AAKjG,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,YAAY,GAAG,aAAa,CA4BzF;AA2DD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,aAAa,CAE1G;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,YAAY,EAAE,CAEtF;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,YAAY,EAAE,CAMxE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAE9E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAU7D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,YAAY,GAAG,YAAY,CAKnE"}

package/dist/puzzles/pyraminx/moves.js

@@ -30,56 +30,53 @@ function applySingleCoreMoveCW(state, face) {
     const centers = state.centers;
     const perm = state.edgesPerm;
     const orient = state.edgesOrient;
+    const tips = state.tips;
     // Clone arrays for temporary storage
     const prevPerm = [...perm];
     const prevOrient = [...orient];
     if (face === "U") {
-        // Center
+        // U: UL -> UB -> UR -> UL with the physical orientation (matches viz)
         centers[0] = (centers[0] + 1) % 3;
-        // Edges cycle: 0 -> 1 -> 2 -> 0 (UL -> UR -> UB -> UL)
-        // No orientation flips for U
-        perm[1] = prevPerm[0];
-        perm[2] = prevPerm[1];
-        perm[0] = prevPerm[2];
-        orient[1] = prevOrient[0];
-        orient[2] = prevOrient[1];
-        orient[0] = prevOrient[2];
+        tips[0] = (tips[0] + 1) % 3;
+        perm[0] = prevPerm[1];
+        perm[1] = prevPerm[2];
+        perm[2] = prevPerm[0];
+        orient[0] = (prevOrient[1] + 1) % 2;
+        orient[1] = (prevOrient[2] + 1) % 2;
+        orient[2] = prevOrient[0];
     }
     else if (face === "L") {
-        // Center
-        centers[1] = (centers[1] + 1) % 3;
-        // Edges cycle: 0 -> 4 -> 3 -> 0 (UL -> LB -> LR -> UL)
-        // Flips: UL(0) flips, LB(4) flips, LR(3) does not flip
-        perm[4] = prevPerm[0];
-        perm[3] = prevPerm[4];
-        perm[0] = prevPerm[3];
-        orient[4] = (prevOrient[0] + 1) % 2;
-        orient[3] = (prevOrient[4] + 1) % 2;
-        orient[0] = prevOrient[3];
+        // L: UL -> LB -> LR -> UL (physical, matches viz)
+        centers[1] = (centers[1] + 2) % 3;
+        tips[1] = (tips[1] + 1) % 3;
+        perm[0] = prevPerm[4];
+        perm[3] = prevPerm[0];
+        perm[4] = prevPerm[3];
+        orient[0] = prevOrient[4];
+        orient[3] = (prevOrient[0] + 1) % 2;
+        orient[4] = (prevOrient[3] + 1) % 2;
     }
     else if (face === "R") {
-        // Center
+        // R: UR -> LR -> RB -> UR (physical, matches viz)
         centers[2] = (centers[2] + 1) % 3;
-        // Edges cycle: 1 -> 3 -> 5 -> 1 (UR -> LR -> RB -> UR)
-        // Flips: UR(1) flips, LR(3) flips, RB(5) does not flip
-        perm[3] = prevPerm[1];
-        perm[5] = prevPerm[3];
-        perm[1] = prevPerm[5];
-        orient[3] = (prevOrient[1] + 1) % 2;
-        orient[5] = (prevOrient[3] + 1) % 2;
-        orient[1] = prevOrient[5];
+        tips[2] = (tips[2] + 1) % 3;
+        perm[1] = prevPerm[3];
+        perm[3] = prevPerm[5];
+        perm[5] = prevPerm[1];
+        orient[1] = (prevOrient[3] + 1) % 2;
+        orient[3] = (prevOrient[5] + 1) % 2;
+        orient[5] = prevOrient[1];
     }
     else if (face === "B") {
-        // Center
-        centers[3] = (centers[3] + 1) % 3;
-        // Edges cycle: 2 -> 5 -> 4 -> 2 (UB -> RB -> LB -> UB)
-        // Flips: UB(2) flips, RB(5) flips, LB(4) does not flip
-        perm[5] = prevPerm[2];
-        perm[4] = prevPerm[5];
-        perm[2] = prevPerm[4];
-        orient[5] = (prevOrient[2] + 1) % 2;
-        orient[4] = (prevOrient[5] + 1) % 2;
-        orient[2] = prevOrient[4];
+        // B: UB -> LB -> RB -> UB (physical, matches viz)
+        centers[3] = (centers[3] + 2) % 3;
+        tips[3] = (tips[3] + 1) % 3;
+        perm[2] = prevPerm[5];
+        perm[4] = prevPerm[2];
+        perm[5] = prevPerm[4];
+        orient[2] = prevOrient[5];
+        orient[4] = (prevOrient[2] + 1) % 2;
+        orient[5] = (prevOrient[4] + 1) % 2;
     }
 }
 export function applyPyraminxAlgorithm(state, moves) {

package/dist/puzzles/pyraminx/scrambler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scrambler.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/scrambler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAO9F,eAAO,MAAM,yBAAyB,EAAE,iBAYvC,CAAC;AAEF,wBAAsB,wBAAwB,CAC5C,OAAO,GAAE,eAAe,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3D,OAAO,CAAC,cAAc,CAAC,CAyCzB"}
+{"version":3,"file":"scrambler.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/scrambler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAQ9F,eAAO,MAAM,yBAAyB,EAAE,iBAYvC,CAAC;AAEF,wBAAsB,wBAAwB,CAC5C,OAAO,GAAE,eAAe,GAAG;IAAE,cAAc,CAAC,EAAE,OAAO,CAAA;CAAO,GAC3D,OAAO,CAAC,cAAc,CAAC,CA+CzB"}

package/dist/puzzles/pyraminx/scrambler.js

@@ -2,6 +2,7 @@ import { generateRandomPyraminxState } from "./random-state.js";
 import { createSolvedPyraminxState } from "./state.js";
 import { applyPyraminxAlgorithm, invertPyraminxAlgorithm } from "./moves.js";
 import { solvePyraminx } from "./solver.js";
+import { formatPyraminxFacelets, toPyraminxFacelets } from "./facelets.js";
 export const pyraminxScrambleGenerator = {
     info: {
         eventId: "pyrso",
@@ -20,15 +21,17 @@ export async function generatePyraminxScramble(options = {}) {
     // Solve the core edges and centers
     const solution = solvePyraminx(state);
     const scrambleMoves = invertPyraminxAlgorithm(solution);
-    // Append tips to scrambleMoves
+    // Append tips: layer moves already rotate tips, so we need the delta
+    // between the target tips and the tips produced by the core scramble.
+    const coreState = applyPyraminxAlgorithm(createSolvedPyraminxState(), scrambleMoves);
     const finalMoves = [...scrambleMoves];
     const tipsNotation = ["u", "l", "r", "b"];
     for (let i = 0; i < 4; i++) {
-        const tipVal = state.tips[i];
-        if (tipVal === 1) {
+        const delta = (state.tips[i] - coreState.tips[i] + 3) % 3;
+        if (delta === 1) {
             finalMoves.push(tipsNotation[i]);
         }
-        else if (tipVal === 2) {
+        else if (delta === 2) {
             finalMoves.push(`${tipsNotation[i]}'`);
         }
     }
@@ -41,6 +44,7 @@ export async function generatePyraminxScramble(options = {}) {
             throw new Error("Generated Pyraminx scramble does not reproduce the target random state.");
         }
     }
+    const facelets = toPyraminxFacelets(state);
     return {
         eventId: "pyrso",
         scramble: finalMoves.join(" "),
@@ -49,6 +53,8 @@ export async function generatePyraminxScramble(options = {}) {
         generator: "pyraminx-ida-star",
         metadata: {
             state,
+            facelets,
+            faceletString: formatPyraminxFacelets(facelets),
             solutionMoves: solution,
             solutionDepth: solution.length
         }

package/dist-cjs/puzzles/cube3/scrambler.js

@@ -46,6 +46,7 @@ async function generateCube3Scramble(options = {}) {
         metadata: {
             generator: "cube3-two-phase",
             generatorVersion: "1.0.0",
+            facelets,
             faceletString: (0, facelets_js_1.formatCube3Facelets)(facelets),
             state: JSON.parse(JSON.stringify(state)),
             solutionMoves: solution.moves,

package/dist-cjs/puzzles/cube4/scrambler.js

@@ -44,9 +44,9 @@ exports.cube4ScrambleGenerator = {
         eventId: "444",
         name: "4x4x4 Cube",
         puzzle: "cube-4x4",
-        quality: "random-move",
-        generator: "cube4-random-move",
-        description: "Random-move 4x4 scramble with 40 moves."
+        quality: "random-state",
+        generator: "cubing-scramble",
+        description: "Random-state 4x4 scramble generated by cubing.js."
     },
     generate(options = {}) {
         return generateCube4Scramble(options);

package/dist-cjs/puzzles/pyraminx/facelets.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSolvedPyraminxFacelets = createSolvedPyraminxFacelets;
+exports.toPyraminxFacelets = toPyraminxFacelets;
+exports.formatPyraminxFacelets = formatPyraminxFacelets;
+exports.getPyraminxFaceOrder = getPyraminxFaceOrder;
+const FACE_ORDER = ["F", "L", "R", "D"];
+// positionId -> sticker slots (each slot = one triangle cell of the grid).
+// Positions follow the scrambler piece model (moves.ts):
+//   edges 0..5 = UL, UR, UB, LR, LB, RB
+//   centers 0..3 = U, L, R, B
+//   tips 0..3 = U, L, R, B
+//
+// The slot layout is validated against the piece model by
+// test/pyraminx-facelets.test.ts (single moves + randomized sequences).
+const EDGE_POSITION_SLOTS = [
+    [["F", 1], ["L", 7]], // 0 UL
+    [["F", 3], ["R", 5]], // 1 UR
+    [["L", 2], ["R", 2]], // 2 UB
+    [["F", 6], ["D", 2]], // 3 LR
+    [["L", 5], ["D", 5]], // 4 LB
+    [["R", 7], ["D", 7]], // 5 RB
+];
+const CENTER_POSITION_SLOTS = [
+    [["F", 2], ["L", 3], ["R", 1]], // 0 U
+    [["F", 5], ["L", 6], ["D", 1]], // 1 L
+    [["F", 7], ["R", 6], ["D", 3]], // 2 R
+    [["L", 1], ["R", 3], ["D", 6]], // 3 B
+];
+const TIP_POSITION_SLOTS = [
+    [["F", 0], ["L", 4], ["R", 0]], // 0 U
+    [["F", 4], ["D", 0], ["L", 8]], // 1 L
+    [["F", 8], ["R", 8], ["D", 4]], // 2 R
+    [["L", 0], ["D", 8], ["R", 4]], // 3 B
+];
+// pieceId -> sticker colors (canonical order aligned with the role order above)
+const EDGE_PIECE_STICKERS = [
+    ["F", "L"], // 0 UL
+    ["F", "R"], // 1 UR
+    ["L", "R"], // 2 UB
+    ["F", "D"], // 3 LR
+    ["L", "D"], // 4 LB
+    ["R", "D"], // 5 RB
+];
+const CENTER_PIECE_STICKERS = [
+    ["F", "L", "R"], // 0 U
+    ["F", "L", "D"], // 1 L
+    ["F", "R", "D"], // 2 R
+    ["L", "R", "D"], // 3 B
+];
+const TIP_PIECE_STICKERS = [
+    ["F", "L", "R"], // 0 U
+    ["F", "D", "L"], // 1 L
+    ["F", "R", "D"], // 2 R
+    ["L", "D", "R"], // 3 B
+];
+function createSolvedPyraminxFacelets() {
+    return {
+        F: Array.from({ length: 9 }, () => "F"),
+        L: Array.from({ length: 9 }, () => "L"),
+        R: Array.from({ length: 9 }, () => "R"),
+        D: Array.from({ length: 9 }, () => "D"),
+    };
+}
+function createEmptyPyraminxFacelets() {
+    return {
+        F: Array(9).fill("?"),
+        L: Array(9).fill("?"),
+        R: Array(9).fill("?"),
+        D: Array(9).fill("?"),
+    };
+}
+function placeOrientedStickers(facelets, slots, stickers, orientation) {
+    for (let index = 0; index < slots.length; index += 1) {
+        const [face, stickerIndex] = slots[index];
+        const sticker = stickers[(index - orientation + stickers.length) % stickers.length];
+        const arr = facelets[face];
+        arr[stickerIndex] = sticker;
+    }
+}
+function toPyraminxFacelets(state) {
+    const facelets = createEmptyPyraminxFacelets();
+    for (let position = 0; position < 6; position += 1) {
+        const piece = state.edgesPerm[position];
+        const orientation = state.edgesOrient[position];
+        placeOrientedStickers(facelets, EDGE_POSITION_SLOTS[position], EDGE_PIECE_STICKERS[piece], orientation);
+    }
+    for (let position = 0; position < 4; position += 1) {
+        const orientation = state.centers[position];
+        placeOrientedStickers(facelets, CENTER_POSITION_SLOTS[position], CENTER_PIECE_STICKERS[position], orientation);
+    }
+    for (let position = 0; position < 4; position += 1) {
+        const orientation = state.tips[position];
+        placeOrientedStickers(facelets, TIP_POSITION_SLOTS[position], TIP_PIECE_STICKERS[position], orientation);
+    }
+    return facelets;
+}
+function formatPyraminxFacelets(facelets) {
+    return FACE_ORDER.map((face) => facelets[face].join("")).join("");
+}
+function getPyraminxFaceOrder() {
+    return FACE_ORDER;
+}

package/dist-cjs/puzzles/pyraminx/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solvePyraminx = exports.generatePyraminxScramble = exports.pyraminxScrambleGenerator = exports.generateRandomPyraminxState = exports.isAllowedRandomPyraminxState = exports.validatePyraminxState = exports.permutationParity = exports.isSolvedPyraminxState = exports.pyraminxStatesEqual = exports.createSolvedPyraminxState = exports.clonePyraminxState = exports.parsePyraminxMove = exports.parsePyraminxAlgorithm = exports.invertPyraminxMove = exports.invertPyraminxAlgorithm = exports.formatPyraminxAlgorithm = exports.applyPyraminxMove = exports.applyPyraminxAlgorithm = exports.PYRAMINX_TIPS = exports.PYRAMINX_CORE_MOVES = void 0;
+exports.solvePyraminx = exports.toPyraminxFacelets = exports.getPyraminxFaceOrder = exports.formatPyraminxFacelets = exports.createSolvedPyraminxFacelets = exports.generatePyraminxScramble = exports.pyraminxScrambleGenerator = exports.generateRandomPyraminxState = exports.isAllowedRandomPyraminxState = exports.validatePyraminxState = exports.permutationParity = exports.isSolvedPyraminxState = exports.pyraminxStatesEqual = exports.createSolvedPyraminxState = exports.clonePyraminxState = exports.parsePyraminxMove = exports.parsePyraminxAlgorithm = exports.invertPyraminxMove = exports.invertPyraminxAlgorithm = exports.formatPyraminxAlgorithm = exports.applyPyraminxMove = exports.applyPyraminxAlgorithm = exports.PYRAMINX_TIPS = exports.PYRAMINX_CORE_MOVES = void 0;
 var types_js_1 = require("./types.js");
 Object.defineProperty(exports, "PYRAMINX_CORE_MOVES", { enumerable: true, get: function () { return types_js_1.PYRAMINX_CORE_MOVES; } });
 Object.defineProperty(exports, "PYRAMINX_TIPS", { enumerable: true, get: function () { return types_js_1.PYRAMINX_TIPS; } });
@@ -26,5 +26,10 @@ Object.defineProperty(exports, "generateRandomPyraminxState", { enumerable: true
 var scrambler_js_1 = require("./scrambler.js");
 Object.defineProperty(exports, "pyraminxScrambleGenerator", { enumerable: true, get: function () { return scrambler_js_1.pyraminxScrambleGenerator; } });
 Object.defineProperty(exports, "generatePyraminxScramble", { enumerable: true, get: function () { return scrambler_js_1.generatePyraminxScramble; } });
+var facelets_js_1 = require("./facelets.js");
+Object.defineProperty(exports, "createSolvedPyraminxFacelets", { enumerable: true, get: function () { return facelets_js_1.createSolvedPyraminxFacelets; } });
+Object.defineProperty(exports, "formatPyraminxFacelets", { enumerable: true, get: function () { return facelets_js_1.formatPyraminxFacelets; } });
+Object.defineProperty(exports, "getPyraminxFaceOrder", { enumerable: true, get: function () { return facelets_js_1.getPyraminxFaceOrder; } });
+Object.defineProperty(exports, "toPyraminxFacelets", { enumerable: true, get: function () { return facelets_js_1.toPyraminxFacelets; } });
 var solver_js_1 = require("./solver.js");
 Object.defineProperty(exports, "solvePyraminx", { enumerable: true, get: function () { return solver_js_1.solvePyraminx; } });

package/dist-cjs/puzzles/pyraminx/moves.js

@@ -39,56 +39,53 @@ function applySingleCoreMoveCW(state, face) {
     const centers = state.centers;
     const perm = state.edgesPerm;
     const orient = state.edgesOrient;
+    const tips = state.tips;
     // Clone arrays for temporary storage
     const prevPerm = [...perm];
     const prevOrient = [...orient];
     if (face === "U") {
-        // Center
+        // U: UL -> UB -> UR -> UL with the physical orientation (matches viz)
         centers[0] = (centers[0] + 1) % 3;
-        // Edges cycle: 0 -> 1 -> 2 -> 0 (UL -> UR -> UB -> UL)
-        // No orientation flips for U
-        perm[1] = prevPerm[0];
-        perm[2] = prevPerm[1];
-        perm[0] = prevPerm[2];
-        orient[1] = prevOrient[0];
-        orient[2] = prevOrient[1];
-        orient[0] = prevOrient[2];
+        tips[0] = (tips[0] + 1) % 3;
+        perm[0] = prevPerm[1];
+        perm[1] = prevPerm[2];
+        perm[2] = prevPerm[0];
+        orient[0] = (prevOrient[1] + 1) % 2;
+        orient[1] = (prevOrient[2] + 1) % 2;
+        orient[2] = prevOrient[0];
     }
     else if (face === "L") {
-        // Center
-        centers[1] = (centers[1] + 1) % 3;
-        // Edges cycle: 0 -> 4 -> 3 -> 0 (UL -> LB -> LR -> UL)
-        // Flips: UL(0) flips, LB(4) flips, LR(3) does not flip
-        perm[4] = prevPerm[0];
-        perm[3] = prevPerm[4];
-        perm[0] = prevPerm[3];
-        orient[4] = (prevOrient[0] + 1) % 2;
-        orient[3] = (prevOrient[4] + 1) % 2;
-        orient[0] = prevOrient[3];
+        // L: UL -> LB -> LR -> UL (physical, matches viz)
+        centers[1] = (centers[1] + 2) % 3;
+        tips[1] = (tips[1] + 1) % 3;
+        perm[0] = prevPerm[4];
+        perm[3] = prevPerm[0];
+        perm[4] = prevPerm[3];
+        orient[0] = prevOrient[4];
+        orient[3] = (prevOrient[0] + 1) % 2;
+        orient[4] = (prevOrient[3] + 1) % 2;
     }
     else if (face === "R") {
-        // Center
+        // R: UR -> LR -> RB -> UR (physical, matches viz)
         centers[2] = (centers[2] + 1) % 3;
-        // Edges cycle: 1 -> 3 -> 5 -> 1 (UR -> LR -> RB -> UR)
-        // Flips: UR(1) flips, LR(3) flips, RB(5) does not flip
-        perm[3] = prevPerm[1];
-        perm[5] = prevPerm[3];
-        perm[1] = prevPerm[5];
-        orient[3] = (prevOrient[1] + 1) % 2;
-        orient[5] = (prevOrient[3] + 1) % 2;
-        orient[1] = prevOrient[5];
+        tips[2] = (tips[2] + 1) % 3;
+        perm[1] = prevPerm[3];
+        perm[3] = prevPerm[5];
+        perm[5] = prevPerm[1];
+        orient[1] = (prevOrient[3] + 1) % 2;
+        orient[3] = (prevOrient[5] + 1) % 2;
+        orient[5] = prevOrient[1];
     }
     else if (face === "B") {
-        // Center
-        centers[3] = (centers[3] + 1) % 3;
-        // Edges cycle: 2 -> 5 -> 4 -> 2 (UB -> RB -> LB -> UB)
-        // Flips: UB(2) flips, RB(5) flips, LB(4) does not flip
-        perm[5] = prevPerm[2];
-        perm[4] = prevPerm[5];
-        perm[2] = prevPerm[4];
-        orient[5] = (prevOrient[2] + 1) % 2;
-        orient[4] = (prevOrient[5] + 1) % 2;
-        orient[2] = prevOrient[4];
+        // B: UB -> LB -> RB -> UB (physical, matches viz)
+        centers[3] = (centers[3] + 2) % 3;
+        tips[3] = (tips[3] + 1) % 3;
+        perm[2] = prevPerm[5];
+        perm[4] = prevPerm[2];
+        perm[5] = prevPerm[4];
+        orient[2] = prevOrient[5];
+        orient[4] = (prevOrient[2] + 1) % 2;
+        orient[5] = (prevOrient[4] + 1) % 2;
     }
 }
 function applyPyraminxAlgorithm(state, moves) {

package/dist-cjs/puzzles/pyraminx/scrambler.js

@@ -6,6 +6,7 @@ const random_state_js_1 = require("./random-state.js");
 const state_js_1 = require("./state.js");
 const moves_js_1 = require("./moves.js");
 const solver_js_1 = require("./solver.js");
+const facelets_js_1 = require("./facelets.js");
 exports.pyraminxScrambleGenerator = {
     info: {
         eventId: "pyrso",
@@ -24,15 +25,17 @@ async function generatePyraminxScramble(options = {}) {
     // Solve the core edges and centers
     const solution = (0, solver_js_1.solvePyraminx)(state);
     const scrambleMoves = (0, moves_js_1.invertPyraminxAlgorithm)(solution);
-    // Append tips to scrambleMoves
+    // Append tips: layer moves already rotate tips, so we need the delta
+    // between the target tips and the tips produced by the core scramble.
+    const coreState = (0, moves_js_1.applyPyraminxAlgorithm)((0, state_js_1.createSolvedPyraminxState)(), scrambleMoves);
     const finalMoves = [...scrambleMoves];
     const tipsNotation = ["u", "l", "r", "b"];
     for (let i = 0; i < 4; i++) {
-        const tipVal = state.tips[i];
-        if (tipVal === 1) {
+        const delta = (state.tips[i] - coreState.tips[i] + 3) % 3;
+        if (delta === 1) {
             finalMoves.push(tipsNotation[i]);
         }
-        else if (tipVal === 2) {
+        else if (delta === 2) {
             finalMoves.push(`${tipsNotation[i]}'`);
         }
     }
@@ -45,6 +48,7 @@ async function generatePyraminxScramble(options = {}) {
             throw new Error("Generated Pyraminx scramble does not reproduce the target random state.");
         }
     }
+    const facelets = (0, facelets_js_1.toPyraminxFacelets)(state);
     return {
         eventId: "pyrso",
         scramble: finalMoves.join(" "),
@@ -53,6 +57,8 @@ async function generatePyraminxScramble(options = {}) {
         generator: "pyraminx-ida-star",
         metadata: {
             state,
+            facelets,
+            faceletString: (0, facelets_js_1.formatPyraminxFacelets)(facelets),
             solutionMoves: solution,
             solutionDepth: solution.length
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubingcenter/scrambler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Extensible scramble generation toolkit for CubingCenter projects.",
   "type": "module",
   "license": "MIT",