From f34c63bf22a4daf183015c29a08e7abcf3b02d58 Mon Sep 17 00:00:00 2001
From: Zhongjin Lu <zhongjin.lu@mondorobotics.com>
Date: Wed, 11 Feb 2026 20:41:43 +0800
Subject: [PATCH] feat: add version flags and unify version lookup

---
 README.md                          |  1 +
 src/cli.ts                         |  6 ++++++
 src/daemon-client.ts               | 25 +------------------------
 src/daemon.ts                      | 25 +------------------------
 src/utils/args.ts                  |  8 +++++++-
 src/utils/version.ts               | 26 ++++++++++++++++++++++++++
 test/integration/smoke-cli.test.ts | 12 ++++++++++++
 7 files changed, 54 insertions(+), 49 deletions(-)
 create mode 100644 src/utils/version.ts

diff --git a/README.md b/README.md
index 21d6e823c..ebc98c9a4 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,7 @@ Notes:
 - If XCTest returns 0 nodes (e.g., foreground app changed), agent-device falls back to AX when available.
 
 Flags:
+- `--version, -V` print version and exit
 - `--platform ios|android`
 - `--device <name>`
 - `--udid <udid>` (iOS)
diff --git a/src/cli.ts b/src/cli.ts
index c4ecd38fe..c39f3e351 100644
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -1,6 +1,7 @@
 import { parseArgs, usage } from './utils/args.ts';
 import { asAppError, AppError } from './utils/errors.ts';
 import { formatSnapshotText, printHumanError, printJson } from './utils/output.ts';
+import { readVersion } from './utils/version.ts';
 import { pathToFileURL } from 'node:url';
 import { sendToDaemon } from './daemon-client.ts';
 import fs from 'node:fs';
@@ -10,6 +11,11 @@ import path from 'node:path';
 export async function runCli(argv: string[]): Promise<void> {
   const parsed = parseArgs(argv);
 
+  if (parsed.flags.version) {
+    process.stdout.write(`${readVersion()}\n`);
+    process.exit(0);
+  }
+
   if (parsed.flags.help || !parsed.command) {
     process.stdout.write(`${usage()}\n`);
     process.exit(parsed.flags.help ? 0 : 1);
diff --git a/src/daemon-client.ts b/src/daemon-client.ts
index 85febd742..713dd1501 100644
--- a/src/daemon-client.ts
+++ b/src/daemon-client.ts
@@ -2,10 +2,10 @@ import net from 'node:net';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import { AppError } from './utils/errors.ts';
 import type { CommandFlags } from './core/dispatch.ts';
 import { runCmdDetached } from './utils/exec.ts';
+import { findProjectRoot, readVersion } from './utils/version.ts';
 
 export type DaemonRequest = {
   token: string;
@@ -134,18 +134,6 @@ async function sendRequest(info: DaemonInfo, req: DaemonRequest): Promise<Daemon
   });
 }
 
-function readVersion(): string {
-  try {
-    const root = findProjectRoot();
-    const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')) as {
-      version?: string;
-    };
-    return pkg.version ?? '0.0.0';
-  } catch {
-    return '0.0.0';
-  }
-}
-
 function resolveRequestTimeoutMs(): number {
   const raw = process.env.AGENT_DEVICE_DAEMON_TIMEOUT_MS;
   if (!raw) return 60000;
@@ -153,14 +141,3 @@ function resolveRequestTimeoutMs(): number {
   if (!Number.isFinite(parsed)) return 60000;
   return Math.max(1000, Math.floor(parsed));
 }
-
-function findProjectRoot(): string {
-  const start = path.dirname(fileURLToPath(import.meta.url));
-  let current = start;
-  for (let i = 0; i < 6; i += 1) {
-    const pkgPath = path.join(current, 'package.json');
-    if (fs.existsSync(pkgPath)) return current;
-    current = path.dirname(current);
-  }
-  return start;
-}
diff --git a/src/daemon.ts b/src/daemon.ts
index bc72d4acc..503f6e271 100644
--- a/src/daemon.ts
+++ b/src/daemon.ts
@@ -3,10 +3,10 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import crypto from 'node:crypto';
-import { fileURLToPath } from 'node:url';
 import { dispatchCommand, type CommandFlags } from './core/dispatch.ts';
 import { isCommandSupportedOnDevice } from './core/capabilities.ts';
 import { asAppError, AppError } from './utils/errors.ts';
+import { readVersion } from './utils/version.ts';
 import { stopIosRunnerSession } from './platforms/ios/runner-client.ts';
 import type { DaemonRequest, DaemonResponse } from './daemon/types.ts';
 import { SessionStore } from './daemon/session-store.ts';
@@ -203,26 +203,3 @@ function start(): void {
 }
 
 start();
-
-function readVersion(): string {
-  try {
-    const root = findProjectRoot();
-    const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')) as {
-      version?: string;
-    };
-    return pkg.version ?? '0.0.0';
-  } catch {
-    return '0.0.0';
-  }
-}
-
-function findProjectRoot(): string {
-  const start = path.dirname(fileURLToPath(import.meta.url));
-  let current = start;
-  for (let i = 0; i < 6; i += 1) {
-    const pkgPath = path.join(current, 'package.json');
-    if (fs.existsSync(pkgPath)) return current;
-    current = path.dirname(current);
-  }
-  return start;
-}
diff --git a/src/utils/args.ts b/src/utils/args.ts
index 016a6ccd2..65b998d58 100644
--- a/src/utils/args.ts
+++ b/src/utils/args.ts
@@ -25,11 +25,12 @@ export type ParsedArgs = {
     noRecord?: boolean;
     replayUpdate?: boolean;
     help: boolean;
+    version: boolean;
   };
 };
 
 export function parseArgs(argv: string[]): ParsedArgs {
-  const flags: ParsedArgs['flags'] = { json: false, help: false };
+  const flags: ParsedArgs['flags'] = { json: false, help: false, version: false };
   const positionals: string[] = [];
 
   for (let i = 0; i < argv.length; i += 1) {
@@ -42,6 +43,10 @@ export function parseArgs(argv: string[]): ParsedArgs {
       flags.help = true;
       continue;
     }
+    if (arg === '--version' || arg === '-V') {
+      flags.version = true;
+      continue;
+    }
     if (arg === '--verbose' || arg === '-v') {
       flags.verbose = true;
       continue;
@@ -229,5 +234,6 @@ Flags:
   --update, -u                               Replay: update selectors and rewrite replay file in place
   --user-installed                           Apps: list user-installed packages (Android only)
   --all                                      Apps: list all packages (Android only)
+  --version, -V                              Print version and exit
 `;
 }
diff --git a/src/utils/version.ts b/src/utils/version.ts
new file mode 100644
index 000000000..9bcd14dae
--- /dev/null
+++ b/src/utils/version.ts
@@ -0,0 +1,26 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+export function readVersion(): string {
+  try {
+    const root = findProjectRoot();
+    const pkg = JSON.parse(fs.readFileSync(path.join(root, 'package.json'), 'utf8')) as {
+      version?: string;
+    };
+    return pkg.version ?? '0.0.0';
+  } catch {
+    return '0.0.0';
+  }
+}
+
+export function findProjectRoot(): string {
+  const start = path.dirname(fileURLToPath(import.meta.url));
+  let current = start;
+  for (let i = 0; i < 6; i += 1) {
+    const pkgPath = path.join(current, 'package.json');
+    if (fs.existsSync(pkgPath)) return current;
+    current = path.dirname(current);
+  }
+  return start;
+}
diff --git a/test/integration/smoke-cli.test.ts b/test/integration/smoke-cli.test.ts
index 2aa6edb6d..5786e1c0b 100644
--- a/test/integration/smoke-cli.test.ts
+++ b/test/integration/smoke-cli.test.ts
@@ -17,6 +17,18 @@ test('cli --help returns usage', () => {
   assert.match(result.stdout, /agent-device/i);
 });
 
+test('cli --version prints semver and exits 0', () => {
+  const result = runCli(['--version']);
+  assert.equal(result.status, 0, result.stderr);
+  assert.match(result.stdout, /^\d+\.\d+\.\d+/i);
+});
+
+test('cli -V prints semver and exits 0', () => {
+  const result = runCli(['-V']);
+  assert.equal(result.status, 0, result.stderr);
+  assert.match(result.stdout, /^\d+\.\d+\.\d+/i);
+});
+
 test('cli without command prints usage and exits 1', () => {
   const result = runCli([]);
   assert.equal(result.status, 1, result.stderr);