@drakulavich/oura-cli 0.4.0 → 0.4.1

package/CHANGELOG.md

@@ -6,6 +6,15 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+## [0.4.1] - 2026-05-13
+
+### Fixed
+- Global flags (`--format`, `--token`, `--db`, `--tz`, `--no-color`) placed
+  BEFORE the subcommand name are now hoisted to AFTER it before citty parses
+  argv. Restores the v0.3.x flag-first form like
+  `oura-cli --format json sleep today`. Regression introduced by the citty
+  migration in v0.4.0.
+
 ## [0.4.0] - 2026-05-13
 
 ### Changed
@@ -190,6 +199,7 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 - Local SQLite cache at `~/.oura-cli/oura.db`.
 - Auth via `oura-cli login`, `OURA_TOKEN`, `OURA_TOKEN_PATH`, or `~/.oura-token`.
 
+[0.4.1]: https://github.com/drakulavich/oura-cli/releases/tag/v0.4.1
 [0.4.0]: https://github.com/drakulavich/oura-cli/releases/tag/v0.4.0
 [0.3.4]: https://github.com/drakulavich/oura-cli/releases/tag/v0.3.4
 [0.3.3]: https://github.com/drakulavich/oura-cli/releases/tag/v0.3.3

package/dist/index.js

@@ -2576,8 +2576,62 @@ function createApiCommand(name, description, endpoint) {
   });
 }
 
+// src/lib/argv-normalize.ts
+var GLOBAL_FLAGS_WITH_VALUE = new Set(["--format", "--token", "--db", "--tz"]);
+var GLOBAL_FLAGS_BOOLEAN = new Set(["--no-color"]);
+var SUBCOMMANDS = new Set([
+  "login",
+  "describe",
+  "healthcheck",
+  "manifest",
+  "sleep",
+  "readiness",
+  "activity",
+  "hr",
+  "spo2",
+  "stress",
+  "workout",
+  "sync",
+  "db",
+  "report"
+]);
+function normalizeArgv(argv) {
+  const [bun, script, ...rest] = argv;
+  const subIdx = rest.findIndex((a) => SUBCOMMANDS.has(a));
+  if (subIdx < 0)
+    return argv;
+  const before = rest.slice(0, subIdx);
+  const subcommandOnwards = rest.slice(subIdx);
+  const hoisted = [];
+  const leftover = [];
+  for (let i = 0;i < before.length; i++) {
+    const tok = before[i];
+    if (tok.includes("=")) {
+      const name = tok.slice(0, tok.indexOf("="));
+      if (GLOBAL_FLAGS_WITH_VALUE.has(name) || GLOBAL_FLAGS_BOOLEAN.has(name)) {
+        hoisted.push(tok);
+        continue;
+      }
+    }
+    if (GLOBAL_FLAGS_WITH_VALUE.has(tok)) {
+      hoisted.push(tok);
+      if (i + 1 < before.length) {
+        hoisted.push(before[i + 1]);
+        i++;
+      }
+      continue;
+    }
+    if (GLOBAL_FLAGS_BOOLEAN.has(tok)) {
+      hoisted.push(tok);
+      continue;
+    }
+    leftover.push(tok);
+  }
+  return [bun, script, ...leftover, ...subcommandOnwards, ...hoisted];
+}
+
 // src/index.ts
-var VERSION = "0.4.0";
+var VERSION = "0.4.1";
 if (process.argv.includes("--no-color") || process.env.NO_COLOR) {
   source_default.level = 0;
 }
@@ -2605,4 +2659,5 @@ var main = defineCommand({
     report: reportCommand
   }
 });
-runMain(main);
+var normalized = normalizeArgv(process.argv);
+runMain(main, { rawArgs: normalized.slice(2) });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@drakulavich/oura-cli",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Oura Ring CLI — query and analyze Oura Ring health data from the command line, designed for humans and AI agents.",
   "keywords": [
     "oura",