meshy-node 0.3.1 → 0.3.3

package/main.cjs

@@ -4301,7 +4301,7 @@ var require_has_flag = __commonJS({
 var require_supports_color = __commonJS({
   "../../node_modules/.pnpm/supports-color@7.2.0/node_modules/supports-color/index.js"(exports2, module2) {
     "use strict";
-    var os6 = require("os");
+    var os7 = require("os");
     var tty = require("tty");
     var hasFlag2 = require_has_flag();
     var { env } = process;
@@ -4349,7 +4349,7 @@ var require_supports_color = __commonJS({
         return min;
       }
       if (process.platform === "win32") {
-        const osRelease = os6.release().split(".");
+        const osRelease = os7.release().split(".");
         if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
           return Number(osRelease[2]) >= 14931 ? 3 : 2;
         }
@@ -6629,8 +6629,8 @@ var require_node2 = __commonJS({
           }
           break;
         case "FILE":
-          var fs20 = require("fs");
-          stream2 = new fs20.SyncWriteStream(fd2, { autoClose: false });
+          var fs21 = require("fs");
+          stream2 = new fs21.SyncWriteStream(fd2, { autoClose: false });
           stream2._type = "fs";
           break;
         case "PIPE":
@@ -19420,11 +19420,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path21) {
-      if (!path21 || typeof path21 !== "string") {
+    function lookup(path22) {
+      if (!path22 || typeof path22 !== "string") {
         return false;
       }
-      var extension2 = extname3("x." + path21).toLowerCase().substr(1);
+      var extension2 = extname3("x." + path22).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -22942,7 +22942,7 @@ var require_path_to_regexp = __commonJS({
     "use strict";
     module2.exports = pathToRegexp;
     var MATCHING_GROUP_REGEXP = /\\.|\((?:\?<(.*?)>)?(?!\?)/g;
-    function pathToRegexp(path21, keys, options) {
+    function pathToRegexp(path22, keys, options) {
       options = options || {};
       keys = keys || [];
       var strict = options.strict;
@@ -22956,8 +22956,8 @@ var require_path_to_regexp = __commonJS({
       var pos = 0;
       var backtrack = "";
       var m;
-      if (path21 instanceof RegExp) {
-        while (m = MATCHING_GROUP_REGEXP.exec(path21.source)) {
+      if (path22 instanceof RegExp) {
+        while (m = MATCHING_GROUP_REGEXP.exec(path22.source)) {
           if (m[0][0] === "\\") continue;
           keys.push({
             name: m[1] || name2++,
@@ -22965,18 +22965,18 @@ var require_path_to_regexp = __commonJS({
             offset: m.index
           });
         }
-        return path21;
+        return path22;
       }
-      if (Array.isArray(path21)) {
-        path21 = path21.map(function(value) {
+      if (Array.isArray(path22)) {
+        path22 = path22.map(function(value) {
           return pathToRegexp(value, keys, options).source;
         });
-        return new RegExp(path21.join("|"), flags);
+        return new RegExp(path22.join("|"), flags);
       }
-      if (typeof path21 !== "string") {
+      if (typeof path22 !== "string") {
         throw new TypeError("path must be a string, array of strings, or regular expression");
       }
-      path21 = path21.replace(
+      path22 = path22.replace(
         /\\.|(\/)?(\.)?:(\w+)(\(.*?\))?(\*)?(\?)?|[.*]|\/\(/g,
         function(match, slash, format, key, capture, star, optional, offset) {
           if (match[0] === "\\") {
@@ -22993,7 +22993,7 @@ var require_path_to_regexp = __commonJS({
           if (slash || format) {
             backtrack = "";
           } else {
-            backtrack += path21.slice(pos, offset);
+            backtrack += path22.slice(pos, offset);
           }
           pos = offset + match.length;
           if (match === "*") {
@@ -23023,7 +23023,7 @@ var require_path_to_regexp = __commonJS({
           return result;
         }
       );
-      while (m = MATCHING_GROUP_REGEXP.exec(path21)) {
+      while (m = MATCHING_GROUP_REGEXP.exec(path22)) {
         if (m[0][0] === "\\") continue;
         if (keysOffset + i === keys.length || keys[keysOffset + i].offset > m.index) {
           keys.splice(keysOffset + i, 0, {
@@ -23035,13 +23035,13 @@ var require_path_to_regexp = __commonJS({
         }
         i++;
       }
-      path21 += strict ? "" : path21[path21.length - 1] === "/" ? "?" : "/?";
+      path22 += strict ? "" : path22[path22.length - 1] === "/" ? "?" : "/?";
       if (end) {
-        path21 += "$";
-      } else if (path21[path21.length - 1] !== "/") {
-        path21 += lookahead ? "(?=/|$)" : "(?:/|$)";
+        path22 += "$";
+      } else if (path22[path22.length - 1] !== "/") {
+        path22 += lookahead ? "(?=/|$)" : "(?:/|$)";
       }
-      return new RegExp("^" + path21, flags);
+      return new RegExp("^" + path22, flags);
     }
   }
 });
@@ -23054,19 +23054,19 @@ var require_layer = __commonJS({
     var debug = require_src2()("express:router:layer");
     var hasOwnProperty = Object.prototype.hasOwnProperty;
     module2.exports = Layer;
-    function Layer(path21, options, fn) {
+    function Layer(path22, options, fn) {
       if (!(this instanceof Layer)) {
-        return new Layer(path21, options, fn);
+        return new Layer(path22, options, fn);
       }
-      debug("new %o", path21);
+      debug("new %o", path22);
       var opts = options || {};
       this.handle = fn;
       this.name = fn.name || "<anonymous>";
       this.params = void 0;
       this.path = void 0;
-      this.regexp = pathRegexp(path21, this.keys = [], opts);
-      this.regexp.fast_star = path21 === "*";
-      this.regexp.fast_slash = path21 === "/" && opts.end === false;
+      this.regexp = pathRegexp(path22, this.keys = [], opts);
+      this.regexp.fast_star = path22 === "*";
+      this.regexp.fast_slash = path22 === "/" && opts.end === false;
     }
     Layer.prototype.handle_error = function handle_error(error, req, res, next) {
       var fn = this.handle;
@@ -23090,20 +23090,20 @@ var require_layer = __commonJS({
         next(err);
       }
     };
-    Layer.prototype.match = function match(path21) {
+    Layer.prototype.match = function match(path22) {
       var match2;
-      if (path21 != null) {
+      if (path22 != null) {
         if (this.regexp.fast_slash) {
           this.params = {};
           this.path = "";
           return true;
         }
         if (this.regexp.fast_star) {
-          this.params = { "0": decode_param(path21) };
-          this.path = path21;
+          this.params = { "0": decode_param(path22) };
+          this.path = path22;
           return true;
         }
-        match2 = this.regexp.exec(path21);
+        match2 = this.regexp.exec(path22);
       }
       if (!match2) {
         this.params = void 0;
@@ -23196,10 +23196,10 @@ var require_route = __commonJS({
     var slice = Array.prototype.slice;
     var toString = Object.prototype.toString;
     module2.exports = Route;
-    function Route(path21) {
-      this.path = path21;
+    function Route(path22) {
+      this.path = path22;
       this.stack = [];
-      debug("new %o", path21);
+      debug("new %o", path22);
       this.methods = {};
     }
     Route.prototype._handles_method = function _handles_method(method) {
@@ -23412,8 +23412,8 @@ var require_router = __commonJS({
         if (++sync > 100) {
           return setImmediate(next, err);
         }
-        var path21 = getPathname(req);
-        if (path21 == null) {
+        var path22 = getPathname(req);
+        if (path22 == null) {
           return done(layerError);
         }
         var layer;
@@ -23421,7 +23421,7 @@ var require_router = __commonJS({
         var route;
         while (match !== true && idx < stack.length) {
           layer = stack[idx++];
-          match = matchLayer(layer, path21);
+          match = matchLayer(layer, path22);
           route = layer.route;
           if (typeof match !== "boolean") {
             layerError = layerError || match;
@@ -23459,18 +23459,18 @@ var require_router = __commonJS({
           } else if (route) {
             layer.handle_request(req, res, next);
           } else {
-            trim_prefix(layer, layerError, layerPath, path21);
+            trim_prefix(layer, layerError, layerPath, path22);
           }
           sync = 0;
         });
       }
-      function trim_prefix(layer, layerError, layerPath, path21) {
+      function trim_prefix(layer, layerError, layerPath, path22) {
         if (layerPath.length !== 0) {
-          if (layerPath !== path21.slice(0, layerPath.length)) {
+          if (layerPath !== path22.slice(0, layerPath.length)) {
             next(layerError);
             return;
           }
-          var c = path21[layerPath.length];
+          var c = path22[layerPath.length];
           if (c && c !== "/" && c !== ".") return next(layerError);
           debug("trim prefix (%s) from url %s", layerPath, req.url);
           removed = layerPath;
@@ -23548,7 +23548,7 @@ var require_router = __commonJS({
     };
     proto.use = function use(fn) {
       var offset = 0;
-      var path21 = "/";
+      var path22 = "/";
       if (typeof fn !== "function") {
         var arg = fn;
         while (Array.isArray(arg) && arg.length !== 0) {
@@ -23556,7 +23556,7 @@ var require_router = __commonJS({
         }
         if (typeof arg !== "function") {
           offset = 1;
-          path21 = fn;
+          path22 = fn;
         }
       }
       var callbacks = flatten(slice.call(arguments, offset));
@@ -23568,8 +23568,8 @@ var require_router = __commonJS({
         if (typeof fn !== "function") {
           throw new TypeError("Router.use() requires a middleware function but got a " + gettype(fn));
         }
-        debug("use %o %s", path21, fn.name || "<anonymous>");
-        var layer = new Layer(path21, {
+        debug("use %o %s", path22, fn.name || "<anonymous>");
+        var layer = new Layer(path22, {
           sensitive: this.caseSensitive,
           strict: false,
           end: false
@@ -23579,9 +23579,9 @@ var require_router = __commonJS({
       }
       return this;
     };
-    proto.route = function route(path21) {
-      var route2 = new Route(path21);
-      var layer = new Layer(path21, {
+    proto.route = function route(path22) {
+      var route2 = new Route(path22);
+      var layer = new Layer(path22, {
         sensitive: this.caseSensitive,
         strict: this.strict,
         end: true
@@ -23591,8 +23591,8 @@ var require_router = __commonJS({
       return route2;
     };
     methods.concat("all").forEach(function(method) {
-      proto[method] = function(path21) {
-        var route = this.route(path21);
+      proto[method] = function(path22) {
+        var route = this.route(path22);
         route[method].apply(route, slice.call(arguments, 1));
         return this;
       };
@@ -23628,9 +23628,9 @@ var require_router = __commonJS({
       }
       return toString.call(obj).replace(objectRegExp, "$1");
     }
-    function matchLayer(layer, path21) {
+    function matchLayer(layer, path22) {
       try {
-        return layer.match(path21);
+        return layer.match(path22);
       } catch (err) {
         return err;
       }
@@ -23748,13 +23748,13 @@ var require_view = __commonJS({
   "../../node_modules/.pnpm/express@4.22.1/node_modules/express/lib/view.js"(exports2, module2) {
     "use strict";
     var debug = require_src2()("express:view");
-    var path21 = require("path");
-    var fs20 = require("fs");
-    var dirname7 = path21.dirname;
-    var basename3 = path21.basename;
-    var extname3 = path21.extname;
-    var join16 = path21.join;
-    var resolve14 = path21.resolve;
+    var path22 = require("path");
+    var fs21 = require("fs");
+    var dirname7 = path22.dirname;
+    var basename4 = path22.basename;
+    var extname3 = path22.extname;
+    var join17 = path22.join;
+    var resolve14 = path22.resolve;
     module2.exports = View;
     function View(name2, options) {
       var opts = options || {};
@@ -23783,17 +23783,17 @@ var require_view = __commonJS({
       this.path = this.lookup(fileName);
     }
     View.prototype.lookup = function lookup(name2) {
-      var path22;
+      var path23;
       var roots = [].concat(this.root);
       debug('lookup "%s"', name2);
-      for (var i = 0; i < roots.length && !path22; i++) {
+      for (var i = 0; i < roots.length && !path23; i++) {
         var root = roots[i];
         var loc = resolve14(root, name2);
         var dir = dirname7(loc);
-        var file = basename3(loc);
-        path22 = this.resolve(dir, file);
+        var file = basename4(loc);
+        path23 = this.resolve(dir, file);
       }
-      return path22;
+      return path23;
     };
     View.prototype.render = function render(options, callback) {
       debug('render "%s"', this.path);
@@ -23801,21 +23801,21 @@ var require_view = __commonJS({
     };
     View.prototype.resolve = function resolve15(dir, file) {
       var ext = this.ext;
-      var path22 = join16(dir, file);
-      var stat = tryStat(path22);
+      var path23 = join17(dir, file);
+      var stat = tryStat(path23);
       if (stat && stat.isFile()) {
-        return path22;
+        return path23;
       }
-      path22 = join16(dir, basename3(file, ext), "index" + ext);
-      stat = tryStat(path22);
+      path23 = join17(dir, basename4(file, ext), "index" + ext);
+      stat = tryStat(path23);
       if (stat && stat.isFile()) {
-        return path22;
+        return path23;
       }
     };
-    function tryStat(path22) {
-      debug('stat "%s"', path22);
+    function tryStat(path23) {
+      debug('stat "%s"', path23);
       try {
-        return fs20.statSync(path22);
+        return fs21.statSync(path23);
       } catch (e) {
         return void 0;
       }
@@ -23829,7 +23829,7 @@ var require_content_disposition = __commonJS({
     "use strict";
     module2.exports = contentDisposition;
     module2.exports.parse = parse;
-    var basename3 = require("path").basename;
+    var basename4 = require("path").basename;
     var Buffer2 = require_safe_buffer().Buffer;
     var ENCODE_URL_ATTR_CHAR_REGEXP = /[\x00-\x20"'()*,/:;<=>?@[\\\]{}\x7f]/g;
     var HEX_ESCAPE_REGEXP = /%[0-9A-Fa-f]{2}/;
@@ -23865,9 +23865,9 @@ var require_content_disposition = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name2 = basename3(filename);
+      var name2 = basename4(filename);
       var isQuotedString = TEXT_REGEXP.test(name2);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename3(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name2) : basename4(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name2;
       if (hasFallback || !isQuotedString || HEX_ESCAPE_REGEXP.test(name2)) {
         params["filename*"] = name2;
@@ -24112,8 +24112,8 @@ var require_types = __commonJS({
 var require_mime = __commonJS({
   "../../node_modules/.pnpm/mime@1.6.0/node_modules/mime/mime.js"(exports2, module2) {
     "use strict";
-    var path21 = require("path");
-    var fs20 = require("fs");
+    var path22 = require("path");
+    var fs21 = require("fs");
     function Mime() {
       this.types = /* @__PURE__ */ Object.create(null);
       this.extensions = /* @__PURE__ */ Object.create(null);
@@ -24134,7 +24134,7 @@ var require_mime = __commonJS({
     };
     Mime.prototype.load = function(file) {
       this._loading = file;
-      var map = {}, content = fs20.readFileSync(file, "ascii"), lines = content.split(/[\r\n]+/);
+      var map = {}, content = fs21.readFileSync(file, "ascii"), lines = content.split(/[\r\n]+/);
       lines.forEach(function(line) {
         var fields = line.replace(/\s*#.*|^\s*|\s*$/g, "").split(/\s+/);
         map[fields.shift()] = fields;
@@ -24142,8 +24142,8 @@ var require_mime = __commonJS({
       this.define(map);
       this._loading = null;
     };
-    Mime.prototype.lookup = function(path22, fallback) {
-      var ext = path22.replace(/^.*[\.\/\\]/, "").toLowerCase();
+    Mime.prototype.lookup = function(path23, fallback) {
+      var ext = path23.replace(/^.*[\.\/\\]/, "").toLowerCase();
       return this.types[ext] || fallback || this.default_type;
     };
     Mime.prototype.extension = function(mimeType) {
@@ -24256,33 +24256,33 @@ var require_send = __commonJS({
     var escapeHtml = require_escape_html();
     var etag = require_etag();
     var fresh = require_fresh();
-    var fs20 = require("fs");
+    var fs21 = require("fs");
     var mime = require_mime();
     var ms = require_ms();
     var onFinished = require_on_finished();
     var parseRange = require_range_parser();
-    var path21 = require("path");
+    var path22 = require("path");
     var statuses = require_statuses();
     var Stream = require("stream");
     var util3 = require("util");
-    var extname3 = path21.extname;
-    var join16 = path21.join;
-    var normalize = path21.normalize;
-    var resolve14 = path21.resolve;
-    var sep3 = path21.sep;
+    var extname3 = path22.extname;
+    var join17 = path22.join;
+    var normalize = path22.normalize;
+    var resolve14 = path22.resolve;
+    var sep4 = path22.sep;
     var BYTES_RANGE_REGEXP = /^ *bytes=/;
     var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
     var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
     module2.exports = send;
     module2.exports.mime = mime;
-    function send(req, path22, options) {
-      return new SendStream(req, path22, options);
+    function send(req, path23, options) {
+      return new SendStream(req, path23, options);
     }
-    function SendStream(req, path22, options) {
+    function SendStream(req, path23, options) {
       Stream.call(this);
       var opts = options || {};
       this.options = opts;
-      this.path = path22;
+      this.path = path23;
       this.req = req;
       this._acceptRanges = opts.acceptRanges !== void 0 ? Boolean(opts.acceptRanges) : true;
       this._cacheControl = opts.cacheControl !== void 0 ? Boolean(opts.cacheControl) : true;
@@ -24328,8 +24328,8 @@ var require_send = __commonJS({
       this._index = index2;
       return this;
     }, "send.index: pass index as option");
-    SendStream.prototype.root = function root(path22) {
-      this._root = resolve14(String(path22));
+    SendStream.prototype.root = function root(path23) {
+      this._root = resolve14(String(path23));
       debug("root %s", this._root);
       return this;
     };
@@ -24442,10 +24442,10 @@ var require_send = __commonJS({
       var lastModified = this.res.getHeader("Last-Modified");
       return parseHttpDate(lastModified) <= parseHttpDate(ifRange);
     };
-    SendStream.prototype.redirect = function redirect(path22) {
+    SendStream.prototype.redirect = function redirect(path23) {
       var res = this.res;
       if (hasListeners(this, "directory")) {
-        this.emit("directory", res, path22);
+        this.emit("directory", res, path23);
         return;
       }
       if (this.hasTrailingSlash()) {
@@ -24465,42 +24465,42 @@ var require_send = __commonJS({
     SendStream.prototype.pipe = function pipe(res) {
       var root = this._root;
       this.res = res;
-      var path22 = decode(this.path);
-      if (path22 === -1) {
+      var path23 = decode(this.path);
+      if (path23 === -1) {
         this.error(400);
         return res;
       }
-      if (~path22.indexOf("\0")) {
+      if (~path23.indexOf("\0")) {
         this.error(400);
         return res;
       }
       var parts;
       if (root !== null) {
-        if (path22) {
-          path22 = normalize("." + sep3 + path22);
+        if (path23) {
+          path23 = normalize("." + sep4 + path23);
         }
-        if (UP_PATH_REGEXP.test(path22)) {
-          debug('malicious path "%s"', path22);
+        if (UP_PATH_REGEXP.test(path23)) {
+          debug('malicious path "%s"', path23);
           this.error(403);
           return res;
         }
-        parts = path22.split(sep3);
-        path22 = normalize(join16(root, path22));
+        parts = path23.split(sep4);
+        path23 = normalize(join17(root, path23));
       } else {
-        if (UP_PATH_REGEXP.test(path22)) {
-          debug('malicious path "%s"', path22);
+        if (UP_PATH_REGEXP.test(path23)) {
+          debug('malicious path "%s"', path23);
           this.error(403);
           return res;
         }
-        parts = normalize(path22).split(sep3);
-        path22 = resolve14(path22);
+        parts = normalize(path23).split(sep4);
+        path23 = resolve14(path23);
       }
       if (containsDotFile(parts)) {
         var access = this._dotfiles;
         if (access === void 0) {
           access = parts[parts.length - 1][0] === "." ? this._hidden ? "allow" : "ignore" : "allow";
         }
-        debug('%s dotfile "%s"', access, path22);
+        debug('%s dotfile "%s"', access, path23);
         switch (access) {
           case "allow":
             break;
@@ -24514,13 +24514,13 @@ var require_send = __commonJS({
         }
       }
       if (this._index.length && this.hasTrailingSlash()) {
-        this.sendIndex(path22);
+        this.sendIndex(path23);
         return res;
       }
-      this.sendFile(path22);
+      this.sendFile(path23);
       return res;
     };
-    SendStream.prototype.send = function send2(path22, stat) {
+    SendStream.prototype.send = function send2(path23, stat) {
       var len = stat.size;
       var options = this.options;
       var opts = {};
@@ -24532,9 +24532,9 @@ var require_send = __commonJS({
         this.headersAlreadySent();
         return;
       }
-      debug('pipe "%s"', path22);
-      this.setHeader(path22, stat);
-      this.type(path22);
+      debug('pipe "%s"', path23);
+      this.setHeader(path23, stat);
+      this.type(path23);
       if (this.isConditionalGET()) {
         if (this.isPreconditionFailure()) {
           this.error(412);
@@ -24583,28 +24583,28 @@ var require_send = __commonJS({
         res.end();
         return;
       }
-      this.stream(path22, opts);
+      this.stream(path23, opts);
     };
-    SendStream.prototype.sendFile = function sendFile(path22) {
+    SendStream.prototype.sendFile = function sendFile(path23) {
       var i = 0;
       var self2 = this;
-      debug('stat "%s"', path22);
-      fs20.stat(path22, function onstat(err, stat) {
-        if (err && err.code === "ENOENT" && !extname3(path22) && path22[path22.length - 1] !== sep3) {
+      debug('stat "%s"', path23);
+      fs21.stat(path23, function onstat(err, stat) {
+        if (err && err.code === "ENOENT" && !extname3(path23) && path23[path23.length - 1] !== sep4) {
           return next(err);
         }
         if (err) return self2.onStatError(err);
-        if (stat.isDirectory()) return self2.redirect(path22);
-        self2.emit("file", path22, stat);
-        self2.send(path22, stat);
+        if (stat.isDirectory()) return self2.redirect(path23);
+        self2.emit("file", path23, stat);
+        self2.send(path23, stat);
       });
       function next(err) {
         if (self2._extensions.length <= i) {
           return err ? self2.onStatError(err) : self2.error(404);
         }
-        var p = path22 + "." + self2._extensions[i++];
+        var p = path23 + "." + self2._extensions[i++];
         debug('stat "%s"', p);
-        fs20.stat(p, function(err2, stat) {
+        fs21.stat(p, function(err2, stat) {
           if (err2) return next(err2);
           if (stat.isDirectory()) return next();
           self2.emit("file", p, stat);
@@ -24612,7 +24612,7 @@ var require_send = __commonJS({
         });
       }
     };
-    SendStream.prototype.sendIndex = function sendIndex(path22) {
+    SendStream.prototype.sendIndex = function sendIndex(path23) {
       var i = -1;
       var self2 = this;
       function next(err) {
@@ -24620,9 +24620,9 @@ var require_send = __commonJS({
           if (err) return self2.onStatError(err);
           return self2.error(404);
         }
-        var p = join16(path22, self2._index[i]);
+        var p = join17(path23, self2._index[i]);
         debug('stat "%s"', p);
-        fs20.stat(p, function(err2, stat) {
+        fs21.stat(p, function(err2, stat) {
           if (err2) return next(err2);
           if (stat.isDirectory()) return next();
           self2.emit("file", p, stat);
@@ -24631,10 +24631,10 @@ var require_send = __commonJS({
       }
       next();
     };
-    SendStream.prototype.stream = function stream(path22, options) {
+    SendStream.prototype.stream = function stream(path23, options) {
       var self2 = this;
       var res = this.res;
-      var stream2 = fs20.createReadStream(path22, options);
+      var stream2 = fs21.createReadStream(path23, options);
       this.emit("stream", stream2);
       stream2.pipe(res);
       function cleanup() {
@@ -24649,10 +24649,10 @@ var require_send = __commonJS({
         self2.emit("end");
       });
     };
-    SendStream.prototype.type = function type(path22) {
+    SendStream.prototype.type = function type(path23) {
       var res = this.res;
       if (res.getHeader("Content-Type")) return;
-      var type2 = mime.lookup(path22);
+      var type2 = mime.lookup(path23);
       if (!type2) {
         debug("no content-type");
         return;
@@ -24661,9 +24661,9 @@ var require_send = __commonJS({
       debug("content-type %s", type2);
       res.setHeader("Content-Type", type2 + (charset ? "; charset=" + charset : ""));
     };
-    SendStream.prototype.setHeader = function setHeader(path22, stat) {
+    SendStream.prototype.setHeader = function setHeader(path23, stat) {
       var res = this.res;
-      this.emit("headers", res, path22, stat);
+      this.emit("headers", res, path23, stat);
       if (this._acceptRanges && !res.getHeader("Accept-Ranges")) {
         debug("accept ranges");
         res.setHeader("Accept-Ranges", "bytes");
@@ -24722,9 +24722,9 @@ var require_send = __commonJS({
       }
       return err instanceof Error ? createError(status, err, { expose: false }) : createError(status, err);
     }
-    function decode(path22) {
+    function decode(path23) {
       try {
-        return decodeURIComponent(path22);
+        return decodeURIComponent(path23);
       } catch (err) {
         return -1;
       }
@@ -25634,10 +25634,10 @@ var require_utils2 = __commonJS({
     var querystring = require("querystring");
     exports2.etag = createETagGenerator({ weak: false });
     exports2.wetag = createETagGenerator({ weak: true });
-    exports2.isAbsolute = function(path21) {
-      if ("/" === path21[0]) return true;
-      if (":" === path21[1] && ("\\" === path21[2] || "/" === path21[2])) return true;
-      if ("\\\\" === path21.substring(0, 2)) return true;
+    exports2.isAbsolute = function(path22) {
+      if ("/" === path22[0]) return true;
+      if (":" === path22[1] && ("\\" === path22[2] || "/" === path22[2])) return true;
+      if ("\\\\" === path22.substring(0, 2)) return true;
     };
     exports2.flatten = deprecate.function(
       flatten,
@@ -25760,7 +25760,7 @@ var require_application = __commonJS({
   "../../node_modules/.pnpm/express@4.22.1/node_modules/express/lib/application.js"(exports2, module2) {
     "use strict";
     var finalhandler = require_finalhandler();
-    var Router12 = require_router();
+    var Router13 = require_router();
     var methods = require_methods();
     var middleware = require_init();
     var query = require_query();
@@ -25825,7 +25825,7 @@ var require_application = __commonJS({
     };
     app.lazyrouter = function lazyrouter() {
       if (!this._router) {
-        this._router = new Router12({
+        this._router = new Router13({
           caseSensitive: this.enabled("case sensitive routing"),
           strict: this.enabled("strict routing")
         });
@@ -25848,7 +25848,7 @@ var require_application = __commonJS({
     };
     app.use = function use(fn) {
       var offset = 0;
-      var path21 = "/";
+      var path22 = "/";
       if (typeof fn !== "function") {
         var arg = fn;
         while (Array.isArray(arg) && arg.length !== 0) {
@@ -25856,7 +25856,7 @@ var require_application = __commonJS({
         }
         if (typeof arg !== "function") {
           offset = 1;
-          path21 = fn;
+          path22 = fn;
         }
       }
       var fns = flatten(slice.call(arguments, offset));
@@ -25867,12 +25867,12 @@ var require_application = __commonJS({
       var router = this._router;
       fns.forEach(function(fn2) {
         if (!fn2 || !fn2.handle || !fn2.set) {
-          return router.use(path21, fn2);
+          return router.use(path22, fn2);
         }
-        debug(".use app under %s", path21);
-        fn2.mountpath = path21;
+        debug(".use app under %s", path22);
+        fn2.mountpath = path22;
         fn2.parent = this;
-        router.use(path21, function mounted_app(req, res, next) {
+        router.use(path22, function mounted_app(req, res, next) {
           var orig = req.app;
           fn2.handle(req, res, function(err) {
             setPrototypeOf(req, orig.request);
@@ -25884,9 +25884,9 @@ var require_application = __commonJS({
       }, this);
       return this;
     };
-    app.route = function route(path21) {
+    app.route = function route(path22) {
       this.lazyrouter();
-      return this._router.route(path21);
+      return this._router.route(path22);
     };
     app.engine = function engine(ext, fn) {
       if (typeof fn !== "function") {
@@ -25937,7 +25937,7 @@ var require_application = __commonJS({
       }
       return this;
     };
-    app.path = function path21() {
+    app.path = function path22() {
       return this.parent ? this.parent.path() + this.mountpath : "";
     };
     app.enabled = function enabled2(setting) {
@@ -25953,19 +25953,19 @@ var require_application = __commonJS({
       return this.set(setting, false);
     };
     methods.forEach(function(method) {
-      app[method] = function(path21) {
+      app[method] = function(path22) {
         if (method === "get" && arguments.length === 1) {
-          return this.set(path21);
+          return this.set(path22);
         }
         this.lazyrouter();
-        var route = this._router.route(path21);
+        var route = this._router.route(path22);
         route[method].apply(route, slice.call(arguments, 1));
         return this;
       };
     });
-    app.all = function all(path21) {
+    app.all = function all(path22) {
       this.lazyrouter();
-      var route = this._router.route(path21);
+      var route = this._router.route(path22);
       var args = slice.call(arguments, 1);
       for (var i = 0; i < methods.length; i++) {
         route[methods[i]].apply(route, args);
@@ -26724,7 +26724,7 @@ var require_request = __commonJS({
       var subdomains2 = !isIP(hostname3) ? hostname3.split(".").reverse() : [hostname3];
       return subdomains2.slice(offset);
     });
-    defineGetter(req, "path", function path21() {
+    defineGetter(req, "path", function path22() {
       return parse(this).pathname;
     });
     defineGetter(req, "hostname", function hostname3() {
@@ -27047,7 +27047,7 @@ var require_response = __commonJS({
     var http3 = require("http");
     var isAbsolute4 = require_utils2().isAbsolute;
     var onFinished = require_on_finished();
-    var path21 = require("path");
+    var path22 = require("path");
     var statuses = require_statuses();
     var merge = require_utils_merge();
     var sign = require_cookie_signature().sign;
@@ -27056,9 +27056,9 @@ var require_response = __commonJS({
     var setCharset = require_utils2().setCharset;
     var cookie = require_cookie();
     var send = require_send();
-    var extname3 = path21.extname;
+    var extname3 = path22.extname;
     var mime = send.mime;
-    var resolve14 = path21.resolve;
+    var resolve14 = path22.resolve;
     var vary = require_vary();
     var res = Object.create(http3.ServerResponse.prototype);
     module2.exports = res;
@@ -27235,26 +27235,26 @@ var require_response = __commonJS({
       this.type("txt");
       return this.send(body);
     };
-    res.sendFile = function sendFile(path22, options, callback) {
+    res.sendFile = function sendFile(path23, options, callback) {
       var done = callback;
       var req = this.req;
       var res2 = this;
       var next = req.next;
       var opts = options || {};
-      if (!path22) {
+      if (!path23) {
         throw new TypeError("path argument is required to res.sendFile");
       }
-      if (typeof path22 !== "string") {
+      if (typeof path23 !== "string") {
         throw new TypeError("path must be a string to res.sendFile");
       }
       if (typeof options === "function") {
         done = options;
         opts = {};
       }
-      if (!opts.root && !isAbsolute4(path22)) {
+      if (!opts.root && !isAbsolute4(path23)) {
         throw new TypeError("path must be absolute or specify root to res.sendFile");
       }
-      var pathname = encodeURI(path22);
+      var pathname = encodeURI(path23);
       var file = send(req, pathname, opts);
       sendfile(res2, file, opts, function(err) {
         if (done) return done(err);
@@ -27264,7 +27264,7 @@ var require_response = __commonJS({
         }
       });
     };
-    res.sendfile = function(path22, options, callback) {
+    res.sendfile = function(path23, options, callback) {
       var done = callback;
       var req = this.req;
       var res2 = this;
@@ -27274,7 +27274,7 @@ var require_response = __commonJS({
         done = options;
         opts = {};
       }
-      var file = send(req, path22, opts);
+      var file = send(req, path23, opts);
       sendfile(res2, file, opts, function(err) {
         if (done) return done(err);
         if (err && err.code === "EISDIR") return next();
@@ -27287,7 +27287,7 @@ var require_response = __commonJS({
       res.sendfile,
       "res.sendfile: Use res.sendFile instead"
     );
-    res.download = function download(path22, filename, options, callback) {
+    res.download = function download(path23, filename, options, callback) {
       var done = callback;
       var name2 = filename;
       var opts = options || null;
@@ -27304,7 +27304,7 @@ var require_response = __commonJS({
         opts = filename;
       }
       var headers = {
-        "Content-Disposition": contentDisposition(name2 || path22)
+        "Content-Disposition": contentDisposition(name2 || path23)
       };
       if (opts && opts.headers) {
         var keys = Object.keys(opts.headers);
@@ -27317,7 +27317,7 @@ var require_response = __commonJS({
       }
       opts = Object.create(opts);
       opts.headers = headers;
-      var fullPath = !opts.root ? resolve14(path22) : path22;
+      var fullPath = !opts.root ? resolve14(path23) : path23;
       return this.sendFile(fullPath, opts, done);
     };
     res.contentType = res.type = function contentType(type) {
@@ -27618,11 +27618,11 @@ var require_serve_static = __commonJS({
         }
         var forwardError = !fallthrough;
         var originalUrl = parseUrl.original(req);
-        var path21 = parseUrl(req).pathname;
-        if (path21 === "/" && originalUrl.pathname.substr(-1) !== "/") {
-          path21 = "";
+        var path22 = parseUrl(req).pathname;
+        if (path22 === "/" && originalUrl.pathname.substr(-1) !== "/") {
+          path22 = "";
         }
-        var stream = send(req, path21, opts);
+        var stream = send(req, path22, opts);
         stream.on("directory", onDirectory);
         if (setHeaders) {
           stream.on("headers", setHeaders);
@@ -27690,7 +27690,7 @@ var require_express = __commonJS({
     var mixin = require_merge_descriptors();
     var proto = require_application();
     var Route = require_route();
-    var Router12 = require_router();
+    var Router13 = require_router();
     var req = require_request();
     var res = require_response();
     exports2 = module2.exports = createApplication;
@@ -27713,7 +27713,7 @@ var require_express = __commonJS({
     exports2.request = req;
     exports2.response = res;
     exports2.Route = Route;
-    exports2.Router = Router12;
+    exports2.Router = Router13;
     exports2.json = bodyParser.json;
     exports2.query = require_query();
     exports2.raw = bodyParser.raw;
@@ -32265,11 +32265,11 @@ function persistNodeStartupTransport(storagePath, transport) {
     transport
   });
 }
-function persistNodeStartupJoin(storagePath, join16) {
+function persistNodeStartupJoin(storagePath, join17) {
   const startup = resolveNodeStartupMetadata(storagePath);
   persistNodeStartupMetadata(storagePath, {
     ...startup,
-    join: join16
+    join: join17
   });
 }
 function resolvePersistedDevTunnelId(storagePath, kind) {
@@ -32612,6 +32612,10 @@ var TASK_PRIORITIES = /* @__PURE__ */ new Set([
   "high",
   "critical"
 ]);
+var TASK_CONVERSATION_KIND_SET = /* @__PURE__ */ new Set([
+  "meshyChat",
+  "nativeSession"
+]);
 var NODE_ROLES = /* @__PURE__ */ new Set([
   "leader",
   "follower"
@@ -32627,6 +32631,9 @@ function isTaskStatus(value) {
 function isTaskPriority(value) {
   return typeof value === "string" && TASK_PRIORITIES.has(value);
 }
+function isTaskConversationKind(value) {
+  return typeof value === "string" && TASK_CONVERSATION_KIND_SET.has(value);
+}
 function isNodeRole(value) {
   return typeof value === "string" && NODE_ROLES.has(value);
 }
@@ -33117,7 +33124,8 @@ function parseTask(value) {
   }
   const status = asTaskStatus(value.status);
   const priority = asTaskPriority(value.priority);
-  if (typeof value.id !== "string" || typeof value.title !== "string" || typeof value.description !== "string" || typeof value.agent !== "string" || value.project !== null && typeof value.project !== "string" || value.effectiveProjectPath !== null && value.effectiveProjectPath !== void 0 && typeof value.effectiveProjectPath !== "string" || value.branch !== null && value.branch !== void 0 && typeof value.branch !== "string" || !isPlainObject(value.payload) || status === null || priority === null || value.assignedTo !== null && typeof value.assignedTo !== "string" || value.assignedNodeName !== void 0 && value.assignedNodeName !== null && typeof value.assignedNodeName !== "string" || typeof value.createdBy !== "string" || value.result !== null && !isPlainObject(value.result) || value.error !== null && typeof value.error !== "string" || typeof value.retryCount !== "number" || !Number.isFinite(value.retryCount) || typeof value.maxRetries !== "number" || !Number.isFinite(value.maxRetries) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt)) {
+  const conversationKind = value.conversationKind === void 0 ? "meshyChat" : asTaskConversationKind(value.conversationKind);
+  if (typeof value.id !== "string" || typeof value.title !== "string" || typeof value.description !== "string" || typeof value.agent !== "string" || value.project !== null && typeof value.project !== "string" || value.effectiveProjectPath !== null && value.effectiveProjectPath !== void 0 && typeof value.effectiveProjectPath !== "string" || value.branch !== null && value.branch !== void 0 && typeof value.branch !== "string" || conversationKind === null || !isPlainObject(value.payload) || status === null || priority === null || value.assignedTo !== null && typeof value.assignedTo !== "string" || value.assignedNodeName !== void 0 && value.assignedNodeName !== null && typeof value.assignedNodeName !== "string" || typeof value.createdBy !== "string" || value.result !== null && !isPlainObject(value.result) || value.error !== null && typeof value.error !== "string" || typeof value.retryCount !== "number" || !Number.isFinite(value.retryCount) || typeof value.maxRetries !== "number" || !Number.isFinite(value.maxRetries) || typeof value.createdAt !== "number" || !Number.isFinite(value.createdAt) || typeof value.updatedAt !== "number" || !Number.isFinite(value.updatedAt)) {
     return null;
   }
   return {
@@ -33128,6 +33136,7 @@ function parseTask(value) {
     project: value.project ?? null,
     effectiveProjectPath: typeof value.effectiveProjectPath === "string" ? value.effectiveProjectPath : null,
     branch: value.branch === void 0 ? void 0 : typeof value.branch === "string" ? value.branch : null,
+    conversationKind,
     payload: clone(value.payload),
     status,
     priority,
@@ -33177,6 +33186,9 @@ function asTaskStatus(value) {
 function asTaskPriority(value) {
   return isTaskPriority(value) ? value : null;
 }
+function asTaskConversationKind(value) {
+  return isTaskConversationKind(value) ? value : null;
+}
 function sortEntries(input) {
   return Array.from(input.entries()).sort(([left], [right]) => left.localeCompare(right));
 }
@@ -33254,19 +33266,19 @@ async function fetchWithTimeout(url, init, timeoutMs = DEFAULT_NODE_REQUEST_TIME
     cleanup();
   }
 }
-async function fetchNodeWithFallback(node, path21, init, timeoutMs = DEFAULT_NODE_REQUEST_TIMEOUT_MS, trace, options) {
+async function fetchNodeWithFallback(node, path22, init, timeoutMs = DEFAULT_NODE_REQUEST_TIMEOUT_MS, trace, options) {
   let lastError;
   const endpoints = getNodeRequestEndpoints(node, options);
   for (const [index, endpoint] of endpoints.entries()) {
     const attempt = index + 1;
-    trace?.onAttempt?.({ attempt, endpoint, path: path21, timeoutMs, totalEndpoints: endpoints.length });
+    trace?.onAttempt?.({ attempt, endpoint, path: path22, timeoutMs, totalEndpoints: endpoints.length });
     try {
-      const response = await fetchWithTimeout(`${endpoint}${path21}`, init, timeoutMs);
-      trace?.onResponse?.({ attempt, endpoint, path: path21, response, timeoutMs, totalEndpoints: endpoints.length });
+      const response = await fetchWithTimeout(`${endpoint}${path22}`, init, timeoutMs);
+      trace?.onResponse?.({ attempt, endpoint, path: path22, response, timeoutMs, totalEndpoints: endpoints.length });
       return { endpoint, response };
     } catch (error) {
       lastError = error;
-      trace?.onError?.({ attempt, endpoint, error, path: path21, timeoutMs, totalEndpoints: endpoints.length });
+      trace?.onError?.({ attempt, endpoint, error, path: path22, timeoutMs, totalEndpoints: endpoints.length });
     }
   }
   throw lastError instanceof Error ? lastError : new Error("No reachable node endpoint");
@@ -33852,6 +33864,7 @@ var TaskEngine = class {
       project: input.project ?? null,
       effectiveProjectPath: null,
       branch: input.branch ?? null,
+      conversationKind: input.conversationKind ?? "meshyChat",
       payload: input.payload,
       status: "pending",
       priority: input.priority ?? "normal",
@@ -34540,8 +34553,11 @@ var NODE_KIND_BY_LEGACY = {
   "node-workdir-tree": "node.workdir.tree",
   "node-workdir-branch-info": "node.workdir.branch-info",
   "node-workdir-branch-create": "node.workdir.branch-create",
+  "node-sessions-list": "node.sessions.list",
   devtunnel: "node.transport.set",
+  "node-agent-upgrade": "node.agent.upgrade",
   "task-cancel": "task.cancel",
+  "task-logs": "task.logs",
   "task-output-summary": "task.output.summary",
   "task-output-tree": "task.output.tree",
   "task-output-content": "task.output.content",
@@ -35305,9 +35321,9 @@ var DataRouter = class {
   /**
    * Returns true if the request should be proxied to the leader.
    */
-  shouldProxy(method, path21) {
+  shouldProxy(method, path22) {
     if (this.election.isLeader()) return false;
-    if (this.isExcludedPath(path21)) return false;
+    if (this.isExcludedPath(path22)) return false;
     if (method.toUpperCase() === "GET") return false;
     return WRITE_METHODS.has(method.toUpperCase());
   }
@@ -35411,8 +35427,8 @@ var DataRouter = class {
     };
   }
   // ── Helpers ───────────────────────────────────────────────────────────
-  isExcludedPath(path21) {
-    return EXCLUDED_PATH_PREFIXES.some((prefix) => path21.startsWith(prefix)) || EXCLUDED_PATH_SUFFIXES.some((suffix) => path21.endsWith(suffix));
+  isExcludedPath(path22) {
+    return EXCLUDED_PATH_PREFIXES.some((prefix) => path22.startsWith(prefix)) || EXCLUDED_PATH_SUFFIXES.some((suffix) => path22.endsWith(suffix));
   }
 };
 
@@ -35550,6 +35566,328 @@ var EngineRegistry = class {
   }
 };
 
+// ../../packages/core/src/agents/native-session-history.ts
+var fs7 = __toESM(require("fs"), 1);
+var os4 = __toESM(require("os"), 1);
+var path7 = __toESM(require("path"), 1);
+function isRecord2(value) {
+  return typeof value === "object" && value !== null;
+}
+function readJsonLines(filePath) {
+  if (!fs7.existsSync(filePath)) {
+    return [];
+  }
+  const content = fs7.readFileSync(filePath, "utf8");
+  if (!content.trim()) {
+    return [];
+  }
+  return content.split(/\r?\n/).map((line) => line.trim()).filter(Boolean).flatMap((line) => {
+    try {
+      const parsed = JSON.parse(line);
+      return isRecord2(parsed) ? [parsed] : [];
+    } catch {
+      return [];
+    }
+  });
+}
+function readFileModifiedAt(filePath) {
+  try {
+    return fs7.statSync(filePath).mtime.toISOString();
+  } catch {
+    return null;
+  }
+}
+function compareUpdatedSessions(left, right) {
+  const leftTime = left.updatedAt ? Date.parse(left.updatedAt) : 0;
+  const rightTime = right.updatedAt ? Date.parse(right.updatedAt) : 0;
+  return rightTime - leftTime || left.sessionId.localeCompare(right.sessionId);
+}
+function getNativeHomeDir() {
+  return process.env.HOME || process.env.USERPROFILE || os4.homedir();
+}
+function findMatchingFiles(rootDir, predicate) {
+  if (!fs7.existsSync(rootDir)) {
+    return [];
+  }
+  const matches = [];
+  const pendingDirs = [rootDir];
+  while (pendingDirs.length > 0) {
+    const currentDir = pendingDirs.shift();
+    if (!currentDir) continue;
+    const entries = fs7.readdirSync(currentDir, { withFileTypes: true }).sort((left, right) => left.name.localeCompare(right.name));
+    for (const entry of entries) {
+      const entryPath = path7.join(currentDir, entry.name);
+      if (entry.isDirectory()) {
+        pendingDirs.push(entryPath);
+        continue;
+      }
+      if (!entry.isFile() || !predicate(entryPath)) {
+        continue;
+      }
+      let mtimeMs = 0;
+      try {
+        mtimeMs = fs7.statSync(entryPath).mtimeMs;
+      } catch {
+        mtimeMs = 0;
+      }
+      matches.push({ filePath: entryPath, mtimeMs });
+    }
+  }
+  return matches.sort((left, right) => right.mtimeMs - left.mtimeMs || left.filePath.localeCompare(right.filePath)).map((entry) => entry.filePath);
+}
+function findFirstMatchingFile(rootDir, predicate) {
+  if (!fs7.existsSync(rootDir)) {
+    return null;
+  }
+  const pendingDirs = [rootDir];
+  while (pendingDirs.length > 0) {
+    const currentDir = pendingDirs.shift();
+    if (!currentDir) continue;
+    const entries = fs7.readdirSync(currentDir, { withFileTypes: true }).sort((left, right) => left.name.localeCompare(right.name));
+    for (const entry of entries) {
+      const entryPath = path7.join(currentDir, entry.name);
+      if (entry.isDirectory()) {
+        pendingDirs.push(entryPath);
+        continue;
+      }
+      if (entry.isFile() && predicate(entryPath)) {
+        return entryPath;
+      }
+    }
+  }
+  return null;
+}
+function buildAssistantTextEvent(text, timestamp) {
+  return {
+    type: "assistant",
+    message: {
+      role: "assistant",
+      content: [{ type: "text", text }]
+    },
+    ...timestamp ? { timestamp } : {}
+  };
+}
+function buildAssistantThinkingEvent(thinking, timestamp) {
+  return {
+    type: "assistant",
+    message: {
+      role: "assistant",
+      content: [{ type: "thinking", thinking }]
+    },
+    ...timestamp ? { timestamp } : {}
+  };
+}
+function extractCodexReasoningText(item) {
+  if (typeof item.text === "string") {
+    return item.text.trim();
+  }
+  if (Array.isArray(item.summary)) {
+    return item.summary.map((entry) => {
+      if (typeof entry === "string") return entry.trim();
+      if (isRecord2(entry) && typeof entry.text === "string") {
+        return entry.text.trim();
+      }
+      return "";
+    }).filter(Boolean).join("\n\n");
+  }
+  return "";
+}
+function truncateSummary(text, maxLength = 96) {
+  const normalized = text.replace(/\s+/g, " ").trim();
+  if (!normalized) {
+    return "";
+  }
+  if (normalized.length <= maxLength) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxLength - 1).trimEnd()}\u2026`;
+}
+function extractTextFromClaudeMessageContent(content) {
+  if (typeof content === "string") {
+    return truncateSummary(content);
+  }
+  if (!Array.isArray(content)) {
+    return "";
+  }
+  for (const part of content) {
+    if (!isRecord2(part)) continue;
+    if (typeof part.text === "string" && part.text.trim()) {
+      return truncateSummary(part.text);
+    }
+    if (part.type === "tool_result" && typeof part.content === "string" && part.content.trim()) {
+      return truncateSummary(part.content);
+    }
+  }
+  return "";
+}
+function findClaudeSessionSummary(entries, sessionId) {
+  let cwd = "";
+  let summary = "";
+  let updatedAt = null;
+  for (const entry of entries) {
+    if (typeof entry.timestamp === "string") {
+      updatedAt = entry.timestamp;
+    }
+    if (!cwd && typeof entry.cwd === "string" && entry.cwd.trim()) {
+      cwd = entry.cwd.trim();
+    }
+    if (summary || entry.type !== "user" || !isRecord2(entry.message)) {
+      continue;
+    }
+    const candidate = extractTextFromClaudeMessageContent(entry.message.content);
+    if (candidate) {
+      summary = candidate;
+    }
+  }
+  if (!cwd) {
+    return null;
+  }
+  return {
+    agent: "claudecode",
+    sessionId,
+    cwd,
+    summary: summary || `Claude Code session ${sessionId.slice(0, 12)}`,
+    updatedAt
+  };
+}
+function loadCodexSessionIndex() {
+  const indexPath = path7.join(getNativeHomeDir(), ".codex", "session_index.jsonl");
+  const index = /* @__PURE__ */ new Map();
+  for (const entry of readJsonLines(indexPath)) {
+    if (typeof entry.id !== "string" || !entry.id.trim()) {
+      continue;
+    }
+    index.set(entry.id, {
+      ...typeof entry.thread_name === "string" && entry.thread_name.trim() ? { threadName: truncateSummary(entry.thread_name) } : {},
+      ...typeof entry.updated_at === "string" && entry.updated_at.trim() ? { updatedAt: entry.updated_at } : {}
+    });
+  }
+  return index;
+}
+function findCodexSessionSummary(entries, filePath, sessionIndex) {
+  let sessionId = path7.basename(filePath, ".jsonl");
+  let cwd = "";
+  let summary = "";
+  let updatedAt = null;
+  for (const entry of entries) {
+    if (typeof entry.timestamp === "string") {
+      updatedAt = entry.timestamp;
+    }
+    if (entry.type === "session_meta" && isRecord2(entry.payload)) {
+      if (typeof entry.payload.id === "string" && entry.payload.id.trim()) {
+        sessionId = entry.payload.id.trim();
+      }
+      if (!cwd && typeof entry.payload.cwd === "string" && entry.payload.cwd.trim()) {
+        cwd = entry.payload.cwd.trim();
+      }
+      continue;
+    }
+    if (!summary && entry.type === "event_msg" && isRecord2(entry.payload) && entry.payload.type === "user_message") {
+      if (typeof entry.payload.message === "string" && entry.payload.message.trim()) {
+        summary = truncateSummary(entry.payload.message);
+      }
+    }
+  }
+  if (!cwd || !sessionId) {
+    return null;
+  }
+  const indexed = sessionIndex.get(sessionId);
+  return {
+    agent: "codex",
+    sessionId,
+    cwd,
+    summary: indexed?.threadName || summary || `Codex session ${sessionId.slice(0, 12)}`,
+    updatedAt: indexed?.updatedAt ?? updatedAt
+  };
+}
+function loadClaudeSessionHistory(sessionId) {
+  const projectsDir = path7.join(getNativeHomeDir(), ".claude", "projects");
+  const sessionFile = findFirstMatchingFile(projectsDir, (filePath) => {
+    if (filePath.includes(`${path7.sep}subagents${path7.sep}`)) {
+      return false;
+    }
+    return path7.basename(filePath).toLowerCase() === `${sessionId.toLowerCase()}.jsonl`;
+  });
+  if (!sessionFile) {
+    return { logs: [], sourcePath: null };
+  }
+  const logs = readJsonLines(sessionFile).filter((entry) => {
+    if (entry.type !== "user" && entry.type !== "assistant" || entry.isMeta === true || entry.isSidechain === true) {
+      return false;
+    }
+    return isRecord2(entry.message);
+  });
+  return { logs, sourcePath: sessionFile };
+}
+function loadCodexSessionHistory(sessionId) {
+  const sessionsDir = path7.join(getNativeHomeDir(), ".codex", "sessions");
+  const sessionFile = findFirstMatchingFile(sessionsDir, (filePath) => path7.basename(filePath).toLowerCase().includes(sessionId.toLowerCase()) && filePath.toLowerCase().endsWith(".jsonl"));
+  if (!sessionFile) {
+    return { logs: [], sourcePath: null };
+  }
+  const logs = readJsonLines(sessionFile).flatMap((entry) => {
+    if (entry.type !== "event_msg" || !isRecord2(entry.payload)) {
+      return [];
+    }
+    const timestamp = typeof entry.timestamp === "string" ? entry.timestamp : void 0;
+    const payload = entry.payload;
+    if (payload.type === "user_message" && typeof payload.message === "string" && payload.message.trim()) {
+      return [buildTaskUserLogEvent([{ type: "text", text: payload.message.trim() }], timestamp)];
+    }
+    if (payload.type === "agent_message" && typeof payload.message === "string" && payload.message.trim()) {
+      return [buildAssistantTextEvent(payload.message.trim(), timestamp)];
+    }
+    if (payload.type === "agent_reasoning") {
+      const reasoning = extractCodexReasoningText(payload);
+      if (reasoning) {
+        return [buildAssistantThinkingEvent(reasoning, timestamp)];
+      }
+    }
+    return [];
+  });
+  return { logs, sourcePath: sessionFile };
+}
+function loadNativeSessionHistory(input) {
+  if (input.agent === "claudecode") {
+    return loadClaudeSessionHistory(input.sessionId);
+  }
+  return loadCodexSessionHistory(input.sessionId);
+}
+function listNativeSessions(input) {
+  const limit = Math.min(Math.max(1, input.limit ?? 50), 100);
+  if (input.agent === "claudecode") {
+    const projectsDir = path7.join(getNativeHomeDir(), ".claude", "projects");
+    return findMatchingFiles(projectsDir, (filePath) => {
+      if (filePath.includes(`${path7.sep}subagents${path7.sep}`)) {
+        return false;
+      }
+      return filePath.toLowerCase().endsWith(".jsonl");
+    }).map((filePath) => {
+      const sessionId = path7.basename(filePath, ".jsonl");
+      const summary = findClaudeSessionSummary(readJsonLines(filePath), sessionId);
+      if (!summary) {
+        return null;
+      }
+      return {
+        ...summary,
+        updatedAt: summary.updatedAt ?? readFileModifiedAt(filePath)
+      };
+    }).filter((session) => session !== null).sort(compareUpdatedSessions).slice(0, limit);
+  }
+  const sessionIndex = loadCodexSessionIndex();
+  const sessionsDir = path7.join(getNativeHomeDir(), ".codex", "sessions");
+  return findMatchingFiles(sessionsDir, (filePath) => filePath.toLowerCase().endsWith(".jsonl")).map((filePath) => {
+    const summary = findCodexSessionSummary(readJsonLines(filePath), filePath, sessionIndex);
+    if (!summary) {
+      return null;
+    }
+    return {
+      ...summary,
+      updatedAt: summary.updatedAt ?? readFileModifiedAt(filePath)
+    };
+  }).filter((session) => session !== null).sort(compareUpdatedSessions).slice(0, limit);
+}
+
 // ../../packages/core/src/tasks/task-forwarding.ts
 function getEventType(event) {
   return typeof event.type === "string" ? event.type : void 0;
@@ -35857,18 +36195,18 @@ function getCurrentGitBranch(workDir) {
 var import_node_child_process3 = require("child_process");
 
 // ../../packages/core/src/agents/cli-invocations.ts
-var fs7 = __toESM(require("fs"), 1);
-var path7 = __toESM(require("path"), 1);
+var fs8 = __toESM(require("fs"), 1);
+var path8 = __toESM(require("path"), 1);
 function resolveClaudeInvocation() {
   if (process.platform !== "win32") {
     return { command: "claude", argsPrefix: [] };
   }
-  const pathEntries = (process.env.PATH ?? "").split(path7.delimiter).filter(Boolean);
+  const pathEntries = (process.env.PATH ?? "").split(path8.delimiter).filter(Boolean);
   for (const entry of pathEntries) {
-    const shimPath = path7.join(entry, "claude.cmd");
-    if (!fs7.existsSync(shimPath)) continue;
-    const cliPath = path7.join(entry, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
-    if (fs7.existsSync(cliPath)) {
+    const shimPath = path8.join(entry, "claude.cmd");
+    if (!fs8.existsSync(shimPath)) continue;
+    const cliPath = path8.join(entry, "node_modules", "@anthropic-ai", "claude-code", "cli.js");
+    if (fs8.existsSync(cliPath)) {
       return {
         command: process.execPath,
         argsPrefix: [cliPath]
@@ -35881,12 +36219,12 @@ function resolveCodexInvocation() {
   if (process.platform !== "win32") {
     return { command: "codex", argsPrefix: [] };
   }
-  const pathEntries = (process.env.PATH ?? "").split(path7.delimiter).filter(Boolean);
+  const pathEntries = (process.env.PATH ?? "").split(path8.delimiter).filter(Boolean);
   for (const entry of pathEntries) {
-    const shimPath = path7.join(entry, "codex.cmd");
-    if (!fs7.existsSync(shimPath)) continue;
-    const cliPath = path7.join(entry, "node_modules", "@openai", "codex", "bin", "codex.js");
-    if (fs7.existsSync(cliPath)) {
+    const shimPath = path8.join(entry, "codex.cmd");
+    if (!fs8.existsSync(shimPath)) continue;
+    const cliPath = path8.join(entry, "node_modules", "@openai", "codex", "bin", "codex.js");
+    if (fs8.existsSync(cliPath)) {
       return {
         command: process.execPath,
         argsPrefix: [cliPath]
@@ -36039,8 +36377,8 @@ var CodexLiteAdapter = class {
 };
 
 // ../../packages/core/src/agents/engines/claude-code-engine.ts
-var fs8 = __toESM(require("fs"), 1);
-var path8 = __toESM(require("path"), 1);
+var fs9 = __toESM(require("fs"), 1);
+var path9 = __toESM(require("path"), 1);
 var import_node_child_process4 = require("child_process");
 var DEFAULT_CLAUDE_MODEL = "sonnet";
 function buildClaudeModeArgs(mode) {
@@ -36077,7 +36415,7 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
       if (task.agent !== "claudecode") continue;
       const sessionId = task.payload.sessionId;
       if (!sessionId) continue;
-      const cwd = path8.resolve(
+      const cwd = path9.resolve(
         task.payload.sessionCwd ?? task.effectiveProjectPath ?? task.project ?? process.cwd()
       );
       this.sessions.set(task.id, { sessionId, cwd, title: task.title });
@@ -36204,6 +36542,13 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
         session = recovered;
       }
     }
+    if (!session) {
+      const persisted = this.recoverPersistedSession(taskId);
+      if (persisted) {
+        this.sessions.set(taskId, persisted);
+        session = persisted;
+      }
+    }
     if (!session) {
       throw new MeshyError("TASK_NOT_FOUND", `No active session for task ${taskId}`, 404);
     }
@@ -36337,8 +36682,8 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
   /** Recover a session by scanning the JSONL log file for the last system.init event. */
   recoverSession(taskId) {
     const logPath = this.getLogPath(taskId);
-    if (!fs8.existsSync(logPath)) return null;
-    const content = fs8.readFileSync(logPath, "utf-8").trim();
+    if (!fs9.existsSync(logPath)) return null;
+    const content = fs9.readFileSync(logPath, "utf-8").trim();
     if (!content) return null;
     const lines = content.split("\n");
     for (let i = lines.length - 1; i >= 0; i--) {
@@ -36351,7 +36696,7 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
           const persistedCwd = typeof task?.payload.sessionCwd === "string" ? task.payload.sessionCwd : void 0;
           return {
             sessionId: event.session_id,
-            cwd: path8.resolve(
+            cwd: path9.resolve(
               (typeof event.cwd === "string" ? event.cwd : persistedCwd) ?? task?.effectiveProjectPath ?? task?.project ?? process.cwd()
             ),
             title: task?.title ?? taskId
@@ -36362,11 +36707,25 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
     }
     return null;
   }
+  recoverPersistedSession(taskId) {
+    const task = this.taskEngine.getTask(taskId);
+    const sessionId = typeof task?.payload.sessionId === "string" ? task.payload.sessionId : void 0;
+    if (!sessionId) {
+      return null;
+    }
+    return {
+      sessionId,
+      cwd: path9.resolve(
+        (typeof task?.payload.sessionCwd === "string" ? task.payload.sessionCwd : void 0) ?? task?.effectiveProjectPath ?? task?.project ?? process.cwd()
+      ),
+      title: task?.title ?? taskId
+    };
+  }
 };
 
 // ../../packages/core/src/agents/engines/codex-engine.ts
-var fs9 = __toESM(require("fs"), 1);
-var path9 = __toESM(require("path"), 1);
+var fs10 = __toESM(require("fs"), 1);
+var path10 = __toESM(require("path"), 1);
 var import_node_child_process5 = require("child_process");
 function buildAssistantEvent(text, timestamp = (/* @__PURE__ */ new Date()).toISOString()) {
   return {
@@ -36378,7 +36737,7 @@ function buildAssistantEvent(text, timestamp = (/* @__PURE__ */ new Date()).toIS
     timestamp
   };
 }
-function buildAssistantThinkingEvent(thinking, timestamp = (/* @__PURE__ */ new Date()).toISOString()) {
+function buildAssistantThinkingEvent2(thinking, timestamp = (/* @__PURE__ */ new Date()).toISOString()) {
   return {
     type: "assistant",
     message: {
@@ -36388,7 +36747,7 @@ function buildAssistantThinkingEvent(thinking, timestamp = (/* @__PURE__ */ new
     timestamp
   };
 }
-function extractCodexReasoningText(item) {
+function extractCodexReasoningText2(item) {
   if (typeof item.text === "string") {
     return item.text.trim();
   }
@@ -36446,7 +36805,7 @@ var CodexEngine = class extends ExecutionEngine {
       if (task.agent !== "codex") continue;
       const sessionId = task.payload.sessionId;
       if (!sessionId) continue;
-      const cwd = path9.resolve(
+      const cwd = path10.resolve(
         task.payload.sessionCwd ?? task.effectiveProjectPath ?? task.project ?? process.cwd()
       );
       this.sessions.set(task.id, { sessionId, cwd, title: task.title });
@@ -36481,6 +36840,13 @@ var CodexEngine = class extends ExecutionEngine {
         session = recovered;
       }
     }
+    if (!session) {
+      const persisted = this.recoverPersistedSession(taskId);
+      if (persisted) {
+        this.sessions.set(taskId, persisted);
+        session = persisted;
+      }
+    }
     if (!session) {
       throw new MeshyError("TASK_NOT_FOUND", `No active session for task ${taskId}`, 404);
     }
@@ -36626,9 +36992,9 @@ var CodexEngine = class extends ExecutionEngine {
         return buildAssistantEvent(item.text);
       }
       if (item?.type === "reasoning" || item?.type === "agent_reasoning") {
-        const reasoning = extractCodexReasoningText(item);
+        const reasoning = extractCodexReasoningText2(item);
         if (reasoning) {
-          return buildAssistantThinkingEvent(reasoning);
+          return buildAssistantThinkingEvent2(reasoning);
         }
       }
     }
@@ -36640,13 +37006,13 @@ var CodexEngine = class extends ExecutionEngine {
     if (images.length === 0) {
       return { prompt, imagePaths: [] };
     }
-    const attachmentDir = path9.join(this.logDir, "attachments", taskId);
-    fs9.mkdirSync(attachmentDir, { recursive: true });
+    const attachmentDir = path10.join(this.logDir, "attachments", taskId);
+    fs10.mkdirSync(attachmentDir, { recursive: true });
     const imagePaths = images.map((image, index) => {
       const fallbackName = `image-${Date.now()}-${index}.${inferExtension(image.mediaType)}`;
       const filename = sanitizeFilename(image.filename ?? fallbackName);
-      const filePath = path9.join(attachmentDir, filename);
-      fs9.writeFileSync(filePath, Buffer.from(image.data, "base64"));
+      const filePath = path10.join(attachmentDir, filename);
+      fs10.writeFileSync(filePath, Buffer.from(image.data, "base64"));
       return filePath;
     });
     return { prompt, imagePaths };
@@ -36665,8 +37031,8 @@ var CodexEngine = class extends ExecutionEngine {
   /** Recover a session by scanning the JSONL log for the thread.started event. */
   recoverSession(taskId) {
     const logPath = this.getLogPath(taskId);
-    if (!fs9.existsSync(logPath)) return null;
-    const content = fs9.readFileSync(logPath, "utf-8").trim();
+    if (!fs10.existsSync(logPath)) return null;
+    const content = fs10.readFileSync(logPath, "utf-8").trim();
     if (!content) return null;
     const lines = content.split("\n");
     for (let i = lines.length - 1; i >= 0; i--) {
@@ -36679,7 +37045,7 @@ var CodexEngine = class extends ExecutionEngine {
           const persistedCwd = typeof task?.payload.sessionCwd === "string" ? task.payload.sessionCwd : void 0;
           return {
             sessionId: event.thread_id,
-            cwd: path9.resolve(persistedCwd ?? task?.effectiveProjectPath ?? task?.project ?? process.cwd()),
+            cwd: path10.resolve(persistedCwd ?? task?.effectiveProjectPath ?? task?.project ?? process.cwd()),
             title: task?.title ?? taskId
           };
         }
@@ -36688,11 +37054,25 @@ var CodexEngine = class extends ExecutionEngine {
     }
     return null;
   }
+  recoverPersistedSession(taskId) {
+    const task = this.taskEngine.getTask(taskId);
+    const sessionId = typeof task?.payload.sessionId === "string" ? task.payload.sessionId : void 0;
+    if (!sessionId) {
+      return null;
+    }
+    return {
+      sessionId,
+      cwd: path10.resolve(
+        (typeof task?.payload.sessionCwd === "string" ? task.payload.sessionCwd : void 0) ?? task?.effectiveProjectPath ?? task?.project ?? process.cwd()
+      ),
+      title: task?.title ?? taskId
+    };
+  }
 };
 
 // ../../packages/core/src/storage/storage-paths.ts
-var os4 = __toESM(require("os"), 1);
-var path10 = __toESM(require("path"), 1);
+var os5 = __toESM(require("os"), 1);
+var path11 = __toESM(require("path"), 1);
 function resolveDefaultStorageMode(options = {}) {
   const envMode = options.env?.MESHY_STORAGE_MODE;
   if (envMode === "cwd" || envMode === "home") {
@@ -36707,20 +37087,20 @@ function resolveDefaultStorageMode(options = {}) {
 function resolveDefaultStoragePath(options = {}) {
   const mode = resolveDefaultStorageMode(options);
   const envBaseDir = options.env?.MESHY_STORAGE_BASE_DIR;
-  const baseDir = mode === "cwd" ? envBaseDir ?? options.cwd ?? process.cwd() : options.homeDir ?? os4.homedir();
-  return path10.resolve(baseDir, ".meshy");
+  const baseDir = mode === "cwd" ? envBaseDir ?? options.cwd ?? process.cwd() : options.homeDir ?? os5.homedir();
+  return path11.resolve(baseDir, ".meshy");
 }
 function toSafeNodeStorageName(nodeName) {
   const safeName = nodeName.trim().replace(/[^a-zA-Z0-9_-]+/g, "_").replace(/_+/g, "_").replace(/^_+|_+$/g, "");
   return safeName.length > 0 ? safeName : "node";
 }
 function resolveNodeScopedStoragePath(storageRoot, nodeName) {
-  return path10.resolve(storageRoot, toSafeNodeStorageName(nodeName));
+  return path11.resolve(storageRoot, toSafeNodeStorageName(nodeName));
 }
 
 // ../../packages/core/src/storage/storage-migration.ts
-var fs10 = __toESM(require("fs"), 1);
-var path11 = __toESM(require("path"), 1);
+var fs11 = __toESM(require("fs"), 1);
+var path12 = __toESM(require("path"), 1);
 var LEGACY_FILES = [
   "metadata.json",
   "cluster.json",
@@ -36731,33 +37111,33 @@ var LEGACY_FILES = [
 ];
 var LEGACY_DIRS = ["logs", "task-logs"];
 function migrateLegacyNodeStorage(options) {
-  const sourcePath = path11.resolve(options.storageRoot);
+  const sourcePath = path12.resolve(options.storageRoot);
   if (normalizeString2(options.nodeName)) {
     return migrateIntoRequestedNode({ ...options, storageRoot: sourcePath, nodeName: normalizeString2(options.nodeName) });
   }
   return migrateByDiscoveredNodes({ ...options, storageRoot: sourcePath });
 }
 function migrateIntoRequestedNode(options) {
-  const sourcePath = path11.resolve(options.storageRoot);
+  const sourcePath = path12.resolve(options.storageRoot);
   const targetPath = resolveNodeScopedStoragePath(sourcePath, options.nodeName);
   const moved = [];
   const skipped = [];
   const entries = collectLegacyEntries(sourcePath, options.nodeName);
   for (const entry of entries) {
-    const source = path11.join(sourcePath, entry.sourceName);
-    const target = path11.join(targetPath, entry.targetName);
-    if (!fs10.existsSync(source)) {
+    const source = path12.join(sourcePath, entry.sourceName);
+    const target = path12.join(targetPath, entry.targetName);
+    if (!fs11.existsSync(source)) {
       continue;
     }
-    if (fs10.existsSync(target) && options.overwrite !== true) {
+    if (fs11.existsSync(target) && options.overwrite !== true) {
       skipped.push(entry.targetName);
       continue;
     }
-    fs10.mkdirSync(path11.dirname(target), { recursive: true });
-    if (fs10.existsSync(target)) {
-      fs10.rmSync(target, { recursive: true, force: true });
+    fs11.mkdirSync(path12.dirname(target), { recursive: true });
+    if (fs11.existsSync(target)) {
+      fs11.rmSync(target, { recursive: true, force: true });
     }
-    fs10.renameSync(source, target);
+    fs11.renameSync(source, target);
     moved.push(entry.targetName);
   }
   return {
@@ -36772,16 +37152,16 @@ function migrateIntoRequestedNode(options) {
   };
 }
 function migrateByDiscoveredNodes(options) {
-  const sourcePath = path11.resolve(options.storageRoot);
+  const sourcePath = path12.resolve(options.storageRoot);
   const moved = [];
   const skipped = [];
   const dropped = [];
   const targetNames = /* @__PURE__ */ new Set();
   const nodeIdToName = /* @__PURE__ */ new Map();
-  const nodes = readJsonRecord(path11.join(sourcePath, "nodes.json"));
+  const nodes = readJsonRecord(path12.join(sourcePath, "nodes.json"));
   const nodesByName = /* @__PURE__ */ new Map();
   for (const [key, value] of Object.entries(nodes)) {
-    if (!isRecord2(value)) {
+    if (!isRecord3(value)) {
       dropped.push(`node:${key}`);
       continue;
     }
@@ -36795,7 +37175,7 @@ function migrateByDiscoveredNodes(options) {
     nodeIdToName.set(nodeId, nodeName);
     nodesByName.set(nodeName, { ...nodesByName.get(nodeName) ?? {}, [nodeId]: value });
   }
-  const metadata = readJsonRecord(path11.join(sourcePath, "metadata.json"));
+  const metadata = readJsonRecord(path12.join(sourcePath, "metadata.json"));
   const metadataNodeName = normalizeString2(metadata.defaultNodeName);
   if (metadataNodeName) {
     targetNames.add(metadataNodeName);
@@ -36825,7 +37205,7 @@ function migrateByDiscoveredNodes(options) {
     }
     moveScopedPath(
       identity.sourcePath,
-      path11.join(resolveNodeScopedStoragePath(sourcePath, identity.nodeName), "node-identity.json"),
+      path12.join(resolveNodeScopedStoragePath(sourcePath, identity.nodeName), "node-identity.json"),
       `${identity.nodeName}/node-identity.json`,
       options.overwrite === true,
       moved,
@@ -36837,8 +37217,8 @@ function migrateByDiscoveredNodes(options) {
   migrateNodeScopedOrDrop(sourcePath, resolveElectionNodeName(sourcePath, nodeIdToName) ?? inferredSingleNodeName, "election.json", options.overwrite === true, moved, skipped, dropped);
   migrateNodeScopedOrDrop(sourcePath, inferredSingleNodeName, "cluster.json", options.overwrite === true, moved, skipped, dropped);
   migrateNodeScopedOrDrop(sourcePath, inferredSingleNodeName, "logs", options.overwrite === true, moved, skipped, dropped);
-  cleanupEmptyDir(path11.join(sourcePath, "task-logs"));
-  const targetNodeNames = [...targetNames].filter((nodeName) => fs10.existsSync(resolveNodeScopedStoragePath(sourcePath, nodeName))).sort();
+  cleanupEmptyDir(path12.join(sourcePath, "task-logs"));
+  const targetNodeNames = [...targetNames].filter((nodeName) => fs11.existsSync(resolveNodeScopedStoragePath(sourcePath, nodeName))).sort();
   const targetPaths = targetNodeNames.map((nodeName) => resolveNodeScopedStoragePath(sourcePath, nodeName));
   return {
     migrated: moved.length > 0 && skipped.length === 0,
@@ -36855,9 +37235,9 @@ function migrateTasksAndShares(sourcePath, nodeIdToName, targetNames, overwrite,
   const taskNodeNames = /* @__PURE__ */ new Set();
   const taskIdToNodeName = /* @__PURE__ */ new Map();
   const tasksByName = /* @__PURE__ */ new Map();
-  const tasks = readJsonRecord(path11.join(sourcePath, "tasks.json"));
+  const tasks = readJsonRecord(path12.join(sourcePath, "tasks.json"));
   for (const [key, value] of Object.entries(tasks)) {
-    if (!isRecord2(value)) {
+    if (!isRecord3(value)) {
       dropped.push(`task:${key}`);
       continue;
     }
@@ -36876,16 +37256,16 @@ function migrateTasksAndShares(sourcePath, nodeIdToName, targetNames, overwrite,
   for (const [nodeName, taskGroup] of tasksByName) {
     writeScopedJson(sourcePath, nodeName, "tasks.json", taskGroup, overwrite, moved, skipped);
   }
-  if (skipped.length === taskSkipStart && fs10.existsSync(path11.join(sourcePath, "tasks.json"))) {
+  if (skipped.length === taskSkipStart && fs11.existsSync(path12.join(sourcePath, "tasks.json"))) {
     if (tasksByName.size === 0) {
       dropped.push("tasks.json");
     }
-    fs10.rmSync(path11.join(sourcePath, "tasks.json"), { force: true });
+    fs11.rmSync(path12.join(sourcePath, "tasks.json"), { force: true });
   }
   const sharesByName = /* @__PURE__ */ new Map();
-  const shares = readJsonRecord(path11.join(sourcePath, "shares.json"));
+  const shares = readJsonRecord(path12.join(sourcePath, "shares.json"));
   for (const [key, value] of Object.entries(shares)) {
-    if (!isRecord2(value)) {
+    if (!isRecord3(value)) {
       dropped.push(`share:${key}`);
       continue;
     }
@@ -36912,22 +37292,22 @@ function migrateTasksAndShares(sourcePath, nodeIdToName, targetNames, overwrite,
   return taskNodeNames;
 }
 function migrateTaskLogs(sourcePath, taskIdToNodeName, overwrite, moved, skipped, dropped) {
-  const sourceDir = path11.join(sourcePath, "task-logs");
-  if (!fs10.existsSync(sourceDir)) return;
-  for (const fileName of fs10.readdirSync(sourceDir)) {
-    const source = path11.join(sourceDir, fileName);
-    const stat = fs10.statSync(source);
+  const sourceDir = path12.join(sourcePath, "task-logs");
+  if (!fs11.existsSync(sourceDir)) return;
+  for (const fileName of fs11.readdirSync(sourceDir)) {
+    const source = path12.join(sourceDir, fileName);
+    const stat = fs11.statSync(source);
     if (!stat.isFile()) continue;
     const taskId = fileName.endsWith(".jsonl") ? fileName.slice(0, -".jsonl".length) : fileName;
     const nodeName = taskIdToNodeName.get(taskId);
     if (!nodeName) {
-      fs10.rmSync(source, { force: true });
+      fs11.rmSync(source, { force: true });
       dropped.push(`task-log:${fileName}`);
       continue;
     }
     moveScopedPath(
       source,
-      path11.join(resolveNodeScopedStoragePath(sourcePath, nodeName), "task-logs", fileName),
+      path12.join(resolveNodeScopedStoragePath(sourcePath, nodeName), "task-logs", fileName),
       `${nodeName}/task-logs/${fileName}`,
       overwrite,
       moved,
@@ -36936,8 +37316,8 @@ function migrateTaskLogs(sourcePath, taskIdToNodeName, overwrite, moved, skipped
   }
 }
 function migrateNodeScopedOrDrop(sourcePath, nodeName, sourceName, overwrite, moved, skipped, dropped) {
-  const source = path11.join(sourcePath, sourceName);
-  if (!fs10.existsSync(source)) return;
+  const source = path12.join(sourcePath, sourceName);
+  if (!fs11.existsSync(source)) return;
   if (!nodeName) {
     removeLegacyPath(source);
     dropped.push(sourceName);
@@ -36945,7 +37325,7 @@ function migrateNodeScopedOrDrop(sourcePath, nodeName, sourceName, overwrite, mo
   }
   moveScopedPath(
     source,
-    path11.join(resolveNodeScopedStoragePath(sourcePath, nodeName), sourceName),
+    path12.join(resolveNodeScopedStoragePath(sourcePath, nodeName), sourceName),
     `${nodeName}/${sourceName}`,
     overwrite,
     moved,
@@ -36954,37 +37334,37 @@ function migrateNodeScopedOrDrop(sourcePath, nodeName, sourceName, overwrite, mo
 }
 function writeScopedJson(sourcePath, nodeName, fileName, value, overwrite, moved, skipped) {
   if (Object.keys(value).length === 0) return;
-  const target = path11.join(resolveNodeScopedStoragePath(sourcePath, nodeName), fileName);
+  const target = path12.join(resolveNodeScopedStoragePath(sourcePath, nodeName), fileName);
   const label = `${nodeName}/${fileName}`;
-  if (fs10.existsSync(target) && !overwrite) {
+  if (fs11.existsSync(target) && !overwrite) {
     skipped.push(label);
     return;
   }
-  fs10.mkdirSync(path11.dirname(target), { recursive: true });
-  fs10.writeFileSync(target, JSON.stringify(value, null, 2) + "\n", "utf-8");
+  fs11.mkdirSync(path12.dirname(target), { recursive: true });
+  fs11.writeFileSync(target, JSON.stringify(value, null, 2) + "\n", "utf-8");
   moved.push(label);
 }
 function moveScopedPath(source, target, label, overwrite, moved, skipped) {
-  if (!fs10.existsSync(source)) return;
-  if (fs10.existsSync(target) && !overwrite) {
+  if (!fs11.existsSync(source)) return;
+  if (fs11.existsSync(target) && !overwrite) {
     skipped.push(label);
     return;
   }
-  fs10.mkdirSync(path11.dirname(target), { recursive: true });
-  if (fs10.existsSync(target)) {
-    fs10.rmSync(target, { recursive: true, force: true });
+  fs11.mkdirSync(path12.dirname(target), { recursive: true });
+  if (fs11.existsSync(target)) {
+    fs11.rmSync(target, { recursive: true, force: true });
   }
-  fs10.renameSync(source, target);
+  fs11.renameSync(source, target);
   moved.push(label);
 }
 function collectIdentityEntries(storageRoot) {
-  if (!fs10.existsSync(storageRoot)) return [];
+  if (!fs11.existsSync(storageRoot)) return [];
   const entries = [];
-  for (const sourceName of fs10.readdirSync(storageRoot)) {
+  for (const sourceName of fs11.readdirSync(storageRoot)) {
     const match = /^node-identity-(.+)\.json$/.exec(sourceName);
     if (sourceName !== "node-identity.json" && !match) continue;
-    const sourcePath = path11.join(storageRoot, sourceName);
-    if (!fs10.statSync(sourcePath).isFile()) continue;
+    const sourcePath = path12.join(storageRoot, sourceName);
+    if (!fs11.statSync(sourcePath).isFile()) continue;
     const identity = readJsonRecord(sourcePath);
     const nodeName = normalizeString2(identity.name) ?? (match ? match[1] : void 0);
     entries.push({ sourceName, sourcePath, nodeName });
@@ -36992,27 +37372,27 @@ function collectIdentityEntries(storageRoot) {
   return entries;
 }
 function resolveElectionNodeName(sourcePath, nodeIdToName) {
-  const election = readJsonRecord(path11.join(sourcePath, "election.json"));
+  const election = readJsonRecord(path12.join(sourcePath, "election.json"));
   const leaderId = normalizeString2(election.leaderId);
   return leaderId ? nodeIdToName.get(leaderId) : void 0;
 }
 function removeLegacyFile(sourcePath, fileName, dropped) {
-  const target = path11.join(sourcePath, fileName);
-  if (!fs10.existsSync(target)) return;
-  fs10.rmSync(target, { force: true });
+  const target = path12.join(sourcePath, fileName);
+  if (!fs11.existsSync(target)) return;
+  fs11.rmSync(target, { force: true });
   if (fileName !== "nodes.json" && fileName !== "shares.json") {
     dropped.push(fileName);
   }
 }
 function cleanupEmptyDir(dirPath) {
-  if (!fs10.existsSync(dirPath)) return;
-  if (fs10.readdirSync(dirPath).length === 0) {
-    fs10.rmSync(dirPath, { recursive: true, force: true });
+  if (!fs11.existsSync(dirPath)) return;
+  if (fs11.readdirSync(dirPath).length === 0) {
+    fs11.rmSync(dirPath, { recursive: true, force: true });
   }
 }
 function removeLegacyPath(targetPath) {
-  if (fs10.existsSync(targetPath)) {
-    fs10.rmSync(targetPath, { recursive: true, force: true });
+  if (fs11.existsSync(targetPath)) {
+    fs11.rmSync(targetPath, { recursive: true, force: true });
   }
 }
 function collectLegacyEntries(storageRoot, nodeName) {
@@ -37026,16 +37406,16 @@ function collectLegacyEntries(storageRoot, nodeName) {
   }
   const exactIdentity = `node-identity-${safeName}.json`;
   entries.push({ sourceName: exactIdentity, targetName: "node-identity.json" });
-  const legacyIdentity = path11.join(storageRoot, "node-identity.json");
-  if (fs10.existsSync(legacyIdentity)) {
+  const legacyIdentity = path12.join(storageRoot, "node-identity.json");
+  if (fs11.existsSync(legacyIdentity)) {
     entries.push({ sourceName: "node-identity.json", targetName: "node-identity.json" });
   }
   return entries;
 }
 function readJsonRecord(filePath) {
   try {
-    const parsed = JSON.parse(fs10.readFileSync(filePath, "utf-8"));
-    return isRecord2(parsed) ? parsed : {};
+    const parsed = JSON.parse(fs11.readFileSync(filePath, "utf-8"));
+    return isRecord3(parsed) ? parsed : {};
   } catch {
     return {};
   }
@@ -37045,12 +37425,12 @@ function normalizeString2(value) {
   const trimmed = value.trim();
   return trimmed.length > 0 ? trimmed : void 0;
 }
-function isRecord2(value) {
+function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
 // ../../packages/core/src/node/node.ts
-var path13 = __toESM(require("path"), 1);
+var path14 = __toESM(require("path"), 1);
 
 // ../../packages/core/src/messaging/node-local-message-handler.ts
 async function handleLocalNodeMessage(deps, message) {
@@ -37095,8 +37475,8 @@ async function handleLocalNodeMessage(deps, message) {
 }
 
 // ../../packages/core/src/node/node-identity.ts
-var fs11 = __toESM(require("fs"), 1);
-var path12 = __toESM(require("path"), 1);
+var fs12 = __toESM(require("fs"), 1);
+var path13 = __toESM(require("path"), 1);
 
 // ../../node_modules/.pnpm/nanoid@5.1.7/node_modules/nanoid/index.js
 var import_node_crypto6 = require("crypto");
@@ -37130,17 +37510,17 @@ function nanoid(size = 21) {
 
 // ../../packages/core/src/node/node-identity.ts
 function loadOrCreateNodeId(storagePath, nodeName) {
-  const identityPath = path12.join(storagePath, "node-identity.json");
+  const identityPath = path13.join(storagePath, "node-identity.json");
   try {
-    if (fs11.existsSync(identityPath)) {
-      const raw = JSON.parse(fs11.readFileSync(identityPath, "utf-8"));
+    if (fs12.existsSync(identityPath)) {
+      const raw = JSON.parse(fs12.readFileSync(identityPath, "utf-8"));
       if (typeof raw.id === "string" && raw.id.length > 0) return raw.id;
     }
   } catch {
   }
   const id = nanoid();
-  fs11.mkdirSync(path12.dirname(identityPath), { recursive: true });
-  fs11.writeFileSync(identityPath, JSON.stringify({ id, name: nodeName }, null, 2) + "\n", "utf-8");
+  fs12.mkdirSync(path13.dirname(identityPath), { recursive: true });
+  fs12.writeFileSync(identityPath, JSON.stringify({ id, name: nodeName }, null, 2) + "\n", "utf-8");
   return id;
 }
 
@@ -37184,7 +37564,7 @@ var MeshyNode = class {
     await this.transport.start(this.config.node.port);
     const endpoint = await this.transport.getEndpoint();
     const now = Date.now();
-    const workDir = path13.resolve(this.config.node.workDir ?? process.cwd());
+    const workDir = path14.resolve(this.config.node.workDir ?? process.cwd());
     this.selfInfo = {
       id: nodeId,
       name: this.config.node.name,
@@ -37214,7 +37594,7 @@ var MeshyNode = class {
       this.logger,
       this.getSettingsSnapshot
     );
-    const logDir = path13.join(this.config.storage.path, "task-logs");
+    const logDir = path14.join(this.config.storage.path, "task-logs");
     this.taskEngine = new TaskEngine(this.store, this.nodeRegistry, this.eventBus, logDir);
     this.heartbeat.setGetAssignedTasks((nodeId2) => {
       const result = this.taskEngine.listTasks({ assignedTo: nodeId2, status: "assigned" });
@@ -37911,7 +38291,7 @@ async function apiFetch(ctx, port, apiPath) {
     const body = await res.json().catch(() => null);
     throw new Error(body?.error?.message ?? `API error: ${res.status} ${res.statusText}`);
   }
-  return res.json();
+  return await res.json();
 }
 async function apiWrite(ctx, method, port, apiPath, body) {
   const res = await ctx.fetchImpl(`http://localhost:${port}${apiPath}`, {
@@ -37923,7 +38303,7 @@ async function apiWrite(ctx, method, port, apiPath, body) {
     const data = await res.json().catch(() => null);
     throw new Error(data?.error?.message ?? `HTTP ${res.status}`);
   }
-  return res.json();
+  return await res.json();
 }
 function writeLines(stream, lines) {
   stream.write(`${lines.join("\n")}
@@ -38282,7 +38662,7 @@ function formatBanner(info) {
 }
 
 // src/bootstrap/process.ts
-var fs12 = __toESM(require("fs"), 1);
+var fs13 = __toESM(require("fs"), 1);
 var nodePath = __toESM(require("path"), 1);
 var startupFatalLogPath;
 function getErrorMessage2(err) {
@@ -38307,8 +38687,8 @@ function writeStartupFatalError(err, logPath = startupFatalLogPath) {
   if (!logPath) {
     return void 0;
   }
-  fs12.mkdirSync(nodePath.dirname(logPath), { recursive: true });
-  fs12.appendFileSync(logPath, formatFatalErrorForLog(err), "utf-8");
+  fs13.mkdirSync(nodePath.dirname(logPath), { recursive: true });
+  fs13.appendFileSync(logPath, formatFatalErrorForLog(err), "utf-8");
   return logPath;
 }
 async function closeHttpServer(server, options = {}) {
@@ -38825,8 +39205,8 @@ function getErrorMap() {
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path21, errorMaps, issueData } = params;
-  const fullPath = [...path21, ...issueData.path || []];
+  const { data, path: path22, errorMaps, issueData } = params;
+  const fullPath = [...path22, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -38942,11 +39322,11 @@ var errorUtil;
 
 // ../../node_modules/.pnpm/zod@3.25.76/node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path21, key) {
+  constructor(parent, value, path22, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path21;
+    this._path = path22;
     this._key = key;
   }
   get path() {
@@ -42451,7 +42831,15 @@ var SystemAgentInfoSchema = external_exports.object({
   version: external_exports.string().nullable(),
   checkedAt: external_exports.string(),
   detail: external_exports.string().nullable().optional(),
-  metadataStatus: external_exports.string().nullable().optional()
+  metadataStatus: external_exports.string().nullable().optional(),
+  update: external_exports.object({
+    packageName: external_exports.string(),
+    currentVersion: external_exports.string().nullable(),
+    latestVersion: external_exports.string().nullable(),
+    updateAvailable: external_exports.boolean(),
+    checkedAt: external_exports.string(),
+    detail: external_exports.string().nullable().optional()
+  }).optional()
 });
 var NodeSettingsSnapshotSchema = external_exports.object({
   collectedAt: external_exports.number(),
@@ -42513,6 +42901,7 @@ var JoinTaskSchema = external_exports.object({
   agent: external_exports.string(),
   project: external_exports.string().nullable(),
   effectiveProjectPath: external_exports.string().nullable(),
+  conversationKind: external_exports.enum(["meshyChat", "nativeSession"]).optional(),
   payload: external_exports.record(external_exports.unknown()),
   status: external_exports.enum(["pending", "assigned", "running", "completed", "failed", "cancelled", "archived"]),
   priority: external_exports.enum(["low", "normal", "high", "critical"]),
@@ -42611,6 +43000,13 @@ var GitRemoteBranchOptionSchema = external_exports.object({
   branch: external_exports.string(),
   ref: external_exports.string()
 });
+var NativeSessionSummarySchema = external_exports.object({
+  agent: external_exports.enum(["codex", "claudecode"]),
+  sessionId: external_exports.string(),
+  cwd: external_exports.string(),
+  summary: external_exports.string(),
+  updatedAt: external_exports.string().nullable()
+});
 var NodeListQuery = external_exports.object({
   status: external_exports.enum(["online", "busy", "offline"]).optional(),
   capability: external_exports.string().optional()
@@ -42640,6 +43036,10 @@ var NodeWorkDirBranchQuery = external_exports.object({
   offset: external_exports.coerce.number().int().min(0).default(0),
   allowAbsolute: QueryBoolean
 });
+var NodeNativeSessionsQuery = external_exports.object({
+  agent: external_exports.enum(["codex", "claudecode"]),
+  limit: external_exports.coerce.number().int().min(1).max(100).default(50)
+});
 var NodeWorkDirTreeResponse = external_exports.object({
   nodeId: external_exports.string(),
   rootPath: external_exports.string(),
@@ -42676,6 +43076,11 @@ var CreateNodeWorkDirBranchBody = external_exports.object({
 var CreateNodeWorkDirBranchResponse = NodeWorkDirBranchResponse.extend({
   createdBranch: external_exports.string()
 });
+var NodeNativeSessionsResponse = external_exports.object({
+  nodeId: external_exports.string(),
+  agent: external_exports.enum(["codex", "claudecode"]),
+  sessions: external_exports.array(NativeSessionSummarySchema)
+});
 var UpdateNodeBody = external_exports.object({
   name: external_exports.string().min(1).optional(),
   capabilities: external_exports.array(external_exports.string()).optional()
@@ -42683,7 +43088,9 @@ var UpdateNodeBody = external_exports.object({
 
 // ../../packages/api/src/schemas/tasks.ts
 var AGENT_OPTIONS = ["mars", "codex", "claudecode", "eureka"];
+var NATIVE_SESSION_AGENT_OPTIONS = ["codex", "claudecode"];
 var TASK_MODE_OPTIONS = ["bypass", "plan", "edit", "dangerous"];
+var TASK_CONVERSATION_KIND_OPTIONS = ["meshyChat", "nativeSession"];
 var TaskPayload = external_exports.record(external_exports.unknown()).superRefine((payload, ctx) => {
   const mode = payload.mode;
   if (mode !== void 0 && !TASK_MODE_OPTIONS.includes(mode)) {
@@ -42720,6 +43127,7 @@ var TaskListResponse = external_exports.object({
     project: external_exports.string().nullable(),
     effectiveProjectPath: external_exports.string().nullable(),
     branch: external_exports.string().nullable().optional(),
+    conversationKind: external_exports.enum(TASK_CONVERSATION_KIND_OPTIONS).optional(),
     payload: external_exports.record(external_exports.unknown()),
     status: external_exports.enum(["pending", "assigned", "running", "completed", "failed", "cancelled", "archived"]),
     priority: external_exports.enum(["low", "normal", "high", "critical"]),
@@ -42750,6 +43158,7 @@ var AssignTaskBody = external_exports.object({
   nodeId: external_exports.string().min(1)
 });
 var TaskResponse = TaskListResponse.shape.tasks.element;
+var TaskLogEvent = external_exports.record(external_exports.unknown());
 var TaskMessageTextPart = external_exports.object({
   type: external_exports.literal("text"),
   text: external_exports.string().trim().min(1)
@@ -42782,6 +43191,19 @@ var SendMessageBody = external_exports.union([
     content: [{ type: "text", text: value.message }]
   }))
 ]);
+var AttachNativeSessionBody = external_exports.object({
+  title: external_exports.string().trim().min(1).max(120).optional(),
+  agent: external_exports.enum(NATIVE_SESSION_AGENT_OPTIONS),
+  sessionId: external_exports.string().trim().min(1),
+  cwd: external_exports.string().trim().min(1),
+  assignTo: external_exports.string().min(1).optional(),
+  priority: external_exports.enum(["low", "normal", "high", "critical"]).default("normal"),
+  mode: external_exports.enum(TASK_MODE_OPTIONS).optional()
+});
+var WorkerImportTaskBody = external_exports.object({
+  task: TaskResponse,
+  logs: external_exports.array(TaskLogEvent).default([])
+});
 var TaskLogsQuery = external_exports.object({
   after: external_exports.coerce.number().int().min(0).optional()
 });
@@ -42804,9 +43226,9 @@ var BatchTaskIdsBody = external_exports.object({
 });
 
 // ../../packages/api/src/app/server.ts
-var path18 = __toESM(require("path"), 1);
-var fs17 = __toESM(require("fs"), 1);
-var import_express12 = __toESM(require_express2(), 1);
+var path19 = __toESM(require("path"), 1);
+var fs18 = __toESM(require("fs"), 1);
+var import_express13 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/middleware/auth.ts
 var SKIP_AUTH_PATHS = ["/api/system/health"];
@@ -43231,7 +43653,7 @@ function createClusterControlRoutes() {
 }
 
 // ../../packages/api/src/routes/nodes.ts
-var import_express4 = __toESM(require_express2(), 1);
+var import_express5 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/node/devtunnel-guard.ts
 var BLOCKING_TASK_STATUSES = /* @__PURE__ */ new Set(["assigned", "running"]);
@@ -43257,11 +43679,11 @@ function assertCanChangeNodeDevTunnel(taskEngine, nodeId) {
 var import_express3 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/node/node-workdir-service.ts
-var path15 = __toESM(require("path"), 1);
+var path16 = __toESM(require("path"), 1);
 
 // ../../packages/api/src/output/helpers.ts
-var fs13 = __toESM(require("fs"), 1);
-var path14 = __toESM(require("path"), 1);
+var fs14 = __toESM(require("fs"), 1);
+var path15 = __toESM(require("path"), 1);
 var MAX_INLINE_SIZE = 512 * 1024;
 var TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
   ".txt",
@@ -43374,15 +43796,15 @@ function mimeForExt(ext) {
   return MIME_MAP[ext] ?? "application/octet-stream";
 }
 function resolveOutputPath(root, relativePath) {
-  const resolved = path14.resolve(root, relativePath);
-  const normalizedRoot = path14.resolve(root);
-  if (!resolved.startsWith(normalizedRoot + path14.sep) && resolved !== normalizedRoot) {
+  const resolved = path15.resolve(root, relativePath);
+  const normalizedRoot = path15.resolve(root);
+  if (!resolved.startsWith(normalizedRoot + path15.sep) && resolved !== normalizedRoot) {
     throw new Error("Path traversal detected");
   }
   return resolved;
 }
 function classifyFile(filePath) {
-  const ext = path14.extname(filePath).toLowerCase();
+  const ext = path15.extname(filePath).toLowerCase();
   if (ext === ".json" || ext === ".jsonl" || ext === ".ndjson") {
     return { kind: "json", mimeType: "application/json" };
   }
@@ -43412,21 +43834,21 @@ function listDirectory(root, relativePath, options = {}) {
   return listResolvedDirectory(absPath, relativePath, options);
 }
 function listAbsoluteDirectory(absoluteDir, options = {}) {
-  if (!path14.isAbsolute(absoluteDir)) {
+  if (!path15.isAbsolute(absoluteDir)) {
     throw new Error("listAbsoluteDirectory requires an absolute path");
   }
   return listResolvedDirectory(absoluteDir, absoluteDir, { ...options, childPathStyle: "absolute" });
 }
 function listResolvedDirectory(absPath, relativeBase, options = {}) {
-  if (!fs13.existsSync(absPath) || !fs13.statSync(absPath).isDirectory()) {
+  if (!fs14.existsSync(absPath) || !fs14.statSync(absPath).isDirectory()) {
     return [];
   }
-  const entries = fs13.readdirSync(absPath, { withFileTypes: true });
+  const entries = fs14.readdirSync(absPath, { withFileTypes: true });
   const result = [];
   const childPathStyle = options.childPathStyle ?? "relative";
   for (const entry of entries) {
     if (entry.name.startsWith(".")) continue;
-    const entryRelPath = childPathStyle === "absolute" ? path14.join(absPath, entry.name) : path14.join(relativeBase || ".", entry.name).split(path14.sep).join("/");
+    const entryRelPath = childPathStyle === "absolute" ? path15.join(absPath, entry.name) : path15.join(relativeBase || ".", entry.name).split(path15.sep).join("/");
     if (entry.isDirectory()) {
       result.push({
         path: entryRelPath,
@@ -43436,8 +43858,8 @@ function listResolvedDirectory(absPath, relativeBase, options = {}) {
     } else if (options.directoriesOnly) {
       continue;
     } else if (entry.isFile()) {
-      const fullPath = path14.join(absPath, entry.name);
-      const stat = fs13.statSync(fullPath);
+      const fullPath = path15.join(absPath, entry.name);
+      const stat = fs14.statSync(fullPath);
       const { kind, mimeType } = classifyFile(entry.name);
       result.push({
         path: entryRelPath,
@@ -43457,11 +43879,11 @@ function listResolvedDirectory(absPath, relativeBase, options = {}) {
 }
 function detectHtmlEntries(root) {
   const entries = [];
-  if (fs13.existsSync(path14.join(root, "index.html"))) {
+  if (fs14.existsSync(path15.join(root, "index.html"))) {
     entries.push({ path: "index.html", label: "index.html" });
   }
   try {
-    const topLevel = fs13.readdirSync(root, { withFileTypes: true });
+    const topLevel = fs14.readdirSync(root, { withFileTypes: true });
     const htmlFiles = topLevel.filter(
       (e) => e.isFile() && e.name.endsWith(".html") && !e.name.startsWith(".")
     );
@@ -43472,8 +43894,8 @@ function detectHtmlEntries(root) {
     }
     const subdirs = topLevel.filter((e) => e.isDirectory() && !e.name.startsWith("."));
     for (const dir of subdirs) {
-      const subIndex = path14.join(root, dir.name, "index.html");
-      if (fs13.existsSync(subIndex)) {
+      const subIndex = path15.join(root, dir.name, "index.html");
+      if (fs14.existsSync(subIndex)) {
         entries.push({
           path: `${dir.name}/index.html`,
           label: `${dir.name}/index.html`
@@ -43485,11 +43907,11 @@ function detectHtmlEntries(root) {
   return entries;
 }
 function getOutputSummary(root) {
-  const rootName = path14.basename(root);
+  const rootName = path15.basename(root);
   const htmlEntries = detectHtmlEntries(root);
   let fileCount;
   try {
-    const entries = fs13.readdirSync(root, { withFileTypes: true });
+    const entries = fs14.readdirSync(root, { withFileTypes: true });
     fileCount = entries.filter((e) => !e.name.startsWith(".")).length;
   } catch {
     fileCount = void 0;
@@ -43505,14 +43927,14 @@ function getOutputSummary(root) {
 }
 function readFileContent(root, relativePath) {
   const absPath = resolveOutputPath(root, relativePath);
-  if (!fs13.existsSync(absPath) || !fs13.statSync(absPath).isFile()) {
+  if (!fs14.existsSync(absPath) || !fs14.statSync(absPath).isFile()) {
     throw new Error("File not found");
   }
-  const stat = fs13.statSync(absPath);
+  const stat = fs14.statSync(absPath);
   const { kind, mimeType } = classifyFile(absPath);
   if (kind === "image" || kind === "pdf" || kind === "binary") {
     const truncated2 = stat.size > MAX_INLINE_SIZE;
-    const buffer = truncated2 ? Buffer.alloc(0) : fs13.readFileSync(absPath);
+    const buffer = truncated2 ? Buffer.alloc(0) : fs14.readFileSync(absPath);
     return {
       path: relativePath,
       kind,
@@ -43523,7 +43945,7 @@ function readFileContent(root, relativePath) {
     };
   }
   const truncated = stat.size > MAX_INLINE_SIZE;
-  const content = truncated ? fs13.readFileSync(absPath, "utf-8").slice(0, MAX_INLINE_SIZE) : fs13.readFileSync(absPath, "utf-8");
+  const content = truncated ? fs14.readFileSync(absPath, "utf-8").slice(0, MAX_INLINE_SIZE) : fs14.readFileSync(absPath, "utf-8");
   return {
     path: relativePath,
     kind,
@@ -43742,7 +44164,7 @@ function getGitDiff(dirPath) {
   const branch = git2(["rev-parse", "--abbrev-ref", "HEAD"], dirPath) || null;
   const staged = git2(["diff", "--cached"], dirPath);
   const unstaged = git2(["diff"], dirPath);
-  const statusOutput = git2(["status", "--porcelain"], dirPath);
+  const statusOutput = git2(["status", "--porcelain", "-uall"], dirPath);
   const changedFiles = [];
   const untrackedFiles = [];
   for (const line of statusOutput.split("\n")) {
@@ -43768,14 +44190,14 @@ function getGitDiff(dirPath) {
 
 // ../../packages/api/src/node/node-workdir-service.ts
 function isAbsolutePath(p) {
-  return path15.isAbsolute(p) || /^[A-Za-z]:[\\/]/.test(p);
+  return path16.isAbsolute(p) || /^[A-Za-z]:[\\/]/.test(p);
 }
 function resolveNodeWorkDirTarget(nodeId, rootPath, currentPath, allowAbsolute) {
   if (!rootPath) {
     throw new MeshyError("VALIDATION_ERROR", `Node ${nodeId} does not expose a working directory`, 400);
   }
   const useAbsolute = allowAbsolute && isAbsolutePath(currentPath);
-  const resolvedPath = useAbsolute ? path15.resolve(currentPath) : currentPath;
+  const resolvedPath = useAbsolute ? path16.resolve(currentPath) : currentPath;
   return {
     rootPath,
     resolvedPath,
@@ -43860,13 +44282,13 @@ function createLocalNodeWorkDirBranch(nodeId, rootPath, currentPath, options) {
 }
 function computeParentPath(rootPath, currentPath, useAbsolute) {
   if (useAbsolute) {
-    const parent = path15.dirname(currentPath);
+    const parent = path16.dirname(currentPath);
     return parent === currentPath ? null : parent;
   }
   const normalized = currentPath.replace(/\\/g, "/").replace(/\/+$/, "");
   if (normalized === "" || normalized === ".") {
-    const absParent = path15.dirname(path15.resolve(rootPath));
-    return absParent === path15.resolve(rootPath) ? null : absParent;
+    const absParent = path16.dirname(path16.resolve(rootPath));
+    return absParent === path16.resolve(rootPath) ? null : absParent;
   }
   const segments = normalized.split("/").filter(Boolean);
   segments.pop();
@@ -43966,7 +44388,44 @@ function sendLocalNodeWorkDirBranchCreate(req, res, nodeId, options = {}) {
 }
 
 // ../../packages/api/src/tasks/task-route-utils.ts
-var fs14 = __toESM(require("fs"), 1);
+var fs15 = __toESM(require("fs"), 1);
+
+// ../../packages/api/src/node/node-message-compat.ts
+var LEGACY_KIND_BY_NODE_MESSAGE = {
+  "node.workdir.tree": "node-workdir-tree",
+  "node.workdir.branch-info": "node-workdir-branch-info",
+  "node.workdir.branch-create": "node-workdir-branch-create",
+  "node.sessions.list": "node-sessions-list",
+  "node.transport.set": "devtunnel",
+  "node.agent.upgrade": "node-agent-upgrade",
+  "task.cancel": "task-cancel",
+  "task.logs": "task-logs",
+  "task.output.summary": "task-output-summary",
+  "task.output.tree": "task-output-tree",
+  "task.output.content": "task-output-content",
+  "task.output.download": "task-output-download",
+  "task.output.diff": "task-output-diff",
+  "task.preview.create": "task-preview-session"
+};
+function canRequestNodeMessage(heartbeat) {
+  return !!(heartbeat?.requestNodeMessage || heartbeat?.requestWorkerControl);
+}
+function requestFallbackNodeMessage(heartbeat, nodeId, message) {
+  if (heartbeat.requestNodeMessage) return heartbeat.requestNodeMessage(nodeId, message);
+  if (heartbeat.requestWorkerControl) return heartbeat.requestWorkerControl(nodeId, toLegacyWorkerControl2(message));
+  throw new Error("Node message fallback is not available");
+}
+function toLegacyWorkerControl2(message) {
+  return {
+    ...typeof message.payload === "object" && message.payload !== null ? message.payload : {},
+    kind: LEGACY_KIND_BY_NODE_MESSAGE[message.kind] ?? message.kind
+  };
+}
+
+// ../../packages/api/src/tasks/task-route-utils.ts
+function isRecord4(value) {
+  return typeof value === "object" && value !== null;
+}
 function restoreTaskState(taskEngine, task) {
   taskEngine.updateTask(task.id, {
     status: task.status,
@@ -43981,10 +44440,10 @@ function readLocalTaskLogs(engineRegistry, taskId, after, agent) {
     throw new MeshyError("VALIDATION_ERROR", `Engine not registered for agent: ${agent}`, 400);
   }
   const logPath = engine.getLogPath(taskId);
-  if (!fs14.existsSync(logPath)) {
+  if (!fs15.existsSync(logPath)) {
     return { logs: [], total: 0 };
   }
-  const content = fs14.readFileSync(logPath, "utf-8");
+  const content = fs15.readFileSync(logPath, "utf-8");
   const allLines = content.trim().split("\n").filter(Boolean);
   const logs = [];
   for (let i = after; i < allLines.length; i++) {
@@ -43995,6 +44454,169 @@ function readLocalTaskLogs(engineRegistry, taskId, after, agent) {
   }
   return { logs, total: allLines.length };
 }
+function recordLocalTaskLogs(engineRegistry, task, logs) {
+  if (logs.length === 0) {
+    return;
+  }
+  const engine = engineRegistry.get(task.agent);
+  if (!engine) {
+    throw new MeshyError("VALIDATION_ERROR", `Engine not registered for agent: ${task.agent}`, 400);
+  }
+  for (const event of logs) {
+    engine.recordOutput(task.id, event);
+  }
+}
+function parseEventTimestamp(event) {
+  if (typeof event.timestamp !== "string") {
+    return null;
+  }
+  const parsed = Date.parse(event.timestamp);
+  return Number.isNaN(parsed) ? null : parsed;
+}
+function getTaskUserMessageSignature(value) {
+  const content = normalizeTaskUserMessageContent(value);
+  if (content.length === 0) {
+    return null;
+  }
+  return content.map((part) => {
+    if (part.type === "text") return `t:${part.text}`;
+    if (part.type === "tool_result") return `r:${part.toolUseId}:${part.isError === true ? "1" : "0"}:${part.content}`;
+    const dataStart = part.data.slice(0, 32);
+    const dataEnd = part.data.slice(-32);
+    return `i:${part.mediaType}:${part.data.length}:${dataStart}:${dataEnd}`;
+  }).join("|");
+}
+function normalizeStructuredValue(value) {
+  if (Array.isArray(value)) {
+    return value.map((entry) => normalizeStructuredValue(entry));
+  }
+  if (!isRecord4(value)) {
+    return value;
+  }
+  return Object.fromEntries(
+    Object.entries(value).filter(([, entryValue]) => entryValue !== void 0).sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey)).map(([key, entryValue]) => [key, normalizeStructuredValue(entryValue)])
+  );
+}
+function getTranscriptEventSignature(event) {
+  if (event.type === "user") {
+    const signature = getTaskUserMessageSignature(isRecord4(event.message) ? event.message.content : event.message) ?? getTaskUserMessageSignature(event.content);
+    return signature ? `user:${signature}` : null;
+  }
+  if (event.type === "assistant") {
+    if (typeof event.message === "string") {
+      return `assistant:${JSON.stringify(event.message)}`;
+    }
+    if (isRecord4(event.message) && "content" in event.message) {
+      return `assistant:${JSON.stringify(normalizeStructuredValue(event.message.content))}`;
+    }
+    if (Array.isArray(event.content)) {
+      return `assistant:${JSON.stringify(normalizeStructuredValue(event.content))}`;
+    }
+    if (isRecord4(event.message)) {
+      return `assistant:${JSON.stringify(normalizeStructuredValue(event.message))}`;
+    }
+  }
+  return null;
+}
+function sortLogsChronologically(events) {
+  return events.map((event, index) => ({ event, index })).sort((left, right) => {
+    const leftTimestamp = parseEventTimestamp(left.event);
+    const rightTimestamp = parseEventTimestamp(right.event);
+    if (leftTimestamp !== null && rightTimestamp !== null && leftTimestamp !== rightTimestamp) {
+      return leftTimestamp - rightTimestamp;
+    }
+    return left.index - right.index;
+  }).map((entry) => entry.event);
+}
+function timestampsMatch(left, right) {
+  const leftTimestamp = parseEventTimestamp(left);
+  const rightTimestamp = parseEventTimestamp(right);
+  if (leftTimestamp === null || rightTimestamp === null) {
+    return true;
+  }
+  return Math.abs(leftTimestamp - rightTimestamp) <= 6e4;
+}
+function transcriptEvents(events) {
+  return events.flatMap((event, index) => {
+    const signature = getTranscriptEventSignature(event);
+    return signature ? [{ index, event, signature }] : [];
+  });
+}
+function findLocalTranscriptDuplicates(nativeLogs, localLogs) {
+  const nativeTranscript = transcriptEvents(nativeLogs);
+  const localTranscript = transcriptEvents(localLogs);
+  if (nativeTranscript.length === 0 || localTranscript.length === 0) {
+    return /* @__PURE__ */ new Set();
+  }
+  const duplicates = /* @__PURE__ */ new Set();
+  for (const localEvent of localTranscript) {
+    if (nativeTranscript.some((nativeEvent) => nativeEvent.signature === localEvent.signature && timestampsMatch(nativeEvent.event, localEvent.event))) {
+      duplicates.add(localEvent.index);
+    }
+  }
+  return duplicates;
+}
+function mergeNativeSessionLogs(nativeLogs, localLogs) {
+  if (localLogs.length === 0) {
+    return nativeLogs;
+  }
+  const duplicateLocalIndexes = findLocalTranscriptDuplicates(nativeLogs, localLogs);
+  const retainedLocalLogs = localLogs.filter((_, index) => !duplicateLocalIndexes.has(index));
+  if (retainedLocalLogs.length === 0) {
+    return nativeLogs;
+  }
+  return sortLogsChronologically([...nativeLogs, ...retainedLocalLogs]);
+}
+function readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, agent) {
+  const local = readLocalTaskLogs(engineRegistry, taskId, after, agent);
+  const sessionId = typeof task?.payload?.sessionId === "string" ? task.payload.sessionId : "";
+  if (after > 0 || task?.conversationKind !== "nativeSession" || !sessionId || task.agent !== "codex" && task.agent !== "claudecode") {
+    return local;
+  }
+  const history = loadNativeSessionHistory({ agent: task.agent, sessionId });
+  if (history.logs.length === 0) {
+    return local;
+  }
+  if (local.total > 0) {
+    const logs = mergeNativeSessionLogs(history.logs, local.logs);
+    return { logs, total: logs.length };
+  }
+  recordLocalTaskLogs(engineRegistry, task, history.logs);
+  return readLocalTaskLogs(engineRegistry, taskId, after, agent);
+}
+async function seedTaskSnapshotOnWorker(task, logs, node, log2, timeoutMs = 1e4) {
+  const proxyPath = "/api/worker/import-task";
+  const { endpoint, response } = await fetchNodeWithFallback(
+    node,
+    proxyPath,
+    {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ task, logs })
+    },
+    timeoutMs,
+    void 0,
+    { preferPublicEndpoint: true }
+  );
+  if (!response.ok) {
+    const failure = await response.text().catch(() => "");
+    throw new MeshyError("NODE_OFFLINE", failure || `Failed to seed task on ${node.name} (${response.status})`, 502);
+  }
+  const body = await response.json().catch(() => null);
+  const seededLogs = Array.isArray(body?.logs) ? body.logs : logs;
+  log2.info("seeded task snapshot on worker", {
+    taskId: task.id,
+    assignedTo: node.id,
+    endpoint,
+    importedLogCount: seededLogs.length
+  });
+  return seededLogs;
+}
+async function requestTaskLogsOverKeepalive(heartbeat, nodeId, task, after) {
+  if (!canRequestNodeMessage(heartbeat)) return null;
+  const message = createNodeMessage("task.logs", { taskId: task.id, after, task }, { expectsResponse: true });
+  return requestFallbackNodeMessage(heartbeat, nodeId, message);
+}
 async function sendProxyResponse(res, proxyRes) {
   const contentType = proxyRes.headers.get("content-type");
   const contentDisposition = proxyRes.headers.get("content-disposition");
@@ -44005,6 +44627,43 @@ async function sendProxyResponse(res, proxyRes) {
   if (cacheControl) res.setHeader("Cache-Control", cacheControl);
   res.status(proxyRes.status).send(body);
 }
+async function maybeProxyReadToLeader(req, res, options = {}) {
+  const { dataRouter, nodeRegistry, logger: rootLogger } = req.app.locals.deps;
+  const methods = new Set((options.methods ?? ["GET"]).map((method) => method.toUpperCase()));
+  if (!methods.has(req.method.toUpperCase()) || nodeRegistry?.isLeader?.() !== false || !dataRouter?.proxyToLeader) {
+    return false;
+  }
+  const leaderEndpoint = dataRouter.getLeaderEndpoint?.();
+  if (!leaderEndpoint) {
+    return false;
+  }
+  try {
+    const result = await dataRouter.proxyToLeader(req);
+    for (const [key, value] of Object.entries(result.headers)) {
+      if (key.toLowerCase() === "content-length" || key.toLowerCase() === "transfer-encoding") continue;
+      res.setHeader(key, value);
+    }
+    res.status(result.status).json(result.body);
+    return true;
+  } catch (error) {
+    const log2 = rootLogger?.child?.("tasks/leader-read-proxy") ?? rootLogger;
+    log2?.warn?.("leader read proxy failed", {
+      path: req.originalUrl ?? req.url,
+      leaderEndpoint,
+      error: error instanceof Error ? error.message : String(error)
+    });
+    throw error instanceof MeshyError ? error : new MeshyError("NODE_OFFLINE", "Leader unreachable", 502);
+  }
+}
+
+// ../../packages/api/src/node/node-native-session-service.ts
+function getLocalNodeNativeSessions(nodeId, agent, limit) {
+  return {
+    nodeId,
+    agent,
+    sessions: listNativeSessions({ agent, limit })
+  };
+}
 
 // ../../packages/api/src/tasks/task-cancellation.ts
 var TERMINAL_STATUSES2 = /* @__PURE__ */ new Set(["completed", "failed", "cancelled", "archived"]);
@@ -44066,29 +44725,29 @@ function cancelTaskOnCurrentNode(deps, taskId, options = {}) {
 }
 
 // ../../packages/api/src/tasks/task-output-service.ts
-var fs16 = __toESM(require("fs"), 1);
-var path17 = __toESM(require("path"), 1);
+var fs17 = __toESM(require("fs"), 1);
+var path18 = __toESM(require("path"), 1);
 
 // ../../packages/api/src/preview/preview-server.ts
 var crypto3 = __toESM(require("crypto"), 1);
-var fs15 = __toESM(require("fs"), 1);
-var path16 = __toESM(require("path"), 1);
+var fs16 = __toESM(require("fs"), 1);
+var path17 = __toESM(require("path"), 1);
 var http2 = __toESM(require("http"), 1);
 function resolvePreviewPath(rootPath, relativePath) {
   const sanitizedPath = relativePath.replace(/\\/g, "/");
-  const resolvedPath = path16.resolve(rootPath, sanitizedPath);
-  const normalizedRoot = path16.resolve(rootPath);
-  if (!resolvedPath.startsWith(normalizedRoot + path16.sep) && resolvedPath !== normalizedRoot) {
+  const resolvedPath = path17.resolve(rootPath, sanitizedPath);
+  const normalizedRoot = path17.resolve(rootPath);
+  if (!resolvedPath.startsWith(normalizedRoot + path17.sep) && resolvedPath !== normalizedRoot) {
     throw new Error("Invalid preview path");
   }
   return {
     absolutePath: resolvedPath,
-    normalizedPath: path16.relative(normalizedRoot, resolvedPath).split(path16.sep).join("/")
+    normalizedPath: path17.relative(normalizedRoot, resolvedPath).split(path17.sep).join("/")
   };
 }
 function resolvePreviewEntryPath(rootPath, entryPath) {
   const { absolutePath, normalizedPath } = resolvePreviewPath(rootPath, entryPath ?? "index.html");
-  if (!fs15.existsSync(absolutePath) || !fs15.statSync(absolutePath).isFile()) {
+  if (!fs16.existsSync(absolutePath) || !fs16.statSync(absolutePath).isFile()) {
     throw new Error("Preview entry not found");
   }
   return normalizedPath;
@@ -44152,7 +44811,7 @@ var MIME_MAP2 = {
   ".pdf": "application/pdf"
 };
 function getMime(filePath) {
-  return MIME_MAP2[path16.extname(filePath).toLowerCase()] ?? "application/octet-stream";
+  return MIME_MAP2[path17.extname(filePath).toLowerCase()] ?? "application/octet-stream";
 }
 function sendPreviewAssetResponse(sessionManager, token, requestedPath, res) {
   const session = sessionManager.get(token);
@@ -44170,13 +44829,13 @@ function sendPreviewAssetResponse(sessionManager, token, requestedPath, res) {
     res.end("Invalid path");
     return;
   }
-  if (!fs15.existsSync(resolved) || !fs15.statSync(resolved).isFile()) {
+  if (!fs16.existsSync(resolved) || !fs16.statSync(resolved).isFile()) {
     res.writeHead(404, { "Content-Type": "text/plain" });
     res.end("File not found");
     return;
   }
   const mime = getMime(resolved);
-  const content = fs15.readFileSync(resolved);
+  const content = fs16.readFileSync(resolved);
   res.writeHead(200, {
     "Content-Type": mime,
     "Content-Length": content.length,
@@ -44449,13 +45108,13 @@ function getLocalTaskOutputDownload(taskEngine, taskId, filePath) {
   const rootPath = getTaskOutputRoot(taskEngine, taskId);
   try {
     const absolutePath = resolveOutputPath(rootPath, filePath);
-    if (!fs16.existsSync(absolutePath) || !fs16.statSync(absolutePath).isFile()) {
+    if (!fs17.existsSync(absolutePath) || !fs17.statSync(absolutePath).isFile()) {
       throw new MeshyError("TASK_NOT_FOUND", `File not found: ${filePath}`, 404);
     }
     const { mimeType } = classifyFile(absolutePath);
-    const fileName = path17.basename(absolutePath).replace(/"/g, "");
+    const fileName = path18.basename(absolutePath).replace(/"/g, "");
     return {
-      content: fs16.readFileSync(absolutePath),
+      content: fs17.readFileSync(absolutePath),
       headers: {
         "Content-Type": mimeType,
         "Content-Disposition": `inline; filename="${fileName}"`,
@@ -44498,6 +45157,289 @@ async function createPreviewSessionPayload(deps, taskId, entryPath, requestOrigi
   };
 }
 
+// ../../packages/api/src/node/agent-upgrade-service.ts
+var import_node_child_process9 = require("child_process");
+
+// ../../packages/api/src/app/system-info.ts
+var os6 = __toESM(require("os"), 1);
+var import_node_child_process8 = require("child_process");
+var RUNTIME_TOOLS = [
+  { id: "claude", label: "Claude Code", command: "claude", packageName: "@anthropic-ai/claude-code" },
+  { id: "codex", label: "Codex", command: "codex", packageName: "@openai/codex" }
+];
+var runtimeToolUpdateCache = /* @__PURE__ */ new Map();
+function clearRuntimeToolUpdateCache(packageName) {
+  if (packageName) {
+    runtimeToolUpdateCache.delete(packageName);
+    return;
+  }
+  runtimeToolUpdateCache.clear();
+}
+function runRuntimeToolCommand(command, args, platform2) {
+  const result = (0, import_node_child_process8.spawnSync)(command, args, {
+    encoding: "utf-8",
+    shell: platform2 === "win32" && command !== "where",
+    windowsHide: true,
+    timeout: 2500
+  });
+  return {
+    status: result.status,
+    stdout: typeof result.stdout === "string" ? result.stdout : "",
+    stderr: typeof result.stderr === "string" ? result.stderr : "",
+    error: result.error?.message ?? null
+  };
+}
+function normalizeOutput(output) {
+  if (!output) {
+    return null;
+  }
+  const firstLine = output.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
+  return firstLine ?? null;
+}
+function formatLocalDate(date) {
+  const year = date.getFullYear();
+  const month = String(date.getMonth() + 1).padStart(2, "0");
+  const day = String(date.getDate()).padStart(2, "0");
+  return `${year}-${month}-${day}`;
+}
+function resolveCommandPath(command, commandRunner, platform2) {
+  const lookupCommand = platform2 === "win32" ? "where" : "which";
+  const result = commandRunner(lookupCommand, [command]);
+  if (result.status === 0) {
+    return { path: normalizeOutput(result.stdout) };
+  }
+  return {
+    path: null,
+    detail: normalizeOutput(result.stderr) ?? result.error ?? null
+  };
+}
+function extractSemver(value) {
+  return value?.match(/\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?/)?.[0] ?? null;
+}
+function normalizePackageVersion(output) {
+  if (!output) return null;
+  const trimmed = output.trim();
+  try {
+    const parsed = JSON.parse(trimmed);
+    if (typeof parsed === "string") {
+      return parsed.trim() || null;
+    }
+  } catch {
+  }
+  return normalizeOutput(trimmed);
+}
+function normalizeInstalledPackageVersion(output, packageName) {
+  if (!output) return null;
+  const trimmed = output.trim();
+  try {
+    const parsed = JSON.parse(trimmed);
+    const version2 = parsed.dependencies?.[packageName]?.version;
+    if (typeof version2 === "string") {
+      return version2.trim() || null;
+    }
+  } catch {
+  }
+  return extractSemver(normalizeOutput(trimmed));
+}
+function resolveInstalledPackageVersion(definition, commandRunner) {
+  const result = commandRunner("npm", ["list", "-g", definition.packageName, "--depth=0", "--json"]);
+  return normalizeInstalledPackageVersion(result.stdout ?? null, definition.packageName);
+}
+function compareSemver(left, right) {
+  const leftParts = left.split(/[.-]/).map((part) => Number.parseInt(part, 10));
+  const rightParts = right.split(/[.-]/).map((part) => Number.parseInt(part, 10));
+  for (let index = 0; index < 3; index += 1) {
+    const delta = (leftParts[index] || 0) - (rightParts[index] || 0);
+    if (delta !== 0) return delta;
+  }
+  return 0;
+}
+function checkToolUpdate(definition, installedVersion, checkedAt, commandRunner, checkedOn, updateCache) {
+  const currentVersion = extractSemver(installedVersion);
+  const cached = updateCache.get(definition.packageName);
+  let latestVersion = cached?.latestVersion ?? null;
+  let detail = cached?.detail ?? null;
+  let updateCheckedAt = cached?.checkedAt ?? checkedAt;
+  if (cached?.checkedOn !== checkedOn) {
+    const latestResult = commandRunner("npm", ["view", definition.packageName, "version", "--json"]);
+    latestVersion = latestResult.status === 0 ? normalizePackageVersion(latestResult.stdout ?? null) : null;
+    detail = latestResult.status === 0 ? null : normalizeOutput(latestResult.stderr) ?? latestResult.error ?? "Update check failed";
+    updateCheckedAt = checkedAt;
+    updateCache.set(definition.packageName, {
+      checkedOn,
+      checkedAt,
+      latestVersion,
+      detail
+    });
+  }
+  return {
+    packageName: definition.packageName,
+    currentVersion,
+    latestVersion,
+    updateAvailable: Boolean(currentVersion && latestVersion && compareSemver(latestVersion, currentVersion) > 0),
+    checkedAt: updateCheckedAt,
+    detail
+  };
+}
+function inspectTool(definition, commandRunner, checkedAt, checkedOn, updateCache, platform2) {
+  const resolved = resolveCommandPath(definition.command, commandRunner, platform2);
+  if (!resolved.path) {
+    return {
+      id: definition.id,
+      label: definition.label,
+      command: definition.command,
+      available: false,
+      path: null,
+      version: null,
+      checkedAt,
+      detail: resolved.detail ?? "Command not found on PATH",
+      update: checkToolUpdate(definition, null, checkedAt, commandRunner, checkedOn, updateCache)
+    };
+  }
+  const versionResult = commandRunner(definition.command, ["--version"]);
+  const commandVersion = normalizeOutput(versionResult.stdout) ?? normalizeOutput(versionResult.stderr);
+  const version2 = extractSemver(commandVersion) ? commandVersion : resolveInstalledPackageVersion(definition, commandRunner);
+  const detail = versionResult.status === 0 ? null : normalizeOutput(versionResult.stderr) ?? versionResult.error ?? "Version check failed";
+  return {
+    id: definition.id,
+    label: definition.label,
+    command: definition.command,
+    available: true,
+    path: resolved.path,
+    version: version2,
+    checkedAt,
+    detail,
+    update: checkToolUpdate(definition, version2, checkedAt, commandRunner, checkedOn, updateCache)
+  };
+}
+function inspectRuntimeTools(options = {}) {
+  const platform2 = options.platform ?? process.platform;
+  const commandRunner = options.commandRunner ?? ((command, args) => runRuntimeToolCommand(command, args, platform2));
+  const now = options.now ?? /* @__PURE__ */ new Date();
+  const checkedAt = now.toISOString();
+  const checkedOn = formatLocalDate(now);
+  const updateCache = options.updateCache ?? runtimeToolUpdateCache;
+  return RUNTIME_TOOLS.map((definition) => inspectTool(definition, commandRunner, checkedAt, checkedOn, updateCache, platform2));
+}
+function getOsSnapshot() {
+  const cpus2 = os6.cpus();
+  return {
+    platform: os6.platform(),
+    release: os6.release(),
+    arch: os6.arch(),
+    hostname: os6.hostname(),
+    cpuModel: cpus2[0]?.model ?? null,
+    cpuCount: cpus2.length,
+    totalMemoryBytes: os6.totalmem(),
+    freeMemoryBytes: os6.freemem()
+  };
+}
+function buildNodeSettingsSnapshot(options) {
+  const uptime = process.uptime();
+  const runtimeMetadata = options.runtimeMetadata;
+  const agents = (options.inspectRuntimeTools?.() ?? inspectRuntimeTools()).map((agent) => ({
+    ...agent,
+    metadataStatus: runtimeMetadata?.components?.[agent.id]?.status ?? null
+  }));
+  return {
+    collectedAt: Date.now(),
+    version: runtimeMetadata?.packageVersion ?? "0.1.0",
+    packageName: runtimeMetadata?.packageName ?? "meshy",
+    uptime,
+    auth: options.auth,
+    os: getOsSnapshot(),
+    runtime: {
+      nodeVersion: process.version,
+      pid: process.pid,
+      startedAt: Date.now() - Math.floor(uptime * 1e3),
+      cwd: process.cwd(),
+      workDir: options.workDir ?? null,
+      storagePath: options.storagePath ?? null,
+      localDashboardOrigin: options.localDashboardOrigin ?? null
+    },
+    agents,
+    startupRequirements: {
+      lastCheckedAt: runtimeMetadata?.startupRequirementsLastCheckedAt,
+      lastCheckedOn: runtimeMetadata?.startupRequirementsLastCheckedOn,
+      components: runtimeMetadata?.components ?? {}
+    },
+    components: runtimeMetadata?.components ?? {},
+    repository: runtimeMetadata?.repository ?? {},
+    packages: runtimeMetadata?.packages ?? {}
+  };
+}
+
+// ../../packages/api/src/node/agent-upgrade-service.ts
+var AGENT_PACKAGES = {
+  claude: "@anthropic-ai/claude-code",
+  codex: "@openai/codex"
+};
+var OUTPUT_LIMIT = 4e3;
+function summarizeOutput(value) {
+  const text = value ?? "";
+  return text.length > OUTPUT_LIMIT ? `${text.slice(0, OUTPUT_LIMIT)}\u2026` : text;
+}
+function defaultCommandRunner(command, args) {
+  const result = (0, import_node_child_process9.spawnSync)(command, args, {
+    encoding: "utf-8",
+    shell: process.platform === "win32",
+    windowsHide: true,
+    timeout: 18e4
+  });
+  return {
+    status: result.status,
+    stdout: typeof result.stdout === "string" ? result.stdout : "",
+    stderr: typeof result.stderr === "string" ? result.stderr : "",
+    error: result.error?.message ?? null
+  };
+}
+function isRuntimeAgentId(value) {
+  return value === "claude" || value === "codex";
+}
+function buildUpgradeArgs(agent, packageName) {
+  const args = ["install", "-g", `${packageName}@latest`];
+  if (agent === "claude") {
+    args.push("--include=optional", "--ignore-scripts=false");
+  }
+  return args;
+}
+function upgradeRuntimeAgent(agent, options = {}) {
+  const packageName = AGENT_PACKAGES[agent];
+  if (!packageName) {
+    throw new MeshyError("VALIDATION_ERROR", `Unsupported upgrade agent: ${agent}`, 400);
+  }
+  const command = "npm";
+  const args = buildUpgradeArgs(agent, packageName);
+  const result = (options.commandRunner ?? defaultCommandRunner)(command, args);
+  const ok = result.status === 0 && !result.error;
+  if (ok) {
+    clearRuntimeToolUpdateCache(packageName);
+  }
+  const detail = result.error ?? (summarizeOutput(result.stderr) || "Agent upgrade failed");
+  return {
+    ok,
+    agent,
+    packageName,
+    command,
+    args,
+    status: result.status,
+    stdout: summarizeOutput(result.stdout),
+    stderr: summarizeOutput(result.stderr),
+    detail: ok ? null : detail
+  };
+}
+function upgradeRuntimeAgentForDeps(deps, agent) {
+  const result = deps.upgradeRuntimeAgent?.(agent) ?? upgradeRuntimeAgent(agent);
+  if (result.ok) {
+    const settingsSnapshot = deps.refreshSettingsSnapshot?.();
+    if (settingsSnapshot) {
+      deps.nodeRegistry.updateSettingsSnapshot(deps.nodeRegistry.getSelf().id, settingsSnapshot);
+      return { ...result, settingsSnapshot };
+    }
+  }
+  return result;
+}
+
 // ../../packages/api/src/node/worker-control.ts
 function jsonResponse(requestId, statusCode, body) {
   return {
@@ -44541,6 +45483,12 @@ function payloadValue(request, key, fallback) {
   const value = request.payload[key];
   return value === void 0 ? fallback : value;
 }
+function maybeImportTaskSnapshot(deps, request) {
+  if (!request.kind.startsWith("task.output.") && request.kind !== "task.preview.create" && request.kind !== "task.logs") return;
+  const task = payloadValue(request, "task", null);
+  if (!task || deps.taskEngine.getTask(task.id)) return;
+  deps.taskEngine.importTasks([task]);
+}
 async function executeWorkerControlRequest(deps, request) {
   const startedAt = Date.now();
   const log2 = deps.logger.child("worker-control");
@@ -44553,6 +45501,7 @@ async function executeWorkerControlRequest(deps, request) {
   });
   try {
     let response;
+    maybeImportTaskSnapshot(deps, request);
     switch (request.kind) {
       case "node.workdir.tree": {
         const self2 = deps.nodeRegistry.getSelf();
@@ -44611,6 +45560,19 @@ async function executeWorkerControlRequest(deps, request) {
         );
         break;
       }
+      case "node.sessions.list": {
+        const self2 = deps.nodeRegistry.getSelf();
+        response = jsonResponse(
+          request.id,
+          200,
+          getLocalNodeNativeSessions(
+            self2.id,
+            payloadValue(request, "agent", "codex"),
+            payloadValue(request, "limit", 50)
+          )
+        );
+        break;
+      }
       case "node.transport.set": {
         assertCanChangeNodeDevTunnel(deps.taskEngine, deps.nodeRegistry.getSelf().id);
         if (payloadValue(request, "enabled", false)) {
@@ -44637,6 +45599,14 @@ async function executeWorkerControlRequest(deps, request) {
         });
         break;
       }
+      case "node.agent.upgrade": {
+        const agent = payloadValue(request, "agent", "");
+        if (!isRuntimeAgentId(agent)) {
+          throw new MeshyError("VALIDATION_ERROR", `Unsupported upgrade agent: ${agent}`, 400);
+        }
+        response = jsonResponse(request.id, 200, upgradeRuntimeAgentForDeps(deps, agent));
+        break;
+      }
       case "task.cancel": {
         const taskId = payloadValue(request, "taskId", "");
         const result = cancelTaskOnCurrentNode({
@@ -44657,6 +45627,16 @@ async function executeWorkerControlRequest(deps, request) {
         });
         break;
       }
+      case "task.logs": {
+        const taskId = payloadValue(request, "taskId", "");
+        const task = deps.taskEngine.getTask(taskId);
+        response = jsonResponse(
+          request.id,
+          200,
+          readLocalTaskLogsWithNativeHistory(deps.engineRegistry, task, taskId, payloadValue(request, "after", 0), task?.agent ?? "claudecode")
+        );
+        break;
+      }
       case "task.output.summary": {
         response = jsonResponse(
           request.id,
@@ -44758,38 +45738,100 @@ function sendWorkerControlResponse(res, response) {
   res.status(response.statusCode).send(response.body);
 }
 
-// ../../packages/api/src/node/node-message-compat.ts
-var LEGACY_KIND_BY_NODE_MESSAGE = {
-  "node.workdir.tree": "node-workdir-tree",
-  "node.workdir.branch-info": "node-workdir-branch-info",
-  "node.workdir.branch-create": "node-workdir-branch-create",
-  "node.transport.set": "devtunnel",
-  "task.cancel": "task-cancel",
-  "task.output.summary": "task-output-summary",
-  "task.output.tree": "task-output-tree",
-  "task.output.content": "task-output-content",
-  "task.output.download": "task-output-download",
-  "task.output.diff": "task-output-diff",
-  "task.preview.create": "task-preview-session"
-};
-function canRequestNodeMessage(heartbeat) {
-  return !!(heartbeat?.requestNodeMessage || heartbeat?.requestWorkerControl);
+// ../../packages/api/src/routes/node-native-sessions.ts
+var import_express4 = __toESM(require_express2(), 1);
+function sendLocalNodeNativeSessions(req, res, nodeId, options = {}) {
+  const query = NodeNativeSessionsQuery.parse(req.query);
+  const { nodeRegistry } = req.app.locals.deps;
+  const self2 = nodeRegistry.getSelf();
+  if (options.requireSelfNode && nodeId !== self2.id) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  res.json(getLocalNodeNativeSessions(self2.id, query.agent, query.limit));
 }
-function requestFallbackNodeMessage(heartbeat, nodeId, message) {
-  if (heartbeat.requestNodeMessage) return heartbeat.requestNodeMessage(nodeId, message);
-  if (heartbeat.requestWorkerControl) return heartbeat.requestWorkerControl(nodeId, toLegacyWorkerControl2(message));
-  throw new Error("Node message fallback is not available");
+
+// ../../packages/api/src/routes/node-agent-upgrade.ts
+function isRecord5(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function toLegacyWorkerControl2(message) {
-  return {
-    ...typeof message.payload === "object" && message.payload !== null ? message.payload : {},
-    kind: LEGACY_KIND_BY_NODE_MESSAGE[message.kind] ?? message.kind
-  };
+function readSettingsSnapshot(value) {
+  if (!isRecord5(value)) return void 0;
+  const snapshot = value.settingsSnapshot;
+  if (!isRecord5(snapshot)) return void 0;
+  return snapshot;
+}
+function applySyncedSettingsSnapshot(deps, nodeId, body) {
+  const settingsSnapshot = readSettingsSnapshot(body);
+  if (settingsSnapshot) {
+    deps.nodeRegistry.updateSettingsSnapshot(nodeId, settingsSnapshot);
+  }
+}
+function parseAgent(value) {
+  if (isRuntimeAgentId(value)) return value;
+  throw new MeshyError("VALIDATION_ERROR", `Unsupported upgrade agent: ${value}`, 400);
+}
+function upgradeSelfNode(deps, nodeId, agent) {
+  const result = upgradeRuntimeAgentForDeps(deps, agent);
+  applySyncedSettingsSnapshot(deps, nodeId, result);
+  return result;
+}
+async function fallbackUpgrade(deps, res, nodeId, agent) {
+  if (!canRequestNodeMessage(deps.heartbeat)) {
+    throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to upgrade ${agent}`, 502);
+  }
+  const controlResponse = await requestFallbackNodeMessage(
+    deps.heartbeat,
+    nodeId,
+    createNodeMessage("node.agent.upgrade", { agent }, { expectsResponse: true })
+  );
+  applySyncedSettingsSnapshot(deps, nodeId, controlResponse.body);
+  sendWorkerControlResponse(res, controlResponse);
+}
+async function proxyUpgrade(deps, nodeId, agent) {
+  const node = deps.nodeRegistry.getNode(nodeId);
+  if (!node) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  const { response } = await fetchNodeWithFallback(node, `/api/nodes/${nodeId}/agents/${agent}/upgrade`, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" }
+  }, void 0, void 0, { preferPublicEndpoint: true });
+  const body = await response.json().catch(() => ({ error: response.statusText }));
+  if (!response.ok) {
+    throw new MeshyError("NODE_OFFLINE", `Remote node returned ${response.status}`, response.status, body);
+  }
+  applySyncedSettingsSnapshot(deps, nodeId, body);
+  return body;
+}
+async function sendNodeAgentUpgrade(req, res, nodeId, agentParam) {
+  const deps = req.app.locals.deps;
+  const agent = parseAgent(agentParam);
+  const self2 = deps.nodeRegistry.getSelf();
+  const isSelf = nodeId === self2.id;
+  if (!isSelf && !deps.election.isLeader()) {
+    throw new MeshyError("NOT_LEADER", "Only the leader can upgrade agents on other nodes", 403);
+  }
+  if (isSelf) {
+    res.json(upgradeSelfNode(deps, nodeId, agent));
+    return;
+  }
+  const canPushToNode = deps.heartbeat?.canPushToNode?.(nodeId) ?? true;
+  if (!canPushToNode) {
+    await fallbackUpgrade(deps, res, nodeId, agent);
+    return;
+  }
+  try {
+    res.json(await proxyUpgrade(deps, nodeId, agent));
+  } catch (err) {
+    if (!canRequestNodeMessage(deps.heartbeat)) throw err;
+    await fallbackUpgrade(deps, res, nodeId, agent);
+  }
 }
 
 // ../../packages/api/src/routes/nodes.ts
 var NODE_WORKDIR_PROXY_TIMEOUT_MS = 1e4;
 var NODE_WORKDIR_BRANCH_PROXY_TIMEOUT_MS = 25e3;
+var NODE_NATIVE_SESSIONS_PROXY_TIMEOUT_MS = 1e4;
 function describeProxyError2(error) {
   if (error instanceof Error) {
     const errorCategory = error.name === "AbortError" || /aborted/i.test(error.message) ? "abort" : /timeout/i.test(error.message) ? "timeout" : "network";
@@ -45053,45 +46095,121 @@ async function maybeHandleRemoteNodeWorkDirBranchCreateRequest(req, res, nodeId)
     throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to create a git branch`, 502);
   }
 }
+async function maybeHandleRemoteNodeNativeSessionsRequest(req, res, nodeId) {
+  const query = NodeNativeSessionsQuery.parse(req.query);
+  const { nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
+  const selfId = nodeRegistry.getSelf().id;
+  if (nodeId === selfId) {
+    return false;
+  }
+  const node = nodeRegistry.getNode(nodeId);
+  if (!node) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  const log2 = rootLogger.child("nodes/native-sessions");
+  const proxyPath = req.originalUrl ?? `/api/nodes/${nodeId}/native-sessions`;
+  const fallbackRequest = createNodeMessage("node.sessions.list", {
+    agent: query.agent,
+    limit: query.limit
+  }, { expectsResponse: true });
+  const canPushToNode = heartbeat?.canPushToNode?.(nodeId) ?? true;
+  if (!canPushToNode && canRequestNodeMessage(heartbeat)) {
+    log2.warn("node native sessions request falling back to keepalive control", {
+      nodeId,
+      proxyPath
+    });
+    const controlResponse = await requestFallbackNodeMessage(heartbeat, nodeId, fallbackRequest);
+    sendWorkerControlResponse(res, controlResponse);
+    return true;
+  }
+  try {
+    const { endpoint, response } = await fetchNodeWithFallback(
+      node,
+      proxyPath,
+      void 0,
+      NODE_NATIVE_SESSIONS_PROXY_TIMEOUT_MS,
+      createNodeWorkdirProxyTrace(log2, nodeId, proxyPath),
+      { preferPublicEndpoint: true }
+    );
+    log2.debug("proxying node native sessions request", {
+      nodeId,
+      endpoint,
+      proxyPath
+    });
+    await sendProxyResponse(res, response);
+    return true;
+  } catch (err) {
+    const errorDetails = describeProxyError2(err);
+    log2.warn("node native sessions proxy error", {
+      nodeId,
+      proxyPath,
+      timeoutMs: NODE_NATIVE_SESSIONS_PROXY_TIMEOUT_MS,
+      ...errorDetails
+    });
+    if (canRequestNodeMessage(heartbeat)) {
+      log2.warn("node native sessions proxy failed, falling back to keepalive control", {
+        nodeId,
+        proxyPath,
+        timeoutMs: NODE_NATIVE_SESSIONS_PROXY_TIMEOUT_MS,
+        ...errorDetails
+      });
+      const controlResponse = await requestFallbackNodeMessage(heartbeat, nodeId, fallbackRequest);
+      sendWorkerControlResponse(res, controlResponse);
+      return true;
+    }
+    throw new MeshyError("NODE_OFFLINE", `Cannot reach node ${nodeId} to list its native sessions`, 502);
+  }
+}
 function createNodeRoutes() {
-  const router = (0, import_express4.Router)();
+  const router = (0, import_express5.Router)();
   router.get("/", asyncHandler3(async (req, res) => {
     const { nodeRegistry } = req.app.locals.deps;
     const query = NodeListQuery.parse(req.query);
     let nodes = nodeRegistry.getAllNodes();
     if (query.status) {
-      nodes = nodes.filter((n) => n.status === query.status);
+      nodes = nodes.filter((node) => node.status === query.status);
     }
-    if (query.capability) {
+    const capability = query.capability;
+    if (capability) {
       nodes = nodes.filter(
-        (n) => n.capabilities && n.capabilities.includes(query.capability)
+        (node) => node.capabilities && node.capabilities.includes(capability)
       );
     }
     res.json({ nodes });
   }));
   router.get("/:id", asyncHandler3(async (req, res) => {
     const { nodeRegistry } = req.app.locals.deps;
-    const node = nodeRegistry.getNode(req.params.id);
+    const nodeId = req.params.id;
+    const node = nodeRegistry.getNode(nodeId);
     if (!node) {
-      throw new MeshyError("NODE_NOT_FOUND", `Node ${req.params.id} not found`, 404);
+      throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
     }
     res.json(node);
   }));
   router.get("/:id/status", asyncHandler3(async (req, res) => {
     const { nodeRegistry, taskEngine } = req.app.locals.deps;
-    const node = nodeRegistry.getNode(req.params.id);
+    const nodeId = req.params.id;
+    const node = nodeRegistry.getNode(nodeId);
     if (!node) {
-      throw new MeshyError("NODE_NOT_FOUND", `Node ${req.params.id} not found`, 404);
-    }
-    const { tasks } = taskEngine.listTasks({ assignedTo: req.params.id });
-    const taskSummary = tasks.map((t) => ({
-      id: t.id,
-      title: t.title,
-      status: t.status,
-      priority: t.priority
+      throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+    }
+    const { tasks } = taskEngine.listTasks({ assignedTo: nodeId });
+    const taskSummary = tasks.map((task) => ({
+      id: task.id,
+      title: task.title,
+      status: task.status,
+      priority: task.priority
     }));
     res.json({ node, tasks: taskSummary });
   }));
+  router.get("/:id/native-sessions", asyncHandler3(async (req, res) => {
+    const nodeId = req.params.id;
+    const handled = await maybeHandleRemoteNodeNativeSessionsRequest(req, res, nodeId);
+    if (handled) {
+      return;
+    }
+    sendLocalNodeNativeSessions(req, res, nodeId);
+  }));
   router.get("/:id/workdir/tree", asyncHandler3(async (req, res) => {
     const nodeId = req.params.id;
     const handled = await maybeHandleRemoteNodeWorkDirRequest(req, res, nodeId);
@@ -45116,6 +46234,9 @@ function createNodeRoutes() {
     }
     sendLocalNodeWorkDirBranchCreate(req, res, nodeId);
   }));
+  router.post("/:id/agents/:agent/upgrade", asyncHandler3(async (req, res) => {
+    await sendNodeAgentUpgrade(req, res, req.params.id, req.params.agent);
+  }));
   router.patch("/:id", asyncHandler3(async (req, res) => {
     const { nodeRegistry, persistNodeNamePreference } = req.app.locals.deps;
     const updates = UpdateNodeBody.parse(req.body);
@@ -45141,14 +46262,15 @@ function createNodeRoutes() {
   }));
   router.delete("/:id", asyncHandler3(async (req, res) => {
     const { nodeRegistry, election } = req.app.locals.deps;
+    const nodeId = req.params.id;
     if (!election.isLeader()) {
       throw new MeshyError("NOT_LEADER", "Only the leader node can delete nodes", 403);
     }
-    const node = nodeRegistry.getNode(req.params.id);
+    const node = nodeRegistry.getNode(nodeId);
     if (!node) {
-      throw new MeshyError("NODE_NOT_FOUND", `Node ${req.params.id} not found`, 404);
+      throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
     }
-    nodeRegistry.removeNode(req.params.id);
+    nodeRegistry.removeNode(nodeId);
     res.json({ ok: true });
   }));
   router.post("/:id/devtunnel", asyncHandler3(async (req, res) => {
@@ -45249,12 +46371,12 @@ function createNodeRoutes() {
 }
 
 // ../../packages/api/src/routes/node-messages.ts
-var import_express5 = __toESM(require_express2(), 1);
+var import_express6 = __toESM(require_express2(), 1);
 function asyncHandler4(fn) {
   return (req, res, next) => fn(req, res, next).catch(next);
 }
 function createNodeMessageRoutes() {
-  const router = (0, import_express5.Router)();
+  const router = (0, import_express6.Router)();
   router.post("/messages", asyncHandler4(async (req, res) => {
     const response = await handleNodeMessage(req.app.locals.deps, req.body);
     if (response) {
@@ -45334,7 +46456,7 @@ async function handleTaskMessage(deps, message) {
 }
 
 // ../../packages/api/src/routes/tasks.ts
-var import_express7 = __toESM(require_express2(), 1);
+var import_express8 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/tasks/task-remote-cancellation.ts
 async function cancelRemoteTaskExecution(deps) {
@@ -45403,8 +46525,307 @@ function startLocalTaskFollowUp(deps, task, content, assignedTo, metadata) {
   }
 }
 
+// ../../packages/api/src/tasks/task-session-import.ts
+var TASK_IMPORT_PROXY_TIMEOUT_MS = 1e4;
+function buildImportedSessionTitle(agent, sessionId) {
+  const label = agent === "codex" ? "Codex" : "Claude Code";
+  const suffix = sessionId.trim().slice(0, 12);
+  return `${label} session ${suffix || "attached"}`;
+}
+function resolveTargetImportNode(nodeRegistry, nodeId, agent) {
+  const self2 = nodeRegistry.getSelf();
+  const node = nodeRegistry.getNode(nodeId) ?? (self2?.id === nodeId ? self2 : null);
+  if (!node) {
+    throw new MeshyError("NODE_NOT_FOUND", `Node ${nodeId} not found`, 404);
+  }
+  if (node.status === "offline") {
+    throw new MeshyError("NODE_OFFLINE", `Node ${node.name} is offline`, 400);
+  }
+  if (node.supportedAgents && node.supportedAgents.length > 0 && !node.supportedAgents.includes(agent)) {
+    throw new MeshyError("VALIDATION_ERROR", `Node ${node.name} does not support agent ${agent}`, 400);
+  }
+  return node;
+}
+async function attachNativeSession(deps, body) {
+  const log2 = deps.logger.child("tasks/import-session");
+  const selfId = deps.nodeRegistry.getSelf()?.id;
+  const targetNodeId = body.assignTo ?? selfId;
+  if (!targetNodeId) {
+    throw new MeshyError("VALIDATION_ERROR", "No target node is available for session import", 400);
+  }
+  const targetNode = resolveTargetImportNode(deps.nodeRegistry, targetNodeId, body.agent);
+  const history = loadNativeSessionHistory({
+    agent: body.agent,
+    sessionId: body.sessionId
+  });
+  let importedLogs = history.logs;
+  const task = deps.taskEngine.createTask({
+    title: body.title?.trim() || buildImportedSessionTitle(body.agent, body.sessionId),
+    description: `Attached native ${body.agent === "codex" ? "Codex" : "Claude Code"} session`,
+    agent: body.agent,
+    project: body.cwd,
+    conversationKind: "nativeSession",
+    payload: {
+      sessionId: body.sessionId,
+      sessionCwd: body.cwd,
+      ...body.mode ? { mode: body.mode } : {}
+    },
+    priority: body.priority,
+    createdBy: "api"
+  });
+  const importedTask = deps.taskEngine.updateTask(task.id, {
+    status: "completed",
+    assignedTo: targetNode.id,
+    assignedNodeName: targetNode.name,
+    effectiveProjectPath: body.cwd
+  });
+  if (!importedTask) {
+    deps.taskEngine.deleteTask(task.id);
+    throw new MeshyError("TASK_NOT_FOUND", `Task ${task.id} not found after session import`, 500);
+  }
+  try {
+    if (targetNode.id !== selfId) {
+      importedLogs = await seedTaskSnapshotOnWorker(importedTask, importedLogs, targetNode, log2, TASK_IMPORT_PROXY_TIMEOUT_MS);
+    }
+  } catch (error) {
+    deps.taskEngine.deleteTask(task.id);
+    throw error;
+  }
+  if (importedLogs.length > 0) {
+    try {
+      recordLocalTaskLogs(deps.engineRegistry, importedTask, importedLogs);
+      log2.info("imported native session history into local task logs", {
+        taskId: importedTask.id,
+        assignedTo: importedTask.assignedTo,
+        importedLogCount: importedLogs.length,
+        sourcePath: history.sourcePath
+      });
+    } catch (error) {
+      log2.warn("failed to mirror imported native session history locally", {
+        taskId: importedTask.id,
+        assignedTo: importedTask.assignedTo,
+        importedLogCount: importedLogs.length,
+        sourcePath: history.sourcePath,
+        error: error instanceof Error ? error.message : String(error)
+      });
+    }
+  } else {
+    log2.info("no native session history found to import", {
+      taskId: importedTask.id,
+      assignedTo: importedTask.assignedTo,
+      sessionId: body.sessionId,
+      sourcePath: history.sourcePath
+    });
+  }
+  return importedTask;
+}
+
+// ../../packages/api/src/tasks/task-log-proxy.ts
+var TASK_LOG_PROXY_PURPOSE_HEADER = "x-meshy-proxy-purpose";
+var TASK_LOG_PROXY_SOURCE_HEADER = "x-meshy-proxy-source-node";
+var TASK_LOG_PROXY_TASK_HEADER = "x-meshy-task-snapshot";
+var TASK_LOG_PROXY_PURPOSE = "task-logs";
+function encodeTaskSnapshot(task) {
+  return Buffer.from(JSON.stringify(task), "utf8").toString("base64url");
+}
+function decodeTaskSnapshot(value) {
+  if (!value) return void 0;
+  try {
+    const task = JSON.parse(Buffer.from(value, "base64url").toString("utf8"));
+    return typeof task?.id === "string" ? task : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function createTaskLogsProxyHeaders(sourceNodeId, task) {
+  return {
+    [TASK_LOG_PROXY_PURPOSE_HEADER]: TASK_LOG_PROXY_PURPOSE,
+    [TASK_LOG_PROXY_TASK_HEADER]: encodeTaskSnapshot(task),
+    ...sourceNodeId ? { [TASK_LOG_PROXY_SOURCE_HEADER]: sourceNodeId } : {}
+  };
+}
+function getTaskLogsProxyRequestMetadata(req) {
+  const purpose = req.get(TASK_LOG_PROXY_PURPOSE_HEADER);
+  const sourceNodeId = req.get(TASK_LOG_PROXY_SOURCE_HEADER) ?? void 0;
+  return { isProxy: purpose === TASK_LOG_PROXY_PURPOSE, sourceNodeId, task: decodeTaskSnapshot(req.get(TASK_LOG_PROXY_TASK_HEADER)) };
+}
+function describeProxyError3(error) {
+  if (error instanceof Error) {
+    const errorCategory = error.name === "AbortError" || /aborted/i.test(error.message) ? "abort" : /timeout/i.test(error.message) ? "timeout" : "network";
+    return {
+      errorName: error.name,
+      errorMessage: error.message,
+      errorCategory
+    };
+  }
+  return {
+    errorName: "UnknownError",
+    errorMessage: String(error),
+    errorCategory: "unknown"
+  };
+}
+function createTaskLogsProxyTrace(log2, taskId, nodeId, proxyPath) {
+  return {
+    onAttempt: ({ attempt, endpoint, timeoutMs, totalEndpoints }) => {
+      log2.debug("task logs proxy attempt", { taskId, nodeId, proxyPath, endpoint, attempt, totalEndpoints, timeoutMs });
+    },
+    onResponse: ({ attempt, endpoint, response, timeoutMs, totalEndpoints }) => {
+      log2.info("task logs proxy response", {
+        taskId,
+        nodeId,
+        proxyPath,
+        endpoint,
+        attempt,
+        totalEndpoints,
+        timeoutMs,
+        ok: response.ok,
+        statusCode: response.status
+      });
+    },
+    onError: ({ attempt, endpoint, error, timeoutMs, totalEndpoints }) => {
+      log2.warn("task logs proxy attempt failed", {
+        taskId,
+        nodeId,
+        proxyPath,
+        endpoint,
+        attempt,
+        totalEndpoints,
+        timeoutMs,
+        ...describeProxyError3(error)
+      });
+    }
+  };
+}
+
+// ../../packages/api/src/tasks/task-log-response.ts
+var TASK_LOG_PROXY_TIMEOUT_MS = 1e4;
+async function sendTaskLogsResponse(req, res, taskId) {
+  const { engineRegistry, taskEngine, nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
+  const log2 = rootLogger.child("tasks/logs");
+  const query = TaskLogsQuery.parse(req.query);
+  const after = query.after ?? 0;
+  const proxyRequest = getTaskLogsProxyRequestMetadata(req);
+  let task = taskEngine.getTask(taskId);
+  if (!task && proxyRequest.task?.id === taskId) {
+    taskEngine.importTasks([proxyRequest.task]);
+    task = taskEngine.getTask(taskId) ?? proxyRequest.task;
+    log2.info("imported task snapshot from proxied task logs request", {
+      taskId,
+      assignedTo: task.assignedTo,
+      sourceNodeId: proxyRequest.sourceNodeId
+    });
+  }
+  if (!task && !proxyRequest.isProxy && await maybeProxyReadToLeader(req, res)) return;
+  const selfId = nodeRegistry.getSelf()?.id;
+  const isLeader = nodeRegistry.isLeader();
+  const isFollowerRemoteTask = !isLeader && !!(task?.assignedTo && task.assignedTo !== selfId);
+  const needsProxy = isLeader && !!(task?.assignedTo && task.assignedTo !== selfId);
+  if (proxyRequest.isProxy) {
+    log2.info("received proxied task logs request", {
+      taskId,
+      after,
+      taskFound: !!task,
+      assignedTo: task?.assignedTo,
+      selfId,
+      isLeader,
+      sourceNodeId: proxyRequest.sourceNodeId,
+      forwardedHost: req.get("x-forwarded-host"),
+      forwardedFor: req.get("x-forwarded-for")
+    });
+  }
+  if (!task) throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
+  log2.debug("log request", {
+    taskId,
+    assignedTo: task?.assignedTo,
+    selfId,
+    isLeader,
+    needsProxy
+  });
+  if (isLeader) {
+    const local2 = readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, task?.agent ?? "claudecode");
+    if (local2.total > 0 || !needsProxy) {
+      log2.debug("serving leader-local task logs", {
+        taskId,
+        assignedTo: task?.assignedTo,
+        selfId,
+        total: local2.total,
+        after
+      });
+      res.json(local2);
+      return;
+    }
+    log2.debug("leader-local task log missing, falling back to worker proxy", {
+      taskId,
+      assignedTo: task?.assignedTo,
+      selfId
+    });
+  }
+  const assignedTo = task.assignedTo;
+  if (needsProxy && assignedTo) {
+    const node = nodeRegistry.getNode(assignedTo);
+    log2.debug("proxy target", { nodeId: node?.id, endpoint: node?.endpoint, devtunnel: node?.devtunnelEndpoint, status: node?.status });
+    if (node) {
+      const seededLogs = await seedTaskSnapshotOnWorker(task, [], node, log2).catch((err) => {
+        log2.warn("failed to seed task snapshot before task logs proxy", {
+          taskId,
+          assignedTo,
+          ...describeProxyError3(err)
+        });
+        return [];
+      });
+      if (seededLogs.length > 0) recordLocalTaskLogs(engineRegistry, task, seededLogs);
+      const proxyPath = `/api/tasks/${taskId}/logs?after=${after}`;
+      try {
+        const { endpoint, response: proxyRes } = await fetchNodeWithFallback(
+          node,
+          proxyPath,
+          { headers: createTaskLogsProxyHeaders(selfId, task) },
+          TASK_LOG_PROXY_TIMEOUT_MS,
+          createTaskLogsProxyTrace(log2, taskId, node.id, proxyPath),
+          { preferPublicEndpoint: true }
+        );
+        const proxyUrl = `${endpoint}${proxyPath}`;
+        log2.info("proxying task logs request", {
+          taskId,
+          assignedTo,
+          endpoint,
+          proxyPath,
+          url: proxyUrl
+        });
+        if (!proxyRes.ok) throw new MeshyError("NODE_OFFLINE", `Worker log proxy failed (${proxyRes.status})`, 502);
+        const data = await proxyRes.json();
+        log2.debug("proxy returned", { logs: data.logs?.length ?? 0, total: data.total });
+        res.json(data);
+        return;
+      } catch (err) {
+        log2.warn("task logs proxy failed; falling back to keepalive control", {
+          taskId,
+          assignedTo,
+          timeoutMs: TASK_LOG_PROXY_TIMEOUT_MS,
+          ...describeProxyError3(err)
+        });
+        const fallback = await requestTaskLogsOverKeepalive(heartbeat, assignedTo, task, after);
+        if (fallback) {
+          sendWorkerControlResponse(res, fallback);
+          return;
+        }
+      }
+    }
+  }
+  const local = readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, task?.agent ?? "claudecode");
+  if (!proxyRequest.isProxy && isFollowerRemoteTask && local.total === 0 && await maybeProxyReadToLeader(req, res)) return;
+  log2.debug("serving local task logs after proxy miss", {
+    taskId,
+    assignedTo: task?.assignedTo,
+    selfId,
+    total: local.total,
+    after
+  });
+  res.json(local);
+}
+
 // ../../packages/api/src/routes/task-output.ts
-var import_express6 = __toESM(require_express2(), 1);
+var import_express7 = __toESM(require_express2(), 1);
 
 // ../../packages/api/src/app/request-origin.ts
 function getFirstHeaderValue(value) {
@@ -45458,7 +46879,7 @@ function resolveRequestOrigin(req) {
 
 // ../../packages/api/src/routes/task-output.ts
 var TASK_OUTPUT_PROXY_TIMEOUT_MS = 1e4;
-function describeProxyError3(error) {
+function describeProxyError4(error) {
   if (error instanceof Error) {
     const errorCategory = error.name === "AbortError" || /aborted/i.test(error.message) ? "abort" : /timeout/i.test(error.message) ? "timeout" : "network";
     return {
@@ -45511,7 +46932,7 @@ function createTaskOutputProxyTrace(log2, taskId, assignedTo, kind, proxyPath) {
         attempt,
         totalEndpoints,
         timeoutMs,
-        ...describeProxyError3(error)
+        ...describeProxyError4(error)
       });
     }
   };
@@ -45529,11 +46950,26 @@ function rewritePreviewPayloadIfNeeded(req, nodeId, payload) {
   }
   return rewritePreviewSessionPayloadForProxy(previewProxyManager, payload, nodeId);
 }
+function withTaskSnapshot(message, task) {
+  if (!message || typeof message.payload !== "object" || message.payload === null) return message;
+  return { ...message, payload: { ...message.payload, task } };
+}
+async function sendTaskOutputProxyResponse(req, res, nodeId, proxyRes, fallbackRequest) {
+  if (fallbackRequest?.kind === "task.preview.create" && proxyRes.ok) {
+    const body = await proxyRes.json().catch(() => null);
+    if (isPreviewSessionPayload(body)) {
+      res.status(proxyRes.status).json(rewritePreviewPayloadIfNeeded(req, nodeId, body));
+      return;
+    }
+  }
+  await sendProxyResponse(res, proxyRes);
+}
 async function maybeHandleRemoteTaskOutputRequest(req, res, taskId, subPath, init, fallbackRequest) {
   const { taskEngine, nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
   const log2 = rootLogger.child("tasks/output");
   const task = taskEngine.getTask(taskId);
   if (!task) {
+    if (await maybeProxyReadToLeader(req, res, { methods: ["GET", "POST"] })) return true;
     throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
   }
   const selfId = nodeRegistry.getSelf()?.id;
@@ -45550,14 +46986,15 @@ async function maybeHandleRemoteTaskOutputRequest(req, res, taskId, subPath, ini
     throw new MeshyError("NODE_NOT_FOUND", `Assigned node ${assignedNodeId} not found`, 404);
   }
   if (!node.endpoint && !node.devtunnelEndpoint) {
-    if (fallbackRequest && canRequestNodeMessage(heartbeat)) {
+    const hydratedFallbackRequest2 = withTaskSnapshot(fallbackRequest, task);
+    if (hydratedFallbackRequest2 && canRequestNodeMessage(heartbeat)) {
       log2.warn("worker output endpoint missing, falling back to keepalive control", {
         taskId,
         assignedTo: assignedNodeId,
-        kind: fallbackRequest.kind
+        kind: hydratedFallbackRequest2.kind
       });
-      const controlResponse = await requestFallbackNodeMessage(heartbeat, assignedNodeId, fallbackRequest);
-      if (fallbackRequest.kind === "task.preview.create" && controlResponse.bodyEncoding === "json" && isPreviewSessionPayload(controlResponse.body)) {
+      const controlResponse = await requestFallbackNodeMessage(heartbeat, assignedNodeId, hydratedFallbackRequest2);
+      if (hydratedFallbackRequest2.kind === "task.preview.create" && controlResponse.bodyEncoding === "json" && isPreviewSessionPayload(controlResponse.body)) {
         res.status(controlResponse.statusCode).json(
           rewritePreviewPayloadIfNeeded(req, assignedNodeId, controlResponse.body)
         );
@@ -45571,6 +47008,7 @@ async function maybeHandleRemoteTaskOutputRequest(req, res, taskId, subPath, ini
   const qs = new URL(req.originalUrl ?? req.url, "http://localhost").search;
   const proxyPath = `/api/tasks/${taskId}/output${subPath}${qs}`;
   const messageKind = fallbackRequest?.kind ?? "task.output.proxy";
+  const hydratedFallbackRequest = withTaskSnapshot(fallbackRequest, task);
   try {
     const { endpoint, response: proxyRes } = await fetchNodeWithFallback(
       node,
@@ -45587,26 +47025,35 @@ async function maybeHandleRemoteTaskOutputRequest(req, res, taskId, subPath, ini
       proxyPath,
       outputEndpoint: endpoint
     });
-    if (fallbackRequest?.kind === "task.preview.create" && proxyRes.ok) {
-      const body = await proxyRes.json().catch(() => null);
-      if (isPreviewSessionPayload(body)) {
-        res.status(proxyRes.status).json(rewritePreviewPayloadIfNeeded(req, assignedNodeId, body));
+    if (proxyRes.status === 404) {
+      const seededLogs = await seedTaskSnapshotOnWorker(task, [], node, log2).catch((seedError) => {
+        log2.warn("failed to seed task snapshot after worker output 404", {
+          taskId,
+          assignedTo: assignedNodeId,
+          kind: messageKind,
+          error: seedError instanceof Error ? seedError.message : String(seedError)
+        });
+        return null;
+      });
+      if (seededLogs !== null) {
+        const retry = await fetchNodeWithFallback(node, proxyPath, init, TASK_OUTPUT_PROXY_TIMEOUT_MS);
+        await sendTaskOutputProxyResponse(req, res, assignedNodeId, retry.response, fallbackRequest);
         return true;
       }
     }
-    await sendProxyResponse(res, proxyRes);
+    await sendTaskOutputProxyResponse(req, res, assignedNodeId, proxyRes, fallbackRequest);
     return true;
   } catch (err) {
-    if (fallbackRequest && canRequestNodeMessage(heartbeat)) {
+    if (hydratedFallbackRequest && canRequestNodeMessage(heartbeat)) {
       log2.warn("worker output proxy failed, falling back to keepalive control", {
         taskId,
         assignedTo: assignedNodeId,
-        kind: fallbackRequest.kind,
+        kind: hydratedFallbackRequest.kind,
         timeoutMs: TASK_OUTPUT_PROXY_TIMEOUT_MS,
-        ...describeProxyError3(err)
+        ...describeProxyError4(err)
       });
-      const controlResponse = await requestFallbackNodeMessage(heartbeat, assignedNodeId, fallbackRequest);
-      if (fallbackRequest.kind === "task.preview.create" && controlResponse.bodyEncoding === "json" && isPreviewSessionPayload(controlResponse.body)) {
+      const controlResponse = await requestFallbackNodeMessage(heartbeat, assignedNodeId, hydratedFallbackRequest);
+      if (hydratedFallbackRequest.kind === "task.preview.create" && controlResponse.bodyEncoding === "json" && isPreviewSessionPayload(controlResponse.body)) {
         res.status(controlResponse.statusCode).json(
           rewritePreviewPayloadIfNeeded(req, assignedNodeId, controlResponse.body)
         );
@@ -45620,13 +47067,13 @@ async function maybeHandleRemoteTaskOutputRequest(req, res, taskId, subPath, ini
       assignedTo: assignedNodeId,
       kind: messageKind,
       timeoutMs: TASK_OUTPUT_PROXY_TIMEOUT_MS,
-      ...describeProxyError3(err)
+      ...describeProxyError4(err)
     });
     throw new MeshyError("NODE_OFFLINE", "Cannot reach worker for task output", 502);
   }
 }
 function createTaskOutputRoutes(options = {}) {
-  const router = (0, import_express6.Router)();
+  const router = (0, import_express7.Router)();
   const allowRemoteProxy = options.allowRemoteProxy ?? true;
   router.get("/:id/output", asyncHandler5(async (req, res) => {
     const taskId = req.params.id;
@@ -45747,62 +47194,6 @@ function createTaskOutputRoutes(options = {}) {
 var TERMINAL_STATUSES3 = /* @__PURE__ */ new Set(["completed", "failed", "cancelled", "archived"]);
 var ARCHIVABLE_STATUSES = /* @__PURE__ */ new Set(["completed", "failed", "cancelled", "archived"]);
 var ACTIVE_STATUSES = /* @__PURE__ */ new Set(["pending", "assigned", "running"]);
-var TASK_LOG_PROXY_TIMEOUT_MS = 1e4;
-function describeProxyError4(error) {
-  if (error instanceof Error) {
-    const errorCategory = error.name === "AbortError" || /aborted/i.test(error.message) ? "abort" : /timeout/i.test(error.message) ? "timeout" : "network";
-    return {
-      errorName: error.name,
-      errorMessage: error.message,
-      errorCategory
-    };
-  }
-  return {
-    errorName: "UnknownError",
-    errorMessage: String(error),
-    errorCategory: "unknown"
-  };
-}
-function createTaskLogsProxyTrace(log2, taskId, nodeId, proxyPath) {
-  return {
-    onAttempt: ({ attempt, endpoint, timeoutMs, totalEndpoints }) => {
-      log2.debug("task logs proxy attempt", {
-        taskId,
-        nodeId,
-        proxyPath,
-        endpoint,
-        attempt,
-        totalEndpoints,
-        timeoutMs
-      });
-    },
-    onResponse: ({ attempt, endpoint, response, timeoutMs, totalEndpoints }) => {
-      log2.info("task logs proxy response", {
-        taskId,
-        nodeId,
-        proxyPath,
-        endpoint,
-        attempt,
-        totalEndpoints,
-        timeoutMs,
-        ok: response.ok,
-        statusCode: response.status
-      });
-    },
-    onError: ({ attempt, endpoint, error, timeoutMs, totalEndpoints }) => {
-      log2.warn("task logs proxy attempt failed", {
-        taskId,
-        nodeId,
-        proxyPath,
-        endpoint,
-        attempt,
-        totalEndpoints,
-        timeoutMs,
-        ...describeProxyError4(error)
-      });
-    }
-  };
-}
 function shouldGenerateTitle(task) {
   return task.payload.titleSource === "derived";
 }
@@ -45917,7 +47308,7 @@ function buildShareUrl(origin, shareId) {
   return `${origin.replace(/\/+$/, "")}/shared/tasks/${encodeURIComponent(shareId)}`;
 }
 function createTaskRoutes() {
-  const router = (0, import_express7.Router)();
+  const router = (0, import_express8.Router)();
   router.post("/", asyncHandler6(async (req, res) => {
     const { taskEngine, nodeRegistry, liteAgentRunner, logger: rootLogger, workDir } = req.app.locals.deps;
     const body = CreateTaskBody.parse(req.body);
@@ -45940,6 +47331,17 @@ function createTaskRoutes() {
     scheduleTitleGeneration({ taskEngine, liteAgentRunner, logger: rootLogger, workDir }, task);
     res.status(201).json(withAssignedNodeMetadata(task, nodeRegistry));
   }));
+  router.post("/import-session", asyncHandler6(async (req, res) => {
+    const { taskEngine, nodeRegistry, engineRegistry, logger: rootLogger, shareOrigin } = req.app.locals.deps;
+    const body = AttachNativeSessionBody.parse(req.body);
+    const importedTask = await attachNativeSession({
+      taskEngine,
+      nodeRegistry,
+      engineRegistry,
+      logger: rootLogger
+    }, body);
+    res.status(201).json(toTaskResponse(importedTask, nodeRegistry, taskEngine, shareOrigin));
+  }));
   router.get("/", asyncHandler6(async (req, res) => {
     const { taskEngine, nodeRegistry, shareOrigin } = req.app.locals.deps;
     const query = TaskListQuery.parse(req.query);
@@ -45991,6 +47393,7 @@ function createTaskRoutes() {
     const taskId = req.params.id;
     const task = taskEngine.getTask(taskId);
     if (!task) {
+      if (await maybeProxyReadToLeader(req, res)) return;
       throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     res.json(toTaskResponse(task, nodeRegistry, taskEngine, shareOrigin));
@@ -46049,13 +47452,14 @@ function createTaskRoutes() {
     const { taskEngine, nodeRegistry, logger: rootLogger } = req.app.locals.deps;
     const log2 = rootLogger.child("tasks/patch");
     const updates = UpdateTaskBody.parse(req.body);
-    const existing = taskEngine.getTask(req.params.id);
+    const taskId = req.params.id;
+    const existing = taskEngine.getTask(taskId);
     if (!existing) {
-      throw new MeshyError("TASK_NOT_FOUND", `Task ${req.params.id} not found`, 404);
+      throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     if (updates.status !== void 0 && TERMINAL_STATUSES3.has(existing.status) && ACTIVE_STATUSES.has(updates.status)) {
       log2.warn("ignoring stale status regression for terminal task", {
-        taskId: req.params.id,
+        taskId,
         currentStatus: existing.status,
         incomingStatus: updates.status
       });
@@ -46071,33 +47475,35 @@ function createTaskRoutes() {
     }
     if (updates.status !== void 0 && existing.status === "archived" && updates.status !== "archived") {
       log2.warn("ignoring status change for archived task", {
-        taskId: req.params.id,
+        taskId,
         currentStatus: existing.status,
         incomingStatus: updates.status
       });
       res.json(withAssignedNodeMetadata(existing, nodeRegistry));
       return;
     }
-    const task = taskEngine.updateTask(req.params.id, updates);
+    const task = taskEngine.updateTask(taskId, updates);
     if (!task) {
-      throw new MeshyError("TASK_NOT_FOUND", `Task ${req.params.id} not found`, 404);
+      throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     res.json(withAssignedNodeMetadata(task, nodeRegistry));
   }));
   router.delete("/:id", asyncHandler6(async (req, res) => {
     const { taskEngine } = req.app.locals.deps;
-    const result = taskEngine.deleteTask(req.params.id);
+    const taskId = req.params.id;
+    const result = taskEngine.deleteTask(taskId);
     if (!result) {
-      throw new MeshyError("TASK_NOT_FOUND", `Task ${req.params.id} not found`, 404);
+      throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     res.json({ ok: true });
   }));
   router.post("/:id/cancel", asyncHandler6(async (req, res) => {
     const { taskEngine, nodeRegistry, engineRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
     const log2 = rootLogger.child("tasks/cancel");
-    const task = taskEngine.getTask(req.params.id);
+    const taskId = req.params.id;
+    const task = taskEngine.getTask(taskId);
     if (!task) {
-      throw new MeshyError("TASK_NOT_FOUND", `Task ${req.params.id} not found`, 404);
+      throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     if (TERMINAL_STATUSES3.has(task.status)) {
       throw new MeshyError("VALIDATION_ERROR", `Task ${task.id} cannot be cancelled (status: ${task.status})`, 400);
@@ -46141,97 +47547,16 @@ function createTaskRoutes() {
     res.json(withAssignedNodeMetadata(task, nodeRegistry));
   }));
   router.get("/:id/logs", asyncHandler6(async (req, res) => {
-    const { engineRegistry, taskEngine, nodeRegistry, logger: rootLogger } = req.app.locals.deps;
-    const log2 = rootLogger.child("tasks/logs");
-    const query = TaskLogsQuery.parse(req.query);
-    const after = query.after ?? 0;
-    const taskId = req.params.id;
-    const task = taskEngine.getTask(taskId);
-    const selfId = nodeRegistry.getSelf()?.id;
-    const isLeader = nodeRegistry.isLeader();
-    const needsProxy = isLeader && !!(task?.assignedTo && task.assignedTo !== selfId);
-    log2.debug("log request", {
-      taskId,
-      assignedTo: task?.assignedTo,
-      selfId,
-      isLeader,
-      needsProxy
-    });
-    if (isLeader) {
-      const local2 = readLocalTaskLogs(engineRegistry, taskId, after, task?.agent ?? "claudecode");
-      if (local2.total > 0 || !needsProxy) {
-        log2.debug("serving leader-local task logs", {
-          taskId,
-          assignedTo: task?.assignedTo,
-          selfId,
-          total: local2.total,
-          after
-        });
-        res.json(local2);
-        return;
-      }
-      log2.debug("leader-local task log missing, falling back to worker proxy", {
-        taskId,
-        assignedTo: task?.assignedTo,
-        selfId
-      });
-    }
-    if (needsProxy) {
-      const node = nodeRegistry.getNode(task.assignedTo);
-      log2.debug("proxy target", { nodeId: node?.id, endpoint: node?.endpoint, devtunnel: node?.devtunnelEndpoint, status: node?.status });
-      if (node) {
-        const proxyPath = `/api/tasks/${taskId}/logs?after=${after}`;
-        try {
-          const { endpoint, response: proxyRes } = await fetchNodeWithFallback(
-            node,
-            proxyPath,
-            void 0,
-            TASK_LOG_PROXY_TIMEOUT_MS,
-            createTaskLogsProxyTrace(log2, taskId, node.id, proxyPath),
-            { preferPublicEndpoint: true }
-          );
-          const proxyUrl = `${endpoint}${proxyPath}`;
-          log2.info("proxying task logs request", {
-            taskId,
-            assignedTo: task.assignedTo,
-            endpoint,
-            proxyPath,
-            url: proxyUrl
-          });
-          log2.debug("proxy response", { status: proxyRes.status });
-          if (proxyRes.ok) {
-            const data = await proxyRes.json();
-            log2.debug("proxy returned", { logs: data?.logs?.length ?? 0, total: data?.total });
-            res.json(data);
-            return;
-          }
-        } catch (err) {
-          log2.warn("task logs proxy failed; serving local logs after proxy miss", {
-            taskId,
-            assignedTo: task.assignedTo,
-            timeoutMs: TASK_LOG_PROXY_TIMEOUT_MS,
-            ...describeProxyError4(err)
-          });
-        }
-      }
-    }
-    const local = readLocalTaskLogs(engineRegistry, taskId, after, task?.agent ?? "claudecode");
-    log2.debug("serving local task logs after proxy miss", {
-      taskId,
-      assignedTo: task?.assignedTo,
-      selfId,
-      total: local.total,
-      after
-    });
-    res.json(local);
+    await sendTaskLogsResponse(req, res, req.params.id);
   }));
   router.post("/:id/message", asyncHandler6(async (req, res) => {
     const { taskEngine, engineRegistry, nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
     const log2 = rootLogger.child("tasks/message");
     const body = SendMessageBody.parse(req.body);
-    const task = taskEngine.getTask(req.params.id);
+    const taskId = req.params.id;
+    const task = taskEngine.getTask(taskId);
     if (!task) {
-      throw new MeshyError("TASK_NOT_FOUND", `Task ${req.params.id} not found`, 404);
+      throw new MeshyError("TASK_NOT_FOUND", `Task ${taskId} not found`, 404);
     }
     if (!supportsFollowUpAgent(task.agent)) {
       throw new MeshyError("VALIDATION_ERROR", `Agent ${task.agent} does not support chat messages`, 400);
@@ -46287,7 +47612,7 @@ function createTaskRoutes() {
 }
 
 // ../../packages/api/src/routes/shared.ts
-var import_express8 = __toESM(require_express2(), 1);
+var import_express9 = __toESM(require_express2(), 1);
 function asyncHandler7(fn) {
   return (req, res, next) => fn(req, res, next).catch(next);
 }
@@ -46315,6 +47640,7 @@ function toSharedConversation(share, task) {
     title: task.title,
     description: task.description,
     agent: task.agent,
+    conversationKind: task.conversationKind,
     status: task.status,
     priority: task.priority,
     assignedNodeName: task.assignedNodeName ?? null,
@@ -46326,7 +47652,7 @@ function toSharedConversation(share, task) {
   };
 }
 function createSharedRoutes() {
-  const router = (0, import_express8.Router)();
+  const router = (0, import_express9.Router)();
   router.get("/conversations/:shareId", asyncHandler7(async (req, res) => {
     const { taskEngine } = req.app.locals.deps;
     const shareId = req.params.shareId;
@@ -46338,15 +47664,10 @@ function createSharedRoutes() {
     res.json(toSharedConversation(share, task));
   }));
   router.get("/conversations/:shareId/logs", asyncHandler7(async (req, res) => {
-    const { taskEngine, engineRegistry } = req.app.locals.deps;
-    const query = TaskLogsQuery.parse(req.query);
+    const { taskEngine } = req.app.locals.deps;
     const shareId = req.params.shareId;
     const share = assertActiveShare(taskEngine.getTaskShare(shareId));
-    const task = taskEngine.getTask(share.taskId);
-    if (!task) {
-      throw new MeshyError("TASK_NOT_FOUND", "Shared conversation task not found", 404);
-    }
-    res.json(readLocalTaskLogs(engineRegistry, task.id, query.after ?? 0, task.agent));
+    await sendTaskLogsResponse(req, res, share.taskId);
   }));
   router.get("/conversations/:shareId/output", asyncHandler7(async (req, res) => {
     const { taskEngine } = req.app.locals.deps;
@@ -46441,7 +47762,7 @@ function createSharedRoutes() {
 }
 
 // ../../packages/api/src/routes/worker.ts
-var import_express9 = __toESM(require_express2(), 1);
+var import_express10 = __toESM(require_express2(), 1);
 var WorkerMessageBody = external_exports.object({
   taskId: external_exports.string().min(1)
 }).and(SendMessageBody);
@@ -46452,7 +47773,7 @@ function asyncHandler8(fn) {
   return (req, res, next) => fn(req, res, next).catch(next);
 }
 function createWorkerRoutes() {
-  const router = (0, import_express9.Router)();
+  const router = (0, import_express10.Router)();
   router.post("/execute", asyncHandler8(async (req, res) => {
     const { taskEngine, engineRegistry, nodeRegistry, eventBus, logger: rootLogger, workDir } = req.app.locals.deps;
     const log2 = rootLogger.child("worker/execute");
@@ -46470,6 +47791,21 @@ function createWorkerRoutes() {
     });
     res.json({ ok: true });
   }));
+  router.post("/import-task", asyncHandler8(async (req, res) => {
+    const { taskEngine, engineRegistry } = req.app.locals.deps;
+    const body = WorkerImportTaskBody.parse(req.body);
+    const { task } = body;
+    let { logs } = body;
+    if (logs.length === 0 && task.conversationKind === "nativeSession") {
+      const sessionId = typeof task.payload?.sessionId === "string" ? task.payload.sessionId : "";
+      if (sessionId && (task.agent === "codex" || task.agent === "claudecode")) {
+        logs = loadNativeSessionHistory({ agent: task.agent, sessionId }).logs;
+      }
+    }
+    taskEngine.importTasks([task]);
+    recordLocalTaskLogs(engineRegistry, task, logs);
+    res.status(201).json({ ok: true, task, logs });
+  }));
   router.post("/message", asyncHandler8(async (req, res) => {
     const { engineRegistry, taskEngine, nodeRegistry, eventBus, logger: rootLogger } = req.app.locals.deps;
     const log2 = rootLogger.child("worker/message");
@@ -46651,129 +47987,12 @@ function normalizeNodeMessageResponse(value) {
 }
 
 // ../../packages/api/src/routes/system.ts
-var import_express10 = __toESM(require_express2(), 1);
-
-// ../../packages/api/src/app/system-info.ts
-var os5 = __toESM(require("os"), 1);
-var import_node_child_process8 = require("child_process");
-var RUNTIME_TOOLS = [
-  { id: "claude", label: "Claude Code", command: "claude" },
-  { id: "codex", label: "Codex", command: "codex" }
-];
-function normalizeOutput(output) {
-  if (!output) {
-    return null;
-  }
-  const firstLine = output.split(/\r?\n/).map((line) => line.trim()).find(Boolean);
-  return firstLine ?? null;
-}
-function resolveCommandPath(command) {
-  const lookupCommand = process.platform === "win32" ? "where" : "which";
-  const result = (0, import_node_child_process8.spawnSync)(lookupCommand, [command], {
-    encoding: "utf-8",
-    shell: false,
-    windowsHide: true,
-    timeout: 1500
-  });
-  if (result.status === 0) {
-    return { path: normalizeOutput(result.stdout) };
-  }
-  return {
-    path: null,
-    detail: normalizeOutput(result.stderr) ?? result.error?.message ?? null
-  };
-}
-function inspectTool(definition) {
-  const checkedAt = (/* @__PURE__ */ new Date()).toISOString();
-  const resolved = resolveCommandPath(definition.command);
-  if (!resolved.path) {
-    return {
-      id: definition.id,
-      label: definition.label,
-      command: definition.command,
-      available: false,
-      path: null,
-      version: null,
-      checkedAt,
-      detail: resolved.detail ?? "Command not found on PATH"
-    };
-  }
-  const versionResult = (0, import_node_child_process8.spawnSync)(definition.command, ["--version"], {
-    encoding: "utf-8",
-    shell: process.platform === "win32",
-    windowsHide: true,
-    timeout: 2500
-  });
-  const version2 = normalizeOutput(versionResult.stdout) ?? normalizeOutput(versionResult.stderr);
-  const detail = versionResult.status === 0 ? null : normalizeOutput(versionResult.stderr) ?? versionResult.error?.message ?? "Version check failed";
-  return {
-    id: definition.id,
-    label: definition.label,
-    command: definition.command,
-    available: true,
-    path: resolved.path,
-    version: version2,
-    checkedAt,
-    detail
-  };
-}
-function inspectRuntimeTools() {
-  return RUNTIME_TOOLS.map(inspectTool);
-}
-function getOsSnapshot() {
-  const cpus2 = os5.cpus();
-  return {
-    platform: os5.platform(),
-    release: os5.release(),
-    arch: os5.arch(),
-    hostname: os5.hostname(),
-    cpuModel: cpus2[0]?.model ?? null,
-    cpuCount: cpus2.length,
-    totalMemoryBytes: os5.totalmem(),
-    freeMemoryBytes: os5.freemem()
-  };
-}
-function buildNodeSettingsSnapshot(options) {
-  const uptime = process.uptime();
-  const runtimeMetadata = options.runtimeMetadata;
-  const agents = (options.inspectRuntimeTools?.() ?? inspectRuntimeTools()).map((agent) => ({
-    ...agent,
-    metadataStatus: runtimeMetadata?.components?.[agent.id]?.status ?? null
-  }));
-  return {
-    collectedAt: Date.now(),
-    version: runtimeMetadata?.packageVersion ?? "0.1.0",
-    packageName: runtimeMetadata?.packageName ?? "meshy",
-    uptime,
-    auth: options.auth,
-    os: getOsSnapshot(),
-    runtime: {
-      nodeVersion: process.version,
-      pid: process.pid,
-      startedAt: Date.now() - Math.floor(uptime * 1e3),
-      cwd: process.cwd(),
-      workDir: options.workDir ?? null,
-      storagePath: options.storagePath ?? null,
-      localDashboardOrigin: options.localDashboardOrigin ?? null
-    },
-    agents,
-    startupRequirements: {
-      lastCheckedAt: runtimeMetadata?.startupRequirementsLastCheckedAt,
-      lastCheckedOn: runtimeMetadata?.startupRequirementsLastCheckedOn,
-      components: runtimeMetadata?.components ?? {}
-    },
-    components: runtimeMetadata?.components ?? {},
-    repository: runtimeMetadata?.repository ?? {},
-    packages: runtimeMetadata?.packages ?? {}
-  };
-}
-
-// ../../packages/api/src/routes/system.ts
+var import_express11 = __toESM(require_express2(), 1);
 function asyncHandler9(fn) {
   return (req, res, next) => fn(req, res, next).catch(next);
 }
 function createSystemRoutes() {
-  const router = (0, import_express10.Router)();
+  const router = (0, import_express11.Router)();
   router.get("/health", asyncHandler9(async (req, res) => {
     const { logger: rootLogger } = req.app.locals.deps;
     rootLogger.child("system/health").info("received system health API call", {
@@ -46834,8 +48053,8 @@ function createSystemRoutes() {
       return;
     }
     const { type } = req.body;
-    if (!type || !["direct", "devtunnel", "tailscale"].includes(type)) {
-      res.status(400).json({ error: "Invalid transport type. Must be: direct, devtunnel, or tailscale" });
+    if (!type || !["direct", "devtunnel"].includes(type)) {
+      res.status(400).json({ error: "Invalid transport type. Must be: direct or devtunnel" });
       return;
     }
     const newEndpoint = await switchTransport(type);
@@ -46879,7 +48098,7 @@ function createSystemRoutes() {
 }
 
 // ../../packages/api/src/routes/events.ts
-var import_express11 = __toESM(require_express2(), 1);
+var import_express12 = __toESM(require_express2(), 1);
 var HEARTBEAT_INTERVAL_MS = 15e3;
 var CATEGORY_MAP = {
   tasks: "task.",
@@ -46915,9 +48134,10 @@ function shouldIncludeEvent(eventName, categories) {
   });
 }
 function createEventRoutes() {
-  const router = (0, import_express11.Router)();
+  const router = (0, import_express12.Router)();
   router.get("/", (req, res) => {
     const { eventBus } = req.app.locals.deps;
+    const stream = res;
     const categories = parseFilter(req.query.filter);
     res.writeHead(200, {
       "Content-Type": "text/event-stream",
@@ -46934,20 +48154,14 @@ data: ${JSON.stringify(data)}
 
 `;
         res.write(payload);
-        if (typeof res.flush === "function") {
-          ;
-          res.flush();
-        }
+        stream.flush?.();
       };
       listeners.set(eventName, listener);
       eventBus.on(eventName, listener);
     }
     const heartbeatTimer = setInterval(() => {
       res.write(": heartbeat\n\n");
-      if (typeof res.flush === "function") {
-        ;
-        res.flush();
-      }
+      stream.flush?.();
     }, HEARTBEAT_INTERVAL_MS);
     req.on("close", () => {
       clearInterval(heartbeatTimer);
@@ -47000,8 +48214,8 @@ function isAllowedSharePath(pathname) {
 function resolveRuntimeBaseDir() {
   const entryPath = process.argv[1];
   if (typeof entryPath === "string" && entryPath.length > 0) {
-    const resolved = fs17.realpathSync(path18.resolve(entryPath));
-    return path18.dirname(resolved);
+    const resolved = fs18.realpathSync(path19.resolve(entryPath));
+    return path19.dirname(resolved);
   }
   return process.cwd();
 }
@@ -47009,25 +48223,25 @@ function resolveStaticDir(baseDir) {
   const envStaticDir = process.env.MESHY_STATIC_DIR;
   const candidateDirs = [
     envStaticDir,
-    path18.resolve(baseDir, "dashboard"),
-    path18.resolve(baseDir, "../dashboard"),
-    path18.resolve(baseDir, "../../dashboard/dist"),
-    path18.resolve(baseDir, "../../../packages/dashboard/dist"),
-    path18.resolve(baseDir, "../public"),
-    path18.resolve(baseDir, "../../packages/api/public"),
-    path18.resolve(baseDir, "../../../packages/api/public"),
-    path18.resolve(process.cwd(), "packages/dashboard/dist"),
-    path18.resolve(process.cwd(), "packages/api/public")
+    path19.resolve(baseDir, "dashboard"),
+    path19.resolve(baseDir, "../dashboard"),
+    path19.resolve(baseDir, "../../dashboard/dist"),
+    path19.resolve(baseDir, "../../../packages/dashboard/dist"),
+    path19.resolve(baseDir, "../public"),
+    path19.resolve(baseDir, "../../packages/api/public"),
+    path19.resolve(baseDir, "../../../packages/api/public"),
+    path19.resolve(process.cwd(), "packages/dashboard/dist"),
+    path19.resolve(process.cwd(), "packages/api/public")
   ].filter((value) => typeof value === "string" && value.length > 0);
   for (const candidate of candidateDirs) {
-    if (fs17.existsSync(candidate)) {
+    if (fs18.existsSync(candidate)) {
       return candidate;
     }
   }
   return null;
 }
 function createServer2(deps) {
-  const app = (0, import_express12.default)();
+  const app = (0, import_express13.default)();
   app.locals.deps = deps;
   if (typeof deps.heartbeat.setNodeMessageHandler === "function") {
     deps.heartbeat.setNodeMessageHandler((message) => handleNodeMessage(deps, message));
@@ -47068,7 +48282,7 @@ function createServer2(deps) {
   const runtimeBaseDir = resolveRuntimeBaseDir();
   const staticDir = resolveStaticDir(runtimeBaseDir);
   if (staticDir) {
-    const staticMiddleware = import_express12.default.static(staticDir);
+    const staticMiddleware = import_express13.default.static(staticDir);
     app.use((req, res, next) => {
       if (isApiRequest(req)) {
         next();
@@ -47081,7 +48295,7 @@ function createServer2(deps) {
       staticMiddleware(req, res, next);
     });
   }
-  app.use(import_express12.default.json({ limit: JSON_BODY_LIMIT }));
+  app.use(import_express13.default.json({ limit: JSON_BODY_LIMIT }));
   app.use(createAuthMiddleware(authConfig));
   app.use((req, res, next) => {
     void (async () => {
@@ -47103,7 +48317,7 @@ function createServer2(deps) {
     })().catch(next);
   });
   app.use(createRoutingMiddleware(deps.dataRouter));
-  const largeBodyParser = import_express12.default.json({ limit: JSON_BODY_LIMIT_LARGE });
+  const largeBodyParser = import_express13.default.json({ limit: JSON_BODY_LIMIT_LARGE });
   app.use("/api/cluster", createClusterRoutes());
   app.use("/api/cluster-control", createClusterControlRoutes());
   app.use("/api/node", largeBodyParser, createNodeMessageRoutes());
@@ -47114,8 +48328,8 @@ function createServer2(deps) {
   app.use("/api/system", createSystemRoutes());
   app.use("/api/events", createEventRoutes());
   if (staticDir) {
-    const indexPath = path18.join(staticDir, "index.html");
-    if (fs17.existsSync(indexPath)) {
+    const indexPath = path19.join(staticDir, "index.html");
+    if (fs18.existsSync(indexPath)) {
       app.get("*", (req, res, next) => {
         if (isApiRequest(req)) {
           next();
@@ -47199,10 +48413,10 @@ var DirectTransport = class {
 };
 
 // ../../packages/transport/src/devtunnel.ts
-var import_node_child_process9 = require("child_process");
+var import_node_child_process10 = require("child_process");
 function isInstalled(cmd) {
   try {
-    (0, import_node_child_process9.execSync)(process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`, { stdio: "pipe" });
+    (0, import_node_child_process10.execSync)(process.platform === "win32" ? `where ${cmd}` : `command -v ${cmd}`, { stdio: "pipe" });
     return true;
   } catch {
     return false;
@@ -47225,14 +48439,14 @@ var DevTunnelTransport = class {
       );
     }
     try {
-      (0, import_node_child_process9.execSync)("devtunnel user show", { stdio: "pipe" });
+      (0, import_node_child_process10.execSync)("devtunnel user show", { stdio: "pipe" });
     } catch {
       throw new Error(
         "Not logged in to devtunnel. Run: devtunnel user login"
       );
     }
     const hostArgs = this.buildHostArgs(localPort);
-    const child = (0, import_node_child_process9.spawn)("devtunnel", hostArgs, {
+    const child = (0, import_node_child_process10.spawn)("devtunnel", hostArgs, {
       stdio: ["pipe", "pipe", "pipe"]
     });
     this.process = child;
@@ -47337,7 +48551,7 @@ ${lines.join("")}`
       return;
     }
     try {
-      (0, import_node_child_process9.execFileSync)("devtunnel", ["access", "create", tunnelId, "--tenant"], { stdio: "pipe" });
+      (0, import_node_child_process10.execFileSync)("devtunnel", ["access", "create", tunnelId, "--tenant"], { stdio: "pipe" });
     } catch (err) {
       if (isExistingTenantAccessError(err)) {
         return;
@@ -47353,7 +48567,7 @@ ${lines.join("")}`
       return void 0;
     }
     try {
-      (0, import_node_child_process9.execFileSync)("devtunnel", ["show", tunnelId], { stdio: "pipe" });
+      (0, import_node_child_process10.execFileSync)("devtunnel", ["show", tunnelId], { stdio: "pipe" });
       return tunnelId;
     } catch {
       const createArgs = ["create", tunnelId];
@@ -47361,7 +48575,7 @@ ${lines.join("")}`
         createArgs.push("-a");
       }
       try {
-        (0, import_node_child_process9.execFileSync)("devtunnel", createArgs, { stdio: "pipe" });
+        (0, import_node_child_process10.execFileSync)("devtunnel", createArgs, { stdio: "pipe" });
         return tunnelId;
       } catch (err) {
         throw new Error(
@@ -47373,13 +48587,13 @@ ${lines.join("")}`
   ensureTunnelPort(tunnelId, localPort) {
     const ports = this.listTunnelPorts(tunnelId);
     for (const stalePort of ports.filter((p) => p !== localPort)) {
-      (0, import_node_child_process9.execFileSync)("devtunnel", ["port", "delete", tunnelId, "-p", String(stalePort)], { stdio: "pipe" });
+      (0, import_node_child_process10.execFileSync)("devtunnel", ["port", "delete", tunnelId, "-p", String(stalePort)], { stdio: "pipe" });
     }
     if (ports.includes(localPort)) {
       return;
     }
     try {
-      (0, import_node_child_process9.execFileSync)(
+      (0, import_node_child_process10.execFileSync)(
         "devtunnel",
         ["port", "create", tunnelId, "-p", String(localPort), "--protocol", "http"],
         { stdio: "pipe" }
@@ -47395,7 +48609,7 @@ ${lines.join("")}`
   }
   listTunnelPorts(tunnelId) {
     try {
-      const output = (0, import_node_child_process9.execFileSync)("devtunnel", ["port", "list", tunnelId, "-j"], { stdio: "pipe" });
+      const output = (0, import_node_child_process10.execFileSync)("devtunnel", ["port", "list", tunnelId, "-j"], { stdio: "pipe" });
       const parsed = JSON.parse(output.toString());
       const items = Array.isArray(parsed) ? parsed : parsed && typeof parsed === "object" && Array.isArray(parsed.ports) ? parsed.ports : parsed && typeof parsed === "object" && Array.isArray(parsed.value) ? parsed.value : [];
       return items.map((item) => getPortNumber(item)).filter((value) => value !== void 0);
@@ -47407,7 +48621,7 @@ ${lines.join("")}`
   }
   hasTunnelPort(tunnelId, localPort) {
     try {
-      (0, import_node_child_process9.execFileSync)(
+      (0, import_node_child_process10.execFileSync)(
         "devtunnel",
         ["port", "show", tunnelId, "-p", String(localPort), "-j"],
         { stdio: "pipe" }
@@ -47484,16 +48698,42 @@ function createTransport(config) {
   }
 }
 
+// src/bootstrap/terminal-writer.ts
+function formatDetail(detail) {
+  if (detail instanceof Error) {
+    return detail.stack ?? detail.message;
+  }
+  if (typeof detail === "string") {
+    return detail;
+  }
+  try {
+    return JSON.stringify(detail);
+  } catch {
+    return String(detail);
+  }
+}
+var terminalWriter = {
+  error(message, ...details) {
+    const suffix = details.length > 0 ? ` ${details.map(formatDetail).join(" ")}` : "";
+    process.stderr.write(`${message}${suffix}
+`);
+  },
+  line(message = "") {
+    process.stdout.write(`${message}
+`);
+  }
+};
+
 // src/startup.ts
-var fs18 = __toESM(require("fs"), 1);
-var path19 = __toESM(require("path"), 1);
+var fs19 = __toESM(require("fs"), 1);
+var path20 = __toESM(require("path"), 1);
 var readline = __toESM(require("readline/promises"), 1);
-var import_node_child_process10 = require("child_process");
+var import_node_child_process11 = require("child_process");
 function getDefaultNodeName() {
   return getDeviceNodeName();
 }
 var DEFAULT_NODE_NAME = getDefaultNodeName();
-var SUPPORTED_TRANSPORTS = ["direct", "devtunnel", "tailscale"];
+var SUPPORTED_TRANSPORTS = ["direct", "devtunnel"];
 var STARTUP_REQUIREMENTS = ["az", "devtunnel", "claude", "codex"];
 function createDefaultConfig(storagePath = resolveDefaultStoragePath(), nodeName = DEFAULT_NODE_NAME) {
   return {
@@ -47534,7 +48774,7 @@ function createPromptSession(prompt) {
 }
 function createDefaultCommandRunner(platform2) {
   return (command, args, interactive = false) => {
-    const result = (0, import_node_child_process10.spawnSync)(command, args, {
+    const result = (0, import_node_child_process11.spawnSync)(command, args, {
       encoding: "utf-8",
       shell: platform2 === "win32",
       stdio: interactive ? "inherit" : "pipe"
@@ -47549,21 +48789,21 @@ function createDefaultCommandRunner(platform2) {
   };
 }
 function getNodeMetadataPath2(storagePath) {
-  return path19.join(storagePath, "metadata.json");
+  return path20.join(storagePath, "metadata.json");
 }
 function readStartupMetadataFile(storagePath) {
   try {
-    const raw = JSON.parse(fs18.readFileSync(getNodeMetadataPath2(storagePath), "utf-8"));
+    const raw = JSON.parse(fs19.readFileSync(getNodeMetadataPath2(storagePath), "utf-8"));
     return typeof raw === "object" && raw !== null ? raw : {};
   } catch {
     return {};
   }
 }
 function writeStartupMetadataFile(storagePath, metadata) {
-  fs18.mkdirSync(storagePath, { recursive: true });
-  fs18.writeFileSync(getNodeMetadataPath2(storagePath), JSON.stringify(metadata, null, 2) + "\n", "utf-8");
+  fs19.mkdirSync(storagePath, { recursive: true });
+  fs19.writeFileSync(getNodeMetadataPath2(storagePath), JSON.stringify(metadata, null, 2) + "\n", "utf-8");
 }
-function formatLocalDate(now) {
+function formatLocalDate2(now) {
   const year = now.getFullYear();
   const month = String(now.getMonth() + 1).padStart(2, "0");
   const day = String(now.getDate()).padStart(2, "0");
@@ -47654,7 +48894,7 @@ function resolveStartupRequirementsMetadata(storagePath) {
 }
 function shouldSkipStartupRequirementsCheck(storagePath, now = /* @__PURE__ */ new Date()) {
   const metadata = resolveStartupRequirementsMetadata(storagePath);
-  if (metadata.lastCheckedOn !== formatLocalDate(now)) {
+  if (metadata.lastCheckedOn !== formatLocalDate2(now)) {
     return false;
   }
   return STARTUP_REQUIREMENTS.every((requirement) => isRequirementSatisfied(requirement, metadata.components?.[requirement]));
@@ -47738,7 +48978,7 @@ async function ensureStartupRequirements(storagePath, options = {}) {
     await current.close();
   };
   const checkedAt = now.toISOString();
-  const checkedOn = formatLocalDate(now);
+  const checkedOn = formatLocalDate2(now);
   const components = {};
   try {
     for (const requirement of STARTUP_REQUIREMENTS) {
@@ -47800,9 +49040,9 @@ async function ensureStartupRequirements(storagePath, options = {}) {
     metadata
   };
 }
-function loadConfigFile(path21) {
+function loadConfigFile(path22) {
   try {
-    const raw = fs18.readFileSync(path21, "utf-8");
+    const raw = fs19.readFileSync(path22, "utf-8");
     return JSON.parse(raw);
   } catch {
     return {};
@@ -47878,13 +49118,13 @@ async function promptStartOptions(args, fileConfig, defaults, prompt) {
           result.port = port;
           break;
         }
-        console.log("Invalid port. Enter a positive integer.");
+        terminalWriter.line("Invalid port. Enter a positive integer.");
       }
     }
     if (result.transport === void 0) {
       while (true) {
         const input = normalizePromptValue(
-          await ask(formatPrompt("Transport (direct/devtunnel/tailscale)", merged.transport.type))
+          await ask(formatPrompt("Transport (direct/devtunnel)", merged.transport.type))
         );
         if (!input) {
           result.transport = merged.transport.type;
@@ -47894,7 +49134,7 @@ async function promptStartOptions(args, fileConfig, defaults, prompt) {
           result.transport = input;
           break;
         }
-        console.log("Invalid transport. Use direct, devtunnel, or tailscale.");
+        terminalWriter.line("Invalid transport. Use direct or devtunnel.");
       }
     }
     if (result.join === void 0) {
@@ -47980,26 +49220,26 @@ function formatLoadedStartMetadata(info, authEnabled) {
 }
 
 // src/runtime-metadata.ts
-var fs19 = __toESM(require("fs"), 1);
-var path20 = __toESM(require("path"), 1);
-var import_node_child_process11 = require("child_process");
+var fs20 = __toESM(require("fs"), 1);
+var path21 = __toESM(require("path"), 1);
+var import_node_child_process12 = require("child_process");
 var runtimeDir = resolveRuntimeDir();
 var appRoot = resolveAppRoot(runtimeDir);
-var repoRoot = path20.resolve(appRoot, "../..");
+var repoRoot = path21.resolve(appRoot, "../..");
 function resolveRuntimeDir() {
   const entryPath = process.argv[1];
   if (typeof entryPath === "string" && entryPath.length > 0) {
     try {
-      return path20.dirname(fs19.realpathSync(path20.resolve(entryPath)));
+      return path21.dirname(fs20.realpathSync(path21.resolve(entryPath)));
     } catch {
-      return path20.dirname(path20.resolve(entryPath));
+      return path21.dirname(path21.resolve(entryPath));
     }
   }
   return process.cwd();
 }
 function readJsonFile(filePath) {
   try {
-    return JSON.parse(fs19.readFileSync(filePath, "utf-8"));
+    return JSON.parse(fs20.readFileSync(filePath, "utf-8"));
   } catch {
     return null;
   }
@@ -48009,9 +49249,9 @@ function readPackageManifest(filePath) {
 }
 function readEmbeddedRuntimeMetadata() {
   const candidates = [
-    path20.join(appRoot, "runtime-metadata.json"),
-    path20.join(runtimeDir, "runtime-metadata.json"),
-    path20.resolve(process.cwd(), "apps/node/dist/runtime-metadata.json")
+    path21.join(appRoot, "runtime-metadata.json"),
+    path21.join(runtimeDir, "runtime-metadata.json"),
+    path21.resolve(process.cwd(), "apps/node/dist/runtime-metadata.json")
   ];
   for (const candidate of candidates) {
     const metadata = readJsonFile(candidate);
@@ -48024,23 +49264,23 @@ function readEmbeddedRuntimeMetadata() {
 function resolveAppRoot(baseDir) {
   const candidates = [
     baseDir,
-    path20.resolve(baseDir, ".."),
-    path20.resolve(process.cwd(), "apps/node/dist"),
-    path20.resolve(process.cwd(), "apps/node"),
+    path21.resolve(baseDir, ".."),
+    path21.resolve(process.cwd(), "apps/node/dist"),
+    path21.resolve(process.cwd(), "apps/node"),
     process.cwd()
   ];
   for (const candidate of candidates) {
-    const manifest = readPackageManifest(path20.join(candidate, "package.json"));
+    const manifest = readPackageManifest(path21.join(candidate, "package.json"));
     if (manifest?.name === "@meshy/node" || manifest?.name === "meshy-node") {
       return candidate;
     }
   }
   for (const candidate of candidates) {
-    if (fs19.existsSync(path20.join(candidate, "package.json"))) {
+    if (fs20.existsSync(path21.join(candidate, "package.json"))) {
       return candidate;
     }
   }
-  return path20.resolve(baseDir, "..");
+  return path21.resolve(baseDir, "..");
 }
 function toPackageInfo(filePath) {
   const manifest = readPackageManifest(filePath);
@@ -48078,7 +49318,7 @@ function readRepositoryUrlFromManifest(manifest) {
 }
 function readGitValue(args) {
   try {
-    const output = (0, import_node_child_process11.execFileSync)("git", args, {
+    const output = (0, import_node_child_process12.execFileSync)("git", args, {
       cwd: repoRoot,
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"],
@@ -48100,8 +49340,8 @@ function buildRuntimeMetadata(storagePath) {
       components: startupRequirements.components
     };
   }
-  const appPackage = toPackageInfo(path20.join(appRoot, "package.json"));
-  const workspaceManifest = readPackageManifest(path20.join(repoRoot, "package.json"));
+  const appPackage = toPackageInfo(path21.join(appRoot, "package.json"));
+  const workspaceManifest = readPackageManifest(path21.join(repoRoot, "package.json"));
   return {
     packageName: appPackage?.name ?? "meshy",
     packageVersion: appPackage?.version ?? "0.1.0",
@@ -48109,11 +49349,11 @@ function buildRuntimeMetadata(storagePath) {
     startupRequirementsLastCheckedOn: startupRequirements.lastCheckedOn,
     components: startupRequirements.components,
     packages: {
-      workspace: toPackageInfo(path20.join(repoRoot, "package.json")),
+      workspace: toPackageInfo(path21.join(repoRoot, "package.json")),
       node: appPackage,
-      core: toPackageInfo(path20.join(repoRoot, "packages/core/package.json")),
-      dashboard: toPackageInfo(path20.join(repoRoot, "packages/dashboard/package.json")),
-      api: toPackageInfo(path20.join(repoRoot, "packages/api/package.json"))
+      core: toPackageInfo(path21.join(repoRoot, "packages/core/package.json")),
+      dashboard: toPackageInfo(path21.join(repoRoot, "packages/dashboard/package.json")),
+      api: toPackageInfo(path21.join(repoRoot, "packages/api/package.json"))
     },
     repository: {
       url: normalizeRepositoryUrl(readGitValue(["config", "--get", "remote.upstream.url"])) ?? normalizeRepositoryUrl(readGitValue(["config", "--get", "remote.origin.url"])) ?? readRepositoryUrlFromManifest(workspaceManifest),
@@ -48127,11 +49367,7 @@ function buildRuntimeMetadata(storagePath) {
 function createSettingsSnapshotProvider(options) {
   let cachedSnapshot = null;
   let cachedSnapshotAt = 0;
-  return function getSettingsSnapshot() {
-    const now = Date.now();
-    if (cachedSnapshot && now - cachedSnapshotAt < 3e4) {
-      return structuredClone(cachedSnapshot);
-    }
+  function buildSnapshot() {
     cachedSnapshot = buildNodeSettingsSnapshot({
       auth: options.authMetadata,
       localDashboardOrigin: options.localDashboardOrigin,
@@ -48139,8 +49375,23 @@ function createSettingsSnapshotProvider(options) {
       storagePath: options.storagePath,
       workDir: options.workDir
     });
-    cachedSnapshotAt = now;
+    cachedSnapshotAt = Date.now();
     return structuredClone(cachedSnapshot);
+  }
+  function getSettingsSnapshot() {
+    const now = Date.now();
+    if (cachedSnapshot && now - cachedSnapshotAt < 3e4) {
+      return structuredClone(cachedSnapshot);
+    }
+    return buildSnapshot();
+  }
+  return {
+    getSettingsSnapshot,
+    refreshSettingsSnapshot: () => {
+      cachedSnapshot = null;
+      cachedSnapshotAt = 0;
+      return buildSnapshot();
+    }
   };
 }
 async function resolveStartConfig(args) {
@@ -48427,13 +49678,13 @@ function registerShutdownHandlers(options) {
   let shuttingDown = false;
   async function shutdown() {
     if (shuttingDown) {
-      console.log("Force exit.");
+      terminalWriter.line("Force exit.");
       process.exit(130);
     }
     shuttingDown = true;
-    console.log("\nShutting down...");
+    terminalWriter.line("\nShutting down...");
     const forceExitTimer = setTimeout(() => {
-      console.log("Force exit.");
+      terminalWriter.line("Force exit.");
       process.exit(0);
     }, 1e4);
     forceExitTimer.unref?.();
@@ -48443,10 +49694,10 @@ function registerShutdownHandlers(options) {
       await options.tunnelManager.stop();
       await options.meshyNode.stop();
       clearTimeout(forceExitTimer);
-      console.log("Goodbye!");
+      terminalWriter.line("Goodbye!");
       process.exit(0);
     } catch (err) {
-      console.error("Error during shutdown:", err);
+      terminalWriter.error("Error during shutdown:", err);
       process.exit(1);
     }
   }
@@ -48455,9 +49706,9 @@ function registerShutdownHandlers(options) {
 }
 async function startNode(args) {
   const { authMetadata, config, hydratedArgs, runtimeMetadata, storageRoot } = await resolveStartConfig(args);
-  console.log("Checking startup requirements (az, devtunnel, claude, codex)...");
+  terminalWriter.line("Checking startup requirements (az, devtunnel, claude, codex)...");
   const startupRequirements = await ensureStartupRequirements(config.storage.path);
-  console.log(
+  terminalWriter.line(
     startupRequirements.skipped ? "Startup requirements already verified today; skipping checks." : "Startup requirements check complete."
   );
   const localDashboardOrigin = `http://localhost:${config.node.port}`;
@@ -48471,9 +49722,9 @@ async function startNode(args) {
     settingsProvider: () => authMetadata
   });
   if (hydratedArgs.loaded) {
-    console.log("");
-    console.log(formatLoadedStartMetadata(hydratedArgs.loaded, authMetadata.enabled));
-    console.log("");
+    terminalWriter.line("");
+    terminalWriter.line(formatLoadedStartMetadata(hydratedArgs.loaded, authMetadata.enabled));
+    terminalWriter.line("");
   }
   if (authMetadata.enabled) {
     await nodeAuth.warmup();
@@ -48481,13 +49732,14 @@ async function startNode(args) {
   } else {
     setRequestAuthHeadersProvider(null);
   }
-  const getSettingsSnapshot = createSettingsSnapshotProvider({
+  const settingsSnapshotProvider = createSettingsSnapshotProvider({
     authMetadata,
     localDashboardOrigin,
     runtimeMetadata,
     storagePath: config.storage.path,
     workDir: nodePath2.resolve(config.node.workDir ?? process.cwd())
   });
+  const { getSettingsSnapshot, refreshSettingsSnapshot } = settingsSnapshotProvider;
   const meshyNode = new MeshyNode(config, {
     logger: logger27,
     transportFactory: createTransport,
@@ -48570,6 +49822,8 @@ async function startNode(args) {
     },
     isDevTunnelEnabled: () => meshyNode.isDevTunnelEnabled(),
     localDashboardOrigin,
+    upgradeRuntimeAgent,
+    refreshSettingsSnapshot,
     dashboardOrigin: tunnelManager.getDashboardOrigin(),
     shareOrigin: tunnelManager.getShareOrigin(),
     ensureShareTunnel: () => tunnelManager.ensureShareTunnel(),
@@ -48597,9 +49851,9 @@ async function startNode(args) {
       port: config.node.port,
       dashboardOrigin: tunnelManager.getDashboardOrigin()
     });
-    console.log("");
-    console.log(banner);
-    console.log("");
+    terminalWriter.line("");
+    terminalWriter.line(banner);
+    terminalWriter.line("");
   });
   registerShutdownHandlers({
     server,