bare-agent 0.34.0 → 0.36.0

package/src/provider-openai.d.ts

@@ -17,10 +17,19 @@ export type OpenAIOptions = {
     /**
      * - BA-18: request/idle timeout in ms. Bounds a silent or
      * never-answering socket on inactivity so `generate()` rejects with a retryable `TimeoutError`
-     * (`code: 'ETIMEDOUT'`) instead of hanging until the OS TCP timeout (~2h). `0`/`Infinity`
-     * disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
+     * (`code: 'ETIMEDOUT'`, `context.bound: 'idle'`) instead of hanging until the OS TCP timeout (~2h).
+     * `0`/`Infinity` disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
      */
     timeoutMs?: number | undefined;
+    /**
+     * - BA-19: TOTAL call-duration deadline in ms, beside `timeoutMs`.
+     * The idle bound resets on any socket activity, so a response that trickles a byte forever never
+     * trips it and hangs for hours. This is an absolute, non-resetting ceiling; on trip, `generate()`
+     * rejects with a TERMINAL `TimeoutError` (`code: 'EDEADLINE'`, `context.bound: 'deadline'`,
+     * `retryable: false`). DISABLED by default; `0`/`Infinity` disable. Overridable per call via
+     * `generate(..., { deadlineMs })`.
+     */
+    deadlineMs?: number | undefined;
 };
 /**
  * @typedef {object} OpenAIOptions
@@ -34,8 +43,14 @@ export type OpenAIOptions = {
  *   debugging only.
  * @property {number} [timeoutMs=600000] - BA-18: request/idle timeout in ms. Bounds a silent or
  *   never-answering socket on inactivity so `generate()` rejects with a retryable `TimeoutError`
- *   (`code: 'ETIMEDOUT'`) instead of hanging until the OS TCP timeout (~2h). `0`/`Infinity`
- *   disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
+ *   (`code: 'ETIMEDOUT'`, `context.bound: 'idle'`) instead of hanging until the OS TCP timeout (~2h).
+ *   `0`/`Infinity` disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
+ * @property {number} [deadlineMs=0] - BA-19: TOTAL call-duration deadline in ms, beside `timeoutMs`.
+ *   The idle bound resets on any socket activity, so a response that trickles a byte forever never
+ *   trips it and hangs for hours. This is an absolute, non-resetting ceiling; on trip, `generate()`
+ *   rejects with a TERMINAL `TimeoutError` (`code: 'EDEADLINE'`, `context.bound: 'deadline'`,
+ *   `retryable: false`). DISABLED by default; `0`/`Infinity` disable. Overridable per call via
+ *   `generate(..., { deadlineMs })`.
  */
 export class OpenAIProvider {
     /**
@@ -47,11 +62,12 @@ export class OpenAIProvider {
     baseUrl: string;
     exposeErrorBody: boolean;
     timeoutMs: number | undefined;
+    deadlineMs: number | undefined;
     /**
      * Generate a response from the OpenAI API.
      * @param {Message[]} messages - Conversation messages.
      * @param {ToolDef[]} [tools=[]] - Tool definitions.
-     * @param {Record<string, any>} [options={}] - Options (temperature, maxTokens, timeoutMs — a per-call override of the constructor's `timeoutMs`; see BA-18).
+     * @param {Record<string, any>} [options={}] - Options (temperature, maxTokens, timeoutMs — a per-call override of the constructor's `timeoutMs`, see BA-18; deadlineMs — a per-call override of the constructor's `deadlineMs`, see BA-19).
      * @returns {Promise<GenerateResult>}
      * @throws {Error} `[OpenAIProvider] ...` — on HTTP errors (4xx/5xx) or invalid JSON response.
      */
@@ -73,8 +89,9 @@ export class OpenAIProvider {
      * @param {string} path
      * @param {Record<string, any>} body
      * @param {number} [timeoutMs=0] - Idle-socket timeout (ms); 0 disables. See BA-18 / provider-http.
+     * @param {number} [deadlineMs=0] - Total call-duration deadline (ms); 0 disables. See BA-19 / provider-http.
      * @returns {Promise<any>}
      */
-    _request(path: string, body: Record<string, any>, timeoutMs?: number): Promise<any>;
+    _request(path: string, body: Record<string, any>, timeoutMs?: number, deadlineMs?: number): Promise<any>;
     _warnedInsecure: boolean | undefined;
 }

package/src/provider-openai.js

@@ -5,7 +5,7 @@ const http = require('http');
 const { ProviderError } = require('./errors');
 const { requestWithTemperatureFallback } = require('./provider-temperature');
 const { normalizeStopReason } = require('./provider-stop-reason');
-const { resolveTimeoutMs, applyRequestTimeout } = require('./provider-http');
+const { resolveTimeoutMs, applyRequestBounds } = require('./provider-http');
 
 /** @typedef {import('../types').Message} Message */
 /** @typedef {import('../types').ToolDef} ToolDef */
@@ -30,8 +30,14 @@ function isLoopbackHost(hostname) {
  *   debugging only.
  * @property {number} [timeoutMs=600000] - BA-18: request/idle timeout in ms. Bounds a silent or
  *   never-answering socket on inactivity so `generate()` rejects with a retryable `TimeoutError`
- *   (`code: 'ETIMEDOUT'`) instead of hanging until the OS TCP timeout (~2h). `0`/`Infinity`
- *   disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
+ *   (`code: 'ETIMEDOUT'`, `context.bound: 'idle'`) instead of hanging until the OS TCP timeout (~2h).
+ *   `0`/`Infinity` disables it (pre-BA-18 behaviour). Overridable per call via `generate(..., { timeoutMs })`.
+ * @property {number} [deadlineMs=0] - BA-19: TOTAL call-duration deadline in ms, beside `timeoutMs`.
+ *   The idle bound resets on any socket activity, so a response that trickles a byte forever never
+ *   trips it and hangs for hours. This is an absolute, non-resetting ceiling; on trip, `generate()`
+ *   rejects with a TERMINAL `TimeoutError` (`code: 'EDEADLINE'`, `context.bound: 'deadline'`,
+ *   `retryable: false`). DISABLED by default; `0`/`Infinity` disable. Overridable per call via
+ *   `generate(..., { deadlineMs })`.
  */
 
 class OpenAIProvider {
@@ -45,13 +51,15 @@ class OpenAIProvider {
     this.exposeErrorBody = options.exposeErrorBody === true;
     // BA-18: request/idle timeout (ms). Resolved at call time (default 600000; 0/Infinity disable).
     this.timeoutMs = options.timeoutMs;
+    // BA-19: total call-duration deadline (ms). Resolved at call time (default 0 = disabled).
+    this.deadlineMs = options.deadlineMs;
   }
 
   /**
    * Generate a response from the OpenAI API.
    * @param {Message[]} messages - Conversation messages.
    * @param {ToolDef[]} [tools=[]] - Tool definitions.
-   * @param {Record<string, any>} [options={}] - Options (temperature, maxTokens, timeoutMs — a per-call override of the constructor's `timeoutMs`; see BA-18).
+   * @param {Record<string, any>} [options={}] - Options (temperature, maxTokens, timeoutMs — a per-call override of the constructor's `timeoutMs`, see BA-18; deadlineMs — a per-call override of the constructor's `deadlineMs`, see BA-19).
    * @returns {Promise<GenerateResult>}
    * @throws {Error} `[OpenAIProvider] ...` — on HTTP errors (4xx/5xx) or invalid JSON response.
    */
@@ -73,8 +81,9 @@ class OpenAIProvider {
     // BA-10: newer models (o1/gpt-5-class) reject a non-default `temperature` with a 400 — drop it and
     // retry once. `temperatureDropped` flows back so an upstream receipt can report the effective value.
     const timeoutMs = resolveTimeoutMs(this.timeoutMs, options.timeoutMs);
+    const deadlineMs = resolveTimeoutMs(this.deadlineMs, options.deadlineMs, 0, 'deadlineMs');
     const { data, temperatureDropped } = await requestWithTemperatureFallback({
-      request: () => this._request('/chat/completions', body, timeoutMs),
+      request: () => this._request('/chat/completions', body, timeoutMs, deadlineMs),
       hadTemperature: () => body.temperature != null,
       stripTemperature: () => { delete body.temperature; },
       warnOnce: () => this._warnTemperatureDropped(),
@@ -133,9 +142,10 @@ class OpenAIProvider {
    * @param {string} path
    * @param {Record<string, any>} body
    * @param {number} [timeoutMs=0] - Idle-socket timeout (ms); 0 disables. See BA-18 / provider-http.
+   * @param {number} [deadlineMs=0] - Total call-duration deadline (ms); 0 disables. See BA-19 / provider-http.
    * @returns {Promise<any>}
    */
-  _request(path, body, timeoutMs = 0) {
+  _request(path, body, timeoutMs = 0, deadlineMs = 0) {
     return new Promise((resolve, reject) => {
       const url = new URL(this.baseUrl + path);
       const transport = url.protocol === 'https:' ? https : http;
@@ -177,7 +187,7 @@ class OpenAIProvider {
           }
         });
       });
-      applyRequestTimeout(req, timeoutMs, 'OpenAIProvider');
+      applyRequestBounds(req, { timeoutMs, deadlineMs }, 'OpenAIProvider');
       req.on('error', reject);
       req.write(payload);
       req.end();