npm - meshy-node - Versions diffs - 0.6.7 → 0.6.9 - Mend

meshy-node 0.6.7 → 0.6.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (22) hide show

package/dashboard/assets/{play-Dc8Adtxz.js → play-D9KadCMh.js} RENAMED Viewed

@@ -1,4 +1,4 @@
-import{c as a}from"./index-Dcj0nR-j.js";/**
+import{c as a}from"./index-KyuFQeSE.js";/**
  * @license lucide-react v1.7.0 - ISC
  *
  * This source code is licensed under the ISC license.

package/dashboard/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Meshy Dashboard</title>
     <link rel="icon" type="image/svg+xml" href="data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 100 100'><text y='.9em' font-size='90'>&#x1F578;</text></svg>" />
-    <script type="module" crossorigin src="/assets/index-Dcj0nR-j.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CXPXpidI.css">
+    <script type="module" crossorigin src="/assets/index-KyuFQeSE.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-ByKsIqsl.css">
   </head>
   <body>
     <div id="root"></div>

package/main.cjs CHANGED Viewed

@@ -56411,7 +56411,7 @@ function loadClaudeSessionHistory(sessionId) {
 }
 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"));
+  const sessionFile = findFirstMatchingFile(sessionsDir, (filePath) => path7.basename(filePath).toLowerCase().includes(sessionId.toLowerCase()) && filePath.toLowerCase().endsWith(".jsonl")) ?? findFirstMatchingFile(sessionsDir, (filePath) => filePath.toLowerCase().endsWith(".jsonl") && readJsonLines(filePath).some((entry) => entry.type === "session_meta" && isRecord4(entry.payload) && typeof entry.payload.id === "string" && entry.payload.id.toLowerCase() === sessionId.toLowerCase()));
   if (!sessionFile) {
     return { logs: [], sourcePath: null };
   }
@@ -56530,6 +56530,25 @@ function listNativeSessions(input) {
   }).filter((session) => session !== null).sort(compareUpdatedSessions).slice(0, limit);
 }
+// ../../packages/core/src/agents/native-session-payload.ts
+function nonEmptyString(value) {
+  return typeof value === "string" && value.trim().length > 0 ? value.trim() : "";
+}
+function getNativeHistorySessionId(payload) {
+  return nonEmptyString(payload?.nativeSessionId) || nonEmptyString(payload?.sessionId);
+}
+function buildPersistedSessionPayload(task, sessionId, cwd) {
+  const payload = task?.payload ?? {};
+  const nextPayload = { ...payload, sessionId, sessionCwd: cwd };
+  if (task?.conversationKind !== "nativeSession") {
+    return nextPayload;
+  }
+  return {
+    ...nextPayload,
+    nativeSessionId: getNativeHistorySessionId(payload) || sessionId
+  };
+}
 // ../../packages/core/src/tasks/task-forwarding.ts
 function getEventType(event) {
   return typeof event.type === "string" ? event.type : void 0;
@@ -57435,9 +57454,8 @@ var ClaudeCodeEngine = class extends ExecutionEngine {
   persistSession(taskId, sessionId, cwd) {
     try {
       const current = this.taskEngine.getTask(taskId);
-      const payload = current?.payload ?? {};
       this.taskEngine.updateTask(taskId, {
-        payload: { ...payload, sessionId, sessionCwd: cwd }
+        payload: buildPersistedSessionPayload(current, sessionId, cwd)
       });
     } catch {
     }
@@ -57826,9 +57844,8 @@ var CodexEngine = class extends ExecutionEngine {
   persistSession(taskId, sessionId, cwd) {
     try {
       const current = this.taskEngine.getTask(taskId);
-      const payload = current?.payload ?? {};
       this.taskEngine.updateTask(taskId, {
-        payload: { ...payload, sessionId, sessionCwd: cwd }
+        payload: buildPersistedSessionPayload(current, sessionId, cwd)
       });
     } catch {
     }
@@ -58146,9 +58163,8 @@ var CopilotCliEngine = class extends ExecutionEngine {
   persistSession(taskId, sessionId, cwd) {
     try {
       const current = this.taskEngine.getTask(taskId);
-      const payload = current?.payload ?? {};
       this.taskEngine.updateTask(taskId, {
-        payload: { ...payload, sessionId, sessionCwd: cwd }
+        payload: buildPersistedSessionPayload(current, sessionId, cwd)
       });
     } catch {
     }
@@ -61949,7 +61965,7 @@ function mergeNativeSessionLogs(nativeLogs, localLogs) {
 }
 function readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, agent) {
   const local = readLocalTaskLogs(engineRegistry, taskId, after, agent);
-  const sessionId = typeof task?.payload?.sessionId === "string" ? task.payload.sessionId : "";
+  const sessionId = getNativeHistorySessionId(task?.payload);
   if (after > 0 || task?.conversationKind !== "nativeSession" || !sessionId || task.agent !== "codex" && task.agent !== "claudecode" && task.agent !== "copilot") {
     return local;
   }
@@ -64557,6 +64573,7 @@ async function attachNativeSession(deps, body) {
     project: body.cwd,
     conversationKind: "nativeSession",
     payload: {
+      nativeSessionId: body.sessionId,
       sessionId: body.sessionId,
       sessionCwd: body.cwd,
       ...body.mode ? { mode: body.mode } : {}
@@ -64690,6 +64707,9 @@ function createTaskLogsProxyTrace(log2, taskId, nodeId, proxyPath) {
 // ../../packages/api/src/tasks/task-log-response.ts
 var TASK_LOG_PROXY_TIMEOUT_MS = 1e4;
+function canRepairNativeSessionLogsOnWorker(task, after) {
+  return after === 0 && task?.conversationKind === "nativeSession" && (task.agent === "codex" || task.agent === "claudecode" || task.agent === "copilot");
+}
 async function sendTaskLogsResponse(req, res, taskId) {
   const { engineRegistry, taskEngine, nodeRegistry, heartbeat, logger: rootLogger } = req.app.locals.deps;
   const log2 = rootLogger.child("tasks/logs");
@@ -64713,6 +64733,8 @@ async function sendTaskLogsResponse(req, res, taskId) {
   const proxyNodeId = task?.assignedTo ?? snapshotOwnerId;
   const isFollowerRemoteTask = !isLeader && !!(task?.assignedTo && task.assignedTo !== selfId);
   const needsProxy = isLeader && !!(proxyNodeId && proxyNodeId !== selfId);
+  const shouldAskWorkerForNativeRepair = needsProxy && canRepairNativeSessionLogsOnWorker(task, after);
+  let leaderLocal = null;
   if (proxyRequest.isProxy) {
     log2.info("received proxied task logs request", {
       taskId,
@@ -64737,7 +64759,8 @@ async function sendTaskLogsResponse(req, res, taskId) {
   });
   if (isLeader) {
     const local2 = readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, task?.agent ?? "claudecode");
-    if (local2.total > 0 || !needsProxy) {
+    leaderLocal = local2;
+    if ((local2.total > 0 || !needsProxy) && !shouldAskWorkerForNativeRepair) {
       log2.debug("serving leader-local task logs", {
         taskId,
         assignedTo: task?.assignedTo,
@@ -64748,17 +64771,27 @@ async function sendTaskLogsResponse(req, res, taskId) {
       res.json(local2);
       return;
     }
-    log2.debug("leader-local task log missing, falling back to worker proxy", {
-      taskId,
-      assignedTo: task?.assignedTo,
-      selfId
-    });
+    if (local2.total > 0 && shouldAskWorkerForNativeRepair) {
+      log2.debug("leader-local native session logs may be partial, checking worker repair path", {
+        taskId,
+        assignedTo: task?.assignedTo,
+        selfId,
+        total: local2.total,
+        after
+      });
+    } else {
+      log2.debug("leader-local task log missing, falling back to worker proxy", {
+        taskId,
+        assignedTo: task?.assignedTo,
+        selfId
+      });
+    }
   }
   if (needsProxy && proxyNodeId) {
     const node = nodeRegistry.getNode(proxyNodeId);
     log2.debug("proxy target", { nodeId: node?.id, endpoint: node?.endpoint, devtunnel: node?.devtunnelEndpoint, status: node?.status });
     if (node) {
-      if (task.assignedTo === proxyNodeId && !snapshotOwnerId) {
+      if (task.assignedTo === proxyNodeId && !snapshotOwnerId && !(shouldAskWorkerForNativeRepair && (leaderLocal?.total ?? 0) > 0)) {
         const seededLogs = await seedTaskSnapshotOnWorker(task, [], node, log2).catch((err) => {
           log2.warn("failed to seed task snapshot before task logs proxy", {
             taskId,
@@ -64767,7 +64800,19 @@ async function sendTaskLogsResponse(req, res, taskId) {
           });
           return [];
         });
-        if (seededLogs.length > 0) recordLocalTaskLogs(engineRegistry, task, seededLogs);
+        if (seededLogs.length > 0) {
+          recordLocalTaskLogs(engineRegistry, task, seededLogs);
+          const seededResponse = { logs: seededLogs.slice(after), total: seededLogs.length };
+          log2.debug("serving worker-seeded task logs without second proxy", {
+            taskId,
+            assignedTo: task?.assignedTo,
+            selfId,
+            total: seededResponse.total,
+            after
+          });
+          res.json(seededResponse);
+          return;
+        }
       }
       const proxyPath = `/api/tasks/${taskId}/logs?after=${after}`;
       try {
@@ -64807,7 +64852,7 @@ async function sendTaskLogsResponse(req, res, taskId) {
       }
     }
   }
-  const local = readLocalTaskLogsWithNativeHistory(engineRegistry, task, taskId, after, task?.agent ?? "claudecode");
+  const local = leaderLocal ?? 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,
@@ -66030,7 +66075,7 @@ function createWorkerRoutes() {
     const { task } = body;
     let { logs } = body;
     if (logs.length === 0 && task.conversationKind === "nativeSession") {
-      const sessionId = typeof task.payload?.sessionId === "string" ? task.payload.sessionId : "";
+      const sessionId = getNativeHistorySessionId(task.payload);
       if (sessionId && (task.agent === "codex" || task.agent === "claudecode" || task.agent === "copilot")) {
         logs = loadNativeSessionHistory({ agent: task.agent, sessionId }).logs;
       }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "meshy-node",
-  "version": "0.6.7",
+  "version": "0.6.9",
   "private": false,
   "description": "Standalone Meshy node package with bundled runtime and dashboard assets.",
   "type": "commonjs",

package/runtime-metadata.json CHANGED Viewed

@@ -1,14 +1,14 @@
 {
   "packageName": "meshy-node",
-  "packageVersion": "0.6.7",
+  "packageVersion": "0.6.9",
   "packages": {
     "workspace": {
       "name": "meshy",
-      "version": "0.6.7"
+      "version": "0.6.9"
     },
     "node": {
       "name": "meshy-node",
-      "version": "0.6.7"
+      "version": "0.6.9"
     },
     "core": {
       "name": "@meshy/core",
@@ -25,7 +25,7 @@
   },
   "repository": {
     "url": "https://github.com/ai-microsoft/meshy",
-    "branch": "release0525",
-    "commit": "f3ca6c2"
+    "branch": "OptHeader",
+    "commit": "4a5aadb"
   }
 }