@jskit-ai/jskit-cli 0.2.135 → 0.2.136

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jskit-ai/jskit-cli",
-  "version": "0.2.135",
+  "version": "0.2.136",
   "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.130",
-    "@jskit-ai/kernel": "0.1.120",
-    "@jskit-ai/shell-web": "0.1.119",
+    "@jskit-ai/jskit-catalog": "0.1.131",
+    "@jskit-ai/kernel": "0.1.121",
+    "@jskit-ai/shell-web": "0.1.120",
     "@vue/compiler-sfc": "^3.5.29",
     "ts-morph": "^28.0.0",
     "yaml": "^2.8.3"

package/src/server/cliRuntime/mutations/fileMutations.js

@@ -20,6 +20,7 @@ import {
   loadMutationWhenConfigContext,
   resolveAppRelativePathWithinRoot
 } from "../ioAndMigrations.js";
+import { normalizeRelativePosixPath } from "../localPackageSupport.js";
 import {
   interpolateFileMutationRecord,
   renderTemplateFile,
@@ -39,7 +40,7 @@ async function prepareFileMutations(
   const existingManagedFilesByPath = new Map();
   for (const managedFileValue of ensureArray(existingManagedFiles)) {
     const managedFile = ensureObject(managedFileValue);
-    const managedPath = String(managedFile.path || "").trim();
+    const managedPath = normalizeRelativePosixPath(managedFile.path);
     if (!managedPath) {
       continue;
     }
@@ -205,7 +206,7 @@ async function applyFileMutations(
   const existingManagedFilesByPath = new Map();
   for (const managedFileValue of ensureArray(existingManagedFiles)) {
     const managedFile = ensureObject(managedFileValue);
-    const managedPath = String(managedFile.path || "").trim();
+    const managedPath = normalizeRelativePosixPath(managedFile.path);
     if (!managedPath) {
       continue;
     }
@@ -260,6 +261,7 @@ async function applyFileMutations(
         managedFiles.push({
           ...existingManaged,
           path: relativeTargetPath,
+          ownership: mutation.ownership,
           preserveOnRemove: mutation.preserveOnRemove,
           reason: mutation.reason || String(existingManaged.reason || ""),
           category: mutation.category || String(existingManaged.category || ""),
@@ -271,6 +273,7 @@ async function applyFileMutations(
       if (mutation.ownership === "app" && previous.exists && hashBuffer(previous.buffer) === renderedSourceHash) {
         managedFiles.push({
           path: relativeTargetPath,
+          ownership: mutation.ownership,
           hash: renderedSourceHash,
           hadPrevious: true,
           previousContentBase64: previous.buffer.toString("base64"),
@@ -289,6 +292,7 @@ async function applyFileMutations(
 
       managedFiles.push({
         path: relativeTargetPath,
+        ownership: mutation.ownership,
         hash: renderedSourceHash,
         hadPrevious: previous.exists,
         previousContentBase64: previous.exists ? previous.buffer.toString("base64") : "",

package/src/server/commandHandlers/appCommandCatalog.js

@@ -90,7 +90,8 @@ const APP_COMMAND_DEFINITIONS = Object.freeze({
     defaults: Object.freeze([
       "Root runtime, development, optional, and peer dependencies are installed at their exact latest registry versions.",
       "JSKIT ranges in npm workspace manifests and package descriptors are aligned with the latest major release, then workspace resolutions are refreshed in the lockfile.",
-      "The command reports elapsed progress and refreshes managed migrations and the composed CI workflow unless --dry-run is used."
+      "Installed packages whose descriptor versions changed are reapplied with their saved options before managed migrations and the composed CI workflow are refreshed.",
+      "App-owned files retain local edits through the normal package-update ownership rules."
     ])
   }),
   "sync-ci": Object.freeze({

package/src/server/commandHandlers/appCommands/updatePackages.js

@@ -5,6 +5,10 @@ import {
   runExternalCommandAsync,
   runLocalJskitAsync
 } from "./shared.js";
+import {
+  ensureObject,
+  sortStrings
+} from "../../shared/collectionUtils.js";
 
 const DEPENDENCY_SECTIONS = Object.freeze([
   Object.freeze({
@@ -32,9 +36,10 @@ const JSKIT_PACKAGE_PATTERN = /^@jskit-ai\/[a-z0-9._-]+$/iu;
 const PROGRESS_INTERVAL_MS = 5_000;
 
 function collectJskitPackageNames(packageMap = {}) {
-  return Object.keys(packageMap && typeof packageMap === "object" ? packageMap : {})
-    .filter((name) => JSKIT_PACKAGE_PATTERN.test(String(name || "")))
-    .sort((left, right) => left.localeCompare(right));
+  return sortStrings(
+    Object.keys(packageMap && typeof packageMap === "object" ? packageMap : {})
+      .filter((name) => JSKIT_PACKAGE_PATTERN.test(String(name || "")))
+  );
 }
 
 function collectManifestJskitPackageNames(packageJson = {}) {
@@ -44,7 +49,7 @@ function collectManifestJskitPackageNames(packageJson = {}) {
       packageNames.add(packageName);
     }
   }
-  return [...packageNames].sort((left, right) => left.localeCompare(right));
+  return sortStrings([...packageNames]);
 }
 
 function resolveExactVersion(packageName = "", rawVersion = "", createCliError) {
@@ -74,6 +79,70 @@ function resolveInstallSpecs(packageNames = [], latestVersions = new Map()) {
   return packageNames.map((packageName) => `${packageName}@${latestVersions.get(packageName)}`);
 }
 
+function collectChangedInstalledPackageIds(lock = {}, latestVersions = new Map()) {
+  const installedPackages = ensureObject(lock.installedPackages);
+  return sortStrings(
+    [...latestVersions.entries()]
+      .filter(([packageId, targetVersion]) => {
+        if (!Object.prototype.hasOwnProperty.call(installedPackages, packageId)) {
+          return false;
+        }
+        const installedPackage = ensureObject(installedPackages[packageId]);
+        return String(installedPackage.version || "").trim() !== targetVersion;
+      })
+      .map(([packageId]) => packageId)
+  );
+}
+
+async function reapplyChangedInstalledPackages({
+  appRoot,
+  createCliError,
+  dryRun,
+  latestVersions,
+  loadLockFile,
+  stderr,
+  stdout
+}) {
+  const { lock } = await loadLockFile(appRoot);
+  const packageIds = collectChangedInstalledPackageIds(lock, latestVersions);
+  if (packageIds.length < 1) {
+    stdout?.write("[jskit:update] managed package state is already current.\n");
+    return;
+  }
+
+  stdout?.write(`[jskit:update] managed packages requiring reapply: ${packageIds.join(", ")}.\n`);
+  if (dryRun) {
+    return;
+  }
+
+  for (const [index, packageId] of packageIds.entries()) {
+    const { lock: currentLock } = await loadLockFile(appRoot);
+    const currentVersion = String(
+      ensureObject(ensureObject(currentLock.installedPackages)[packageId]).version || ""
+    ).trim();
+    if (currentVersion === latestVersions.get(packageId)) {
+      continue;
+    }
+    stdout?.write(
+      `[jskit:update] reapplying managed package ${index + 1}/${packageIds.length}: ${packageId}.\n`
+    );
+    await runLocalJskitAsync(appRoot, ["update", "package", packageId], {
+      stdout,
+      stderr,
+      createCliError
+    });
+  }
+
+  const { lock: updatedLock } = await loadLockFile(appRoot);
+  const remainingPackageIds = collectChangedInstalledPackageIds(updatedLock, latestVersions);
+  if (remainingPackageIds.length > 0) {
+    throw createCliError(
+      `Managed package reapply finished with stale lock versions: ${remainingPackageIds.join(", ")}.`
+    );
+  }
+  stdout?.write("[jskit:update] managed package state is current.\n");
+}
+
 function formatElapsedTime(elapsedMilliseconds = 0) {
   const elapsedSeconds = Math.max(0, Math.floor(Number(elapsedMilliseconds) / 1000));
   if (elapsedSeconds < 1) {
@@ -429,6 +498,7 @@ async function runAppUpdatePackagesCommand(ctx = {}, { appRoot = "", options = {
   const {
     createCliError,
     loadAppPackageJson,
+    loadLockFile,
     assertAppManagedCiWorkflowUnmodified
   } = ctx;
 
@@ -455,7 +525,19 @@ async function runAppUpdatePackagesCommand(ctx = {}, { appRoot = "", options = {
         stderr,
         stdout
       });
-      if (!updatedRootPackages || dryRun) {
+      if (!updatedRootPackages) {
+        return;
+      }
+      await reapplyChangedInstalledPackages({
+        appRoot,
+        createCliError,
+        dryRun,
+        latestVersions,
+        loadLockFile,
+        stderr,
+        stdout
+      });
+      if (dryRun) {
         return;
       }
       stdout?.write("[jskit:update] generating managed migrations for changed packages.\n");
@@ -538,7 +620,9 @@ async function runAppUpdatePackagesCommand(ctx = {}, { appRoot = "", options = {
 }
 
 export {
+  collectChangedInstalledPackageIds,
   formatElapsedTime,
+  reapplyChangedInstalledPackages,
   runAppUpdatePackagesCommand,
   runWithProgress
 };

package/src/server/commandHandlers/health.js

@@ -30,6 +30,7 @@ function createHealthCommands(ctx = {}) {
     inspectPackageOfferings,
     fileExists,
     normalizeRelativePath,
+    normalizeRelativePosixPath,
     path
   } = ctx;
 
@@ -1321,7 +1322,12 @@ function createHealthCommands(ctx = {}) {
     }
   }
 
-  async function collectMainPackageFeatureLaneWarnings({ appRoot, appLocalRegistry, warnings }) {
+  async function collectMainPackageFeatureLaneWarnings({
+    appRoot,
+    appLocalRegistry,
+    managedAppOwnedFilePaths,
+    warnings
+  }) {
     const mainPackageEntry = [...appLocalRegistry.values()].find((packageEntry) => {
       const packageId = String(packageEntry?.packageId || "").trim();
       const relativeDir = String(packageEntry?.relativeDir || "").trim();
@@ -1343,7 +1349,8 @@ function createHealthCommands(ctx = {}) {
     const extraDomainFiles = relativeServerFiles.filter(
       (relativePath) =>
         !MAIN_SERVER_BASELINE_RELATIVE_PATHS.has(relativePath) &&
-        MAIN_SERVER_DOMAIN_FILE_PATTERN.test(relativePath)
+        MAIN_SERVER_DOMAIN_FILE_PATTERN.test(relativePath) &&
+        !managedAppOwnedFilePaths.has(normalizeRelativePath(appRoot, path.join(rootDir, relativePath)))
     );
     if (extraDomainFiles.length > 0) {
       reasons.push(`extra server domain files: ${extraDomainFiles.join(", ")}`);
@@ -1438,7 +1445,13 @@ function createHealthCommands(ctx = {}) {
     }
   }
 
-  async function collectFeatureLaneDoctorIssues({ appRoot, appLocalRegistry, issues, warnings }) {
+  async function collectFeatureLaneDoctorIssues({
+    appRoot,
+    appLocalRegistry,
+    managedAppOwnedFilePaths,
+    issues,
+    warnings
+  }) {
     const packageEntries = sortStrings([...appLocalRegistry.keys()])
       .map((packageId) => appLocalRegistry.get(packageId))
       .filter(Boolean);
@@ -1454,6 +1467,7 @@ function createHealthCommands(ctx = {}) {
     await collectMainPackageFeatureLaneWarnings({
       appRoot,
       appLocalRegistry,
+      managedAppOwnedFilePaths,
       warnings
     });
     await collectHandmadeFeatureLaneWarnings({
@@ -2125,6 +2139,7 @@ function createHealthCommands(ctx = {}) {
     const issues = [];
     const warnings = [];
     const installed = ensureObject(lock.installedPackages);
+    const managedAppOwnedFilePaths = new Set();
     await hydratePackageRegistryFromInstalledNodeModules({
       appRoot,
       packageRegistry: combinedPackageRegistry,
@@ -2148,7 +2163,10 @@ function createHealthCommands(ctx = {}) {
       const managed = ensureObject(lockEntry.managed);
       for (const fileChange of ensureArray(managed.files)) {
         const changeRecord = ensureObject(fileChange);
-        const relativePath = String(changeRecord.path || "").trim();
+        const relativePath = normalizeRelativePosixPath(changeRecord.path);
+        if (changeRecord.ownership === "app" && relativePath) {
+          managedAppOwnedFilePaths.add(relativePath);
+        }
         const absolutePath = path.join(appRoot, relativePath);
         if (!(await fileExists(absolutePath))) {
           issues.push(`${packageId}: managed file missing: ${relativePath}`);
@@ -2172,6 +2190,7 @@ function createHealthCommands(ctx = {}) {
     await collectFeatureLaneDoctorIssues({
       appRoot,
       appLocalRegistry,
+      managedAppOwnedFilePaths,
       issues,
       warnings
     });