freddie 0.0.123 → 0.0.124

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "freddie",
-  "version": "0.0.123",
+  "version": "0.0.124",
   "type": "module",
   "description": "Open JS agent harness built on pi-mono, floosie, xstate, and anentrypoint-design",
   "bin": {
@@ -18,16 +18,14 @@
     "start": "node bin/freddie.js",
     "test": "node test.js",
     "build:browser": "vite build --config vite.browser.config.js",
+    "build:browser-shim": "node scripts/browser-shim-build/build.mjs",
     "link-local-design": "node scripts/link-local-design.mjs"
   },
   "dependencies": {
-    "@anentrypoint/libsql-plugkit-client": "github:AnEntrypoint/libsql-plugkit-client",
     "@libsql/client": "^0.5.0",
-    "@mariozechner/pi-agent-core": "^0.70.6",
     "@mariozechner/pi-ai": "^0.70.6",
-    "@mariozechner/pi-coding-agent": "^0.70.6",
     "@mariozechner/pi-tui": "^0.70.6",
-    "acptoapi": "^1.0.140",
+    "acptoapi": "^1.0.144",
     "anentrypoint-design": "latest",
     "commander": "^14.0.0",
     "express": "^5.0.0",
@@ -36,10 +34,8 @@
     "gm-plugkit": "^2.0.1535",
     "gm-skill": "latest",
     "js-yaml": "^4.1.0",
-    "libsql-plugkit-client": "^0.0.10",
     "plugsdk": "^1.0.20",
-    "xstate": "^5.31.0",
-    "zod": "^4.0.0"
+    "xstate": "^5.31.0"
   },
   "optionalDependencies": {
     "@libsql/darwin-arm64": "0.3.19",
@@ -85,6 +81,7 @@
     "xstate"
   ],
   "devDependencies": {
+    "esbuild": "^0.28.0",
     "vite": "^8.0.13"
   }
 }

package/src/agent/acptoapi-bridge.js

@@ -11,10 +11,15 @@ const envVal = (k) => { try { return (typeof process !== 'undefined' && process.
 const ACPTOAPI_TIMEOUT_MS = Number(envVal('FREDDIE_LLM_TIMEOUT_MS')) || 240000
 
 export function getAcptoapiUrl() {
-    // Retained for callers that still read a URL for display/logging purposes
-    // (the dashboard health row, CLI banner) -- there is no listening port to
-    // reach any more; this is informational only.
-    return envVal('FREDDIE_LLM_URL') || 'in-process (acptoapi)'
+    // Returns the configured dialable acptoapi URL, or null when unset. Most
+    // callers (the dashboard health row, CLI banner) treat this as display/logging
+    // only -- there is no listening port required for the in-process callLLM()
+    // path below. However codex_responses_adapter.js, gemini_native_adapter.js,
+    // image_gen_provider.js, and model-discovery.js still fetch() this value as a
+    // live HTTP base and DO require a real dialable URL (FREDDIE_LLM_URL set) --
+    // they must guard against a null return rather than building a request
+    // against a placeholder string.
+    return envVal('FREDDIE_LLM_URL') || null
 }
 
 export function getAcptoapiModel() {

package/src/agent/codex_responses_adapter.js

@@ -4,7 +4,9 @@ import { isCodexModel } from '../cli/codex_models.js'
 
 export async function chat({ input, model = 'o3-mini', tools = [], reasoning_effort = 'medium' } = {}) {
     if (!isCodexModel(model)) console.warn('[codex_responses] non-codex model: ' + model)
-    const base = getAcptoapiUrl().replace(/\/v1\/?$/, '')
+    const url = getAcptoapiUrl()
+    if (!url) throw new Error('FREDDIE_LLM_URL must be set for this adapter (acptoapi is in-process only otherwise)')
+    const base = url.replace(/\/v1\/?$/, '')
     const r = await fetch(base + '/v1/responses', {
         method: 'POST',
         headers: { authorization: 'Bearer none', 'content-type': 'application/json' },

package/src/agent/gemini_native_adapter.js

@@ -3,7 +3,9 @@ import { getAcptoapiUrl } from './acptoapi-bridge.js'
 import { adaptToolForGemini, adaptMessagesForGemini } from './gemini_schema.js'
 
 export async function chat({ messages, model = 'gemini-2.5-flash', tools = [] } = {}) {
-    const base = getAcptoapiUrl().replace(/\/v1\/?$/, '')
+    const acptoapiUrl = getAcptoapiUrl()
+    if (!acptoapiUrl) throw new Error('FREDDIE_LLM_URL must be set for this adapter (acptoapi is in-process only otherwise)')
+    const base = acptoapiUrl.replace(/\/v1\/?$/, '')
     const url = `${base}/v1beta/models/${model}:generateContent`
     const body = { contents: adaptMessagesForGemini(messages), ...(tools.length ? { tools: [{ function_declarations: tools.map(adaptToolForGemini) }] } : {}) }
     const r = await fetch(url, {

package/src/agent/image_gen_provider.js

@@ -5,7 +5,9 @@ const PROVIDERS = ['openai', 'replicate', 'stability']
 
 export async function generate({ provider = 'openai', prompt, size, model } = {}) {
     if (!PROVIDERS.includes(provider)) throw new Error('unknown image provider: ' + provider)
-    const base = getAcptoapiUrl().replace(/\/v1\/?$/, '')
+    const url = getAcptoapiUrl()
+    if (!url) throw new Error('FREDDIE_LLM_URL must be set for this adapter (acptoapi is in-process only otherwise)')
+    const base = url.replace(/\/v1\/?$/, '')
     const body = provider === 'replicate'
         ? { version: model || 'black-forest-labs/flux-schnell', input: { prompt } }
         : { model: model || 'gpt-image-1', prompt, size }

package/src/agent/llm_resolver.js

@@ -5,6 +5,22 @@ import { parseTextToolCalls } from './tool_call_text.js'
 import * as sdkNs from 'acptoapi'
 export { matrixUsable } from './model-matrix.js'
 
+// Reachability memoization: bridgeReachable() now performs a REAL LLM call
+// (acptoapi-bridge.js's isReachable() sends a live 'ping' completion), so
+// calling it on every turn doubles LLM cost/latency. Cache the result for a
+// short TTL so a burst of turns within the window reuses one probe. Does NOT
+// touch acptoapi-bridge.js's exported isReachable -- health-check/dashboard
+// callers still need a live, uncached probe.
+let _lastReachable = { at: 0, ok: false }
+const REACHABLE_TTL_MS = 5000
+async function cachedReachable() {
+    const now = Date.now()
+    if (now - _lastReachable.at < REACHABLE_TTL_MS) return _lastReachable.ok
+    const ok = await bridgeReachable()
+    _lastReachable = { at: now, ok }
+    return ok
+}
+
 // `acptoapi` is externalized by vite (browser) so the host environment
 // supplies it (thebird ships docs/lib/acptoapi-browser.js via importmap).
 // Node CLI gets the real CJS package. Defensive `|| {}` keeps the bundle
@@ -78,7 +94,7 @@ async function buildModel({ provider, model, inputModel }) {
     const keyed = Array.isArray(auto) ? auto.filter(l => { const p = l.model.split('/')[0]; const env = PROVIDER_KEYS[p]; return env && process.env[env] }) : []
     if (keyed.length) return keyed.map(l => l.model).join(', ')
     // No local provider keys — delegate to acptoapi if reachable.
-    if (await bridgeReachable()) return process.env.FREDDIE_LLM_MODEL || 'auto'
+    if (await cachedReachable()) return process.env.FREDDIE_LLM_MODEL || 'auto'
     return null
 }
 
@@ -87,12 +103,12 @@ export function resolveCallLLM({ provider, model } = {}) {
         const m = await buildModel({ provider, model, inputModel: input.model })
         if (!m) {
             const status = typeof sdk.getStatus === 'function' ? sdk.getStatus().map(s => `${s.provider}(ok=${s.ok},fails=${s.failCount})`).join(', ') : ''
-            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 : ''))
+            throw new Error('no LLM backend reachable: set a provider API key or FREDDIE_LLM_MODEL' + (status ? ' | sampler: ' + status : ''))
         }
         try {
             const isSimple = typeof m === 'string' && !m.includes(',') && !/^queue\//.test(m)
 
-            if (isSimple && await bridgeReachable()) {
+            if (isSimple && await cachedReachable()) {
                 return await bridgeCall({ ...input, model: m })
             }
 
@@ -105,7 +121,9 @@ export function resolveCallLLM({ provider, model } = {}) {
             if (m.includes(',') || /^queue\//.test(m)) opts.matrixSource = process.env.FREDDIE_MATRIX_URL || MATRIX_FILE
 
             if (typeof sdk.chat !== 'function') {
-                // Browser context: no node-side sdk; route via HTTP bridge.
+                // Browser/no-sdk context: fall back to acptoapi-bridge's in-process
+                // call (may be a no-op/broken in true browser bundles since acptoapi
+                // is externalized for vite -- unverified post-rewrite, see build:browser).
                 return await bridgeCall({ ...input, model: m })
             }
             const r = await sdk.chat(opts)

package/src/agent/model-discovery.js

@@ -17,7 +17,9 @@ export function listKnownProviders() {
 }
 
 export async function discoverModels({ provider } = {}) {
-    const base = getAcptoapiUrl().replace(/\/v1\/?$/, '')
+    const url = getAcptoapiUrl()
+    if (!url) throw new Error('FREDDIE_LLM_URL must be set for this adapter (acptoapi is in-process only otherwise)')
+    const base = url.replace(/\/v1\/?$/, '')
     try {
         const r = await fetch(base + '/v1/models', {
             headers: { authorization: 'Bearer none' },

package/src/host/index.js

@@ -5,7 +5,7 @@ import { getFreddieHome } from '../home.js'
 import { applyActiveProjectFromRegistry } from '../projects.js'
 
 let _host = null
-let _loaded = false
+let _loadPromise = null
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 const REPO_PLUGINS = path.resolve(__dirname, '..', '..', 'plugins')
@@ -16,18 +16,24 @@ export function host() {
 }
 
 export async function bootHost(extraRoots = []) {
-    const h = host()
-    if (_loaded) return h
-    _loaded = true
-    if (!process.env.FREDDIE_HOME && !process.env.FREDDIE_PROFILE) applyActiveProjectFromRegistry()
-    const roots = [REPO_PLUGINS, path.join(getFreddieHome(), 'plugins'), path.join(process.cwd(), '.freddie', 'plugins'), ...extraRoots]
-    const plugins = await discoverPlugins(roots)
-    await h.load(plugins)
-    const ccRoots = [path.join(getFreddieHome(), 'cc-plugins'), path.join(process.cwd(), '.freddie', 'cc-plugins')]
-    await h.loadCcPlugins(ccRoots)
-    const extra = (process.env.FREDDIE_EXTRA_CC_ROOTS || '').split(path.delimiter).filter(Boolean)
-    for (const r of [__dirname, process.cwd(), ...extra]) await h.loadCcFromNodeModules(r)
-    return h
+    // Memoize the IN-FLIGHT promise, not a boolean flag: a boolean set true
+    // before the awaits below complete let concurrent callers observe a
+    // partially-loaded host. Returning the same promise means every caller
+    // (including ones that arrive mid-load) awaits the exact same completion.
+    if (_loadPromise) return _loadPromise
+    _loadPromise = (async () => {
+        const h = host()
+        if (!process.env.FREDDIE_HOME && !process.env.FREDDIE_PROFILE) applyActiveProjectFromRegistry()
+        const roots = [REPO_PLUGINS, path.join(getFreddieHome(), 'plugins'), path.join(process.cwd(), '.freddie', 'plugins'), ...extraRoots]
+        const plugins = await discoverPlugins(roots)
+        await h.load(plugins)
+        const ccRoots = [path.join(getFreddieHome(), 'cc-plugins'), path.join(process.cwd(), '.freddie', 'cc-plugins')]
+        await h.loadCcPlugins(ccRoots)
+        const extra = (process.env.FREDDIE_EXTRA_CC_ROOTS || '').split(path.delimiter).filter(Boolean)
+        for (const r of [__dirname, process.cwd(), ...extra]) await h.loadCcFromNodeModules(r)
+        return h
+    })()
+    return _loadPromise
 }
 
-export function resetHostForTests() { _host = null; _loaded = false }
+export function resetHostForTests() { _host = null; _loadPromise = null }

package/src/agent/__browser_shims/alias-plugin.mjs

@@ -1,24 +0,0 @@
-
-import path from 'path';
-const F='C:/dev/freddie';
-const R=p=>path.resolve(p);
-const ALIAS={
-  [R(F+'/src/host/index.js')]: R(F+'/src/agent/__browser_shims/host.js'),
-  [R(F+'/src/toolsets.js')]: R(F+'/src/agent/__browser_shims/toolsets.js'),
-  [R(F+'/src/agent/llm_resolver.js')]: R(F+'/src/agent/__browser_shims/llm_resolver.js'),
-  [R(F+'/src/observability/log.js')]: R(F+'/src/agent/__browser_shims/log.js'),
-  [R(F+'/src/config.js')]: R(F+'/src/agent/__browser_shims/config.js'),
-  [R(F+'/src/home.js')]: R(F+'/src/agent/__browser_shims/home.js'),
-};
-export default {
-  name: 'freddie-browser-alias',
-  setup(build){
-    build.onResolve({filter: /.*/}, async args=>{
-      if(args.path.startsWith('node:') || (!args.path.startsWith('.') && !path.isAbsolute(args.path))) return null;
-      const resolved = path.resolve(args.resolveDir||'', args.path);
-      const candidates=[resolved, resolved+'.js', resolved+'/index.js'];
-      for(const c of candidates) if(ALIAS[c]) return { path: ALIAS[c] };
-      return null;
-    });
-  }
-};

package/src/agent/__browser_shims/build.mjs

@@ -1,18 +0,0 @@
-
-import * as esbuild from 'esbuild';
-import alias from './alias-plugin.mjs';
-await esbuild.build({
-  entryPoints: ['C:/dev/freddie/src/agent/__browser_shims/entry.js'],
-  bundle: true,
-  format: 'esm',
-  platform: 'browser',
-  conditions: ['browser','module','import'],
-  outfile: 'C:/dev/thebird/docs/freddie-runtime.js',
-  plugins: [alias],
-  legalComments: 'none',
-  minify: false,
-  sourcemap: false,
-  logLevel: 'info',
-  external: [],
-});
-console.log('bundle ok');