yingclaw 2.5.4 → 2.5.7

package/README.md

@@ -61,8 +61,8 @@ claw gateway
 | Kimi / Moonshot | kimi-k2.5 | kimi-k2.5 |
 | 阿里云百炼 | qwen3-max | qwen3.5-plus |
 | MiniMax | MiniMax-M2.7 | MiniMax-M2.7-Turbo |
-| 智谱 GLM | glm-4.7 | glm-5-turbo |
-| 小米 MiMo | mimo-vl-v2.5-pro | mimo-vl-v2.5-pro |
+| 智谱 GLM | GLM-4.7 | GLM-5-Turbo |
+| 小米 MiMo | mimo-v2.5-pro | mimo-v2-flash |
 | 自定义接口 | 自动获取或手动输入 | — |
 
 DeepSeek 的 `[1m]` 后缀是真实 API 模型 ID，表示 100 万 token 上下文窗口（[官方说明](https://api-docs.deepseek.com/zh-cn/quick_start/agent_integrations/claude_code)）。

package/lib/autostart.js

@@ -63,6 +63,35 @@ function runLaunchctl(runner, args, options = {}) {
   return result;
 }
 
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
+}
+
+function getLaunchAgentRuntimeStatus(runner, service) {
+  const result = runner('launchctl', ['print', service], { encoding: 'utf8', stdio: 'pipe' });
+  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  return {
+    loaded: result.status === 0,
+    running: result.status === 0 && /state\s*=\s*running/i.test(output),
+  };
+}
+
+function waitForLaunchAgentUnload(runner, service, options = {}) {
+  const timeoutMs = options.timeoutMs == null ? 1500 : options.timeoutMs;
+  const intervalMs = options.intervalMs == null ? 100 : options.intervalMs;
+  const deadline = Date.now() + timeoutMs;
+
+  do {
+    if (!getLaunchAgentRuntimeStatus(runner, service).loaded) {
+      return true;
+    }
+    if (Date.now() >= deadline) {
+      return false;
+    }
+    sleepSync(intervalMs);
+  } while (true);
+}
+
 function installGatewayAutostart(options = {}) {
   const platform = options.platform || process.platform;
   if (platform !== 'darwin') {
@@ -84,8 +113,18 @@ function installGatewayAutostart(options = {}) {
   const domain = `gui/${uid}`;
   const service = `${domain}/${GATEWAY_LAUNCH_AGENT_LABEL}`;
 
-  runLaunchctl(runner, ['bootout', domain, GATEWAY_LAUNCH_AGENT_LABEL], { optional: true });
-  runLaunchctl(runner, ['bootstrap', domain, file]);
+  const bootout = runLaunchctl(runner, ['bootout', service], { optional: true });
+  if (bootout.status === 0) {
+    waitForLaunchAgentUnload(runner, service, {
+      timeoutMs: options.unloadTimeoutMs,
+      intervalMs: options.unloadPollIntervalMs,
+    });
+  }
+  const bootstrap = runLaunchctl(runner, ['bootstrap', domain, file], { optional: true });
+  if (bootstrap.status !== 0 && !getLaunchAgentRuntimeStatus(runner, service).loaded) {
+    const stderr = String(bootstrap.stderr || '').trim();
+    throw new Error(`launchctl bootstrap ${domain} ${file} 失败${stderr ? `: ${stderr}` : ''}`);
+  }
   runLaunchctl(runner, ['enable', service]);
   runLaunchctl(runner, ['kickstart', '-k', service]);
 
@@ -111,12 +150,11 @@ function getGatewayAutostartStatus(options = {}) {
   }
 
   const runner = options.runner || spawnSync;
-  const result = runner('launchctl', ['print', `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`], { encoding: 'utf8', stdio: 'pipe' });
-  const output = `${result.stdout || ''}\n${result.stderr || ''}`;
+  const runtimeStatus = getLaunchAgentRuntimeStatus(runner, `gui/${uid}/${GATEWAY_LAUNCH_AGENT_LABEL}`);
   return {
     supported: true,
     installed: true,
-    running: result.status === 0 && /state\s*=\s*running/i.test(output),
+    running: runtimeStatus.running,
     file,
   };
 }

package/lib/config.js

@@ -52,6 +52,7 @@ const PROVIDERS = {
     name: 'MiniMax',
     baseUrl: 'https://api.minimaxi.com/anthropic',
     modelsUrl: 'https://api.minimaxi.com/v1/models',
+    fastModel: 'MiniMax-M2.7-Turbo',
     models: [
       { name: 'MiniMax M2.7（旗舰）',       value: 'MiniMax-M2.7' },
       { name: 'MiniMax M2.7 Turbo（快速）', value: 'MiniMax-M2.7-Turbo' },
@@ -62,6 +63,7 @@ const PROVIDERS = {
     name: '智谱 GLM',
     baseUrl: 'https://open.bigmodel.cn/api/anthropic',
     modelsUrl: 'https://open.bigmodel.cn/api/paas/v4/models',
+    fastModel: 'GLM-5-Turbo',
     models: [
       { name: 'GLM-4.7（旗舰）',     value: 'GLM-4.7' },
       { name: 'GLM-5.1（强力）',     value: 'GLM-5.1' },
@@ -89,7 +91,27 @@ const PROVIDERS = {
   },
 };
 
+const PREFERRED_MODEL_IDS = {
+  qwen: ['qwen3-max', 'qwen3-plus', 'qwen3.5-plus'],
+  minimax: ['MiniMax-M2.7', 'MiniMax-M2.7-Turbo', 'MiniMax-M2.5'],
+  glm: ['GLM-4.7', 'GLM-5.1', 'GLM-5-Turbo', 'GLM-4.5-Air'],
+  mimo: ['mimo-v2.5-pro', 'mimo-v2.5', 'mimo-v2-flash'],
+};
+
+function sortPreferredModelIds(providerKey, ids) {
+  const preferred = PREFERRED_MODEL_IDS[providerKey];
+  if (!preferred) return ids;
+  return [
+    ...preferred.filter((id) => ids.includes(id)),
+    ...ids.filter((id) => !preferred.includes(id)),
+  ];
+}
+
 function normalizeModelIds(providerKey, ids) {
+  if (PREFERRED_MODEL_IDS[providerKey]) {
+    return sortPreferredModelIds(providerKey, ids);
+  }
+
   if (providerKey !== 'deepseek') return ids;
 
   const mapped = ids.map((id) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.5.4",
+  "version": "2.5.7",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {