@jskit-ai/jskit-cli 0.2.129 → 0.2.131

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

@@ -0,0 +1,40 @@
+async function runAppSyncCiCommand(ctx = {}, { appRoot = "", options = {}, stdout }) {
+  const {
+    createCliError,
+    synchronizeAppCiWorkflow
+  } = ctx;
+  const force = String(options?.inlineOptions?.force || "").trim().toLowerCase() === "true";
+  const result = await synchronizeAppCiWorkflow({
+    appRoot,
+    allowManagedOverwrite: force
+  });
+  if (!result.applicable) {
+    throw createCliError("jskit app sync-ci only works in a JSKIT app root.");
+  }
+
+  if (options.json) {
+    stdout.write(`${JSON.stringify({
+      path: result.path,
+      hash: result.hash,
+      changed: result.changed,
+      removedLegacyWorkflow: result.removedLegacyWorkflow,
+      replacedModifiedWorkflow: result.replacedModifiedWorkflow
+    }, null, 2)}\n`);
+    return 0;
+  }
+
+  if (result.replacedModifiedWorkflow) {
+    stdout.write(`Replaced the modified JSKIT-managed CI workflow: ${result.path}\n`);
+  } else if (result.changed) {
+    stdout.write(`Synchronized the JSKIT-managed CI workflow: ${result.path}\n`);
+  } else {
+    stdout.write(`The JSKIT-managed CI workflow is already current: ${result.path}\n`);
+  }
+  if (result.removedLegacyWorkflow) {
+    stdout.write("Removed the superseded .github/workflows/verify.yml scaffold.\n");
+  }
+  stdout.write(`Recorded content hash: ${result.hash}\n`);
+  return 0;
+}
+
+export { runAppSyncCiCommand };

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

@@ -32,9 +32,11 @@ function resolveInstallSpecs(packageNames = [], resolveMajorRange) {
 async function runAppUpdatePackagesCommand(ctx = {}, { appRoot = "", options = {}, stdout, stderr }) {
   const {
     createCliError,
-    loadAppPackageJson
+    loadAppPackageJson,
+    assertAppManagedCiWorkflowUnmodified
   } = ctx;
 
+  await assertAppManagedCiWorkflowUnmodified({ appRoot });
   const { packageJson } = await loadAppPackageJson(appRoot);
   const runtimePackages = collectJskitPackageNames(packageJson?.dependencies);
   const devPackages = collectJskitPackageNames(packageJson?.devDependencies);
@@ -93,6 +95,12 @@ async function runAppUpdatePackagesCommand(ctx = {}, { appRoot = "", options = {
       stderr,
       createCliError
     });
+    stdout.write("[jskit:update] synchronizing the managed CI workflow.\n");
+    await runLocalJskit(appRoot, ["app", "sync-ci"], {
+      stdout,
+      stderr,
+      createCliError
+    });
   }
 
   stdout.write("[jskit:update] done.\n");

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

@@ -8,7 +8,10 @@ const BASELINE_VERIFY_SCRIPTS = Object.freeze([
 ]);
 
 async function runAppVerifyCommand(ctx = {}, { appRoot = "", options = {}, stdout, stderr }) {
-  const { createCliError } = ctx;
+  const {
+    createCliError,
+    validateAppCiWorkflow
+  } = ctx;
   const inlineOptions =
     options?.inlineOptions && typeof options.inlineOptions === "object" ? options.inlineOptions : {};
   const against = String(inlineOptions.against || "").trim();
@@ -17,6 +20,14 @@ async function runAppVerifyCommand(ctx = {}, { appRoot = "", options = {}, stdou
     throw createCliError("jskit app verify does not support --dry-run.", { exitCode: 1 });
   }
 
+  const ciValidation = await validateAppCiWorkflow({ appRoot });
+  if (!ciValidation.valid) {
+    throw createCliError(
+      ciValidation.issues.map((issue) => issue.message).join("\n"),
+      { exitCode: 1 }
+    );
+  }
+
   for (const scriptName of BASELINE_VERIFY_SCRIPTS) {
     runExternalCommand("npm", ["run", "--if-present", scriptName], {
       cwd: appRoot,

package/src/server/commandHandlers/health.js

@@ -26,6 +26,7 @@ function createHealthCommands(ctx = {}) {
     loadAppLocalPackageRegistry,
     mergePackageRegistries,
     hydratePackageRegistryFromInstalledNodeModules,
+    validateManagedCiWorkflow,
     inspectPackageOfferings,
     fileExists,
     normalizeRelativePath,
@@ -2130,6 +2131,13 @@ function createHealthCommands(ctx = {}) {
       seedPackageIds: Object.keys(installed)
     });
 
+    const ciValidation = await validateManagedCiWorkflow({
+      appRoot,
+      lock,
+      packageRegistry: combinedPackageRegistry
+    });
+    issues.push(...ciValidation.issues.map((issue) => issue.message));
+
     for (const [packageId, lockEntryValue] of Object.entries(installed)) {
       const lockEntry = ensureObject(lockEntryValue);
       if (!combinedPackageRegistry.has(packageId)) {

package/src/server/commandHandlers/packageCommands/add.js

@@ -360,6 +360,9 @@ async function runPackageAddCommand(ctx = {}, { positional, options, cwd, io })
     resolvePackageOptions,
     applyPackageInstall,
     adoptAppLocalPackageDependencies,
+    assertManagedCiWorkflowUnmodified,
+    composeInstalledPackageCi,
+    synchronizeManagedCiWorkflow,
     writeJsonFile,
     readFileBufferIfExists,
     runNpmInstall,
@@ -485,6 +488,10 @@ async function runPackageAddCommand(ctx = {}, { positional, options, cwd, io })
   const combinedPackageRegistry = mergePackageRegistries(packageRegistry, appLocalRegistry);
   const { packageJsonPath, packageJson } = await loadAppPackageJson(appRoot);
   const { lockPath, lock } = await loadLockFile(appRoot);
+  await assertManagedCiWorkflowUnmodified({
+    appRoot,
+    lock
+  });
   const resolvedTargetPackageId = targetType === "package"
     ? await resolvePackageIdFromRegistryOrNodeModules({
         appRoot,
@@ -556,6 +563,19 @@ async function runPackageAddCommand(ctx = {}, { positional, options, cwd, io })
     combinedPackageRegistry,
     `${invocationMode} ${targetType} ${targetId}`
   );
+  for (const packageId of plannedInstalledPackageIds) {
+    const packageEntry = combinedPackageRegistry.get(packageId);
+    if (!packageEntry) {
+      throw createCliError(
+        `[ci:descriptor-missing] Installed package descriptor not found for ${packageId}. Restore the package in node_modules or the JSKIT catalog before changing installed package requirements.`
+      );
+    }
+  }
+  composeInstalledPackageCi({
+    lock,
+    packageRegistry: combinedPackageRegistry,
+    installedPackageIds: plannedInstalledPackageIds
+  });
 
   if (targetType === "bundle") {
     validateInlineOptionsForBundle({
@@ -766,6 +786,14 @@ async function runPackageAddCommand(ctx = {}, { positional, options, cwd, io })
     });
   }
 
+  await synchronizeManagedCiWorkflow({
+    appRoot,
+    lock,
+    packageRegistry: combinedPackageRegistry,
+    touchedFiles,
+    dryRun: options.dryRun === true
+  });
+
   const touchedFileList = sortStrings([...touchedFiles]);
   const successLabel = invocationMode === "generate"
     ? "Generated with"

package/src/server/commandHandlers/packageCommands/remove.js

@@ -27,6 +27,8 @@ async function runPackageRemoveCommand(ctx = {}, { positional, options, cwd, io
     removeEnvValue,
     writeFile,
     removeManagedViteProxyEntries,
+    assertManagedCiWorkflowUnmodified,
+    synchronizeManagedCiWorkflow,
     hashBuffer,
     rm,
     writeJsonFile,
@@ -45,6 +47,10 @@ async function runPackageRemoveCommand(ctx = {}, { positional, options, cwd, io
   const combinedPackageRegistry = mergePackageRegistries(packageRegistry, appLocalRegistry);
   const { packageJsonPath, packageJson } = await loadAppPackageJson(appRoot);
   const { lockPath, lock } = await loadLockFile(appRoot);
+  await assertManagedCiWorkflowUnmodified({
+    appRoot,
+    lock
+  });
   const installed = ensureObject(lock.installedPackages);
   await hydratePackageRegistryFromInstalledNodeModules({
     appRoot,
@@ -159,6 +165,13 @@ async function runPackageRemoveCommand(ctx = {}, { positional, options, cwd, io
   }
 
   delete installed[resolvedTargetId];
+  await synchronizeManagedCiWorkflow({
+    appRoot,
+    lock,
+    packageRegistry: combinedPackageRegistry,
+    touchedFiles,
+    dryRun: options.dryRun === true
+  });
   const touchedFileList = sortStrings([...touchedFiles]);
 
   if (!options.dryRun) {

package/src/server/core/buildCommandDeps.js

@@ -27,6 +27,13 @@ function createCommandHandlerDeps(deps = {}) {
     applyPackageMigrationsOnly: deps.applyPackageMigrationsOnly,
     applyPackagePositioning: deps.applyPackagePositioning,
     adoptAppLocalPackageDependencies: deps.adoptAppLocalPackageDependencies,
+    assertAppManagedCiWorkflowUnmodified: deps.assertAppManagedCiWorkflowUnmodified,
+    assertManagedCiWorkflowUnmodified: deps.assertManagedCiWorkflowUnmodified,
+    composeInstalledPackageCi: deps.composeInstalledPackageCi,
+    synchronizeAppCiWorkflow: deps.synchronizeAppCiWorkflow,
+    synchronizeManagedCiWorkflow: deps.synchronizeManagedCiWorkflow,
+    validateAppCiWorkflow: deps.validateAppCiWorkflow,
+    validateManagedCiWorkflow: deps.validateManagedCiWorkflow,
     loadAppPackageJson: deps.loadAppPackageJson,
     resolveLocalPackageId: deps.resolveLocalPackageId,
     createLocalPackageScaffoldFiles: deps.createLocalPackageScaffoldFiles,

package/src/server/core/createCliRunner.js

@@ -93,6 +93,15 @@ import {
 import {
   removeManagedViteProxyEntries
 } from "../cliRuntime/viteProxy.js";
+import {
+  assertAppManagedCiWorkflowUnmodified,
+  assertManagedCiWorkflowUnmodified,
+  composeInstalledPackageCi,
+  synchronizeAppCiWorkflow,
+  synchronizeManagedCiWorkflow,
+  validateAppCiWorkflow,
+  validateManagedCiWorkflow
+} from "../cliRuntime/ci/managedWorkflow.js";
 
 const commandHandlers = createCommandHandlers(
   createCommandHandlerDeps({
@@ -123,6 +132,13 @@ const commandHandlers = createCommandHandlers(
     applyPackageMigrationsOnly,
     applyPackagePositioning,
     adoptAppLocalPackageDependencies,
+    assertAppManagedCiWorkflowUnmodified,
+    assertManagedCiWorkflowUnmodified,
+    composeInstalledPackageCi,
+    synchronizeAppCiWorkflow,
+    synchronizeManagedCiWorkflow,
+    validateAppCiWorkflow,
+    validateManagedCiWorkflow,
     loadAppPackageJson,
     resolveLocalPackageId,
     createLocalPackageScaffoldFiles,

package/src/server/index.js

@@ -1,2 +1,13 @@
 export { runCli } from "./core/createCliRunner.js";
 export * from "./appBlueprint.js";
+export {
+  synchronizeAppCiWorkflow,
+  validateAppCiWorkflow
+} from "./cliRuntime/ci/managedWorkflow.js";
+export {
+  composeCiContributions
+} from "./cliRuntime/ci/composer.js";
+export {
+  JSKIT_CI_WORKFLOW_RELATIVE_PATH,
+  renderGithubWorkflow
+} from "./cliRuntime/ci/githubWorkflow.js";