Fix moi env CLI tests on macOS with a MOI_DATA_DIR seam

The e2e tests isolated the data dir via XDG_DATA_HOME, which env-paths
only honors on Linux — on macOS every spawned CLI read the real
~/Library/Application Support/moi registry and exited 1 (18 failures).
Add a MOI_DATA_DIR override as the single source of the data dir
(server/data-dir.ts) and use it in the tests. Also realpath the temp
dirs: macOS tmpdir() is a symlink (/var -> /private/var) and the
spawned CLI's resolved cwd must prefix-match the registered path.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: molefrog

server/data-dir.ts

@@ -0,0 +1,9 @@
+// Single source of truth for the OS data dir holding moi's global state
+// (workspaces.json, thread-config.json, workspace-env.json, …).
+//
+// MOI_DATA_DIR overrides it wholesale. This is the isolation seam for CLI
+// e2e tests: env-paths only honors XDG_DATA_HOME on Linux, so on macOS a
+// spawned CLI would otherwise read the developer's real data dir.
+import envPaths from 'env-paths'
+
+export const DATA_DIR = process.env.MOI_DATA_DIR || envPaths('moi', { suffix: false }).data

server/registry.ts

@@ -1,10 +1,10 @@
-import envPaths from 'env-paths'
 import { mkdir } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join, resolve, sep } from 'path'
 
 import type { DiscoveredWorkspace, WorkspaceEntry, WorkspaceType } from '@/lib/types'
 
+import { DATA_DIR } from './data-dir'
 import { type OpenClawAgent, discoverOpenClawAgents } from './openclaw'
 
 // Replace the home-dir prefix with `~` for display. Keeps the original
@@ -22,7 +22,6 @@ function withDisplayPath<T extends { path: string }>(entry: T): T & { displayPat
   return { ...entry, displayPath: tildify(entry.path) }
 }
 
-const DATA_DIR = envPaths('moi', { suffix: false }).data
 export const DEFAULT_REGISTRY_PATH = join(DATA_DIR, 'workspaces.json')
 
 // Overridable for tests

server/test/cli-env.test.ts

@@ -1,9 +1,11 @@
 // End-to-end tests for the `moi env` CLI: each test spawns the real CLI
 // (`bun server/cli.ts env …`) against a temp workspace, with the registry and
-// env stores isolated under a temp XDG_DATA_HOME. MOI_SECRET_BACKEND=file pins
-// the file secret store so a test run can never touch the real OS keychain.
+// env stores isolated under a temp MOI_DATA_DIR (env-paths only honors
+// XDG_DATA_HOME on Linux, so an explicit override is the only portable seam).
+// MOI_SECRET_BACKEND=file pins the file secret store so a test run can never
+// touch the real OS keychain.
 import { afterEach, beforeEach, describe, expect, test } from 'bun:test'
-import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
+import { mkdir, mkdtemp, realpath, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'path'
 
@@ -13,9 +15,6 @@ let dataHome: string
 let wsDir: string
 let outsideDir: string
 
-// The stores keyed by env-paths land in $XDG_DATA_HOME/moi on Linux and
-// $XDG_DATA_HOME/moi (via env-paths override) elsewhere too, because env-paths
-// honors XDG_DATA_HOME on every platform when set.
 const moiDataDir = () => join(dataHome, 'moi')
 const secretsPath = () => join(moiDataDir(), 'workspace-secrets.json')
 
@@ -40,7 +39,7 @@ async function runCli(
     stderr: 'pipe',
     env: {
       ...process.env,
-      XDG_DATA_HOME: dataHome,
+      MOI_DATA_DIR: moiDataDir(),
       MOI_SECRET_BACKEND: 'file',
       // No NO_COLOR override: stdout is a pipe here, exactly like an agent
       // capturing the command, so plain output must be the default.
@@ -64,10 +63,15 @@ async function storedSecrets(): Promise<Record<string, Record<string, string>>>
   }
 }
 
+// realpath matters: on macOS tmpdir() is a symlink (/var → /private/var), and
+// the spawned CLI sees the resolved cwd, which must prefix-match the
+// registered workspace path.
+const tempDir = async (prefix: string) => realpath(await mkdtemp(join(tmpdir(), prefix)))
+
 beforeEach(async () => {
-  dataHome = await mkdtemp(join(tmpdir(), 'moi-cli-data-'))
-  wsDir = await mkdtemp(join(tmpdir(), 'moi-cli-ws-'))
-  outsideDir = await mkdtemp(join(tmpdir(), 'moi-cli-outside-'))
+  dataHome = await tempDir('moi-cli-data-')
+  wsDir = await tempDir('moi-cli-ws-')
+  outsideDir = await tempDir('moi-cli-outside-')
   await registerWorkspace(wsDir)
 })
 
@@ -252,7 +256,7 @@ describe('moi env exec', () => {
         stderr: 'pipe',
         env: {
           ...process.env,
-          XDG_DATA_HOME: dataHome,
+          MOI_DATA_DIR: moiDataDir(),
           MOI_SECRET_BACKEND: 'file',
           NO_COLOR: '1',
           HOME_MADE: 'stale'

server/thread-config.ts

@@ -1,10 +1,10 @@
 import { mkdir, rename } from 'node:fs/promises'
 import { join } from 'path'
 
-import envPaths from 'env-paths'
-
 import type { ThreadConfig } from '@/lib/types'
 
+import { DATA_DIR } from './data-dir'
+
 // Per-thread model/effort overrides for chat threads. Stored OUTSIDE the user's
 // workspace (no repo churn) in ONE global JSON file in moi's data dir, alongside
 // the workspace registry. Keyed by workspace path then sessionId:
@@ -20,7 +20,6 @@ export type ThreadConfigPatch = {
 
 type Store = Record<string, Record<string, ThreadConfig>>
 
-const DATA_DIR = envPaths('moi', { suffix: false }).data
 let _path = join(DATA_DIR, 'thread-config.json')
 
 // Test seam: point the store at a scratch file (mirrors registry.setRegistryPath).

server/workspace-env.ts

@@ -14,13 +14,14 @@
 // Non-secret metadata (the `inheritDotenv` mode flag) lives in a small JSON
 // file in the OS data dir. Secret values live in the SecretStore. The two are
 // keyed by the absolute workspace path.
-import envPaths from 'env-paths'
 import { chmod, mkdir, rename } from 'node:fs/promises'
 import { dirname, join, resolve } from 'node:path'
 import { parseEnv } from 'node:util'
 
 import type { WorkspaceEnvView } from '@/lib/types'
 
+import { DATA_DIR } from './data-dir'
+
 // Dotenv files scanned in the workspace root, low → high precedence. A later
 // file's keys override an earlier file's (base `.env`, machine-local `.env.local`).
 const DOTENV_FILES = ['.env', '.env.local'] as const
@@ -32,7 +33,6 @@ export function isValidEnvKey(key: string): boolean {
   return ENV_KEY_RE.test(key)
 }
 
-const DATA_DIR = envPaths('moi', { suffix: false }).data
 const DEFAULT_META_PATH = join(DATA_DIR, 'workspace-env.json')
 const DEFAULT_SECRET_PATH = join(DATA_DIR, 'workspace-secrets.json')
 // Keychain namespace for Bun.secrets entries.