@kvell007/embed-labs-cli 0.1.0-alpha.31 → 0.1.0-alpha.33

package/dist/local-toolchain.js

@@ -11,6 +11,7 @@ const DEFAULT_RELEASE_ROOT = "/Volumes/LLVM-TSPI/tspi-rk3566-llvm-release-minima
 const DEFAULT_QT_SMOKE_SOURCE = "/Users/kvell/kk-project/DBT-Agent-Project/llvm-build-tspi/qt-smoke";
 const DEFAULT_BOARD_ID = "taishanpi-1m-rk3566";
 const PICO2W_RP2350_BOARD_ID = "pico2w-rp2350-monitor";
+const COLOREASYPICO2_RP2350_BOARD_ID = "coloreasypico2-rp2350-monitor";
 const DEFAULT_CHANNEL = "stable";
 const DEFAULT_DOWNLOAD_BASE_URL = "https://download.embedboard.com";
 const DOWNLOAD_REQUEST_TIMEOUT_MS = 12_000;
@@ -20,13 +21,15 @@ const BUILT_IN_CHANNEL = {
     packages: [
         { id: "embedlabs.tools.vendor.rockchip", version: "1.0.0", manifest: "" },
         { id: "embedlabs.tools.common.llvm", version: "22.1.3", manifest: "" },
+        { id: "embedlabs.tools.common.arm-none-eabi", version: "15.2.rel1", manifest: "" },
         { id: "embedlabs.tools.common.e2fsprogs", version: "1.0.0", manifest: "" },
         { id: "embedlabs.tools.runtime.qtquick-live-preview", version: "1.0.31", manifest: "" },
         { id: "embedlabs.tools.runtime.rp2350-monitor", version: "1.0.31", manifest: "" },
         { id: "embedlabs.family.rk356x", version: "1.0.0", manifest: "" },
         { id: "embedlabs.family.rp2350", version: "1.0.0", manifest: "" },
         { id: "embedlabs.board.taishanpi.1m-rk3566", version: "1.0.31", manifest: "" },
-        { id: "embedlabs.board.pico2w.rp2350-monitor", version: "1.0.31", manifest: "" }
+        { id: "embedlabs.board.pico2w.rp2350-monitor", version: "1.0.31", manifest: "" },
+        { id: "embedlabs.board.coloreasypico2.rp2350-monitor", version: "1.0.31", manifest: "" }
     ]
 };
 const BUILT_IN_MANIFESTS = {
@@ -46,6 +49,14 @@ const BUILT_IN_MANIFESTS = {
         hosts: ["darwin-arm64", "linux-x86_64"],
         provides: ["llvm.clang", "llvm.clangxx", "llvm.ld_lld", "llvm.ar", "llvm.objcopy", "llvm.readelf"]
     },
+    "embedlabs.tools.common.arm-none-eabi": {
+        schema: "embedlabs.package.v1",
+        id: "embedlabs.tools.common.arm-none-eabi",
+        version: "15.2.rel1",
+        kind: "tools",
+        hosts: ["darwin-arm64"],
+        provides: ["arm-none-eabi.gcc", "arm-none-eabi.g++", "arm-none-eabi.objcopy", "picotool"]
+    },
     "embedlabs.tools.common.e2fsprogs": {
         schema: "embedlabs.package.v1",
         id: "embedlabs.tools.common.e2fsprogs",
@@ -89,7 +100,8 @@ const BUILT_IN_MANIFESTS = {
         kind: "family",
         family: "rp2350",
         requires: [
-            { id: "embedlabs.tools.runtime.rp2350-monitor", version: "^1.0.31" }
+            { id: "embedlabs.tools.common.arm-none-eabi", version: "15.x", roles: ["compile", "uf2"] },
+            { id: "embedlabs.tools.runtime.rp2350-monitor", version: "^1.0.31", roles: ["hardware-control", "logic-analyzer", "debug-probe"] }
         ]
     },
     "embedlabs.board.taishanpi.1m-rk3566": {
@@ -105,8 +117,7 @@ const BUILT_IN_MANIFESTS = {
             { id: "embedlabs.tools.vendor.rockchip", version: "^1.0.0", roles: ["flash", "resource-image"] },
             { id: "embedlabs.tools.common.llvm", version: "22.x", roles: ["compile"] },
             { id: "embedlabs.tools.common.e2fsprogs", version: "^1.0.0", roles: ["userdata-image"] },
-            { id: "embedlabs.tools.runtime.qtquick-live-preview", version: "^1.0.31", roles: ["qtquick-preview"] },
-            { id: "embedlabs.tools.runtime.rp2350-monitor", version: "^1.0.31", roles: ["rp2350-monitor"] }
+            { id: "embedlabs.tools.runtime.qtquick-live-preview", version: "^1.0.31", roles: ["qtquick-preview"] }
         ],
         build_modes: ["local-llvm"]
     },
@@ -115,16 +126,32 @@ const BUILT_IN_MANIFESTS = {
         id: "embedlabs.board.pico2w.rp2350-monitor",
         version: "1.0.31",
         kind: "board",
-        display_name: "Pico 2 W / RP2350 Monitor",
+        display_name: "Pico 2 W",
         family: "rp2350",
         board: "Pico 2 W",
-        variant: "RP2350 Monitor",
         board_id: PICO2W_RP2350_BOARD_ID,
         requires: [
             { id: "embedlabs.family.rp2350", version: "^1.0.0" },
+            { id: "embedlabs.tools.common.arm-none-eabi", version: "15.x", roles: ["compile", "uf2", "picotool"] },
             { id: "embedlabs.tools.runtime.rp2350-monitor", version: "^1.0.31", roles: ["hardware-control", "logic-analyzer", "debug-probe"] }
         ],
-        build_modes: ["local-monitor"]
+        build_modes: ["local-pico-sdk", "optional-rp2350-monitor"]
+    },
+    "embedlabs.board.coloreasypico2.rp2350-monitor": {
+        schema: "embedlabs.package.v1",
+        id: "embedlabs.board.coloreasypico2.rp2350-monitor",
+        version: "1.0.31",
+        kind: "board",
+        display_name: "ColorEasyPICO2",
+        family: "rp2350",
+        board: "ColorEasyPICO2",
+        board_id: COLOREASYPICO2_RP2350_BOARD_ID,
+        requires: [
+            { id: "embedlabs.family.rp2350", version: "^1.0.0" },
+            { id: "embedlabs.tools.common.arm-none-eabi", version: "15.x", roles: ["compile", "uf2", "picotool"] },
+            { id: "embedlabs.tools.runtime.rp2350-monitor", version: "^1.0.31", roles: ["hardware-control", "logic-analyzer", "debug-probe"] }
+        ],
+        build_modes: ["local-pico-sdk", "optional-rp2350-monitor"]
     }
 };
 const INSTALL_COPY_PATHS = [
@@ -137,7 +164,9 @@ const INSTALL_COPY_PATHS = [
     "tools/mac",
     "toolkit-runtime/qtquick-live-preview",
     "toolkit-runtime/rp2350-monitor",
-    "toolkit-runtime/RP2350-Monitor",
+    "rp2350-sdk",
+    "rp2350-initial-firmware",
+    "rp2350-examples",
     "images/current",
     "userdata/rootfs",
     "boot-workspace",
@@ -377,7 +406,7 @@ export async function listLocalToolchainEnvironments(options = {}) {
             components: download?.components?.map(localToolchainEnvironmentComponent),
             install_command: `embedlabs local toolchain install --board ${boardId} --mode ${mode}`,
             update_command: `embedlabs local toolchain install --board ${boardId} --mode ${mode} --force`,
-            notes: environmentNotes({ status, downloadError, unsupportedPackages: hostSupport.unsupportedPackages })
+            notes: environmentNotes({ boardId, status, downloadError, unsupportedPackages: hostSupport.unsupportedPackages })
         });
     }
     const filteredEnvironments = options.installedOnly
@@ -435,8 +464,8 @@ export async function installLocalToolchain(options = {}) {
         }
         await mkdir(releaseRoot, { recursive: true });
         const installedPaths = [];
-        for (const relativePath of INSTALL_COPY_PATHS) {
-            const sourcePath = resolve(sourceRoot.path, relativePath);
+        for (const relativePath of installCopyPathsForBoard(latest.board_id)) {
+            const sourcePath = await resolveInstallSourcePathForBoard(sourceRoot.path, relativePath, latest.board_id);
             if (!await pathExists(sourcePath)) {
                 continue;
             }
@@ -478,7 +507,7 @@ export async function validateLocalToolchain(input) {
     const releaseRoot = typeof input === "string" ? input : input?.releaseRoot;
     const mode = normalizeLocalToolchainInstallMode(typeof input === "string" ? undefined : input?.mode);
     const boardId = normalizeBoardId(typeof input === "string" ? DEFAULT_BOARD_ID : input?.boardId ?? DEFAULT_BOARD_ID);
-    const resolvedRoot = await resolveLocalReleaseRoot(releaseRoot);
+    const resolvedRoot = await resolveLocalReleaseRoot(releaseRoot, boardId);
     const required = requiredLocalToolchainChecks(mode, boardId);
     const checked_paths = [];
     for (const [label, relativePath] of required) {
@@ -518,7 +547,7 @@ function normalizeLocalToolchainInstallMode(mode) {
     throw new Error(`Unsupported local toolchain install mode ${normalized}; expected ${LOCAL_TOOLCHAIN_INSTALL_MODES.join(", ")}.`);
 }
 function requiredLocalToolchainChecks(mode, boardId) {
-    if (boardId === PICO2W_RP2350_BOARD_ID || boardId === "rp2350" || boardId === "rp2350-monitor") {
+    if (isRp2350MonitorBoardId(boardId)) {
         return requiredRp2350MonitorChecks(mode);
     }
     const base = [
@@ -530,8 +559,6 @@ function requiredLocalToolchainChecks(mode, boardId) {
         ["boot resource image", "boot-workspace/out/resource.img"],
         ["boot image", "boot-workspace/out/boot.img"],
         ["boot DTB", "boot-workspace/out/tspi-rk3566-user-v10-linux.dtb"],
-        ["RP2350 Monitor CLI", "toolkit-runtime/rp2350-monitor/tools/rpmon_cli.py"],
-        ["RP2350 Monitor logic analyzer", "toolkit-runtime/rp2350-monitor/ui/bin/embed-labs-logic-analyzer"],
         ["package metadata", "meta"]
     ];
     const compile = [
@@ -572,23 +599,43 @@ function requiredLocalToolchainChecks(mode, boardId) {
     return [...base, ...compile, ...qt, ...images, ...full];
 }
 function requiredRp2350MonitorChecks(mode) {
-    const runtime = [
+    const base = [
         ["release root", "."],
+    ];
+    const runtime = [
         ["RP2350 Monitor UI", "toolkit-runtime/rp2350-monitor/ui/index.html"],
         ["RP2350 Monitor bridge", "toolkit-runtime/rp2350-monitor/ui/bridge/rpmon_bridge.py"],
         ["RP2350 Monitor CLI", "toolkit-runtime/rp2350-monitor/tools/rpmon_cli.py"],
+        ["RP2350 picotool", "toolkit-runtime/rp2350-monitor/tools/picotool"],
         ["RP2350 Monitor logic analyzer", "toolkit-runtime/rp2350-monitor/ui/bin/embed-labs-logic-analyzer"],
         ["RP2350 Monitor AI operation contract", "toolkit-runtime/rp2350-monitor/ui/docs/ai-operation-contract.md"],
         ["package metadata", "meta"]
     ];
     const firmware = [
-        ["Pico 2 W monitor UF2", "toolkit-runtime/rp2350-monitor/firmware/rp2350_monitor.uf2"],
-        ["Pico 2 W firmware source", "toolkit-runtime/rp2350-monitor/firmware/src/main.cpp"]
+        ["RP2350 Monitor UF2", "toolkit-runtime/rp2350-monitor/firmware/rp2350_monitor.uf2"],
+        ["RP2350 Monitor firmware source", "toolkit-runtime/rp2350-monitor/firmware/src/main.cpp"]
     ];
-    if (mode === "firmware" || mode === "full") {
-        return [...runtime, ...firmware];
+    const initialFirmware = [
+        ["Pico 2 W initialization UF2", "rp2350-initial-firmware/pico2w/initial.uf2"],
+        ["ColorEasyPICO2 initialization UF2", "rp2350-initial-firmware/coloreasypico2/initial.uf2"]
+    ];
+    const compile = [
+        ["Pico SDK", "rp2350-sdk/pico-sdk/pico_sdk_init.cmake"],
+        ["Pico SDK CMakeLists", "rp2350-sdk/pico-sdk/CMakeLists.txt"],
+        ["ARM bare-metal C compiler", "rp2350-sdk/toolchains/arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi/bin/arm-none-eabi-gcc"],
+        ["ARM bare-metal C++ compiler", "rp2350-sdk/toolchains/arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi/bin/arm-none-eabi-g++"],
+        ["picotool", "rp2350-sdk/picotool/install/picotool/picotool"]
+    ];
+    if (mode === "compile") {
+        return [...base, ...compile, ...initialFirmware];
     }
-    return runtime;
+    if (mode === "firmware") {
+        return [...base, ...runtime, ...firmware, ...initialFirmware];
+    }
+    if (mode === "full") {
+        return [...base, ...runtime, ...firmware, ...initialFirmware, ...compile];
+    }
+    return [...base, ...runtime];
 }
 export async function compileTaishanPiSingleFile(options) {
     assertAuthenticated(options.auth);
@@ -689,17 +736,26 @@ async function loadLocalToolchainMetadata(metadataRoot, channelName) {
     return { channel, manifests, metadataRoot: root };
 }
 async function resolveLocalToolchainDownloadPlan(input) {
+    const requestedBoardId = normalizeBoardId(input.boardId);
+    const compatibleBoardIds = compatibleDownloadBoardIds(requestedBoardId);
     const channelUrl = downloadChannelUrl(input.channel);
     const channel = await fetchJson(channelUrl);
     if (channel.schema !== "embedlabs.download-channel.v1") {
         throw new Error(`Unexpected download channel schema ${channel.schema}.`);
     }
-    const entry = (channel.packages ?? []).find((item) => {
-        return item.board_id === input.boardId
-            && item.host === input.host
-            && item.toolchain === input.toolchain
-            && (item.kind === undefined || item.kind === "toolchain-archive" || item.kind === "board-support-archive");
-    });
+    const entries = channel.packages ?? [];
+    let entry;
+    for (const boardId of compatibleBoardIds) {
+        entry = entries.find((item) => {
+            return normalizeBoardId(item.board_id ?? "") === boardId
+                && item.host === input.host
+                && item.toolchain === input.toolchain
+                && (item.kind === undefined || item.kind === "toolchain-archive" || item.kind === "board-support-archive");
+        });
+        if (entry) {
+            break;
+        }
+    }
     if (!entry?.manifest) {
         return undefined;
     }
@@ -708,8 +764,9 @@ async function resolveLocalToolchainDownloadPlan(input) {
     if (manifest.id !== entry.id || manifest.version !== entry.version) {
         throw new Error(`Download manifest mismatch for ${entry.id}@${entry.version}.`);
     }
-    if (manifest.board_id !== input.boardId || manifest.host !== input.host || manifest.toolchain !== input.toolchain) {
-        throw new Error(`Download manifest does not match requested ${input.boardId}/${input.host}/${input.toolchain}.`);
+    const manifestBoardId = normalizeBoardId(manifest.board_id ?? "");
+    if (!compatibleBoardIds.includes(manifestBoardId) || manifest.host !== input.host || manifest.toolchain !== input.toolchain) {
+        throw new Error(`Download manifest does not match requested ${requestedBoardId}/${input.host}/${input.toolchain}.`);
     }
     if ((!manifest.archive?.file || !manifest.archive.sha256 || !Number.isFinite(manifest.archive.size_bytes))
         && (!Array.isArray(manifest.components) || manifest.components.length === 0)) {
@@ -726,7 +783,7 @@ async function resolveLocalToolchainDownloadPlan(input) {
             size_bytes: Number.isFinite(mirror.size_bytes) ? mirror.size_bytes : manifest.archive?.size_bytes
         })), manifest.download_policy?.preferred_order)
         : [];
-    const components = (manifest.components ?? []).map((component) => normalizeDownloadComponent(component, manifest, manifestUrl));
+    const components = downloadComponentsForBoard(requestedBoardId, (manifest.components ?? []).map((component) => normalizeDownloadComponent(component, manifest, manifestUrl)));
     const first = mirrors[0];
     if (!first && components.length === 0) {
         return undefined;
@@ -736,7 +793,7 @@ async function resolveLocalToolchainDownloadPlan(input) {
         manifest_url: manifestUrl,
         package_id: manifest.id,
         version: manifest.version,
-        board_id: input.boardId,
+        board_id: requestedBoardId,
         host: input.host,
         toolchain: input.toolchain,
         source_url: first?.url,
@@ -843,18 +900,27 @@ function resolvePackageRefs(packageId, channel, manifests, seen = new Set()) {
     return refs;
 }
 function boardPackageIdFor(boardId) {
-    if (boardId === DEFAULT_BOARD_ID || boardId === "taishanpi" || boardId === "taishanpi-1m-rk3566") {
+    const normalized = normalizeBoardId(boardId);
+    if (normalized === DEFAULT_BOARD_ID || normalized === "taishanpi" || normalized === "taishanpi-1m-rk3566") {
         return "embedlabs.board.taishanpi.1m-rk3566";
     }
-    if (boardId === PICO2W_RP2350_BOARD_ID
-        || boardId === "pico2w"
-        || boardId === "pico-2-w"
-        || boardId === "pico2"
-        || boardId === "rp2350"
-        || boardId === "rp2350-monitor") {
+    if (normalized === COLOREASYPICO2_RP2350_BOARD_ID
+        || normalized === "coloreasypico2"
+        || normalized === "color-easy-pico2"
+        || normalized === "color-easy-pico-2"
+        || normalized === "color-easy-pico-2-rp2350-monitor"
+        || normalized === "ce-pico2") {
+        return "embedlabs.board.coloreasypico2.rp2350-monitor";
+    }
+    if (normalized === PICO2W_RP2350_BOARD_ID
+        || normalized === "pico2w"
+        || normalized === "pico-2-w"
+        || normalized === "pico2"
+        || normalized === "rp2350"
+        || normalized === "rp2350-monitor") {
         return "embedlabs.board.pico2w.rp2350-monitor";
     }
-    if (boardId.startsWith("embedlabs.board.")) {
+    if (normalized.startsWith("embedlabs.board.")) {
         return boardId;
     }
     throw new Error(`Unsupported local toolchain board ${boardId}.`);
@@ -883,6 +949,38 @@ function boardIdForPackageManifest(manifest) {
 function normalizeBoardId(boardId) {
     return boardId.trim().toLowerCase().replaceAll("_", "-");
 }
+function isRp2350MonitorBoardId(boardId) {
+    const normalized = normalizeBoardId(boardId);
+    return normalized === PICO2W_RP2350_BOARD_ID
+        || normalized === COLOREASYPICO2_RP2350_BOARD_ID
+        || normalized === "pico2w"
+        || normalized === "pico-2-w"
+        || normalized === "pico2"
+        || normalized === "rp2350"
+        || normalized === "rp2350-monitor"
+        || normalized === "coloreasypico2"
+        || normalized === "color-easy-pico2"
+        || normalized === "color-easy-pico-2"
+        || normalized === "ce-pico2";
+}
+function compatibleDownloadBoardIds(boardId) {
+    const normalized = normalizeBoardId(boardId);
+    if (normalized === COLOREASYPICO2_RP2350_BOARD_ID) {
+        return [COLOREASYPICO2_RP2350_BOARD_ID, PICO2W_RP2350_BOARD_ID];
+    }
+    return [normalized];
+}
+function downloadComponentsForBoard(boardId, components) {
+    const normalized = normalizeBoardId(boardId);
+    if (normalized === DEFAULT_BOARD_ID) {
+        return components.filter((component) => !isRp2350MonitorComponent(component));
+    }
+    return components;
+}
+function isRp2350MonitorComponent(component) {
+    const text = `${component.id} ${component.role ?? ""} ${component.archive.file}`.toLowerCase();
+    return text.includes("rp2350-monitor") || text.includes("pico2w-rp2350-monitor");
+}
 function compareVersionLike(left, right) {
     return left.localeCompare(right, undefined, { numeric: true, sensitivity: "base" });
 }
@@ -904,6 +1002,12 @@ function packageHostSupport(packages, manifests, host) {
 }
 function environmentNotes(input) {
     const notes = [];
+    if (normalizeBoardId(input.boardId) === COLOREASYPICO2_RP2350_BOARD_ID) {
+        notes.push("ColorEasyPICO2 uses the same RP2350/Pico SDK, ARM bare-metal toolchain, picotool, and optional RP2350 Monitor image package as Pico 2 W; Wi-Fi operations are not declared for this no-Wi-Fi board.");
+    }
+    if (isRp2350MonitorBoardId(input.boardId)) {
+        notes.push("RP2350 Monitor is an optional hardware-control firmware image; the board environment itself is the Pico 2 W or ColorEasyPICO2 C/C++ SDK environment.");
+    }
     if (input.status === "available") {
         notes.push("Environment is available but not installed on this computer.");
     }
@@ -997,7 +1101,7 @@ async function writeCurrentRegistry(installRoot, latest, releaseRoot, mode, sour
         updated_at: new Date().toISOString()
     }, null, 2)}\n`, "utf8");
 }
-async function resolveLocalReleaseRoot(releaseRoot) {
+async function resolveLocalReleaseRoot(releaseRoot, boardId = DEFAULT_BOARD_ID) {
     if (releaseRoot?.trim()) {
         return resolve(releaseRoot);
     }
@@ -1005,7 +1109,7 @@ async function resolveLocalReleaseRoot(releaseRoot) {
     if (envRoot) {
         return resolve(envRoot);
     }
-    const current = await currentLocalToolchain(undefined, DEFAULT_BOARD_ID);
+    const current = await currentLocalToolchain(undefined, boardId);
     if (current.release_root) {
         return resolve(current.release_root);
     }
@@ -1148,6 +1252,62 @@ function selectedDownloadComponents(components, mode) {
         return component.install_modes.includes(mode);
     });
 }
+function installCopyPathsForBoard(boardId) {
+    if (normalizeBoardId(boardId) === DEFAULT_BOARD_ID) {
+        return INSTALL_COPY_PATHS.filter((relativePath) => {
+            const normalized = relativePath.toLowerCase();
+            return normalized !== "toolkit-runtime/rp2350-monitor"
+                && normalized !== "toolkit-runtime/rp2350-monitor/";
+        });
+    }
+    return INSTALL_COPY_PATHS;
+}
+async function resolveInstallSourcePathForBoard(sourceRoot, relativePath, boardId) {
+    const direct = resolve(sourceRoot, relativePath);
+    if (await pathExists(direct)) {
+        return direct;
+    }
+    if (!isRp2350MonitorBoardId(boardId)) {
+        return direct;
+    }
+    const legacyRp2350Root = await findLegacyRp2350Root(sourceRoot);
+    if (!legacyRp2350Root) {
+        return direct;
+    }
+    if (relativePath === "rp2350-sdk") {
+        return legacyRp2350Root;
+    }
+    if (relativePath === "rp2350-initial-firmware") {
+        return resolve(legacyRp2350Root, "initial_firmware");
+    }
+    if (relativePath === "rp2350-examples") {
+        return resolve(legacyRp2350Root, "validation");
+    }
+    return direct;
+}
+async function findLegacyRp2350Root(sourceRoot) {
+    const direct = resolve(sourceRoot, "RP2350");
+    if (await pathExists(resolve(direct, "pico-sdk", "pico_sdk_init.cmake"))) {
+        return direct;
+    }
+    let entries;
+    try {
+        entries = await readdir(sourceRoot, { withFileTypes: true });
+    }
+    catch {
+        return undefined;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory()) {
+            continue;
+        }
+        const candidate = resolve(sourceRoot, entry.name, "RP2350");
+        if (await pathExists(resolve(candidate, "pico-sdk", "pico_sdk_init.cmake"))) {
+            return candidate;
+        }
+    }
+    return undefined;
+}
 async function downloadToolchainArchive(sourceUrl, installRoot, expected) {
     const downloadsDir = join(installRoot, "cache", "downloads");
     await mkdir(downloadsDir, { recursive: true });