npm - meshy-node - Versions diffs - 1.0.2 → 1.0.3 - Mend

meshy-node 1.0.2 → 1.0.3

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 (15) hide show

package/dashboard/index.html CHANGED Viewed

@@ -5,7 +5,7 @@
     <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-Cw9E6sQy.js"></script>
+    <script type="module" crossorigin src="/assets/index-DQFY3oGe.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DPc1_Q2V.css">
   </head>
   <body>

package/main.cjs CHANGED Viewed

@@ -148597,6 +148597,7 @@ var DEFAULT_PORT_CHECK_TIMEOUT_MS = 750;
 var DEFAULT_POLL_INTERVAL_MS = 1e3;
 var DEFAULT_STARTUP_TIMEOUT_MS = 15 * 60 * 1e3;
 var DEFAULT_STOP_TIMEOUT_MS = 3e3;
+var DEVICE_AUTH_EXPIRED_DETAIL = "GitHub device authorization expired; enable the tunnel again to request a new code";
 var GHC_TUNNEL_ARGS = ["-y", "ghc-tunnel@latest", "-d"];
 var GHC_TUNNEL_SETUP_ARGS = ["-y", "ghc-tunnel@latest", "--setup", "-d"];
 var GHC_TUNNEL_READY_PATTERN = /GitHub Copilot API Proxy/i;
@@ -148656,19 +148657,20 @@ function appendTail(tail, chunk, limitBytes) {
 function sleep2(ms) {
   return new Promise((resolve24) => setTimeout(resolve24, ms));
 }
-function createDetachedOutputLog() {
+function createTunnelOutputLog() {
   const dir = import_node_fs.default.mkdtempSync(import_node_path.default.join(import_node_os4.default.tmpdir(), "meshy-ghc-tunnel-"));
   const logPath = import_node_path.default.join(dir, "output.log");
   const fd = import_node_fs.default.openSync(logPath, "a");
   return { dir, logPath, fd };
 }
 function defaultSpawnTunnel(command, args, options) {
-  const output = createDetachedOutputLog();
+  const output = createTunnelOutputLog();
   let child;
   try {
+    const detached = process.platform !== "win32";
     child = (0, import_node_child_process10.spawn)(command, args, {
       ...options,
-      detached: true,
+      detached,
       stdio: ["ignore", output.fd, output.fd]
     });
   } finally {
@@ -148803,6 +148805,36 @@ function parseGithubDeviceFlow(output) {
     ...expires ? { expiresInSeconds: Number(expires) } : {}
   };
 }
+function updateAuthPrompt(current, output, now = Date.now()) {
+  const parsed = parseGithubDeviceFlow(output);
+  if (!parsed) return current;
+  if (current?.code === parsed.code && current.expiresAt) return current;
+  return addAuthPromptTiming(parsed, now);
+}
+function addAuthPromptTiming(auth, now = Date.now()) {
+  return {
+    ...auth,
+    issuedAt: now,
+    ...auth.expiresInSeconds !== void 0 ? { expiresAt: now + auth.expiresInSeconds * 1e3 } : {}
+  };
+}
+function normalizeCopilotTunnelResult(value, now = Date.now()) {
+  if (!value || typeof value !== "object") return value;
+  const result = value;
+  if (result.auth || result.status !== "starting" && result.status !== "auth-required") return value;
+  const output = `${typeof result.stdout === "string" ? result.stdout : ""}
+${typeof result.stderr === "string" ? result.stderr : ""}`;
+  const auth = parseGithubDeviceFlow(output);
+  if (!auth) return value;
+  return {
+    ...result,
+    status: "auth-required",
+    auth: addAuthPromptTiming(auth, now)
+  };
+}
+function isAuthPromptExpired(auth, now = Date.now()) {
+  return typeof auth?.expiresAt === "number" && now >= auth.expiresAt;
+}
 function hasGithubCopilotTunnelReadyOutput(output) {
   return GHC_TUNNEL_READY_PATTERN.test(output) && GHC_TUNNEL_API_PATTERN.test(output);
 }
@@ -148987,8 +149019,8 @@ async function enableGithubCopilotTunnel(options = {}) {
   };
   const handleOutput = (target, chunk) => {
     appendTail(target, chunk, outputLimitBytes);
-    auth = parseGithubDeviceFlow(`${stdout.text}
-${stderr.text}`) ?? auth;
+    auth = updateAuthPrompt(auth, `${stdout.text}
+${stderr.text}`);
     publish2(auth ? "auth-required" : "starting");
   };
   const stdoutListener = (chunk) => handleOutput(stdout, Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk)));
@@ -149026,6 +149058,10 @@ ${stderr.text}`) ?? auth;
     if (childState.spawnError) {
       return buildResult({ host, port, command, args, pid, status: "failed", stdout, stderr, auth, detail: childState.spawnError.message });
     }
+    if (isAuthPromptExpired(auth)) {
+      await terminateChildProcess(child, stopTimeoutMs);
+      return buildResult({ host, port, command, args, pid, status: "failed", stdout, stderr, auth, detail: DEVICE_AUTH_EXPIRED_DETAIL });
+    }
     if (childState.exit) {
       const detail = childState.exit.code === 0 ? `ghc-tunnel exited before port ${port} became reachable` : `ghc-tunnel exited with code ${childState.exit.code ?? "null"}${childState.exit.signal ? ` (${childState.exit.signal})` : ""}`;
       return buildResult({ host, port, command, args, pid, status: "failed", stdout, stderr, auth, detail });
@@ -149073,8 +149109,8 @@ async function runGithubCopilotTunnelSetup(options = {}) {
   };
   const handleOutput = (target, chunk) => {
     appendTail(target, chunk, outputLimitBytes);
-    auth = parseGithubDeviceFlow(`${stdout.text}
-${stderr.text}`) ?? auth;
+    auth = updateAuthPrompt(auth, `${stdout.text}
+${stderr.text}`);
     publish2(auth ? "auth-required" : "starting");
     if (options.resolveOnReadyOutput && hasGithubCopilotTunnelReadyOutput(`${stdout.text}
 ${stderr.text}`)) {
@@ -149108,8 +149144,9 @@ ${stderr.text}`)) {
 // ../../packages/api/src/node/node-operation-service.ts
 var LEADER_REPORT_RETRY_MS = 5e3;
-var REMOTE_OPERATION_REFRESH_TIMEOUT_MS = 2e3;
+var REMOTE_OPERATION_REFRESH_TIMEOUT_MS = 7e3;
 var OPERATION_COMMIT_EFFECT = /* @__PURE__ */ Symbol("operationCommitEffect");
+var REMOTE_OPERATION_MISSING_STATUS = 404;
 function sleep3(ms) {
   return new Promise((resolve24) => setTimeout(resolve24, ms));
 }
@@ -149209,16 +149246,19 @@ var NodeOperationService = class {
     this.scheduleRun(id);
   }
   applyRemoteUpdate(operation) {
+    const normalized = normalizeNodeOperation(operation);
     const current = this.store.get(operation.id);
-    if (current && isTerminalStatus(current.status) && !isTerminalStatus(operation.status)) {
+    if (current && isTerminalStatus(current.status) && !isTerminalStatus(normalized.status)) {
       return current;
     }
-    const saved = this.store.upsert(current ? { ...current, ...operation } : operation);
+    const saved = this.store.upsert(current ? { ...current, ...normalized } : normalized);
     this.applyOperationSideEffects(saved);
     this.deps.eventBus.emit("node.operation.updated", { operation: saved });
     return saved;
   }
   markFailed(id, error2) {
+    const current = this.store.get(id);
+    if (!current || isTerminalStatus(current.status)) return current;
     return this.update(id, {
       status: "failed",
       error: error2,
@@ -149331,10 +149371,11 @@ var NodeOperationService = class {
     }
   }
   scheduleLeaderReportRetry(operation) {
-    if (!isTerminalStatus(operation.status) || this.leaderReportRetryTimers.has(operation.id)) return;
+    if (this.leaderReportRetryTimers.has(operation.id)) return;
     const timer = setTimeout(() => {
       this.leaderReportRetryTimers.delete(operation.id);
-      void this.reportToLeader(operation);
+      const latest = this.store.get(operation.id) ?? operation;
+      void this.reportToLeader(latest);
     }, LEADER_REPORT_RETRY_MS);
     this.leaderReportRetryTimers.set(operation.id, timer);
   }
@@ -149358,7 +149399,8 @@ async function refreshRemoteNodeOperation(deps, operation) {
   const self2 = deps.nodeRegistry.getSelf();
   if (operation.nodeId === self2.id) return operation;
   const node2 = deps.nodeRegistry.getNode(operation.nodeId);
-  if (!node2) return operation;
+  if (!node2) return failUnavailableCopilotTunnelOperation(deps, operation, `Remote node ${operation.nodeId} is no longer in the cluster`);
+  if (node2.status === "offline") return failUnavailableCopilotTunnelOperation(deps, operation, `Remote node ${node2.name} is offline while ${operation.kind} is running`);
   const message = createNodeMessage("node.operation.get", { operationId: operation.id });
   const heartbeat = deps.heartbeat;
   try {
@@ -149367,6 +149409,15 @@ async function refreshRemoteNodeOperation(deps, operation) {
       timeoutMs: REMOTE_OPERATION_REFRESH_TIMEOUT_MS,
       logger: deps.logger
     }).request(node2, message);
+    if (!response.ok) {
+      if (response.statusCode === REMOTE_OPERATION_MISSING_STATUS) {
+        return getNodeOperationService(deps).markFailed(
+          operation.id,
+          `Remote node no longer has operation ${operation.id}; it may have restarted`
+        ) ?? operation;
+      }
+      return operation;
+    }
     const remote = readOperationFromResponse(response);
     return remote ? getNodeOperationService(deps).applyRemoteUpdate(remote) : operation;
   } catch (err) {
@@ -149379,6 +149430,10 @@ async function refreshRemoteNodeOperation(deps, operation) {
     return operation;
   }
 }
+function failUnavailableCopilotTunnelOperation(deps, operation, error2) {
+  if (!operation.kind.startsWith("copilot.tunnel")) return operation;
+  return getNodeOperationService(deps).markFailed(operation.id, error2) ?? operation;
+}
 async function dispatchNodeOperation(deps, operation, node2, options = {}) {
   const message = createNodeMessage("node.operation.execute", {
     operation,
@@ -149417,6 +149472,13 @@ function readOperationFromResponse(response) {
   const operation = response.body && typeof response.body === "object" ? response.body.operation : void 0;
   return operation && typeof operation === "object" ? operation : null;
 }
+function normalizeNodeOperation(operation) {
+  if (!operation.kind.startsWith("copilot.tunnel") || !operation.result) return operation;
+  return {
+    ...operation,
+    result: normalizeCopilotTunnelResult(operation.result)
+  };
+}
 function runAgentUpgradeOperation(operation, deps) {
   const agent = readPayloadString(operation, "agent");
   if (!isRuntimeAgentId(agent)) throw new Error(`Unsupported upgrade agent: ${agent}`);
@@ -177699,6 +177761,15 @@ async function cancelRemoteTaskExecution(deps) {
 // ../../packages/api/src/tasks/task-session-import.ts
 init_cjs_shims();
 var TASK_IMPORT_PROXY_TIMEOUT_MS = 1e4;
+var IMPORT_STATUS_SCORE = {
+  running: 50,
+  assigned: 40,
+  pending: 30,
+  completed: 20,
+  failed: 10,
+  cancelled: 10,
+  archived: 0
+};
 function buildImportedSessionTitle(agent, sessionId) {
   const label = agent === "codex" ? "Codex" : agent === "copilot" ? "Copilot CLI" : "Claude Code";
   const suffix = sessionId.trim().slice(0, 12);
@@ -177723,6 +177794,38 @@ function resolveTargetImportNode(nodeRegistry, nodeId, agent) {
   }
   return node2;
 }
+function sameNativeAgent(taskAgent, nativeAgent) {
+  if (nativeAgent === "claudecode") return taskAgent === "claudecode" || taskAgent === "claude";
+  return taskAgent === nativeAgent;
+}
+function taskNativeSessionIds(task) {
+  const ids = [];
+  const add = (value) => {
+    if (typeof value === "string" && value.trim() && !ids.includes(value.trim())) ids.push(value.trim());
+  };
+  add(task.payload?.nativeSessionId);
+  add(task.payload?.sessionId);
+  const agentSessions = task.payload?.agentSessions;
+  if (agentSessions && typeof agentSessions === "object") {
+    for (const session of Object.values(agentSessions)) {
+      add(session?.sessionId);
+    }
+  }
+  return ids;
+}
+function taskMatchesImportTarget(task, targetNode) {
+  if (task.assignedTo === targetNode.id || task.assignedNodeName === targetNode.name) return true;
+  return !task.assignedTo && !task.assignedNodeName;
+}
+function compareImportCandidates(left, right, targetNode) {
+  const score = (task) => IMPORT_STATUS_SCORE[task.status] + (task.conversationKind === "nativeSession" ? 5 : 0) + (task.assignedTo === targetNode.id ? 3 : 0);
+  return score(right) - score(left) || right.updatedAt - left.updatedAt || right.createdAt - left.createdAt;
+}
+function findExistingImportedSessionTask(taskEngine, body3, targetNode) {
+  const sessionId = body3.sessionId.trim();
+  const candidates = taskEngine.listTasks().tasks.filter((task) => task.status !== "archived" && sameNativeAgent(task.agent, body3.agent) && taskMatchesImportTarget(task, targetNode) && taskNativeSessionIds(task).includes(sessionId));
+  return candidates.sort((left, right) => compareImportCandidates(left, right, targetNode))[0] ?? null;
+}
 async function attachNativeSession(deps, body3) {
   const log2 = deps.logger.child("tasks/import-session");
   const selfId = deps.nodeRegistry.getSelf()?.id;
@@ -177731,6 +177834,15 @@ async function attachNativeSession(deps, body3) {
     throw new MeshyError("VALIDATION_ERROR", "No target node is available for session import", 400);
   }
   const targetNode = resolveTargetImportNode(deps.nodeRegistry, targetNodeId, body3.agent);
+  const existingTask = findExistingImportedSessionTask(deps.taskEngine, body3, targetNode);
+  if (existingTask) {
+    log2.info("native session already attached to task", {
+      taskId: existingTask.id,
+      assignedTo: existingTask.assignedTo,
+      sessionId: body3.sessionId
+    });
+    return { task: existingTask, created: false };
+  }
   const history = loadNativeSessionHistory({
     agent: body3.agent,
     sessionId: body3.sessionId
@@ -177795,7 +177907,7 @@ async function attachNativeSession(deps, body3) {
       sourcePath: history.sourcePath
     });
   }
-  return importedTask;
+  return { task: importedTask, created: true };
 }
 // ../../packages/api/src/tasks/task-log-response.ts
@@ -178938,13 +179050,13 @@ function createTaskRoutes() {
   router.post("/import-session", asyncHandler8(async (req, res) => {
     const { taskEngine, nodeRegistry, engineRegistry, logger: rootLogger, shareOrigin } = req.app.locals.deps;
     const body3 = AttachNativeSessionBody.parse(req.body);
-    const importedTask = await attachNativeSession({
+    const imported = await attachNativeSession({
       taskEngine,
       nodeRegistry,
       engineRegistry,
       logger: rootLogger
     }, body3);
-    res.status(201).json(toTaskResponse(importedTask, nodeRegistry, taskEngine, shareOrigin));
+    res.status(imported.created ? 201 : 200).json(toTaskResponse(imported.task, nodeRegistry, taskEngine, shareOrigin));
   }));
   router.get("/", asyncHandler8(async (req, res) => {
     const { taskEngine, nodeRegistry, shareOrigin } = req.app.locals.deps;
@@ -179914,6 +180026,7 @@ data: ${JSON.stringify(data)}
 // ../../packages/api/src/routes/node-operations.ts
 init_cjs_shims();
 var import_express15 = __toESM(require_express2(), 1);
+var TERMINABLE_COPILOT_TUNNEL_KINDS = /* @__PURE__ */ new Set(["copilot.tunnel", "copilot.tunnel.disable"]);
 function asyncHandler12(fn) {
   return (req, res, next2) => fn(req, res, next2).catch(next2);
 }
@@ -179921,6 +180034,13 @@ function parseStatus(value) {
   if (value === "queued" || value === "running" || value === "succeeded" || value === "failed") return value;
   return void 0;
 }
+function readTerminateReason(body3) {
+  if (body3 && typeof body3 === "object") {
+    const reason = body3.reason;
+    if (typeof reason === "string" && reason.trim()) return reason.trim();
+  }
+  return "Terminated by Copilot tunnel retry";
+}
 function createNodeOperationRoutes() {
   const router = (0, import_express15.Router)();
   router.get("/", asyncHandler12(async (req, res) => {
@@ -179943,6 +180063,20 @@ function createNodeOperationRoutes() {
     }
     res.json(operation);
   }));
+  router.post("/:id/terminate", asyncHandler12(async (req, res) => {
+    if (await maybeProxyReadToLeader(req, res, { methods: ["POST"] })) return;
+    const deps = req.app.locals.deps;
+    const operations = getNodeOperationService(deps);
+    const current = operations.get(req.params.id);
+    if (!current) {
+      throw new MeshyError("NODE_NOT_FOUND", `Node operation ${req.params.id} not found`, 404);
+    }
+    if (!TERMINABLE_COPILOT_TUNNEL_KINDS.has(current.kind)) {
+      throw new MeshyError("VALIDATION_ERROR", `Node operation ${current.kind} cannot be terminated from this route`, 400);
+    }
+    const operation = operations.markFailed(current.id, readTerminateReason(req.body)) ?? current;
+    res.json(operation);
+  }));
   return router;
 }

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "meshy-node",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "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": "1.0.2",
+  "packageVersion": "1.0.3",
   "packages": {
     "workspace": {
       "name": "meshy",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "node": {
       "name": "meshy-node",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "core": {
       "name": "@meshy/core",
@@ -26,6 +26,6 @@
   "repository": {
     "url": "https://github.com/gim-home/meshy",
     "branch": "main",
-    "commit": "8b895af"
+    "commit": "1e2b6f3"
   }
 }