@skilder-ai/runtime 0.9.3 → 0.9.4

package/dist/index.js

@@ -1917,7 +1917,7 @@ var require_package = __commonJS({
 // ../../node_modules/.pnpm/dotenv@17.2.3/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
   "../../node_modules/.pnpm/dotenv@17.2.3/node_modules/dotenv/lib/main.js"(exports2, module2) {
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     var path4 = require("path");
     var os4 = require("os");
     var crypto5 = require("crypto");
@@ -2059,7 +2059,7 @@ var require_main = __commonJS({
       if (options && options.path && options.path.length > 0) {
         if (Array.isArray(options.path)) {
           for (const filepath of options.path) {
-            if (fs5.existsSync(filepath)) {
+            if (fs6.existsSync(filepath)) {
               possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`;
             }
           }
@@ -2069,7 +2069,7 @@ var require_main = __commonJS({
       } else {
         possibleVaultPath = path4.resolve(process.cwd(), ".env.vault");
       }
-      if (fs5.existsSync(possibleVaultPath)) {
+      if (fs6.existsSync(possibleVaultPath)) {
         return possibleVaultPath;
       }
       return null;
@@ -2122,7 +2122,7 @@ var require_main = __commonJS({
       const parsedAll = {};
       for (const path5 of optionPaths) {
         try {
-          const parsed = DotenvModule.parse(fs5.readFileSync(path5, { encoding }));
+          const parsed = DotenvModule.parse(fs6.readFileSync(path5, { encoding }));
           DotenvModule.populate(parsedAll, parsed, options);
         } catch (e2) {
           if (debug) {
@@ -14151,7 +14151,7 @@ var require_graphql = __commonJS({
     var _validate2 = require_validate2();
     var _execute = require_execute();
     function graphql(args) {
-      return new Promise((resolve5) => resolve5(graphqlImpl(args)));
+      return new Promise((resolve6) => resolve6(graphqlImpl(args)));
     }
     function graphqlSync(args) {
       const result = graphqlImpl(args);
@@ -20661,7 +20661,7 @@ var require_atomic_sleep = __commonJS({
 var require_sonic_boom = __commonJS({
   "../../node_modules/.pnpm/sonic-boom@4.2.0/node_modules/sonic-boom/index.js"(exports2, module2) {
     "use strict";
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     var EventEmitter = require("events");
     var inherits = require("util").inherits;
     var path4 = require("path");
@@ -20718,20 +20718,20 @@ var require_sonic_boom = __commonJS({
       const mode = sonic.mode;
       if (sonic.sync) {
         try {
-          if (sonic.mkdir) fs5.mkdirSync(path4.dirname(file2), { recursive: true });
-          const fd = fs5.openSync(file2, flags, mode);
+          if (sonic.mkdir) fs6.mkdirSync(path4.dirname(file2), { recursive: true });
+          const fd = fs6.openSync(file2, flags, mode);
           fileOpened(null, fd);
         } catch (err) {
           fileOpened(err);
           throw err;
         }
       } else if (sonic.mkdir) {
-        fs5.mkdir(path4.dirname(file2), { recursive: true }, (err) => {
+        fs6.mkdir(path4.dirname(file2), { recursive: true }, (err) => {
           if (err) return fileOpened(err);
-          fs5.open(file2, flags, mode, fileOpened);
+          fs6.open(file2, flags, mode, fileOpened);
         });
       } else {
-        fs5.open(file2, flags, mode, fileOpened);
+        fs6.open(file2, flags, mode, fileOpened);
       }
     }
     function SonicBoom(opts) {
@@ -20772,16 +20772,16 @@ var require_sonic_boom = __commonJS({
         this.flush = flushBuffer;
         this.flushSync = flushBufferSync;
         this._actualWrite = actualWriteBuffer;
-        fsWriteSync = () => fs5.writeSync(this.fd, this._writingBuf);
-        fsWrite = () => fs5.write(this.fd, this._writingBuf, this.release);
+        fsWriteSync = () => fs6.writeSync(this.fd, this._writingBuf);
+        fsWrite = () => fs6.write(this.fd, this._writingBuf, this.release);
       } else if (contentMode === void 0 || contentMode === kContentModeUtf8) {
         this._writingBuf = "";
         this.write = write;
         this.flush = flush;
         this.flushSync = flushSync;
         this._actualWrite = actualWrite;
-        fsWriteSync = () => fs5.writeSync(this.fd, this._writingBuf, "utf8");
-        fsWrite = () => fs5.write(this.fd, this._writingBuf, "utf8", this.release);
+        fsWriteSync = () => fs6.writeSync(this.fd, this._writingBuf, "utf8");
+        fsWrite = () => fs6.write(this.fd, this._writingBuf, "utf8", this.release);
       } else {
         throw new Error(`SonicBoom supports "${kContentModeUtf8}" and "${kContentModeBuffer}", but passed ${contentMode}`);
       }
@@ -20837,7 +20837,7 @@ var require_sonic_boom = __commonJS({
           }
         }
         if (this._fsync) {
-          fs5.fsyncSync(this.fd);
+          fs6.fsyncSync(this.fd);
         }
         const len = this._len;
         if (this._reopening) {
@@ -20949,7 +20949,7 @@ var require_sonic_boom = __commonJS({
       const onDrain = () => {
         if (!this._fsync) {
           try {
-            fs5.fsync(this.fd, (err) => {
+            fs6.fsync(this.fd, (err) => {
               this._flushPending = false;
               cb(err);
             });
@@ -21051,7 +21051,7 @@ var require_sonic_boom = __commonJS({
       const fd = this.fd;
       this.once("ready", () => {
         if (fd !== this.fd) {
-          fs5.close(fd, (err) => {
+          fs6.close(fd, (err) => {
             if (err) {
               return this.emit("error", err);
             }
@@ -21100,7 +21100,7 @@ var require_sonic_boom = __commonJS({
           buf = this._bufs[0];
         }
         try {
-          const n3 = fs5.writeSync(this.fd, buf, "utf8");
+          const n3 = fs6.writeSync(this.fd, buf, "utf8");
           const releasedBufObj = releaseWritingBuf(buf, this._len, n3);
           buf = releasedBufObj.writingBuf;
           this._len = releasedBufObj.len;
@@ -21116,7 +21116,7 @@ var require_sonic_boom = __commonJS({
         }
       }
       try {
-        fs5.fsyncSync(this.fd);
+        fs6.fsyncSync(this.fd);
       } catch {
       }
     }
@@ -21137,7 +21137,7 @@ var require_sonic_boom = __commonJS({
           buf = mergeBuf(this._bufs[0], this._lens[0]);
         }
         try {
-          const n3 = fs5.writeSync(this.fd, buf);
+          const n3 = fs6.writeSync(this.fd, buf);
           buf = buf.subarray(n3);
           this._len = Math.max(this._len - n3, 0);
           if (buf.length <= 0) {
@@ -21165,13 +21165,13 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf || this._bufs.shift() || "";
       if (this.sync) {
         try {
-          const written = fs5.writeSync(this.fd, this._writingBuf, "utf8");
+          const written = fs6.writeSync(this.fd, this._writingBuf, "utf8");
           release(null, written);
         } catch (err) {
           release(err);
         }
       } else {
-        fs5.write(this.fd, this._writingBuf, "utf8", release);
+        fs6.write(this.fd, this._writingBuf, "utf8", release);
       }
     }
     function actualWriteBuffer() {
@@ -21180,7 +21180,7 @@ var require_sonic_boom = __commonJS({
       this._writingBuf = this._writingBuf.length ? this._writingBuf : mergeBuf(this._bufs.shift(), this._lens.shift());
       if (this.sync) {
         try {
-          const written = fs5.writeSync(this.fd, this._writingBuf);
+          const written = fs6.writeSync(this.fd, this._writingBuf);
           release(null, written);
         } catch (err) {
           release(err);
@@ -21189,7 +21189,7 @@ var require_sonic_boom = __commonJS({
         if (kCopyBuffer) {
           this._writingBuf = Buffer.from(this._writingBuf);
         }
-        fs5.write(this.fd, this._writingBuf, release);
+        fs6.write(this.fd, this._writingBuf, release);
       }
     }
     function actualClose(sonic) {
@@ -21205,12 +21205,12 @@ var require_sonic_boom = __commonJS({
       sonic._lens = [];
       assert2(typeof sonic.fd === "number", `sonic.fd must be a number, got ${typeof sonic.fd}`);
       try {
-        fs5.fsync(sonic.fd, closeWrapped);
+        fs6.fsync(sonic.fd, closeWrapped);
       } catch {
       }
       function closeWrapped() {
         if (sonic.fd !== 1 && sonic.fd !== 2) {
-          fs5.close(sonic.fd, done);
+          fs6.close(sonic.fd, done);
         } else {
           done();
         }
@@ -21889,7 +21889,7 @@ var require_transport = __commonJS({
     "use strict";
     var { createRequire: createRequire2 } = require("module");
     var getCallers = require_caller();
-    var { join: join6, isAbsolute: isAbsolute3, sep: sep2 } = require("node:path");
+    var { join: join6, isAbsolute: isAbsolute3, sep: sep3 } = require("node:path");
     var sleep = require_atomic_sleep();
     var onExit = require_on_exit_leak_free();
     var ThreadStream = require_thread_stream();
@@ -21997,7 +21997,7 @@ var require_transport = __commonJS({
         let fixTarget2;
         for (const filePath of callers) {
           try {
-            const context2 = filePath === "node:repl" ? process.cwd() + sep2 : filePath;
+            const context2 = filePath === "node:repl" ? process.cwd() + sep3 : filePath;
             fixTarget2 = createRequire2(context2).resolve(origin);
             break;
           } catch (err) {
@@ -24114,9 +24114,9 @@ var require_pump = __commonJS({
   "../../node_modules/.pnpm/pump@3.0.3/node_modules/pump/index.js"(exports2, module2) {
     var once = require_once();
     var eos = require_end_of_stream();
-    var fs5;
+    var fs6;
     try {
-      fs5 = require("fs");
+      fs6 = require("fs");
     } catch (e2) {
     }
     var noop2 = function() {
@@ -24127,8 +24127,8 @@ var require_pump = __commonJS({
     };
     var isFS = function(stream) {
       if (!ancient) return false;
-      if (!fs5) return false;
-      return (stream instanceof (fs5.ReadStream || noop2) || stream instanceof (fs5.WriteStream || noop2)) && isFn(stream.close);
+      if (!fs6) return false;
+      return (stream instanceof (fs6.ReadStream || noop2) || stream instanceof (fs6.WriteStream || noop2)) && isFn(stream.close);
     };
     var isRequest = function(stream) {
       return stream.setHeader && isFn(stream.abort);
@@ -24294,13 +24294,13 @@ var require_pino_abstract_transport = __commonJS({
     var { Duplex } = require("stream");
     var { parentPort, workerData } = require("worker_threads");
     function createDeferred() {
-      let resolve5;
+      let resolve6;
       let reject;
       const promise2 = new Promise((_resolve, _reject) => {
-        resolve5 = _resolve;
+        resolve6 = _resolve;
         reject = _reject;
       });
-      promise2.resolve = resolve5;
+      promise2.resolve = resolve6;
       promise2.reject = reject;
       return promise2;
     }
@@ -26628,14 +26628,14 @@ var require_util = __commonJS({
     }
     function delay2(ms = 0) {
       let methods;
-      const p2 = new Promise((resolve5) => {
+      const p2 = new Promise((resolve6) => {
         const timer = setTimeout(() => {
-          resolve5();
+          resolve6();
         }, ms);
         const cancel = () => {
           if (timer) {
             clearTimeout(timer);
-            resolve5();
+            resolve6();
           }
         };
         methods = { cancel };
@@ -26655,18 +26655,18 @@ var require_util = __commonJS({
     }
     function deferred() {
       let methods = {};
-      const p2 = new Promise((resolve5, reject) => {
-        methods = { resolve: resolve5, reject };
+      const p2 = new Promise((resolve6, reject) => {
+        methods = { resolve: resolve6, reject };
       });
       return Object.assign(p2, methods);
     }
     function debugDeferred() {
       let methods = {};
-      const p2 = new Promise((resolve5, reject) => {
+      const p2 = new Promise((resolve6, reject) => {
         methods = {
           resolve: (v2) => {
             console.trace("resolve", v2);
-            resolve5(v2);
+            resolve6(v2);
           },
           reject: (err) => {
             console.trace("reject");
@@ -33144,12 +33144,12 @@ var require_protocol = __commonJS({
         }
       }
       async _doDial(srv) {
-        const { resolve: resolve5 } = this.options;
+        const { resolve: resolve6 } = this.options;
         const alts = await srv.resolve({
           fn: (0, transport_1.getResolveFn)(),
           debug: this.options.debug,
           randomize: !this.options.noRandomize,
-          resolve: resolve5
+          resolve: resolve6
         });
         let lastErr = null;
         for (const a3 of alts) {
@@ -33543,12 +33543,12 @@ var require_protocol = __commonJS({
       }
       async drain() {
         const subs = this.subscriptions.all();
-        const promises3 = [];
+        const promises4 = [];
         subs.forEach((sub) => {
-          promises3.push(sub.drain());
+          promises4.push(sub.drain());
         });
         try {
-          await Promise.allSettled(promises3);
+          await Promise.allSettled(promises4);
         } catch {
         } finally {
           this.noMorePublishing = true;
@@ -33745,11 +33745,11 @@ var require_nats = __commonJS({
         this.options = (0, options_1.parseOptions)(opts);
       }
       static connect(opts = {}) {
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const nc = new _NatsConnectionImpl(opts);
           protocol_1.ProtocolHandler.connect(nc.options, nc).then((ph) => {
             nc.protocol = ph;
-            resolve5(nc);
+            resolve6(nc);
           }).catch((err) => {
             reject(err);
           });
@@ -36751,11 +36751,11 @@ var require_jsmconsumer_api = __commonJS({
           consumerName = cfg.name ?? cfg.durable_name ?? "";
         }
         if (consumerName !== "") {
-          let fs5 = cfg.filter_subject ?? void 0;
-          if (fs5 === ">") {
-            fs5 = void 0;
+          let fs6 = cfg.filter_subject ?? void 0;
+          if (fs6 === ">") {
+            fs6 = void 0;
           }
-          subj = fs5 !== void 0 ? `${this.prefix}.CONSUMER.CREATE.${stream}.${consumerName}.${fs5}` : `${this.prefix}.CONSUMER.CREATE.${stream}.${consumerName}`;
+          subj = fs6 !== void 0 ? `${this.prefix}.CONSUMER.CREATE.${stream}.${consumerName}.${fs6}` : `${this.prefix}.CONSUMER.CREATE.${stream}.${consumerName}`;
         } else {
           subj = cfg.durable_name ? `${this.prefix}.CONSUMER.DURABLE.CREATE.${stream}.${cfg.durable_name}` : `${this.prefix}.CONSUMER.CREATE.${stream}`;
         }
@@ -40568,7 +40568,7 @@ var require_auth_config = __commonJS({
       writeAuthConfig: () => writeAuthConfig
     });
     module2.exports = __toCommonJS(auth_config_exports);
-    var fs5 = __toESM2(require("fs"));
+    var fs6 = __toESM2(require("fs"));
     var path4 = __toESM2(require("path"));
     var import_token_util = require_token_util();
     function getAuthConfigPath() {
@@ -40583,10 +40583,10 @@ var require_auth_config = __commonJS({
     function readAuthConfig() {
       try {
         const authPath = getAuthConfigPath();
-        if (!fs5.existsSync(authPath)) {
+        if (!fs6.existsSync(authPath)) {
           return null;
         }
-        const content = fs5.readFileSync(authPath, "utf8");
+        const content = fs6.readFileSync(authPath, "utf8");
         if (!content) {
           return null;
         }
@@ -40598,10 +40598,10 @@ var require_auth_config = __commonJS({
     function writeAuthConfig(config2) {
       const authPath = getAuthConfigPath();
       const authDir = path4.dirname(authPath);
-      if (!fs5.existsSync(authDir)) {
-        fs5.mkdirSync(authDir, { mode: 504, recursive: true });
+      if (!fs6.existsSync(authDir)) {
+        fs6.mkdirSync(authDir, { mode: 504, recursive: true });
       }
-      fs5.writeFileSync(authPath, JSON.stringify(config2, null, 2), { mode: 384 });
+      fs6.writeFileSync(authPath, JSON.stringify(config2, null, 2), { mode: 384 });
     }
     function isValidAccessToken(authConfig) {
       if (!authConfig.token)
@@ -40748,7 +40748,7 @@ var require_token_util = __commonJS({
     });
     module2.exports = __toCommonJS(token_util_exports);
     var path4 = __toESM2(require("path"));
-    var fs5 = __toESM2(require("fs"));
+    var fs6 = __toESM2(require("fs"));
     var import_token_error = require_token_error();
     var import_token_io = require_token_io();
     var import_auth_config = require_auth_config();
@@ -40833,12 +40833,12 @@ var require_token_util = __commonJS({
         );
       }
       const prjPath = path4.join(dir, ".vercel", "project.json");
-      if (!fs5.existsSync(prjPath)) {
+      if (!fs6.existsSync(prjPath)) {
         throw new import_token_error.VercelOidcTokenError(
           "project.json not found, have you linked your project with `vc link?`"
         );
       }
-      const prj = JSON.parse(fs5.readFileSync(prjPath, "utf8"));
+      const prj = JSON.parse(fs6.readFileSync(prjPath, "utf8"));
       if (typeof prj.projectId !== "string" && typeof prj.orgId !== "string") {
         throw new TypeError(
           "Expected a string-valued projectId property. Try running `vc link` to re-link your project."
@@ -40855,9 +40855,9 @@ var require_token_util = __commonJS({
       }
       const tokenPath = path4.join(dir, "com.vercel.token", `${projectId}.json`);
       const tokenJson = JSON.stringify(token);
-      fs5.mkdirSync(path4.dirname(tokenPath), { mode: 504, recursive: true });
-      fs5.writeFileSync(tokenPath, tokenJson);
-      fs5.chmodSync(tokenPath, 432);
+      fs6.mkdirSync(path4.dirname(tokenPath), { mode: 504, recursive: true });
+      fs6.writeFileSync(tokenPath, tokenJson);
+      fs6.chmodSync(tokenPath, 432);
       return;
     }
     function loadToken(projectId) {
@@ -40868,10 +40868,10 @@ var require_token_util = __commonJS({
         );
       }
       const tokenPath = path4.join(dir, "com.vercel.token", `${projectId}.json`);
-      if (!fs5.existsSync(tokenPath)) {
+      if (!fs6.existsSync(tokenPath)) {
         return null;
       }
-      const token = JSON.parse(fs5.readFileSync(tokenPath, "utf8"));
+      const token = JSON.parse(fs6.readFileSync(tokenPath, "utf8"));
       assertVercelOidcTokenResponse(token);
       return token;
     }
@@ -44005,7 +44005,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve5.call(this, root, ref);
+      let _sch = resolve6.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a51 = root.localRefs) === null || _a51 === void 0 ? void 0 : _a51[ref];
         const { schemaId } = this.opts;
@@ -44032,7 +44032,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve5(root, ref) {
+    function resolve6(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -44607,7 +44607,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve5(baseURI, relativeURI, options) {
+    function resolve6(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -44834,7 +44834,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize: normalize2,
-      resolve: resolve5,
+      resolve: resolve6,
       resolveComponent,
       equal,
       serialize,
@@ -47801,12 +47801,12 @@ var require_dist2 = __commonJS({
         throw new Error(`Unknown format "${name21}"`);
       return f2;
     };
-    function addFormats(ajv, list, fs5, exportName) {
+    function addFormats(ajv, list, fs6, exportName) {
       var _a51;
       var _b41;
       (_a51 = (_b41 = ajv.opts.code).formats) !== null && _a51 !== void 0 ? _a51 : _b41.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f2 of list)
-        ajv.addFormat(f2, fs5[f2]);
+        ajv.addFormat(f2, fs6[f2]);
     }
     module2.exports = exports2 = formatsPlugin;
     Object.defineProperty(exports2, "__esModule", { value: true });
@@ -48527,7 +48527,7 @@ var require_Observable = __commonJS({
       Observable2.prototype.forEach = function(next, promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve5, reject) {
+        return new promiseCtor(function(resolve6, reject) {
           var subscriber = new Subscriber_1.SafeSubscriber({
             next: function(value) {
               try {
@@ -48538,7 +48538,7 @@ var require_Observable = __commonJS({
               }
             },
             error: reject,
-            complete: resolve5
+            complete: resolve6
           });
           _this.subscribe(subscriber);
         });
@@ -48560,14 +48560,14 @@ var require_Observable = __commonJS({
       Observable2.prototype.toPromise = function(promiseCtor) {
         var _this = this;
         promiseCtor = getPromiseCtor(promiseCtor);
-        return new promiseCtor(function(resolve5, reject) {
+        return new promiseCtor(function(resolve6, reject) {
           var value;
           _this.subscribe(function(x3) {
             return value = x3;
           }, function(err) {
             return reject(err);
           }, function() {
-            return resolve5(value);
+            return resolve6(value);
           });
         });
       };
@@ -50663,11 +50663,11 @@ var require_innerFrom = __commonJS({
     "use strict";
     var __awaiter = exports2 && exports2.__awaiter || function(thisArg, _arguments, P3, generator) {
       function adopt(value) {
-        return value instanceof P3 ? value : new P3(function(resolve5) {
-          resolve5(value);
+        return value instanceof P3 ? value : new P3(function(resolve6) {
+          resolve6(value);
         });
       }
-      return new (P3 || (P3 = Promise))(function(resolve5, reject) {
+      return new (P3 || (P3 = Promise))(function(resolve6, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -50683,7 +50683,7 @@ var require_innerFrom = __commonJS({
           }
         }
         function step(result) {
-          result.done ? resolve5(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve6(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -50765,14 +50765,14 @@ var require_innerFrom = __commonJS({
       }, i2);
       function verb(n3) {
         i2[n3] = o[n3] && function(v2) {
-          return new Promise(function(resolve5, reject) {
-            v2 = o[n3](v2), settle(resolve5, reject, v2.done, v2.value);
+          return new Promise(function(resolve6, reject) {
+            v2 = o[n3](v2), settle(resolve6, reject, v2.done, v2.value);
           });
         };
       }
-      function settle(resolve5, reject, d2, v2) {
+      function settle(resolve6, reject, d2, v2) {
         Promise.resolve(v2).then(function(v3) {
-          resolve5({ value: v3, done: d2 });
+          resolve6({ value: v3, done: d2 });
         }, reject);
       }
     };
@@ -51391,7 +51391,7 @@ var require_lastValueFrom = __commonJS({
     var EmptyError_1 = require_EmptyError();
     function lastValueFrom(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve5, reject) {
+      return new Promise(function(resolve6, reject) {
         var _hasValue = false;
         var _value;
         source.subscribe({
@@ -51402,9 +51402,9 @@ var require_lastValueFrom = __commonJS({
           error: reject,
           complete: function() {
             if (_hasValue) {
-              resolve5(_value);
+              resolve6(_value);
             } else if (hasConfig) {
-              resolve5(config2.defaultValue);
+              resolve6(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -51426,16 +51426,16 @@ var require_firstValueFrom = __commonJS({
     var Subscriber_1 = require_Subscriber();
     function firstValueFrom3(source, config2) {
       var hasConfig = typeof config2 === "object";
-      return new Promise(function(resolve5, reject) {
+      return new Promise(function(resolve6, reject) {
         var subscriber = new Subscriber_1.SafeSubscriber({
           next: function(value) {
-            resolve5(value);
+            resolve6(value);
             subscriber.unsubscribe();
           },
           error: reject,
           complete: function() {
             if (hasConfig) {
-              resolve5(config2.defaultValue);
+              resolve6(config2.defaultValue);
             } else {
               reject(new EmptyError_1.EmptyError());
             }
@@ -57478,41 +57478,41 @@ var require_queue2 = __commonJS({
       queue.drained = drained;
       return queue;
       function push(value) {
-        var p2 = new Promise(function(resolve5, reject) {
+        var p2 = new Promise(function(resolve6, reject) {
           pushCb(value, function(err, result) {
             if (err) {
               reject(err);
               return;
             }
-            resolve5(result);
+            resolve6(result);
           });
         });
         p2.catch(noop2);
         return p2;
       }
       function unshift(value) {
-        var p2 = new Promise(function(resolve5, reject) {
+        var p2 = new Promise(function(resolve6, reject) {
           unshiftCb(value, function(err, result) {
             if (err) {
               reject(err);
               return;
             }
-            resolve5(result);
+            resolve6(result);
           });
         });
         p2.catch(noop2);
         return p2;
       }
       function drained() {
-        var p2 = new Promise(function(resolve5) {
+        var p2 = new Promise(function(resolve6) {
           process.nextTick(function() {
             if (queue.idle()) {
-              resolve5();
+              resolve6();
             } else {
               var previousDrain = queue.drain;
               queue.drain = function() {
                 if (typeof previousDrain === "function") previousDrain();
-                resolve5();
+                resolve6();
                 queue.drain = previousDrain;
               };
             }
@@ -57855,8 +57855,8 @@ var require_create_promise = __commonJS({
         reject: null,
         promise: null
       };
-      obj.promise = new Promise((resolve5, reject) => {
-        obj.resolve = resolve5;
+      obj.promise = new Promise((resolve6, reject) => {
+        obj.resolve = resolve6;
         obj.reject = reject;
       });
       return obj;
@@ -58125,11 +58125,11 @@ var require_thenify = __commonJS({
         return;
       }
       debug("thenify");
-      return (resolve5, reject) => {
+      return (resolve6, reject) => {
         const p2 = this._loadRegistered();
         return p2.then(() => {
           this[kThenifyDoNotWrap] = true;
-          return resolve5(this._server);
+          return resolve6(this._server);
         }, reject);
       };
     }
@@ -58398,12 +58398,12 @@ var require_boot = __commonJS({
           throw new AVV_ERR_CALLBACK_NOT_FN("close", typeof func);
         }
       } else {
-        promise2 = new Promise(function(resolve5, reject) {
+        promise2 = new Promise(function(resolve6, reject) {
           func = function(err) {
             if (err) {
               return reject(err);
             }
-            resolve5();
+            resolve6();
           };
         });
       }
@@ -58423,7 +58423,7 @@ var require_boot = __commonJS({
         queueMicrotask(this.start.bind(this));
         return;
       }
-      return new Promise((resolve5, reject) => {
+      return new Promise((resolve6, reject) => {
         this._readyQ.push(readyPromiseCB);
         this.start();
         const relativeContext = this._current[0].server;
@@ -58431,7 +58431,7 @@ var require_boot = __commonJS({
           if (err) {
             reject(err);
           } else {
-            resolve5(relativeContext);
+            resolve6(relativeContext);
           }
           process.nextTick(done);
         }
@@ -59691,8 +59691,8 @@ var require_promise = __commonJS({
     var { kTestInternals } = require_symbols3();
     function withResolvers() {
       let res, rej;
-      const promise2 = new Promise((resolve5, reject) => {
-        res = resolve5;
+      const promise2 = new Promise((resolve6, reject) => {
+        res = resolve6;
         rej = reject;
       });
       return { promise: promise2, resolve: res, reject: rej };
@@ -59791,15 +59791,15 @@ var require_server = __commonJS({
         if (cb === void 0) {
           const listening = listenPromise.call(this, server, listenOptions);
           return listening.then((address) => {
-            const { promise: promise2, resolve: resolve5 } = PonyPromise.withResolvers();
+            const { promise: promise2, resolve: resolve6 } = PonyPromise.withResolvers();
             if (host === "localhost") {
               multipleBindings.call(this, server, httpHandler, options, listenOptions, () => {
                 this[kState].listening = true;
-                resolve5(address);
+                resolve6(address);
                 onListenHookRunner(this);
               });
             } else {
-              resolve5(address);
+              resolve6(address);
               onListenHookRunner(this);
             }
             return promise2;
@@ -59926,7 +59926,7 @@ var require_server = __commonJS({
       }
       return this.ready().then(() => {
         if (this[kState].aborted) return;
-        const { promise: promise2, resolve: resolve5, reject } = PonyPromise.withResolvers();
+        const { promise: promise2, resolve: resolve6, reject } = PonyPromise.withResolvers();
         const errEventHandler = (err) => {
           cleanup();
           this[kState].listening = false;
@@ -59935,7 +59935,7 @@ var require_server = __commonJS({
         const listeningEventHandler = () => {
           cleanup();
           this[kState].listening = true;
-          resolve5(logServerAddress.call(
+          resolve6(logServerAddress.call(
             this,
             server,
             listenOptions.listenTextResolver || defaultResolveServerListeningText
@@ -61516,7 +61516,7 @@ var require_reply = __commonJS({
   "../../node_modules/.pnpm/fastify@5.6.2/node_modules/fastify/lib/reply.js"(exports2, module2) {
     "use strict";
     var eos = require("node:stream").finished;
-    var Readable3 = require("node:stream").Readable;
+    var Readable4 = require("node:stream").Readable;
     var {
       kFourOhFourContext,
       kReplyErrorHandlerCalled,
@@ -62051,7 +62051,7 @@ var require_reply = __commonJS({
       if (payload.locked) {
         throw new FST_ERR_REP_READABLE_STREAM_LOCKED();
       }
-      const nodeStream = Readable3.fromWeb(payload);
+      const nodeStream = Readable4.fromWeb(payload);
       sendStream(nodeStream, res, reply);
     }
     function sendStream(payload, res, reply) {
@@ -77154,7 +77154,7 @@ var require_form_data = __commonJS({
   "../../node_modules/.pnpm/light-my-request@6.6.0/node_modules/light-my-request/lib/form-data.js"(exports2, module2) {
     "use strict";
     var { randomUUID: randomUUID5 } = require("node:crypto");
-    var { Readable: Readable3 } = require("node:stream");
+    var { Readable: Readable4 } = require("node:stream");
     var textEncoder;
     function isFormDataLike(payload) {
       return payload && typeof payload === "object" && typeof payload.append === "function" && typeof payload.delete === "function" && typeof payload.get === "function" && typeof payload.getAll === "function" && typeof payload.has === "function" && typeof payload.set === "function" && payload[Symbol.toStringTag] === "FormData";
@@ -77193,7 +77193,7 @@ Content-Type: ${value.type || "application/octet-stream"}\r
         }
         yield textEncoder.encode(`--${boundary}--`);
       }
-      const stream = Readable3.from(asyncIterator());
+      const stream = Readable4.from(asyncIterator());
       return {
         stream,
         contentType: `multipart/form-data; boundary=${boundary}`
@@ -77208,7 +77208,7 @@ Content-Type: ${value.type || "application/octet-stream"}\r
 var require_request3 = __commonJS({
   "../../node_modules/.pnpm/light-my-request@6.6.0/node_modules/light-my-request/lib/request.js"(exports2, module2) {
     "use strict";
-    var { Readable: Readable3, addAbortSignal } = require("node:stream");
+    var { Readable: Readable4, addAbortSignal } = require("node:stream");
     var util2 = require("node:util");
     var cookie = require_dist5();
     var assert2 = require("node:assert");
@@ -77246,7 +77246,7 @@ var require_request3 = __commonJS({
       }
     }
     function Request2(options) {
-      Readable3.call(this, {
+      Readable4.call(this, {
         autoDestroy: false
       });
       const parsedURL = parseURL(options.url || options.path, options.query);
@@ -77378,7 +77378,7 @@ var require_request3 = __commonJS({
         }
       });
     }
-    util2.inherits(Request2, Readable3);
+    util2.inherits(Request2, Readable4);
     util2.inherits(CustomRequest, Request2);
     Request2.prototype.destroy = function(error48) {
       if (this.destroyed || this._lightMyRequest.isDone) return;
@@ -77583,14 +77583,14 @@ var require_response = __commonJS({
   "../../node_modules/.pnpm/light-my-request@6.6.0/node_modules/light-my-request/lib/response.js"(exports2, module2) {
     "use strict";
     var http = require("node:http");
-    var { Writable, Readable: Readable3, addAbortSignal } = require("node:stream");
+    var { Writable, Readable: Readable4, addAbortSignal } = require("node:stream");
     var util2 = require("node:util");
     var setCookie = require_set_cookie();
     function Response3(req, onEnd, reject) {
       http.ServerResponse.call(this, req);
       if (req._lightMyRequest?.payloadAsStream) {
         const read = this.emit.bind(this, "drain");
-        this._lightMyRequest = { headers: null, trailers: {}, stream: new Readable3({ read }) };
+        this._lightMyRequest = { headers: null, trailers: {}, stream: new Readable4({ read }) };
         const signal = req._lightMyRequest.signal;
         if (signal) {
           addAbortSignal(signal, this._lightMyRequest.stream);
@@ -77736,7 +77736,7 @@ var require_response = __commonJS({
         if (response._lightMyRequest.stream) {
           return response._lightMyRequest.stream;
         }
-        return Readable3.from(response._lightMyRequest.payloadChunks);
+        return Readable4.from(response._lightMyRequest.payloadChunks);
       };
       return res;
     }
@@ -78664,9 +78664,9 @@ var require_light_my_request = __commonJS({
         const res = new Response3(req, callback);
         return makeRequest(dispatchFunc, server, req, res);
       } else {
-        return new Promise((resolve5, reject) => {
+        return new Promise((resolve6, reject) => {
           const req = new RequestConstructor(options);
-          const res = new Response3(req, resolve5, reject);
+          const res = new Response3(req, resolve6, reject);
           makeRequest(dispatchFunc, server, req, res);
         });
       }
@@ -84625,10 +84625,10 @@ var require_raw_body = __commonJS({
       if (done) {
         return readStream(stream, encoding, length, limit, wrap(done));
       }
-      return new Promise(function executor(resolve5, reject) {
+      return new Promise(function executor(resolve6, reject) {
         readStream(stream, encoding, length, limit, function onRead(err, buf) {
           if (err) return reject(err);
-          resolve5(buf);
+          resolve6(buf);
         });
       });
     }
@@ -84871,7 +84871,7 @@ var require_windows = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js"(exports2, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     function checkPathExt(path4, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
@@ -84896,12 +84896,12 @@ var require_windows = __commonJS({
       return checkPathExt(path4, options);
     }
     function isexe(path4, options, cb) {
-      fs5.stat(path4, function(er, stat) {
+      fs6.stat(path4, function(er, stat) {
         cb(er, er ? false : checkStat(stat, path4, options));
       });
     }
     function sync(path4, options) {
-      return checkStat(fs5.statSync(path4), path4, options);
+      return checkStat(fs6.statSync(path4), path4, options);
     }
   }
 });
@@ -84911,14 +84911,14 @@ var require_mode = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js"(exports2, module2) {
     module2.exports = isexe;
     isexe.sync = sync;
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     function isexe(path4, options, cb) {
-      fs5.stat(path4, function(er, stat) {
+      fs6.stat(path4, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
     function sync(path4, options) {
-      return checkStat(fs5.statSync(path4), options);
+      return checkStat(fs6.statSync(path4), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -84942,7 +84942,7 @@ var require_mode = __commonJS({
 // ../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "../../node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js"(exports2, module2) {
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -84960,12 +84960,12 @@ var require_isexe = __commonJS({
         if (typeof Promise !== "function") {
           throw new TypeError("callback not provided");
         }
-        return new Promise(function(resolve5, reject) {
+        return new Promise(function(resolve6, reject) {
           isexe(path4, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
-              resolve5(is);
+              resolve6(is);
             }
           });
         });
@@ -85031,27 +85031,27 @@ var require_which = __commonJS({
         opt = {};
       const { pathEnv, pathExt, pathExtExe } = getPathInfo(cmd, opt);
       const found = [];
-      const step = (i2) => new Promise((resolve5, reject) => {
+      const step = (i2) => new Promise((resolve6, reject) => {
         if (i2 === pathEnv.length)
-          return opt.all && found.length ? resolve5(found) : reject(getNotFoundError(cmd));
+          return opt.all && found.length ? resolve6(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i2];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
         const pCmd = path4.join(pathPart, cmd);
         const p2 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
-        resolve5(subStep(p2, i2, 0));
+        resolve6(subStep(p2, i2, 0));
       });
-      const subStep = (p2, i2, ii) => new Promise((resolve5, reject) => {
+      const subStep = (p2, i2, ii) => new Promise((resolve6, reject) => {
         if (ii === pathExt.length)
-          return resolve5(step(i2 + 1));
+          return resolve6(step(i2 + 1));
         const ext = pathExt[ii];
         isexe(p2 + ext, { pathExt: pathExtExe }, (er, is) => {
           if (!er && is) {
             if (opt.all)
               found.push(p2 + ext);
             else
-              return resolve5(p2 + ext);
+              return resolve6(p2 + ext);
           }
-          return resolve5(subStep(p2, i2, ii + 1));
+          return resolve6(subStep(p2, i2, ii + 1));
         });
       });
       return cb ? step(0).then((res) => cb(null, res), cb) : step(0);
@@ -85206,16 +85206,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "../../node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js"(exports2, module2) {
     "use strict";
-    var fs5 = require("fs");
+    var fs6 = require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs5.openSync(command, "r");
-        fs5.readSync(fd, buffer, 0, size, 0);
-        fs5.closeSync(fd);
+        fd = fs6.openSync(command, "r");
+        fs6.readSync(fd, buffer, 0, size, 0);
+        fs6.closeSync(fd);
       } catch (e2) {
       }
       return shebangCommand(buffer.toString());
@@ -87858,6 +87858,9 @@ async function writeAssetCache(assetPath, buffer, config2) {
   await fs.promises.writeFile(cachePath, buffer, { mode: 384 });
   return cachePath;
 }
+function isSkilderPath(filePath) {
+  return filePath.startsWith(SKILDER_FILE_PREFIX);
+}
 function resolveFilePath(filePath, config2) {
   const workingDirPrefix = config2.workingDir.endsWith(path.sep) ? config2.workingDir : config2.workingDir + path.sep;
   if (filePath.startsWith(SKILDER_ASSET_PREFIX)) {
@@ -89103,8 +89106,8 @@ function getElementAtPath(obj, path4) {
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
-  const promises3 = keys.map((key) => promisesObj[key]);
-  return Promise.all(promises3).then((results) => {
+  const promises4 = keys.map((key) => promisesObj[key]);
+  return Promise.all(promises4).then((results) => {
     const resolvedObj = {};
     for (let i2 = 0; i2 < keys.length; i2++) {
       resolvedObj[keys[i2]] = results[i2];
@@ -109452,9 +109455,9 @@ var SseMCPTransport = class {
     );
   }
   async start() {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.connected) {
-        return resolve5();
+        return resolve6();
       }
       this.abortController = new AbortController();
       const establishConnection = async (triedAuth = false) => {
@@ -109521,7 +109524,7 @@ var SseMCPTransport = class {
                     });
                   }
                   this.connected = true;
-                  resolve5();
+                  resolve6();
                 } else if (event === "message") {
                   try {
                     const message = JSONRPCMessageSchema.parse(
@@ -110098,7 +110101,7 @@ var DefaultMCPClient = class {
     resultSchema,
     options
   }) {
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (this.isClosed) {
         return reject(
           new MCPClientError({
@@ -110132,7 +110135,7 @@ var DefaultMCPClient = class {
         }
         try {
           const result = resultSchema.parse(response.result);
-          resolve5(result);
+          resolve6(result);
         } catch (error48) {
           const parseError = new MCPClientError({
             message: "Failed to parse server response",
@@ -110611,8 +110614,10 @@ function safeParseConfig(data) {
 }
 
 // ../common/src/mcp-transport.builders.ts
-function substituteEnvVars(value) {
+function substituteEnvVars(value, extraEnv = {}) {
   return value.replace(/\$\{([^}]+)\}/g, (_3, varName) => {
+    if (varName in extraEnv)
+      return extraEnv[varName];
     return process.env[varName] || "";
   });
 }
@@ -110634,7 +110639,7 @@ function getCommandFromRegistryType(registryType) {
       throw new Error(`Unsupported registry type: ${registryType}. Supported types: ${supportedTypes.join(", ")}`);
   }
 }
-function buildStdioArgs(pkg) {
+function buildStdioArgs(pkg, extraEnv = {}) {
   const args = [];
   const packageArgs = pkg.packageArguments || [];
   const runtimeArgs = pkg.runtimeArguments || [];
@@ -110644,10 +110649,10 @@ function buildStdioArgs(pkg) {
     if (arg.type === "named" && arg.name) {
       args.push(`--${arg.name}`);
       if (arg.value) {
-        args.push(substituteEnvVars(String(arg.value)));
+        args.push(substituteEnvVars(String(arg.value), extraEnv));
       }
     } else if (arg.value) {
-      args.push(substituteEnvVars(String(arg.value)));
+      args.push(substituteEnvVars(String(arg.value), extraEnv));
     }
   });
   if (registryType === "oci") {
@@ -110661,10 +110666,10 @@ function buildStdioArgs(pkg) {
     if (arg.type === "named" && arg.name) {
       args.push(`--${arg.name}`);
       if (arg.value) {
-        args.push(substituteEnvVars(String(arg.value)));
+        args.push(substituteEnvVars(String(arg.value), extraEnv));
       }
     } else if (arg.value) {
-      args.push(substituteEnvVars(String(arg.value)));
+      args.push(substituteEnvVars(String(arg.value), extraEnv));
     }
   });
   return args;
@@ -110697,8 +110702,8 @@ function buildStdioTransport(pkg, defaultEnv = {}) {
     throw new Error(`Package registryType is required`);
   }
   const command = registryType === "none" ? identifier : getCommandFromRegistryType(registryType);
-  const args = buildStdioArgs(pkg);
   const env = buildEnvironmentVariables(envVars, defaultEnv);
+  const args = buildStdioArgs(pkg, env);
   return {
     command,
     args,
@@ -137125,7 +137130,7 @@ var InfomaniakTranscriptionModel = class {
         };
       }
       if (attempt < maxRetries - 1) {
-        await new Promise((resolve5) => setTimeout(resolve5, delayMs));
+        await new Promise((resolve6) => setTimeout(resolve6, delayMs));
       }
     }
     throw new Error(`Transcription timed out after ${maxRetries} attempts`);
@@ -142852,7 +142857,7 @@ var Protocol = class {
           return;
         }
         const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-        await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+        await new Promise((resolve6) => setTimeout(resolve6, pollInterval));
         options?.signal?.throwIfAborted();
       }
     } catch (error48) {
@@ -142869,7 +142874,7 @@ var Protocol = class {
    */
   request(request, resultSchema, options) {
     const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       const earlyReject = (error48) => {
         reject(error48);
       };
@@ -142947,7 +142952,7 @@ var Protocol = class {
           if (!parseResult.success) {
             reject(parseResult.error);
           } else {
-            resolve5(parseResult.data);
+            resolve6(parseResult.data);
           }
         } catch (error48) {
           reject(error48);
@@ -143208,12 +143213,12 @@ var Protocol = class {
       }
     } catch {
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       if (signal.aborted) {
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
         return;
       }
-      const timeoutId = setTimeout(resolve5, interval);
+      const timeoutId = setTimeout(resolve6, interval);
       signal.addEventListener("abort", () => {
         clearTimeout(timeoutId);
         reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -144083,12 +144088,12 @@ var StdioServerTransport = class {
     this.onclose?.();
   }
   send(message) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       const json3 = serializeMessage(message);
       if (this._stdout.write(json3)) {
-        resolve5();
+        resolve6();
       } else {
-        this._stdout.once("drain", resolve5);
+        this._stdout.once("drain", resolve6);
       }
     });
   }
@@ -144176,14 +144181,45 @@ var FileService = class FileService2 extends LifecycleService {
       SKILDER_MAX_FILE_SIZE_MB: String(this.maxFileSizeMB)
     };
   }
-  async sweepDirByAge(dir, maxAgeMs, label) {
+  /**
+   * Resolve a relative path under the working dir for transient files written
+   * by MCP servers (e.g. `<workspaceId>/playwright-mcp/shot.png`). Rejects any
+   * `..` segment so callers can't escape the working dir.
+   */
+  resolveTransientPath(rel) {
+    const resolved = path2.resolve(this.workingDir, rel);
+    if (resolved !== this.workingDir && !resolved.startsWith(this.workingDir + path2.sep)) {
+      throw new Error(`Path traversal detected in "${rel}".`);
+    }
+    return resolved;
+  }
+  /**
+   * Resolve the per-workspace working directory used for transient files
+   * produced by MCP servers (e.g. Playwright screenshots). The segment is the
+   * raw workspaceId; callers must pass a trusted id from auth context.
+   */
+  getWorkspaceDir(workspaceId) {
+    if (!workspaceId || workspaceId.includes("/") || workspaceId.includes("..") || workspaceId.includes(path2.sep)) {
+      throw new Error(`Invalid workspaceId for workspace dir: "${workspaceId}"`);
+    }
+    return path2.join(this.workingDir, workspaceId);
+  }
+  async sweepDirByAge(dir, maxAgeMs, label, maxDepth = 2, skipDirs = /* @__PURE__ */ new Set()) {
     let deletedCount = 0;
     let bytesFreed = 0;
-    try {
-      const entries = await fs3.promises.readdir(dir);
-      const now2 = Date.now();
+    const now2 = Date.now();
+    const walk = async (current, depth) => {
+      let entries;
+      try {
+        entries = await fs3.promises.readdir(current);
+      } catch (error48) {
+        if (error48 instanceof Error && "code" in error48 && error48.code === "ENOENT")
+          return;
+        this.logger.warn({ dir: current, error: error48 }, `${label} failed to read directory`);
+        return;
+      }
       for (const entry of entries) {
-        const filePath = path2.join(dir, entry);
+        const filePath = path2.join(current, entry);
         try {
           const stat = await fs3.promises.lstat(filePath);
           if (stat.isSymbolicLink()) {
@@ -144195,6 +144231,8 @@ var FileService = class FileService2 extends LifecycleService {
             await fs3.promises.unlink(filePath);
             bytesFreed += stat.size;
             deletedCount++;
+          } else if (stat.isDirectory() && depth < maxDepth && !skipDirs.has(filePath)) {
+            await walk(filePath, depth + 1);
           }
         } catch (error48) {
           if (error48 instanceof Error && "code" in error48 && error48.code === "ENOENT")
@@ -144202,16 +144240,13 @@ var FileService = class FileService2 extends LifecycleService {
           this.logger.warn({ filePath, error: error48 }, `${label} failed to process file`);
         }
       }
-    } catch (error48) {
-      if (error48 instanceof Error && "code" in error48 && error48.code === "ENOENT") {
-        return { deletedCount, bytesFreed };
-      }
-      this.logger.warn({ error: error48 }, `${label} failed to read directory`);
-    }
+    };
+    await walk(dir, 0);
     return { deletedCount, bytesFreed };
   }
   async runGarbageCollection() {
-    const { deletedCount, bytesFreed } = await this.sweepDirByAge(this.workingDir, this.gcMaxAgeMs, "GC");
+    const skip2 = /* @__PURE__ */ new Set([this.getAssetCacheDir()]);
+    const { deletedCount, bytesFreed } = await this.sweepDirByAge(this.workingDir, this.gcMaxAgeMs, "GC", 2, skip2);
     if (deletedCount > 0) {
       this.logger.info({ deletedCount, bytesFreed }, `GC completed: ${deletedCount} file(s) deleted, ${bytesFreed} bytes freed`);
     }
@@ -144268,7 +144303,7 @@ var FileService = class FileService2 extends LifecycleService {
   }
   /**
    * Stream an asset to the local cache without buffering the whole payload in
-   * memory. Used by the runtime's `download_asset` flow to handle large files
+   * memory. Used by the runtime's `read_skilder_file` flow to handle large files
    * (the new content-addressed `/assets/:id` endpoint streams bytes directly).
    *
    * Enforces the same size limit as `cacheAsset`. Returns the absolute path
@@ -145192,22 +145227,26 @@ function errorResult(text2, skillIds) {
 function appendReferencedResources(lines, mentions, related, skillName) {
   if (mentions.length === 0) return;
   lines.push("## Resources");
-  lines.push("Only resources referenced in the skill description or instructions are shown.");
   lines.push("");
   for (const m2 of mentions) {
-    const resourcePath = `/${skillName}/${m2.qualifiedName}`;
     const entry = related.find((r2) => (r2.path ? `${r2.path}/${r2.name}` : r2.name) === m2.qualifiedName);
-    lines.push(`### ${m2.name}`);
+    const path4 = m2.class === "downloadable" && entry?.id ? generateSkilderAssetPath(entry.id, entry.name) : `/${skillName}/${m2.qualifiedName}`;
+    lines.push(`### ${m2.name} (${m2.class})`);
     if (entry?.description) {
       lines.push(entry.description);
     }
-    lines.push("");
     if (m2.class === "learnable") {
-      lines.push(`**Consume:** \`learn --path "${resourcePath}"\``);
+      lines.push(`**Consume:** \`learn --path "${path4}"\``);
     } else if (m2.class === "executable") {
-      lines.push(`**Consume:** \`execute_script --path "${resourcePath}"\``);
+      lines.push(`**Consume:** \`execute_script --path "${path4}"\``);
     } else {
-      lines.push(`**Consume:** \`download_asset --path "${resourcePath}"\``);
+      lines.push("**How to use:**");
+      lines.push(
+        `- **Default \u2014 pass URI to a tool:** send the path as-is (e.g. \`{ "filePath": "${path4}" }\`). Do NOT call \`read_skilder_file\` unless the tool requires raw bytes.`
+      );
+      lines.push(
+        `- **Read bytes (text/image only):** \`read_skilder_file --path "${path4}"\` \u2014 use only for text inspection or image preview. Binary files (PDF, zip, xlsx, etc.) will fail. Always check before hand that you really need the bytes before attempting a read.`
+      );
     }
     lines.push("");
   }
@@ -145860,41 +145899,187 @@ To execute this script:
     skillId: skill.id
   };
 }
-async function handleDownloadAsset(args, ctx) {
+
+// src/services/static-tools/read-skilder-file.handler.ts
+var fs5 = __toESM(require("fs"));
+var import_node_stream3 = require("node:stream");
+var IMAGE_EXTENSIONS = {
+  ".png": "image/png",
+  ".jpg": "image/jpeg",
+  ".jpeg": "image/jpeg",
+  ".gif": "image/gif",
+  ".webp": "image/webp",
+  ".svg": "image/svg+xml"
+};
+var TEXT_EXTENSIONS = {
+  ".txt": "text/plain",
+  ".md": "text/markdown",
+  ".markdown": "text/markdown",
+  ".json": "application/json",
+  ".xml": "application/xml",
+  ".csv": "text/csv",
+  ".tsv": "text/tab-separated-values",
+  ".yaml": "text/yaml",
+  ".yml": "text/yaml",
+  ".html": "text/html",
+  ".htm": "text/html",
+  ".log": "text/plain"
+};
+function extensionOf(filePath) {
+  const lower = filePath.toLowerCase();
+  const dot = lower.lastIndexOf(".");
+  return dot === -1 ? void 0 : lower.slice(dot);
+}
+function imageMimeFromExtension(filePath) {
+  const ext = extensionOf(filePath);
+  return ext ? IMAGE_EXTENSIONS[ext] : void 0;
+}
+function textMimeFromExtension(filePath) {
+  const ext = extensionOf(filePath);
+  return ext ? TEXT_EXTENSIONS[ext] : void 0;
+}
+function getBackendUrl4() {
+  return (process.env.SKILDER_BACKEND_URL || "http://localhost:3000").replace(/\/$/, "");
+}
+async function readLocalBytes(absolutePath, fileService) {
+  const stat = await fs5.promises.stat(absolutePath);
+  if (stat.size > fileService.maxAssetBytes) {
+    throw new DownloadAssetError(
+      `Error: File "${absolutePath}" is ${stat.size} bytes, exceeding the ${Math.floor(fileService.maxAssetBytes / (1024 * 1024))}MB limit.`
+    );
+  }
+  return fs5.promises.readFile(absolutePath);
+}
+async function fetchAssetIntoCache(assetUri, resourceId, deps) {
+  const assetUrl = `${getBackendUrl4()}/assets/${encodeURIComponent(resourceId)}`;
+  let response;
+  try {
+    response = await fetch(assetUrl, { headers: { Authorization: `Bearer ${deps.userKey}` } });
+  } catch (err) {
+    deps.logger.error({ err, assetUri, url: assetUrl }, "Failed to fetch asset from backend");
+    throw new DownloadAssetError(
+      `Error: Failed to download asset "${assetUri}". Please try again. If the issue persists, verify that the Skilder backend is reachable and your authentication is valid.`
+    );
+  }
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new DownloadAssetError(`Error: Asset "${assetUri}" has not been uploaded yet, or no longer exists.`);
+    }
+    if (response.status === 401 || response.status === 403) {
+      throw new DownloadAssetError(`Error: Not authorized to fetch "${assetUri}".`);
+    }
+    throw new DownloadAssetError(`Error: Failed to fetch "${assetUri}" (HTTP ${response.status}).`);
+  }
+  if (!response.body) {
+    throw new DownloadAssetError(`Error: Backend returned no body for "${assetUri}".`);
+  }
+  const contentLengthHeader = response.headers.get("content-length");
+  const expectedBytes = contentLengthHeader ? Number.parseInt(contentLengthHeader, 10) : void 0;
+  if (expectedBytes !== void 0 && Number.isFinite(expectedBytes) && expectedBytes > deps.fileService.maxAssetBytes) {
+    const maxMB = Math.floor(deps.fileService.maxAssetBytes / (1024 * 1024));
+    throw new DownloadAssetError(`Error: "${assetUri}" is ${expectedBytes} bytes, exceeding the ${maxMB}MB limit.`);
+  }
+  const nodeStream = import_node_stream3.Readable.fromWeb(response.body);
+  try {
+    return await deps.fileService.cacheAssetFromStream(assetUri, nodeStream, {
+      expectedBytes: Number.isFinite(expectedBytes) ? expectedBytes : void 0
+    });
+  } catch (writeError) {
+    if (writeError instanceof AssetTooLargeError) {
+      const maxMB = Math.floor(writeError.maxBytes / (1024 * 1024));
+      throw new DownloadAssetError(
+        `Error: "${assetUri}" is ${writeError.bufferBytes} bytes, exceeding the ${maxMB}MB limit.`
+      );
+    }
+    if (writeError instanceof AssetTruncatedError) {
+      throw new DownloadAssetError(
+        `Error: "${assetUri}" download was truncated (received ${writeError.receivedBytes} of ${writeError.expectedBytes} bytes). Please retry.`
+      );
+    }
+    deps.logger.error({ err: writeError, assetUri }, "Failed to cache asset");
+    throw new DownloadAssetError(`Error: Failed to cache "${assetUri}".`);
+  }
+}
+function buildSuccessResult(reportedPath, absolutePath, bytes, skillIds) {
+  const content = [];
+  const imageMime = imageMimeFromExtension(absolutePath);
+  if (imageMime) {
+    content.push({ type: "image", mimeType: imageMime, data: bytes.toString("base64") });
+  } else {
+    const textMime = textMimeFromExtension(absolutePath);
+    if (textMime) {
+      content.push({ type: "text", text: bytes.toString("utf8") });
+    } else {
+      content.push({
+        type: "text",
+        text: `File "${reportedPath}" is binary (${bytes.length} bytes). It cannot be inlined; pass the path to a binary-aware tool (e.g. \`execute_script\`) to process it.`
+      });
+    }
+  }
+  return {
+    response: { content },
+    ...skillIds ? { skillIds } : {}
+  };
+}
+async function handleReadSkilderFile(args, ctx) {
   const path4 = args.path;
   if (!path4) {
     return errorResult(
       `Error: path is required.
 
-Usage: download_asset --path "/Skill Name/filename.ext"
+Usage:
+- \`read_skilder_file --path "@skilder-file:/<workspaceId>/playwright-mcp/shot.png"\`
+- \`read_skilder_file --path "@skilder-asset:/<resourceId>/file.xlsx"\``
+    );
+  }
+  if (!ctx.fileService) {
+    return errorResult("Error: File service is not available in this runtime configuration.");
+  }
+  if (!isSkilderPath(path4) && !isSkilderAssetPath(path4)) {
+    return errorResult(
+      `Error: path must be a Skilder URI.
 
-Examples:
-- \`download_asset --path "/Data Processing/template.xlsx"\`
-- \`download_asset --path "/Reports/logo.png"\``
+Accepted forms:
+- \`@skilder-file:/<workspaceId>/...\` for transient runtime files.
+- \`@skilder-asset:/<resourceId>/<filename>\` for skill assets (use \`learn\` to discover these).`
     );
   }
   try {
-    const { assetPath, itemName, mimetype, skillId } = await downloadSkillAsset(path4, {
-      catalog: ctx.catalog,
-      fileService: ctx.fileService,
-      userKey: ctx.identity.userKey,
-      logger: ctx.logger
-    });
-    return {
-      response: {
-        content: [
-          {
-            type: "text",
-            text: `Successfully downloaded "${itemName}" (${mimetype}).
-
-**Local path:** \`${assetPath}\`
-
-This file can be used with other file I/O tools that accept \`@skilder-asset:/\` paths. This path can be resolved by any runtime \u2014 the asset will be fetched from the backend automatically if not cached locally.`
-          }
-        ]
-      },
-      skillIds: [skillId]
-    };
+    if (isSkilderPath(path4)) {
+      const rel = path4.slice("@skilder-file:/".length);
+      let fullPath;
+      try {
+        fullPath = ctx.fileService.resolveTransientPath(rel);
+      } catch {
+        return errorResult(`Error: Path traversal detected in "${path4}".`);
+      }
+      let bytes2;
+      try {
+        bytes2 = await readLocalBytes(fullPath, ctx.fileService);
+      } catch (err) {
+        if (err instanceof DownloadAssetError) return errorResult(err.userMessage);
+        if (err instanceof Error && "code" in err && err.code === "ENOENT") {
+          return errorResult(`Error: File "${path4}" not found. It may have been garbage-collected or never created.`);
+        }
+        throw err;
+      }
+      return buildSuccessResult(path4, fullPath, bytes2);
+    }
+    const { resourceId } = parseAssetPath(path4);
+    if (!ctx.identity.userKey) {
+      return errorResult("Error: Authentication is not available. Cannot fetch assets without a user key.");
+    }
+    const cachePath = ctx.fileService.getAssetCachePath(path4);
+    const cached2 = await ctx.fileService.isAssetCached(path4);
+    if (!cached2) {
+      await fetchAssetIntoCache(path4, resourceId, {
+        fileService: ctx.fileService,
+        userKey: ctx.identity.userKey,
+        logger: ctx.logger
+      });
+    }
+    const bytes = await readLocalBytes(cachePath, ctx.fileService);
+    return buildSuccessResult(path4, cachePath, bytes);
   } catch (error48) {
     if (error48 instanceof DownloadAssetError) {
       return errorResult(error48.userMessage, error48.skillId ? [error48.skillId] : void 0);
@@ -145952,7 +146137,7 @@ var STATIC_TOOL_NAMES = [
   "execute_script",
   "feedback_skill",
   "call_tool",
-  "download_asset",
+  "read_skilder_file",
   "delegate"
 ];
 var HANDLERS = {
@@ -145961,7 +146146,7 @@ var HANDLERS = {
   execute_script: handleExecuteScript,
   feedback_skill: handleFeedbackSkill,
   call_tool: handleCallTool,
-  download_asset: handleDownloadAsset,
+  read_skilder_file: handleReadSkilderFile,
   delegate: handleDelegate
 };
 var StaticToolRegistry = class StaticToolRegistry2 {
@@ -146149,7 +146334,7 @@ var SkillService = class SkillService2 extends LifecycleService {
       this.prepareCallToolTool()
     ];
     if (this.fileService) {
-      tools.push(this.prepareDownloadAssetTool());
+      tools.push(this.prepareReadSkilderFileTool());
     }
     if (process.env.SKILDER_ENABLE_AGENT_DELEGATE === "true" && (this.identity.delegateDepth ?? 0) < MAX_DELEGATE_DEPTH) {
       tools.push(this.prepareDelegateTool());
@@ -146348,41 +146533,47 @@ Scripts run on their linked runtime.`,
     };
   }
   /**
-   * Prepare the download_asset tool definition.
-   * Downloads a binary asset from a skill and saves it to a local file.
+   * Prepare the read_skilder_file tool definition.
+   * Reads a file from any Skilder-managed location and returns it (plus an
+   * inline image content block for image MIME types).
    */
-  prepareDownloadAssetTool() {
+  prepareReadSkilderFileTool() {
     return {
-      name: "download_asset",
-      title: "download_asset",
-      description: `Download a binary asset from a skill and save it to a local file. Returns a \`@skilder-file:/\` path for use by other I/O file tools.
+      name: "read_skilder_file",
+      title: "read_skilder_file",
+      description: `Read the bytes of a Skilder-managed file and return them in a form the agent can directly consume. Use this when you need to actually see/process the file's contents (e.g. look at a screenshot, read a CSV) \u2014 not when you just need to pass a path to another tool.
 
-Path format: \`/Skill Name/filename.ext\`
+Returned content depends on the file type:
+- Images (png, jpg, gif, webp, svg) \u2014 inline image content block so vision-capable agents can see the file directly.
+- Text-ish files (text/*, JSON, XML, CSV) \u2014 inline text content with the file's contents.
+- Other binary files \u2014 handle via a binary-aware tool (e.g. \`execute_script\`); the Skilder path you already have is what that tool needs.
 
-Examples:
-- \`download_asset --path "/Data Processing/template.xlsx"\`
-- \`download_asset --path "/Reports/logo.png"\`
+Accepted path forms:
+- \`@skilder-file:/<path>\` \u2014 transient runtime file (e.g. an MCP-produced screenshot under \`<workspaceId>/playwright-mcp/\`).
+- \`@skilder-asset:/<resourceId>/<filename>\` \u2014 backend-hosted skill asset; fetched on cache miss. Surfaced by \`learn\`.
 
-The path must point to a downloadable (binary) resource in a skill's related items. Learnable (text) resources should be accessed via \`learn\`, and executable scripts via \`execute_script\`.`,
+Examples:
+- \`read_skilder_file --path "@skilder-file:/ws123/playwright-mcp/step-01.png"\`
+- \`read_skilder_file --path "@skilder-asset:/0xabc/report.csv"\``,
       inputSchema: {
         type: "object",
         properties: {
           path: {
             type: "string",
-            description: "Path to the downloadable asset. Format: /Skill Name/filename.ext"
+            description: "Skilder URI: @skilder-file:/<path> or @skilder-asset:/<resourceId>/<filename>"
           }
         },
         required: ["path"]
       },
       annotations: {
-        title: "Download Asset",
-        readOnlyHint: false,
-        idempotentHint: false,
+        title: "Read Skilder File",
+        readOnlyHint: true,
+        idempotentHint: true,
         openWorldHint: false
       },
       __routing: {
         type: "static",
-        toolName: "download_asset",
+        toolName: "read_skilder_file",
         workspaceId: this.identity.workspaceId
       }
     };
@@ -147242,7 +147433,7 @@ var McpServer = class {
     let task = createTaskResult.task;
     const pollInterval = task.pollInterval ?? 5e3;
     while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-      await new Promise((resolve5) => setTimeout(resolve5, pollInterval));
+      await new Promise((resolve6) => setTimeout(resolve6, pollInterval));
       const updatedTask = await extra.taskStore.getTask(taskId);
       if (!updatedTask) {
         throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -148971,7 +149162,7 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
         });
         if (!chunk) {
           if (i2 === 1) {
-            await new Promise((resolve5) => setTimeout(resolve5));
+            await new Promise((resolve6) => setTimeout(resolve6));
             maxReadCount = 3;
             continue;
           }
@@ -149467,9 +149658,9 @@ data:
       const initRequest = messages.find((m2) => isInitializeRequest(m2));
       const clientProtocolVersion = initRequest ? initRequest.params.protocolVersion : req.headers.get("mcp-protocol-version") ?? DEFAULT_NEGOTIATED_PROTOCOL_VERSION;
       if (this._enableJsonResponse) {
-        return new Promise((resolve5) => {
+        return new Promise((resolve6) => {
           this._streamMapping.set(streamId, {
-            resolveJson: resolve5,
+            resolveJson: resolve6,
             cleanup: () => {
               this._streamMapping.delete(streamId);
             }
@@ -150173,7 +150364,7 @@ var import_readline = require("readline");
 // ../../node_modules/.pnpm/@modelcontextprotocol+sdk@1.27.1_zod@4.3.6/node_modules/@modelcontextprotocol/sdk/dist/esm/client/stdio.js
 var import_cross_spawn = __toESM(require_cross_spawn(), 1);
 var import_node_process2 = __toESM(require("node:process"), 1);
-var import_node_stream3 = require("node:stream");
+var import_node_stream4 = require("node:stream");
 var DEFAULT_INHERITED_ENV_VARS = import_node_process2.default.platform === "win32" ? [
   "APPDATA",
   "HOMEDRIVE",
@@ -150211,7 +150402,7 @@ var StdioClientTransport = class {
     this._stderrStream = null;
     this._serverParams = server;
     if (server.stderr === "pipe" || server.stderr === "overlapped") {
-      this._stderrStream = new import_node_stream3.PassThrough();
+      this._stderrStream = new import_node_stream4.PassThrough();
     }
   }
   /**
@@ -150221,7 +150412,7 @@ var StdioClientTransport = class {
     if (this._process) {
       throw new Error("StdioClientTransport already started! If using Client class, note that connect() calls start() automatically.");
     }
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       this._process = (0, import_cross_spawn.default)(this._serverParams.command, this._serverParams.args ?? [], {
         // merge default env with server env because mcp server needs some env vars
         env: {
@@ -150238,7 +150429,7 @@ var StdioClientTransport = class {
         this.onerror?.(error48);
       });
       this._process.on("spawn", () => {
-        resolve5();
+        resolve6();
       });
       this._process.on("close", (_code) => {
         this._process = void 0;
@@ -150297,22 +150488,22 @@ var StdioClientTransport = class {
     if (this._process) {
       const processToClose = this._process;
       this._process = void 0;
-      const closePromise = new Promise((resolve5) => {
+      const closePromise = new Promise((resolve6) => {
         processToClose.once("close", () => {
-          resolve5();
+          resolve6();
         });
       });
       try {
         processToClose.stdin?.end();
       } catch {
       }
-      await Promise.race([closePromise, new Promise((resolve5) => setTimeout(resolve5, 2e3).unref())]);
+      await Promise.race([closePromise, new Promise((resolve6) => setTimeout(resolve6, 2e3).unref())]);
       if (processToClose.exitCode === null) {
         try {
           processToClose.kill("SIGTERM");
         } catch {
         }
-        await Promise.race([closePromise, new Promise((resolve5) => setTimeout(resolve5, 2e3).unref())]);
+        await Promise.race([closePromise, new Promise((resolve6) => setTimeout(resolve6, 2e3).unref())]);
       }
       if (processToClose.exitCode === null) {
         try {
@@ -150324,15 +150515,15 @@ var StdioClientTransport = class {
     this._readBuffer.clear();
   }
   send(message) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       if (!this._process?.stdin) {
         throw new Error("Not connected");
       }
       const json3 = serializeMessage(message);
       if (this._process.stdin.write(json3)) {
-        resolve5();
+        resolve6();
       } else {
-        this._process.stdin.once("drain", resolve5);
+        this._process.stdin.once("drain", resolve6);
       }
     });
   }
@@ -150431,7 +150622,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
     }
   }
   spawnProcess(command, args, timeout2, env) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let stdout = "";
       let stderr = "";
       let killed = false;
@@ -150476,7 +150667,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
       child.on("error", (error48) => {
         clearTimeout(timeoutId);
         this.logger.error({ err: error48, command }, "Spawned process emitted error");
-        resolve5({
+        resolve6({
           success: false,
           stdout,
           stderr,
@@ -150486,7 +150677,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
       child.on("close", (exitCode) => {
         clearTimeout(timeoutId);
         if (outputTruncated) {
-          resolve5({
+          resolve6({
             success: false,
             stdout,
             stderr,
@@ -150495,7 +150686,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
           return;
         }
         if (killed) {
-          resolve5({
+          resolve6({
             success: false,
             stdout,
             stderr,
@@ -150504,14 +150695,14 @@ var ScriptExecutorService = class ScriptExecutorService2 {
           return;
         }
         if (exitCode === 0) {
-          resolve5({
+          resolve6({
             success: true,
             stdout,
             stderr: stderr || void 0,
             exitCode: 0
           });
         } else {
-          resolve5({
+          resolve6({
             success: false,
             stdout,
             stderr,
@@ -150557,7 +150748,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
     }
   }
   spawnInteractiveProcess(command, args, timeout2, toolCallTimeout, onRequest, env) {
-    return new Promise((resolve5) => {
+    return new Promise((resolve6) => {
       let stderr = "";
       let killed = false;
       let outputTruncated = false;
@@ -150719,7 +150910,7 @@ var ScriptExecutorService = class ScriptExecutorService2 {
         }
         const stdout = outputChunks.join("\n");
         const consoleOutput = consoleChunks.join("\n") || void 0;
-        resolve5({ success: false, stdout, consoleOutput, stderr, error: error48.message });
+        resolve6({ success: false, stdout, consoleOutput, stderr, error: error48.message });
       });
       child.on("close", async (exitCode) => {
         childExited = true;
@@ -150733,17 +150924,17 @@ var ScriptExecutorService = class ScriptExecutorService2 {
         const stdout = outputChunks.join("\n");
         const consoleOutput = consoleChunks.join("\n") || void 0;
         if (outputTruncated) {
-          resolve5({ success: false, stdout, consoleOutput, stderr, error: `Script output exceeded maximum size of ${MAX_SCRIPT_OUTPUT_SIZE / (1024 * 1024)}MB` });
+          resolve6({ success: false, stdout, consoleOutput, stderr, error: `Script output exceeded maximum size of ${MAX_SCRIPT_OUTPUT_SIZE / (1024 * 1024)}MB` });
           return;
         }
         if (killed) {
-          resolve5({ success: false, stdout, consoleOutput, stderr, error: `Script execution timed out after ${currentTimeout}ms` });
+          resolve6({ success: false, stdout, consoleOutput, stderr, error: `Script execution timed out after ${currentTimeout}ms` });
           return;
         }
         if (exitCode === 0) {
-          resolve5({ success: true, stdout, consoleOutput, stderr: stderr || void 0, exitCode: 0 });
+          resolve6({ success: true, stdout, consoleOutput, stderr: stderr || void 0, exitCode: 0 });
         } else {
-          resolve5({
+          resolve6({
             success: false,
             stdout,
             consoleOutput,
@@ -153027,7 +153218,7 @@ var SSEClientTransport = class {
   }
   _startOrAuth() {
     const fetchImpl = this?._eventSourceInit?.fetch ?? this._fetch ?? fetch;
-    return new Promise((resolve5, reject) => {
+    return new Promise((resolve6, reject) => {
       this._eventSource = new EventSource(this._url.href, {
         ...this._eventSourceInit,
         fetch: async (url2, init) => {
@@ -153048,7 +153239,7 @@ var SSEClientTransport = class {
       this._abortController = new AbortController();
       this._eventSource.onerror = (event) => {
         if (event.code === 401 && this._authProvider) {
-          this._authThenStart().then(resolve5, reject);
+          this._authThenStart().then(resolve6, reject);
           return;
         }
         const error48 = new SseError(event.code, event.message, event);
@@ -153070,7 +153261,7 @@ var SSEClientTransport = class {
           void this.close();
           return;
         }
-        resolve5();
+        resolve6();
       });
       this._eventSource.onmessage = (event) => {
         const messageEvent = event;
@@ -153226,7 +153417,11 @@ var ToolServerService = class ToolServerService2 extends LifecycleService {
     if (this.config.transport === dgraph_resolvers_types_exports.McpTransportType.Stdio && "identifier" in parsedConfig) {
       this.logger.info(`Setting STDIO transport for ${this.config.name}`);
       const defaultEnv = getDefaultEnvironment();
-      const stdioConfig = buildStdioTransport(parsedConfig, { ...defaultEnv, LOG_LEVEL: "silent" });
+      const stdioConfig = buildStdioTransport(parsedConfig, {
+        ...defaultEnv,
+        LOG_LEVEL: "silent",
+        ...this.additionalEnv
+      });
       Object.assign(stdioConfig.env, this.additionalEnv);
       this.isPythonServer = parsedConfig.registryType === "pypi" || stdioConfig.command === "uvx";
       this.transport = new StdioClientTransport({
@@ -153360,7 +153555,7 @@ var ToolServerService = class ToolServerService2 extends LifecycleService {
           while (Date.now() - startTime < 1e3) {
             try {
               process.kill(pid, 0);
-              await new Promise((resolve5) => setTimeout(resolve5, 50));
+              await new Promise((resolve6) => setTimeout(resolve6, 50));
             } catch {
               this.logger.debug(`Process ${pid} exited gracefully`);
               break;
@@ -153825,6 +154020,24 @@ var GET_SKILL_RELATED_QUERY = `
     }
   }
 `;
+function rewriteWorkspacePathsInResult(result, workspaceId, workspaceDir) {
+  if (!result || !Array.isArray(result.content) || !workspaceDir)
+    return result;
+  const escaped = workspaceDir.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const pattern = new RegExp(escaped, "g");
+  const replacement = `@skilder-file:/${workspaceId}`;
+  const rewritten = result.content.map((block) => {
+    if (block && block.type === "text" && typeof block.text === "string") {
+      const text2 = block.text;
+      const next = text2.replace(pattern, replacement);
+      if (next === text2)
+        return block;
+      return { ...block, text: next };
+    }
+    return block;
+  });
+  return { ...result, content: rewritten };
+}
 function formatScriptError(stderr, exitCode) {
   const lines = stderr.split("\n");
   let errorMessage = "";
@@ -153926,10 +154139,10 @@ var ToolService = class ToolService2 extends LifecycleService {
     return mcpServerId;
   }
   parseInstanceKey(key) {
-    const sep2 = key.indexOf(":");
-    if (sep2 === -1)
+    const sep3 = key.indexOf(":");
+    if (sep3 === -1)
       return { mcpServerId: key };
-    return { mcpServerId: key.slice(0, sep2), userId: key.slice(sep2 + 1) };
+    return { mcpServerId: key.slice(0, sep3), userId: key.slice(sep3 + 1) };
   }
   /** All live instance keys belonging to a given MCP server (1 for shared, N for per-user). */
   getInstanceKeysForServer(mcpServerId) {
@@ -154219,7 +154432,7 @@ var ToolService = class ToolService2 extends LifecycleService {
       this.publishMCPServerStatus(void 0, mcpServer.id, "ERROR", "Server has no workspace association");
       throw new Error(`MCP Server ${mcpServer.name} has no workspace association`);
     }
-    const mcpServerService = this.toolServerServiceFactory(mcpServer, roots, authProvider);
+    const mcpServerService = this.toolServerServiceFactory(mcpServer, roots, authProvider, mcpServer.workspace?.id);
     this.logger.info({ instanceKey, userId }, `Activating MCPServer: ${mcpServer.name} with ${mcpServer.tools?.length ?? 0} tools, and roots: ${JSON.stringify(roots)}`);
     if (this.mcpServers.has(instanceKey)) {
       this.logger.debug(`MCPServer ${mcpServer.name} instance ${instanceKey} already running -> shutting down`);
@@ -154456,8 +154669,15 @@ var ToolService = class ToolService2 extends LifecycleService {
             scriptMsg.respond(response);
           };
           if (this.inFlightScripts >= MAX_CONCURRENT_SCRIPTS) {
-            this.logger.warn({ event: "script_execution_rejected_busy", scriptId, inFlight: this.inFlightScripts, limit: MAX_CONCURRENT_SCRIPTS }, "Rejecting script execution: runtime at concurrency limit");
-            respondOnce(new ErrorResponse({ error: `Runtime busy: ${this.inFlightScripts}/${MAX_CONCURRENT_SCRIPTS} scripts running. Please retry shortly.` }));
+            this.logger.warn({
+              event: "script_execution_rejected_busy",
+              scriptId,
+              inFlight: this.inFlightScripts,
+              limit: MAX_CONCURRENT_SCRIPTS
+            }, "Rejecting script execution: runtime at concurrency limit");
+            respondOnce(new ErrorResponse({
+              error: `Runtime busy: ${this.inFlightScripts}/${MAX_CONCURRENT_SCRIPTS} scripts running. Please retry shortly.`
+            }));
             continue;
           }
           this.inFlightScripts++;
@@ -154683,6 +154903,11 @@ var ToolService = class ToolService2 extends LifecycleService {
                 }
               }
             }
+            const rewriteWorkspaceId = msg.data.workspaceId;
+            if (rewriteWorkspaceId) {
+              const workspaceDir = this.fileService.getWorkspaceDir(rewriteWorkspaceId);
+              result = rewriteWorkspacePathsInResult(result, rewriteWorkspaceId, workspaceDir);
+            }
             msg.respond(new RuntimeCallToolResponse({
               result,
               executedBy
@@ -154881,7 +155106,12 @@ ${result.stderr}`;
       }
       respond(new RuntimeCallToolResponse({
         result: {
-          content: [{ type: "text", text: output || (useInteractive ? "(Script executed with no output() call)" : "(Script executed successfully with no output)") }]
+          content: [
+            {
+              type: "text",
+              text: output || (useInteractive ? "(Script executed with no output() call)" : "(Script executed successfully with no output)")
+            }
+          ]
         },
         executedBy,
         debug: truncateDebug(result.consoleOutput)
@@ -155088,7 +155318,12 @@ ${result.stdout}
     }
     if (!userId) {
       return {
-        content: [{ type: "text", text: "SKILDER_OAUTH_ERROR:NO_USER_CONTEXT:Script-originated tool call lacks an originating user." }],
+        content: [
+          {
+            type: "text",
+            text: "SKILDER_OAUTH_ERROR:NO_USER_CONTEXT:Script-originated tool call lacks an originating user."
+          }
+        ],
         isError: true
       };
     }
@@ -155109,7 +155344,12 @@ ${result.stdout}
       return this.dynamicToolRouter.routeByToolId(catalogEntry.toolId, toolName, workspaceId, runtimeId, userId, userKey, args);
     }
     return {
-      content: [{ type: "text", text: `Error: Tool '${toolName}' not found on this runtime or any other runtime in the workspace.` }],
+      content: [
+        {
+          type: "text",
+          text: `Error: Tool '${toolName}' not found on this runtime or any other runtime in the workspace.`
+        }
+      ],
       isError: true
     };
   }
@@ -155439,7 +155679,10 @@ ${result.stdout}
   buildTestTransport(transportType, parsedConfig, authProvider) {
     if (transportType === dgraph_resolvers_types_exports.McpTransportType.Stdio) {
       const defaultEnv = getDefaultEnvironment();
-      const stdioConfig = buildStdioTransport(parsedConfig, { ...defaultEnv, LOG_LEVEL: "silent" });
+      const stdioConfig = buildStdioTransport(parsedConfig, {
+        ...defaultEnv,
+        LOG_LEVEL: "silent"
+      });
       Object.assign(stdioConfig.env, this.fileService.getEnvVars());
       return new StdioClientTransport({
         command: stdioConfig.command,
@@ -155807,7 +156050,7 @@ var MainService = class MainService2 extends LifecycleService {
     await this.up();
   }
   wait(ms) {
-    return new Promise((resolve5) => setTimeout(resolve5, ms));
+    return new Promise((resolve6) => setTimeout(resolve6, ms));
   }
   async subscribeToReconnectMessage() {
     this.logger.debug("Subscribing to RuntimeReconnectMessage");
@@ -156020,10 +156263,14 @@ var start = () => {
   container.bind(LOG_LEVELS).toConstantValue(process.env.LOG_LEVELS);
   container.bind(LoggerService).toSelf().inSingletonScope();
   container.bind(ToolServerService).toFactory((context2) => {
-    return (config2, roots, authProvider) => {
+    return (config2, roots, authProvider, workspaceId) => {
       const logger = context2.get(LoggerService).getLogger(`tool.server.${config2.name}`);
       const fileService = context2.get(FileService);
-      return new ToolServerService(logger, config2, roots, fileService.getEnvVars(), authProvider);
+      const envVars = fileService.getEnvVars();
+      if (workspaceId) {
+        envVars.SKILDER_WORKSPACE_DIR = fileService.getWorkspaceDir(workspaceId);
+      }
+      return new ToolServerService(logger, config2, roots, envVars, authProvider);
     };
   });
   container.bind(AIProviderService).toSelf().inSingletonScope();