@kevin5251984/guild 0.2.12 → 0.2.14

package/src/oauth.ts

@@ -1057,73 +1057,6 @@ function thinkingText(message: AssistantMessage | undefined): string {
     .trim();
 }
 
-/**
- * Codex `DEFAULT_STREAM_IDLE_TIMEOUT_MS`. No tokens on the stream — not a
- * wall clock on the whole turn. Do not pass this as Pi `timeoutMs` for xAI:
- * OpenAI-completions maps that to the SDK request timeout and kills thinking.
- */
-export const STREAM_IDLE_TIMEOUT_MS = 300_000;
-
-export class StreamIdleError extends Error {
-  readonly idleMs: number;
-  constructor(idleMs: number) {
-    super(
-      `stream idle: no tokens for ${Math.round(idleMs / 1000)}s (Codex-style; not a turn wall clock). Resend or switch models.`,
-    );
-    this.name = "StreamIdleError";
-    this.idleMs = idleMs;
-  }
-}
-
-export function startStreamIdle(
-  idleMs: number,
-  parent?: AbortSignal,
-): {
-  signal: AbortSignal;
-  bump: () => void;
-  dispose: () => void;
-  timedOut: () => boolean;
-} {
-  const ctrl = new AbortController();
-  let timer: ReturnType<typeof setTimeout> | undefined;
-  let timedOut = false;
-  const fire = () => {
-    if (timedOut || ctrl.signal.aborted) return;
-    timedOut = true;
-    ctrl.abort();
-  };
-  const bump = () => {
-    if (timedOut || parent?.aborted) return;
-    if (timer) clearTimeout(timer);
-    timer = setTimeout(fire, idleMs);
-  };
-  const onParent = () => {
-    if (timer) clearTimeout(timer);
-    ctrl.abort();
-  };
-  if (parent?.aborted) {
-    ctrl.abort();
-  } else {
-    parent?.addEventListener("abort", onParent, { once: true });
-  }
-  bump();
-  return {
-    signal: ctrl.signal,
-    bump,
-    dispose: () => {
-      if (timer) clearTimeout(timer);
-      parent?.removeEventListener("abort", onParent);
-    },
-    timedOut: () => timedOut,
-  };
-}
-
-function userAborted(signal?: AbortSignal): Error {
-  const err = new Error("aborted");
-  err.name = "AbortError";
-  return err;
-}
-
 /** Pi streamSimple: Think chips only from thinking_delta, not a planted placeholder. */
 async function streamOAuthMessage(
   models: MutableModels,
@@ -1133,11 +1066,7 @@ async function streamOAuthMessage(
   toolCtx: ToolContext,
   traces: ToolTrace[],
 ): Promise<AssistantMessage> {
-  const idle = startStreamIdle(STREAM_IDLE_TIMEOUT_MS, options?.signal);
-  const stream = models.streamSimple(model, context, {
-    ...options,
-    signal: idle.signal,
-  });
+  const stream = models.streamSimple(model, context, options);
   let lastEmit = 0;
   const flush = (partial: AssistantMessage | undefined, force: boolean) => {
     const think = thinkingText(partial);
@@ -1147,40 +1076,19 @@ async function streamOAuthMessage(
     lastEmit = now;
     emitProgress(toolCtx, traces, think);
   };
-  const failIfIdle = (): never => {
-    if (options?.signal?.aborted) throw userAborted(options.signal);
-    throw new StreamIdleError(STREAM_IDLE_TIMEOUT_MS);
-  };
-  try {
-    for await (const event of stream) {
-      idle.bump();
-      if (event.type === "thinking_start" || event.type === "thinking_delta") {
-        flush(event.partial, event.type === "thinking_start");
-      } else if (event.type === "thinking_end") {
-        flush(event.partial, true);
-      } else if (event.type === "done") {
-        flush(event.message, true);
-        return event.message;
-      } else if (event.type === "error") {
-        if (idle.timedOut() || options?.signal?.aborted) failIfIdle();
-        return event.error;
-      }
-    }
-    if (idle.timedOut() || options?.signal?.aborted) failIfIdle();
-    return stream.result();
-  } catch (err) {
-    if (err instanceof StreamIdleError) throw err;
-    if (err instanceof Error && err.name === "AbortError") {
-      if (options?.signal?.aborted) throw err;
-      if (idle.timedOut()) throw new StreamIdleError(STREAM_IDLE_TIMEOUT_MS);
+  for await (const event of stream) {
+    if (event.type === "thinking_start" || event.type === "thinking_delta") {
+      flush(event.partial, event.type === "thinking_start");
+    } else if (event.type === "thinking_end") {
+      flush(event.partial, true);
+    } else if (event.type === "done") {
+      flush(event.message, true);
+      return event.message;
+    } else if (event.type === "error") {
+      return event.error;
     }
-    if (idle.timedOut() && !(options?.signal?.aborted)) {
-      throw new StreamIdleError(STREAM_IDLE_TIMEOUT_MS);
-    }
-    throw err;
-  } finally {
-    idle.dispose();
   }
+  return stream.result();
 }
 
 function abortWhen(signal?: AbortSignal): Promise<never> {
@@ -1344,33 +1252,21 @@ export async function completeOAuth(input: {
       if (fitted.length < transcript.length) {
         transcript.splice(0, transcript.length, ...fitted);
       }
-      let result: AssistantMessage;
-      try {
-        result = await Promise.race([
-          streamOAuthMessage(
-            models,
-            model,
-            {
-              systemPrompt: input.system,
-              messages: transcript,
-              ...(useTools ? { tools } : {}),
-            },
-            options,
-            toolCtx,
-            traces,
-          ),
-          abortWhen(options.signal),
-        ]);
-      } catch (err) {
-        if (err instanceof StreamIdleError) {
-          return {
-            calls: [],
-            text: err.message,
-            thinking: thinkingChunks.join("\n\n"),
-          };
-        }
-        throw err;
-      }
+      const result = await Promise.race([
+        streamOAuthMessage(
+          models,
+          model,
+          {
+            systemPrompt: input.system,
+            messages: transcript,
+            ...(useTools ? { tools } : {}),
+          },
+          options,
+          toolCtx,
+          traces,
+        ),
+        abortWhen(options.signal),
+      ]);
       if (result.stopReason === "aborted" || toolCtx.signal?.aborted || options.signal?.aborted) {
         const err = new Error("aborted");
         err.name = "AbortError";