@hallofame/cloudflare-agent 0.1.9 → 0.1.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hallofame/cloudflare-agent",
-  "version": "0.1.9",
+  "version": "0.1.10",
   "description": "Hall Of Fame autonomous agent for Cloudflare Agents and Workers AI",
   "type": "module",
   "license": "MIT",

package/src/HallOfFameAgent.ts

@@ -4,6 +4,7 @@ import { activityPrompt, systemPrompt } from './prompt'
 import { Agent } from 'agents'
 import { HallOfFameClient } from './HallOfFameClient'
 import { SocialMemory } from './SocialMemory'
+import { WorkersAIResponse } from './WorkersAIResponse'
 
 const TOKEN_KEY = 'halloffame-token'
 const DEFAULT_MODEL = '@cf/google/gemma-4-26b-a4b-it'
@@ -12,11 +13,6 @@ const MAX_TOOL_STEPS = 12
 
 type ModelMessage = Record<string, unknown>
 
-interface ModelResponse {
-  response?: string
-  tool_calls?: unknown[]
-}
-
 interface ActivityContext {
   checks: Record<string, 'ok' | 'unavailable'>
   data: Record<string, unknown>
@@ -179,14 +175,18 @@ export class HallOfFameAgent extends Agent<Env, AgentState> {
           ...(visionImage ? { image: visionImage } : {}),
         }
         visionImage = undefined
-        const result = (await this.env.AI.run(
+        const rawResult = await this.env.AI.run(
           (this.env.HOF_MODEL ?? DEFAULT_MODEL) as keyof AiModels,
           input as never,
-        )) as ModelResponse
-        const calls = this.parseToolCalls(result.tool_calls)
+        )
+        const result = new WorkersAIResponse(rawResult).normalize()
+        const calls = this.parseToolCalls(result.toolCalls)
 
         if (calls.length === 0) {
-          const summary = result.response?.trim() || 'Activity cycle completed without a summary.'
+          if (!result.text) {
+            throw new Error('Workers AI returned neither text nor tool calls.')
+          }
+          const summary = result.text
           const updatedMemory = memory.addActivity(summary)
           this.setState({
             ...this.state,
@@ -203,8 +203,8 @@ export class HallOfFameAgent extends Agent<Env, AgentState> {
 
         messages.push({
           role: 'assistant',
-          content: result.response ?? '',
-          tool_calls: result.tool_calls,
+          content: result.text,
+          tool_calls: result.toolCalls,
         })
 
         for (const call of calls) {

package/src/WorkersAIResponse.ts

@@ -0,0 +1,44 @@
+export interface NormalizedModelResponse {
+  text: string
+  toolCalls: unknown[]
+}
+
+export class WorkersAIResponse {
+  constructor(private readonly value: unknown) {}
+
+  normalize(): NormalizedModelResponse {
+    const result = this.record(this.value)
+    const choice = Array.isArray(result.choices) ? this.record(result.choices[0]) : {}
+    const message = this.record(choice.message)
+    const content = result.response ?? message.content
+
+    return {
+      text: this.text(content),
+      toolCalls: this.toolCalls(result.tool_calls ?? message.tool_calls),
+    }
+  }
+
+  private text(value: unknown): string {
+    if (typeof value === 'string') return value.trim()
+    if (!Array.isArray(value)) return ''
+
+    return value
+      .map((part) => {
+        const item = this.record(part)
+
+        return typeof item.text === 'string' ? item.text : ''
+      })
+      .join('')
+      .trim()
+  }
+
+  private toolCalls(value: unknown): unknown[] {
+    return Array.isArray(value) ? value : []
+  }
+
+  private record(value: unknown): Record<string, unknown> {
+    return typeof value === 'object' && value !== null && !Array.isArray(value)
+      ? (value as Record<string, unknown>)
+      : {}
+  }
+}