freddie 0.0.112 → 0.0.114

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freddie",
-  "version": "0.0.112",
+  "version": "0.0.114",
   "type": "module",
   "description": "Open JS agent harness built on pi-mono, floosie, xstate, and anentrypoint-design",
   "bin": {
@@ -26,8 +26,8 @@
     "@mariozechner/pi-ai": "^0.70.6",
     "@mariozechner/pi-coding-agent": "^0.70.6",
     "@mariozechner/pi-tui": "^0.70.6",
-    "acptoapi": "^1.0.107",
-    "anentrypoint-design": "^0.0.132",
+    "acptoapi": "^1.0.112",
+    "anentrypoint-design": "^0.0.135",
     "commander": "^14.0.0",
     "express": "^5.0.0",
     "flatspace": "^1.0.18",

package/src/agent/acptoapi-bridge.js

@@ -32,14 +32,12 @@ export async function callLLM({ messages, tools = [], model } = {}) {
     const headers = { 'content-type': 'application/json', authorization: 'Bearer none' }
     const cwd = process.cwd()
     if (Array.isArray(tools) && tools.length) headers['x-cwd'] = cwd
-    // Fast-fail timeout + skip loopback when page is on a remote origin
-    // (gh-pages → http://localhost:4800 hangs forever under Chrome private-network rules).
-    const _u = (() => { try { return new URL(base, (typeof location !== 'undefined' && location.href) || 'http://_/') } catch { return null } })()
-    const _isLb = _u && /^(localhost|127\.0\.0\.1|0\.0\.0\.0|::1)$/i.test(_u.hostname)
-    const _pageLb = (() => { try { const h = ((typeof location !== 'undefined' && location.hostname) || '').toLowerCase(); return h === 'localhost' || h === '127.0.0.1' || h === '' || h === '::1' } catch { return true } })()
-    if (_isLb && !_pageLb) throw new Error(`acptoapi unreachable: page on ${typeof location !== 'undefined' ? location.hostname : '?'} cannot reach loopback ${base}`)
+    // Rely on AbortController timeout. acptoapi v1+ ships CORS + Private
+    // Network Access headers so cross-origin loopback (gh-pages → localhost)
+    // succeeds when acptoapi is running. The earlier preemptive loopback
+    // refusal caused false negatives on reachable endpoints.
     const _ac = new AbortController()
-    const _tid = setTimeout(() => _ac.abort(new Error('acptoapi fetch timeout')), 8000)
+    const _tid = setTimeout(() => _ac.abort(new Error('acptoapi fetch timeout')), 60000)
     let res
     try {
         res = await fetch(base.replace(/\/$/, '') + '/chat/completions', {

package/src/agent/llm_resolver.js

@@ -23,9 +23,26 @@ const toMsgs = ms => ms.map(m => {
 
 const tryJson = s => { try { return typeof s === 'string' ? JSON.parse(s) : (s || {}) } catch { return {} } }
 
+function flattenContent(c) {
+    // Anthropic-shape arrays (returned by ACP daemons routed through acptoapi)
+    // come as [{ type: 'text', text: '...' }, { type: 'tool_use', ... }]. Pull
+    // out concatenated text so the agent loop has something to display, and
+    // surface tool_use blocks separately so callers can map them.
+    if (typeof c === 'string') return { text: c, toolUses: [] }
+    if (Array.isArray(c)) {
+        const text = c.filter(p => p && (p.type === 'text' || typeof p.text === 'string')).map(p => p.text || '').join('')
+        const toolUses = c.filter(p => p && p.type === 'tool_use')
+        return { text, toolUses }
+    }
+    return { text: '', toolUses: [] }
+}
+
 function adapt(result) {
     const c = result?.choices?.[0]?.message || {}
-    return { content: typeof c.content === 'string' ? c.content : '', tool_calls: Array.isArray(c.tool_calls) ? c.tool_calls.map(tc => ({ id: tc.id, name: tc.function?.name, arguments: tryJson(tc.function?.arguments) })) : [], raw: result }
+    const flat = flattenContent(c.content)
+    const openaiTC = Array.isArray(c.tool_calls) ? c.tool_calls.map(tc => ({ id: tc.id, name: tc.function?.name, arguments: tryJson(tc.function?.arguments) })) : []
+    const anthropicTC = flat.toolUses.map(t => ({ id: t.id, name: t.name, arguments: t.input || {} }))
+    return { content: flat.text, tool_calls: openaiTC.concat(anthropicTC), raw: result }
 }
 
 // Names callers can use as model= to select a curated acptoapi chain.
@@ -70,7 +87,11 @@ export function resolveCallLLM({ provider, model } = {}) {
                 return await bridgeCall({ ...input, model: m })
             }
 
-            const opts = { model: m, messages: toMsgs(input.messages), tools: toTools(input.tools), onFallback: input.onFallback, output: 'openai' }
+            // fallbackOn list mirrors acptoapi/lib/named-chains.js FALLBACK_ON.
+            // Without this, comma-separated model lists default to ['error'] and
+            // rate-limited / empty / timed-out responses don't trigger chain
+            // fallback — the request just throws.
+            const opts = { model: m, messages: toMsgs(input.messages), tools: toTools(input.tools), onFallback: input.onFallback, output: 'openai', fallbackOn: ['error', 'rate_limit', 'timeout', 'empty'] }
             if (/^queue\//.test(m)) opts.queuesMap = getConfigValue('agent.model_queues', {}) || {}
             if (m.includes(',') || /^queue\//.test(m)) opts.matrixSource = process.env.FREDDIE_MATRIX_URL || MATRIX_FILE