@botbotgo/agent-harness 0.0.35 → 0.0.37

package/dist/package-version.d.ts

@@ -1 +1 @@
-export declare const AGENT_HARNESS_VERSION = "0.0.34";
+export declare const AGENT_HARNESS_VERSION = "0.0.36";

package/dist/package-version.js

@@ -1 +1 @@
-export const AGENT_HARNESS_VERSION = "0.0.34";
+export const AGENT_HARNESS_VERSION = "0.0.36";

package/dist/runtime/agent-runtime-adapter.js

@@ -32,6 +32,16 @@ function asObject(value) {
 function resolveTimeoutMs(value) {
     return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
 }
+function computeRemainingTimeoutMs(deadlineAt, fallbackTimeoutMs) {
+    if (!deadlineAt) {
+        return fallbackTimeoutMs;
+    }
+    const remaining = deadlineAt - Date.now();
+    if (remaining <= 0) {
+        return 0;
+    }
+    return fallbackTimeoutMs ? Math.min(fallbackTimeoutMs, remaining) : remaining;
+}
 function isPlaceholderApiKey(value) {
     return typeof value === "string" && value.trim().toLowerCase() === "dummy";
 }
@@ -209,11 +219,27 @@ export class AgentRuntimeAdapter {
             });
         });
     }
-    async *iterateWithTimeout(iterable, timeoutMs, operation) {
+    async *iterateWithTimeout(iterable, timeoutMs, operation, deadlineAt, deadlineTimeoutMs) {
         const iterator = iterable[Symbol.asyncIterator]();
         try {
             for (;;) {
-                const next = await this.withTimeout(() => iterator.next(), timeoutMs, operation, "stream");
+                const effectiveTimeoutMs = computeRemainingTimeoutMs(deadlineAt, timeoutMs);
+                if (effectiveTimeoutMs !== undefined && effectiveTimeoutMs <= 0) {
+                    throw new RuntimeOperationTimeoutError(operation, deadlineTimeoutMs ?? timeoutMs ?? 0, "invoke");
+                }
+                let next;
+                try {
+                    next = await this.withTimeout(() => iterator.next(), effectiveTimeoutMs, operation, "stream");
+                }
+                catch (error) {
+                    if (error instanceof RuntimeOperationTimeoutError &&
+                        deadlineAt &&
+                        deadlineTimeoutMs &&
+                        effectiveTimeoutMs !== timeoutMs) {
+                        throw new RuntimeOperationTimeoutError(operation, deadlineTimeoutMs, "invoke");
+                    }
+                    throw error;
+                }
                 if (next.done) {
                     return;
                 }
@@ -591,6 +617,7 @@ export class AgentRuntimeAdapter {
         try {
             const invokeTimeoutMs = this.resolveBindingTimeout(binding);
             const streamIdleTimeoutMs = this.resolveStreamIdleTimeout(binding);
+            const streamDeadlineAt = invokeTimeoutMs ? Date.now() + invokeTimeoutMs : undefined;
             if (binding.langchainAgentParams) {
                 const langchainParams = binding.langchainAgentParams;
                 const resolvedModel = (await this.resolveModel(binding.langchainAgentParams.model));
@@ -605,8 +632,8 @@ export class AgentRuntimeAdapter {
                 // agent loop and only adds an extra model round-trip before the runnable path.
                 if (canUseDirectModelStream && typeof model.stream === "function") {
                     let emitted = false;
-                    const stream = await this.withTimeout(() => model.stream(this.buildRawModelMessages(langchainParams.systemPrompt, history, input)), invokeTimeoutMs, "model stream start", "stream");
-                    for await (const chunk of this.iterateWithTimeout(stream, streamIdleTimeoutMs, "model stream")) {
+                    const stream = await this.withTimeout(() => model.stream(this.buildRawModelMessages(langchainParams.systemPrompt, history, input)), computeRemainingTimeoutMs(streamDeadlineAt, invokeTimeoutMs), "model stream start", "stream");
+                    for await (const chunk of this.iterateWithTimeout(stream, streamIdleTimeoutMs, "model stream", streamDeadlineAt, invokeTimeoutMs)) {
                         const delta = readStreamDelta(chunk);
                         if (delta) {
                             emitted = true;
@@ -626,12 +653,12 @@ export class AgentRuntimeAdapter {
             const runnable = await this.create(binding);
             const request = { messages: this.buildAgentMessages(history, input) };
             if (typeof runnable.streamEvents === "function") {
-                const events = await this.withTimeout(() => runnable.streamEvents(request, { configurable: { thread_id: threadId }, version: "v2" }), invokeTimeoutMs, "agent streamEvents start", "stream");
+                const events = await this.withTimeout(() => runnable.streamEvents(request, { configurable: { thread_id: threadId }, version: "v2" }), computeRemainingTimeoutMs(streamDeadlineAt, invokeTimeoutMs), "agent streamEvents start", "stream");
                 const allowVisibleStreamDeltas = Boolean(binding.langchainAgentParams);
                 let emittedOutput = "";
                 const seenTerminalOutputs = new Set();
                 let lastStep = "";
-                for await (const event of this.iterateWithTimeout(events, streamIdleTimeoutMs, "agent streamEvents")) {
+                for await (const event of this.iterateWithTimeout(events, streamIdleTimeoutMs, "agent streamEvents", streamDeadlineAt, invokeTimeoutMs)) {
                     const interruptPayload = extractInterruptPayload(event);
                     if (interruptPayload) {
                         yield { kind: "interrupt", content: interruptPayload };
@@ -691,9 +718,9 @@ export class AgentRuntimeAdapter {
                 }
             }
             if (binding.langchainAgentParams && typeof runnable.stream === "function") {
-                const stream = await this.withTimeout(() => runnable.stream(request, { configurable: { thread_id: threadId } }), invokeTimeoutMs, "agent stream start", "stream");
+                const stream = await this.withTimeout(() => runnable.stream(request, { configurable: { thread_id: threadId } }), computeRemainingTimeoutMs(streamDeadlineAt, invokeTimeoutMs), "agent stream start", "stream");
                 let emitted = false;
-                for await (const chunk of this.iterateWithTimeout(stream, streamIdleTimeoutMs, "agent stream")) {
+                for await (const chunk of this.iterateWithTimeout(stream, streamIdleTimeoutMs, "agent stream", streamDeadlineAt, invokeTimeoutMs)) {
                     const delta = readStreamDelta(chunk);
                     if (delta) {
                         emitted = true;

package/dist/runtime/tool-hitl.js

@@ -2,6 +2,7 @@ import { interrupt } from "@langchain/langgraph";
 import path from "node:path";
 const DEDUPED_REMOTE_TOOL_NAMES = new Set(["builtin.fetch_url", "builtin.web_search"]);
 const PATH_LIKE_INPUT_KEYS = new Set(["path", "root", "dir", "directory", "cwd"]);
+const ROOT_SCOPING_INPUT_KEYS = new Set(["root", "dir", "directory", "cwd"]);
 function toInputPreview(input) {
     if (typeof input === "object" && input && !Array.isArray(input)) {
         return input;
@@ -129,6 +130,10 @@ function guardWorkspaceBoundToolInput(input, compiledTool, binding) {
         const absolute = path.resolve(workspaceRoot, candidate);
         const relative = path.relative(workspaceRoot, absolute);
         if (relative.startsWith("..") || path.isAbsolute(relative)) {
+            if (ROOT_SCOPING_INPUT_KEYS.has(key)) {
+                record[key] = workspaceRoot;
+                continue;
+            }
             throw new Error(`Tool ${compiledTool.name} input ${key} resolves outside the workspace root`);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@botbotgo/agent-harness",
-  "version": "0.0.35",
+  "version": "0.0.37",
   "description": "Agent Harness framework package",
   "type": "module",
   "packageManager": "npm@10.9.2",