dlw-machine-setup 0.12.0 → 0.13.0-canary.2

package/bin/installer.js

@@ -4560,13 +4560,18 @@ function assertBundleRootExists(ctx) {
 // src/utils/channel.ts
 var import_fs9 = require("fs");
 var import_path9 = require("path");
-function getChannel() {
+function getInstallerVersion() {
   try {
     const pkgPath = (0, import_path9.join)(__dirname, "..", "package.json");
     const { version } = JSON.parse((0, import_fs9.readFileSync)(pkgPath, "utf-8"));
-    if (typeof version === "string" && version.includes("-")) return "test";
+    return typeof version === "string" ? version : null;
   } catch {
+    return null;
   }
+}
+function getChannel() {
+  const version = getInstallerVersion();
+  if (version && version.includes("-")) return "test";
   return "prod";
 }
 
@@ -4601,6 +4606,7 @@ var fetch_factory_default = defineStep({
   execute: async (ctx) => {
     const result = await fetchFactory(ctx.token, ctx.factoryRepo, ctx.config.projectPath, ctx.config.agent, ctx.config.agentTeams);
     ctx.installed.factoryInstalled = result.success;
+    ctx.installed.factoryReleaseVersion = result.releaseTag ?? null;
     if (result.instructionsSnippet) {
       ctx.installed.factoryInstructionsSnippet = result.instructionsSnippet;
     }
@@ -4672,6 +4678,7 @@ async function fetchFactory(token, repo, targetDir, agent, agentTeams) {
     result.failureReason = err instanceof Error ? err.message : String(err);
     return result;
   }
+  result.releaseTag = release.tagName;
   const asset = release.assets.find((a) => a.name === FACTORY_ASSET_NAME);
   if (!asset) {
     result.failureReason = `${FACTORY_ASSET_NAME} not found in release`;
@@ -5536,8 +5543,17 @@ var write_state_default = defineStep({
     const target = getAgentTarget(ctx.config.agent);
     const state = {
       installedAt: (/* @__PURE__ */ new Date()).toISOString(),
-      installerVersion: package_default.version,
+      /* The PUBLISHED wrapper version (e.g. 0.13.0-canary.1), read at runtime —
+       * the bundled root package.json version is dev metadata and drifts.
+       * The `-` rule on this field is how the factory-update-check hook
+       * detects the install channel. */
+      installerVersion: getInstallerVersion() ?? package_default.version,
+      /* NOTE: releaseVersion is the wizard-options data release, NOT Factory.
+       * Kept under its historical name for backward compatibility. */
       releaseVersion: ctx.config.releaseVersion,
+      /* Factory release actually installed (e.g. v2.32.0-rc.1); null when
+       * Factory wasn't selected. Read by the factory-update-check hook. */
+      factoryReleaseVersion: ctx.installed.factoryReleaseVersion ?? null,
       contextReleaseVersion: ctx.installed.contextReleaseVersion ?? null,
       projectPath: ctx.config.projectPath,
       agent: ctx.config.agent,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dlw-machine-setup",
-  "version": "0.12.0",
+  "version": "0.13.0-canary.2",
   "description": "One-shot installer for The Machine toolchain",
   "bin": {
     "dlw-machine-setup": "bin/installer.js"