let5see/clawdbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gateway: honor agent timeout for chat.send (#229)

Browse Source 
Co-authored-by: clawd@msch <clawd@msch>
This commit is contained in:
Martin Schürrer
2026-01-06 03:45:02 +01:00
committed by GitHub
parent 9b5610aa45
commit d83ca74c18
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gateway/server-bridge.ts
View File

@@ -886,10 +886,6 @@ export function createBridgeHandlers(ctx: BridgeHandlersContext) {
timeoutMs?: number; timeoutMs?: number;
idempotencyKey: string; idempotencyKey: string;
}; };
const timeoutMs = Math.min(
Math.max(p.timeoutMs ?? 30_000, 0),
30_000,
);
const normalizedAttachments = const normalizedAttachments =
p.attachments?.map((a) => ({ p.attachments?.map((a) => ({
type: typeof a?.type === "string" ? a.type : undefined, type: typeof a?.type === "string" ? a.type : undefined,
@@ -928,7 +924,17 @@ export function createBridgeHandlers(ctx: BridgeHandlersContext) {
} }
} }
const { storePath, store, entry } = loadSessionEntry(p.sessionKey); const { cfg, storePath, store, entry } = loadSessionEntry(
p.sessionKey,
);
const defaultTimeoutMs = Math.max(
Math.floor((cfg.agent?.timeoutSeconds ?? 600) * 1000),
0,
);
const timeoutMs =
typeof p.timeoutMs === "number" && Number.isFinite(p.timeoutMs)
? Math.max(0, Math.floor(p.timeoutMs))
: defaultTimeoutMs;
const now = Date.now(); const now = Date.now();
const sessionId = entry?.sessionId ?? randomUUID(); const sessionId = entry?.sessionId ?? randomUUID();
const sessionEntry: SessionEntry = { const sessionEntry: SessionEntry = {

9
src/gateway/server-methods/chat.ts
View File

@@ -154,7 +154,6 @@ export const chatHandlers: GatewayRequestHandlers = {
timeoutMs?: number; timeoutMs?: number;
idempotencyKey: string; idempotencyKey: string;
}; };
const timeoutMs = Math.min(Math.max(p.timeoutMs ?? 30_000, 0), 30_000);
const normalizedAttachments = const normalizedAttachments =
p.attachments?.map((a) => ({ p.attachments?.map((a) => ({
type: typeof a?.type === "string" ? a.type : undefined, type: typeof a?.type === "string" ? a.type : undefined,
@@ -189,6 +188,14 @@ export const chatHandlers: GatewayRequestHandlers = {
} }
} }
const { cfg, storePath, store, entry } = loadSessionEntry(p.sessionKey); const { cfg, storePath, store, entry } = loadSessionEntry(p.sessionKey);
const defaultTimeoutMs = Math.max(
Math.floor((cfg.agent?.timeoutSeconds ?? 600) * 1000),
0,
);
const timeoutMs =
typeof p.timeoutMs === "number" && Number.isFinite(p.timeoutMs)
? Math.max(0, Math.floor(p.timeoutMs))
: defaultTimeoutMs;
const now = Date.now(); const now = Date.now();
const sessionId = entry?.sessionId ?? randomUUID(); const sessionId = entry?.sessionId ?? randomUUID();
const sessionEntry: SessionEntry = { const sessionEntry: SessionEntry = {