@vue-skuilder/cli 0.1.11-7 → 0.1.11

package/src/commands/studio.ts

@@ -183,11 +183,9 @@ async function launchStudio(coursePath: string, options: StudioOptions) {
     );
 
     // Phase 9.5: Launch Express backend
-    console.log(chalk.cyan(`⚡ Starting Express backend server...`));
     const expressResult = await startExpressBackend(
       couchDBManager.getConnectionDetails(),
-      resolvedPath,
-      unpackResult.courseId
+      unpackResult.databaseName
     );
     expressServer = expressResult.server;
 
@@ -201,7 +199,8 @@ async function launchStudio(coursePath: string, options: StudioOptions) {
     const studioUIPort = await startStudioUIServer(
       couchDBManager.getConnectionDetails(),
       unpackResult,
-      studioUIPath
+      studioUIPath,
+      expressResult.url
     );
 
     console.log(chalk.green(`✅ Studio session ready!`));
@@ -210,7 +209,7 @@ async function launchStudio(coursePath: string, options: StudioOptions) {
     console.log(chalk.gray(`   Express API: ${expressResult.url}`));
 
     // Display MCP connection information
-    const mcpInfo = getMCPConnectionInfo(unpackResult, couchDBManager, resolvedPath);
+    const mcpInfo = getMCPConnectionInfo(unpackResult, couchDBManager);
     console.log(chalk.blue(`🔗 MCP Server: ${mcpInfo.command}`));
     console.log(chalk.gray(`   Connect MCP clients using the command above`));
     console.log(chalk.gray(`   Environment variables for MCP:`));
@@ -219,7 +218,7 @@ async function launchStudio(coursePath: string, options: StudioOptions) {
     });
 
     // Display .mcp.json content for Claude Code integration
-    const mcpJsonContent = generateMCPJson(unpackResult, couchDBManager, resolvedPath);
+    const mcpJsonContent = generateMCPJson(unpackResult, couchDBManager);
     console.log(chalk.blue(`📋 .mcp.json content:`));
     console.log(chalk.gray(mcpJsonContent));
 
@@ -407,7 +406,8 @@ interface UnpackResult {
 async function startStudioUIServer(
   connectionDetails: ConnectionDetails,
   unpackResult: UnpackResult,
-  studioPath: string
+  studioPath: string,
+  expressApiUrl?: string
 ): Promise<number> {
   // Serve from built dist directory if it exists, otherwise fallback to source
   const distPath = path.join(studioPath, 'dist');
@@ -458,6 +458,9 @@ async function startStudioUIServer(
                     name: '${unpackResult.databaseName}',
                     courseId: '${unpackResult.courseId}',
                     originalCourseId: '${unpackResult.courseId}'
+                  },
+                  express: {
+                    url: '${expressApiUrl || 'http://localhost:3000'}'
                   }
                 };
               </script>
@@ -486,6 +489,9 @@ async function startStudioUIServer(
                     name: '${unpackResult.databaseName}',
                     courseId: '${unpackResult.courseId}',
                     originalCourseId: '${unpackResult.courseId}'
+                  },
+                  express: {
+                    url: '${expressApiUrl || 'http://localhost:3000'}'
                   }
                 };
               </script>
@@ -562,8 +568,7 @@ async function openBrowser(url: string): Promise<void> {
  */
 async function startExpressBackend(
   couchDbConnectionDetails: ConnectionDetails,
-  _projectPath: string,
-  courseId: string
+  databaseName: string
 ): Promise<{ server: http.Server; port: number; url: string }> {
   console.log(chalk.blue('⚡ Starting Express backend server...'));
 
@@ -584,7 +589,7 @@ async function startExpressBackend(
       username: couchDbConnectionDetails.username,
       password: couchDbConnectionDetails.password,
     },
-    courseIDs: [courseId],
+    courseIDs: [databaseName],
     version: VERSION,
     nodeEnv: 'studio',
     cors: {
@@ -594,6 +599,9 @@ async function startExpressBackend(
   };
 
   try {
+    // Set NODE_ENV for studio mode authentication bypass
+    process.env.NODE_ENV = 'studio';
+
     // Create Express app using factory
     const app = createExpressApp(config);
 
@@ -836,9 +844,9 @@ async function buildDefaultStudioUI(buildPath: string): Promise<string> {
     const studioPackageJsonPath = path.join(buildPath, 'package.json');
     await transformPackageJsonForStudioBuild(studioPackageJsonPath);
 
-    // Fix Vite config to use npm packages instead of monorepo paths
-    console.log(chalk.gray(`   Updating Vite configuration for standalone build...`));
-    await fixViteConfigForStandaloneBuild(buildPath);
+    // Fix Vite config to use npm packages and resolve custom questions imports
+    console.log(chalk.gray(`   Updating Vite configuration for studio build...`));
+    await createStudioViteConfig(buildPath);
 
     // Run Vite build process
     console.log(chalk.gray(`   Running Vite build process...`));
@@ -1036,9 +1044,9 @@ async function buildStudioUIWithCustomQuestions(
     const studioPackageJsonPath = path.join(buildPath, 'package.json');
     await transformPackageJsonForStudioBuild(studioPackageJsonPath);
 
-    // Step 2.5: Fix Vite config to use npm packages instead of monorepo paths
-    console.log(chalk.gray(`   Updating Vite configuration for standalone build...`));
-    await fixViteConfigForStandaloneBuild(buildPath);
+    // Step 2.5: Fix Vite config to use npm packages and resolve custom questions imports
+    console.log(chalk.gray(`   Updating Vite configuration for studio build...`));
+    await createStudioViteConfig(buildPath);
 
     // Step 3: Install custom questions package
     console.log(
@@ -1259,9 +1267,9 @@ async function runViteBuild(buildPath: string): Promise<void> {
 }
 
 /**
- * Fix Vite configuration to work in standalone build environment
+ * Create Vite configuration for studio-ui build environment
  */
-async function fixViteConfigForStandaloneBuild(buildPath: string): Promise<void> {
+async function createStudioViteConfig(buildPath: string): Promise<void> {
   const viteConfigPath = path.join(buildPath, 'vite.config.ts');
 
   if (!fs.existsSync(viteConfigPath)) {
@@ -1269,9 +1277,9 @@ async function fixViteConfigForStandaloneBuild(buildPath: string): Promise<void>
     return;
   }
 
-  // Create a clean standalone vite config for external projects
-  // Relies on standard npm package resolution instead of monorepo paths
-  const standaloneViteConfig = `import { defineConfig } from 'vite';
+  // Create a clean studio vite config for studio-ui environment
+  // Includes aliases to resolve custom questions imports
+  const studioViteConfig = `import { defineConfig } from 'vite';
 import vue from '@vitejs/plugin-vue';
 
 export default defineConfig({
@@ -1297,9 +1305,17 @@ export default defineConfig({
   },
   resolve: {
     extensions: ['.js', '.ts', '.json', '.vue'],
+    alias: {
+      // Resolve @vue-skuilder packages to npm packages for custom questions import
+      '@vue-skuilder/common': '@vue-skuilder/common',
+      '@vue-skuilder/courseware': '@vue-skuilder/courseware',
+      '@vue-skuilder/db': '@vue-skuilder/db',
+      '@vue-skuilder/common-ui': '@vue-skuilder/common-ui',
+      '@vue-skuilder/edit-ui': '@vue-skuilder/edit-ui'
+    },
     dedupe: [
       'vue',
-      'vuetify', 
+      'vuetify',
       'vue-router',
       'pinia',
       '@vue-skuilder/db',
@@ -1311,50 +1327,23 @@ export default defineConfig({
   }
 });`;
 
-  fs.writeFileSync(viteConfigPath, standaloneViteConfig);
-  console.log(chalk.gray(`   Vite config replaced with standalone version`));
+  fs.writeFileSync(viteConfigPath, studioViteConfig);
+  console.log(chalk.gray(`   Vite config replaced with studio version`));
 }
 
 /**
- * Determine the correct MCP server executable path/command based on project context
+ * Determine the correct MCP server executable path.
+ * This is now greatly simplified because the bundled server is always
+ * located relative to this `studio.ts` file.
  */
-function resolveMCPExecutable(projectPath: string): {
-  command: string;
-  args: string[];
-  isNpx: boolean;
-} {
-  // Check if we're in the monorepo (packages/cli exists)
-  const monorepoCliPath = path.join(projectPath, 'packages', 'cli', 'dist', 'mcp-server.js');
-  if (fs.existsSync(monorepoCliPath)) {
-    return {
-      command: './packages/cli/dist/mcp-server.js',
-      args: [],
-      isNpx: false,
-    };
-  }
+function resolveMCPExecutable(): { command: string; args: string[] } {
+  // Resolve the path to the bundled server relative to the current file.
+  // __dirname is the `dist/commands` directory.
+  const serverPath = path.resolve(__dirname, '..', 'mcp-server.js');
 
-  // Check if @vue-skuilder/cli is installed as a dependency
-  const scaffoldedCliPath = path.join(
-    projectPath,
-    'node_modules',
-    '@vue-skuilder',
-    'cli',
-    'dist',
-    'mcp-server.js'
-  );
-  if (fs.existsSync(scaffoldedCliPath)) {
-    return {
-      command: './node_modules/@vue-skuilder/cli/dist/mcp-server.js',
-      args: [],
-      isNpx: false,
-    };
-  }
-
-  // Fallback to npx approach
   return {
-    command: 'npx',
-    args: ['@vue-skuilder/cli', 'mcp-server'],
-    isNpx: true,
+    command: 'node',
+    args: [serverPath],
   };
 }
 
@@ -1363,19 +1352,16 @@ function resolveMCPExecutable(projectPath: string): {
  */
 function getMCPConnectionInfo(
   unpackResult: UnpackResult,
-  couchDBManager: CouchDBManager,
-  projectPath: string
+  couchDBManager: CouchDBManager
 ): { command: string; env: Record<string, string> } {
   const couchDetails = couchDBManager.getConnectionDetails();
-  const executable = resolveMCPExecutable(projectPath);
+  const executable = resolveMCPExecutable();
+  const port = couchDetails.port || 5985;
 
   // Build command string for display
-  let commandStr: string;
-  if (executable.isNpx) {
-    commandStr = `${executable.command} ${executable.args.join(' ')} ${unpackResult.databaseName} ${couchDetails.port}`;
-  } else {
-    commandStr = `node ${executable.command} ${unpackResult.databaseName} ${couchDetails.port}`;
-  }
+  const commandStr = `${executable.command} ${executable.args.join(' ')} ${
+    unpackResult.databaseName
+  } ${port}`;
 
   return {
     command: commandStr,
@@ -1394,12 +1380,11 @@ function getMCPConnectionInfo(
 function generateMCPJson(
   unpackResult: UnpackResult,
   couchDBManager: CouchDBManager,
-  projectPath: string,
   serverName: string = 'vue-skuilder-studio'
 ): string {
   const couchDetails = couchDBManager.getConnectionDetails();
   const port = couchDetails.port || 5985;
-  const executable = resolveMCPExecutable(projectPath);
+  const executable = resolveMCPExecutable();
 
   const mcpConfig = {
     mcpServers: {

package/src/mcp-server.ts

@@ -1,7 +1,9 @@
-#!/usr/bin/env node
+// MCP Server for Vue-Skuilder courses
+// This file is bundled into a self-contained executable
 
 import { initializeDataLayer, getDataLayer, initializeTuiLogging } from '@vue-skuilder/db';
 import { MCPServer } from '@vue-skuilder/mcp';
+import { consoleLogger } from '@vue-skuilder/common';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
 
 initializeTuiLogging();
@@ -42,10 +44,11 @@ async function main() {
     await initializeDataLayer(couchdbConfig);
     const courseDB = getDataLayer().getCourseDB(courseId);
 
-    // Create and start MCP server
+    // Create and start MCP server with console logger
     const server = new MCPServer(courseDB, {
       enableSourceLinking: true,
       maxCardsPerQuery: 50,
+      logger: consoleLogger,
     });
 
     const transport = new StdioServerTransport();
@@ -53,7 +56,9 @@ async function main() {
 
     console.error('MCP Server started successfully!');
     console.error(`Course: ${courseId}`);
-    console.error('Available resources: course://config, cards://all, tags://all, shapes://all');
+    console.error('Available resources: course://config, cards://all, cards://tag/{tagName}, cards://shape/{shapeName}, cards://elo/{eloRange}');
+    console.error('                     shapes://all, shapes://{shapeName}, schema://{dataShapeName}');
+    console.error('                     tags://all, tags://stats, tags://{tagName}, tags://union/{tags}, tags://intersect/{tags}, tags://exclusive/{tags}, tags://distribution');
     console.error('Available tools: create_card, update_card, tag_card, delete_card');
     console.error('Available prompts: fill-in-card-authoring, elo-scoring-guidance');
     console.error('Ready for MCP client connections via stdio');

package/src/utils/template.ts

@@ -200,27 +200,22 @@ export default defineConfig({
         },
         rollupOptions: {
           // External packages that shouldn't be bundled in library mode
+          // For studio integration, we bundle vue-skuilder packages to avoid npm resolution issues
           external: [
-            'vue',
-            'vue-router',
-            'vuetify',
-            'pinia',
-            '@vue-skuilder/common',
-            '@vue-skuilder/common-ui',
-            '@vue-skuilder/courseware',
-            '@vue-skuilder/db',
+            // Bundle everything for studio integration - no externals
           ],
           output: {
             // Global variables for UMD build
             globals: {
-              'vue': 'Vue',
+              vue: 'Vue',
               'vue-router': 'VueRouter',
-              'vuetify': 'Vuetify',
-              'pinia': 'Pinia',
-              '@vue-skuilder/common': 'VueSkuilderCommon',
-              '@vue-skuilder/common-ui': 'VueSkuilderCommonUI',
-              '@vue-skuilder/courseware': 'VueSkuilderCourseWare',
-              '@vue-skuilder/db': 'VueSkuilderDB',
+              vuetify: 'Vuetify',
+              pinia: 'Pinia',
+              // Remove globals for bundled packages
+              // '@vue-skuilder/common': 'VueSkuilderCommon',
+              // '@vue-skuilder/common-ui': 'VueSkuilderCommonUI',
+              // '@vue-skuilder/courseware': 'VueSkuilderCourseWare',
+              // '@vue-skuilder/db': 'VueSkuilderDB',
             },
             exports: 'named',
             // Preserve CSS in the output bundle
@@ -421,6 +416,7 @@ node_modules/
 # Production builds
 /dist
 /build
+/dist-lib
 
 # Local env files
 .env

package/dist/studio-ui-src/vite.config.base.js

@@ -1,103 +0,0 @@
-import { resolve } from 'path';
-
-const isDev = process.env.NODE_ENV !== 'production';
-
-console.info(`[VITE] shared config loaded in ${isDev ? 'development' : 'production'} mode`);
-
-/**
- * Creates shared alias mappings for monorepo packages
- * @param {string} rootDir - Path to the monorepo root directory
- * @returns {Object} Alias configuration object
- */
-export function createBaseAliases(rootDir = process.cwd()) {
-  return {
-    // Inter-package aliases using actual package names from imports
-    '@vue-skuilder/db': isDev
-      ? resolve(rootDir, './packages/db/src') // Dev: source directory
-      : resolve(rootDir, './packages/db/dist/index.mjs'), // Prod: ES module build
-    '@vue-skuilder/common': isDev
-      ? resolve(rootDir, './packages/common/src') // Dev: source directory
-      : resolve(rootDir, './packages/common/dist/index.mjs'),
-
-    // specific built-style imports must precede the package alias, otherwise
-    // the package prefixes get aliased out before this alias is applied
-
-    '@vue-skuilder/common-ui/style': resolve(rootDir, './packages/common-ui/dist/assets/index.css'),
-    '@vue-skuilder/courseware/style': resolve(
-      rootDir,
-      './packages/courseware/dist/assets/index.css'
-    ),
-    '@vue-skuilder/edit-ui/style': resolve(rootDir, './packages/edit-ui/dist/assets/index.css'),
-
-    '@vue-skuilder/common-ui': isDev
-      ? resolve(rootDir, './packages/common-ui/src') // Dev: source directory
-      : resolve(rootDir, './packages/common-ui/dist/common-ui.es.js'),
-    '@vue-skuilder/courseware': isDev
-      ? resolve(rootDir, './packages/courseware/src') // Dev: source directory
-      : resolve(rootDir, './packages/courseware/dist/index.mjs'),
-    '@vue-skuilder/edit-ui': isDev
-      ? resolve(rootDir, './packages/edit-ui/src') // Dev: source directory
-      : resolve(rootDir, './packages/edit-ui/dist/edit-ui.es.js'),
-
-    '@vue-skuilder/express': isDev
-      ? resolve(rootDir, './packages/express/src') // Dev: source directory
-      : resolve(rootDir, './packages/express/dist/index.mjs'), // Assuming ESM build, adjust if different
-    '@vue-skuilder/platform-ui': isDev
-      ? resolve(rootDir, './packages/platform-ui/src') // App, resolve to src dir
-      : resolve(rootDir, './packages/platform-ui/dist'), // App, resolve to dist dir
-    '@vue-skuilder/standalone-ui': isDev
-      ? resolve(rootDir, './packages/standalone-ui/src') // App, resolve to src dir
-      : resolve(rootDir, './packages/standalone-ui/dist'), // App, resolve to dist dir
-    '@vue-skuilder/e2e-db': isDev
-      ? resolve(rootDir, './packages/e2e-db/src') // Dev: source directory
-      : resolve(rootDir, './packages/e2e-db/dist/index.js'), // Assuming CJS build for tests
-    '@vue-skuilder/cli': isDev
-      ? resolve(rootDir, './packages/cli/src') // Dev: source directory
-      : resolve(rootDir, './packages/cli/dist/cli.js'), // Assuming CJS build
-    '@vue-skuilder/client': isDev
-      ? resolve(rootDir, './packages/client/src') // Dev: source directory
-      : resolve(rootDir, './packages/client/dist/index.js'), // Assuming CJS build
-
-    // Intra-package aliases for internal imports (matching tsconfig.base.json)
-    // These always point to src directories, as they are used for internal package resolution
-    // or by other packages in dev mode when they override the @vue-skuilder/* alias
-    '@db': resolve(rootDir, './packages/db/src'),
-    '@common': resolve(rootDir, './packages/common/src'),
-    '@cui': resolve(rootDir, './packages/common-ui/src'),
-    '@courseware': resolve(rootDir, './packages/courseware/src'),
-    '@eui': resolve(rootDir, './packages/edit-ui/src'),
-    '@express': resolve(rootDir, './packages/express/src'),
-    '@pui': resolve(rootDir, './packages/platform-ui/src'), // App, resolve to src dir
-    '@sui': resolve(rootDir, './packages/standalone-ui/src'), // App, resolve to src dir
-    '@e2e-db': resolve(rootDir, './packages/e2e-db/src'),
-    '@cli': resolve(rootDir, './packages/cli/src'),
-    '@client': resolve(rootDir, './packages/client/src'),
-  };
-}
-
-/**
- * Creates shared Vite resolve configuration
- * @param {string} rootDir - Path to the monorepo root directory
- * @param {Object} localAliases - Package-specific aliases to merge
- * @returns {Object} Vite resolve configuration
- */
-export function createBaseResolve(rootDir = process.cwd(), localAliases = {}) {
-  return {
-    alias: {
-      ...createBaseAliases(rootDir),
-      ...localAliases,
-    },
-    extensions: ['.js', '.ts', '.json', '.vue'],
-    dedupe: [
-      'vue',
-      'vuetify',
-      'vue-router',
-      'pinia',
-      '@vue-skuilder/db',
-      '@vue-skuilder/common',
-      '@vue-skuilder/common-ui',
-      '@vue-skuilder/courseware',
-      '@vue-skuilder/edit-ui',
-    ],
-  };
-}