mslxdff 0.1.187 → 0.1.188

package/src/runtime/providers-setup.js

@@ -1,168 +1,168 @@
-import { join, dirname } from "node:path";
-import { fileURLToPath } from "node:url";
-import { defaultStateFile, loadToken } from "../state.js";
-import { createUpstreamClient } from "../upstream.js";
-import { createUpstreamEngine } from "../upstream-engine/index.js";
-import { createModelsService } from "../models.js";
-import { createAutoSelector } from "../auto.js";
-import { createPeersService } from "../peers.js";
-import { createGroupsService, createBansService } from "../groups.js";
-import { logDir, appendEvent } from "../logs.js";
-import { loadPlugins, runHook, resolvePluginDirs } from "../plugins.js";
-import { createOpenCodeProvider } from "../providers/opencode.js";
-import { loadProviderKeys, loadProviderAuths, loadProviderConfigs } from "../state.js";
-import { refreshIntervalMs, modelCooldownMs, slowCooldownMs, peerCooldownMs, peerLimitCooldownMs, peerHeatMs, banWindowMs, banThreshold } from "../cli/policy.js";
-import { errMsg } from "../cli/util.js";
-import { createPreferredDispatcher } from "../v6pool/index.js";
-
-
-import { shouldEnableCustomProvider, loadAuthDocs } from "./provider-gate.js";
-/**
- * 世界组装 — 插件加载 → providers → models/auto/peers/groups/bans。
- * 无参（读 env/state 自身），返回 ctx 由门面接力 server-lifecycle。
- */
-export async function setupProviders() {
-  // 供应商 id 统一（旧 cline id → cline）：必须在实例化任何 provider 之前跑；幂等，失败不阻断启动
-  try {
-    const { runStateMigrations } = await import("../state/migrations.js");
-    const mig = await runStateMigrations({ file: defaultStateFile() });
-    if (mig.applied.length) console.log(`state migrations applied: ${mig.applied.join(", ")}`);
-    for (const e of mig.errors) console.log(`state migration failed: ${e.id} — ${e.error}`);
-  } catch (err) {
-    console.log(`state migrations failed: ${errMsg(err)}`);
-  }
-  const { token, created } = await loadToken();
-  const pkgRoot2 = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
-  const pluginDirs = resolvePluginDirs({ pkgRoot: pkgRoot2 });
-  const { plugins: loadedPlugins, errors: pluginErrors } = await loadPlugins({ dirs: pluginDirs });
-  for (const e of pluginErrors) {
-    console.log(`plugin load failed: ${e.file} — ${e.error}`);
-    appendEvent({ ts: Date.now(), type: "plugin-load-error", file: e.file, error: e.error });
-  }
-  if (loadedPlugins.length) {
-    console.log(`plugins loaded (${loadedPlugins.length}): ${loadedPlugins.map((p) => `${p.name}${p.version ? `@${p.version}` : ""}`).join(", ")}`);
-    appendEvent({ ts: Date.now(), type: "plugins-loaded", plugins: loadedPlugins.map((p) => ({ name: p.name, version: p.version })) });
-  }
-  const upstreamHooks = loadedPlugins.length
-    ? (name, ctx) => runHook(loadedPlugins, name, ctx)
-    : null;
-  const providerPlugin = loadedPlugins.find((p) => typeof p.createUpstream === "function");
-  let upstream;
-  const baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
-  let providers = [];
-
-  const outboundDispatcher = createPreferredDispatcher({ baseUrl });
-  if (providerPlugin) {
-    if (!upstream) {
-      try {
-        upstream = await providerPlugin.createUpstream({ baseUrl, authToken: process.env.UPSTREAM_AUTH_TOKEN || "public", env: process.env });
-        console.log(`upstream provider replaced by plugin: ${providerPlugin.name}`);
-        appendEvent({ ts: Date.now(), type: "plugin-upstream-active", plugin: providerPlugin.name });
-      } catch (err) {
-        console.log(`plugin upstream (${providerPlugin.name}) failed: ${errMsg(err)} — falling back to default`);
-        appendEvent({ ts: Date.now(), type: "plugin-upstream-error", plugin: providerPlugin.name, error: errMsg(err) });
-      }
-    }
-    if (!upstream) upstream = createUpstreamClient({ hooks: upstreamHooks, dispatcher: outboundDispatcher });
-  } else {
-    const opencodeClient = createUpstreamEngine({ hooks: upstreamHooks, dispatcher: outboundDispatcher });
-    const opencodeModels = createModelsService({
-      baseUrl,
-      headers: opencodeClient.headers,
-      refreshMs: refreshIntervalMs(),
-      cacheFile: join(logDir(), "models.json"),
-    });
-    providers.push(createOpenCodeProvider({ upstream: opencodeClient, modelsService: opencodeModels }));
-    const orKeys = loadProviderKeys("openrouter");
-    if (orKeys.length) {
-      const { createOpenRouterProvider } = await import("../providers/openrouter.js");
-      providers.push(createOpenRouterProvider({ apiKeys: orKeys }));
-      console.log(`provider enabled: openrouter (${orKeys.length} key${orKeys.length > 1 ? "s" : ""})`);
-      appendEvent({ ts: Date.now(), type: "provider-enabled", provider: "openrouter", keys: orKeys.length });
-    }
-    const genericConfigs = loadProviderConfigs();
-    for (const [gid, cfg] of Object.entries(genericConfigs)) {
-      if (gid === "opencode" || gid === "openrouter") continue;
-      const base = String(cfg?.baseUrl || "").trim();
-      const keys = Array.isArray(cfg?.keys) ? cfg.keys.filter((k) => typeof k === "string" && k.trim()) : [];
-      const auths = Array.isArray(cfg?.auths) ? cfg.auths : [];
-      // 可扩展：优先走注册表定制 provider（如 workbuddy、cline），新增供应商仅需在 registry.js 注册
-      const { getCustomProviderFactory } = await import("../providers/registry.js");
-      const customFactory = await getCustomProviderFactory(gid, base);
-      if (customFactory) {
-        // auth 号型（workbuddy/traework/qoder）：无 keys 但 auth 目录有号也启用；baseUrl 可空
-        // （端点由各自 constants 决定，如 qoder 的 qoder://native）。
-        const hasAuthDocs = !keys.length && !auths.length ? (await loadAuthDocs(gid)).length > 0 : false;
-        if (!shouldEnableCustomProvider(gid, { keys, auths, hasAuthDocs })) continue;
-        try {
-          const provider = gid === "workbuddy"
-            ? await customFactory({ baseUrl: base || "https://copilot.tencent.com", apiKeys: keys, auths })
-            : gid === "traework"
-              ? await customFactory({ baseUrl: base || "https://trae-api-cn.mchost.guru", apiKeys: keys, auths })
-              : await customFactory({ id: gid, baseUrl: base, apiKeys: keys });
-          providers.push(provider);
-          console.log(`provider enabled: ${gid} (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base || provider.baseUrl} [custom]`);
-          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base || provider.baseUrl });
-          appendEvent({ type: "provider-state", provider: gid, state: "enabled", keys: keys.length, accounts: auths.length, baseUrl: base || provider.baseUrl });
-        } catch (err) {
-          console.log(`provider ${gid} failed: ${err?.message || err}`);
-          appendEvent({ ts: Date.now(), type: "provider-error", provider: gid, error: String(err?.message || err) });
-        }
-        continue;
-      }
-      if (!base || !keys.length) continue;
-      try {
-        const { createGenericProvider } = await import("../providers/generic.js");
-        providers.push(createGenericProvider({ id: gid, baseUrl: base, apiKeys: keys }));
-        console.log(`provider enabled: ${gid} (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base}`);
-        appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base });
-      } catch (err) {
-        console.log(`provider ${gid} failed: ${err?.message || err}`);
-        appendEvent({ ts: Date.now(), type: "provider-error", provider: gid, error: String(err?.message || err) });
-      }
-    }
-    if (!genericConfigs["workbuddy"]) {
-      const wbKeys = loadProviderKeys("workbuddy");
-      if (wbKeys.length) {
-        try {
-          const { createWorkbuddyProvider } = await import("../providers/workbuddy.js");
-          const wbAuths = loadProviderAuths("workbuddy");
-          providers.push(createWorkbuddyProvider({ apiKeys: wbKeys, auths: wbAuths }));
-          console.log(`provider enabled: workbuddy (${wbKeys.length} key${wbKeys.length > 1 ? "s" : ""}) baseUrl=https://copilot.tencent.com (env)`);
-          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: "workbuddy", keys: wbKeys.length, baseUrl: "https://copilot.tencent.com" });
-          appendEvent({ type: "provider-state", provider: "workbuddy", state: "enabled", keys: wbKeys.length, accounts: wbAuths.length });
-        } catch (err) {
-          console.log(`provider workbuddy failed: ${err?.message || err}`);
-        }
-      }
-    }
-    const { createProviderDispatcher } = await import("../providers/dispatcher.js");
-    upstream = createProviderDispatcher(providers);
-    appendEvent({ ts: Date.now(), type: "providers", providers: providers.map((p) => p.id) });
-  }
-  const opencodeProvider = providers.find((p) => p.id === "opencode");
-  const models = createModelsService({
-    providers: providers.length > 1 ? providers : undefined,
-    baseUrl,
-    headers: upstream.headers || opencodeProvider?.upstream?.headers,
-    refreshMs: refreshIntervalMs(),
-    cacheFile: join(logDir(), "models.json"),
-  });
-  const auto = createAutoSelector({
-    cooldownMs: modelCooldownMs(),
-    slowCooldownMs: slowCooldownMs(),
-    file: defaultStateFile(),
-    loadCandidates: async () => {
-      try {
-        return (await models.get()).data.map((m) => m.id);
-      } catch {
-        return null;
-      }
-    },
-  });
-  const peers = createPeersService({ cooldownMs: peerCooldownMs(), limitCooldownMs: peerLimitCooldownMs(), heatMs: peerHeatMs() });
-  const groups = createGroupsService({});
-  const bans = createBansService({ windowMs: banWindowMs(), threshold: banThreshold() });
-
-  return { token, created, loadedPlugins, upstreamHooks, providerPlugin, upstream, providers, baseUrl, opencodeProvider, models, auto, peers, groups, bans };
-}
+import { join, dirname } from "node:path";
+import { fileURLToPath } from "node:url";
+import { defaultStateFile, loadToken } from "../state.js";
+import { createUpstreamClient } from "../upstream.js";
+import { createUpstreamEngine } from "../upstream-engine/index.js";
+import { createModelsService } from "../models.js";
+import { createAutoSelector } from "../auto.js";
+import { createPeersService } from "../peers.js";
+import { createGroupsService, createBansService } from "../groups.js";
+import { logDir, appendEvent } from "../logs.js";
+import { loadPlugins, runHook, resolvePluginDirs } from "../plugins.js";
+import { createOpenCodeProvider } from "../providers/opencode.js";
+import { loadProviderKeys, loadProviderAuths, loadProviderConfigs } from "../state.js";
+import { refreshIntervalMs, modelCooldownMs, slowCooldownMs, peerCooldownMs, peerLimitCooldownMs, peerHeatMs, banWindowMs, banThreshold } from "../cli/policy.js";
+import { errMsg } from "../cli/util.js";
+import { createPreferredDispatcher } from "../v6pool/index.js";
+
+
+import { shouldEnableCustomProvider, loadAuthDocs } from "./provider-gate.js";
+/**
+ * 世界组装 — 插件加载 → providers → models/auto/peers/groups/bans。
+ * 无参（读 env/state 自身），返回 ctx 由门面接力 server-lifecycle。
+ */
+export async function setupProviders() {
+  // 供应商 id 统一（旧 cline id → cline）：必须在实例化任何 provider 之前跑；幂等，失败不阻断启动
+  try {
+    const { runStateMigrations } = await import("../state/migrations.js");
+    const mig = await runStateMigrations({ file: defaultStateFile() });
+    if (mig.applied.length) console.log(`state migrations applied: ${mig.applied.join(", ")}`);
+    for (const e of mig.errors) console.log(`state migration failed: ${e.id} — ${e.error}`);
+  } catch (err) {
+    console.log(`state migrations failed: ${errMsg(err)}`);
+  }
+  const { token, created } = await loadToken();
+  const pkgRoot2 = join(dirname(fileURLToPath(import.meta.url)), "..", "..");
+  const pluginDirs = resolvePluginDirs({ pkgRoot: pkgRoot2 });
+  const { plugins: loadedPlugins, errors: pluginErrors } = await loadPlugins({ dirs: pluginDirs });
+  for (const e of pluginErrors) {
+    console.log(`plugin load failed: ${e.file} — ${e.error}`);
+    appendEvent({ ts: Date.now(), type: "plugin-load-error", file: e.file, error: e.error });
+  }
+  if (loadedPlugins.length) {
+    console.log(`plugins loaded (${loadedPlugins.length}): ${loadedPlugins.map((p) => `${p.name}${p.version ? `@${p.version}` : ""}`).join(", ")}`);
+    appendEvent({ ts: Date.now(), type: "plugins-loaded", plugins: loadedPlugins.map((p) => ({ name: p.name, version: p.version })) });
+  }
+  const upstreamHooks = loadedPlugins.length
+    ? (name, ctx) => runHook(loadedPlugins, name, ctx)
+    : null;
+  const providerPlugin = loadedPlugins.find((p) => typeof p.createUpstream === "function");
+  let upstream;
+  const baseUrl = process.env.UPSTREAM_BASE_URL || "https://opencode.ai";
+  let providers = [];
+
+  const outboundDispatcher = createPreferredDispatcher({ baseUrl });
+  if (providerPlugin) {
+    if (!upstream) {
+      try {
+        upstream = await providerPlugin.createUpstream({ baseUrl, authToken: process.env.UPSTREAM_AUTH_TOKEN || "public", env: process.env });
+        console.log(`upstream provider replaced by plugin: ${providerPlugin.name}`);
+        appendEvent({ ts: Date.now(), type: "plugin-upstream-active", plugin: providerPlugin.name });
+      } catch (err) {
+        console.log(`plugin upstream (${providerPlugin.name}) failed: ${errMsg(err)} — falling back to default`);
+        appendEvent({ ts: Date.now(), type: "plugin-upstream-error", plugin: providerPlugin.name, error: errMsg(err) });
+      }
+    }
+    if (!upstream) upstream = createUpstreamClient({ hooks: upstreamHooks, dispatcher: outboundDispatcher });
+  } else {
+    const opencodeClient = createUpstreamEngine({ hooks: upstreamHooks, dispatcher: outboundDispatcher });
+    const opencodeModels = createModelsService({
+      baseUrl,
+      headers: opencodeClient.headers,
+      refreshMs: refreshIntervalMs(),
+      cacheFile: join(logDir(), "models.json"),
+    });
+    providers.push(createOpenCodeProvider({ upstream: opencodeClient, modelsService: opencodeModels }));
+    const orKeys = loadProviderKeys("openrouter");
+    if (orKeys.length) {
+      const { createOpenRouterProvider } = await import("../providers/openrouter.js");
+      providers.push(createOpenRouterProvider({ apiKeys: orKeys }));
+      console.log(`provider enabled: openrouter (${orKeys.length} key${orKeys.length > 1 ? "s" : ""})`);
+      appendEvent({ ts: Date.now(), type: "provider-enabled", provider: "openrouter", keys: orKeys.length });
+    }
+    const genericConfigs = loadProviderConfigs();
+    for (const [gid, cfg] of Object.entries(genericConfigs)) {
+      if (gid === "opencode" || gid === "openrouter") continue;
+      const base = String(cfg?.baseUrl || "").trim();
+      const keys = Array.isArray(cfg?.keys) ? cfg.keys.filter((k) => typeof k === "string" && k.trim()) : [];
+      const auths = Array.isArray(cfg?.auths) ? cfg.auths : [];
+      // 可扩展：优先走注册表定制 provider（如 workbuddy、cline），新增供应商仅需在 registry.js 注册
+      const { getCustomProviderFactory } = await import("../providers/registry.js");
+      const customFactory = await getCustomProviderFactory(gid, base);
+      if (customFactory) {
+        // auth 号型（workbuddy/traework/qoder）：无 keys 但 auth 目录有号也启用；baseUrl 可空
+        // （端点由各自 constants 决定，如 qoder 的 qoder://native）。
+        const hasAuthDocs = !keys.length && !auths.length ? (await loadAuthDocs(gid)).length > 0 : false;
+        if (!shouldEnableCustomProvider(gid, { keys, auths, hasAuthDocs })) continue;
+        try {
+          const provider = gid === "workbuddy"
+            ? await customFactory({ baseUrl: base || "https://copilot.tencent.com", apiKeys: keys, auths })
+            : gid === "traework"
+              ? await customFactory({ baseUrl: base || "https://trae-api-cn.mchost.guru", apiKeys: keys, auths })
+              : await customFactory({ id: gid, baseUrl: base, apiKeys: keys });
+          providers.push(provider);
+          console.log(`provider enabled: ${gid} (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base || provider.baseUrl} [custom]`);
+          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base || provider.baseUrl });
+          appendEvent({ type: "provider-state", provider: gid, state: "enabled", keys: keys.length, accounts: auths.length, baseUrl: base || provider.baseUrl });
+        } catch (err) {
+          console.log(`provider ${gid} failed: ${err?.message || err}`);
+          appendEvent({ ts: Date.now(), type: "provider-error", provider: gid, error: String(err?.message || err) });
+        }
+        continue;
+      }
+      if (!base || !keys.length) continue;
+      try {
+        const { createGenericProvider } = await import("../providers/generic.js");
+        providers.push(createGenericProvider({ id: gid, baseUrl: base, apiKeys: keys }));
+        console.log(`provider enabled: ${gid} (${keys.length} key${keys.length > 1 ? "s" : ""}) baseUrl=${base}`);
+        appendEvent({ ts: Date.now(), type: "provider-enabled", provider: gid, keys: keys.length, baseUrl: base });
+      } catch (err) {
+        console.log(`provider ${gid} failed: ${err?.message || err}`);
+        appendEvent({ ts: Date.now(), type: "provider-error", provider: gid, error: String(err?.message || err) });
+      }
+    }
+    if (!genericConfigs["workbuddy"]) {
+      const wbKeys = loadProviderKeys("workbuddy");
+      if (wbKeys.length) {
+        try {
+          const { createWorkbuddyProvider } = await import("../providers/workbuddy.js");
+          const wbAuths = loadProviderAuths("workbuddy");
+          providers.push(createWorkbuddyProvider({ apiKeys: wbKeys, auths: wbAuths }));
+          console.log(`provider enabled: workbuddy (${wbKeys.length} key${wbKeys.length > 1 ? "s" : ""}) baseUrl=https://copilot.tencent.com (env)`);
+          appendEvent({ ts: Date.now(), type: "provider-enabled", provider: "workbuddy", keys: wbKeys.length, baseUrl: "https://copilot.tencent.com" });
+          appendEvent({ type: "provider-state", provider: "workbuddy", state: "enabled", keys: wbKeys.length, accounts: wbAuths.length });
+        } catch (err) {
+          console.log(`provider workbuddy failed: ${err?.message || err}`);
+        }
+      }
+    }
+    const { createProviderDispatcher } = await import("../providers/dispatcher.js");
+    upstream = createProviderDispatcher(providers);
+    appendEvent({ ts: Date.now(), type: "providers", providers: providers.map((p) => p.id) });
+  }
+  const opencodeProvider = providers.find((p) => p.id === "opencode");
+  const models = createModelsService({
+    providers: providers.length > 1 ? providers : undefined,
+    baseUrl,
+    headers: upstream.headers || opencodeProvider?.upstream?.headers,
+    refreshMs: refreshIntervalMs(),
+    cacheFile: join(logDir(), "models.json"),
+  });
+  const auto = createAutoSelector({
+    cooldownMs: modelCooldownMs(),
+    slowCooldownMs: slowCooldownMs(),
+    file: defaultStateFile(),
+    loadCandidates: async () => {
+      try {
+        return (await models.get()).data.map((m) => m.id);
+      } catch {
+        return null;
+      }
+    },
+  });
+  const peers = createPeersService({ cooldownMs: peerCooldownMs(), limitCooldownMs: peerLimitCooldownMs(), heatMs: peerHeatMs() });
+  const groups = createGroupsService({});
+  const bans = createBansService({ windowMs: banWindowMs(), threshold: banThreshold() });
+
+  return { token, created, loadedPlugins, upstreamHooks, providerPlugin, upstream, providers, baseUrl, opencodeProvider, models, auto, peers, groups, bans };
+}

package/src/runtime/server-lifecycle.js

@@ -18,7 +18,7 @@ export async function startServerLifecycle({ VERSION, token, created, upstream,
     loadModelAliases();
   } catch {}
 
-  const router = createRouter({ token, upstream, models, auto, logs, peers, maxHops: maxHopsValue(), groups, bans, bus, plugins: loadedPlugins });
+  const router = createRouter({ token, upstream, models, auto, logs, peers, maxHops: maxHopsValue(), groups, bans, bus, plugins: loadedPlugins, version: VERSION });
   const listenHost = effectiveHost();
   const isDebug = process.env.MSLXDFF_DEBUG === "1";
   const srv = startServer({

package/src/server.js

@@ -1,78 +1,78 @@
-import { createServer as httpCreateServer } from "node:http";
-import { DEFAULT_PORT, getPort } from "./state.js";
-import { flushAgentLoop } from "./talk-full.js"; // 关停收尾：talk/full 捕获是异步队列落盘，退出前排空（空队列时近似 O(1)，且自身不抛）
-
-export function startServer({ router, signals = true, host, onBeforeClose }, port = resolvePort()) {
-  const listenHost = host ?? resolveHost();
-  const server = httpCreateServer((req, res) => {
-    router(req, res).catch((err) => {
-      res.statusCode = 500;
-      res.setHeader("Content-Type", "application/json");
-      res.end(JSON.stringify({ error: String(err?.message || err) }));
-    });
-  });
-
-  const ready = () =>
-    new Promise((resolve, reject) => {
-      server.on("error", reject);
-      if (listenHost) server.listen(port, listenHost, resolve);
-      else server.listen(port, resolve);
-    });
-
-  const close = async () => {
-    // 关停序列里唯一的新增步：先排空 agent 回路捕获（talk/full）的异步写队列，再走既有顺序
-    // （server:stop hook → server.close/closeAllConnections）。既有关停顺序语义一字未动；
-    // 队列空时 flush 即刻返回，且 flushAgentLoop 自身不抛（外层 try 只为兜住 import 侧意外）。
-    try { await flushAgentLoop(); } catch {}
-    // 插件 hook：server:stop — 关闭前触发（fire-and-forget，不阻塞关停）
-    try { await onBeforeClose?.(); } catch {}
-    await new Promise((resolve) => {
-      server.close(resolve);
-      // SSE debug streams keep connections open — force-close so shutdown
-      // never waits on them.
-      server.closeAllConnections?.();
-    });
-  };
-
-  if (signals) {
-    // 关停留痕（Linux 有效：可捕获 SIGTERM/SIGINT 并记录）。Windows 注意：process.kill 的
-    // SIGTERM 实为 TerminateProcess 强杀，被杀的 JS 进程收不到该事件，此处不会触发——
-    // Windows 的"谁杀了我"靠 src/daemon.js stopDaemon() 的杀者留痕 + 最后一条 heartbeat。
-    let stopping = false;
-    const onSignal = (sig) => {
-      if (stopping) return;
-      stopping = true;
-      try { console.log(`[lifecycle] ${sig} received — shutting down (pid ${process.pid}, uptime ${Math.round(process.uptime())}s)`); } catch {}
-      // 关停必须**真的退出**：warp-pool 的 wireproxy 子进程 stdio 是 pipe，活着的子进程会把事件循环钉住；
-      // 只 close() server（放开 8989）会留下「不监听端口却还活着」的幽灵 daemon
-      //（真机 2026-10-17：Oct16 起的幽灵与新版互杀 warp-pool 端口一整天，且它不在 daemon.pid 里，-restart 永远碰不到）。
-      // process.exit 会跑 exit 钩子（warp-pool 杀隧道、lifecycle 写遗书），故清理不会被跳过。
-      const hard = setTimeout(() => { try { console.log(`[lifecycle] ${sig} 优雅关停 8s 未完成 — 强制退出`); } catch {} process.exit(0); }, 8000);
-      hard.unref?.();
-      close().then(() => process.exit(0), (e) => { try { console.log(`[lifecycle] 关停抛错：${String(e?.message || e)}`); } catch {} process.exit(1); });
-    };
-    process.on("SIGINT", () => onSignal("SIGINT"));
-    process.on("SIGTERM", () => onSignal("SIGTERM"));
-  }
-
-  return { server, ready, close };
-}
-
-export function resolveHost() {
-  const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
-  if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
-  return "0.0.0.0";
-}
-
-export function resolvePort() {
-  // 8989 is the hard default. Port only changes via an explicit, mslxdff-owned
-  // override: the persisted `-port N` setting, or the MSLXDFF_PORT env var.
-  // Bare `PORT` is deliberately NOT read — an ssh session / wrapper script
-  // commonly injects it and would silently override the default.
-  const persisted = getPort();
-  if (persisted) return persisted;
-  const env = Number(process.env.MSLXDFF_PORT);
-  // 0 = OS-assigned ephemeral port (valid; used by tests/containers)
-  if (Number.isInteger(env) && env >= 0) return env;
-  return DEFAULT_PORT;
-}
+import { createServer as httpCreateServer } from "node:http";
+import { DEFAULT_PORT, getPort } from "./state.js";
+import { flushAgentLoop } from "./talk-full.js"; // 关停收尾：talk/full 捕获是异步队列落盘，退出前排空（空队列时近似 O(1)，且自身不抛）
+
+export function startServer({ router, signals = true, host, onBeforeClose }, port = resolvePort()) {
+  const listenHost = host ?? resolveHost();
+  const server = httpCreateServer((req, res) => {
+    router(req, res).catch((err) => {
+      res.statusCode = 500;
+      res.setHeader("Content-Type", "application/json");
+      res.end(JSON.stringify({ error: String(err?.message || err) }));
+    });
+  });
+
+  const ready = () =>
+    new Promise((resolve, reject) => {
+      server.on("error", reject);
+      if (listenHost) server.listen(port, listenHost, resolve);
+      else server.listen(port, resolve);
+    });
+
+  const close = async () => {
+    // 关停序列里唯一的新增步：先排空 agent 回路捕获（talk/full）的异步写队列，再走既有顺序
+    // （server:stop hook → server.close/closeAllConnections）。既有关停顺序语义一字未动；
+    // 队列空时 flush 即刻返回，且 flushAgentLoop 自身不抛（外层 try 只为兜住 import 侧意外）。
+    try { await flushAgentLoop(); } catch {}
+    // 插件 hook：server:stop — 关闭前触发（fire-and-forget，不阻塞关停）
+    try { await onBeforeClose?.(); } catch {}
+    await new Promise((resolve) => {
+      server.close(resolve);
+      // SSE debug streams keep connections open — force-close so shutdown
+      // never waits on them.
+      server.closeAllConnections?.();
+    });
+  };
+
+  if (signals) {
+    // 关停留痕（Linux 有效：可捕获 SIGTERM/SIGINT 并记录）。Windows 注意：process.kill 的
+    // SIGTERM 实为 TerminateProcess 强杀，被杀的 JS 进程收不到该事件，此处不会触发——
+    // Windows 的"谁杀了我"靠 src/daemon.js stopDaemon() 的杀者留痕 + 最后一条 heartbeat。
+    let stopping = false;
+    const onSignal = (sig) => {
+      if (stopping) return;
+      stopping = true;
+      try { console.log(`[lifecycle] ${sig} received — shutting down (pid ${process.pid}, uptime ${Math.round(process.uptime())}s)`); } catch {}
+      // 关停必须**真的退出**：warp-pool 的 wireproxy 子进程 stdio 是 pipe，活着的子进程会把事件循环钉住；
+      // 只 close() server（放开 8989）会留下「不监听端口却还活着」的幽灵 daemon
+      //（真机 2026-10-17：Oct16 起的幽灵与新版互杀 warp-pool 端口一整天，且它不在 daemon.pid 里，-restart 永远碰不到）。
+      // process.exit 会跑 exit 钩子（warp-pool 杀隧道、lifecycle 写遗书），故清理不会被跳过。
+      const hard = setTimeout(() => { try { console.log(`[lifecycle] ${sig} 优雅关停 8s 未完成 — 强制退出`); } catch {} process.exit(0); }, 8000);
+      hard.unref?.();
+      close().then(() => process.exit(0), (e) => { try { console.log(`[lifecycle] 关停抛错：${String(e?.message || e)}`); } catch {} process.exit(1); });
+    };
+    process.on("SIGINT", () => onSignal("SIGINT"));
+    process.on("SIGTERM", () => onSignal("SIGTERM"));
+  }
+
+  return { server, ready, close };
+}
+
+export function resolveHost() {
+  const envHost = process.env.MSLXDFF_HOST || process.env.MSLXDFF_BIND_HOST;
+  if (typeof envHost === "string" && envHost.trim()) return envHost.trim();
+  return "0.0.0.0";
+}
+
+export function resolvePort() {
+  // 8989 is the hard default. Port only changes via an explicit, mslxdff-owned
+  // override: the persisted `-port N` setting, or the MSLXDFF_PORT env var.
+  // Bare `PORT` is deliberately NOT read — an ssh session / wrapper script
+  // commonly injects it and would silently override the default.
+  const persisted = getPort();
+  if (persisted) return persisted;
+  const env = Number(process.env.MSLXDFF_PORT);
+  // 0 = OS-assigned ephemeral port (valid; used by tests/containers)
+  if (Number.isInteger(env) && env >= 0) return env;
+  return DEFAULT_PORT;
+}