@jskit-ai/jskit-cli 0.2.130 → 0.2.132

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.130",
+  "version": "0.2.132",
   "description": "Bundle and package orchestration CLI for JSKIT apps.",
   "type": "module",
   "files": [
@@ -20,9 +20,9 @@
     "test": "node --test"
   },
   "dependencies": {
-    "@jskit-ai/jskit-catalog": "0.1.125",
-    "@jskit-ai/kernel": "0.1.118",
-    "@jskit-ai/shell-web": "0.1.116",
+    "@jskit-ai/jskit-catalog": "0.1.127",
+    "@jskit-ai/kernel": "0.1.119",
+    "@jskit-ai/shell-web": "0.1.118",
     "@vue/compiler-sfc": "^3.5.29",
     "ts-morph": "^28.0.0",
     "yaml": "^2.8.3"

package/src/server/cliRuntime/ci/managedWorkflow.js

@@ -483,7 +483,8 @@ async function loadAppCiContext(appRoot) {
   await hydratePackageRegistryFromInstalledNodeModules({
     appRoot,
     packageRegistry,
-    seedPackageIds: Object.keys(ensureObject(lock.installedPackages))
+    seedPackageIds: Object.keys(ensureObject(lock.installedPackages)),
+    preferInstalledDescriptors: true
   });
   return {
     lockPath,

package/src/server/cliRuntime/packageRegistries.js

@@ -268,7 +268,8 @@ async function resolveInstalledNodeModulePackageEntry({ appRoot, packageId }) {
 async function hydratePackageRegistryFromInstalledNodeModules({
   appRoot,
   packageRegistry,
-  seedPackageIds = []
+  seedPackageIds = [],
+  preferInstalledDescriptors = false
 }) {
   const queue = ensureArray(seedPackageIds)
     .map((value) => String(value || "").trim())
@@ -283,19 +284,23 @@ async function hydratePackageRegistryFromInstalledNodeModules({
     visited.add(packageId);
 
     let packageEntry = packageRegistry.get(packageId);
-    if (!packageEntry) {
+    const shouldResolveInstalledDescriptor =
+      !packageEntry ||
+      (preferInstalledDescriptors && packageEntry.sourceType !== "app-local-package");
+    if (shouldResolveInstalledDescriptor) {
       const resolvedEntry = await resolveInstalledNodeModulePackageEntry({
         appRoot,
         packageId
       });
-      if (!resolvedEntry) {
+      if (!resolvedEntry && !packageEntry) {
         continue;
       }
-
-      packageRegistry.set(resolvedEntry.packageId, resolvedEntry);
-      packageEntry = resolvedEntry;
-      if (resolvedEntry.packageId !== packageId && !visited.has(resolvedEntry.packageId)) {
-        queue.push(resolvedEntry.packageId);
+      if (resolvedEntry) {
+        packageRegistry.set(resolvedEntry.packageId, resolvedEntry);
+        packageEntry = resolvedEntry;
+        if (resolvedEntry.packageId !== packageId && !visited.has(resolvedEntry.packageId)) {
+          queue.push(resolvedEntry.packageId);
+        }
       }
     }