crewx 0.9.0-rc.97 → 0.9.0-rc.98

package/dist-server/domain/market/install.service.js

@@ -59,6 +59,7 @@ const crewx_pool_service_js_1 = require("../../modules/crewx-pool.service.js");
 const install_id_validation_js_1 = require("./install-id.validation.js");
 const source_coordinate_js_1 = require("./source-coordinate.js");
 const todo_js_1 = require("../mcp/default-apps/todo.js");
+const mcp_app_assets_js_1 = require("../mcp/mcp-app-assets.js");
 /**
  * PLAN→APPLY sealing window (design §5.7, WI-20260803-007 §2) — a layer
  * separate from `TemplateInstaller.cleanupStale()`'s 24h stale-leftover
@@ -89,7 +90,7 @@ function sealPath(workspaceRoot, installId) {
     return (0, path_1.join)(stagingDirFor(workspaceRoot, installId), '.install-meta.json');
 }
 function publicTodoAssetPath() {
-    return (0, path_1.resolve)(process.env.MCP_APPS_ASSET_DIR ?? (0, path_1.resolve)(process.cwd(), 'examples/mcp-apps/dist'), 'todo/todo.html');
+    return (0, path_1.resolve)((0, mcp_app_assets_js_1.mcpAppAssetDir)(), 'todo/todo.html');
 }
 function sha256File(absPath) {
     return (0, crypto_1.createHash)('sha256').update(new Uint8Array((0, fs_1.readFileSync)(absPath))).digest('hex');

package/dist-server/domain/mcp/mcp-app-assets.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mcpAppAssetDir = mcpAppAssetDir;
+const node_fs_1 = require("node:fs");
+const node_path_1 = require("node:path");
+const MCP_APP_ASSET_SUBDIR = (0, node_path_1.join)('examples', 'mcp-apps', 'dist');
+let crewxPackageRoot;
+// Walk up from __dirname to find root package.json (works in both src/ and dist-server/ layouts)
+function findCrewxPackageRoot() {
+    if (crewxPackageRoot !== undefined)
+        return crewxPackageRoot;
+    let dir = __dirname;
+    while (dir !== (0, node_path_1.dirname)(dir)) {
+        try {
+            const pkg = JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.join)(dir, 'package.json'), 'utf-8'));
+            if (pkg.name === 'crewx')
+                return (crewxPackageRoot = dir);
+        }
+        catch { }
+        dir = (0, node_path_1.dirname)(dir);
+    }
+    return (crewxPackageRoot = null);
+}
+/**
+ * Directory holding the generated MCP App HTML bundles. Anchored to the crewx
+ * package root, not process.cwd() — `npx crewx` runs with the user's directory
+ * as cwd, which never contains the bundles.
+ */
+function mcpAppAssetDir() {
+    return (0, node_path_1.resolve)(process.env.MCP_APPS_ASSET_DIR ?? (0, node_path_1.resolve)(findCrewxPackageRoot() ?? process.cwd(), MCP_APP_ASSET_SUBDIR));
+}

package/dist-server/domain/mcp/mcp-apps.js

@@ -29,6 +29,7 @@ const weather_js_1 = require("./default-apps/weather.js");
 const terminal_js_1 = require("./default-apps/terminal.js");
 const terminal_session_service_js_1 = require("../terminal/terminal-session.service.js");
 const workspace_context_store_js_1 = require("../../common/workspace-context.store.js");
+const mcp_app_assets_js_1 = require("./mcp-app-assets.js");
 exports.MCP_APPS_ENV = 'CREWX_MCP_APPS';
 const PUBLIC_TODO_CONTENT_ID = 'cmtybl8cc0fapgi1wdx61w003';
 const PUBLIC_TODO_ENTRY_HASH = '2c23ec000f7990e3b8ec836db21d80e0cbd9b28fd309066a9065c75c9f527732';
@@ -40,12 +41,9 @@ const MCP_APP_HELLO_ID = 'mcp-app-hello';
 exports.MCP_APP_WORKFLOW_ID = 'mcp-app-workflow-approval';
 exports.MCP_APP_TIC_TAC_TOE_ID = 'mcp-app-tic-tac-toe';
 exports.MCP_APP_TIC_TAC_TOE_CARD_KEY = exports.MCP_APP_TIC_TAC_TOE_ID;
-function mcpAppAssetDir() {
-    return (0, node_path_1.resolve)(process.env.MCP_APPS_ASSET_DIR ?? (0, node_path_1.resolve)(process.cwd(), 'examples/mcp-apps/dist'));
-}
 /** Load the exact generated HTML that the MCP registry advertises and serves. */
 function readMcpAppAsset(relativePath) {
-    const assetPath = (0, node_path_1.resolve)(mcpAppAssetDir(), relativePath);
+    const assetPath = (0, node_path_1.resolve)((0, mcp_app_assets_js_1.mcpAppAssetDir)(), relativePath);
     try {
         const html = (0, node_fs_1.readFileSync)(assetPath, 'utf8');
         if (!/<html(?:\s|>)/i.test(html) || !/<\/html\s*>/i.test(html)) {
@@ -64,7 +62,7 @@ function readMcpAppAsset(relativePath) {
  * present-and-invalid bundle through readMcpAppAsset().
  */
 function readOptionalMcpAppAsset(relativePath) {
-    const assetPath = (0, node_path_1.resolve)(mcpAppAssetDir(), relativePath);
+    const assetPath = (0, node_path_1.resolve)((0, mcp_app_assets_js_1.mcpAppAssetDir)(), relativePath);
     return (0, node_fs_1.existsSync)(assetPath) ? readMcpAppAsset(relativePath) : undefined;
 }
 const HELLO_WORLD_HTML = readMcpAppAsset('hello/hello-world.html');