@sunerpy/opencode-kiro-auth 0.13.2 → 0.13.3

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

@@ -74,14 +74,23 @@ export class RequestHandler {
             abortFromInbound();
         else
             inboundSignal?.addEventListener('abort', abortFromInbound, { once: true });
-        const timeout = setDeadlineTimeout(() => requestController.abort(new DOMException('Kiro request timed out', 'TimeoutError')), this.config.request_timeout_ms);
+        let timeout;
+        const refreshRequestDeadline = () => {
+            if (requestController.signal.aborted)
+                return;
+            if (timeout)
+                clearDeadlineTimeout(timeout);
+            timeout = setDeadlineTimeout(() => requestController.abort(new DOMException('Kiro request timed out', 'TimeoutError')), this.config.request_timeout_ms);
+        };
+        refreshRequestDeadline();
         let requestCleanupDone = false;
         let responseOwnsLifecycle = false;
         const cleanupRequest = () => {
             if (requestCleanupDone)
                 return;
             requestCleanupDone = true;
-            clearDeadlineTimeout(timeout);
+            if (timeout)
+                clearDeadlineTimeout(timeout);
             inboundSignal?.removeEventListener('abort', abortFromInbound);
         };
         const signal = requestController.signal;
@@ -189,11 +198,13 @@ export class RequestHandler {
                     };
                     const sdkResponse = await client.send(command, { abortSignal: signal });
                     sendResolved = true;
+                    refreshRequestDeadline();
                     if (apiTimestamp) {
                         this.logSdkResponse(sdkPrep, apiTimestamp);
                     }
                     const response = await this.responseHandler.handleSdkSuccess(sdkResponse, model, sdkPrep.conversationId, sdkPrep.streaming, {
                         signal,
+                        onActivity: refreshRequestDeadline,
                         onComplete: completeRequest,
                         onTerminal: cleanupRequest,
                         onCancel: (reason) => requestController.abort(reason),

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

@@ -1,6 +1,7 @@
 import { SdkEventStreamIterationError } from './stream-error.js';
 export interface SdkResponseLifecycle {
     signal?: AbortSignal;
+    onActivity?: () => void;
     onComplete?: () => void | Promise<void>;
     onTerminal?: () => void;
     onCancel?: (reason: unknown) => void;

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

@@ -11,7 +11,7 @@ async function closeIterator(iterator) {
     }
     catch { }
 }
-function wrapSdkEventStream(sdkResponse, signal) {
+function wrapSdkEventStream(sdkResponse, signal, onActivity) {
     const eventStream = sdkResponse.generateAssistantResponseResponse;
     if (!eventStream || typeof eventStream[Symbol.asyncIterator] !== 'function') {
         return { response: sdkResponse, closeRaw: async () => { } };
@@ -25,8 +25,13 @@ function wrapSdkEventStream(sdkResponse, signal) {
         await closeIterator(rawIterator);
     };
     const nextRaw = async () => {
+        const recordActivity = (result) => {
+            if (!result.done)
+                onActivity?.();
+            return result;
+        };
         if (!signal)
-            return rawIterator.next();
+            return rawIterator.next().then(recordActivity);
         if (signal.aborted) {
             await closeRaw();
             throw abortReason(signal);
@@ -45,7 +50,7 @@ function wrapSdkEventStream(sdkResponse, signal) {
                 settle(() => reject(abortReason(signal)));
             };
             signal.addEventListener('abort', onAbort, { once: true });
-            Promise.resolve(rawIterator.next()).then((result) => settle(() => resolve(result)), (error) => settle(() => reject(error)));
+            Promise.resolve(rawIterator.next()).then((result) => settle(() => resolve(recordActivity(result))), (error) => settle(() => reject(error)));
         });
     };
     const wrappedIterator = {
@@ -94,7 +99,7 @@ export class ResponseHandler {
         if (streaming) {
             return this.handleSdkStreaming(sdkResponse, model, conversationId, lifecycle);
         }
-        return this.handleSdkNonStreaming(sdkResponse, model, conversationId, lifecycle.signal);
+        return this.handleSdkNonStreaming(sdkResponse, model, conversationId, lifecycle);
     }
     async handleStreaming(response, model, conversationId) {
         const s = transformKiroStream(response, model, conversationId);
@@ -113,7 +118,7 @@ export class ResponseHandler {
         }), { headers: { 'Content-Type': 'text/event-stream' } });
     }
     async handleSdkStreaming(sdkResponse, model, conversationId, lifecycle) {
-        const wrapped = wrapSdkEventStream(sdkResponse, lifecycle.signal);
+        const wrapped = wrapSdkEventStream(sdkResponse, lifecycle.signal, lifecycle.onActivity);
         const transformed = transformSdkStream(wrapped.response, model, conversationId);
         const buffered = [];
         let firstSemantic;
@@ -215,14 +220,14 @@ export class ResponseHandler {
             }
         }, { highWaterMark: 0 }), { headers: { 'Content-Type': 'text/event-stream' } });
     }
-    async handleSdkNonStreaming(sdkResponse, model, conversationId, signal) {
+    async handleSdkNonStreaming(sdkResponse, model, conversationId, lifecycle) {
         // For non-streaming SDK responses, collect all events
         let content = '';
         let reasoningContent = '';
         const toolCalls = [];
         let inputTokens = 0;
         let outputTokens = 0;
-        const wrapped = wrapSdkEventStream(sdkResponse, signal);
+        const wrapped = wrapSdkEventStream(sdkResponse, lifecycle.signal, lifecycle.onActivity);
         const eventStream = wrapped.response.generateAssistantResponseResponse;
         if (eventStream) {
             try {
@@ -243,7 +248,7 @@ export class ResponseHandler {
                 }
             }
             finally {
-                if (signal?.aborted)
+                if (lifecycle.signal?.aborted)
                     await wrapped.closeRaw();
             }
         }

package/package.json

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