fix: retarget updater to @mosaic/mosaic (#384)

packages/mosaic/__tests__/update-checker.test.ts

@@ -1,7 +1,40 @@
-import { describe, expect, it } from 'vitest';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { semverLt, formatUpdateNotice } from '../src/runtime/update-checker.js';
 import type { UpdateCheckResult } from '../src/runtime/update-checker.js';
 
+const { execSyncMock, cacheFiles } = vi.hoisted(() => ({
+  execSyncMock: vi.fn(),
+  cacheFiles: new Map<string, string>(),
+}));
+
+vi.mock('node:child_process', () => ({
+  execSync: execSyncMock,
+}));
+
+vi.mock('node:fs', () => ({
+  existsSync: vi.fn((path: string) => cacheFiles.has(path)),
+  mkdirSync: vi.fn(),
+  readFileSync: vi.fn((path: string) => {
+    const value = cacheFiles.get(path);
+    if (value === undefined) {
+      throw new Error(`ENOENT: ${path}`);
+    }
+    return value;
+  }),
+  writeFileSync: vi.fn((path: string, content: string) => {
+    cacheFiles.set(path, content);
+  }),
+}));
+
+vi.mock('node:os', () => ({
+  homedir: vi.fn(() => '/mock-home'),
+}));
+
+async function importUpdateChecker() {
+  vi.resetModules();
+  return import('../src/runtime/update-checker.js');
+}
+
 describe('semverLt', () => {
   it('returns true when a < b', () => {
     expect(semverLt('0.0.1', '0.0.2')).toBe(true);
@@ -25,6 +58,11 @@ describe('semverLt', () => {
 });
 
 describe('formatUpdateNotice', () => {
+  beforeEach(() => {
+    execSyncMock.mockReset();
+    cacheFiles.clear();
+  });
+
   it('returns empty string when up to date', () => {
     const result: UpdateCheckResult = {
       current: '1.0.0',
@@ -49,4 +87,109 @@ describe('formatUpdateNotice', () => {
     expect(notice).toContain('0.1.0');
     expect(notice).toContain('Update available');
   });
+
+  it('uses @mosaic/mosaic hints for modern installs', async () => {
+    execSyncMock.mockImplementation((command: string) => {
+      if (command.includes('ls -g --depth=0 --json')) {
+        return JSON.stringify({
+          dependencies: {
+            '@mosaic/mosaic': { version: '0.0.17' },
+            '@mosaic/cli': { version: '0.0.16' },
+          },
+        });
+      }
+
+      if (command.includes('view @mosaic/mosaic version')) {
+        return '0.0.18';
+      }
+
+      throw new Error(`Unexpected command: ${command}`);
+    });
+
+    const { checkForUpdate } = await importUpdateChecker();
+    const result = checkForUpdate({ skipCache: true });
+    const notice = formatUpdateNotice(result);
+
+    expect(result.current).toBe('0.0.17');
+    expect(result.latest).toBe('0.0.18');
+    expect(notice).toContain('@mosaic/mosaic@latest');
+    expect(notice).not.toContain('@mosaic/cli@latest');
+  });
+
+  it('falls back to @mosaic/mosaic for legacy @mosaic/cli installs when cli is unavailable', async () => {
+    execSyncMock.mockImplementation((command: string) => {
+      if (command.includes('ls -g --depth=0 --json')) {
+        return JSON.stringify({
+          dependencies: {
+            '@mosaic/cli': { version: '0.0.16' },
+          },
+        });
+      }
+
+      if (command.includes('view @mosaic/cli version')) {
+        throw new Error('not found');
+      }
+
+      if (command.includes('view @mosaic/mosaic version')) {
+        return '0.0.17';
+      }
+
+      throw new Error(`Unexpected command: ${command}`);
+    });
+
+    const { checkForUpdate } = await importUpdateChecker();
+    const result = checkForUpdate({ skipCache: true });
+    const notice = formatUpdateNotice(result);
+
+    expect(result.current).toBe('0.0.16');
+    expect(result.latest).toBe('0.0.17');
+    expect(notice).toContain('@mosaic/mosaic@latest');
+  });
+
+  it('does not reuse a cached modern-package result for a legacy install', async () => {
+    let installedPackage = '@mosaic/mosaic';
+
+    execSyncMock.mockImplementation((command: string) => {
+      if (command.includes('ls -g --depth=0 --json')) {
+        return JSON.stringify({
+          dependencies:
+            installedPackage === '@mosaic/mosaic'
+              ? { '@mosaic/mosaic': { version: '0.0.17' } }
+              : { '@mosaic/cli': { version: '0.0.16' } },
+        });
+      }
+
+      if (command.includes('view @mosaic/mosaic version')) {
+        return installedPackage === '@mosaic/mosaic' ? '0.0.18' : '0.0.17';
+      }
+
+      if (command.includes('view @mosaic/cli version')) {
+        throw new Error('not found');
+      }
+
+      throw new Error(`Unexpected command: ${command}`);
+    });
+
+    const { checkForUpdate } = await importUpdateChecker();
+
+    const modernResult = checkForUpdate();
+    installedPackage = '@mosaic/cli';
+    const legacyResult = checkForUpdate();
+
+    expect(modernResult.currentPackage).toBe('@mosaic/mosaic');
+    expect(modernResult.targetPackage).toBe('@mosaic/mosaic');
+    expect(modernResult.latest).toBe('0.0.18');
+
+    expect(legacyResult.currentPackage).toBe('@mosaic/cli');
+    expect(legacyResult.targetPackage).toBe('@mosaic/mosaic');
+    expect(legacyResult.latest).toBe('0.0.17');
+    expect(execSyncMock).toHaveBeenCalledWith(
+      expect.stringContaining('view @mosaic/cli version'),
+      expect.any(Object),
+    );
+    expect(execSyncMock).toHaveBeenCalledWith(
+      expect.stringContaining('view @mosaic/mosaic version'),
+      expect.any(Object),
+    );
+  });
 });

packages/mosaic/package.json

@@ -18,9 +18,7 @@
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
-    },
-    "./package.json": "./package.json",
-    "./framework/*": "./framework/*"
+    }
   },
   "scripts": {
     "build": "tsc",

packages/mosaic/src/cli.ts

@@ -12,6 +12,7 @@ import {
   backgroundUpdateCheck,
   checkForUpdate,
   formatUpdateNotice,
+  getInstallCommand,
 } from './runtime/update-checker.js';
 import { runWizard } from './wizard.js';
 import { ClackPrompter } from './prompter/clack-prompter.js';
@@ -354,7 +355,7 @@ program
     try {
       // Relies on @mosaic:registry in ~/.npmrc — do NOT pass --registry
       // globally or non-@mosaic deps will 404 against the Gitea registry.
-      execSync('npm install -g @mosaic/cli@latest', {
+      execSync(getInstallCommand(result), {
         stdio: 'inherit',
         timeout: 60_000,
       });

packages/mosaic/src/commands/launch.ts

@@ -7,9 +7,9 @@
 
 import { execFileSync, execSync, spawnSync } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, writeFileSync, readdirSync, rmSync } from 'node:fs';
+import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { join, dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import type { Command } from 'commander';
 
 const MOSAIC_HOME = process.env['MOSAIC_HOME'] ?? join(homedir(), '.config', 'mosaic');
@@ -498,10 +498,14 @@ function delegateToScript(scriptPath: string, args: string[], env?: Record<strin
  * CLI version) over the deployed copy in ~/.config/mosaic/ (may be stale).
  */
 function resolveTool(...segments: string[]): string {
-  // Resolve relative to the built file: dist/commands/launch.js → ../../framework/tools/...
-  const thisFile = fileURLToPath(import.meta.url);
-  const bundled = join(dirname(thisFile), '..', '..', 'framework', 'tools', ...segments);
-  if (existsSync(bundled)) return bundled;
+  try {
+    const req = createRequire(import.meta.url);
+    const mosaicPkg = dirname(req.resolve('@mosaic/mosaic/package.json'));
+    const bundled = join(mosaicPkg, 'framework', 'tools', ...segments);
+    if (existsSync(bundled)) return bundled;
+  } catch {
+    // Fall through to deployed copy
+  }
   return join(MOSAIC_HOME, 'tools', ...segments);
 }
 

packages/mosaic/src/index.ts

@@ -1 +1,11 @@
 export const VERSION = '0.0.0';
+
+export {
+  backgroundUpdateCheck,
+  checkForUpdate,
+  formatUpdateNotice,
+  getInstallCommand,
+  getInstalledVersion,
+  getLatestVersion,
+  semverLt,
+} from './runtime/update-checker.js';

packages/mosaic/src/runtime/update-checker.ts

@@ -1,5 +1,5 @@
 /**
- * Mosaic update checker — compares installed @mosaic/cli version against the
+ * Mosaic update checker — compares the installed Mosaic package against the
  * Gitea npm registry and reports when an upgrade is available.
  *
  * Used by:
@@ -23,8 +23,12 @@ import { join } from 'node:path';
 export interface UpdateCheckResult {
   /** Currently installed version (empty if not found) */
   current: string;
+  /** Currently installed package name */
+  currentPackage?: string;
   /** Latest published version (empty if check failed) */
   latest: string;
+  /** Package that should be installed for the latest version */
+  targetPackage?: string;
   /** True when a newer version is available */
   updateAvailable: boolean;
   /** ISO timestamp of this check */
@@ -36,7 +40,9 @@ export interface UpdateCheckResult {
 // ─── Constants ──────────────────────────────────────────────────────────────
 
 const REGISTRY = 'https://git.mosaicstack.dev/api/packages/mosaic/npm/';
-const CLI_PKG = '@mosaic/cli';
+const MODERN_PKG = '@mosaic/mosaic';
+const LEGACY_PKG = '@mosaic/cli';
+const INSTALLED_PACKAGE_ORDER = [MODERN_PKG, LEGACY_PKG] as const;
 const CACHE_DIR = join(homedir(), '.cache', 'mosaic');
 const CACHE_FILE = join(CACHE_DIR, 'update-check.json');
 const CACHE_TTL_MS = 60 * 60 * 1000; // 1 hour
@@ -125,17 +131,20 @@ export function semverLt(a: string, b: string): boolean {
 /** Cache stores only the latest registry version (the expensive network call).
  *  The installed version is always checked fresh — it's a local `npm ls`. */
 interface RegistryCache {
+  currentPackage?: string;
   latest: string;
+  targetPackage?: string;
   checkedAt: string;
   registry: string;
 }
 
-function readCache(): RegistryCache | null {
+function readCache(currentPackage: string): RegistryCache | null {
   try {
     if (!existsSync(CACHE_FILE)) return null;
     const raw = JSON.parse(readFileSync(CACHE_FILE, 'utf-8')) as RegistryCache;
     const age = Date.now() - new Date(raw.checkedAt).getTime();
     if (age > CACHE_TTL_MS) return null;
+    if ((raw.currentPackage || '') !== currentPackage) return null;
     return raw;
   } catch {
     return null;
@@ -154,10 +163,10 @@ function writeCache(entry: RegistryCache): void {
 // ─── Public API ─────────────────────────────────────────────────────────────
 
 /**
- * Get the currently installed version of @mosaic/cli.
- * Returns empty string if not installed.
+ * Get the currently installed Mosaic package version.
+ * Prefers the consolidated @mosaic/mosaic package over legacy @mosaic/cli.
  */
-export function getInstalledVersion(): string {
+export function getInstalledVersion(): { name: string; version: string } {
   // Fast path: check via package.json require chain
   try {
     const raw = npmExec(`ls -g --depth=0 --json 2>/dev/null`, 3000);
@@ -165,20 +174,41 @@ export function getInstalledVersion(): string {
       const data = JSON.parse(raw) as {
         dependencies?: Record<string, { version?: string }>;
       };
-      return data?.dependencies?.[CLI_PKG]?.version ?? '';
+      for (const pkg of INSTALLED_PACKAGE_ORDER) {
+        const version = data?.dependencies?.[pkg]?.version;
+        if (version) {
+          return { name: pkg, version };
+        }
+      }
     }
   } catch {
     // fall through
   }
-  return '';
+  return { name: '', version: '' };
 }
 
 /**
  * Fetch the latest published version from the Gitea npm registry.
+ * For legacy @mosaic/cli installs, try the legacy package first and fall back
+ * to @mosaic/mosaic to support the CLI -> mosaic package consolidation.
  * Returns empty string on failure.
  */
-export function getLatestVersion(): string {
-  return npmExec(`view ${CLI_PKG} version --registry=${REGISTRY}`);
+export function getLatestVersion(installedPackage = ''): { name: string; version: string } {
+  const candidates =
+    installedPackage === LEGACY_PKG ? [LEGACY_PKG, MODERN_PKG] : [MODERN_PKG, LEGACY_PKG];
+
+  for (const pkg of candidates) {
+    const version = npmExec(`view ${pkg} version --registry=${REGISTRY}`);
+    if (version) {
+      return { name: pkg, version };
+    }
+  }
+
+  return { name: '', version: '' };
+}
+
+export function getInstallCommand(result: Pick<UpdateCheckResult, 'targetPackage'>): string {
+  return `npm i -g ${result.targetPackage || MODERN_PKG}@latest`;
 }
 
 /**
@@ -188,31 +218,49 @@ export function getLatestVersion(): string {
  * Never throws.
  */
 export function checkForUpdate(options?: { skipCache?: boolean }): UpdateCheckResult {
-  const current = getInstalledVersion();
+  const currentInfo = getInstalledVersion();
+  const current = currentInfo.version;
 
-  let latest: string;
+  let latestInfo: { name: string; version: string };
   let checkedAt: string;
 
   if (!options?.skipCache) {
-    const cached = readCache();
+    const cached = readCache(currentInfo.name);
     if (cached) {
-      latest = cached.latest;
+      latestInfo = {
+        name: cached.targetPackage || MODERN_PKG,
+        version: cached.latest,
+      };
       checkedAt = cached.checkedAt;
     } else {
-      latest = getLatestVersion();
+      latestInfo = getLatestVersion(currentInfo.name);
       checkedAt = new Date().toISOString();
-      writeCache({ latest, checkedAt, registry: REGISTRY });
+      writeCache({
+        currentPackage: currentInfo.name,
+        latest: latestInfo.version,
+        targetPackage: latestInfo.name,
+        checkedAt,
+        registry: REGISTRY,
+      });
     }
   } else {
-    latest = getLatestVersion();
+    latestInfo = getLatestVersion(currentInfo.name);
     checkedAt = new Date().toISOString();
-    writeCache({ latest, checkedAt, registry: REGISTRY });
+    writeCache({
+      currentPackage: currentInfo.name,
+      latest: latestInfo.version,
+      targetPackage: latestInfo.name,
+      checkedAt,
+      registry: REGISTRY,
+    });
   }
 
   return {
     current,
-    latest,
-    updateAvailable: !!(current && latest && semverLt(current, latest)),
+    currentPackage: currentInfo.name,
+    latest: latestInfo.version,
+    targetPackage: latestInfo.name || MODERN_PKG,
+    updateAvailable: !!(current && latestInfo.version && semverLt(current, latestInfo.version)),
     checkedAt,
     registry: REGISTRY,
   };
@@ -224,14 +272,21 @@ export function checkForUpdate(options?: { skipCache?: boolean }): UpdateCheckRe
 export function formatUpdateNotice(result: UpdateCheckResult): string {
   if (!result.updateAvailable) return '';
 
+  const installCommand = getInstallCommand(result);
+  const targetChanged =
+    result.currentPackage && result.targetPackage && result.currentPackage !== result.targetPackage;
+
   const lines = [
     '',
     '╭─────────────────────────────────────────────────╮',
     '│                                                 │',
     `│   Update available: ${result.current} → ${result.latest}`.padEnd(50) + '│',
+    ...(targetChanged
+      ? [`│   Package target: ${result.currentPackage} → ${result.targetPackage}`.padEnd(50) + '│']
+      : []),
     '│                                                 │',
     '│   Run:  bash tools/install.sh                   │',
-    '│   Or:   npm i -g @mosaic/cli@latest             │',
+    `│   Or:   ${installCommand}`.padEnd(50) + '│',
     '│                                                 │',
     '╰─────────────────────────────────────────────────╯',
     '',