freddie 0.0.98 → 0.0.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freddie",
-  "version": "0.0.98",
+  "version": "0.0.100",
   "type": "module",
   "description": "Open JS agent harness built on pi-mono, floosie, xstate, and anentrypoint-design",
   "bin": {
@@ -27,7 +27,7 @@
     "xstate": "^5.31.0",
     "zod": "^4.0.0",
     "anentrypoint-design": "^0.0.94",
-    "acptoapi": "^1.0.59"
+    "acptoapi": "^1.0.63"
   },
   "optionalDependencies": {
     "@libsql/darwin-arm64": "0.3.19",

package/plugins/gui-llm-passthrough/plugin.js

@@ -1,44 +1,44 @@
-import { resolveCallLLM } from '../../src/agent/llm_resolver.js'
+import { createRequire } from 'module'
+import { getConfigValue } from '../../src/config.js'
+import { MATRIX_FILE } from '../../src/agent/model-matrix.js'
 import { flattenForOpenAI } from '../../src/agent/model-discovery.js'
 import { logger } from '../../src/observability/log.js'
 
+const _require = createRequire(import.meta.url)
+const sdk = _require('acptoapi')
 const log = logger('gui-llm-passthrough')
 
+function matrixSource() { return process.env.FREDDIE_MATRIX_URL || MATRIX_FILE }
+
 export default {
     name: 'gui-llm-passthrough', surfaces: 'gui',
     register({ gui }) {
-        gui.route('GET', '/v1/models', (_, res) => {
-            const data = flattenForOpenAI()
-            if (data.length === 0) data.push({ id: 'freddie/auto', object: 'model', created: Math.floor(Date.now() / 1000), owned_by: 'freddie' })
-            res.json({ object: 'list', data })
+        gui.route('GET', '/v1/models', async (_, res) => {
+            try {
+                const rows = await sdk.listAllModelsAndQueues({ queuesMap: getConfigValue('agent.model_queues', {}) || {}, matrixSource: matrixSource() })
+                const local = flattenForOpenAI()
+                const seen = new Set(rows.map(r => r.id))
+                for (const r of local) if (!seen.has(r.id)) rows.push(r)
+                if (rows.length === 0) rows.push({ id: 'freddie/auto', object: 'model', created: Math.floor(Date.now() / 1000), owned_by: 'freddie' })
+                res.json({ object: 'list', data: rows })
+            } catch (e) { log.error('list-models-failed', { error: String(e.message || e) }); res.json({ object: 'list', data: flattenForOpenAI() }) }
         })
         gui.route('POST', '/v1/chat/completions', async (req, res) => {
             const { model, messages, tools, stream } = req.body || {}
             if (!Array.isArray(messages) || messages.length === 0) return res.status(400).json({ error: { message: 'messages required' } })
             try {
-                let provider, mdl
-                if (typeof model === 'string' && model.includes('/')) {
-                    const idx = model.indexOf('/'); provider = model.slice(0, idx); mdl = model.slice(idx + 1)
-                }
-                const call = resolveCallLLM({ provider, model: mdl })
-                const out = await call({ messages, tools: tools?.map(t => ({ name: t.function?.name, description: t.function?.description, parameters: t.function?.parameters })) || [], model: mdl })
-                const id = 'chatcmpl-' + Math.random().toString(36).slice(2, 12)
-                const created = Math.floor(Date.now() / 1000)
-                const choice = { index: 0, message: { role: 'assistant', content: out.content || '', ...(out.tool_calls?.length ? { tool_calls: out.tool_calls.map(tc => ({ id: tc.id, type: 'function', function: { name: tc.name, arguments: JSON.stringify(tc.arguments || {}) } })) } : {}) }, finish_reason: 'stop' }
+                const out = await sdk.chat({ model: model || 'freddie/auto', messages, tools, queuesMap: getConfigValue('agent.model_queues', {}) || {}, matrixSource: matrixSource(), output: 'openai' })
                 if (stream) {
-                    res.setHeader('content-type', 'text/event-stream')
-                    res.setHeader('cache-control', 'no-cache')
-                    res.write(`data: ${JSON.stringify({ id, object: 'chat.completion.chunk', created, model: model || 'freddie/auto', choices: [{ index: 0, delta: { role: 'assistant', content: out.content || '' }, finish_reason: null }] })}\n\n`)
+                    const id = 'chatcmpl-' + Math.random().toString(36).slice(2, 12)
+                    const created = Math.floor(Date.now() / 1000)
+                    const content = out?.choices?.[0]?.message?.content || ''
+                    res.setHeader('content-type', 'text/event-stream'); res.setHeader('cache-control', 'no-cache')
+                    res.write(`data: ${JSON.stringify({ id, object: 'chat.completion.chunk', created, model: model || 'freddie/auto', choices: [{ index: 0, delta: { role: 'assistant', content }, finish_reason: null }] })}\n\n`)
                     res.write(`data: ${JSON.stringify({ id, object: 'chat.completion.chunk', created, model: model || 'freddie/auto', choices: [{ index: 0, delta: {}, finish_reason: 'stop' }] })}\n\n`)
-                    res.write('data: [DONE]\n\n')
-                    res.end()
-                    return
+                    res.write('data: [DONE]\n\n'); res.end(); return
                 }
-                res.json({ id, object: 'chat.completion', created, model: model || 'freddie/auto', choices: [choice], usage: { prompt_tokens: 0, completion_tokens: 0, total_tokens: 0 } })
-            } catch (e) {
-                log.error('chat-completions-failed', { error: String(e.message || e) })
-                res.status(500).json({ error: { message: String(e.message || e), type: 'upstream_error' } })
-            }
+                res.json(out)
+            } catch (e) { log.error('chat-completions-failed', { error: String(e.message || e) }); res.status(500).json({ error: { message: String(e.message || e), type: 'upstream_error' } }) }
         })
     },
 }

package/plugins/gui-models-discover/plugin.js

@@ -1,10 +1,12 @@
+import { createRequire } from 'module'
 import { discoverAndPersist, listKnownProviders } from '../../src/agent/model-discovery.js'
-import { PROVIDER_KEYS, DEFAULTS } from '../../src/agent/llm_resolver.js'
 import { getConfigValue, saveConfigValue } from '../../src/config.js'
-import { getStatus } from '../../src/agent/model-sampler.js'
+import { MATRIX_FILE } from '../../src/agent/model-matrix.js'
 import fs from 'node:fs'
 import path from 'node:path'
 import { spawn } from 'node:child_process'
+const _require = createRequire(import.meta.url)
+const { PROVIDER_KEYS, PROVIDER_DEFAULTS: DEFAULTS, getStatus, peekStatus, listAllQueues } = _require('acptoapi')
 
 const MATRIX_PATH = path.resolve(new URL('.', import.meta.url).pathname.replace(/^\/([A-Za-z]:)/, '$1'), '..', '..', '.gm', 'model-availability.json')
 let _rebuildInFlight = null
@@ -18,7 +20,19 @@ export default {
             try { const provider = req.body?.provider; const result = await discoverAndPersist({ provider }); res.json(result) }
             catch (e) { res.status(500).json({ error: String(e.message || e) }) }
         })
-        gui.route('GET', '/api/models/queues', (_, res) => res.json(getConfigValue('agent.model_queues', {}) || {}))
+        gui.route('GET', '/api/models/queues', (_, res) => {
+            const local = getConfigValue('agent.model_queues', {}) || {}
+            try {
+                const all = listAllQueues({ queuesMap: local })
+                const merged = { ...local }
+                for (const q of all) if (!merged[q.name]) merged[q.name] = q.links.map(m => ({ model: m, source: q.source }))
+                res.json(merged)
+            } catch { res.json(local) }
+        })
+        gui.route('GET', '/api/models/sampler/peek/:provider', (req, res) => {
+            try { res.json(peekStatus(req.params.provider)) }
+            catch (e) { res.status(500).json({ error: String(e.message || e) }) }
+        })
         gui.route('POST', '/api/models/queues', (req, res) => {
             const { name, entries } = req.body || {}
             if (!name || !Array.isArray(entries)) return res.status(400).json({ error: 'name and entries[] required' })

package/plugins/gui-profiles-commands-health/plugin.js

@@ -2,11 +2,9 @@ import { createRequire } from 'module'
 import { listAllProfiles } from '../../src/commands/profile.js'
 import { COMMAND_REGISTRY } from '../../src/commands/registry.js'
 import { getFreddieHome } from '../../src/home.js'
-import { PROVIDER_KEYS, DEFAULTS } from '../../src/agent/llm_resolver.js'
-import { getStatus } from '../../src/agent/model-sampler.js'
 import { resolveKey } from '../../src/agent/credential_sources.js'
 const _require = createRequire(import.meta.url)
-const { probeModels, getCachedModels } = _require('acptoapi')
+const { probeModels, getCachedModels, PROVIDER_KEYS, PROVIDER_DEFAULTS: DEFAULTS, getStatus, peekStatus } = _require('acptoapi')
 export default {
     name: 'gui-profiles-commands-health', surfaces: 'gui',
     register({ gui }) {

package/src/agent/llm_resolver.js

@@ -1,6 +1,7 @@
 import { createRequire } from 'module'
 import { getConfigValue } from '../config.js'
 import { MATRIX_FILE } from './model-matrix.js'
+import { callLLM as bridgeCall, isReachable as bridgeReachable } from './acptoapi-bridge.js'
 export { matrixUsable } from './model-matrix.js'
 
 const _require = createRequire(import.meta.url)
@@ -46,7 +47,12 @@ export function resolveCallLLM({ provider, model } = {}) {
             throw new Error('no LLM backend reachable: set a provider API key or start acptoapi (http://127.0.0.1:4800/v1)' + (status ? ' | sampler: ' + status : ''))
         }
         try {
-            const r = await sdk.chat({ model: m, messages: toMsgs(input.messages), tools: toTools(input.tools), queuesMap: getConfigValue('agent.model_queues', {}) || {}, matrixSource: process.env.FREDDIE_MATRIX_URL || MATRIX_FILE, onFallback: input.onFallback, output: 'openai' })
+            const isSimple = typeof m === 'string' && !m.includes(',') && !/^queue\//.test(m)
+            if (isSimple && await bridgeReachable()) return await bridgeCall({ ...input, model: m })
+            const opts = { model: m, messages: toMsgs(input.messages), tools: toTools(input.tools), onFallback: input.onFallback, output: 'openai' }
+            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
+            const r = await sdk.chat(opts)
             return adapt(r)
         } catch (e) {
             if (/queue not found or empty/i.test(e.message)) throw e