@zhin.js/mcp-feature 1.0.6 → 1.0.9

package/README.md

@@ -47,7 +47,7 @@ old lease = 0:     previous.stop()
 rollback:          candidate.stop()
 ```
 
-MCP 没有入站 admission，因此候选连接不 quiesce 旧 client。旧 turn 可继续通过旧 projection 完成在途调用；新 turn 只看到已启动并已提交的新 client。要求排他连接时，应把连接资源提升到 Plugin Resource handoff。
+MCP 候选连接不会触碰旧 client。旧 turn 继续通过旧 projection 与 snapshot lease 完成在途调用；新 turn 只看到已启动并已提交的新 client。要求排他连接时，连接必须由 Process Host 持有，并让 generation 只原子切换逻辑路由，不能在 shadow prepare 中抢占旧连接。
 
 `McpIndex` 对连接使用 owner inheritance。动态工具名由 client 返回；orchestrator 可投影为 `{connection}__{tool}`，但该模型命名不改变 Capability identity。
 

package/lib/definition.d.ts

@@ -6,7 +6,7 @@ export interface McpToolDescriptor {
     readonly inputSchema?: unknown;
 }
 export interface McpClientInstance {
-    start?(): void | Promise<void>;
+    start?(signal: AbortSignal): void | Promise<void>;
     stop?(): void | Promise<void>;
     listTools(): readonly McpToolDescriptor[] | Promise<readonly McpToolDescriptor[]>;
     callTool(name: string, input: unknown): unknown | Promise<unknown>;

package/lib/mcp-index.d.ts

@@ -10,10 +10,10 @@ export interface McpDescriptor {
 export declare class McpIndex {
     #private;
     private constructor();
-    static create(slots: readonly Readonly<CapabilitySlot<McpDefinition>>[], snapshot: RuntimeSnapshot): Promise<McpIndex>;
+    static create(slots: readonly Readonly<CapabilitySlot<McpDefinition>>[], snapshot: RuntimeSnapshot, signal: AbortSignal): Promise<McpIndex>;
     list(): readonly McpDescriptor[];
     visible(requester: PluginId): readonly McpDescriptor[];
-    start(): Promise<void>;
+    start(signal: AbortSignal): Promise<void>;
     stop(): Promise<void>;
     listTools(requester: PluginId, name: string): Promise<readonly McpToolDescriptor[]>;
     callTool<TResult = unknown>(requester: PluginId, connection: string, tool: string, input: unknown): Promise<TResult>;

package/lib/mcp-index.js

@@ -11,12 +11,14 @@ export class McpIndex {
         for (const record of records)
             this.#records.set(record.entry.slot.id, record);
     }
-    static async create(slots, snapshot) {
+    static async create(slots, snapshot, signal) {
         const index = new OwnerCapabilityIndex(slots, snapshot);
         const records = [];
         try {
             for (const entry of index.entries()) {
-                const client = await entry.slot.definition.create(createCapabilityContext(snapshot, entry.owner));
+                signal.throwIfAborted();
+                const client = await entry.slot.definition.create(createCapabilityContext(snapshot, entry.owner, undefined, signal));
+                signal.throwIfAborted();
                 assertMcpClient(client, entry.source);
                 records.push({ entry, client, started: false, stopped: false });
             }
@@ -33,14 +35,16 @@ export class McpIndex {
     visible(requester) {
         return this.#index.visible(requester).map(toDescriptor);
     }
-    async start() {
+    async start(signal) {
         const started = [];
         try {
             for (const record of this.#order) {
                 if (record.started)
                     continue;
+                signal.throwIfAborted();
                 started.push(record);
-                await record.client.start?.();
+                await record.client.start?.(signal);
+                signal.throwIfAborted();
                 record.started = true;
                 record.stopped = false;
             }
@@ -92,7 +96,7 @@ async function stopRecords(records, primary) {
             continue;
         stack.add(async () => {
             // 先 await stop 成功再标记 stopped：stop 失败时保持未标记，
-            // 下次 stop()（或代际 resume 后的再次 quiesce）可重试，不会永久泄漏。
+            // 下次 stop() 可重试，不会因一次失败永久泄漏。
             await record.client.stop?.();
             record.started = false;
             record.stopped = true;

package/lib/provider.js

@@ -17,29 +17,19 @@ const mcpFeature = defineFeatureProvider({
     },
     runtime: {
         async project(slots, context) {
-            const index = await McpIndex.create(slots, context.snapshot);
-            let previousIndex;
+            const index = await McpIndex.create(slots, context.snapshot, context.signal);
             return {
                 value: index,
                 dispose: () => index.stop(),
                 handoff: {
-                    // 先停旧代连接再激活新代：独占端口型 server 热重载不会新旧并存。
-                    quiescePrevious(previous) {
-                        previousIndex = previousMcpIndex(previous);
-                        return previousIndex?.stop();
-                    },
-                    activateNext: () => index.start(),
+                    // Candidate connections become ready before publication. The old
+                    // index stays usable until its snapshot's final lease drains.
+                    activateNext: (signal) => index.start(signal),
                     deactivateNext: () => index.stop(),
-                    resumePrevious() {
-                        return previousIndex?.start();
-                    },
                 },
             };
         },
     },
 });
-function previousMcpIndex(snapshot) {
-    return snapshot.projections.get(mcpFeatureId);
-}
 export { mcpFeature };
 export default mcpFeature;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/mcp-feature",
-  "version": "1.0.6",
+  "version": "1.0.9",
   "description": "Convention-based MCP client Feature for Zhin Plugin Runtime",
   "type": "module",
   "main": "./lib/index.js",
@@ -17,8 +17,8 @@
     "src"
   ],
   "dependencies": {
-    "@zhin.js/feature-kit": "1.0.6",
-    "@zhin.js/plugin-runtime": "1.1.3"
+    "@zhin.js/feature-kit": "1.0.9",
+    "@zhin.js/plugin-runtime": "1.1.6"
   },
   "devDependencies": {
     "@types/node": "^26.1.2",

package/src/definition.ts

@@ -9,7 +9,7 @@ export interface McpToolDescriptor {
 }
 
 export interface McpClientInstance {
-  start?(): void | Promise<void>;
+  start?(signal: AbortSignal): void | Promise<void>;
   stop?(): void | Promise<void>;
   listTools(): readonly McpToolDescriptor[] | Promise<readonly McpToolDescriptor[]>;
   callTool(name: string, input: unknown): unknown | Promise<unknown>;

package/src/mcp-index.ts

@@ -48,14 +48,17 @@ export class McpIndex {
   static async create(
     slots: readonly Readonly<CapabilitySlot<McpDefinition>>[],
     snapshot: RuntimeSnapshot,
+    signal: AbortSignal,
   ): Promise<McpIndex> {
     const index = new OwnerCapabilityIndex(slots, snapshot);
     const records: McpRecord[] = [];
     try {
       for (const entry of index.entries()) {
+        signal.throwIfAborted();
         const client = await entry.slot.definition.create(
-          createCapabilityContext(snapshot, entry.owner),
+          createCapabilityContext(snapshot, entry.owner, undefined, signal),
         );
+        signal.throwIfAborted();
         assertMcpClient(client, entry.source);
         records.push({ entry, client, started: false, stopped: false });
       }
@@ -74,13 +77,15 @@ export class McpIndex {
     return this.#index.visible(requester).map(toDescriptor);
   }
 
-  async start(): Promise<void> {
+  async start(signal: AbortSignal): Promise<void> {
     const started: McpRecord[] = [];
     try {
       for (const record of this.#order) {
         if (record.started) continue;
+        signal.throwIfAborted();
         started.push(record);
-        await record.client.start?.();
+        await record.client.start?.(signal);
+        signal.throwIfAborted();
         record.started = true;
         record.stopped = false;
       }
@@ -139,7 +144,7 @@ async function stopRecords(records: readonly McpRecord[], primary?: unknown): Pr
     if (record.stopped) continue;
     stack.add(async () => {
       // 先 await stop 成功再标记 stopped：stop 失败时保持未标记，
-      // 下次 stop()（或代际 resume 后的再次 quiesce）可重试，不会永久泄漏。
+      // 下次 stop() 可重试，不会因一次失败永久泄漏。
       await record.client.stop?.();
       record.started = false;
       record.stopped = true;

package/src/provider.ts

@@ -1,4 +1,4 @@
-import { featureId, type RuntimeSnapshot } from '@zhin.js/plugin-runtime';
+import { featureId } from '@zhin.js/plugin-runtime';
 import { defineFeatureProvider, typeScriptModules } from '@zhin.js/feature-kit';
 import { parseMcpDefinition } from './definition.js';
 import { McpIndex } from './mcp-index.js';
@@ -19,31 +19,20 @@ const mcpFeature = defineFeatureProvider({
   },
   runtime: {
     async project(slots, context) {
-      const index = await McpIndex.create(slots, context.snapshot);
-      let previousIndex: McpIndex | undefined;
+      const index = await McpIndex.create(slots, context.snapshot, context.signal);
       return {
         value: index,
         dispose: () => index.stop(),
         handoff: {
-          // 先停旧代连接再激活新代：独占端口型 server 热重载不会新旧并存。
-          quiescePrevious(previous) {
-            previousIndex = previousMcpIndex(previous);
-            return previousIndex?.stop();
-          },
-          activateNext: () => index.start(),
+          // Candidate connections become ready before publication. The old
+          // index stays usable until its snapshot's final lease drains.
+          activateNext: (signal) => index.start(signal),
           deactivateNext: () => index.stop(),
-          resumePrevious() {
-            return previousIndex?.start();
-          },
         },
       };
     },
   },
 });
 
-function previousMcpIndex(snapshot: RuntimeSnapshot): McpIndex | undefined {
-  return snapshot.projections.get(mcpFeatureId) as McpIndex | undefined;
-}
-
 export { mcpFeature };
 export default mcpFeature;