@swissjs/swite 0.3.1 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.3.2
+
+### Patch Changes
+
+- Generalize resolution system and add internalScopes support
+
+  - Add `findSiblingRepository(startPath, repoName)` — replaces hardcoded swiss-lib discovery with a generic sibling repo finder. `findSwissLibMonorepo` preserved as a backward-compat wrapper.
+  - Add `findPackage` with local-first dev precedence — in development, resolves `@scoped/*` packages from local sibling source trees before falling back to `node_modules`.
+  - `internalScopes` from `swiss.config.ts` now flows through to all handlers at startup — prevents internal-scoped packages from being routed to jsDelivr CDN.
+  - `NodeModuleHandler` rewritten to use `findPackage` — replaces verbose walk-up/swiss-lib fallback chain with unified local-first resolver. Adds dist→src redirect for local sibling packages.
+  - CDN blacklist: packages matching `internalScopes` are blocked from jsDelivr fallback with a clear error log.
+  - Fix `cli.ts` builder import path (`./build-engine/builder.js`).
+  - Fix `url-resolver.ts` dynamic import path for `file-path-resolver`.
+  - Update peer deps: `@swissjs/core` → `0.1.8`, `@swissjs/compiler` → `0.1.5`.
+
 ## 0.2.31
 
 ### Patch Changes

package/dist/config/config.d.ts

@@ -20,6 +20,17 @@ export interface ServerConfig {
 export interface SwiteUserConfig {
     server?: ServerConfig;
     services?: ServicesConfig;
+    /**
+     * Package scopes that should be treated as "internal" or "private".
+     * These scopes prioritize local/monorepo resolution and are forbidden from CDN redirects.
+     * e.g. ["@kibologic", "@alpine"]
+     */
+    internalScopes?: string[];
+    /**
+     * Manual override for sibling repository lookup.
+     * Swite will search these directories for local package source code.
+     */
+    siblingRepositories?: string[];
 }
 /**
  * Define swite configuration with full TypeScript validation.

package/dist/config/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,CAErE"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAClC,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,SAAS,EAAE,OAAO,CAAC;IACnB,6DAA6D;IAC7D,WAAW,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,CAAC,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,CAErE"}

package/dist/dev-engine/handlers/base-handler.d.ts

@@ -1,10 +1,12 @@
 import type { Response } from "express";
 import { ModuleResolver } from "../../resolution/resolver.js";
+import type { SwiteUserConfig } from "../../config/config.js";
 export interface HandlerContext {
     resolver: ModuleResolver;
     root: string;
     workspaceRoot: string | null;
-    env: Record<string, string>;
+    env?: Record<string, string>;
+    userConfig?: SwiteUserConfig;
 }
 /**
  * Set cache-busting headers for development

package/dist/dev-engine/handlers/base-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/base-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG9D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC7B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAMjD;AAED;;GAEG;AACH,qBAAa,WAAW;IACV,SAAS,CAAC,OAAO,EAAE,cAAc;gBAAvB,OAAO,EAAE,cAAc;cAE7B,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAI7C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAS9C,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmBrE"}
+{"version":3,"file":"base-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/base-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE9D,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,cAAc,CAAC;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,UAAU,CAAC,EAAE,eAAe,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,GAAG,IAAI,CAMjD;AAED;;GAEG;AACH,qBAAa,WAAW;IACV,SAAS,CAAC,OAAO,EAAE,cAAc;gBAAvB,OAAO,EAAE,cAAc;cAE7B,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAI7C,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;cAS9C,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAmBrE"}

package/dist/dev-engine/handlers/base-handler.js

@@ -24,7 +24,7 @@ export class BaseHandler {
         this.context = context;
     }
     async resolveFilePath(url) {
-        return resolveFilePath(url, this.context.root, this.context.workspaceRoot);
+        return resolveFilePath(url, this.context.root, this.context.workspaceRoot, this.context.userConfig);
     }
     async fileExists(filePath) {
         try {

package/dist/dev-engine/handlers/node-module-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node-module-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/node-module-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKxC,OAAO,EAAE,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAOrE,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,cAAc;IAO7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqRvD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CA0BjC"}
+{"version":3,"file":"node-module-handler.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/handlers/node-module-handler.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAKxC,OAAO,EAAE,WAAW,EAAE,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAQrE,qBAAa,iBAAkB,SAAQ,WAAW;IAChD,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,SAAS,CAAY;gBAEjB,OAAO,EAAE,cAAc;IAO7B,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAgPvD;;;;OAIG;IACH,OAAO,CAAC,wBAAwB;CAmCjC"}

package/dist/dev-engine/handlers/node-module-handler.js

@@ -12,6 +12,7 @@ import { UIHandler } from "./ui-handler.js";
 import { UIXHandler } from "./uix-handler.js";
 import { TSHandler } from "./ts-handler.js";
 import { findWorkspaceRoot } from "../../kernel/workspace.js";
+import { findPackage } from "../../kernel/package-finder.js";
 import { shouldUseCdnFallback } from "../../resolution/cdn/cdn-fallback.js";
 export class NodeModuleHandler extends BaseHandler {
     constructor(context) {
@@ -64,52 +65,33 @@ export class NodeModuleHandler extends BaseHandler {
                     current = parent;
                 }
             }
+            // CONSOLIDATED DISCOVERY: Use the Generalized Package Finder
+            // This follows our "Local-First" priority: Siblings > Local node_modules > Workspace node_modules
             if (!filePath) {
-                // Try workspace root node_modules
-                if (workspaceRoot) {
-                    const workspaceNodeModulesPath = path.join(workspaceRoot, urlPath);
-                    console.log(chalk.blue(`[node_modules] Trying workspace path: ${workspaceNodeModulesPath}`));
-                    try {
-                        // Try to resolve symlinks first (realpath works even if path is a symlink)
-                        const resolvedPath = await fs.realpath(workspaceNodeModulesPath);
-                        console.log(chalk.blue(`[node_modules] Resolved to: ${resolvedPath}`));
-                        // Verify the resolved path exists
-                        await fs.access(resolvedPath);
-                        filePath = resolvedPath;
-                        console.log(chalk.green(`[node_modules] ✓ Found in workspace: ${urlPath}`));
-                    }
-                    catch (err2) {
-                        console.log(chalk.yellow(`[node_modules] Workspace path failed: ${err2 instanceof Error ? err2.message : String(err2)}`));
-                        // Try swiss-lib monorepo node_modules (dynamically found)
-                        const { findSwissLibMonorepo } = await import("../../kernel/package-finder.js");
-                        const swissLib = await findSwissLibMonorepo(this.context.root);
-                        if (swissLib) {
-                            const swissNodeModulesPath = path.join(swissLib, urlPath);
-                            console.log(chalk.blue(`[node_modules] Trying swiss-lib path: ${swissNodeModulesPath}`));
-                            try {
-                                // Try to resolve symlinks first (realpath works even if path is a symlink)
-                                const resolvedPath = await fs.realpath(swissNodeModulesPath);
-                                console.log(chalk.blue(`[node_modules] Resolved to: ${resolvedPath}`));
-                                // Verify the resolved path exists
-                                await fs.access(resolvedPath);
-                                filePath = resolvedPath;
-                                console.log(chalk.green(`[node_modules] ✓ Found in swiss-lib monorepo: ${urlPath}`));
-                            }
-                            catch (err3) {
-                                console.log(chalk.yellow(`[node_modules] swiss-lib path failed: ${err3 instanceof Error ? err3.message : String(err3)}`));
-                                // File not found in any location, will trigger case-insensitive search below
-                                filePath = path.join(this.context.root, urlPath);
+                const urlParts = urlPath.split("/");
+                const packageName = urlParts[1].startsWith("@") ? `${urlParts[1]}/${urlParts[2]}` : urlParts[1];
+                const remainingPath = urlParts[1].startsWith("@") ? urlParts.slice(3).join("/") : urlParts.slice(2).join("/");
+                const location = await findPackage(packageName, this.context.root, workspaceRoot);
+                if (location) {
+                    filePath = path.join(location.path, remainingPath);
+                    console.log(chalk.green(`[node_modules] ✓ Found ${packageName} via ${location.type}: ${filePath}`));
+                    // Re-use dist -> src fallback for local siblings
+                    if (location.type !== 'node_modules' && filePath.includes("/dist/")) {
+                        const srcPath = filePath.replace("/dist/", "/src/").replace(/\.[mc]?js$/, ".ts");
+                        try {
+                            await fs.access(srcPath);
+                            console.log(chalk.yellow(`[node_modules] Intercept: Serving local source instead of dist: ${srcPath}`));
+                            filePath = srcPath;
+                            if (srcPath.endsWith(".ts")) {
+                                return await this.tsHandler.handle(url.replace(/\.[mc]?js$/, ".ts"), res);
                             }
                         }
-                        else {
-                            // File not found in any location, will trigger case-insensitive search below
-                            filePath = path.join(this.context.root, urlPath);
-                        }
+                        catch { /* Fallback to original filePath */ }
                     }
                 }
-                else {
-                    filePath = path.join(this.context.root, urlPath);
-                }
+            }
+            if (!filePath) {
+                filePath = path.join(this.context.root, urlPath);
             }
             console.log(chalk.gray(`[node_modules] Resolving: ${url} -> ${filePath}`));
             // File path is already resolved from above, no need to resolve again
@@ -259,6 +241,13 @@ export class NodeModuleHandler extends BaseHandler {
         }
         if (!pkgName || pkgName === "." || pkgName === "..")
             return null;
+        // Never redirect internal/private scoped packages to public CDNs
+        const internalScopes = this.context.userConfig?.internalScopes || [];
+        const isInternal = internalScopes.some(scope => pkgName === scope || pkgName.startsWith(scope + "/"));
+        if (isInternal) {
+            console.log(chalk.red(`[node_modules] CDN Blocked: Internal scope package ${pkgName} cannot be served from jsDelivr.`));
+            return null;
+        }
         if (!shouldUseCdnFallback(pkgName))
             return null;
         // jsDelivr +esm serves ESM build; works for reflect-metadata and most npm packages

package/dist/dev-engine/middleware/middleware-setup.d.ts

@@ -10,6 +10,7 @@ export interface MiddlewareConfig {
     publicDir: string;
     resolver: ModuleResolver;
     hmr: HMREngine;
+    userConfig?: import("../../config/config.js").SwiteUserConfig;
 }
 export interface MiddlewareResult {
     routes: RouteDefinition[];

package/dist/dev-engine/middleware/middleware-setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-setup.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/middleware/middleware-setup.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAa9D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAK1C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC;CACpE;AAuBD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CA2Q3B"}
+{"version":3,"file":"middleware-setup.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/middleware/middleware-setup.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAmC,MAAM,SAAS,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAIpE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAa9D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAK1C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,cAAc,CAAC;IACzB,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,CAAC,EAAE,OAAO,wBAAwB,EAAE,eAAe,CAAC;CAC/D;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,EAAE,CAAC;IAC1B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC;CACpE;AAuBD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CA2Q3B"}

package/dist/dev-engine/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/dev-engine/server.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IAKb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,YAAY,CACb;IACP,OAAO,CAAC,MAAM,CAAyB;gBAE3B,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM;YAe/B,iBAAiB;IAuBzB,KAAK;CAsEZ"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/dev-engine/server.ts"],"names":[],"mappings":"AAoBA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IAKb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,GAAG,CAAa;IACxB,OAAO,CAAC,QAAQ,CAAiB;IACjC,OAAO,CAAC,GAAG,CAAY;IACvB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,YAAY,CAA6B;IACjD,OAAO,CAAC,YAAY,CACb;IACP,OAAO,CAAC,MAAM,CAAyB;gBAE3B,MAAM,GAAE,OAAO,CAAC,WAAW,CAAM;YAe/B,iBAAiB;IAuBzB,KAAK;CA0EZ"}

package/dist/dev-engine/server.js

@@ -14,6 +14,7 @@ import chalk from "chalk";
 import { setupMiddleware } from "./middleware/middleware-setup.js";
 import { buildSymlinkRegistry } from "../resolution/symlink-registry.js";
 import { findSwissLibMonorepo } from "../kernel/package-finder.js";
+import { loadUserConfig } from "../config/config-loader.js";
 export class SwiteServer {
     constructor(config = {}) {
         this.app = express();
@@ -86,6 +87,8 @@ export class SwiteServer {
             console.warn(`[SWITE] Symlink registry build failed: ${err.message}`);
         }
         console.timeEnd("Symlink Registry");
+        // Load user config (swiss.config.ts) so internalScopes etc. flow into handlers
+        const userConfig = await loadUserConfig(this.config.root);
         // Setup middleware
         console.time("Middleware Setup");
         const workspaceRoot = await this.findWorkspaceRoot(this.config.root);
@@ -95,6 +98,7 @@ export class SwiteServer {
             publicDir: this.config.publicDir,
             resolver: this.resolver,
             hmr: this.hmr,
+            userConfig,
         });
         this.routes = middlewareResult.routes;
         this.routeScanner = middlewareResult.routeScanner;

package/dist/kernel/package-finder.d.ts

@@ -7,16 +7,16 @@ export interface PackageLocation {
     type: 'swiss-lib' | 'workspace' | 'node_modules';
 }
 /**
- * Find a co-located framework monorepo by scanning sibling directories at each
- * ancestor level for any workspace root (pnpm-workspace.yaml) that also has a
- * packages/ directory. Works for any framework directory name.
+ * Find any sibling monorepo by searching for its package.json
+ */
+export declare function findSiblingRepository(startPath: string, repoName: string): Promise<string | null>;
+/**
+ * Backward compatibility wrapper for finding swiss-lib
  */
 export declare function findSwissLibMonorepo(startPath: string): Promise<string | null>;
 /**
- * Find a specific package by name, searching in:
- * 1. node_modules (local and workspace)
- * 2. swiss-lib/packages (if found)
- * 3. workspace packages (lib/, packages/, modules/)
+ * Find a specific package by name, with priority given based on environment.
+ * In development, we prioritize local sibling source code.
  */
 export declare function findPackage(packageName: string, startPath: string, workspaceRoot?: string | null): Promise<PackageLocation | null>;
 /**

package/dist/kernel/package-finder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-finder.d.ts","sourceRoot":"","sources":["../../src/kernel/package-finder.ts"],"names":[],"mappings":"AASA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,cAAc,CAAC;CAClD;AAED;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CA+BpF;AAED;;;;;GAKG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAoDjC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA2B7E"}
+{"version":3,"file":"package-finder.d.ts","sourceRoot":"","sources":["../../src/kernel/package-finder.ts"],"names":[],"mappings":"AASA;;;GAGG;AAEH,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,WAAW,GAAG,WAAW,GAAG,cAAc,CAAC;CAClD;AAED;;GAEG;AACH,wBAAsB,qBAAqB,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyBvG;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEpF;AAED;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,MAAM,EACjB,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,GAC5B,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAuEjC;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CA2B7E"}

package/dist/kernel/package-finder.js

@@ -6,48 +6,47 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 /**
- * Find a co-located framework monorepo by scanning sibling directories at each
- * ancestor level for any workspace root (pnpm-workspace.yaml) that also has a
- * packages/ directory. Works for any framework directory name.
+ * Find any sibling monorepo by searching for its package.json
  */
-export async function findSwissLibMonorepo(startPath) {
-    let current = path.resolve(startPath);
+export async function findSiblingRepository(startPath, repoName) {
+    let current = startPath;
     for (let i = 0; i < 20; i++) {
-        const parent = path.dirname(current);
-        if (parent === current)
-            break;
-        // Scan siblings of `current` at this parent level
+        const siblingPath = path.join(current, repoName);
+        const pkgJson = path.join(siblingPath, "package.json");
+        if (await fileExists(pkgJson)) {
+            return siblingPath;
+        }
         try {
-            const entries = await fs.readdir(parent, { withFileTypes: true });
+            const entries = await fs.readdir(current, { withFileTypes: true });
             for (const entry of entries) {
-                if (entry.name === "node_modules")
-                    continue;
-                if (!entry.isDirectory() && !entry.isSymbolicLink())
-                    continue;
-                const sibling = path.join(parent, entry.name);
-                if (path.resolve(sibling) === path.resolve(current))
-                    continue; // skip self
-                if (await fileExists(path.join(sibling, "pnpm-workspace.yaml")) &&
-                    await fileExists(path.join(sibling, "packages"))) {
-                    return sibling;
+                if (entry.name === repoName && (entry.isDirectory() || entry.isSymbolicLink())) {
+                    const subDir = path.join(current, entry.name);
+                    if (await fileExists(path.join(subDir, "package.json"))) {
+                        return subDir;
+                    }
                 }
             }
         }
-        catch {
-            // Skip on permission errors
-        }
-        current = parent;
+        catch { /* Continue */ }
+        current = path.dirname(current);
+        if (current === path.dirname(current))
+            break;
     }
     return null;
 }
 /**
- * Find a specific package by name, searching in:
- * 1. node_modules (local and workspace)
- * 2. swiss-lib/packages (if found)
- * 3. workspace packages (lib/, packages/, modules/)
+ * Backward compatibility wrapper for finding swiss-lib
+ */
+export async function findSwissLibMonorepo(startPath) {
+    return findSiblingRepository(startPath, 'swiss-lib');
+}
+/**
+ * Find a specific package by name, with priority given based on environment.
+ * In development, we prioritize local sibling source code.
  */
 export async function findPackage(packageName, startPath, workspaceRoot) {
-    // 1. Check local node_modules
+    const isDev = process.env.NODE_ENV !== 'production';
+    // 1. Check local node_modules (Standard resolution) - HIGHEST PRIORITY in Remote-First
     const localNodeModules = path.join(startPath, "node_modules", packageName);
     if (await fileExists(path.join(localNodeModules, "package.json"))) {
         return { path: localNodeModules, type: 'node_modules' };
@@ -70,23 +69,40 @@ export async function findPackage(packageName, startPath, workspaceRoot) {
             }
         }
     }
-    // 4. Check workspace packages (lib/, packages/, modules/)
+    // 4. In dev: broader sibling scan across parent directories
+    if (isDev && packageName.includes("/")) {
+        const parts = packageName.split("/");
+        const unscoped = parts[parts.length - 1];
+        const parentDirs = [
+            path.join(startPath, ".."),
+            path.join(startPath, "../.."),
+            path.join(startPath, "../../.."),
+        ];
+        for (const parent of parentDirs) {
+            try {
+                const potentialRepos = await fs.readdir(parent);
+                for (const repo of potentialRepos) {
+                    const siblingPath = path.join(parent, repo);
+                    const packagePath = path.join(siblingPath, "packages", unscoped);
+                    if (await fileExists(path.join(packagePath, "package.json"))) {
+                        console.log(`[package-finder] Dev Intercept: Serving ${packageName} from local source: ${packagePath}`);
+                        return { path: packagePath, type: 'swiss-lib' };
+                    }
+                }
+            }
+            catch { /* Continue */ }
+        }
+    }
+    // 5. Fallback search in internal workspace packages (lib/, packages/, modules/)
     if (workspaceRoot) {
         const packageDirs = ["lib", "packages", "modules", "libraries", "apps"];
         for (const dir of packageDirs) {
             const searchDir = path.join(workspaceRoot, dir);
             if (!(await fileExists(searchDir)))
                 continue;
-            // Try scoped package name
-            if (packageName.startsWith("@")) {
-                const unscoped = packageName.split("/")[1];
-                const packagePath = path.join(searchDir, unscoped);
-                if (await fileExists(path.join(packagePath, "package.json"))) {
-                    return { path: packagePath, type: 'workspace' };
-                }
-            }
-            // Try full package name
-            const packagePath = path.join(searchDir, packageName);
+            const parts = packageName.split("/");
+            const unscoped = parts.length > 1 ? parts[1] : parts[0];
+            const packagePath = path.join(searchDir, unscoped);
             if (await fileExists(path.join(packagePath, "package.json"))) {
                 return { path: packagePath, type: 'workspace' };
             }

package/dist/resolution/bare-import-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bare-import-resolver.d.ts","sourceRoot":"","sources":["../../src/resolution/bare-import-resolver.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,kBAAkB,EAAmC,MAAM,mBAAmB,CAAC;AAI7F,MAAM,WAAW,yBAA0B,SAAQ,kBAAkB;IACnE,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACtE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,MAAM,CAAC,CAkNjB"}
+{"version":3,"file":"bare-import-resolver.d.ts","sourceRoot":"","sources":["../../src/resolution/bare-import-resolver.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,kBAAkB,EAAmC,MAAM,mBAAmB,CAAC;AAI7F,MAAM,WAAW,yBAA0B,SAAQ,kBAAkB;IACnE,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACtE;AAED;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,yBAAyB,GACjC,OAAO,CAAC,MAAM,CAAC,CA4NjB"}

package/dist/resolution/bare-import-resolver.js

@@ -32,7 +32,7 @@ export async function resolveBareImport(specifier, context) {
         if (workspaceRoot) {
             nodeModulesLocations.push(path.join(workspaceRoot, "node_modules"));
         }
-        // Add swiss-lib monorepo node_modules
+        // Add monorepo node_modules if present
         const swissLib = await findSwissLibMonorepo(context.root);
         if (swissLib) {
             const swissNodeModules = path.join(swissLib, "node_modules");
@@ -159,9 +159,18 @@ export async function resolveBareImport(specifier, context) {
             entryPoint = pkgJson.module || pkgJson.main || "index.js";
         }
         const fullPath = path.join(pkgDir, entryPoint);
-        // Try the exact path first
-        if (await context.fileExists(fullPath)) {
-            return await toUrl(fullPath, context);
+        // Try a few Swiss-specific variations of the entry point before CDN fallback
+        const swissVariations = [
+            fullPath,
+            fullPath.replace(/\.(js|mjs|ts)$/, '.ui'),
+            fullPath.replace(/\.(js|mjs|ts)$/, '.uix'),
+            path.join(pkgDir, 'src/index.ui'),
+            path.join(pkgDir, 'src/index.uix'),
+        ];
+        for (const v of swissVariations) {
+            if (await context.fileExists(v)) {
+                return await toUrl(v, context);
+            }
         }
         // Try with extensions
         for (const ext of [".js", ".mjs", ".ts", ".ui", ".uix"]) {

package/dist/resolution/path/file-path-resolver.d.ts

@@ -1,9 +1,10 @@
 export interface PathResolverContext {
     root: string;
     workspaceRoot: string | null;
+    userConfig?: any;
 }
 /**
  * Resolve file path from URL, handling SWISS packages, workspace packages, and app files
  */
-export declare function resolveFilePath(url: string, root: string, workspaceRoot?: string | null): Promise<string>;
+export declare function resolveFilePath(url: string, root: string, workspaceRoot?: string | null, userConfig?: any): Promise<string>;
 //# sourceMappingURL=file-path-resolver.d.ts.map

package/dist/resolution/path/file-path-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file-path-resolver.d.ts","sourceRoot":"","sources":["../../../src/resolution/path/file-path-resolver.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,MAAM,CAAC,CAsKjB"}
+{"version":3,"file":"file-path-resolver.d.ts","sourceRoot":"","sources":["../../../src/resolution/path/file-path-resolver.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED;;GAEG;AACH,wBAAsB,eAAe,CACnC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,aAAa,GAAE,MAAM,GAAG,IAAW,EACnC,UAAU,CAAC,EAAE,GAAG,GACf,OAAO,CAAC,MAAM,CAAC,CAsMjB"}

package/dist/resolution/path/file-path-resolver.js

@@ -6,16 +6,48 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import { findWorkspaceRoot } from "../../kernel/workspace.js";
-import { findSwissLibMonorepo } from "../../kernel/package-finder.js";
+import { findSwissLibMonorepo, findPackage } from "../../kernel/package-finder.js";
 /**
  * Resolve file path from URL, handling SWISS packages, workspace packages, and app files
  */
-export async function resolveFilePath(url, root, workspaceRoot = null) {
+export async function resolveFilePath(url, root, workspaceRoot = null, userConfig) {
+    // Consolidate workspace root discovery for consistency across resolution blocks
+    const wsRoot = workspaceRoot || (await findWorkspaceRoot(root));
     // /node_modules/ URLs: walk up from app root until we find the package.
     // pnpm may place deps at the app root, one level up (workspace pkg), or at
     // the monorepo root depending on hoisting config and pnpm version.
     if (url.startsWith("/node_modules/")) {
         const urlPath = url.startsWith("/") ? url.slice(1) : url;
+        const parts = urlPath.split("/");
+        // Handle @scoped/package or standard-package
+        const packageName = parts[1].startsWith("@") ? `${parts[1]}/${parts[2]}` : parts[1];
+        // NEW: PNPM-aware Interceptor. Check if this request is for an "internal" scope package.
+        // In development, we always prioritize local siblings if they exist.
+        const internalScopes = userConfig?.internalScopes || [];
+        const match = internalScopes.length > 0
+            ? url.match(new RegExp(`(${internalScopes.join("|")})\/([^/]+)`))
+            : null;
+        if (process.env.NODE_ENV !== 'production' && match) {
+            const packageName = match[0];
+            const remainingPath = url.split(match[0])[1];
+            const localLoc = await findPackage(packageName, root, wsRoot);
+            if (localLoc && localLoc.type !== 'node_modules') {
+                // Found local source! Redirect the base path
+                const fullPath = path.join(localLoc.path, remainingPath);
+                // Re-use workspace fallback logic for dist -> src transition
+                if (fullPath.includes("/dist/")) {
+                    const srcPath = fullPath.replace("/dist/", "/src/").replace(/\.[mc]?js$/, ".ts");
+                    try {
+                        await fs.access(srcPath);
+                        console.log(`[file-path-resolver] Intercept: ${packageName} redirecting to local src: ${srcPath}`);
+                        return srcPath;
+                    }
+                    catch { /* Fallback to dist if src not found */ }
+                }
+                console.log(`[file-path-resolver] Intercept: ${packageName} redirecting to local source: ${fullPath}`);
+                return fullPath;
+            }
+        }
         // Walk up the directory tree from root, trying node_modules at each level
         let current = path.resolve(root);
         const visited = new Set();
@@ -38,7 +70,6 @@ export async function resolveFilePath(url, root, workspaceRoot = null) {
             current = parent;
         }
         // Explicit workspace root (covers hoisted-to-root installs)
-        const wsRoot = workspaceRoot || (await findWorkspaceRoot(root));
         if (wsRoot) {
             const wsPath = path.join(wsRoot, urlPath);
             if (!visited.has(wsPath)) {
@@ -78,13 +109,10 @@ export async function resolveFilePath(url, root, workspaceRoot = null) {
         url.startsWith("/libraries/") ||
         url.startsWith("/packages/") ||
         url.startsWith("/modules/")) {
-        let wsRoot = workspaceRoot;
-        if (!wsRoot) {
-            wsRoot = await findWorkspaceRoot(root);
-            console.log(`[file-path-resolver] Detected workspace root: ${wsRoot} (from app root: ${root})`);
-        }
+        // Already detected wsRoot at function start
         // Normalize URL: path.join with leading slash is wrong on Windows (treats as drive root)
         const urlPath = url.startsWith("/") ? url.slice(1) : url;
+        // ...
         // CRITICAL: For /lib/ paths, we MUST find the SWS root (which has lib/ directory)
         // Start from app root and walk up until we find a directory with both pnpm-workspace.yaml AND lib/
         if (url.startsWith("/lib/")) {
@@ -141,7 +169,6 @@ export async function resolveFilePath(url, root, workspaceRoot = null) {
         }
     }
     // For app files, check if URL already includes the app path
-    const wsRoot = workspaceRoot || (await findWorkspaceRoot(root));
     if (wsRoot) {
         const appRelativeToWorkspace = path
             .relative(wsRoot, root)

package/docs/architecture/build-pipeline.md

@@ -0,0 +1,97 @@
+<!--
+Copyright (c) 2024 Themba Mzumara
+SWITE - SWISS Development Server
+Licensed under the MIT License.
+-->
+
+# Build Pipeline
+
+`SwiteBuilder` (`src/build-engine/builder.ts`) handles production builds. It is invoked by `swite build` with a fixed entry point of `src/index.ui` and output directory of `dist/`.
+
+---
+
+## Overview
+
+The build runs three sequential phases inside a try/finally block. The temporary directory `.swite-build/` is always removed when the build finishes, whether it succeeded or failed.
+
+```
+swite build
+  └── SwiteBuilder.build()
+        ├── 1. cleanOutputDir()       — rm -rf dist/, mkdir dist/
+        ├── 2. compileSwissFiles()    — @swissjs/compiler → .tsx in .swite-build/
+        ├── 3. bundle()               — esbuild bundles from .swite-build/
+        └── 4. copyPublicAssets()     — cp -r public/ dist/
+```
+
+---
+
+## Phase 1: Compile Swiss files
+
+`compileSwissFiles` traverses `src/` and every workspace dependency's `src/` directory.
+
+For each `.ui` or `.uix` file:
+
+1. `UiCompiler.compileAsync(source, filePath)` — transforms SwissJS component syntax to TypeScript/JSX.
+2. Relative `.ui`/`.uix` imports in the compiled output are rewritten to `.tsx` (esbuild needs `.tsx` for JSX, not `.ui`).
+3. If the compiled output ends with `export { Foo }`, a `export default Foo` line is appended so default imports resolve at bundle time.
+4. Written to `.swite-build/<relative-path>.tsx`.
+
+For each `.ts` file, `.ui`/`.uix` imports in `from` clauses are rewritten to `.tsx`, then the file is copied as-is.
+
+CSS files are copied verbatim so that any CSS import stubs in the bundle phase can resolve.
+
+---
+
+## Phase 2: Bundle with esbuild
+
+esbuild is invoked with:
+
+```typescript
+{
+  bundle: true,
+  format: 'esm',
+  target: 'es2020',
+  minify: true,
+  sourcemap: false,
+  splitting: true,   // ESM code splitting
+  metafile: true,
+  platform: 'node',
+}
+```
+
+Three plugins are registered (see [CLI / build](../cli/build.md) for descriptions). Node built-in modules are marked external. The `absWorkingDir` is set to the workspace root (or app root if no workspace is detected) so esbuild resolves node_modules correctly.
+
+---
+
+## Phase 3: Copy public assets
+
+`public/` is copied recursively to `dist/`. If `public/` does not exist, this phase is skipped silently.
+
+---
+
+## Workspace dependency discovery
+
+`discoverWorkspaceDependencies()` reads the app's `package.json` and collects all `workspace:*` entries from `dependencies`, `devDependencies`, and `peerDependencies`. It also scans source files for `@scope/pkg` import patterns to catch transitive workspace imports not listed in `package.json`.
+
+For each candidate package name, it searches these directories under the workspace root:
+
+```
+lib/<pkgName>
+packages/<pkgName>
+packages/runtime/<pkgName>
+packages/plugins/<pkgName>
+packages/domain/<pkgName>
+```
+
+A match requires the directory to have a `package.json` whose `name` field matches the expected package name, and a `src/` subdirectory.
+
+---
+
+## Workspace resolver plugin
+
+The `workspace-resolver` esbuild plugin handles `@scope/pkg` imports during bundling. It maps each import to the compiled `.tsx` files in `.swite-build/` by:
+
+1. Finding the matching workspace dependency from the discovery step.
+2. Reading the package's `package.json` exports field to resolve the subpath.
+3. Converting the export path from `./src/Foo.uix` to `.swite-build/<depRelPath>/src/Foo.tsx`.
+4. Falling back to `src/index.js` if exports resolution fails.