@hybridaione/hybridclaw 0.2.3 → 0.2.7

package/container/src/extensions.ts

@@ -16,14 +16,22 @@ interface RuntimeEventPayload {
 interface RuntimeExtension {
   name: string;
   onEvent?: (payload: RuntimeEventPayload) => void | Promise<void>;
-  onBeforeToolCall?: (toolName: string, args: Record<string, unknown>) => string | null | Promise<string | null>;
-  onAfterToolCall?: (toolName: string, args: Record<string, unknown>, result: string) => void | Promise<void>;
+  onBeforeToolCall?: (
+    toolName: string,
+    args: Record<string, unknown>,
+  ) => string | null | Promise<string | null>;
+  onAfterToolCall?: (
+    toolName: string,
+    args: Record<string, unknown>,
+    result: string,
+  ) => void | Promise<void>;
 }
 
 const DANGEROUS_FILE_CONTENT_PATTERNS: Array<{ re: RegExp; reason: string }> = [
   {
     re: /\brm\s+-rf\s+\/(\s|$)/i,
-    reason: 'Detected destructive root delete pattern (`rm -rf /`) in file content.',
+    reason:
+      'Detected destructive root delete pattern (`rm -rf /`) in file content.',
   },
   {
     re: /:\(\)\s*\{.*\};\s*:/i,
@@ -31,7 +39,8 @@ const DANGEROUS_FILE_CONTENT_PATTERNS: Array<{ re: RegExp; reason: string }> = [
   },
   {
     re: /\bcurl\b[^\n|]*\|\s*(sh|bash|zsh)\b/i,
-    reason: 'Detected remote shell execution pattern (`curl | sh`) in file content.',
+    reason:
+      'Detected remote shell execution pattern (`curl | sh`) in file content.',
   },
 ];
 
@@ -50,9 +59,10 @@ const securityHookExtension: RuntimeExtension = {
   name: 'security-hook',
   onBeforeToolCall: (toolName, args) => {
     if (toolName === 'write' || toolName === 'edit') {
-      const content = toolName === 'write'
-        ? String(args.contents || '')
-        : String(args.new || '');
+      const content =
+        toolName === 'write'
+          ? String(args.contents || '')
+          : String(args.new || '');
       for (const pattern of DANGEROUS_FILE_CONTENT_PATTERNS) {
         if (pattern.re.test(content)) return pattern.reason;
       }
@@ -74,14 +84,17 @@ const runtimeExtensions: RuntimeExtension[] = [securityHookExtension];
 function parseArgs(argsJson: string): Record<string, unknown> {
   try {
     const parsed = JSON.parse(argsJson) as unknown;
-    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) return {};
+    if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed))
+      return {};
     return parsed as Record<string, unknown>;
   } catch {
     return {};
   }
 }
 
-export async function emitRuntimeEvent(payload: RuntimeEventPayload): Promise<void> {
+export async function emitRuntimeEvent(
+  payload: RuntimeEventPayload,
+): Promise<void> {
   for (const ext of runtimeExtensions) {
     if (!ext.onEvent) continue;
     try {
@@ -92,7 +105,10 @@ export async function emitRuntimeEvent(payload: RuntimeEventPayload): Promise<vo
   }
 }
 
-export async function runBeforeToolHooks(toolName: string, argsJson: string): Promise<string | null> {
+export async function runBeforeToolHooks(
+  toolName: string,
+  argsJson: string,
+): Promise<string | null> {
   const args = parseArgs(argsJson);
   for (const ext of runtimeExtensions) {
     if (!ext.onBeforeToolCall) continue;
@@ -112,11 +128,19 @@ export async function runBeforeToolHooks(toolName: string, argsJson: string): Pr
       // ignore broken extensions
     }
   }
-  await emitRuntimeEvent({ event: 'before_tool_call', toolName, blocked: false });
+  await emitRuntimeEvent({
+    event: 'before_tool_call',
+    toolName,
+    blocked: false,
+  });
   return null;
 }
 
-export async function runAfterToolHooks(toolName: string, argsJson: string, result: string): Promise<void> {
+export async function runAfterToolHooks(
+  toolName: string,
+  argsJson: string,
+  result: string,
+): Promise<void> {
   const args = parseArgs(argsJson);
   for (const ext of runtimeExtensions) {
     if (!ext.onAfterToolCall) continue;

package/container/src/hybridai-client.ts

@@ -1,4 +1,9 @@
-import type { ChatCompletionResponse, ChatMessage, ToolCall, ToolDefinition } from './types.js';
+import type {
+  ChatCompletionResponse,
+  ChatMessage,
+  ToolCall,
+  ToolDefinition,
+} from './types.js';
 
 export class HybridAIRequestError extends Error {
   status: number;
@@ -49,8 +54,9 @@ function buildRequestBody(
   enableRag: boolean,
   messages: ChatMessage[],
   tools: ToolDefinition[],
+  maxTokens?: number,
 ): Record<string, unknown> {
-  return {
+  const request: Record<string, unknown> = {
     model,
     chatbot_id: chatbotId,
     messages,
@@ -58,6 +64,14 @@ function buildRequestBody(
     tool_choice: 'auto',
     enable_rag: enableRag,
   };
+  if (
+    typeof maxTokens === 'number' &&
+    Number.isFinite(maxTokens) &&
+    maxTokens > 0
+  ) {
+    request.max_tokens = Math.floor(maxTokens);
+  }
+  return request;
 }
 
 function parseStreamPayloadLine(rawLine: string): string | null {
@@ -86,7 +100,10 @@ function ensureToolCall(toolCalls: ToolCall[], index: number): ToolCall {
   return toolCalls[index];
 }
 
-function mergeToolCallDelta(target: ToolCall, delta: StreamToolCallDelta): void {
+function mergeToolCallDelta(
+  target: ToolCall,
+  delta: StreamToolCallDelta,
+): void {
   if (typeof delta.id === 'string' && delta.id) {
     target.id = target.id ? `${target.id}${delta.id}` : delta.id;
   }
@@ -99,7 +116,10 @@ function mergeToolCallDelta(target: ToolCall, delta: StreamToolCallDelta): void
         ? `${target.function.name}${delta.function.name}`
         : delta.function.name;
     }
-    if (typeof delta.function.arguments === 'string' && delta.function.arguments) {
+    if (
+      typeof delta.function.arguments === 'string' &&
+      delta.function.arguments
+    ) {
       target.function.arguments += delta.function.arguments;
     }
   }
@@ -113,10 +133,18 @@ export async function callHybridAI(
   enableRag: boolean,
   messages: ChatMessage[],
   tools: ToolDefinition[],
+  maxTokens?: number,
 ): Promise<ChatCompletionResponse> {
   const url = `${baseUrl}/v1/chat/completions`;
 
-  const body = buildRequestBody(model, chatbotId, enableRag, messages, tools);
+  const body = buildRequestBody(
+    model,
+    chatbotId,
+    enableRag,
+    messages,
+    tools,
+    maxTokens,
+  );
 
   const response = await fetch(url, {
     method: 'POST',
@@ -144,11 +172,22 @@ export async function callHybridAIStream(
   messages: ChatMessage[],
   tools: ToolDefinition[],
   onTextDelta: (delta: string) => void,
+  maxTokens?: number,
 ): Promise<ChatCompletionResponse> {
   const url = `${baseUrl}/v1/chat/completions`;
   const body = {
-    ...buildRequestBody(model, chatbotId, enableRag, messages, tools),
+    ...buildRequestBody(
+      model,
+      chatbotId,
+      enableRag,
+      messages,
+      tools,
+      maxTokens,
+    ),
     stream: true,
+    stream_options: {
+      include_usage: true,
+    },
   };
 
   const response = await fetch(url, {
@@ -166,11 +205,13 @@ export async function callHybridAIStream(
     throw new HybridAIRequestError(response.status, text);
   }
 
-  const contentType = (response.headers.get('content-type') || '').toLowerCase();
+  const contentType = (
+    response.headers.get('content-type') || ''
+  ).toLowerCase();
   if (
-    contentType.includes('application/json')
-    && !contentType.includes('ndjson')
-    && !contentType.includes('event-stream')
+    contentType.includes('application/json') &&
+    !contentType.includes('ndjson') &&
+    !contentType.includes('event-stream')
   ) {
     return (await response.json()) as ChatCompletionResponse;
   }
@@ -208,10 +249,14 @@ export async function callHybridAIStream(
 
     sawPayload = true;
     if (typeof payload.id === 'string' && payload.id) streamId = payload.id;
-    if (typeof payload.model === 'string' && payload.model) streamModel = payload.model;
-    if (payload.usage && typeof payload.usage === 'object') usage = payload.usage;
-
-    const choice = Array.isArray(payload.choices) ? payload.choices[0] : undefined;
+    if (typeof payload.model === 'string' && payload.model)
+      streamModel = payload.model;
+    if (payload.usage && typeof payload.usage === 'object')
+      usage = payload.usage;
+
+    const choice = Array.isArray(payload.choices)
+      ? payload.choices[0]
+      : undefined;
     if (!choice) return;
 
     if (choice.message) {
@@ -249,7 +294,10 @@ export async function callHybridAIStream(
       }
       if (Array.isArray(delta.tool_calls) && delta.tool_calls.length > 0) {
         for (const callDelta of delta.tool_calls) {
-          const index = typeof callDelta.index === 'number' && callDelta.index >= 0 ? callDelta.index : 0;
+          const index =
+            typeof callDelta.index === 'number' && callDelta.index >= 0
+              ? callDelta.index
+              : 0;
           const target = ensureToolCall(toolCalls, index);
           mergeToolCallDelta(target, callDelta);
         }
@@ -293,7 +341,8 @@ export async function callHybridAIStream(
     throw new Error('Streaming response ended without payload');
   }
 
-  const finalFinishReason = finishReason || (toolCalls.length > 0 ? 'tool_calls' : 'stop');
+  const finalFinishReason =
+    finishReason || (toolCalls.length > 0 ? 'tool_calls' : 'stop');
   return {
     id: streamId || 'stream',
     model: streamModel,