@fugood/buttress-server 2.25.9 → 2.25.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fugood/buttress-server",
-  "version": "2.25.9",
+  "version": "2.25.11",
   "main": "lib/index.mjs",
   "types": "lib/index.d.ts",
   "type": "module",
@@ -19,7 +19,7 @@
   ],
   "scripts": {
     "typecheck": "tsc --noEmit",
-    "build": "tsdown -c rolldown.config.js --config-loader native && tsc --noCheck --emitDeclarationOnly && cp ../buttress-backend-core/src/backends/mlx-bridge.py lib/mlx-bridge.py",
+    "build": "tsdown -c rolldown.config.js --config-loader native && tsc --noCheck --emitDeclarationOnly && cp ../buttress-backend-core/src/backends/mlx-bridge.py lib/mlx-bridge.py && cp ../../node_modules/quickjs-wasi/quickjs.wasm lib/quickjs.wasm",
     "build:dist": "$npm_execpath scripts/build-distribution.js",
     "release": "$npm_execpath scripts/build-distribution.js",
     "release-beta": "$npm_execpath scripts/build-distribution.js --beta",
@@ -37,12 +37,12 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@earendil-works/pi-agent-core": "^0.85.0",
-    "@earendil-works/pi-ai": "0.85.0",
-    "@earendil-works/pi-tui": "^0.85.0",
+    "@earendil-works/pi-agent-core": "^1.0.0",
+    "@earendil-works/pi-ai": "1.0.0",
+    "@earendil-works/pi-tui": "^1.0.0",
     "@elysiajs/cors": "^1.1.1",
     "@elysiajs/node": "^1.4.2",
-    "@fugood/llama.node": "^1.8.0-rc.6",
+    "@fugood/llama.node": "^1.8.0-rc.9",
     "@fugood/whisper.node": "^1.2.0-rc.0",
     "@huggingface/gguf": "^0.3.2",
     "@iarna/toml": "^3.0.0",
@@ -69,7 +69,8 @@
     "zod": "^3.25.76"
   },
   "devDependencies": {
-    "@fugood/bricks-cli": "^2.25.9",
+    "@fugood/agent-tool-runtime": "^2.25.10",
+    "@fugood/bricks-cli": "^2.25.11",
     "@fugood/bricks-devtools-core": "^2.25.5",
     "tsdown": "^0.22.4",
     "typescript": "^7.0.2"

package/public/status.html

@@ -603,6 +603,27 @@
         </div>
       </div>
 
+      <!-- GGML Typed Decision Status (hidden unless active) -->
+      <div class="card" id="ggmlDecisionCard" style="display:none">
+        <div class="card-header">
+          <span class="card-title">Typed Decision Status</span>
+          <span class="badge badge-info" id="ggmlDecisionGeneratorCount">0 generators</span>
+        </div>
+        <div id="ggmlDecisionGenerators"></div>
+        <div class="section">
+          <div class="section-title collapsible" onclick="toggleSection(this)">Model Load History</div>
+          <div class="collapsible-content" id="ggmlDecisionModelHistory">
+            <div class="empty-state">No model load history</div>
+          </div>
+        </div>
+        <div class="section">
+          <div class="section-title collapsible" onclick="toggleSection(this)">Decision History</div>
+          <div class="collapsible-content" id="ggmlDecisionHistory">
+            <div class="empty-state">No decision history</div>
+          </div>
+        </div>
+      </div>
+
       <!-- Local Functions (hidden unless enabled) -->
       <div class="card" id="functionsCard" style="display:none">
         <div class="card-header">
@@ -1049,6 +1070,54 @@
       })
     }
 
+    function renderGgmlDecisionGenerators(generators) {
+      const container = document.getElementById('ggmlDecisionGenerators')
+      document.getElementById('ggmlDecisionGeneratorCount').textContent =
+        `${generators.length} generator${generators.length !== 1 ? 's' : ''}`
+
+      withScrollPreserve(container, () => {
+        if (generators.length === 0) {
+          container.innerHTML = '<div class="empty-state">No typed decision generators loaded</div>'
+          return
+        }
+
+        container.innerHTML = `
+          <div class="table-wrapper">
+            <div class="table-inner">
+              <table>
+                <thead>
+                  <tr>
+                    <th>ID</th>
+                    <th>Model</th>
+                    <th>Type</th>
+                    <th>Quant</th>
+                    <th>Variant</th>
+                    <th>GPU</th>
+                    <th>Model Size</th>
+                    <th>Context</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  ${generators.map(g => `
+                    <tr>
+                      <td class="mono">${escapeHtml(g.id?.slice(0, 8) || '-')}</td>
+                      <td>${formatModelName(g.repoId)}${g.mmprojFilename ? '<br><span style="font-size:11px;color:var(--text-muted)">+ ' + escapeHtml(g.mmprojFilename) + '</span>' : ''}</td>
+                      <td>${escapeHtml(g.decisionType || '-')}</td>
+                      <td>${escapeHtml(g.quantization || '-')}</td>
+                      <td>${escapeHtml(g.variant || '-')}</td>
+                      <td><span class="badge ${g.useGpu ? 'badge-success' : 'badge-info'}">${g.useGpu ? 'yes' : 'no'}</span></td>
+                      <td>${formatBytes(g.modelBytes)}</td>
+                      <td>${g.hasContext ? '<span class="badge badge-success">loaded</span>' : '-'}</td>
+                    </tr>
+                  `).join('')}
+                </tbody>
+              </table>
+            </div>
+          </div>
+        `
+      })
+    }
+
     // Escape HTML
     function escapeHtml(str) {
       if (str == null) return ''
@@ -1077,6 +1146,7 @@
       const onnxStt = status.onnxStt || {}
       const onnxTts = status.onnxTts || {}
       const ggmlTts = status.ggmlTts || {}
+      const ggmlDecision = status.ggmlDecision || {}
 
       // LLM
       renderLlmGenerators(llm.generators || [])
@@ -1288,6 +1358,39 @@
         },
       ])
 
+      // GGML typed decisions
+      const hasGgmlDecision = (ggmlDecision.generators?.length > 0) ||
+        (ggmlDecision.history?.modelLoads?.length > 0) ||
+        (ggmlDecision.history?.decisions?.length > 0)
+      document.getElementById('ggmlDecisionCard').style.display = hasGgmlDecision ? '' : 'none'
+      renderGgmlDecisionGenerators(ggmlDecision.generators || [])
+
+      renderHistory('ggmlDecisionModelHistory', ggmlDecision.history?.modelLoads || [], [
+        { label: 'Time', render: i => `<span class="timestamp">${formatRelativeTime(i.timestamp)}</span>` },
+        { label: 'Model', render: i => formatModelName(i.repoId) },
+        { label: 'Type', render: i => escapeHtml(i.decisionType || '-') },
+        { label: 'Quant', render: i => escapeHtml(i.quantization || '-') },
+        { label: 'Variant', render: i => escapeHtml(i.variant || '-') },
+        { label: 'Duration', render: i => `${(i.durationMs / 1000).toFixed(1)}s` },
+        { label: 'Status', render: i => i.success ?
+          '<span class="badge badge-success">Success</span>' :
+          `<span class="badge badge-error">Failed: ${escapeHtml(i.error || 'Unknown')}</span>`
+        },
+      ])
+
+      renderHistory('ggmlDecisionHistory', ggmlDecision.history?.decisions || [], [
+        { label: 'Time', render: i => `<span class="timestamp">${formatRelativeTime(i.timestamp)}</span>` },
+        { label: 'Model', render: i => formatModelName(i.repoId) },
+        { label: 'Questions', render: i => i.questionCount ?? '-' },
+        { label: 'Images', render: i => i.imageCount || '-' },
+        { label: 'Tokens', render: i => i.inputTokens ?? '-' },
+        { label: 'Duration', render: i => `${i.durationMs} ms` },
+        { label: 'Status', render: i => i.success ?
+          '<span class="badge badge-success">Success</span>' :
+          `<span class="badge badge-error">Failed: ${escapeHtml(i.error || 'Unknown')}</span>`
+        },
+      ])
+
       renderFunctionsStatus(status.functions || {})
     }
 
@@ -1447,7 +1550,7 @@
         const response = await fetch('/buttress/status')
         const data = await response.json()
         // Direct JSON response (not tRPC wrapped)
-        if (data.ggmlLlm || data.ggmlStt || data.mlxLlm || data.onnxStt || data.onnxTts || data.ggmlTts) {
+        if (data.ggmlLlm || data.ggmlStt || data.mlxLlm || data.onnxStt || data.onnxTts || data.ggmlTts || data.ggmlDecision) {
           updateUI(data)
           setConnectionStatus('connected')
         }

package/lib/agent/session-fs.d.ts

@@ -1,3 +0,0 @@
-import type { FileSystem } from '@earendil-works/pi-agent-core';
-/** File storage for agent sessions that classifies errors structurally across vm realms. */
-export declare const createSessionFs: (rootDir: string) => FileSystem;

package/lib/config-DbRjQnNp.mjs

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import e from"node:path";import t from"node:os";import n from"bytes";import r from"ms";import i from"node-machine-id";const a=(e={},t={})=>{let n=Array.isArray(e)?[...e]:{...e};return Object.entries(t||{}).forEach(([e,t])=>{t&&typeof t==`object`&&!Array.isArray(t)?n[e]=a(n[e]||{},t):n[e]=t}),n},o=e=>e&&typeof e==`object`?structuredClone(e):null,s=(e,t)=>{let n=o(e)||{},r=o(t)||{};return a(n,r)},c=(e,t)=>a(structuredClone(e.global),t||{}),l=(e,t,n,r)=>{if(e.generators.length>0){let i=e.generators.filter(e=>e?.type===n);if(i.length>0&&r){let a=i.find(e=>t.getModelIdentifier(n,e)===r);if(a)return c(e,a)}}return Object.keys(e.global).length>0?c(e,{}):null},u={udp:{port:8089,announcements:{enabled:!0,interval:5e3},requests:{enabled:!0,responseDelay:100}},http:{enabled:!0,path:`/buttress/info`,cors:!0}},d=e=>e?e===!0?{...u}:a(u,e):null,f=(e,t)=>{if(!e.generators||e.generators.length===0)return t.map(e=>({type:e}));let n=new Set;return e.generators.forEach(e=>{e.type&&n.add(e.type)}),n.size===0?t.map(e=>({type:e})):Array.from(n).map(e=>({type:e}))},p=(e,t,n)=>e===void 0?n:typeof e==`number`?e:t(e)??n,m=6e4,h=1024*1024*50,g=s=>{let c=i.machineIdSync(),l={server:{id:`buttress-${c}`,name:`Buttress Server (${c.slice(-8)})`,port:2080,temp_file_dir:e.join(t.tmpdir(),`.buttress`),session_timeout:m,max_body_size:h},autodiscover:!1},u=a(l,o(s)||{}),f=Array.isArray(u.generators)?u.generators:[],{server:g,generators:_,autodiscover:v,...y}=u;return{autodiscover:d(v),server:{id:g.id,name:g.name,port:g.port,log_level:g.log_level,temp_file_dir:g.temp_file_dir,max_body_size:p(g.max_body_size,n.parse,h),session_timeout:p(g.session_timeout,e=>r(e),m)},global:y,generators:f}},_=/^[A-Za-z0-9_-]{1,64}$/,v=n=>n===`~`||n.startsWith(`~/`)?e.join(t.homedir(),n.slice(1)):n;var y=class extends Error{constructor(e){super(`[Agents] ${e}`),this.name=`AgentsConfigError`}};const b=(e,t,n)=>{if(t==null)return n;if(t===0||t===!1)return null;if(typeof t==`number`){if(Number.isFinite(t)&&t>0)return t}else if(typeof t==`string`){let e;try{e=r(t)}catch{e=void 0}if(typeof e==`number`&&e>0)return e}throw new y(`agents_options.${e} must be a duration string (e.g. "30d") or a positive number of milliseconds; use 0 to disable it`)},x=(e,t)=>{if(t==null)return{};if(typeof t!=`object`||Array.isArray(t))throw new y(`agent "${e}": mcp_servers must be a table`);let n={};for(let[r,i]of Object.entries(t)){if(!_.test(r))throw new y(`agent "${e}": MCP server name "${r}" must match ${_}`);let t=!!(typeof i?.url==`string`&&i.url),a=!!(typeof i?.command==`string`&&i.command);if(t===a)throw new y(`agent "${e}": MCP server "${r}" needs exactly one of url / command`);n[r]={url:t?i.url:void 0,headers:i?.headers&&typeof i.headers==`object`?i.headers:void 0,command:a?i.command:void 0,args:Array.isArray(i?.args)?i.args.map(String):void 0,env:i?.env&&typeof i.env==`object`?i.env:void 0,optional:i?.optional===!0}}return n},S=(e,t,n)=>{let r=e?.name;if(typeof r!=`string`||!_.test(r))throw new y(`[[agents]] #${t+1}: name is required and must match ${_}`);let i=e?.model;if(typeof i!=`string`||!i.includes(`/`))throw new y(`agent "${r}": model must be "provider/model-id" (e.g. "buttress/ggml-org/gpt-oss-20b-GGUF")`);let a=i.indexOf(`/`),o=i.slice(0,a),s=i.slice(a+1);if(!o||!s)throw new y(`agent "${r}": invalid model reference "${i}"`);if(o===`buttress`&&!n.generators.filter(e=>e.type===`ggml-llm`||e.type===`mlx-llm`).some(e=>(e.model?.repo_id||e.model?.repository)===s))throw new y(`agent "${r}": model "${s}" does not match any configured [[generators]] ggml-llm/mlx-llm repo_id`);if(e?.system_prompt!=null&&e?.system_prompt_file!=null)throw new y(`agent "${r}": set system_prompt or system_prompt_file, not both`);let c=[];if(e?.tools!=null){if(!Array.isArray(e.tools))throw new y(`agent "${r}": tools must be an array of function names`);for(let t of e.tools){if(typeof t!=`string`||!_.test(t))throw new y(`agent "${r}": tool name "${t}" must match ${_} (local function names only)`);if(c.includes(t))throw new y(`agent "${r}": duplicate tool "${t}"`);c.push(t)}}if(e?.local_devices!==void 0&&typeof e.local_devices!=`boolean`)throw new y(`agent "${r}": local_devices must be a boolean`);let l=Number(e?.max_turns??30);if(!Number.isInteger(l)||l<1)throw new y(`agent "${r}": max_turns must be a positive integer`);let u=null;if(e?.max_tokens_per_run!=null&&(u=Number(e.max_tokens_per_run),!Number.isInteger(u)||u<1))throw new y(`agent "${r}": max_tokens_per_run must be a positive integer`);let{name:d,model:f,system_prompt:p,system_prompt_file:m,tools:h,local_devices:g=!1,mcp_servers:v,max_turns:b,max_tokens_per_run:S,thinking:C,...w}=e;return{name:r,provider:o,modelId:s,modelRef:i,systemPrompt:typeof p==`string`?p:null,systemPromptFile:typeof m==`string`?m:null,tools:c,localDevices:g,mcpServers:x(r,v),maxTurns:l,maxTokensPerRun:u,thinking:typeof C==`string`?C:void 0,generation:w}},C=(t,{configDir:n=process.cwd()}={})=>{let r=t.global||{},i=r.agents;if(i==null)return null;if(!Array.isArray(i))throw new y(`agents must be an array of tables ([[agents]])`);if(i.length===0)return null;let a=i.map((e,n)=>S(e,n,t)),o=new Set;for(let e of a){if(o.has(e.name))throw new y(`duplicate agent name "${e.name}"`);o.add(e.name)}let s=r.agents_options||{},c=typeof s.sessions_dir==`string`&&s.sessions_dir?s.sessions_dir:`./.buttress-agent/sessions`,l=v(c),u=e.isAbsolute(l)?l:e.resolve(n,l);for(let t of a)if(t.systemPromptFile){let r=v(t.systemPromptFile);t.systemPromptFile=e.isAbsolute(r)?r:e.resolve(n,r)}let d=Number(s.max_depth??2);if(!Number.isInteger(d)||d<1)throw new y(`agents_options.max_depth must be a positive integer`);let f=s.session_max_count,p=500;if(f===0||f===!1)p=null;else if(f!=null&&(p=Number(f),!Number.isInteger(p)||p<1))throw new y(`agents_options.session_max_count must be a positive integer`);return{agents:a,configDir:n,sessionsDir:u,runtimeTokenFile:e.join(e.dirname(u),`runtime-token`),sessionMaxAgeMs:b(`session_max_age`,s.session_max_age,2592e6),sessionMaxCount:p,maxDepth:d,allowUnauthenticated:s.allow_unauthenticated===!0}};export{g as a,o as i,C as n,l as o,s as r,f as s,y as t};