thebird 1.2.82 → 1.2.83

package/docs/kilo-http-stream.js

@@ -9,18 +9,36 @@ export async function* streamKiloHTTP({ url, model, messages }) {
   catch (e) { throw new Error('kilo serve not reachable at ' + base + ' — start it with: node start-kilo.js --origin ' + location.origin); }
   if (!sessRes.ok) throw new Error('kilo /session ' + sessRes.status + ': ' + await sessRes.text());
   const { id: sessionId } = await sessRes.json();
-  Object.assign(window.__debug = window.__debug || {}, { kilo: { sessionId, url: base, fsBase, writes: [], lastStatus: null } });
+  Object.assign(window.__debug = window.__debug || {}, { kilo: { sessionId, url: base, fsBase, writes: [], toolCalls: [], lastStatus: null } });
+
+  const queue = [];
+  let resolveNext = null;
+  let streamEnded = false;
+  const push = ev => { queue.push(ev); if (resolveNext) { const r = resolveNext; resolveNext = null; r(); } };
+  const textSeen = new Set();
+  const toolState = new Map();
 
   const es = new EventSource(base + '/event');
-  const pendingWrites = new Set();
   es.onmessage = (ev) => {
     try {
       const msg = JSON.parse(ev.data);
-      if (msg.type === 'message.part.updated') {
-        const part = msg.properties?.part;
-        if (part?.type === 'tool' && part.state?.status === 'completed' && (part.tool === 'write' || part.tool === 'edit')) {
-          const abs = part.state.input?.filePath;
-          if (abs) pendingWrites.add(abs);
+      if (msg.type !== 'message.part.updated') return;
+      const part = msg.properties?.part;
+      if (!part) return;
+      if (part.type === 'text' && part.messageID && !textSeen.has(part.id)) {
+        const prior = toolState.get('__text_' + part.id) || '';
+        const txt = part.text || '';
+        if (txt.length > prior.length) { push({ type: 'text-delta', textDelta: txt.slice(prior.length) }); toolState.set('__text_' + part.id, txt); }
+      } else if (part.type === 'tool') {
+        const cid = part.callID;
+        const st = part.state?.status;
+        if (st === 'running' && !toolState.has(cid)) {
+          toolState.set(cid, { name: part.tool, args: part.state.input || {} });
+          push({ type: 'tool-call', toolCallId: cid, toolName: part.tool, args: part.state.input || {} });
+          window.__debug.kilo.toolCalls.push({ id: cid, name: part.tool, args: part.state.input || {} });
+        } else if (st === 'completed' && toolState.has(cid) && !toolState.get(cid).completed) {
+          toolState.get(cid).completed = true;
+          push({ type: 'tool-result', toolCallId: cid, toolName: part.tool, args: part.state.input || {}, result: part.state.output || '' });
         }
       }
     } catch (_) {}
@@ -31,17 +49,24 @@ export async function* streamKiloHTTP({ url, model, messages }) {
   ).join('\n');
 
   const body = { parts: [{ type: 'text', text: userText }], providerID: 'kilo', modelID: model || 'x-ai/grok-code-fast-1:optimized:free' };
-  const msgRes = await fetch(base + '/session/' + sessionId + '/message', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
-  window.__debug.kilo.lastStatus = msgRes.status;
-  if (!msgRes.ok) { es.close(); throw new Error('kilo message ' + msgRes.status + ': ' + await msgRes.text()); }
-  const result = await msgRes.json();
-  window.__debug.kilo.lastResult = result;
+  const msgPromise = fetch(base + '/session/' + sessionId + '/message', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) }).then(async r => {
+    window.__debug.kilo.lastStatus = r.status;
+    const json = await r.json();
+    window.__debug.kilo.lastResult = json;
+    streamEnded = true;
+    if (resolveNext) { const x = resolveNext; resolveNext = null; x(); }
+    return json;
+  });
+
+  while (!streamEnded || queue.length) {
+    if (queue.length) { yield queue.shift(); continue; }
+    await new Promise(r => { resolveNext = r; });
+  }
+  const result = await msgPromise;
   es.close();
-  const mirrored = await mirrorFromSandbox(fsBase, [...pendingWrites]);
+  const touched = [...toolState.values()].filter(v => v.completed && (v.name === 'write' || v.name === 'edit')).map(v => v.args.filePath).filter(Boolean);
+  const mirrored = await mirrorFromSandbox(fsBase, touched);
   window.__debug.kilo.writes = mirrored;
   if (mirrored.length) window.refreshPreview?.();
-  const textParts = (result.parts || []).filter(p => p.type === 'text');
-  for (const tp of textParts) yield { type: 'text-delta', textDelta: tp.text };
-  if (mirrored.length) yield { type: 'text-delta', textDelta: '\n\n[mirrored to preview: ' + mirrored.join(', ') + ']' };
   yield { type: 'finish-step', finishReason: result.info?.finish || 'stop' };
 }

package/index.js

@@ -99,5 +99,6 @@ const { streamRouter, generateRouter, createRouter } = require('./lib/router-str
 const { cloudGenerate, streamCloud, cloudStream } = require('./lib/cloud-generate');
 const { ensureAuth, login: oauthLogin } = require('./lib/oauth');
 const { BridgeError, AuthError, RateLimitError, TimeoutError, ContextWindowError, ContentPolicyError, ProviderError, classifyError, redactKeys } = require('./lib/errors');
+const { streamACP, generateACP } = require('./lib/providers/acp');
 
-module.exports = { streamGemini, createFullStream, generateGemini, streamRouter, generateRouter, createRouter, convertMessages, convertTools, cleanSchema, GeminiError, BridgeError, AuthError, RateLimitError, TimeoutError, ContextWindowError, ContentPolicyError, ProviderError, classifyError, redactKeys, cloudGenerate, streamCloud, cloudStream, ensureAuth, oauthLogin };
+module.exports = { streamGemini, createFullStream, generateGemini, streamRouter, generateRouter, createRouter, convertMessages, convertTools, cleanSchema, GeminiError, BridgeError, AuthError, RateLimitError, TimeoutError, ContextWindowError, ContentPolicyError, ProviderError, classifyError, redactKeys, cloudGenerate, streamCloud, cloudStream, ensureAuth, oauthLogin, streamACP, generateACP };

package/lib/providers/acp.js

@@ -0,0 +1,88 @@
+const { BridgeError } = require('../errors');
+
+async function postJson(url, body) {
+  const res = await fetch(url, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify(body) });
+  if (!res.ok) { const t = await res.text(); throw new BridgeError(t, { status: res.status, retryable: res.status === 429 || res.status >= 500 }); }
+  return res.json();
+}
+
+function subscribeSSE(url, onEvent) {
+  const ctrl = new AbortController();
+  (async () => {
+    try {
+      const res = await fetch(url, { signal: ctrl.signal });
+      if (!res.ok || !res.body) return;
+      const reader = res.body.getReader();
+      const dec = new TextDecoder();
+      let buf = '';
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) return;
+        buf += dec.decode(value, { stream: true });
+        let i;
+        while ((i = buf.indexOf('\n\n')) >= 0) {
+          const chunk = buf.slice(0, i); buf = buf.slice(i + 2);
+          const line = chunk.split('\n').find(l => l.startsWith('data:'));
+          if (!line) continue;
+          try { onEvent(JSON.parse(line.slice(5))); } catch (_) {}
+        }
+      }
+    } catch (e) { if (e.name !== 'AbortError') throw e; }
+  })();
+  return () => ctrl.abort();
+}
+
+function toUserText(messages) {
+  return messages.filter(m => m.role === 'user').map(m =>
+    typeof m.content === 'string' ? m.content : (m.content || []).filter(b => b.type === 'text').map(b => b.text).join('')
+  ).join('\n');
+}
+
+async function* streamACP({ url, model, messages, onStepFinish }) {
+  yield { type: 'start-step' };
+  const base = (url || 'http://localhost:4780').replace(/\/$/, '');
+  const { id: sessionId } = await postJson(base + '/session', {});
+  const queue = []; let resolveNext = null; let done = false;
+  const push = ev => { queue.push(ev); if (resolveNext) { const r = resolveNext; resolveNext = null; r(); } };
+  const textSeen = new Map();
+  const toolState = new Map();
+  const unsubscribe = subscribeSSE(base + '/event', (msg) => {
+    if (msg.type !== 'message.part.updated') return;
+    const part = msg.properties?.part;
+    if (!part) return;
+    if (part.type === 'text' && part.messageID) {
+      const prior = textSeen.get(part.id) || '';
+      const txt = part.text || '';
+      if (txt.length > prior.length) { push({ type: 'text-delta', textDelta: txt.slice(prior.length) }); textSeen.set(part.id, txt); }
+    } else if (part.type === 'tool') {
+      const cid = part.callID; const st = part.state?.status;
+      if (st === 'running' && !toolState.has(cid)) { toolState.set(cid, { name: part.tool, args: part.state.input || {} }); push({ type: 'tool-call', toolCallId: cid, toolName: part.tool, args: part.state.input || {} }); }
+      else if (st === 'completed' && toolState.has(cid) && !toolState.get(cid).completed) { toolState.get(cid).completed = true; push({ type: 'tool-result', toolCallId: cid, toolName: part.tool, args: part.state.input || {}, result: part.state.output || '' }); }
+    }
+  });
+  const promptPromise = postJson(base + '/session/' + sessionId + '/message', {
+    parts: [{ type: 'text', text: toUserText(messages) }],
+    providerID: 'kilo',
+    modelID: model || 'x-ai/grok-code-fast-1:optimized:free',
+  }).finally(() => { done = true; if (resolveNext) { const r = resolveNext; resolveNext = null; r(); } });
+  while (!done || queue.length) {
+    if (queue.length) { yield queue.shift(); continue; }
+    await new Promise(r => { resolveNext = r; });
+  }
+  const result = await promptPromise;
+  unsubscribe();
+  yield { type: 'finish-step', finishReason: result.info?.finish || 'stop' };
+  if (onStepFinish) await onStepFinish();
+}
+
+async function generateACP(opts) {
+  let text = '';
+  const toolCalls = [];
+  for await (const ev of streamACP(opts)) {
+    if (ev.type === 'text-delta') text += ev.textDelta;
+    else if (ev.type === 'tool-call') toolCalls.push({ id: ev.toolCallId, name: ev.toolName, args: ev.args });
+  }
+  return { text, toolCalls };
+}
+
+module.exports = { streamACP, generateACP };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thebird",
-  "version": "1.2.82",
+  "version": "1.2.83",
   "description": "Anthropic SDK to Gemini streaming bridge — drop-in proxy that translates Anthropic message format and tool calls to Google Gemini",
   "scripts": {
     "start": "node serve.js"