grix-connector 4.5.0 → 4.5.1

package/dist/mcp/stream-http/tool-schemas.js

@@ -1 +1 @@
-const o={required:["action"],properties:{action:{type:"string",enum:["contact_search","session_search","message_history","message_search"]},id:{type:"string"},keyword:{type:"string",maxLength:200},limit:{type:"integer",minimum:1,maximum:100},offset:{type:"integer",minimum:0},sessionId:{type:"string"},beforeId:{type:"string"}}},a={required:["action"],properties:{action:{type:"string",enum:["create","detail","leave","add_members","remove_members","update_member_role","update_all_members_muted","update_member_speaking","dissolve"]},sessionId:{type:"string"},name:{type:"string",maxLength:128},memberIds:{type:"array",items:{type:"string"},maxItems:100},memberTypes:{type:"array",items:{type:"integer",enum:[1,2]}},memberId:{type:"string"},role:{type:"integer",enum:[1,2]},memberType:{type:"integer"},allMembersMuted:{type:"boolean"},isSpeakMuted:{type:"boolean"},canSpeakWhenAllMuted:{type:"boolean"}}},p={required:["sessionId","content"],properties:{sessionId:{type:"string"},content:{type:"string",maxLength:1e4},msgType:{type:"integer"},quotedMessageId:{type:"string"},threadId:{type:"string"}}},m={required:["sessionId","msgId"],properties:{sessionId:{type:"string"},msgId:{type:"string"}}},g={required:["action"],properties:{action:{type:"string",enum:["create_agent","list_categories","create_category","update_category","assign_category","rotate_api_key"]},agentName:{type:"string"},introduction:{type:"string"},isMain:{type:"boolean"},agentId:{type:"string"},categoryId:{type:"string"},name:{type:"string"},parentId:{type:"string"},sortOrder:{type:"integer"}}},y={required:["session_id","text"],properties:{event_id:{type:"string"},session_id:{type:"string"},text:{type:"string",maxLength:5e4},quoted_message_id:{type:"string"},is_final:{type:"boolean"}}},d={required:["event_id","status"],properties:{event_id:{type:"string"},status:{type:"string",enum:["responded","canceled","failed"]},msg:{type:"string",maxLength:500}}},c={required:["event_id"],properties:{event_id:{type:"string"},session_id:{type:"string"}}},l={required:["session_id","active"],properties:{session_id:{type:"string"},active:{type:"boolean"},event_id:{type:"string"}}},_={required:["action"],properties:{action:{type:"string",enum:["pair_approve","pair_deny","allow_sender","remove_sender","set_policy"]},code:{type:"string"},sender_id:{type:"string"},policy:{type:"string",enum:["allowlist","open","disabled"]}}},f={required:[],properties:{}},C={grix_query:o,grix_group:a,grix_message_send:p,grix_message_unsend:m,grix_admin:g,grix_reply:y,grix_complete:d,grix_event_ack:c,grix_composing:l,grix_access_control:_,grix_status:f};function B(u,t){const e=C[u];if(!e)return{valid:!1,error:`\u672A\u77E5\u5DE5\u5177: ${u}`};for(const i of e.required)if(t[i]===void 0||t[i]===null)return{valid:!1,error:`\u7F3A\u5C11\u5FC5\u586B\u53C2\u6570: ${i}`};for(const[i,r]of Object.entries(t)){if(r==null)continue;const n=e.properties[i];if(!n)continue;const s=$(i,r,n);if(s)return{valid:!1,error:s}}return{valid:!0}}function $(u,t,e){switch(e.type){case"string":if(typeof t!="string")return`\u53C2\u6570 ${u} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxLength!==void 0&&t.length>e.maxLength)return`\u53C2\u6570 ${u} \u8D85\u8FC7\u6700\u5927\u957F\u5EA6 ${e.maxLength}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${u} \u503C "${t}" \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"integer":if(typeof t!="number"||!Number.isInteger(t))return`\u53C2\u6570 ${u} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof t=="number"?"\u6D6E\u70B9\u6570":typeof t}`;if(e.minimum!==void 0&&t<e.minimum)return`\u53C2\u6570 ${u} \u503C ${t} \u5C0F\u4E8E\u6700\u5C0F\u503C ${e.minimum}`;if(e.maximum!==void 0&&t>e.maximum)return`\u53C2\u6570 ${u} \u503C ${t} \u5927\u4E8E\u6700\u5927\u503C ${e.maximum}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${u} \u503C ${t} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"boolean":if(typeof t!="boolean")return`\u53C2\u6570 ${u} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B boolean\uFF0C\u5B9E\u9645 ${typeof t}`;break;case"array":if(!Array.isArray(t))return`\u53C2\u6570 ${u} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B array\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxItems!==void 0&&t.length>e.maxItems)return`\u53C2\u6570 ${u} \u8D85\u8FC7\u6700\u5927\u5143\u7D20\u6570 ${e.maxItems}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.items)for(let i=0;i<t.length;i++){const r=t[i];if(e.items.type==="string"&&typeof r!="string")return`\u53C2\u6570 ${u}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof r}`;if(e.items.type==="integer"){if(typeof r!="number"||!Number.isInteger(r))return`\u53C2\u6570 ${u}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof r}`;if(e.items.enum&&!e.items.enum.includes(r))return`\u53C2\u6570 ${u}[${i}] \u503C ${r} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.items.enum.join(", ")}]`}}break}}export{B as validateToolArgs};
+const o={required:["action"],properties:{action:{type:"string",enum:["contact_search","session_search","message_history","message_search"]},id:{type:"string"},keyword:{type:"string",maxLength:200},limit:{type:"integer",minimum:1,maximum:100},offset:{type:"integer",minimum:0},sessionId:{type:"string"},beforeId:{type:"string"}}},a={required:["action"],properties:{action:{type:"string",enum:["create","detail","leave","add_members","remove_members","update_member_role","update_all_members_muted","update_member_speaking","dissolve"]},sessionId:{type:"string"},name:{type:"string",maxLength:128},memberIds:{type:"array",items:{type:"string"},maxItems:100},memberTypes:{type:"array",items:{type:"integer",enum:[1,2]}},memberId:{type:"string"},role:{type:"integer",enum:[1,2]},memberType:{type:"integer"},allMembersMuted:{type:"boolean"},isSpeakMuted:{type:"boolean"},canSpeakWhenAllMuted:{type:"boolean"}}},p={required:["sessionId","content"],properties:{sessionId:{type:"string"},content:{type:"string",maxLength:1e4},msgType:{type:"integer"},quotedMessageId:{type:"string"},threadId:{type:"string"}}},m={required:["sessionId","msgId"],properties:{sessionId:{type:"string"},msgId:{type:"string"}}},g={required:["action"],properties:{action:{type:"string",enum:["create_agent","list_categories","create_category","update_category","assign_category","rotate_api_key"]},agentName:{type:"string"},introduction:{type:"string"},isMain:{type:"boolean"},agentId:{type:"string"},categoryId:{type:"string"},name:{type:"string"},parentId:{type:"string"},sortOrder:{type:"integer"}}},y={required:["session_id","text"],properties:{event_id:{type:"string"},session_id:{type:"string"},text:{type:"string",maxLength:5e4},quoted_message_id:{type:"string"},is_final:{type:"boolean"}}},d={required:["event_id","status"],properties:{event_id:{type:"string"},status:{type:"string",enum:["responded","canceled","failed"]},msg:{type:"string",maxLength:500}}},c={required:["event_id"],properties:{event_id:{type:"string"},session_id:{type:"string"}}},l={required:["session_id","active"],properties:{session_id:{type:"string"},active:{type:"boolean"},event_id:{type:"string"}}},_={required:["action"],properties:{action:{type:"string",enum:["pair_approve","pair_deny","allow_sender","remove_sender","set_policy"]},code:{type:"string"},sender_id:{type:"string"},policy:{type:"string",enum:["allowlist","open","disabled"]}}},f={required:[],properties:{}},C={grix_query:o,grix_group:a,grix_message_send:p,grix_message_unsend:m,grix_admin:g,grix_reply:y,grix_complete:d,grix_event_ack:c,grix_composing:l,grix_access_control:_,grix_status:f};function B(r,t){const e=C[r];if(!e)return{valid:!1,error:`\u672A\u77E5\u5DE5\u5177: ${r}`};for(const i of e.required)if(t[i]===void 0||t[i]===null)return{valid:!1,error:`\u7F3A\u5C11\u5FC5\u586B\u53C2\u6570: ${i}`};for(const[i,u]of Object.entries(t)){if(u==null)continue;const n=e.properties[i];if(!n)continue;const s=$(i,u,n);if(s)return{valid:!1,error:s}}return{valid:!0}}function $(r,t,e){switch(e.type){case"string":if(typeof t!="string")return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxLength!==void 0&&t.length>e.maxLength)return`\u53C2\u6570 ${r} \u8D85\u8FC7\u6700\u5927\u957F\u5EA6 ${e.maxLength}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${r} \u503C "${t}" \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"integer":if(typeof t!="number"||!Number.isInteger(t))return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof t=="number"?"\u6D6E\u70B9\u6570":typeof t}`;if(e.minimum!==void 0&&t<e.minimum)return`\u53C2\u6570 ${r} \u503C ${t} \u5C0F\u4E8E\u6700\u5C0F\u503C ${e.minimum}`;if(e.maximum!==void 0&&t>e.maximum)return`\u53C2\u6570 ${r} \u503C ${t} \u5927\u4E8E\u6700\u5927\u503C ${e.maximum}`;if(e.enum&&!e.enum.includes(t))return`\u53C2\u6570 ${r} \u503C ${t} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.enum.join(", ")}]`;break;case"boolean":if(typeof t!="boolean")return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B boolean\uFF0C\u5B9E\u9645 ${typeof t}`;break;case"array":if(!Array.isArray(t))return`\u53C2\u6570 ${r} \u7C7B\u578B\u9519\u8BEF: \u671F\u671B array\uFF0C\u5B9E\u9645 ${typeof t}`;if(e.maxItems!==void 0&&t.length>e.maxItems)return`\u53C2\u6570 ${r} \u8D85\u8FC7\u6700\u5927\u5143\u7D20\u6570 ${e.maxItems}\uFF0C\u5B9E\u9645 ${t.length}`;if(e.items)for(let i=0;i<t.length;i++){const u=t[i];if(e.items.type==="string"&&typeof u!="string")return`\u53C2\u6570 ${r}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B string\uFF0C\u5B9E\u9645 ${typeof u}`;if(e.items.type==="integer"){if(typeof u!="number"||!Number.isInteger(u))return`\u53C2\u6570 ${r}[${i}] \u7C7B\u578B\u9519\u8BEF: \u671F\u671B integer\uFF0C\u5B9E\u9645 ${typeof u}`;if(e.items.enum&&!e.items.enum.includes(u))return`\u53C2\u6570 ${r}[${i}] \u503C ${u} \u4E0D\u5728\u5141\u8BB8\u8303\u56F4 [${e.items.enum.join(", ")}]`}}break}}export{B as validateToolArgs};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "grix-connector",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "Connect local AI coding agents (Claude, Codex, Gemini, Qwen, DeepSeek, Cursor, OpenCode, Pi, OpenHuman, Reasonix) to the Grix scheduling platform. Also serves as an OpenClaw plugin for Grix channel transport.",
   "type": "module",
   "main": "dist/index.js",

package/scripts/launcher.mjs

@@ -7,13 +7,16 @@
 //   - 退出码 75（RESTART_EXIT_CODE）：升级切换 / 重载请求，立即重新读指针拉起；
 //   - 退出码 0 或被信号终止：daemon 是被要求停下的，launcher 随之退出，保活与否交给
 //     上层 supervisor（launchd KeepAlive / Windows wrapper），语义与 launcher 出现前一致；
-//     否则 `grix-connector stop` 的兜底强杀会被 launcher 复活。
+//     否则 `grix-connector stop` 的兜底强杀会被 launcher 复活。不是 launcher 转发的信号
+//     （OOM/SIGKILL 等）仍按崩溃记账，让 supervisor 重拉后的 launcher 能接着数；daemon 进入
+//     优雅关停时会写 `<store>/managed-stop`，关停卡住后被兜底强杀的不算崩溃。
 //   - 其他非零退出：按退避重启；若该版本从未写过 `<store>/health/<ver>.ok` 且 5 分钟内快崩
 //     3 次，则把 `current` 切回 `previous`，写 `<store>/rollback.json` 供旧版本上报。
+//     崩溃时间戳落在 `<store>/crashes.json`，launcher 自身被重拉也不会把计数归零。
 // 收到 SIGTERM/SIGINT/SIGHUP 时转发给子进程并随其退出（服务停止语义）。
 //
 // 本文件由 daemon 在启动时按 LAUNCHER_TEMPLATE_VERSION 比对并原子重写，改动行为时必须 +1。
-export const LAUNCHER_TEMPLATE_VERSION = 1;
+export const LAUNCHER_TEMPLATE_VERSION = 2;
 
 import { spawn } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, realpathSync, renameSync, rmSync, writeFileSync, appendFileSync } from 'node:fs';
@@ -48,6 +51,79 @@ function writePointer(store, name, value) {
   renameSync(tmp, file);
 }
 
+function crashFile(store) {
+  return join(store, 'crashes.json');
+}
+
+/** daemon 自己在优雅关停开始时写下的标记：随后的信号致死是管理性终止，不记崩溃。 */
+function consumeManagedStop(store) {
+  const file = join(store, 'managed-stop');
+  const present = existsSync(file);
+  rmSync(file, { force: true });
+  return present;
+}
+
+/** 读取该版本在快崩窗口内的崩溃时间戳；文件属于别的版本或损坏时视为空。 */
+function loadCrashes(store, version) {
+  try {
+    const parsed = JSON.parse(readFileSync(crashFile(store), 'utf8'));
+    if (parsed?.version !== version || !Array.isArray(parsed.at)) return [];
+    const now = Date.now();
+    return parsed.at.filter((at) => typeof at === 'number' && now - at < RAPID_CRASH_WINDOW_MS);
+  } catch {
+    return [];
+  }
+}
+
+function saveCrashes(store, version, crashes) {
+  try {
+    if (crashes.length === 0) {
+      rmSync(crashFile(store), { force: true });
+      return;
+    }
+    const tmp = `${crashFile(store)}.tmp-${process.pid}`;
+    writeFileSync(tmp, JSON.stringify({ version, at: crashes }), 'utf8');
+    renameSync(tmp, crashFile(store));
+  } catch { /* best effort */ }
+}
+
+/**
+ * 记一次未达健康的崩溃；达到阈值且有可用的 previous 时切回并写 rollback.json。
+ * 返回 true 表示已回滚（调用方应立即按新指针重拉）。
+ */
+function noteCrashAndMaybeRollback(store, version, code, startedAt) {
+  if (existsSync(join(store, 'health', `${version}.ok`))) {
+    saveCrashes(store, version, []);
+    return false;
+  }
+  const now = Date.now();
+  const crashes = loadCrashes(store, version);
+  crashes.push(now);
+  saveCrashes(store, version, crashes);
+  if (crashes.length < RAPID_CRASH_LIMIT) return false;
+  const previous = readPointer(store, 'previous');
+  if (!previous || previous === version || !existsSync(entryFor(store, previous))) {
+    log(store, `${version} keeps crashing and there is no previous version to roll back to`);
+    return false;
+  }
+  log(store, `${version} crashed ${crashes.length}x without becoming healthy; rolling back to ${previous}`);
+  const record = {
+    from_version: previous,
+    to_version: version,
+    exit_code: code,
+    crash_count: crashes.length,
+    uptime_ms: now - startedAt,
+    rolled_back_at: new Date().toISOString(),
+  };
+  const rollbackFile = join(store, 'rollback.json');
+  writeFileSync(`${rollbackFile}.tmp-${process.pid}`, JSON.stringify(record), 'utf8');
+  renameSync(`${rollbackFile}.tmp-${process.pid}`, rollbackFile);
+  writePointer(store, 'current', previous);
+  rmSync(join(store, 'previous'), { force: true });
+  saveCrashes(store, version, []);
+  return true;
+}
+
 function entryFor(store, version) {
   return join(store, 'versions', version, 'dist', 'grix.js');
 }
@@ -107,7 +183,6 @@ async function main() {
   const store = resolveStoreDir();
   const args = process.argv.slice(2);
   mkdirSync(join(store, 'health'), { recursive: true });
-  let crashes = [];
   let backoffMs = 1000;
   log(store, `started node=${process.version} store=${store} template=${LAUNCHER_TEMPLATE_VERSION}`);
 
@@ -125,47 +200,35 @@ async function main() {
       }
     }
 
+    // launcher 自己被 supervisor 重拉时，上一轮落盘的崩溃可能已经够数（例如被 OOM 杀了三次）。
+    if (loadCrashes(store, version).length >= RAPID_CRASH_LIMIT
+      && noteCrashAndMaybeRollback(store, version, null, Date.now())) {
+      continue;
+    }
+
     const startedAt = Date.now();
+    consumeManagedStop(store);
     log(store, `starting ${version}`);
     const { code, signal, stopping } = await runChild(store, version, args);
     log(store, `daemon ${version} exited code=${code} signal=${signal ?? '-'}`);
-    if (stopping || signal || code === 0) process.exit(typeof code === 'number' ? code : 0);
+    const managedStop = consumeManagedStop(store);
+    if (stopping || code === 0) process.exit(typeof code === 'number' ? code : 0);
+    if (signal) {
+      // 不是我们转发的信号：除非 daemon 已进入优雅关停（管理性终止的兜底强杀），
+      // 否则记一次崩溃；随后仍交还 supervisor，重拉后的 launcher 接着数。
+      if (managedStop) log(store, `${version} was terminated during a managed stop; not counting as a crash`);
+      else noteCrashAndMaybeRollback(store, version, code, startedAt);
+      process.exit(code);
+    }
     if (code === RESTART_EXIT_CODE) {
-      crashes = [];
+      saveCrashes(store, version, []);
       backoffMs = 1000;
       continue;
     }
 
-    const healthy = existsSync(join(store, 'health', `${version}.ok`));
-    if (!healthy) {
-      const now = Date.now();
-      crashes = crashes.filter((at) => now - at < RAPID_CRASH_WINDOW_MS);
-      crashes.push(now);
-      if (crashes.length >= RAPID_CRASH_LIMIT) {
-        const previous = readPointer(store, 'previous');
-        if (previous && previous !== version && existsSync(entryFor(store, previous))) {
-          log(store, `${version} crashed ${crashes.length}x without becoming healthy; rolling back to ${previous}`);
-          const record = {
-            from_version: previous,
-            to_version: version,
-            exit_code: code,
-            crash_count: crashes.length,
-            uptime_ms: now - startedAt,
-            rolled_back_at: new Date().toISOString(),
-          };
-          const rollbackFile = join(store, 'rollback.json');
-          writeFileSync(`${rollbackFile}.tmp-${process.pid}`, JSON.stringify(record), 'utf8');
-          renameSync(`${rollbackFile}.tmp-${process.pid}`, rollbackFile);
-          writePointer(store, 'current', previous);
-          rmSync(join(store, 'previous'), { force: true });
-          crashes = [];
-          backoffMs = 1000;
-          continue;
-        }
-        log(store, `${version} keeps crashing and there is no previous version to roll back to`);
-      }
-    } else {
-      crashes = [];
+    if (noteCrashAndMaybeRollback(store, version, code, startedAt)) {
+      backoffMs = 1000;
+      continue;
     }
 
     await sleep(backoffMs);