@jingyi0605/codingns4dsh 0.2.1-beta.3 → 0.2.1-beta.5

package/data/build/dist/client/session-adapter-cache.js

@@ -1,6 +1,7 @@
 import { callCliRpc } from './cli-catalog.js';
 const adaptersBySession = new Map();
 const listeners = new Set();
+const requests = new WeakMap();
 /** 返回一个会话当前绑定的适配器；查询成本为 O(1)。 */
 export function sessionAdapterId(sessionId) {
     return adaptersBySession.get(sessionId);
@@ -34,7 +35,16 @@ export function replaceSessionAdapters(bindings) {
 }
 /** 一次 RPC 读取全部脱敏绑定；不会按 DOM 行逐条请求。 */
 export async function fetchSessionAdapters(rpc) {
-    const value = await callCliRpc(rpc, 'session/adapter-map', {});
+    const existing = requests.get(rpc);
+    if (existing !== undefined)
+        return existing;
+    const request = readSessionAdapters(rpc).finally(() => { if (requests.get(rpc) === request)
+        requests.delete(rpc); });
+    requests.set(rpc, request);
+    return request;
+}
+async function readSessionAdapters(rpc) {
+    const value = await callCliRpc(rpc, 'session/adapter-map', {}, AbortSignal.timeout(10_000));
     if (!Array.isArray(value))
         return [];
     return value

package/data/build/dist/client/session-adapter-cache.js.map

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

package/data/build/dist/client/settings-bridge.d.ts

@@ -30,6 +30,7 @@ export declare class CodingNsSettingsBridge implements CodingNsSettingsStore<Cod
     getSnapshot(): CodingNsSettingsSnapshot<CodingNsSettings>;
     subscribe(listener: SnapshotListener): () => void;
     load(): Promise<void>;
+    reload(): Promise<void>;
     set(field: string, value: unknown): Promise<boolean>;
     unset(field: string): Promise<boolean>;
     mutate(ops: SettingsMutation, expectedRevision?: number): Promise<boolean>;

package/data/build/dist/client/settings-bridge.d.ts.map

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

package/data/build/dist/client/settings-bridge.js

@@ -69,6 +69,13 @@ export class CodingNsSettingsBridge {
         });
         return this.remoteLoad;
     }
+    async reload() {
+        // 先等初次读取结束，再发出新读取，避免迟到的初始快照覆盖业务 RPC 的更新。
+        await this.remoteLoad?.catch(() => undefined);
+        const response = await this.call('settings/get', {});
+        this.remoteLoaded = this.isRemote();
+        this.publish({ status: 'ready', value: response.value, revision: response.revision, writable: true });
+    }
     async set(field, value) {
         const local = this.local;
         if (local !== undefined && !this.isRemote()) {
@@ -168,7 +175,8 @@ export async function callCodingNsRpc(rpc, endpoint, payload) {
     }
     if (!result.ok) {
         console.error('codingns4dsh: client rpc response error', { endpoint, error: result.error });
-        throw new Error(result.error.message);
+        // 保留 Host 的稳定错误码，让业务层区分版本冲突和真正的权限/网络失败。
+        throw Object.assign(new Error(result.error.message), { code: result.error.code });
     }
     debugInfo('codingns4dsh: client rpc response success', { endpoint });
     return result.value;

package/data/build/dist/client/settings-bridge.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-bridge.js","sourceRoot":"","sources":["../../../../src/client/settings-bridge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-bridge.js","sourceRoot":"","sources":["../../../../src/client/settings-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAEvE,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAEzD,OAAO,EACL,oBAAoB,GAIrB,MAAM,uCAAuC,CAAA;AAmB9C;;;;;;GAMG;AACH,MAAM,0BAA0B,GAAG,MAAM,CAAC,MAAM,CAAC;IAC/C,MAAM,EAAE,aAAsB;IAC9B,KAAK,EAAE,SAAS;IAChB,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,KAAK;CAChB,CAAC,CAAA;AAEF;;;;;;GAMG;AACH,MAAM,OAAO,sBAAsB;IAQd;IACA;IARX,QAAQ,CAA4C;IAC3C,SAAS,GAAG,IAAI,GAAG,EAAoB,CAAA;IACvC,gBAAgB,CAAY;IACrC,UAAU,CAA2B;IACrC,YAAY,GAAG,KAAK,CAAA;IAE5B,YACmB,KAA2D,EAC3D,GAAsB;QADtB,UAAK,GAAL,KAAK,CAAsD;QAC3D,QAAG,GAAH,GAAG,CAAmB;QAEvC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,0BAA0B,CAAC,CAAA;QACnF,IAAI,CAAC,gBAAgB,GAAG,KAAK,EAAE,SAAS,CAAC,GAAG,EAAE;YAC5C,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;gBACpB,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;gBACvC,OAAM;YACR,CAAC;YACD,IAAI,CAAC,YAAY,GAAG,KAAK,CAAA;YACzB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;QACrD,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;IACzB,CAAC;IAED,WAAW,KAAiD,OAAO,IAAI,CAAC,QAAQ,CAAA,CAAC,CAAC;IAElF,SAAS,CAAC,QAA0B;QAClC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAA;QAC5B,OAAO,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC9C,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAAE,OAAM;QAC5B,IAAI,IAAI,CAAC,YAAY;YAAE,OAAM;QAC7B,IAAI,IAAI,CAAC,UAAU,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC,UAAU,CAAA;QACzD,SAAS,CAAC,0CAA0C,CAAC,CAAA;QACrD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAyB,cAAc,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;YACxF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;YACxB,IAAI,CAAC,OAAO,CAAC;gBACX,MAAM,EAAE,OAAO;gBACf,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,QAAQ,EAAE,IAAI;aACf,CAAC,CAAA;YACF,SAAS,CAAC,4CAA4C,EAAE,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAA;QAC1F,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE;YACd,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;QAC7B,CAAC,CAAC,CAAA;QACF,OAAO,IAAI,CAAC,UAAU,CAAA;IACxB,CAAC;IAED,KAAK,CAAC,MAAM;QACV,yCAAyC;QACzC,MAAM,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAA;QAC7C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAyB,cAAc,EAAE,EAAE,CAAC,CAAA;QAC5E,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;QACnC,IAAI,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACvG,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,KAAa,EAAE,KAAc;QACrC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;YAC7B,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;IAC/E,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,KAAa;QACvB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACxB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAA;IACtD,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAqB,EAAE,gBAAyB;QAC3D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAA;QACxB,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC5C,MAAM,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAA;YACzC,OAAO,IAAI,CAAA;QACb,CAAC;QACD,MAAM,OAAO,GAAG,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,gBAAgB,EAAE,CAAA;QACpF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,IAAI,CAAyB,cAAc,EAAE,OAAO,CAAC,CAAA;QACjF,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA;QACxB,IAAI,CAAC,OAAO,CAAC;YACX,GAAG,IAAI,CAAC,QAAQ;YAChB,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;QACF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,OAAO,KAAW,IAAI,CAAC,gBAAgB,EAAE,CAAA,CAAC,CAAC;IAEnC,KAAK,CAAC,IAAI,CAAI,QAAgB,EAAE,OAAgB;QACtD,OAAO,eAAe,CAAI,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IACxD,CAAC;IAEO,aAAa;QACnB,OAAO,IAAI,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,0BAA0B,CAAA;IAChE,CAAC;IAED;;;;;OAKG;IACK,OAAO,CAAC,IAAgD;QAC9D,IAAI,oBAAoB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC;YAAE,OAAM;QACrD,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAA;QACpB,KAAK,MAAM,QAAQ,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAAE,QAAQ,EAAE,CAAA;IACxD,CAAC;IAEO,QAAQ;QACd,IAAI,IAAI,CAAC,KAAK,KAAK,SAAS;YAAE,OAAO,IAAI,CAAA;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAA;QACzC,0DAA0D;QAC1D,0DAA0D;QAC1D,OAAO,kBAAkB,EAAE,IAAI,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,aAAa;YAC5F,2CAA2C;YAC3C,sDAAsD;YACtD,0BAA0B;eACvB,QAAQ,CAAC,QAAQ,KAAK,KAAK,CAAA;IAClC,CAAC;CACF;AAED,SAAS,kBAAkB;IACzB,MAAM,OAAO,GAAG,UAGf,CAAA;IACD,gDAAgD;IAChD,+CAA+C;IAC/C,OAAO,OAAO,CAAC,mCAAmC,KAAK,IAAI;WACtD,OAAO,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO;WACtC,OAAO,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,CAAA;AAC9C,CAAC;AAED,2DAA2D;AAC3D,MAAM,CAAC,KAAK,UAAU,eAAe,CAAI,GAAsB,EAAE,QAAgB,EAAE,OAAgB;IACjG,IAAI,MAAM,CAAA;IACV,IAAI,CAAC;QACH,SAAS,CAAC,kCAAkC,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC1F,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAClE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,uCAAuC;QACvC,yDAAyD;QACzD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC;YAAE,MAAM,KAAK,CAAA;QACrD,SAAS,CAAC,mCAAmC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;QAC5E,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAA;QAClE,CAAC;QAAC,OAAO,aAAa,EAAE,CAAC;YACvB,OAAO,CAAC,KAAK,CAAC,0CAA0C,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC,CAAA;YAC7F,MAAM,aAAa,CAAA;QACrB,CAAC;IACH,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAA;QAC3F,wCAAwC;QACxC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAA;IACnF,CAAC;IACD,SAAS,CAAC,2CAA2C,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;IACpE,OAAO,MAAM,CAAC,KAAU,CAAA;AAC1B,CAAC;AAID,6CAA6C;AAC7C,SAAS,WAAW,CAAC,KAAc,EAAE,WAAW,IAAI,OAAO,EAAU;IACnE,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,SAAS;QAAE,OAAO,KAAK,CAAA;IAC3F,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IACrE,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;QAC3D,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,CAAC;YAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAAC,CAAC;gBAAS,CAAC;YAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QAAC,CAAC;IACtG,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,SAAS,CAAC,kBAAkB,CAAC,CAAA;IAC7F,MAAM,SAAS,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAC9C,IAAI,SAAS,KAAK,MAAM,CAAC,SAAS,IAAI,SAAS,KAAK,IAAI;QAAE,MAAM,IAAI,SAAS,CAAC,uBAAuB,CAAC,CAAA;IACtG,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,SAAS,CAAC,aAAa,CAAC,CAAA;IAC3D,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;IACnB,MAAM,MAAM,GAA8B,EAAE,CAAA;IAC5C,IAAI,CAAC;QACH,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACjD,IAAI,KAAK,KAAK,SAAS;gBAAE,SAAQ;YACjC,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QAC5C,CAAC;QACD,OAAO,MAAM,CAAA;IACf,CAAC;YAAS,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,KAA2D,EAC3D,GAAsB;IAEtB,OAAO,IAAI,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AAC/C,CAAC;AAWD,SAAS,eAAe,CAAC,QAA4B;IACnD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAA;AACrH,CAAC"}

package/data/build/dist/client/sherpa-voice-adapter.d.ts

@@ -13,12 +13,24 @@ export declare class ClientSherpaVoiceAdapter implements VoiceRuntimeAdapter {
     private capture;
     private uploader;
     private responseAbort;
+    private leaseRequest;
+    private stopOperation;
     private active;
     private hostLeaseActive;
     private epoch;
     private configuredOwner;
     private selectedInputDeviceId;
     private selectedOutputDeviceId;
+    private diagnostics;
+    private readonly trace;
+    private readonly output;
+    private reply;
+    private chatStreaming;
+    private clearOperation;
+    private settleSpeech;
+    private replySequence;
+    private microphoneMuted;
+    private speakerMuted;
     constructor(options: SherpaClientVoiceAdapterOptions);
     get capabilities(): VoiceRuntimeCapabilities;
     get ownerId(): string | undefined;
@@ -26,6 +38,10 @@ export declare class ClientSherpaVoiceAdapter implements VoiceRuntimeAdapter {
     get inputDeviceId(): string | undefined;
     get outputDeviceId(): string | undefined;
     get outputDeviceSupported(): boolean;
+    get isMicrophoneMuted(): boolean;
+    get isSpeakerMuted(): boolean;
+    setMicrophoneMuted(muted: boolean): void;
+    setSpeakerMuted(muted: boolean): void;
     subscribe(listener: VoiceRuntimeListener): () => void;
     enumerateInputDevices(): Promise<readonly VoiceClientDevice[]>;
     enumerateOutputDevices(): Promise<readonly VoiceClientDevice[]>;
@@ -33,14 +49,19 @@ export declare class ClientSherpaVoiceAdapter implements VoiceRuntimeAdapter {
     selectOutputDevice(deviceId: string): Promise<void>;
     start(ownerId?: string): Promise<void>;
     stop(): Promise<void>;
+    private stopSession;
     interrupt(): Promise<void>;
     sendPcm(frame: VoicePcmFrame, epoch: number): void;
-    speak(text: string, epoch: number): Promise<void>;
+    speak(text: string, epoch: number, isCurrent?: () => boolean, settleState?: boolean): Promise<void>;
+    clearConversation(): Promise<void>;
     dispose(): void;
     private sendPcmFrame;
     private readEvents;
     private handleEvent;
-    private applyOutputDevice;
+    private handleFinalText;
+    private cancelReply;
+    private cancelOutput;
+    private failTransport;
     private emit;
 }
 //# sourceMappingURL=sherpa-voice-adapter.d.ts.map

package/data/build/dist/client/sherpa-voice-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sherpa-voice-adapter.d.ts","sourceRoot":"","sources":["../../../../src/client/sherpa-voice-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAA;AAEjE,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,mBAAmB,EAAE,wBAAwB,EAAqB,oBAAoB,EAAqB,MAAM,sCAAsC,CAAA;AAKvM,MAAM,WAAW,+BAA+B;IAC9C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,QAAQ,EAAE,sBAAsB,CAAA;CAC1C;AAED,8CAA8C;AAC9C,qBAAa,wBAAyB,YAAW,mBAAmB;IAClE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAkC;IAC5D,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAwB;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IACnD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAiC;IACzD,OAAO,CAAC,OAAO,CAAgC;IAC/C,OAAO,CAAC,QAAQ,CAAiC;IACjD,OAAO,CAAC,aAAa,CAA6B;IAClD,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,eAAe,CAAQ;IAC/B,OAAO,CAAC,qBAAqB,CAAoB;IACjD,OAAO,CAAC,sBAAsB,CAAoB;gBAEtC,OAAO,EAAE,+BAA+B;IAcpD,IAAI,YAAY,IAAI,wBAAwB,CAI3C;IAED,IAAI,OAAO,IAAI,MAAM,GAAG,SAAS,CAA0D;IAC3F,IAAI,iBAAiB,IAAI,MAAM,CAAgC;IAC/D,IAAI,aAAa,IAAI,MAAM,GAAG,SAAS,CAAsC;IAC7E,IAAI,cAAc,IAAI,MAAM,GAAG,SAAS,CAAuC;IAC/E,IAAI,qBAAqB,IAAI,OAAO,CAA+I;IAEnL,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,MAAM,IAAI;IAE/C,qBAAqB,IAAI,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC;IAC9D,sBAAsB,IAAI,OAAO,CAAC,SAAS,iBAAiB,EAAE,CAAC;IAC/D,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlD,kBAAkB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnD,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAwCtC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAyBrB,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAQhC,OAAO,CAAC,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI;IAE5C,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAcvD,OAAO,IAAI,IAAI;IAEf,OAAO,CAAC,YAAY;YAMN,UAAU;YAsBV,WAAW;YAaX,iBAAiB;IAQ/B,OAAO,CAAC,IAAI;CACb"}
+{"version":3,"file":"sherpa-voice-adapter.d.ts","sourceRoot":"","sources":["../../../../src/client/sherpa-voice-adapter.ts"],"names":[],"mappings":"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"}