@swissjs/swite 0.3.0 → 0.3.1

package/dist/{middleware → dev-engine/middleware}/static-files.js

@@ -7,7 +7,7 @@ import express from "express";
 import { promises as fs, realpathSync, existsSync } from "node:fs";
 import path from "node:path";
 import chalk from "chalk";
-import { findWorkspaceRoot } from "../utils/workspace.js";
+import { findWorkspaceRoot } from "../../kernel/workspace.js";
 /**
  * Setup static file serving for public directory, node_modules, and workspace packages
  */
@@ -86,7 +86,7 @@ export async function setupStaticFiles(app, config) {
                     return next();
                 }
                 // Strip leading slash: req.path inside app.use('/node_modules') is already
-                // relative to that prefix, e.g. '/@kibologic/shell/design-tokens/primitive.css'
+                // relative to that prefix, e.g. '/@swissjs/shell/design-tokens/primitive.css'
                 const relPath = req.path.replace(/^\/+/, "");
                 if (!relPath)
                     return next();

package/dist/{dev → dev-engine}/pythonDevManager.d.ts

@@ -1,4 +1,4 @@
-import type { PythonServiceConfig } from "../config.js";
+import type { PythonServiceConfig } from "../config/config.js";
 /**
  * Spawn the Python service and wait until its health endpoint responds 200.
  * Streams stdout/stderr line-buffered, prefixed with [python].

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

@@ -0,0 +1 @@
+{"version":3,"file":"pythonDevManager.d.ts","sourceRoot":"","sources":["../../src/dev-engine/pythonDevManager.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAQ/D;;;;GAIG;AACH,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,mBAAmB,EAC3B,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC,CAuCf;AAED;;GAEG;AACH,wBAAgB,oBAAoB,IAAI,IAAI,CAM3C"}

package/dist/{dev → dev-engine}/pythonDevManager.js

@@ -1,7 +1,7 @@
 import { spawn } from "node:child_process";
 import { resolve } from "node:path";
 import chalk from "chalk";
-import { initPythonProxy } from "../proxy/proxyToPython.js";
+import { initPythonProxy } from "../adapters/proxy/proxyToPython.js";
 const POLL_INTERVAL_MS = 500;
 const HEALTH_TIMEOUT_MS = 15000;
 const BACKOFF_THRESHOLD = 5;

package/dist/{router → dev-engine/router}/file-router.d.ts

@@ -1,7 +1,7 @@
-import type { RouteDefinition } from "@kibologic/core";
-import { RouteScanner } from "@kibologic/plugin-file-router/core";
-import { createFileWatcher } from "@kibologic/plugin-file-router/dev";
-import { HMREngine } from "../hmr.js";
+import type { RouteDefinition } from "@swissjs/core";
+import { RouteScanner } from "@swissjs/plugin-file-router/core";
+import { createFileWatcher } from "@swissjs/plugin-file-router/dev";
+import { HMREngine } from "../hmr/hmr.js";
 export interface FileRouterConfig {
     root: string;
     hmr: HMREngine;

package/dist/dev-engine/router/file-router.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"file-router.d.ts","sourceRoot":"","sources":["../../../src/dev-engine/router/file-router.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,SAAS,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,YAAY,EAAE,YAAY,GAAG,IAAI,CAAC;IAClC,YAAY,EAAE,OAAO,CAAC,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC,GAAG,IAAI,CAAC;IACnE,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AAED;;;GAGG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,gBAAgB,GACvB,OAAO,CAAC,gBAAgB,CAAC,CAmI3B"}

package/dist/{router → dev-engine/router}/file-router.js

@@ -6,10 +6,10 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 import chalk from "chalk";
-import { RouteScanner } from "@kibologic/plugin-file-router/core";
-import { createFileWatcher } from "@kibologic/plugin-file-router/dev";
-import { HMREngine } from "../hmr.js";
-import { findWorkspaceRoot } from "../utils/workspace.js";
+import { RouteScanner } from "@swissjs/plugin-file-router/core";
+import { createFileWatcher } from "@swissjs/plugin-file-router/dev";
+import { HMREngine } from "../hmr/hmr.js";
+import { findWorkspaceRoot } from "../../kernel/workspace.js";
 /**
  * Setup file-based routing
  * Scans for route files in pages/ directories and watches for changes

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

@@ -0,0 +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"}

package/dist/{server.js → dev-engine/server.js}

@@ -3,17 +3,17 @@
  * SWITE - SWISS Development Server
  * Licensed under the MIT License.
  */
-import { RouteScanner } from "@kibologic/plugin-file-router/core";
-import { createFileWatcher } from "@kibologic/plugin-file-router/dev";
+import { RouteScanner } from "@swissjs/plugin-file-router/core";
+import { createFileWatcher } from "@swissjs/plugin-file-router/dev";
 import express from "express";
 import path from "node:path";
 import { promises as fs } from "node:fs";
-import { ModuleResolver } from "./resolver.js";
-import { HMREngine } from "./hmr.js";
+import { ModuleResolver } from "../resolution/resolver.js";
+import { HMREngine } from "./hmr/hmr.js";
 import chalk from "chalk";
 import { setupMiddleware } from "./middleware/middleware-setup.js";
-import { buildSymlinkRegistry } from "./resolver/symlink-registry.js";
-import { findSwissLibMonorepo } from "./utils/package-finder.js";
+import { buildSymlinkRegistry } from "../resolution/symlink-registry.js";
+import { findSwissLibMonorepo } from "../kernel/package-finder.js";
 export class SwiteServer {
     constructor(config = {}) {
         this.app = express();

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-export { SwiteServer } from "./server.js";
-export type { SwiteConfig } from "./server.js";
-export { SwiteBuilder, build } from "./builder.js";
-export type { BuildConfig } from "./builder.js";
-export { ModuleResolver } from "./resolver.js";
-export { HMREngine } from "./hmr.js";
-export { defineConfig } from "./config.js";
-export type { SwiteUserConfig, ServerConfig, ServicesConfig, PythonServiceConfig, } from "./config.js";
-export { proxyToPython, initPythonProxy, setProductionMode } from "./proxy/proxyToPython.js";
-export type { ProxyOptions } from "./proxy/proxyToPython.js";
-export { SwiteProxyError } from "./proxy/SwiteProxyError.js";
-export { loadUserConfig } from "./config-loader.js";
-export { startPythonDevService, stopPythonDevService, } from "./dev/pythonDevManager.js";
+export { SwiteServer } from "./dev-engine/server.js";
+export type { SwiteConfig } from "./dev-engine/server.js";
+export { SwiteBuilder, build } from "./build-engine/builder.js";
+export type { BuildConfig } from "./build-engine/builder.js";
+export { ModuleResolver } from "./resolution/resolver.js";
+export { HMREngine } from "./dev-engine/hmr/hmr.js";
+export { defineConfig } from "./config/config.js";
+export type { SwiteUserConfig, ServerConfig, ServicesConfig, PythonServiceConfig, } from "./config/config.js";
+export { proxyToPython, initPythonProxy, setProductionMode } from "./adapters/proxy/proxyToPython.js";
+export type { ProxyOptions } from "./adapters/proxy/proxyToPython.js";
+export { SwiteProxyError } from "./adapters/proxy/SwiteProxyError.js";
+export { loadUserConfig } from "./config/config-loader.js";
+export { startPythonDevService, stopPythonDevService, } from "./dev-engine/pythonDevManager.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACnD,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,YAAY,EACV,eAAe,EACf,YAAY,EACZ,cAAc,EACd,mBAAmB,GACpB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7F,YAAY,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,2BAA2B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,YAAY,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAChE,YAAY,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,YAAY,EACV,eAAe,EACf,YAAY,EACZ,cAAc,EACd,mBAAmB,GACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AACtG,YAAY,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EACL,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,kCAAkC,CAAC"}

package/dist/index.js

@@ -2,12 +2,12 @@
  * SWITE - SWISS Development Server
  * Main exports
  */
-export { SwiteServer } from "./server.js";
-export { SwiteBuilder, build } from "./builder.js";
-export { ModuleResolver } from "./resolver.js";
-export { HMREngine } from "./hmr.js";
-export { defineConfig } from "./config.js";
-export { proxyToPython, initPythonProxy, setProductionMode } from "./proxy/proxyToPython.js";
-export { SwiteProxyError } from "./proxy/SwiteProxyError.js";
-export { loadUserConfig } from "./config-loader.js";
-export { startPythonDevService, stopPythonDevService, } from "./dev/pythonDevManager.js";
+export { SwiteServer } from "./dev-engine/server.js";
+export { SwiteBuilder, build } from "./build-engine/builder.js";
+export { ModuleResolver } from "./resolution/resolver.js";
+export { HMREngine } from "./dev-engine/hmr/hmr.js";
+export { defineConfig } from "./config/config.js";
+export { proxyToPython, initPythonProxy, setProductionMode } from "./adapters/proxy/proxyToPython.js";
+export { SwiteProxyError } from "./adapters/proxy/SwiteProxyError.js";
+export { loadUserConfig } from "./config/config-loader.js";
+export { startPythonDevService, stopPythonDevService, } from "./dev-engine/pythonDevManager.js";

package/dist/internal/cache/compilation-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"compilation-cache.d.ts","sourceRoot":"","sources":["../../../src/internal/cache/compilation-cache.ts"],"names":[],"mappings":"AAmBA;;;GAGG;AACH,qBAAa,gBAAgB;IAC3B,OAAO,CAAC,KAAK,CAAiC;IAC9C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAQ;IAEhC;;OAEG;IACG,GAAG,CACP,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GACvD,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAgFzB;;OAEG;IACG,GAAG,CACP,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,EAAE,CAAC,GACvD,OAAO,CAAC,IAAI,CAAC;IAiChB;;OAEG;IACH,KAAK,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAI7B;;OAEG;IACH,QAAQ,IAAI,IAAI;IAKhB;;OAEG;IACH,QAAQ,IAAI;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE;CAM9C;AAGD,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}

package/dist/{cache → internal/cache}/compilation-cache.js

@@ -38,10 +38,11 @@ export class CompilationCache {
             this.cache.delete(filePath);
             return null;
         }
-        // Check if dependencies changed
+        // Check if dependencies changed (order-independent comparison)
         const currentDeps = await getDependencies(entry.compiled);
+        const prevSet = new Set(entry.dependencies);
         const depsChanged = currentDeps.length !== entry.dependencies.length ||
-            currentDeps.some((dep, i) => dep !== entry.dependencies[i]);
+            currentDeps.some((dep) => !prevSet.has(dep));
         if (depsChanged) {
             console.log(chalk.yellow(`[Cache] Invalidating ${filePath}: dependencies changed`));
             this.cache.delete(filePath);

package/dist/internal/generate-import-map-cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-import-map-cli.d.ts","sourceRoot":"","sources":["../../src/internal/generate-import-map-cli.ts"],"names":[],"mappings":""}

package/dist/{utils → internal}/generate-import-map-cli.js

@@ -6,7 +6,7 @@
  * Licensed under the MIT License.
  */
 import { generateImportMap, saveImportMap } from "./generate-import-map.js";
-import { findWorkspaceRoot } from "./workspace.js";
+import { findWorkspaceRoot } from "../kernel/workspace.js";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 const __filename = fileURLToPath(import.meta.url);

package/dist/internal/generate-import-map.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-import-map.d.ts","sourceRoot":"","sources":["../../src/internal/generate-import-map.ts"],"names":[],"mappings":"AAcA,MAAM,WAAW,SAAS;IACxB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE;QACP,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;KAC7B,CAAC;CACH;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GAAG,IAAI,GAC3B,OAAO,CAAC,SAAS,CAAC,CAkGpB;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;GAEG;AACH,wBAAsB,aAAa,CACjC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAO3B"}

package/dist/{utils → internal}/generate-import-map.js

@@ -6,10 +6,10 @@
  */
 import { promises as fs } from "node:fs";
 import path from "node:path";
-import { ModuleResolver } from "../resolver.js";
+import { ModuleResolver } from "../resolution/resolver.js";
 import chalk from "chalk";
-import { getPackageRegistry } from "./package-registry.js";
-import { findSwissLibMonorepo } from "./package-finder.js";
+import { getPackageRegistry } from "../kernel/package-registry.js";
+import { findSwissLibMonorepo } from "../kernel/package-finder.js";
 /**
  * Scan workspace and generate import map
  * This pre-resolves all known packages to eliminate runtime scanning

package/dist/{utils → kernel}/package-finder.d.ts

@@ -7,7 +7,9 @@ export interface PackageLocation {
     type: 'swiss-lib' | 'workspace' | 'node_modules';
 }
 /**
- * Find swiss-lib monorepo by searching for swiss-lib/package.json or swiss-lib/packages/core
+ * 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.
  */
 export declare function findSwissLibMonorepo(startPath: string): Promise<string | null>;
 /**

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

@@ -0,0 +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"}

package/dist/{utils → kernel}/package-finder.js

@@ -6,59 +6,36 @@
 import { promises as fs } from "node:fs";
 import path from "node:path";
 /**
- * Find swiss-lib monorepo by searching for swiss-lib/package.json or swiss-lib/packages/core
+ * 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.
  */
 export async function findSwissLibMonorepo(startPath) {
-    let current = startPath;
-    for (let i = 0; i < 20; i++) { // Search up to 20 levels
-        // Check for swiss-lib directory with packages/core
-        const swissLibPath = path.join(current, "swiss-lib");
-        const swissLibPackageJson = path.join(swissLibPath, "package.json");
-        const corePackage = path.join(swissLibPath, "packages", "core", "package.json");
-        try {
-            // Check if swiss-lib exists and has core package
-            if (await fileExists(swissLibPackageJson) || await fileExists(corePackage)) {
-                console.log(`[package-finder] Found swiss-lib at: ${swissLibPath}`);
-                return swissLibPath;
-            }
-        }
-        catch {
-            // Continue searching
-        }
-        // Also check for legacy SWISS directory
-        const swissPath = path.join(current, "SWISS");
-        const swissPackageJson = path.join(swissPath, "package.json");
-        const swissCorePackage = path.join(swissPath, "packages", "core", "package.json");
-        try {
-            if (await fileExists(swissPackageJson) || await fileExists(swissCorePackage)) {
-                console.log(`[package-finder] Found legacy SWISS at: ${swissPath}`);
-                return swissPath;
-            }
-        }
-        catch {
-            // Continue searching
-        }
-        // Scan immediate subdirectories of `current` for a swiss-lib/ child
+    let current = path.resolve(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
         try {
-            const entries = await fs.readdir(current, { withFileTypes: true });
-            const subdirs = entries.filter((e) => e.name !== "node_modules" && (e.isDirectory() || e.isSymbolicLink()));
-            for (const entry of subdirs) {
-                const sub = path.join(current, entry.name);
-                const subSwissLib = path.join(sub, "swiss-lib");
-                const subPkgJson = path.join(subSwissLib, "package.json");
-                const subCorePkgJson = path.join(subSwissLib, "packages", "core", "package.json");
-                if (await fileExists(subPkgJson) || await fileExists(subCorePkgJson)) {
-                    console.log(`[package-finder] Found swiss-lib via subdir scan at: ${subSwissLib}`);
-                    return subSwissLib;
+            const entries = await fs.readdir(parent, { 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;
                 }
             }
         }
         catch {
             // Skip on permission errors
         }
-        const parent = path.dirname(current);
-        if (parent === current)
-            break;
         current = parent;
     }
     return null;
@@ -82,14 +59,14 @@ export async function findPackage(packageName, startPath, workspaceRoot) {
             return { path: workspaceNodeModules, type: 'node_modules' };
         }
     }
-    // 3. Check swiss-lib monorepo (for @kibologic/* packages)
-    if (packageName.startsWith("@kibologic/")) {
-        const swissLib = await findSwissLibMonorepo(startPath);
-        if (swissLib) {
-            const packageDir = packageName.replace("@kibologic/", "");
-            const swissPackage = path.join(swissLib, "packages", packageDir);
-            if (await fileExists(path.join(swissPackage, "package.json"))) {
-                return { path: swissPackage, type: 'swiss-lib' };
+    // 3. Check co-located framework monorepo packages/ for any scoped package
+    if (packageName.startsWith("@")) {
+        const monorepo = await findSwissLibMonorepo(startPath);
+        if (monorepo) {
+            const shortName = packageName.split("/")[1];
+            const monorepoPackage = path.join(monorepo, "packages", shortName);
+            if (await fileExists(path.join(monorepoPackage, "package.json"))) {
+                return { path: monorepoPackage, type: 'swiss-lib' };
             }
         }
     }

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

@@ -0,0 +1 @@
+{"version":3,"file":"package-registry.d.ts","sourceRoot":"","sources":["../../src/kernel/package-registry.ts"],"names":[],"mappings":"AAUA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,GAAG,CAAC;CAClB;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAgB;IAEjC;;OAEG;IACG,aAAa,CACjB,aAAa,EAAE,MAAM,EACrB,eAAe,GAAE,MAAM,EAAO,GAC7B,OAAO,CAAC,IAAI,CAAC;IAwChB;;OAEG;YACW,aAAa;IAmF3B;;OAEG;IACH,WAAW,CAAC,WAAW,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI;IAIpD;;OAEG;IACH,cAAc,IAAI,WAAW,EAAE;IAI/B;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAW7B;;OAEG;IACH,eAAe,IAAI,MAAM;CAG1B;AAKD,wBAAgB,kBAAkB,IAAI,eAAe,CAKpD"}

package/dist/kernel/workspace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/kernel/workspace.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAgD5E"}

package/dist/{resolver → resolution}/bare-import-resolver.d.ts

@@ -3,7 +3,7 @@ export interface BareImportResolverContext extends UrlResolverContext {
     resolveWorkspacePackage: (pkgName: string) => Promise<string | null>;
 }
 /**
- * Resolve bare import specifier (e.g., @kibologic/core, react, etc.)
+ * Resolve bare import specifier (e.g., @swissjs/core, react, etc.)
  */
 export declare function resolveBareImport(specifier: string, context: BareImportResolverContext): Promise<string>;
 //# sourceMappingURL=bare-import-resolver.d.ts.map

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

@@ -0,0 +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"}

package/dist/{resolver → resolution}/bare-import-resolver.js

@@ -1,19 +1,18 @@
 /*
- * Bare Import Resolver - Resolves bare module specifiers (@kibologic/core, etc.)
+ * Bare Import Resolver - Resolves bare module specifiers (@swissjs/core, etc.)
  * Extracted from resolver.ts for modularity
  */
 import path from "node:path";
 import { promises as fs } from "node:fs";
 import chalk from "chalk";
-import { findSwissLibMonorepo } from "../utils/package-finder.js";
-import { shouldUseCdnFallback } from "../utils/cdn-fallback.js";
+import { findSwissLibMonorepo } from "../kernel/package-finder.js";
+import { shouldUseCdnFallback } from "./cdn/cdn-fallback.js";
 import { resolveWorkspacePackage } from "./workspace-package-resolver.js";
 import { toUrl } from "./url-resolver.js";
 /**
- * Resolve bare import specifier (e.g., @kibologic/core, react, etc.)
+ * Resolve bare import specifier (e.g., @swissjs/core, react, etc.)
  */
 export async function resolveBareImport(specifier, context) {
-    console.log(`[SWITE] resolveBareImport CALLED: ${specifier}`);
     // Extract package name outside the try/catch so fallback logic can reference it.
     // This must stay project-agnostic: works for both scoped and unscoped packages.
     const parts = specifier.split("/");
@@ -21,7 +20,6 @@ export async function resolveBareImport(specifier, context) {
     const pkgName = isScoped ? `${parts[0]}/${parts[1]}` : parts[0];
     const subPath = isScoped ? parts.slice(2).join("/") : parts.slice(1).join("/");
     try {
-        console.log(`[SWITE] resolveBareImport: ${specifier} -> pkgName: ${pkgName}, subPath: ${subPath}`);
         // Find package.json - check multiple node_modules locations
         let pkgDir = null;
         let pkgJsonPath = null;
@@ -40,7 +38,6 @@ export async function resolveBareImport(specifier, context) {
             const swissNodeModules = path.join(swissLib, "node_modules");
             if (await context.fileExists(swissNodeModules)) {
                 nodeModulesLocations.push(swissNodeModules);
-                console.log(`[SWITE] Added swiss-lib monorepo node_modules for ${pkgName}`);
             }
         }
         // Try each location
@@ -50,48 +47,20 @@ export async function resolveBareImport(specifier, context) {
             if (await context.fileExists(testPkgJsonPath)) {
                 pkgDir = testPkgDir;
                 pkgJsonPath = testPkgJsonPath;
-                console.log(`[SWITE] Found ${pkgName} in ${nodeModulesPath}`);
                 break;
             }
         }
         if (!pkgJsonPath || !pkgDir) {
-            console.log(`[SWITE] Package ${pkgName} not in node_modules, checking workspace...`);
-            // EMERGENCY FIX: For @kibologic/* packages, try direct path first
-            if (pkgName.startsWith('@kibologic/')) {
-                const pkgShortName = pkgName.replace('@kibologic/', '');
-                // Try relative path from SWS to swiss-lib
-                const potentialPaths = [
-                    path.join(context.root, '../swiss-lib/packages', pkgShortName),
-                    path.join(context.root, '../../swiss-lib/packages', pkgShortName),
-                    path.join(context.root, '../../../swiss-lib/packages', pkgShortName),
-                ];
-                for (const candidatePath of potentialPaths) {
-                    const candidatePkgJson = path.join(candidatePath, 'package.json');
-                    if (await context.fileExists(candidatePkgJson)) {
-                        console.log(`[SWITE] Emergency: Found ${pkgName} at ${candidatePath}`);
-                        pkgDir = candidatePath;
-                        pkgJsonPath = candidatePkgJson;
-                        break;
-                    }
-                }
+            const workspacePkg = await context.resolveWorkspacePackage(pkgName);
+            if (workspacePkg) {
+                return await resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, specifier, context);
             }
-            // If still not found, try workspace resolver
-            if (!pkgJsonPath || !pkgDir) {
-                const workspacePkg = await context.resolveWorkspacePackage(pkgName);
-                if (workspacePkg) {
-                    return await resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, specifier, context);
-                }
-                // Last resort: CDN fallback
-                if (!shouldUseCdnFallback(pkgName)) {
-                    // Scoped packages may be private and are not necessarily available on public npm CDNs.
-                    console.warn(`[SWITE] Package ${pkgName} not found anywhere. Scoped package detected; CDN fallback is disabled by default.`);
-                    // Return a same-origin node_modules URL to make failures explicit and allow the
-                    // node-module handler to try serving it.
-                    return `/node_modules/${specifier}`;
-                }
-                console.warn(`[SWITE] Package ${pkgName} not found anywhere, using CDN fallback`);
-                return `https://cdn.jsdelivr.net/npm/${specifier}/+esm`;
+            if (!shouldUseCdnFallback(pkgName)) {
+                console.warn(`[SWITE] Package ${pkgName} not found anywhere. Scoped package detected; CDN fallback is disabled by default.`);
+                return `/node_modules/${specifier}`;
             }
+            console.warn(`[SWITE] Package ${pkgName} not found anywhere, using CDN fallback`);
+            return `https://cdn.jsdelivr.net/npm/${specifier}/+esm`;
         }
         // Continue with normal resolution if we found it
         if (pkgJsonPath && pkgDir) {
@@ -106,7 +75,6 @@ export async function resolveBareImport(specifier, context) {
             realPkgDir = pkgDir;
         }
         const workspacePkg = await context.resolveWorkspacePackage(pkgName);
-        console.log(`[SWITE] resolveBareImport (node_modules): workspacePkg=${workspacePkg}, realPkgDir=${realPkgDir}, pkgName=${pkgName}`);
         if (workspacePkg) {
             const normalizedWorkspacePkg = path
                 .resolve(workspacePkg)
@@ -119,7 +87,6 @@ export async function resolveBareImport(specifier, context) {
             // If the real path is the workspace package, use workspace resolution
             if (normalizedRealPkgDir === normalizedWorkspacePkg ||
                 normalizedRealPkgDir.includes(normalizedWorkspacePkg)) {
-                console.log(`[SWITE] resolveBareImport (node_modules): Using workspace resolution for ${pkgName}`);
                 return await resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, specifier, context);
             }
         }
@@ -151,7 +118,6 @@ export async function resolveBareImport(specifier, context) {
                         .replace("/dist/", "/src/")
                         .replace(/\.js$/, ".ts");
                     if (await context.fileExists(srcFullPath)) {
-                        console.log(`[SWITE] resolveBareImport: Using source file instead of dist: ${srcFullPath}`);
                         return await toUrl(srcFullPath, context);
                     }
                 }
@@ -227,7 +193,6 @@ async function resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, spec
             ? subPath.replace(/\.(js|ts|ui|uix)$/, "")
             : "";
         let exportKey = subPathWithoutExt ? `./${subPathWithoutExt}` : ".";
-        console.log(`[SWITE] resolveBareImport (workspace): pkgName=${pkgName}, subPath=${subPath}, subPathWithoutExt=${subPathWithoutExt}, exportKey=${exportKey}`);
         // Try to find matching export
         if (subPath && !workspacePkgJson.exports[exportKey]) {
             if (subPathWithoutExt) {
@@ -285,7 +250,6 @@ async function resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, spec
             if (normalizedFull.includes("/dist/")) {
                 const srcPath = fullPath.replace(/[/\\]dist[/\\]/, path.sep + "src" + path.sep).replace(/\.js$/i, ".ts");
                 if (await context.fileExists(srcPath)) {
-                    console.log(`[SWITE] resolveBareImport (workspace): preferring src over dist: ${srcPath}`);
                     return await toUrl(srcPath, context);
                 }
             }
@@ -316,7 +280,6 @@ async function resolveWorkspacePackageEntry(workspacePkg, pkgName, subPath, spec
     if (normalizedFull.includes("/dist/")) {
         const srcPath = fullPath.replace(/[/\\]dist[/\\]/, path.sep + "src" + path.sep).replace(/\.js$/i, ".ts");
         if (await context.fileExists(srcPath)) {
-            console.log(`[SWITE] resolveBareImport (fallback): preferring src over dist: ${srcPath}`);
             return await toUrl(srcPath, context);
         }
     }

package/dist/resolution/cdn/cdn-fallback.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cdn-fallback.d.ts","sourceRoot":"","sources":["../../../src/resolution/cdn/cdn-fallback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAmBH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAKpE"}

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

@@ -0,0 +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"}

package/dist/{utils → resolution/path}/file-path-resolver.js

@@ -5,8 +5,8 @@
  */
 import { promises as fs } from "node:fs";
 import path from "node:path";
-import { findWorkspaceRoot } from "./workspace.js";
-import { findSwissLibMonorepo } from "./package-finder.js";
+import { findWorkspaceRoot } from "../../kernel/workspace.js";
+import { findSwissLibMonorepo } from "../../kernel/package-finder.js";
 /**
  * Resolve file path from URL, handling SWISS packages, workspace packages, and app files
  */
@@ -54,32 +54,23 @@ export async function resolveFilePath(url, root, workspaceRoot = null) {
         }
         return path.join(path.resolve(root), urlPath); // fallback; handler will 404
     }
-    // Check if this is a swiss-lib package file
+    // /swiss-packages/ URLs point to files in the co-located framework monorepo's packages/ dir
     if (url.startsWith("/swiss-packages/")) {
-        // Dynamically find swiss-lib monorepo instead of hardcoded paths
-        const swissLib = await findSwissLibMonorepo(root);
-        if (swissLib) {
-            // Remove /swiss-packages prefix and use the rest as relative path
-            const relativePath = url.replace(/^\/swiss-packages\//, "");
-            const swissPackagesPath = path.join(swissLib, "packages");
-            const fullPath = path.join(swissPackagesPath, relativePath);
+        const relativePath = url.replace(/^\/swiss-packages\//, "");
+        const monorepo = await findSwissLibMonorepo(root);
+        if (monorepo) {
+            const fullPath = path.join(monorepo, "packages", relativePath);
             try {
                 await fs.access(fullPath);
-                console.log(`[file-path-resolver] Found swiss-lib package at: ${fullPath}`);
                 return fullPath;
             }
             catch {
-                console.warn(`[file-path-resolver] swiss-lib package file not found: ${fullPath}`);
-                return fullPath; // Return path anyway, will error later if needed
+                return fullPath; // Return anyway; handler will 404 if missing
             }
         }
-        else {
-            // Fallback: construct path from root (may not work, but better than nothing)
-            const relativePath = url.replace(/^\/swiss-packages\//, "");
-            const fallbackPath = path.join(root, "..", "..", "..", "swiss-lib", "packages", relativePath);
-            console.warn(`[file-path-resolver] swiss-lib not found, using fallback: ${fallbackPath}`);
-            return fallbackPath;
-        }
+        // No co-located monorepo found — return a path that will 404 cleanly
+        console.warn(`[file-path-resolver] No framework monorepo found for /swiss-packages/${relativePath}`);
+        return path.join(root, "node_modules", relativePath);
     }
     // Workspace-level directories: always resolve from workspace root
     // Updated: lib/ now contains all packages (moved from packages/)

package/dist/resolution/path/path-fixup.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Centralised /swiss-lib/ → /swiss-packages/ path fixup.
+ *
+ * Root cause: the UiCompiler emits absolute `/swiss-lib/` paths in some code
+ * paths (compiler was written against an older directory structure). Until the
+ * compiler is fixed at source this single function is the authoritative fixup.
+ * Apply it once per compilation, before passing code to the import rewriter.
+ *
+ * All seven previous fixup locations across ui-handler, uix-handler, and
+ * import-rewriter have been removed in favour of this call.
+ */
+export declare function fixSwissLibPaths(code: string): string;
+//# sourceMappingURL=path-fixup.d.ts.map

package/dist/resolution/path/path-fixup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"path-fixup.d.ts","sourceRoot":"","sources":["../../../src/resolution/path/path-fixup.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAOrD"}

package/dist/resolution/path/path-fixup.js

@@ -0,0 +1,20 @@
+/**
+ * Centralised /swiss-lib/ → /swiss-packages/ path fixup.
+ *
+ * Root cause: the UiCompiler emits absolute `/swiss-lib/` paths in some code
+ * paths (compiler was written against an older directory structure). Until the
+ * compiler is fixed at source this single function is the authoritative fixup.
+ * Apply it once per compilation, before passing code to the import rewriter.
+ *
+ * All seven previous fixup locations across ui-handler, uix-handler, and
+ * import-rewriter have been removed in favour of this call.
+ */
+export function fixSwissLibPaths(code) {
+    if (!code.includes('/swiss-lib/'))
+        return code;
+    // More-specific pattern first so `/swiss-lib/packages/` doesn't leave a
+    // dangling `/swiss-packages/packages/` if the replacement ran twice.
+    return code
+        .replace(/\/swiss-lib\/packages\//g, '/swiss-packages/')
+        .replace(/\/swiss-lib\//g, '/swiss-packages/');
+}

package/dist/{resolver.d.ts → resolution/resolver.d.ts}

@@ -1,4 +1,4 @@
-import type { ImportMap } from "./utils/generate-import-map.js";
+import type { ImportMap } from "../internal/generate-import-map.js";
 export declare class ModuleResolver {
     private root;
     private workspaceRoot;