metheus-governance-mcp-cli 0.2.227 → 0.2.228

package/cli.mjs

@@ -1885,51 +1885,70 @@ function prefersRunnerStateRecord(candidate, current) {
 function mergeRunnerStateRecords(preferred, fallback) {
   const primary = safeObject(preferred);
   const secondary = safeObject(fallback);
-  const pickString = (...values) => firstNonEmptyString(values);
-  const pickNumber = (...values) => {
-    for (const value of values) {
-      if (value === 0 || value === "0") return 0;
-      const parsed = intFromRawAllowZero(value, Number.NaN);
+  const hasOwn = (record, key) => Object.prototype.hasOwnProperty.call(record, key);
+  const pickStringField = (key, { allowBlank = false } = {}) => {
+    if (hasOwn(primary, key)) {
+      const value = String(primary[key] ?? "").trim();
+      if (value || allowBlank) {
+        return value;
+      }
+    }
+    return String(secondary[key] ?? "").trim();
+  };
+  const pickNumberField = (key, { allowUndefined = false } = {}) => {
+    if (hasOwn(primary, key)) {
+      const raw = primary[key];
+      if ((raw === undefined || raw === null || String(raw).trim() === "") && allowUndefined) {
+        return undefined;
+      }
+      if (raw === 0 || raw === "0") return 0;
+      const parsed = intFromRawAllowZero(raw, Number.NaN);
       if (Number.isFinite(parsed) && !Number.isNaN(parsed) && parsed > 0) {
         return parsed;
       }
     }
-    return 0;
+    const fallbackRaw = secondary[key];
+    if (fallbackRaw === 0 || fallbackRaw === "0") return 0;
+    const fallbackParsed = intFromRawAllowZero(fallbackRaw, Number.NaN);
+    if (Number.isFinite(fallbackParsed) && !Number.isNaN(fallbackParsed) && fallbackParsed > 0) {
+      return fallbackParsed;
+    }
+    return allowUndefined ? undefined : 0;
   };
   return {
-    last_processed_comment_id: pickString(primary.last_processed_comment_id, secondary.last_processed_comment_id),
-    last_processed_created_at: pickString(primary.last_processed_created_at, secondary.last_processed_created_at),
-    last_source_message_id: pickNumber(primary.last_source_message_id, secondary.last_source_message_id) || undefined,
-    last_source_kind: pickString(primary.last_source_kind, secondary.last_source_kind),
-    last_error: pickString(primary.last_error, secondary.last_error),
-    updated_at: pickString(primary.updated_at, secondary.updated_at, new Date().toISOString()),
-    last_action: pickString(primary.last_action, secondary.last_action),
-    last_reason: pickString(primary.last_reason, secondary.last_reason),
-    last_trigger: pickString(primary.last_trigger, secondary.last_trigger),
-    last_reply_message_id: pickNumber(primary.last_reply_message_id, secondary.last_reply_message_id) || undefined,
-    last_conversation_id: pickString(primary.last_conversation_id, secondary.last_conversation_id),
-    last_conversation_stage: pickString(primary.last_conversation_stage, secondary.last_conversation_stage),
-    last_speaker_bot_username: pickString(primary.last_speaker_bot_username, secondary.last_speaker_bot_username),
-    local_receive_mode: pickString(primary.local_receive_mode, secondary.local_receive_mode),
+    last_processed_comment_id: pickStringField("last_processed_comment_id"),
+    last_processed_created_at: pickStringField("last_processed_created_at"),
+    last_source_message_id: pickNumberField("last_source_message_id", { allowUndefined: true }),
+    last_source_kind: pickStringField("last_source_kind"),
+    last_error: pickStringField("last_error", { allowBlank: true }),
+    updated_at: firstNonEmptyString([primary.updated_at, secondary.updated_at, new Date().toISOString()]),
+    last_action: pickStringField("last_action"),
+    last_reason: pickStringField("last_reason"),
+    last_trigger: pickStringField("last_trigger"),
+    last_reply_message_id: pickNumberField("last_reply_message_id", { allowUndefined: true }),
+    last_conversation_id: pickStringField("last_conversation_id"),
+    last_conversation_stage: pickStringField("last_conversation_stage"),
+    last_speaker_bot_username: pickStringField("last_speaker_bot_username"),
+    local_receive_mode: pickStringField("local_receive_mode"),
     local_telegram_polling_ready: Boolean(primary.local_telegram_polling_ready || secondary.local_telegram_polling_ready),
-    local_telegram_webhook_cleared_url: pickString(primary.local_telegram_webhook_cleared_url, secondary.local_telegram_webhook_cleared_url),
-    local_telegram_webhook_cleared_at: pickString(primary.local_telegram_webhook_cleared_at, secondary.local_telegram_webhook_cleared_at),
-    last_provider_update_id: pickNumber(primary.last_provider_update_id, secondary.last_provider_update_id) || undefined,
-    last_local_poll_at: pickString(primary.last_local_poll_at, secondary.last_local_poll_at),
-    active_comment_id: pickString(primary.active_comment_id, secondary.active_comment_id),
-    active_comment_created_at: pickString(primary.active_comment_created_at, secondary.active_comment_created_at),
-    active_source_message_id: pickNumber(primary.active_source_message_id, secondary.active_source_message_id) || undefined,
-    active_request_key: pickString(primary.active_request_key, secondary.active_request_key),
-    active_started_at: pickString(primary.active_started_at, secondary.active_started_at),
-    active_root_work_item_id: pickString(primary.active_root_work_item_id, secondary.active_root_work_item_id),
-    active_root_work_item_title: pickString(primary.active_root_work_item_title, secondary.active_root_work_item_title),
-    active_root_work_item_status: pickString(primary.active_root_work_item_status, secondary.active_root_work_item_status),
-    active_runner_pid: pickNumber(primary.active_runner_pid, secondary.active_runner_pid) || undefined,
-    active_execution_token: pickString(primary.active_execution_token, secondary.active_execution_token),
-    last_request_key: pickString(primary.last_request_key, secondary.last_request_key),
-    last_root_work_item_id: pickString(primary.last_root_work_item_id, secondary.last_root_work_item_id),
-    last_root_work_item_title: pickString(primary.last_root_work_item_title, secondary.last_root_work_item_title),
-    last_root_work_item_status: pickString(primary.last_root_work_item_status, secondary.last_root_work_item_status),
+    local_telegram_webhook_cleared_url: pickStringField("local_telegram_webhook_cleared_url", { allowBlank: true }),
+    local_telegram_webhook_cleared_at: pickStringField("local_telegram_webhook_cleared_at", { allowBlank: true }),
+    last_provider_update_id: pickNumberField("last_provider_update_id", { allowUndefined: true }),
+    last_local_poll_at: pickStringField("last_local_poll_at"),
+    active_comment_id: pickStringField("active_comment_id", { allowBlank: true }),
+    active_comment_created_at: pickStringField("active_comment_created_at", { allowBlank: true }),
+    active_source_message_id: pickNumberField("active_source_message_id", { allowUndefined: true }),
+    active_request_key: pickStringField("active_request_key", { allowBlank: true }),
+    active_started_at: pickStringField("active_started_at", { allowBlank: true }),
+    active_root_work_item_id: pickStringField("active_root_work_item_id", { allowBlank: true }),
+    active_root_work_item_title: pickStringField("active_root_work_item_title", { allowBlank: true }),
+    active_root_work_item_status: pickStringField("active_root_work_item_status", { allowBlank: true }),
+    active_runner_pid: pickNumberField("active_runner_pid", { allowUndefined: true }),
+    active_execution_token: pickStringField("active_execution_token", { allowBlank: true }),
+    last_request_key: pickStringField("last_request_key"),
+    last_root_work_item_id: pickStringField("last_root_work_item_id"),
+    last_root_work_item_title: pickStringField("last_root_work_item_title"),
+    last_root_work_item_status: pickStringField("last_root_work_item_status"),
     conversation_sessions: {
       ...safeObject(secondary.conversation_sessions),
       ...safeObject(primary.conversation_sessions),

package/lib/provider-local-transport.mjs

@@ -38,6 +38,9 @@ function isTransientTransportError(err) {
     || text.includes("econnreset")
     || text.includes("etimedout")
     || text.includes("timeout")
+    || text.includes("bad record mac")
+    || text.includes("decryption failed")
+    || text.includes("tls_get_more_records")
   );
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metheus-governance-mcp-cli",
-  "version": "0.2.227",
+  "version": "0.2.228",
   "description": "Metheus Governance MCP CLI (setup + stdio proxy)",
   "type": "module",
   "files": [