@mininglamp-oss/octo-runtime 1.1.0 → 1.1.2

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/runner.js

@@ -1,94 +1,5 @@
 #!/usr/bin/env node
-// CLI 使用的独立 worker 入口：只加载显式 manifest 中的 Adapter，注册到唯一 AgentExecutor。
-// 通过 stdio NDJSON 为父 Kernel 提供执行；SDK 可用自有代码入口调用 serveWorker，毋须采用此 manifest。
-import { readFile } from "node:fs/promises";
-import { resolve } from "node:path";
-import { resolveAdapterModuleSpecifier } from "./module-specifier.js";
+// 通用清单 worker 不包含产品准备逻辑；SDK 自有 worker 原生 import 后直接调用 serveWorker。
+import { loadManifestAdapters } from "./manifest-adapters.js";
 import { serveWorker } from "./index.js";
-const index = process.argv.indexOf("--manifest");
-if (index < 0 || !process.argv[index + 1])
-    throw new Error("usage: octo-runtime-executor-kernel --manifest <file>");
-const manifestPath = resolve(process.argv[index + 1]);
-const rawManifest = JSON.parse(await readFile(manifestPath, "utf8"));
-const manifest = parseManifest(rawManifest);
-const adapters = [];
-for (const entry of manifest.adapters) {
-    const specifier = resolveAdapterModuleSpecifier(entry.module, manifestPath);
-    const loaded = await import(specifier);
-    const moduleExports = asRecord(loaded, `adapter module ${entry.module}`);
-    const exported = moduleExports[entry.exportName];
-    if (exported === undefined) {
-        throw new Error(`missing export ${entry.exportName} from ${entry.module}`);
-    }
-    // The manifest is a dynamic plugin boundary: validate the factory and adapter
-    // shape before handing the instance to the host for registration.
-    const instance = entry.factory ? callFactory(exported, entry.options, entry) : exported;
-    if (!isHostedAdapter(instance)) {
-        throw new TypeError(`${entry.module}#${entry.exportName} is not an Octo Runtime adapter`);
-    }
-    if (entry.type && instance.metadata.type !== entry.type) {
-        throw new Error(`manifest type ${entry.type} does not match adapter ${instance.metadata.type}`);
-    }
-    adapters.push(instance);
-}
-// JSON 是 CLI 的装配来源；注册、RPC 和退出清理与 SDK 的代码入口共用。
-serveWorker(adapters);
-/** Parse and validate the on-disk manifest. Only version 1 is supported; each
- * entry names a module, an export, whether that export is a factory, and options. */
-function parseManifest(value) {
-    const record = asRecord(value, "adapter manifest");
-    if (record.version !== 1)
-        throw new TypeError("adapter manifest.version must be 1");
-    if (!Array.isArray(record.adapters))
-        throw new TypeError("adapter manifest.adapters must be an array");
-    return {
-        version: 1,
-        adapters: record.adapters.map((item, position) => {
-            const entry = asRecord(item, `adapter manifest entry ${position}`);
-            const type = optionalString(entry.type);
-            return {
-                module: requiredString(entry.module, `adapters[${position}].module`),
-                exportName: optionalString(entry.export) ?? "default",
-                factory: entry.factory === true,
-                options: entry.options === undefined
-                    ? {}
-                    : asRecord(entry.options, `adapters[${position}].options`),
-                ...(type ? { type } : {})
-            };
-        })
-    };
-}
-function callFactory(value, options, entry) {
-    if (typeof value !== "function") {
-        throw new TypeError(`${entry.module}#${entry.exportName} is marked as a factory but is not callable`);
-    }
-    const factory = value;
-    return factory(options);
-}
-/** Structural type guard: only `metadata.type`, Agent sources and
- * an `invoke` method are required, so any conforming object can be a hosted adapter. */
-function isHostedAdapter(value) {
-    if (!isRecord(value) || !isRecord(value.metadata))
-        return false;
-    return (typeof value.metadata.type === "string" &&
-        Array.isArray(value.metadata.agentSources) &&
-        value.metadata.agentSources.length > 0 &&
-        value.metadata.agentSources.every((source) => source === "preset" || source === "provisioned") &&
-        typeof value.invoke === "function");
-}
-function asRecord(value, name) {
-    if (!isRecord(value))
-        throw new TypeError(`${name} must be an object`);
-    return value;
-}
-function isRecord(value) {
-    return value !== null && typeof value === "object" && !Array.isArray(value);
-}
-function requiredString(value, name) {
-    if (typeof value !== "string" || value.length === 0)
-        throw new TypeError(`${name} must be a non-empty string`);
-    return value;
-}
-function optionalString(value) {
-    return typeof value === "string" && value.length > 0 ? value : undefined;
-}
+serveWorker(await loadManifestAdapters());

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/serve.js

@@ -28,10 +28,29 @@ export function serveWorker(adapters, options = {}) {
     logging.kernel("info", "host.ready");
     // 父 Kernel 断开或停止时等待 Core 取消和清理；需要替换时由 Kernel 监督器重启相同入口。
     let stopping = false;
-    const stop = () => {
+    let drainedExitCode;
+    const stop = (holdForParent = false) => {
         if (stopping)
             return;
         stopping = true;
+        // Let the launcher reserve the full bounded drain only for a worker that handles EOF.
+        if (holdForParent && process.connected)
+            process.send?.({ type: "worker.stopping" }, () => { });
+        const finish = async (code) => {
+            await logging.close();
+            drainedExitCode = code;
+            if (holdForParent && process.connected) {
+                // Windows 的树清理需要 leader 仍存活。通知只表示排空完成，不代表后代已回收。
+                // IPC 保持引用直到 launcher 执行 taskkill；owner 断连仍走下方既有退出收尾。
+                process.channel?.ref();
+                process.send?.({ type: "worker.drained", cleanup: code === 0 ? "complete" : "incomplete" }, (error) => {
+                    if (error)
+                        process.exit(code || 1);
+                });
+            }
+            else
+                process.exit(code);
+        };
         void host.shutdown().then(async (result) => {
             if (result.cleanup === "incomplete") {
                 logging.kernel("error", "host.cleanup_incomplete", {
@@ -39,27 +58,32 @@ export function serveWorker(adapters, options = {}) {
                     unresolved_count: result.unresolvedInvocationIds.length
                 });
             }
-            await logging.close();
-            process.exit(result.cleanup === "complete" ? 0 : 1);
+            await finish(result.cleanup === "complete" ? 0 : 1);
         }, async () => {
-            await logging.close();
-            process.exit(1);
+            await finish(1);
         });
     };
-    process.once("SIGINT", stop);
-    process.once("SIGTERM", stop);
-    process.once("SIGHUP", stop);
-    process.stdin.once("end", stop);
-    process.stdin.once("close", stop);
+    process.once("SIGINT", () => stop());
+    process.once("SIGTERM", () => stop());
+    process.once("SIGHUP", () => stop());
+    process.stdin.once("end", () => stop(process.platform === "win32"));
+    process.stdin.once("close", () => stop(process.platform === "win32"));
     // 心跳必须由执行进程主事件循环处理；独立线程应答会掩盖执行线程阻塞。
     process.on("message", (message) => {
         if (message &&
             typeof message === "object" &&
             "type" in message &&
             message.type === "kernel.ping" &&
+            "probe" in message &&
+            Number.isSafeInteger(message.probe) &&
             process.connected) {
-            process.send?.({ type: "worker.pong" });
+            process.send?.({ type: "worker.pong", probe: message.probe });
         }
     });
-    process.once("disconnect", stop);
+    process.once("disconnect", () => {
+        if (drainedExitCode !== undefined)
+            process.exit(drainedExitCode);
+        else
+            stop();
+    });
 }

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/server.d.ts

@@ -1,9 +1,12 @@
 import { type AdapterProbeOptions } from "@mininglamp-oss/octo-runtime-adapter-sdk";
+import { type AdapterModuleEntry } from "@mininglamp-oss/octo-runtime-adapter-sdk/module-manifest";
 import { type KernelStatus } from "./types.js";
 export interface KernelServerOptions {
     endpoint: string;
     workerEntrypoint: string;
     manifest?: string;
+    /** CLI 装配快照；SDK 原生 worker 无需清单或此字段。 */
+    adapterModules?: AdapterModuleEntry[];
     env?: NodeJS.ProcessEnv;
     adapterConfigurations?: Record<string, AdapterProbeOptions>;
     stateDirectory?: string;
@@ -15,5 +18,5 @@ export interface KernelServerOptions {
  */
 export declare function startKernelServer(options: KernelServerOptions, signal?: AbortSignal): Promise<{
     status: () => KernelStatus;
-    close(): Promise<void>;
+    close(until?: number): Promise<void>;
 }>;

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/server.js

@@ -8,6 +8,7 @@ import { HostRunService } from "./host-run-service.js";
 import { WorkerSupervisor } from "./supervisor.js";
 import { acquireEndpoint } from "./endpoint.js";
 import { InvocationManifest } from "./invocation-manifest.js";
+import { readModuleManifest, resolveAdapterModules } from "@mininglamp-oss/octo-runtime-adapter-sdk/module-manifest";
 import { KernelError } from "./types.js";
 function validateParams(method, params) {
     const fields = {
@@ -71,9 +72,15 @@ function validateParams(method, params) {
  * 启动失败也执行回收；close 失败会保留所有权证据，客户端断开不等同于 owner 关闭。
  */
 export async function startKernelServer(options, signal) {
+    if (options.manifest && options.adapterModules !== undefined)
+        throw new TypeError("manifest and adapterModules are mutually exclusive");
+    // 文件仅在服务启动时读取一次；worker 自动恢复沿用快照，不因磁盘改动改变加载集合。
+    const adapterModules = options.manifest
+        ? resolveAdapterModules(await readModuleManifest(options.manifest, { legacy: true }))
+        : options.adapterModules;
     const instance = randomUUID();
     let manifest;
-    const worker = new WorkerSupervisor({ entrypoint: options.workerEntrypoint, manifest: options.manifest, env: options.env }, (pid) => manifest?.setWorker(pid, options.workerEntrypoint) ?? Promise.resolve());
+    const worker = new WorkerSupervisor({ entrypoint: options.workerEntrypoint, adapterModules, env: options.env }, (pid) => manifest?.setWorker(pid, options.workerEntrypoint) ?? Promise.resolve());
     const configure = (input) => {
         const type = contextItem(input.contexts, "octo.execution", "adapter")?.payload.type;
         return (options.configurations?.(typeof input.runMetadata?.runtimeId === "string" ? input.runMetadata.runtimeId : undefined) ?? options.adapterConfigurations)?.[typeof type === "string" ? type : "codex"];
@@ -312,7 +319,7 @@ export async function startKernelServer(options, signal) {
             }
         });
     });
-    const teardown = async () => {
+    const teardown = async (until = Date.now() + 5000) => {
         runs.beginDrain();
         for (const socket of sockets)
             socket.destroy();
@@ -330,9 +337,10 @@ export async function startKernelServer(options, signal) {
         if (listening)
             await attempt(() => new Promise((resolve) => server.close(() => resolve())));
         // 先终止 worker 才能让失联的源流结束，再清空 Run 缓存；每个资源仍独立尝试回收并汇总失败。
-        const workerStopped = await attempt(() => worker.close());
+        // 内部沿用服务截止时间，为清单和端点收尾预留时间；不重启一份独立关闭预算。
+        const workerStopped = await attempt(() => worker.close(until - 200));
         await attempt(() => runs.close());
-        // 进程未确认回收时保留身份清单和端点租约，禁止新实例覆盖所有权。
+        // An incomplete worker close retains ownership, including an observed executor cleanup failure.
         if (workerStopped) {
             await attempt(() => manifest?.close() ?? Promise.resolve());
             if (listening && process.platform !== "win32")
@@ -385,8 +393,8 @@ export async function startKernelServer(options, signal) {
     }
     return {
         status,
-        close() {
-            return (closing ??= teardown());
+        close(until) {
+            return (closing ??= teardown(until));
         }
     };
 }

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/service.js

@@ -5,6 +5,7 @@ import { beforeDeadline, ServiceInitializationError } from "./lifecycle.js";
 export function createKernelService(options) {
     const configuration = {
         ...options,
+        adapterModules: options.adapterModules && structuredClone(options.adapterModules),
         adapterConfigurations: options.adapterConfigurations && structuredClone(options.adapterConfigurations),
         env: options.env && { ...options.env }
     };
@@ -33,7 +34,7 @@ export function createKernelService(options) {
                 await beforeDeadline(starting?.catch(() => undefined) ?? Promise.resolve(), until);
                 if (startupFailure instanceof AggregateError)
                     throw startupFailure;
-                await beforeDeadline(server?.close() ?? Promise.resolve(), until);
+                await beforeDeadline(server?.close(until) ?? Promise.resolve(), until);
             }
             catch {
                 errors.push({ resource: "kernel", code: "KERNEL_CLEANUP_INCOMPLETE" });

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/supervisor.d.ts

@@ -1,6 +1,6 @@
 import { type SpawnWorkerOptions } from "./process.js";
 import type { KernelStatus } from "./types.js";
-/** Kernel 独占 worker 的创建与回收；清理失败时禁止启动替代实例。 */
+/** Kernel exclusively owns worker replacement; incomplete cleanup prevents a second owner. */
 export declare class WorkerSupervisor {
     #private;
     private readonly options;
@@ -9,5 +9,5 @@ export declare class WorkerSupervisor {
     get status(): KernelStatus["worker"];
     get client(): import("./rpc.js").WorkerRpcClient;
     start(signal?: AbortSignal): Promise<void>;
-    close(): Promise<void>;
+    close(until?: number): Promise<void>;
 }

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/dist/supervisor.js

@@ -1,6 +1,7 @@
-import { spawnWorker } from "./process.js";
+import { closeWorker, spawnWorker } from "./process.js";
 import { KernelError } from "./types.js";
-/** Kernel 独占 worker 的创建与回收；清理失败时禁止启动替代实例。 */
+import { WorkerHeartbeat } from "./heartbeat.js";
+/** Kernel exclusively owns worker replacement; incomplete cleanup prevents a second owner. */
 export class WorkerSupervisor {
     options;
     recordWorker;
@@ -11,12 +12,13 @@ export class WorkerSupervisor {
     #closing = false;
     #recovery;
     #timer;
-    #lastPong = 0;
-    #pendingPing = false;
-    #stableSince = 0;
+    #heartbeat;
+    #activeTime = 0;
     #attempts = [];
+    #slowRecovery = false;
     #abort = new AbortController();
     #cleanupFailure;
+    #closeUntil;
     constructor(options, recordWorker) {
         this.options = options;
         this.recordWorker = recordWorker;
@@ -63,35 +65,44 @@ export class WorkerSupervisor {
             throw error;
         }
         if (this.#closing) {
-            await worker.close();
+            try {
+                await closeWorker(worker, this.#closeUntil ?? Date.now() + 5000, true);
+            }
+            catch (error) {
+                // A late startup still owns resources; failed rollback must block every future replacement.
+                throw (this.#cleanupFailure = new AggregateError([error], "WORKER_CLEANUP_INCOMPLETE"));
+            }
             return;
         }
         this.#worker = worker;
         this.#generation++;
         this.#state = "ready";
-        this.#stableSince = Date.now();
-        this.#lastPong = Date.now();
-        this.#pendingPing = false;
+        const heartbeat = new WorkerHeartbeat();
+        this.#heartbeat = heartbeat;
+        let elapsed = 0;
         worker.child.on("message", (message) => {
             if (this.#worker === worker &&
                 message &&
                 typeof message === "object" &&
                 "type" in message &&
                 message.type === "worker.pong") {
-                this.#lastPong = Date.now();
-                this.#pendingPing = false;
+                heartbeat.pong("probe" in message ? message.probe : undefined);
             }
         });
         worker.child.once("exit", () => this.#failed(worker));
         worker.child.once("error", () => this.#failed(worker));
         this.#timer = setInterval(() => {
-            if (Date.now() - this.#lastPong >= 5000) {
+            if (this.#closing || this.#worker !== worker || this.#state !== "ready")
+                return;
+            const probe = heartbeat.tick();
+            this.#activeTime += heartbeat.activeMs - elapsed;
+            elapsed = heartbeat.activeMs;
+            if (probe.type === "expired") {
                 this.#failed(worker);
                 return;
             }
-            if (!this.#pendingPing && worker.child.connected) {
-                this.#pendingPing = true;
-                worker.child.send({ type: "kernel.ping" }, (error) => {
+            if (probe.type === "ping" && worker.child.connected) {
+                worker.child.send({ type: "kernel.ping", probe: probe.id }, (error) => {
                     if (error)
                         this.#failed(worker);
                 });
@@ -106,31 +117,39 @@ export class WorkerSupervisor {
             return;
         clearInterval(this.#timer);
         this.#state = "recovering";
-        // 先拒绝原 RPC，让 Run 源生成唯一 lost 终态；恢复只允许新 Run。
+        // Reject the old RPC first so its source emits one lost terminal. Recovery admits new work only.
         worker.client.close(new KernelError("WORKER_LOST"));
-        if (Date.now() - this.#stableSince >= 60_000) {
+        if ((this.#heartbeat?.healthyMs ?? 0) >= 60_000) {
             this.#attempts = [];
             this.#attempt = 0;
+            this.#slowRecovery = false;
         }
-        this.#recovery = this.#recover(worker).catch(() => {
-            this.#state = "exhausted";
+        this.#recovery = this.#recover(worker).catch((error) => {
+            // Only unconfirmed cleanup or ownership ends recovery; ordinary startup failures stay retryable.
+            this.#cleanupFailure ??= new AggregateError([error], "WORKER_RECOVERY_BLOCKED");
+            if (!this.#closing)
+                this.#state = "exhausted";
         });
     }
     async #recover(worker) {
-        // 旧 worker 清理成功才允许替换，避免两个 Provider 实例并行持有同一执行资源。
-        // 只恢复服务可用性，不重放旧 Run；旧流已由 #failed 标为 lost。
-        await worker.close();
+        // Reap the old worker before replacement to prevent concurrent Provider owners.
+        // Restore service availability only; #failed already marked old runs lost and never replays them.
+        // Preserve baseline recovery for leaders that exited before close began. On Windows this
+        // path cannot verify detached descendants; EOF-close checks require a live leader at entry.
+        if (worker.child.exitCode !== null || worker.child.signalCode !== null)
+            await worker.close();
+        else
+            await closeWorker(worker, Date.now() + 4800, true);
         await this.recordWorker?.(undefined);
         this.#worker = undefined;
-        for (let attempt = 0; attempt < 3; attempt++) {
-            if (this.#closing)
-                return;
-            this.#attempts = this.#attempts.filter((at) => Date.now() - at < 60_000);
+        while (!this.#closing) {
+            // Suspend time and clock changes must not replenish a recently exhausted restart budget.
+            this.#attempts = this.#attempts.filter((at) => this.#activeTime - at < 60_000);
             if (this.#attempts.length >= 3)
-                break;
-            const delay = [250, 1000, 4000][this.#attempts.length];
-            this.#attempts.push(Date.now());
-            this.#attempt++;
+                this.#slowRecovery = true;
+            // Exhausting the fast budget opens a bounded-rate recovery loop, not a permanent outage.
+            // Keep slow recovery across short-lived workers until 60 seconds of health is observed.
+            const delay = this.#slowRecovery ? 15_000 : [250, 1000, 4000][this.#attempts.length];
             await new Promise((resolve) => {
                 const finish = () => {
                     clearTimeout(timer);
@@ -142,6 +161,9 @@ export class WorkerSupervisor {
             });
             if (this.#closing)
                 return;
+            if (!this.#slowRecovery)
+                this.#attempts.push(this.#activeTime);
+            this.#attempt = Math.min(Number.MAX_SAFE_INTEGER, this.#attempt + 1);
             try {
                 await this.#spawn();
                 return;
@@ -149,17 +171,18 @@ export class WorkerSupervisor {
             catch (error) {
                 if (error instanceof AggregateError)
                     throw error;
-                /* 普通启动失败已回收；聚合清理错误禁止继续替换。 */
+                /* Ordinary startup failures are reaped; aggregate cleanup failures prevent replacement. */
             }
         }
-        this.#state = "exhausted";
     }
-    async close() {
+    async close(until = Date.now() + 5000) {
         this.#closing = true;
+        this.#closeUntil ??= until;
         this.#abort.abort();
         clearInterval(this.#timer);
         await this.#recovery;
-        await this.#worker?.close();
+        if (this.#worker)
+            await closeWorker(this.#worker, this.#closeUntil);
         if (this.#cleanupFailure)
             throw this.#cleanupFailure;
         await this.recordWorker?.(undefined);

package/node_modules/@mininglamp-oss/octo-runtime-executor-kernel/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mininglamp-oss/octo-runtime-executor-kernel",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "private": true,
   "type": "module",
   "exports": {
@@ -8,27 +8,19 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
+    "./manifest-adapters": {
+      "types": "./dist/manifest-adapters.d.ts",
+      "import": "./dist/manifest-adapters.js"
+    },
     "./runner": {
       "types": "./dist/runner.d.ts",
       "import": "./dist/runner.js"
     }
   },
   "dependencies": {
-    "@mininglamp-oss/octo-runtime-executor-core": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-antigravity": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-claude-code": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-codebuddy": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-codex": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-hermes": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-kimi-code": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-mcode": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-openclaw": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-opencode": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-qodercli": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-qoderclicn": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-zcode-gui": "1.1.0",
-    "@mininglamp-oss/octo-runtime-protocol": "1.1.0",
-    "@mininglamp-oss/octo-runtime-adapter-sdk": "1.1.0"
+    "@mininglamp-oss/octo-runtime-executor-core": "1.1.2",
+    "@mininglamp-oss/octo-runtime-protocol": "1.1.2",
+    "@mininglamp-oss/octo-runtime-adapter-sdk": "1.1.2"
   },
   "types": "./dist/index.d.ts",
   "files": [

package/node_modules/@mininglamp-oss/octo-runtime-extra-channel-gateway/config-schema.json

@@ -6,12 +6,12 @@
   "$comment": "声明文件最多 1 MiB，POSIX 权限须为 0600；单 Bot JSON 最多 256 KiB。Bot 按规范化 api_url 与 bot_id 组合判重。路径可访问性、凭据、身份和 Space 授权、重试起点不大于上限等关系仍需运行时检查。Context 内部对象遵循 octo.context-envelope/v3，具体协议约束由现有运行时校验，本文件不重复展开。",
   "type": "object",
   "additionalProperties": false,
-  "required": ["module", "config"],
+  "required": ["config"],
   "properties": {
     "module": {
       "type": "string",
       "const": "@mininglamp-oss/octo-runtime-extra-channel-gateway",
-      "description": "必填。Octo IM Extra 的固定包入口；宿主须预先安装并确保模块可解析。此 schema 约束包名声明，宿主通过绝对路径加载同一模块时可自行调整该约束。插件实例名及 CLI 配置目录名为 channel-gateway。"
+      "description": "可选旧声明。CLI 从 manifest.json 选择模块；省略时使用有效清单，保留时须与清单文字一致。SDK 原生 import 不需要此字段。此 schema 约束固定包名，宿主使用其他公开路径时可自行调整。"
     },
     "enabled": {
       "type": "boolean",

package/node_modules/@mininglamp-oss/octo-runtime-extra-channel-gateway/dist/application/im-channel.js

@@ -49,7 +49,6 @@ export class ImRuntime {
     #busyNotifications = new Map();
     #busyNotifiedAt = new Map();
     #retry = 0;
-    #everOnline = false;
     #disconnecting;
     constructor(config, dependencies) {
         this.dependencies = dependencies;
@@ -110,7 +109,6 @@ export class ImRuntime {
             this.dependencies.signal?.addEventListener("abort", this.#ownerStopped, { once: true });
             this.#delivery = new ImDeliveryDispatcher(this.#signal);
         }
-        this.#everOnline = false;
         this.#retry = 0;
         this.#error = undefined;
         this.#state = "connecting";
@@ -125,6 +123,9 @@ export class ImRuntime {
     async #connect(recovering) {
         if (this.#closed || this.#draining || this.#signal.aborted)
             return;
+        this.#log(recovering ? "channel.retry_started" : "channel.connecting", {
+            attempt: this.#retry
+        });
         this.#connectionAbort?.abort();
         try {
             await this.#disconnecting;
@@ -134,7 +135,7 @@ export class ImRuntime {
             this.#state = this.#closed ? "stopped" : "failed";
             if (!this.#closed)
                 this.#error = "IM_DISPOSE_FAILED";
-            this.#everOnline = false;
+            this.#diagnostic("IM_DISPOSE_FAILED");
             return;
         }
         if (this.#closed || this.#draining || this.#signal.aborted)
@@ -183,7 +184,6 @@ export class ImRuntime {
             if (disconnected)
                 throw disconnected;
             starting = false;
-            this.#everOnline = true;
             this.#state = "online";
             this.#log("channel.connected", { state: "online" });
             this.#error = undefined;
@@ -196,21 +196,19 @@ export class ImRuntime {
             const failure = connectionFailure(error);
             this.#connectionAbort.abort();
             this.#error = failure.message;
-            const retry = recovering && this.#everOnline && failure.retryable;
+            // Offline startup and later disconnects share recovery; only error semantics decide eligibility.
+            const retry = failure.retryable;
             this.#state = retry ? "retrying" : "failed";
             this.#log("channel.connection_failed", { state: this.#state, code: failure.message });
             try {
                 await connector.close();
             }
             catch {
-                this.#everOnline = false;
                 if (!this.#closed)
                     this.#state = "failed";
                 this.#diagnostic("IM_DISPOSE_FAILED");
                 return;
             }
-            if (!retry)
-                this.#everOnline = false;
             if (retry)
                 this.#scheduleReconnect(failure.retryAfterMs);
         }
@@ -218,12 +216,10 @@ export class ImRuntime {
     #lostConnection(connector, failure) {
         this.#log("channel.disconnected", { code: failure.message });
         this.#error = failure.message;
-        const retry = this.#everOnline && failure.retryable;
+        const retry = failure.retryable;
         this.#state = retry ? "retrying" : "failed";
-        if (!retry)
-            this.#everOnline = false;
         this.#connectionAbort?.abort();
-        // 先收回旧连接资源，再计时；停止信号与迟到回调不能建立第二条连接。
+        // Reap the old connection before backoff; shutdown and stale callbacks cannot create a second owner.
         this.#disconnecting = connector.close();
         void this.#disconnecting.then(() => {
             if (retry)
@@ -231,7 +227,6 @@ export class ImRuntime {
         }, () => {
             if (!this.#closed)
                 this.#state = "failed";
-            this.#everOnline = false;
             this.#diagnostic("IM_DISPOSE_FAILED");
         });
     }
@@ -242,9 +237,14 @@ export class ImRuntime {
             this.#state !== "retrying" ||
             this.#reconnect)
             return;
-        const delayMs = Math.max(Math.min(30_000, 5_000 * 2 ** this.#retry), retryAfterMs);
-        this.#retry = Math.min(3, this.#retry + 1);
-        // Node 超过 2^31-1 的 timeout 会变为 1ms；长 Retry-After 分段等待，不能绕过限流。
+        const delayMs = Math.max([5_000, 10_000, 15_000][Math.min(2, this.#retry)], retryAfterMs);
+        this.#retry = Math.min(Number.MAX_SAFE_INTEGER, this.#retry + 1);
+        this.#log("channel.retry_scheduled", {
+            state: "retrying",
+            delay_ms: delayMs,
+            attempt: this.#retry
+        });
+        // Node clamps oversized timers to 1ms. Partition long Retry-After waits without bypassing throttling.
         const deadline = performance.now() + delayMs;
         const wake = () => {
             if (this.#closed || this.#draining || this.#signal.aborted || this.#state !== "retrying")
@@ -744,7 +744,8 @@ export class ImRuntime {
                     ? undefined
                     : await this.dependencies.prepareContexts?.(this.config, turnSignal),
                 initialSession,
-                mentionGuidance: initialSession || !executionSession.providerSession,
+                // 逐轮提醒让升级前的 Provider binding 也收到新 mention 规则，不隐式 reset。
+                mentionGuidance: true,
                 ...(gapEnabled
                     ? {
                         historyGap: gapPlan,
@@ -1069,7 +1070,6 @@ export class ImRuntime {
         this.#state = "stopped";
         this.#log("channel.stopped", { state: "stopped" });
         this.#error = undefined;
-        this.#everOnline = false;
         this.#retry = 0;
         for (const preparation of this.#preparing.values())
             preparation.abort();

package/node_modules/@mininglamp-oss/octo-runtime-extra-channel-gateway/dist/contracts.d.ts

@@ -57,6 +57,7 @@ export interface ImInboundMessage {
     position?: {
         messageSeq: number;
     };
+    /** 同代次卡片重试：buildContext 返回 Gateway 已组合的冻结快照，不再采集或追加默认项。 */
     historyRetry?: boolean;
     bindHistoryTurn?(token: ImGapTurnToken): void;
     markRead?(signal: AbortSignal): Promise<void>;