@flux-lang/cli 0.1.6 → 0.1.8

package/dist/bin/flux.js

@@ -8,6 +8,7 @@ import { createRuntime, parseDocument } from "@flux-lang/core";
 import { shouldLaunchUi } from "../ui-routing.js";
 import { computeBuildId, defaultEmbeddedDir, VIEWER_VERSION as VIEWER_PACKAGE_VERSION, } from "@flux-lang/viewer";
 import { FLUX_CLI_VERSION } from "../version.js";
+import { getFluxVersionInfoCli } from "../versionInfo.js";
 const CLI_VERSION = FLUX_CLI_VERSION;
 void (async () => {
     try {
@@ -24,6 +25,7 @@ void (async () => {
 async function main(argv) {
     const parsed = parseGlobalArgs(argv);
     const args = parsed.args;
+    const fluxVersionInfo = await getFluxVersionInfoCli(process.cwd());
     const uiEnabled = shouldLaunchUi({
         stdoutIsTTY: Boolean(process.stdout.isTTY),
         stdinIsTTY: process.stdin.isTTY,
@@ -37,11 +39,12 @@ async function main(argv) {
             initialArgs: args,
             detach: parsed.detach,
             helpCommand: parsed.help ? args[0] : undefined,
-            version: parsed.version ? `flux v${CLI_VERSION}` : undefined,
+            versionInfo: fluxVersionInfo,
+            showVersionModal: parsed.version,
         });
     }
     if (parsed.version) {
-        await printVersion(parsed.json);
+        await printVersion(parsed.json, fluxVersionInfo);
         return 0;
     }
     if (parsed.help) {
@@ -148,7 +151,7 @@ function parseGlobalArgs(argv) {
     }
     return { ...flags, args };
 }
-async function collectComponentVersions() {
+async function collectComponentVersions(versionInfo) {
     let editorBuildId = null;
     try {
         const embedded = defaultEmbeddedDir();
@@ -159,13 +162,13 @@ async function collectComponentVersions() {
         editorBuildId = null;
     }
     return {
-        cli: CLI_VERSION,
+        cli: versionInfo.version,
         viewer: VIEWER_PACKAGE_VERSION,
         editorBuildId,
     };
 }
-async function printVersion(asJson) {
-    const info = await collectComponentVersions();
+async function printVersion(asJson, versionInfo) {
+    const info = await collectComponentVersions(versionInfo);
     if (asJson) {
         console.log(JSON.stringify(info));
         return;
@@ -1320,7 +1323,8 @@ async function launchUi(options) {
         initialArgs: options.initialArgs,
         detach: options.detach,
         helpCommand: options.helpCommand,
-        version: options.version,
+        versionInfo: options.versionInfo,
+        showVersionModal: options.showVersionModal,
     });
     return 0;
 }

package/dist/versionInfo.js

@@ -0,0 +1,46 @@
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import { coerceVersionInfo } from "@flux-lang/brand";
+import cliPkg from "../package.json" with { type: "json" };
+const VERSION_FILENAME = "version.json";
+function inferChannelFromSemver(version) {
+    return /-canary(?:\.|$)/i.test(version) ? "canary" : "stable";
+}
+async function findVersionJson(startDir) {
+    let current = path.resolve(startDir);
+    while (true) {
+        const candidate = path.join(current, VERSION_FILENAME);
+        try {
+            await fs.access(candidate);
+            return candidate;
+        }
+        catch {
+            // keep walking
+        }
+        const parent = path.dirname(current);
+        if (parent === current)
+            return null;
+        current = parent;
+    }
+}
+export async function getFluxVersionInfoCli(cwd = process.cwd()) {
+    const fromRepo = await findVersionJson(cwd);
+    if (fromRepo) {
+        try {
+            const raw = await fs.readFile(fromRepo, "utf8");
+            const parsed = JSON.parse(raw);
+            return coerceVersionInfo({
+                version: parsed.baseVersion ?? parsed.version,
+                channel: parsed.channel,
+            });
+        }
+        catch {
+            // Fall through to package fallback.
+        }
+    }
+    const packageVersion = String(cliPkg.version ?? "0.0.0");
+    return coerceVersionInfo({
+        version: packageVersion,
+        channel: inferChannelFromSemver(packageVersion),
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flux-lang/cli",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "CLI tooling for the Flux score language",
   "license": "MIT",
   "author": "Sebastian Suarez-Solis",
@@ -17,18 +17,19 @@
     "README.md"
   ],
   "scripts": {
-    "prebuild": "npm run build --workspace @flux-lang/cli-core && npm run build --workspace @flux-lang/cli-ui",
+    "prebuild": "npm run build --workspace @flux-lang/cli-core && npm run build --workspace @flux-lang/brand && npm run build --workspace @flux-lang/cli-ui",
     "build": "tsc -p tsconfig.json",
     "dev": "tsc -p tsconfig.json --watch",
     "lint": "eslint src --ext .ts",
-    "pretest": "npm run build --workspace @flux-lang/core",
+    "pretest": "npm run build --workspace @flux-lang/core && npm run build --workspace @flux-lang/brand",
     "test": "npm run build && vitest",
     "prepublishOnly": "npm run build && chmod +x dist/bin/flux.js"
   },
   "dependencies": {
-    "@flux-lang/core": "^0.1.6",
-    "@flux-lang/cli-core": "^0.1.0",
-    "@flux-lang/cli-ui": "^0.1.0"
+    "@flux-lang/brand": "workspace:^",
+    "@flux-lang/core": "workspace:^",
+    "@flux-lang/cli-core": "workspace:^",
+    "@flux-lang/cli-ui": "workspace:^"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",