@sunerpy/opencode-kiro-auth 0.14.0 → 0.14.1

package/dist/core/request/request-handler.js

@@ -242,8 +242,9 @@ export class RequestHandler {
                     try {
                         sdkResponse = await client.send(command, { abortSignal: signal });
                     }
-                    finally {
+                    catch (error) {
                         endUpstreamWait();
+                        throw error;
                     }
                     sendResolved = true;
                     if (apiTimestamp) {
@@ -251,11 +252,19 @@ export class RequestHandler {
                     }
                     const response = await this.responseHandler.handleSdkSuccess(sdkResponse, model, sdkPrep.conversationId, sdkPrep.streaming, {
                         signal,
-                        onUpstreamWaitStart: () => beginUpstreamWait('stream event', this.config.request_timeout_ms, {
-                            model,
-                            effectiveModel: sdkPrep.effectiveModel,
-                            region: sdkPrep.region
-                        }),
+                        onUpstreamWaitStart: ({ eventIndex }) => {
+                            if (eventIndex === 0) {
+                                if (!this.config.sdk_response_timeout_enabled)
+                                    endUpstreamWait();
+                                return;
+                            }
+                            beginUpstreamWait('stream event', this.config.request_timeout_ms, {
+                                model,
+                                effectiveModel: sdkPrep.effectiveModel,
+                                region: sdkPrep.region,
+                                eventIndex
+                            });
+                        },
                         onUpstreamWaitEnd: endUpstreamWait,
                         onIterationError: (error, afterCompletionMetadata) => logger.warn('Kiro SDK event stream iteration failed', {
                             model,

package/dist/core/request/response-handler.d.ts

@@ -1,7 +1,9 @@
 import { SdkEventStreamIterationError } from './stream-error.js';
 export interface SdkResponseLifecycle {
     signal?: AbortSignal;
-    onUpstreamWaitStart?: () => void;
+    onUpstreamWaitStart?: (context: {
+        eventIndex: number;
+    }) => void;
     onUpstreamWaitEnd?: () => void;
     onIterationError?: (error: unknown, afterCompletionMetadata: boolean) => void;
     onComplete?: () => void | Promise<void>;

package/dist/core/request/response-handler.js

@@ -27,6 +27,7 @@ function wrapSdkEventStream(sdkResponse, signal, onUpstreamWaitStart, onUpstream
     const rawIterator = eventStream[Symbol.asyncIterator]();
     let closed = false;
     let completionMetadataSeen = false;
+    let eventIndex = 0;
     const closeRaw = async () => {
         if (closed)
             return;
@@ -38,26 +39,33 @@ function wrapSdkEventStream(sdkResponse, signal, onUpstreamWaitStart, onUpstream
             await closeRaw();
             throw abortReason(signal);
         }
-        onUpstreamWaitStart?.();
+        onUpstreamWaitStart?.({ eventIndex });
         try {
-            if (!signal)
-                return await rawIterator.next();
-            return await new Promise((resolve, reject) => {
-                let settled = false;
-                const settle = (callback) => {
-                    if (settled)
-                        return;
-                    settled = true;
-                    signal.removeEventListener('abort', onAbort);
-                    callback();
-                };
-                const onAbort = () => {
-                    void closeRaw();
-                    settle(() => reject(abortReason(signal)));
-                };
-                signal.addEventListener('abort', onAbort, { once: true });
-                Promise.resolve(rawIterator.next()).then((result) => settle(() => resolve(result)), (error) => settle(() => reject(error)));
-            });
+            let result;
+            if (!signal) {
+                result = await rawIterator.next();
+            }
+            else {
+                result = await new Promise((resolve, reject) => {
+                    let settled = false;
+                    const settle = (callback) => {
+                        if (settled)
+                            return;
+                        settled = true;
+                        signal.removeEventListener('abort', onAbort);
+                        callback();
+                    };
+                    const onAbort = () => {
+                        void closeRaw();
+                        settle(() => reject(abortReason(signal)));
+                    };
+                    signal.addEventListener('abort', onAbort, { once: true });
+                    Promise.resolve(rawIterator.next()).then((nextResult) => settle(() => resolve(nextResult)), (error) => settle(() => reject(error)));
+                });
+            }
+            if (!result.done)
+                eventIndex++;
+            return result;
         }
         finally {
             onUpstreamWaitEnd?.();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sunerpy/opencode-kiro-auth",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "OpenCode plugin for AWS Kiro (CodeWhisperer) providing access to Claude models",
   "type": "module",
   "main": "dist/index.js",