token-studio 4.8.0 → 4.8.1

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.8.1
+
+- Fixed `npx token-studio demo/start` when npm hoists `vite` beside the package instead of inside `token-studio/node_modules`.
+- Added runtime path tests for npm/npx hoisted dependency layout and local source checkout layout.
+
 ## 4.8.0
 
 - Renamed the npm package to `token-studio` with `npx token-studio demo` as the primary public entry.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-studio",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "description": "Local AI coding ROI studio for private token, output, and model strategy review.",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -4,10 +4,10 @@ import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline/promises';
 import { stdin as input, stdout as output } from 'node:process';
 import { createServer } from 'node:net';
-import { existsSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { hostname } from 'node:os';
 import { fileURLToPath } from 'node:url';
+import { createRequire } from 'node:module';
 import { seedDemoDatabase } from './demo-seed.mjs';
 import { auditExperimentalCollectors, detectCollectors } from './collector-registry.mjs';
 import { CCUSAGE_CLI_REPORTS, ccusageInvocation, runCcusageCliImportPlan } from './ccusage-bridge.mjs';
@@ -17,12 +17,14 @@ import { formatPrivacyCheckReport, runPrivacyCheck } from './privacy-check.mjs';
 import { buildTerminalReport, formatTerminalReport } from './terminal-report.mjs';
 import { buildEmptyStatuslineSnapshot, buildStatuslineSnapshot, formatStatuslineText } from './statusline.mjs';
 import { buildModelPolicy, formatModelPolicy } from './model-policy.mjs';
+import { resolveViteBin } from './runtime-paths.mjs';
 
 const command = process.argv[2] || 'help';
 const args = parseArgs(process.argv.slice(3));
 const SOURCE_DIR = dirname(fileURLToPath(import.meta.url));
 const PACKAGE_ROOT = resolve(SOURCE_DIR, '..');
 const USER_CWD = process.cwd();
+const requireFromCli = createRequire(import.meta.url);
 
 try {
   if (command === 'start') {
@@ -81,10 +83,7 @@ async function startCommand({ demo = false, dbPath = null, route = '/', openBrow
     DB_PATH: dbPath || resolve(USER_CWD, args.db || process.env.DB_PATH || 'data/usage.sqlite'),
     TOKEN_STUDIO_DEMO_MODE: demo ? '1' : process.env.TOKEN_STUDIO_DEMO_MODE || ''
   };
-  const viteBin = resolve(PACKAGE_ROOT, 'node_modules', 'vite', 'bin', 'vite.js');
-  if (!existsSync(viteBin)) {
-    throw new Error('Vite is not installed. Run npm install first, then retry token-studio start.');
-  }
+  const viteBin = resolveViteBin({ packageRoot: PACKAGE_ROOT, requireLike: requireFromCli });
   const server = spawn(process.execPath, [resolve(SOURCE_DIR, 'server.mjs')], {
     cwd: PACKAGE_ROOT,
     env,

package/src/runtime-paths.mjs

@@ -0,0 +1,25 @@
+import { existsSync } from 'node:fs';
+import { dirname, resolve } from 'node:path';
+
+export function resolveViteBin({ packageRoot, requireLike } = {}) {
+  const candidates = [];
+
+  try {
+    const vitePackageJson = requireLike?.resolve?.('vite/package.json');
+    if (vitePackageJson) {
+      candidates.push(resolve(dirname(vitePackageJson), 'bin', 'vite.js'));
+    }
+  } catch {
+    // Fall back to the direct local checkout layout below.
+  }
+
+  if (packageRoot) {
+    candidates.push(resolve(packageRoot, 'node_modules', 'vite', 'bin', 'vite.js'));
+  }
+
+  const found = candidates.find(candidate => existsSync(candidate));
+  if (!found) {
+    throw new Error('Vite is not installed. Reinstall token-studio or run npm install in the source checkout, then retry token-studio start.');
+  }
+  return found;
+}

package/test/runtime-paths.test.mjs

@@ -0,0 +1,54 @@
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { mkdirSync, rmSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { resolveViteBin } from '../src/runtime-paths.mjs';
+
+test('resolveViteBin handles npm npx hoisted dependency layout', () => {
+  const root = join(tmpdir(), `token-studio-runtime-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+  const packageRoot = join(root, 'node_modules', 'token-studio');
+  const viteRoot = join(root, 'node_modules', 'vite');
+  const viteBin = join(viteRoot, 'bin', 'vite.js');
+  mkdirSync(join(packageRoot, 'src'), { recursive: true });
+  mkdirSync(join(viteRoot, 'bin'), { recursive: true });
+  writeFileSync(join(viteRoot, 'package.json'), '{"name":"vite"}\n');
+  writeFileSync(viteBin, '#!/usr/bin/env node\n');
+
+  try {
+    const resolved = resolveViteBin({
+      packageRoot,
+      requireLike: {
+        resolve(id) {
+          assert.equal(id, 'vite/package.json');
+          return join(viteRoot, 'package.json');
+        }
+      }
+    });
+    assert.equal(resolved, viteBin);
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});
+
+test('resolveViteBin keeps local source checkout fallback', () => {
+  const root = join(tmpdir(), `token-studio-runtime-${Date.now()}-${Math.random().toString(16).slice(2)}`);
+  const packageRoot = join(root, 'token-studio');
+  const viteBin = join(packageRoot, 'node_modules', 'vite', 'bin', 'vite.js');
+  mkdirSync(join(packageRoot, 'node_modules', 'vite', 'bin'), { recursive: true });
+  writeFileSync(viteBin, '#!/usr/bin/env node\n');
+
+  try {
+    const resolved = resolveViteBin({
+      packageRoot,
+      requireLike: {
+        resolve() {
+          throw new Error('not found');
+        }
+      }
+    });
+    assert.equal(resolved, viteBin);
+  } finally {
+    rmSync(root, { recursive: true, force: true });
+  }
+});