ycodium-acp-executor 0.2.3254 → 0.2.3265

package/dist/connection.d.ts

@@ -49,6 +49,10 @@ export type AcpConnection = {
     begin<T = unknown>(method: string, params?: unknown, promptId?: string): AcpPendingRequest<T>;
     notify(method: string, params?: unknown): Promise<void>;
     awaitInboundIdle(): Promise<void>;
+    /**
+     * 丢掉还在等的请求，不关连接。刷新期限到了用它：晚到的应答没有等待方，直接忽略。
+     */
+    abandonPending(error: unknown): void;
     close(error?: unknown): Promise<void>;
     readonly closed: Promise<void>;
 };

package/dist/connection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}

package/dist/connection.js

@@ -379,11 +379,15 @@ export function createAcpConnection(options) {
         });
     };
     const close = (error) => shutdown(error ?? new AcpConnectionClosedError());
+    const abandonPending = (error) => {
+        rejectPending(error);
+    };
     return {
         request,
         begin,
         notify,
         awaitInboundIdle,
+        abandonPending,
         close,
         closed,
     };

package/dist/connection.js.map

@@ -1 +1 @@
-{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,YAAY,GAOb,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,aAAa,CAAC;AAE1C,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EACL,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AA+C1D,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AACtC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAEtC,SAAS,OAAO,CAAC,KAAc;IAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IACD,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QAChC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,SAAS,CAAC,wCAAwC,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,SAAS,iBAAiB,CAAC,SAAqB;IAC9C,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAC;IACrD,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC5C,OAAO,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,KAAK,IAAI,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAwBD,MAAM,UAAU,mBAAmB,CAAC,OAA6B;IAC/D,MAAM,UAAU,GAAG,IAAI,eAAe,EAA0B,CAAC;IACjE,MAAM,UAAU,GAAG,UAAU,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IACnD,MAAM,MAAM,GAAG,YAAY,CACzB,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAA+B,EACzE,UAAU,CAAC,QAAQ,CACpB,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC7C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IAC7C,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,GAAG,EAA0B,CAAC;IAClD,MAAM,WAAW,GAAsB,EAAE,CAAC;IAE1C,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,IAAI,OAAkC,CAAC;IACvC,IAAI,WAAgC,CAAC;IACrC,IAAI,WAAW,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAEpC,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAQ,CAAC;IAElF,MAAM,aAAa,GAAG,CAAC,KAAc,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,OAAO,CAAC,KAAK,EAAE,CAAC;QAChB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,GAAG,EAAE;QAC9B,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACtC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,MAAM,EAAE,CAAC;QACX,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,iBAAiB,GAAG,GAAG,EAAE;QAC7B,cAAc,IAAI,CAAC,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,GAAG,EAAE;QAC3B,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,cAAc,GAAG,CAAC,CAAC,CAAC;QACjD,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;YACzB,kBAAkB,EAAE,CAAC;QACvB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,CAAC,KAA0B,EAAE,EAAE;QACzC,OAAO,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EAAE,OAAmB,EAAE,EAAE;QACjD,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACnE,MAAM,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,GAAG,EAAE;QACxB,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,MAAM,WAAW,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAE,EAAE;QAClC,IAAI,OAAO,EAAE,CAAC;YACZ,OAAO,OAAO,CAAC;QACjB,CAAC;QACD,WAAW,GAAG,KAAK,CAAC;QACpB,OAAO,GAAG,CAAC,KAAK,IAAI,EAAE;YACpB,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,kBAAkB,EAAE,CAAC;YACrB,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACrC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;YACnC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACvC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;YAC/C,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAAC,MAAM,CAAC;gBACP,gCAAgC;YAClC,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,gDAAgD;YAClD,CAAC;YACD,IAAI,CAAC;gBACH,MAAM,QAAQ,CAAC,KAAK,EAAE,CAAC;YACzB,CAAC;YAAC,MAAM,CAAC;gBACP,yCAAyC;YAC3C,CAAC;YACD,aAAa,EAAE,CAAC;QAClB,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,OAAO,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;QACrE,IAAI,MAAM,KAAK,gBAAgB,EAAE,CAAC;YAChC,MAAM,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;YAC5C,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;gBACjC,GAAG,CAAC;oBACF,SAAS,EAAE,UAAU;oBACrB,KAAK,EAAE,eAAe;oBACtB,OAAO,EAAE;wBACP,SAAS,EAAE,6BAA6B;wBACxC,MAAM;wBACN,OAAO,EAAE,SAAS;qBACnB;iBACF,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC7B,GAAG,CAAC;oBACF,SAAS,EAAE,UAAU;oBACrB,KAAK,EAAE,eAAe;oBACtB,OAAO,EAAE;wBACP,SAAS,EAAE,6BAA6B;wBACxC,MAAM;wBACN,OAAO,EAAE,WAAW;qBACrB;iBACF,CAAC,CAAC;YACL,CAAC;YACD,MAAM,YAAY,GAA4B;gBAC5C,MAAM,EAAE,gBAAgB;gBACxB,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,QAAQ,EAAE,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK;aAC3D,CAAC;YACF,IAAI,CAAC;gBACH,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,CAAC;YAC/C,CAAC;YAAC,MAAM,CAAC;gBACP,mDAAmD;YACrD,CAAC;YACD,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QACrD,CAAC;QAAC,MAAM,CAAC;YACP,+CAA+C;QACjD,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,EAAa,EAAE,MAAc,EAAE,MAAe,EAAE,EAAE;QAC/E,IAAI,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;gBACvB,MAAM,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YAC5C,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACvD,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,IAAI,EAAE,CAAC,CAAC;QACrE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,QAAQ,GACZ,KAAK,YAAY,YAAY;gBAC3B,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACzF,MAAM,YAAY,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC;QAChF,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,CAAC,EAAa,EAAE,OAAgC,EAAE,EAAE;QAC3E,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;QACvB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC;YACH,OAAO,CAAC,UAAU,EAAE,CAClB,MAAM,EACN,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC;gBAC7B,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;gBAC7B,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE,CAClC,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,gBAAgB;QAClB,CAAC;QACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC;YACpC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACpD,MAAM,CAAC,MAAM,CACX,QAAQ;gBACN,CAAC,CAAC,QAAQ,CAAC,IAAI,KAAK,SAAS;oBAC3B,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;oBACnD,CAAC,CAAC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC;gBACpE,CAAC,CAAC,YAAY,CAAC,aAAa,CAAC,mCAAmC,CAAC,CACpE,CAAC;YACF,OAAO;QACT,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,MAAM,eAAe,GAAG,KAAK,EAAE,OAAgB,EAAE,EAAE;QACjD,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;QACnE,IAAI,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/B,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,qBAAqB,CAAC,OAAO,CAAC,EAAE,CAAC;YACnC,MAAM,oBAAoB,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,eAAe,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EAAE,KAAsC,EAAE,EAAE;QACpE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;YACD,OAAO;QACT,CAAC;QACD,MAAM,eAAe,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEF,MAAM,YAAY,GAAG,KAAK,EAAE,KAAa,EAAE,EAAE;QAC3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC9C,IAAI,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBAChC,OAAO;YACT,CAAC;YACD,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,KAAK,EAAE,KAAiB,EAAE,EAAE;QAC9C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;YAChD,IAAI,OAAO,EAAE,CAAC;gBACZ,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QACD,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,MAAM,CAAC;QACxD,MAAM,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;YACnB,OAAO;QACT,CAAC;QACD,iBAAiB,EAAE,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC;gBAAS,CAAC;YACT,eAAe,EAAE,CAAC;QACpB,CAAC;IACH,CAAC,CAAC;IAEF,+CAA+C;IAC/C,6CAA6C;IAC7C,sBAAsB;IACtB,MAAM,WAAW,GAAG,CAAC,KAAc,EAAQ,EAAE;QAC3C,IAAI,WAAW,KAAK,SAAS;YAAE,OAAO;QACtC,OAAO,CAAC,gBAAgB,EAAE,CAAC,KAAK,CAAC,CAAC;QAClC,KAAK,QAAQ,CACX,IAAI,wBAAwB,CAC1B,gCAAgC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CACzF,CACF,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,IAAyB,EAAE,EAAE;QACnD,WAAW,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1D,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,KAAc,EAAE,EAAE;QAChC,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QACD,cAAc,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,GAAG,EAAE;QACjB,cAAc,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;YAChC,IAAI,IAAI,EAAE,CAAC;gBACT,MAAM,OAAO,GAAG,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChD,IAAI,OAAO,EAAE,CAAC;oBACZ,GAAG,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBACjE,CAAC;YACH,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC;gBACH,MAAM,UAAU,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB;YACpB,CAAC;YACD,iBAAiB,EAAE,CAAC;YACpB,IAAI,CAAC;gBACH,IAAI,QAAQ,GAAG,CAAC,EAAE,CAAC;oBACjB,MAAM,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAC/B,CAAC;gBACD,OAAO,IAAI,EAAE,CAAC;oBACZ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;oBAC9C,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM;oBACR,CAAC;oBACD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;wBACxB,MAAM,YAAY,CAAC,KAAK,CAAC,CAAC;oBAC5B,CAAC;gBACH,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,+BAA+B;YACjC,CAAC;oBAAS,CAAC;gBACT,eAAe,EAAE,CAAC;YACpB,CAAC;YACD,MAAM,QAAQ,CAAC,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CAAC,CAAC;QACzE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,KAAc,EAAE,EAAE;QACjC,cAAc,CAAC,KAAK,IAAI,EAAE;YACxB,MAAM,QAAQ,CACZ,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,wBAAwB,CAAC,wBAAwB,CAAC,CACxF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,wEAAwE;IACxE,+DAA+D;IAC/D,gCAAgC;IAChC,MAAM,eAAe,GAAG,CAAC,KAAc,EAAE,EAAE;QACzC,KAAK,QAAQ,CACX,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,wBAAwB,CAAC,yBAAyB,CAAC,CACzF,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAClC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACtC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;IAEhD,MAAM,KAAK,GAAG,CAAI,MAAc,EAAE,MAAgB,EAAE,QAAiB,EAAwB,EAAE;QAC7F,YAAY,EAAE,CAAC;QACf,MAAM,EAAE,GAAG,aAAa,CAAC;QACzB,aAAa,IAAI,CAAC,CAAC;QACnB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,EAAW,CAAC;QACtE,qDAAqD;QACrD,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE;YACtB,MAAM;YACN,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;YAC/C,OAAO;YACP,MAAM;SACP,CAAC,CAAC;QACH,MAAM,OAAO,GACX,MAAM,KAAK,SAAS;YAClB,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE;YAChC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC7C,kDAAkD;QAClD,uCAAuC;QACvC,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CACjE,GAAG,EAAE,CAAC,SAAS,EACf,CAAC,KAAc,EAAE,EAAE;YACjB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC,CACF,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAqB,EAAE,CAAC;IACtD,CAAC,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,KAAK,EAAE,MAAc,EAAE,MAAgB,EAAE,EAAE;QAC1D,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,OAAO,CAAC;QACd,OAAO,QAAQ,CAAC;IAClB,CAAC,CAA6B,CAAC;IAE/B,MAAM,MAAM,GAAG,KAAK,EAAE,MAAc,EAAE,MAAgB,EAAE,EAAE;QACxD,YAAY,EAAE,CAAC;QACf,MAAM,OAAO,GACX,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QACzF,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC,CAAC;IAEF,MAAM,gBAAgB,GAAG,KAAK,IAAI,EAAE;QAClC,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;YACzB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,cAAc,KAAK,CAAC,EAAE,CAAC;gBACzB,kBAAkB,EAAE,CAAC;YACvB,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,CAAC,KAAe,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,IAAI,IAAI,wBAAwB,EAAE,CAAC,CAAC;IAErF,OAAO;QACL,OAAO;QACP,KAAK;QACL,MAAM;QACN,gBAAgB;QAChB,KAAK;QACL,MAAM;KACP,CAAC;AACJ,CAAC"}
+{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}

package/dist/executor/prompt-results.d.ts

@@ -2,7 +2,7 @@ import type { PromptResponse } from "../protocol.ts";
 import { type AcpExecutorSupport } from "./support.ts";
 type PromptIdentity = {
     readonly promptId: string;
-    readonly sessionId: string;
+    sessionId: string;
     readonly generation: number;
     readonly turnId: string;
 };

package/dist/executor/prompt-results.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt-results.d.ts","sourceRoot":"","sources":["../../src/executor/prompt-results.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAExF,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC7B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC;oBAExB,cAAc,UAAU,MAAM,IAAI,KAAG,YAAY;wBAe7C,MAAM,YAAY,cAAc,KAAG,IAAI;uBAWxC,MAAM,KAAG,IAAI;oBAIhB,MAAM,KAAG,IAAI;uBAWV,YAAY,KAAG,IAAI;6BAIb,MAAM,KAAG,OAAO;qBAExB,MAAM,KAAG,IAAI;oBASR,MAAM,kCAA8B,OAAO,CAAC,IAAI,CAAC;4BA0BjD,IAAI;EAclC"}
+{"version":3,"file":"prompt-results.d.ts","sourceRoot":"","sources":["../../src/executor/prompt-results.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAmC,KAAK,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAExF,KAAK,cAAc,GAAG;IACpB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,cAAc,GAAG;IAC1C,QAAQ,CAAC,EAAE,cAAc,CAAC;IAC1B,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,OAAO,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC;CAC7B,CAAC;AAEF,wBAAgB,mBAAmB,CAAC,EAClC,OAAO,EACP,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,QAAQ,CAAC;oBAExB,cAAc,UAAU,MAAM,IAAI,KAAG,YAAY;wBAe7C,MAAM,YAAY,cAAc,KAAG,IAAI;uBAWxC,MAAM,KAAG,IAAI;oBAIhB,MAAM,KAAG,IAAI;uBAWV,YAAY,KAAG,IAAI;6BAIb,MAAM,KAAG,OAAO;qBAExB,MAAM,KAAG,IAAI;oBASR,MAAM,kCAA8B,OAAO,CAAC,IAAI,CAAC;4BA0BjD,IAAI;EAclC"}

package/dist/executor/prompt.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE7E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GAAG;IACzF,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;+BA2DY,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,WACb,YAAY,KACpB,OAAO,CAAC,cAAc,CAAC;oBAuEG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAwNrE"}
+{"version":3,"file":"prompt.d.ts","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAGlF,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AACvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAE7E,wBAAgB,oBAAoB,CAAC,EACnC,MAAM,EACN,2BAA2B,EAC3B,IAAI,EACJ,KAAK,EACL,OAAO,EACP,kBAAkB,EAClB,KAAK,EACL,QAAQ,EACR,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,cAAc,EACd,WAAW,EACX,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,MAAM,EACN,aAAa,GACd,EAAE,IAAI,CACL,kBAAkB,EAChB,SAAS,GACT,oBAAoB,GACpB,OAAO,GACP,UAAU,GACV,YAAY,GACZ,aAAa,GACb,aAAa,GACb,QAAQ,CACX,GACC,IAAI,CACF,UAAU,CAAC,OAAO,qBAAqB,CAAC,EACtC,QAAQ,GACR,6BAA6B,GAC7B,MAAM,GACN,OAAO,GACP,gBAAgB,GAChB,qBAAqB,CACxB,GACD,IAAI,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,EAAE,0BAA0B,CAAC,GAC7E,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,gBAAgB,GAAG,qBAAqB,CAAC,GAAG;IACzF,aAAa,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;CACvD;+BA2DY,MAAM,eACJ,aAAa,CAAC,eAAe,CAAC,cAC/B,MAAM,IAAI,WACb,YAAY,KACpB,OAAO,CAAC,cAAc,CAAC;oBAuEG,cAAc,KAAG,OAAO,CAAC,aAAa,CAAC;EAiPrE"}

package/dist/executor/prompt.js

@@ -3,7 +3,7 @@
 // @effect-diagnostics globalTimers:off
 import { acpPromptSettlementBelongsToContext } from "../adapter-support.js";
 import { AcpExecutorDisposedError, AcpExecutorError } from "../errors.js";
-import { acpPromptFailureCategory, failureCategoryField, withFailureCategory, } from "../failureCategory.js";
+import { acpPromptFailureCategory, failureCategoryField, readAcpFailureCategory, withFailureCategory, } from "../failureCategory.js";
 import {} from "../protocol.js";
 import { selectPromptTurnId } from "../util.js";
 import {} from "../vendor-hooks.js";
@@ -120,10 +120,11 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
     const prompt = async (input) => {
         failIfPromptUnavailable();
         const started = requireStarted();
+        let sessionId = started.sessionId;
         let record;
         const settle = (rest) => settleTurn({
             expectedGeneration: started.generation,
-            expectedSessionId: started.sessionId,
+            expectedSessionId: sessionId,
             record,
             ...rest,
         });
@@ -213,12 +214,36 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
             const isStale = () => interruptedTurnIds.has(queuedTurnId) ||
                 (input.expectedActiveTurnId !== undefined && shared.activeTurnId !== queuedTurnId);
             if (!isStale()) {
-                shared.modelSelectionState = await applyRequestedModel({
-                    state: shared.modelSelectionState,
-                    acpSessionId: started.sessionId,
-                    requestedModelId: input.requestedModelId,
-                    expectedGeneration: started.generation,
-                });
+                try {
+                    const applied = await applyRequestedModel({
+                        state: shared.modelSelectionState,
+                        acpSessionId: sessionId,
+                        setup: (shared.startResult?.sessionSetupResult ?? {}),
+                        requestedModelId: input.requestedModelId,
+                        expectedGeneration: started.generation,
+                    });
+                    shared.modelSelectionState = applied.state;
+                    sessionId = applied.sessionId;
+                    record.sessionId = applied.sessionId;
+                }
+                catch (error) {
+                    // `turn.started` 已经发出。目录外的型号不能再发 `session/prompt`，这一轮要以 failed 收口。
+                    const failureCategory = readAcpFailureCategory(error);
+                    if (failureCategory === "model-unavailable") {
+                        const errorMessage = error instanceof Error && error.message.trim().length > 0
+                            ? error.message
+                            : "Requested model is not in this agent's catalog. This turn was not sent.";
+                        settle({
+                            turnId,
+                            stopReason: "error",
+                            state: "failed",
+                            errorMessage,
+                            failureCategory,
+                        });
+                        throw error instanceof Error ? withFailureCategory(error, failureCategory) : error;
+                    }
+                    throw error;
+                }
             }
             failIfDisposed();
             if (isStale()) {
@@ -228,7 +253,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
             closeActiveAssistantSegment(turnId);
             let written = false;
             try {
-                response = await sendPromptRpc(started.sessionId, promptParts, () => {
+                response = await sendPromptRpc(sessionId, promptParts, () => {
                     written = true;
                     input.onDispatched?.(turnId);
                 }, record);
@@ -286,7 +311,7 @@ export function createExecutorPrompt({ isLive, closeActiveAssistantSegment, emit
             try {
                 contextWindow =
                     (await hooks.readContextWindow({
-                        sessionId: started.sessionId,
+                        sessionId,
                         promptResponse: response,
                     })) ?? undefined;
             }

package/dist/executor/prompt.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../src/executor/prompt.ts"],"names":[],"mappings":"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"}

package/dist/executor/session.d.ts

@@ -1,4 +1,5 @@
 import { type AcpModelSelectionState } from "../model-selection.ts";
+import { type AcpSessionSetupResponse } from "../runtime-model.ts";
 import type { AcpSessionStartResult } from "../types.ts";
 import type { createExecutorRuntime } from "./runtime.ts";
 import type { AcpExecutorSupport } from "./support.ts";
@@ -6,9 +7,14 @@ export declare function createExecutorSession({ options, connection, isLive, emi
     applyRequestedModel: (input: {
         readonly state: AcpModelSelectionState;
         readonly acpSessionId: string;
+        readonly setup: AcpSessionSetupResponse;
         readonly requestedModelId: string | undefined;
         readonly expectedGeneration: number;
-    }) => Promise<AcpModelSelectionState>;
+    }) => Promise<{
+        readonly state: AcpModelSelectionState;
+        readonly sessionId: string;
+        readonly setup: AcpSessionSetupResponse;
+    }>;
     start: () => Promise<AcpSessionStartResult>;
     requireStarted: () => {
         readonly sessionId: string;

package/dist/executor/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAU/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,UAAU,EACV,MAAM,EACN,IAAI,EACJ,KAAK,EACL,cAAc,EACd,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,GAC9D,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,gBAAgB,CAAC;iCACpD;QACxC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;QACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;KACrC,KAAG,OAAO,CAAC,sBAAsB,CAAC;iBAgLX,OAAO,CAAC,qBAAqB,CAAC;0BA4B3B;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE;4BAQjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EAwB5D"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"AAYA,OAAO,EAGL,KAAK,sBAAsB,EAC5B,MAAM,uBAAuB,CAAC;AAY/B,OAAO,EAIL,KAAK,uBAAuB,EAC7B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAEvD,wBAAgB,qBAAqB,CAAC,EACpC,OAAO,EACP,UAAU,EACV,MAAM,EACN,IAAI,EACJ,KAAK,EACL,cAAc,EACd,MAAM,GACP,EAAE,IAAI,CAAC,kBAAkB,EAAE,SAAS,GAAG,YAAY,GAAG,QAAQ,CAAC,GAC9D,IAAI,CAAC,UAAU,CAAC,OAAO,qBAAqB,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,gBAAgB,CAAC;iCAiFpD;QACxC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;QACvC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,KAAK,EAAE,uBAAuB,CAAC;QACxC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;QAC9C,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;KACrC,KAAG,OAAO;wBArFO,sBAAsB;4BAClB,MAAM;wBACV,uBAAuB;MAmFP;iBAoNV,OAAO,CAAC,qBAAqB,CAAC;0BA4B3B;QAAE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE;4BAQjD,MAAM,KAAG,OAAO,CAAC,IAAI,CAAC;EAwB5D"}

package/dist/executor/session.js

@@ -6,49 +6,145 @@ import { unhandledConfigCategories } from "../config-option-wiring.js";
 import { AcpExecutorDisposedError, AcpExecutorNotStartedError, AcpExecutorRequestError, withStartupStderr, } from "../errors.js";
 import { acpInitializePayload } from "../handshake.js";
 import { modelSelectionStateFromSetup, normalizeModelId, } from "../model-selection.js";
+import { readAcpFailureCategory } from "../failureCategory.js";
+import { judgeRequestedModel, MODEL_CATALOG_REFRESH_TIMEOUT_MS, ModelCatalogRefreshTimeoutError, modelRefreshFailedError, modelRefreshTimedOutError, modelUnavailableError, } from "../model-send.js";
 import {} from "../protocol.js";
 import { acpModeConfigId } from "../runtime-mode.js";
-import { extractModelConfigId, filterMcpServersByAgentCapabilities, matchAdvertisedModelValue, parseSessionModeState, } from "../runtime-model.js";
+import { extractModelConfigId, filterMcpServersByAgentCapabilities, parseSessionModeState, } from "../runtime-model.js";
 export function createExecutorSession({ options, connection, isLive, emit, stamp, failIfDisposed, shared, }) {
-    const applyRequestedModel = async (input) => {
-        const requestedModelId = normalizeModelId(input.requestedModelId);
-        if (requestedModelId === undefined ||
-            requestedModelId === input.state.currentModelId ||
-            (input.state.strategy === "session/set_model" && !input.state.sessionModelsAdvertised) ||
-            (input.state.strategy === "config-option" && input.state.modelConfigId === undefined)) {
-            return input.state;
-        }
-        const value = matchAdvertisedModelValue(requestedModelId, input.state.advertisedModelValues);
-        if (value === undefined) {
-            // 对不上就保留手自己的型号，只记一次日志（带上手的目录）；没有别处替它改写上游请求。
-            if (requestedModelId !== shared.lastUnmatchedModelId) {
-                shared.lastUnmatchedModelId = requestedModelId;
-                options.log?.info("requested model is not in the agent catalog; keeping its own model", {
-                    requestedModelId,
-                    currentModelId: input.state.currentModelId,
-                    advertisedModelValues: input.state.advertisedModelValues,
-                });
-            }
-            return input.state;
+    const openFreshSession = async (expectedGeneration) => {
+        const initialized = shared.initializeResult;
+        // 没有握手就开不出新会话。当成刷新失败，不沿用旧目录把这一轮发出去。
+        if (initialized === undefined) {
+            throw new Error("no handshake");
         }
-        if (value === input.state.currentModelId) {
-            return input.state;
+        const mcpServers = filterMcpServersByAgentCapabilities(options.mcpServers ?? [], initialized.agentCapabilities);
+        const additionalDirectories = options.additionalDirectories !== undefined && options.additionalDirectories.length > 0
+            ? { additionalDirectories: options.additionalDirectories }
+            : {};
+        // 续开会话也走 session/new：load/resume 带回的是旧目录，重判要用一份新的。
+        const created = await connection.request("session/new", {
+            cwd: options.cwd,
+            mcpServers,
+            ...additionalDirectories,
+        });
+        if (!isLive(expectedGeneration)) {
+            throw new AcpExecutorDisposedError();
         }
+        if (created.sessionId === undefined || created.sessionId.length === 0) {
+            throw new Error("session/new did not return a session id");
+        }
+        return { sessionId: created.sessionId, setup: created };
+    };
+    const switchModel = async (input) => {
         let configOptions = input.state.configOptions;
         if (input.state.strategy === "config-option") {
-            const switched = await connection.request("session/set_config_option", { sessionId: input.acpSessionId, configId: input.state.modelConfigId, value });
+            const switched = await connection.request("session/set_config_option", { sessionId: input.sessionId, configId: input.state.modelConfigId, value: input.value });
             configOptions = switched?.configOptions ?? configOptions;
         }
         else {
             await connection.request("session/set_model", {
-                sessionId: input.acpSessionId,
-                modelId: value,
+                sessionId: input.sessionId,
+                modelId: input.value,
             });
         }
         if (!isLive(input.expectedGeneration)) {
             throw new AcpExecutorDisposedError();
         }
-        return { ...input.state, currentModelId: value, configOptions };
+        return { ...input.state, currentModelId: input.value, configOptions };
+    };
+    const adoptReopenedSession = (applied) => {
+        // 开会话还没发布时不改 shared。后面的步骤失败不能把半截新会话认成当前的。
+        if (shared.sessionId === undefined && shared.startResult === undefined)
+            return;
+        const setup = applied.setup;
+        shared.sessionId = applied.sessionId;
+        shared.modelSelectionState = applied.state;
+        shared.modeState = parseSessionModeState(setup);
+        if (shared.startResult !== undefined) {
+            shared.startResult = {
+                ...shared.startResult,
+                sessionId: applied.sessionId,
+                sessionSetupResult: setup,
+                modelConfigId: extractModelConfigId(setup),
+                modelId: applied.state.currentModelId,
+            };
+        }
+    };
+    const applyRequestedModel = async (input) => {
+        async function applyOnce(state, sessionId, setup, refreshed) {
+            const requestedModelId = normalizeModelId(input.requestedModelId) ?? "";
+            const judgment = judgeRequestedModel({
+                state,
+                requestedModelId: input.requestedModelId,
+                refreshed,
+            });
+            if (judgment.kind === "keep")
+                return { state, sessionId, setup };
+            if (judgment.kind === "unavailable") {
+                throw modelUnavailableError(requestedModelId, state.currentModelId);
+            }
+            if (judgment.kind === "switch") {
+                return {
+                    state: await switchModel({
+                        state,
+                        sessionId,
+                        value: judgment.value,
+                        expectedGeneration: input.expectedGeneration,
+                    }),
+                    sessionId,
+                    setup,
+                };
+            }
+            return refreshAndRejudge(requestedModelId);
+        }
+        async function refreshAndRejudge(requestedModelId) {
+            const timeoutMs = options.modelCatalogRefreshTimeoutMs ?? MODEL_CATALOG_REFRESH_TIMEOUT_MS;
+            let timedOut = false;
+            const timeoutError = new ModelCatalogRefreshTimeoutError();
+            let timer;
+            const work = (async () => {
+                await options.refreshCatalogForSend?.();
+                if (timedOut)
+                    throw timeoutError;
+                const reopened = await openFreshSession(input.expectedGeneration);
+                if (timedOut)
+                    throw timeoutError;
+                const next = modelSelectionStateFromSetup(reopened.setup);
+                const applied = await applyOnce(next, reopened.sessionId, reopened.setup, true);
+                if (timedOut)
+                    throw timeoutError;
+                adoptReopenedSession(applied);
+                return applied;
+            })();
+            // 期限先到时，原来的 promise 仍会拒绝进 race；这条接住晚到的拒绝，避免无人处理。
+            void work.then(() => undefined, () => undefined);
+            const deadline = new Promise((_resolve, reject) => {
+                timer = setTimeout(() => {
+                    timedOut = true;
+                    connection.abandonPending(timeoutError);
+                    reject(timeoutError);
+                }, timeoutMs);
+            });
+            try {
+                return await Promise.race([work, deadline]);
+            }
+            catch (error) {
+                if (error instanceof AcpExecutorDisposedError)
+                    throw error;
+                if (timedOut || error instanceof ModelCatalogRefreshTimeoutError) {
+                    throw modelRefreshTimedOutError(requestedModelId);
+                }
+                if (readAcpFailureCategory(error) === "model-unavailable")
+                    throw error;
+                throw modelRefreshFailedError(requestedModelId, error);
+            }
+            finally {
+                if (timer !== undefined)
+                    clearTimeout(timer);
+            }
+        }
+        return applyOnce(input.state, input.acpSessionId, input.setup, false);
     };
     const startOnce = async (expectedGeneration) => {
         // 载荷与探测路径共用一份（`handshake.ts`）：agent 按客户端能力决定播报什么，两边各写一份就会问出两个不同的问题。
@@ -119,12 +215,17 @@ export function createExecutorSession({ options, connection, isLive, emit, stamp
                 categories: unhandledCategories,
             });
         }
-        const nextModelSelectionState = await applyRequestedModel({
-            state: modelSelectionStateFromSetup(setup),
+        const openedSetup = setup;
+        const appliedModel = await applyRequestedModel({
+            state: modelSelectionStateFromSetup(openedSetup),
             acpSessionId: nextSessionId,
+            setup: openedSetup,
             requestedModelId: options.requestedModelId,
             expectedGeneration,
         });
+        nextSessionId = appliedModel.sessionId;
+        setup = appliedModel.setup;
+        const nextModelSelectionState = appliedModel.state;
         // 切过型号就按切型号回包里的那份认档（见 `AcpModelSelectionState.configOptions`）。
         await applyRequestedEffort({
             connection,

package/dist/executor/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/executor/session.ts"],"names":[],"mappings":"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"}

package/dist/executor/support.d.ts

@@ -34,8 +34,6 @@ export type AcpExecutorState = {
     status: AcpSessionStatus;
     sessionId: string | undefined;
     modelSelectionState: AcpModelSelectionState;
-    /** 上一个对不上目录的请求型号：同一个 id 每轮都来，日志只记一次。 */
-    lastUnmatchedModelId: string | undefined;
     initializeResult: InitializeResponse | undefined;
     startResult: AcpSessionStartResult | undefined;
     startInFlight: Promise<AcpSessionStartResult> | undefined;

package/dist/executor/support.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"support.d.ts","sourceRoot":"","sources":["../../src/executor/support.ts"],"names":[],"mappings":"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"}

package/dist/executor.d.ts

@@ -50,6 +50,17 @@ export type AcpExecutorOptions = {
      */
     readonly autoApprove?: (request: AcpPermissionRequest) => boolean;
     readonly requestedModelId?: string;
+    /**
+     * 请求的型号不在目录里，或已经知道当前型号却切不过去时，最多叫一次。
+     * 有厂商缓存的手在这里刷新缓存。抛错表示刷新失败，这一轮不发，也不再开新会话。
+     * 返回之后（没挂这个钩子也一样）再开一次 session/new，用新目录重判。
+     */
+    readonly refreshCatalogForSend?: () => Promise<void>;
+    /**
+     * 发送前刷新模型清单的整段期限，罩住刷新、重开会话和重判。
+     * 缺省比 grok models 命令的 60 秒更长。测试传一个很短的值。
+     */
+    readonly modelCatalogRefreshTimeoutMs?: number;
     /**
      * 用户在输入区选的思考档位。会话建好之后经 `session/set_config_option` 发一次；
      * 对不上这只手报的档就不发（见 `applyRequestedEffort`）。

package/dist/executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,KAAK,UAAU,MAAM,aAAa,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAc/C,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAML,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EAGxB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AACzF,OAAO,KAAK,EACV,mBAAmB,EACnB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,aAAa,EACb,aAAa,EACd,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAsB,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAI5E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;IACzE,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,cAAc,GAAG,gBAAgB,CAAC;IAC1D,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC,CAAC;IACjG;;;OAGG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACvD,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,gBAAgB,EAAE,kBAAkB,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;IAChG,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QAC5B,QAAQ,CAAC,EAAE,CAAC,EAAE;YAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;SAAE,CAAC;QACpF,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;QAC5B,QAAQ,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACjC,CAAC;IACF,QAAQ,CAAC,KAAK,CAAC,EAAE,cAAc,CAAC;IAChC;;;;OAIG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD;;;;OAIG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC;IAClE,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;OAIG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACrD;;;OAGG;IACH,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAC,KAAK,IAAI,CAAC;IACtF,+BAA+B;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE;QACb,QAAQ,CAAC,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;QACrF,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC;KACvF,CAAC;IACF;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,mCAAmC;IACnC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC;IACjC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAC1C;;;OAGG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC,aAAa,CAAC,CAAC;IAC9C,KAAK,IAAI,OAAO,CAAC,qBAAqB,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IACtD,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvC,gBAAgB,CACd,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE;;;;;OAKG;IACH,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7C;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,kDAAkD;IAClD,aAAa,IAAI,aAAa,CAAC,eAAe,CAAC,CAAC;IAChD,8CAA8C;IAC9C,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAClD,CAAC;AAUF,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,WAAW,CAuT1E;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5E"}

package/dist/executor.js

@@ -50,7 +50,6 @@ export function createAcpExecutor(options) {
             currentModelId: undefined,
             advertisedModelValues: [],
         },
-        lastUnmatchedModelId: undefined,
         initializeResult: undefined,
         startResult: undefined,
         startInFlight: undefined,

package/dist/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../src/executor.ts"],"names":[],"mappings":"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"}

package/dist/model-selection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"model-selection.d.ts","sourceRoot":"","sources":["../src/model-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAG5B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,GAAG,eAAe,CAAC;IACzD,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,mCAAmC;IACnC,QAAQ,CAAC,qBAAqB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtD;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9E;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,uBAAuB,GAC7B,sBAAsB,CAkCxB"}
+{"version":3,"file":"model-selection.d.ts","sourceRoot":"","sources":["../src/model-selection.ts"],"names":[],"mappings":"AACA,OAAO,EAKL,KAAK,uBAAuB,EAC7B,MAAM,oBAAoB,CAAC;AAG5B,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,QAAQ,EAAE,mBAAmB,GAAG,eAAe,CAAC;IACzD,QAAQ,CAAC,uBAAuB,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5C,mCAAmC;IACnC,QAAQ,CAAC,qBAAqB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IACtD;;;OAGG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;CAClC,CAAC;AAEF,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9E;AAED,wBAAgB,4BAA4B,CAC1C,KAAK,EAAE,uBAAuB,GAC7B,sBAAsB,CAmCxB"}

package/dist/model-selection.js

@@ -7,7 +7,8 @@ export function normalizeModelId(value) {
 export function modelSelectionStateFromSetup(setup) {
     const sessionModels = isRecord(setup.models) ? setup.models : undefined;
     const modelConfigId = extractModelConfigId(setup);
-    // `models` 优先；只有配置项时走它。两样都没报仍选 set_model，发送守卫会保持静默。
+    // `models` 优先；只有配置项时走它。两样都没报仍选 set_model。当前型号和目录都没有时发送守卫保持；
+    // 已经知道当前型号却对不上请求时，先刷新一次再失败，不沿用这个型号。
     const strategy = sessionModels === undefined && modelConfigId !== undefined
         ? "config-option"
         : "session/set_model";

package/dist/model-selection.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-selection.js","sourceRoot":"","sources":["../src/model-selection.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,EACL,gCAAgC,EAChC,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,GAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAgBrC,MAAM,UAAU,gBAAgB,CAAC,KAAyB;IACxD,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,KAA8B;IAE9B,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAClD,oDAAoD;IACpD,MAAM,QAAQ,GACZ,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS;QACxD,CAAC,CAAE,eAAyB;QAC5B,CAAC,CAAE,mBAA6B,CAAC;IACrC,MAAM,iBAAiB,GACrB,aAAa,KAAK,SAAS;QACzB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,iBAAiB,EAAE,YAAY,CAAC;IACpD,MAAM,cAAc,GAClB,QAAQ,KAAK,eAAe;QAC1B,CAAC,CAAC,OAAO,WAAW,KAAK,QAAQ;YAC/B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;YAC/B,CAAC,CAAC,SAAS;QACb,CAAC,CAAC,OAAO,aAAa,EAAE,CAAC,gBAAgB,CAAC,KAAK,QAAQ;YACrD,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACnD,CAAC,CAAC,SAAS,CAAC;IAClB,OAAO;QACL,QAAQ;QACR,uBAAuB,EAAE,aAAa,KAAK,SAAS;QACpD,aAAa;QACb,cAAc;QACd,qBAAqB,EACnB,QAAQ,KAAK,eAAe;YAC1B,CAAC,CAAC,iBAAiB,KAAK,SAAS;gBAC/B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,CAAC;YACvD,CAAC,CAAC,sBAAsB,CAAC,aAAa,CAAC;QAC3C,aAAa,EAAE,KAAK,CAAC,aAAa;KACnC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"model-selection.js","sourceRoot":"","sources":["../src/model-selection.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,OAAO,EACL,gCAAgC,EAChC,sBAAsB,EACtB,oBAAoB,EACpB,uBAAuB,GAExB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAgBrC,MAAM,UAAU,gBAAgB,CAAC,KAAyB;IACxD,OAAO,KAAK,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,KAA8B;IAE9B,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IACxE,MAAM,aAAa,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAClD,4DAA4D;IAC5D,oCAAoC;IACpC,MAAM,QAAQ,GACZ,aAAa,KAAK,SAAS,IAAI,aAAa,KAAK,SAAS;QACxD,CAAC,CAAE,eAAyB;QAC5B,CAAC,CAAE,mBAA6B,CAAC;IACrC,MAAM,iBAAiB,GACrB,aAAa,KAAK,SAAS;QACzB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;IAClE,MAAM,WAAW,GAAG,iBAAiB,EAAE,YAAY,CAAC;IACpD,MAAM,cAAc,GAClB,QAAQ,KAAK,eAAe;QAC1B,CAAC,CAAC,OAAO,WAAW,KAAK,QAAQ;YAC/B,CAAC,CAAC,gBAAgB,CAAC,WAAW,CAAC;YAC/B,CAAC,CAAC,SAAS;QACb,CAAC,CAAC,OAAO,aAAa,EAAE,CAAC,gBAAgB,CAAC,KAAK,QAAQ;YACrD,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;YACnD,CAAC,CAAC,SAAS,CAAC;IAClB,OAAO;QACL,QAAQ;QACR,uBAAuB,EAAE,aAAa,KAAK,SAAS;QACpD,aAAa;QACb,cAAc;QACd,qBAAqB,EACnB,QAAQ,KAAK,eAAe;YAC1B,CAAC,CAAC,iBAAiB,KAAK,SAAS;gBAC/B,CAAC,CAAC,EAAE;gBACJ,CAAC,CAAC,gCAAgC,CAAC,iBAAiB,CAAC;YACvD,CAAC,CAAC,sBAAsB,CAAC,aAAa,CAAC;QAC3C,aAAa,EAAE,KAAK,CAAC,aAAa;KACnC,CAAC;AACJ,CAAC"}

package/dist/model-send.d.ts

@@ -0,0 +1,25 @@
+import { type AcpModelSelectionState } from "./model-selection.ts";
+export type ModelSendJudgment = {
+    readonly kind: "keep";
+} | {
+    readonly kind: "switch";
+    readonly value: string;
+} | {
+    readonly kind: "refresh";
+} | {
+    readonly kind: "unavailable";
+};
+export declare function judgeRequestedModel(input: {
+    readonly state: AcpModelSelectionState;
+    readonly requestedModelId: string | undefined;
+    readonly refreshed: boolean;
+}): ModelSendJudgment;
+export declare function modelUnavailableError(requestedModelId: string, currentModelId: string | undefined): Error;
+/** 刷新整段的内部期限到了。不带失败类别，免得被当成已经给用户看的那句。 */
+export declare class ModelCatalogRefreshTimeoutError extends Error {
+    constructor();
+}
+export declare function modelRefreshTimedOutError(requestedModelId: string): Error;
+export { MODEL_CATALOG_REFRESH_TIMEOUT_MS } from "./refreshDeadline.ts";
+export declare function modelRefreshFailedError(requestedModelId: string, error: unknown): Error;
+//# sourceMappingURL=model-send.d.ts.map

package/dist/model-send.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-send.d.ts","sourceRoot":"","sources":["../src/model-send.ts"],"names":[],"mappings":"AAEA,OAAO,EAAoB,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAGrF,MAAM,MAAM,iBAAiB,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACnD;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAErC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE;IACzC,QAAQ,CAAC,KAAK,EAAE,sBAAsB,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B,GAAG,iBAAiB,CAkBpB;AAED,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,KAAK,CAQP;AAED,yCAAyC;AACzC,qBAAa,+BAAgC,SAAQ,KAAK;;CAKzD;AAED,wBAAgB,yBAAyB,CAAC,gBAAgB,EAAE,MAAM,GAAG,KAAK,CAOzE;AAED,OAAO,EAAE,gCAAgC,EAAE,MAAM,sBAAsB,CAAC;AAExE,wBAAgB,uBAAuB,CAAC,gBAAgB,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,KAAK,CAWvF"}

package/dist/model-send.js

@@ -0,0 +1,48 @@
+// 发送前的型号判决。纯函数：不刷新、不写会话。刷新一次再失败的步骤在 session.ts。
+import { withFailureCategory } from "./failureCategory.js";
+import { normalizeModelId } from "./model-selection.js";
+import { matchAdvertisedModelValue } from "./runtime-model.js";
+export function judgeRequestedModel(input) {
+    const requested = normalizeModelId(input.requestedModelId);
+    const current = input.state.currentModelId;
+    if (requested === undefined || requested === current)
+        return { kind: "keep" };
+    const hasCatalog = input.state.advertisedModelValues.length > 0;
+    const hasCurrent = current !== undefined;
+    // 当前型号和目录都没报，没有可判的事实，沿用这只手自己的型号。
+    if (!hasCatalog && !hasCurrent)
+        return { kind: "keep" };
+    const canSwitch = (input.state.strategy === "session/set_model" && input.state.sessionModelsAdvertised) ||
+        (input.state.strategy === "config-option" && input.state.modelConfigId !== undefined);
+    const value = hasCatalog
+        ? matchAdvertisedModelValue(requested, input.state.advertisedModelValues)
+        : undefined;
+    // 两边都缺席时 `undefined === undefined` 会当成「已经是当前型号」。目录非空却对不上，必须刷新一次再失败。
+    if (value !== undefined && value === current)
+        return { kind: "keep" };
+    if (value !== undefined && canSwitch)
+        return { kind: "switch", value };
+    return input.refreshed ? { kind: "unavailable" } : { kind: "refresh" };
+}
+export function modelUnavailableError(requestedModelId, currentModelId) {
+    const current = currentModelId ?? "its own model";
+    return withFailureCategory(new Error(`Requested model "${requestedModelId}" is not in this agent's catalog; it is on "${current}". This turn was not sent. Refresh the model list in this agent's settings and try again.`), "model-unavailable");
+}
+/** 刷新整段的内部期限到了。不带失败类别，免得被当成已经给用户看的那句。 */
+export class ModelCatalogRefreshTimeoutError extends Error {
+    constructor() {
+        super("model catalog refresh timed out");
+        this.name = "ModelCatalogRefreshTimeoutError";
+    }
+}
+export function modelRefreshTimedOutError(requestedModelId) {
+    return withFailureCategory(new Error(`Refreshing this agent's model list timed out, so this turn was not sent. Requested model "${requestedModelId}".`), "model-unavailable");
+}
+export { MODEL_CATALOG_REFRESH_TIMEOUT_MS } from "./refreshDeadline.js";
+export function modelRefreshFailedError(requestedModelId, error) {
+    const detail = error instanceof Error && error.message.trim().length > 0
+        ? error.message
+        : "the model list could not be read";
+    return withFailureCategory(new Error(`Refreshing this agent's model list failed (${detail}), so this turn was not sent. Requested model "${requestedModelId}".`), "model-unavailable");
+}
+//# sourceMappingURL=model-send.js.map

package/dist/model-send.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"model-send.js","sourceRoot":"","sources":["../src/model-send.ts"],"names":[],"mappings":"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"}

package/dist/refreshDeadline.d.ts

@@ -0,0 +1,3 @@
+/** 比 grok models 命令的 60 秒更长，免得正常的那次刷新被这段先掐掉。执行器探测与 ACP 目录刷新共用这一期限。 */
+export declare const MODEL_CATALOG_REFRESH_TIMEOUT_MS = 90000;
+//# sourceMappingURL=refreshDeadline.d.ts.map

package/dist/refreshDeadline.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"refreshDeadline.d.ts","sourceRoot":"","sources":["../src/refreshDeadline.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,eAAO,MAAM,gCAAgC,QAAS,CAAC"}

package/dist/refreshDeadline.js

@@ -0,0 +1,3 @@
+/** 比 grok models 命令的 60 秒更长，免得正常的那次刷新被这段先掐掉。执行器探测与 ACP 目录刷新共用这一期限。 */
+export const MODEL_CATALOG_REFRESH_TIMEOUT_MS = 90_000;
+//# sourceMappingURL=refreshDeadline.js.map

package/dist/refreshDeadline.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refreshDeadline.js","sourceRoot":"","sources":["../src/refreshDeadline.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,MAAM,CAAC,MAAM,gCAAgC,GAAG,MAAM,CAAC"}

package/dist/runtime-model.d.ts

@@ -107,7 +107,7 @@ export declare function collectSessionConfigOptionValues(configOption: AcpSessio
 /** `models`（UNSTABLE）里报的型号 id，即 `session/set_model` 肯收的那些值。 */
 export declare function collectSessionModelIds(models: unknown): ReadonlyArray<string>;
 /**
- * 请求的型号在手报的目录里对应哪一个取值；对不上返回 undefined，调用方据此不设型号。
+ * 请求的型号在手报的目录里对应哪一个取值；对不上返回 undefined。
  *
  * 规则的正本是 `@ycodium-ai/plugin-api/executor` 的 `matchCatalogModel`，理由写在那里：
  * 先精确匹配，再按最后一段唯一匹配，两个取值最后一段相同就不猜。纯库不许依赖宿主包

package/dist/runtime-model.js

@@ -97,7 +97,7 @@ function catalogModelLastSegment(value) {
     return separator > 0 && separator < value.length - 1 ? value.slice(separator + 1) : undefined;
 }
 /**
- * 请求的型号在手报的目录里对应哪一个取值；对不上返回 undefined，调用方据此不设型号。
+ * 请求的型号在手报的目录里对应哪一个取值；对不上返回 undefined。
  *
  * 规则的正本是 `@ycodium-ai/plugin-api/executor` 的 `matchCatalogModel`，理由写在那里：
  * 先精确匹配，再按最后一段唯一匹配，两个取值最后一段相同就不猜。纯库不许依赖宿主包

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ycodium-acp-executor",
-  "version": "0.2.3254",
+  "version": "0.2.3265",
   "description": "Agent Client Protocol client and executor state machine for Ycodium agent plugins. Speaks ACP over stdio and emits Ycodium executor events.",
   "keywords": [
     "acp",