@melaya/runner 1.0.13 → 1.0.14

package/dist/sharedVendor.js

@@ -7,7 +7,7 @@
  * runtime from the server's /api/v1/agents/shared-bundle endpoint,
  * integrity-verified via SHA-256, and cached at ~/.melaya-runner/shared/.
  */
-import { mkdirSync, writeFileSync, readFileSync, existsSync } from "fs";
+import { mkdirSync, writeFileSync, readFileSync, existsSync, rmSync } from "fs";
 import { join } from "path";
 import { homedir } from "os";
 import { createHash } from "crypto";
@@ -21,14 +21,38 @@ export function getSharedDir() {
     // and `from crews.X.main import ...` all resolve.
     return CACHE_DIR;
 }
+/**
+ * Canary files that prove the current nested bundle layout has been written
+ * to disk. A cache where any of these is missing was produced by an older
+ * (flat-layout) bundler and must be refetched regardless of version match.
+ */
+const CANARY_FILES = [
+    join(CACHE_DIR, "shared", "runtime", "agent_factory.py"),
+    join(CACHE_DIR, "shared", "runtime", "__init__.py"),
+    join(CACHE_DIR, "shared", "tools", "__init__.py"),
+    join(CACHE_DIR, "agentscope", "__init__.py"),
+];
+function cacheLooksValid() {
+    return CANARY_FILES.every((p) => existsSync(p));
+}
 export async function ensureSharedModules(serverUrl, expectedVersion) {
     mkdirSync(CACHE_DIR, { recursive: true });
-    // Check cached version
+    // Check cached version. We require BOTH a version match AND a valid nested
+    // layout — older runner versions wrote flat filenames into shared/, and
+    // those caches must be purged rather than trusted.
     if (existsSync(VERSION_FILE)) {
         const cached = readFileSync(VERSION_FILE, "utf-8").trim();
-        if (cached === expectedVersion && existsSync(join(CACHE_DIR, "shared", "events.py")) && existsSync(join(CACHE_DIR, "agentscope", "__init__.py"))) {
-            return; // cache is up-to-date
+        if (cached === expectedVersion && cacheLooksValid()) {
+            return;
+        }
+    }
+    // Purge stale cache — flat-layout shared/ or missing agentscope dir.
+    // This is safe: we always refetch the full bundle below.
+    if (existsSync(SHARED_DIR) && !cacheLooksValid()) {
+        try {
+            rmSync(SHARED_DIR, { recursive: true, force: true });
         }
+        catch { /* best-effort */ }
     }
     // Fetch from server
     const httpUrl = serverUrl.replace(/^wss:/, "https:").replace(/^ws:/, "http:");
@@ -44,6 +68,7 @@ export async function ensureSharedModules(serverUrl, expectedVersion) {
         throw new Error("Shared module integrity check failed — hash mismatch");
     }
     // Write files (sanitize filenames to prevent path traversal)
+    const writtenDirs = new Set();
     for (const [filename, content] of Object.entries(body.files)) {
         const safe = filename.replace(/\.\./g, "").replace(/^\//, "").replace(/\\/g, "/");
         if (safe.includes("..") || safe.startsWith("/"))
@@ -54,13 +79,27 @@ export async function ensureSharedModules(serverUrl, expectedVersion) {
         const dir = join(filepath, "..");
         mkdirSync(dir, { recursive: true });
         writeFileSync(filepath, content, "utf-8");
+        // Track every ancestor directory under CACHE_DIR so we can ensure each
+        // has an __init__.py for Python package resolution.
+        let cursor = dir;
+        while (cursor.startsWith(CACHE_DIR) && cursor !== CACHE_DIR) {
+            writtenDirs.add(cursor);
+            cursor = join(cursor, "..");
+        }
     }
-    // Ensure __init__.py in shared/ and crews/ if missing
-    for (const sub of ["shared", "crews"]) {
-        const init = join(CACHE_DIR, sub, "__init__.py");
-        if (existsSync(join(CACHE_DIR, sub)) && !existsSync(init)) {
+    // Ensure __init__.py in every nested directory of shared/ and crews/.
+    // agentscope ships its own __init__.py files as part of the bundle. This
+    // covers cases where the server didn't include an __init__.py for a
+    // particular subdir (e.g. accidentally removed) — Python won't treat it
+    // as a package without one, breaking imports like `shared.runtime.*`.
+    for (const dir of writtenDirs) {
+        const rel = dir.slice(CACHE_DIR.length + 1).replace(/\\/g, "/");
+        const topLevel = rel.split("/")[0];
+        if (topLevel !== "shared" && topLevel !== "crews")
+            continue;
+        const init = join(dir, "__init__.py");
+        if (!existsSync(init))
             writeFileSync(init, "", "utf-8");
-        }
     }
     writeFileSync(VERSION_FILE, expectedVersion, "utf-8");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@melaya/runner",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Run Melaya AI pipelines locally with your own LM Studio or Ollama models",
   "license": "UNLICENSED",
   "private": false,