juneau 0.7.0 → 0.7.2

package/dist/server/index.js

@@ -1,114 +1,129 @@
-function O(n) {
-  const t = n.map((e) => {
-    const i = e.parts.filter((r) => r.type === "text").map((r) => r.text).join("");
-    return { role: e.role, content: i };
-  }), o = [];
-  for (let e = 0; e < t.length; e++) {
-    const i = t[e], r = o[o.length - 1];
-    i.role === "user" && r?.role === "user" && o.push({ role: "assistant", content: "…" }), o.push(i);
+function M(n) {
+  const e = n.map((t) => {
+    const r = t.parts.filter((s) => s.type === "text").map((s) => s.text).join("");
+    return { role: t.role, content: r };
+  }), i = [];
+  for (let t = 0; t < e.length; t++) {
+    const r = e[t], s = i[i.length - 1];
+    r.role === "user" && s?.role === "user" && i.push({ role: "assistant", content: "…" }), i.push(r);
   }
-  return o.filter((e) => e.content.length > 0);
+  return i.filter((t) => t.content.length > 0);
 }
-function h(n) {
+function y(n) {
   return `data: ${JSON.stringify(n)}
 
 `;
 }
-function y(n, t) {
-  return n[t] ?? n.en;
+function w(n, e) {
+  return n[e] ?? n.en;
 }
-function k(n) {
-  const t = new Set(Object.keys(n));
-  for (const [o, e] of Object.entries(n))
-    if (e.tools) {
-      for (const i of e.tools)
-        if (!t.has(i))
+function E(n) {
+  const e = new Set(Object.keys(n));
+  for (const [i, t] of Object.entries(n))
+    if (t.tools) {
+      for (const r of t.tools)
+        if (!e.has(r))
           throw new Error(
-            `[juneau] createSkillSet: skill "${o}" references unknown tool "${i}". Known skills: ${[...t].join(", ")}`
+            `[juneau] createSkillSet: skill "${i}" references unknown tool "${r}". Known skills: ${[...e].join(", ")}`
           );
     }
 }
-function W(n, t = {}) {
-  k(n);
-  const o = t.language ?? "en", e = t.debug ?? !1, i = [], r = [];
-  let s = !1, c = null;
-  const f = {};
-  for (const [l, a] of Object.entries(n))
-    f[l] = {
-      description: a.description,
-      parameters: a.input,
-      execute: async (u) => {
-        r.includes(l) || r.push(l), e && console.debug(`[juneau] skill "${l}" → executing, input:`, u);
-        const g = e ? Date.now() : 0;
-        i.push(
-          h({
+function C(n, e = {}) {
+  E(n);
+  const i = e.language ?? "en", t = e.debug ?? !1, r = [], s = [], o = [];
+  let c = !1, d = null;
+  const g = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Map();
+  for (const [l, f] of Object.entries(n)) {
+    if (g.has(f.id))
+      throw new Error(
+        `[juneau] createSkillSet: skills "${u.get(f.id)}" and "${l}" share the same ID (${f.id}). IDs must be unique.`
+      );
+    g.set(f.id, f), u.set(f.id, l);
+  }
+  const a = {};
+  for (const [l, f] of Object.entries(n))
+    a[l] = {
+      description: f.description,
+      parameters: f.input,
+      execute: async (S) => {
+        s.includes(l) || (s.push(l), o.push(f.id)), t && console.debug(`[juneau] skill "${l}" → executing, input:`, S);
+        const k = t ? Date.now() : 0;
+        r.push(
+          y({
             type: "activity",
             id: l,
-            title: y(a.labels.running, o),
+            title: w(f.labels.running, i),
             status: "running",
             metadata: { skill: l }
           })
         );
-        const $ = {
-          emit: (d) => {
-            e && console.debug(`[juneau] skill "${l}" → emitting part "${d.type}"`), i.push(h({ type: "part", part: d }));
+        const O = {
+          emit: (h) => {
+            t && console.debug(`[juneau] skill "${l}" → emitting part "${h.type}"`), r.push(y({ type: "part", part: h }));
           }
         };
         try {
-          const d = await a.execute(u, $), p = e ? Date.now() - g : 0;
-          return e && console.debug(`[juneau] skill "${l}" → done in ${p}ms, result:`, d), i.push(
-            h({
+          const h = await f.execute(S, O), m = t ? Date.now() - k : 0;
+          return t && console.debug(`[juneau] skill "${l}" → done in ${m}ms, result:`, h), r.push(
+            y({
               type: "activity",
               id: l,
-              title: y(a.labels.done, o),
+              title: w(f.labels.done, i),
               status: "done",
               metadata: { skill: l }
             })
-          ), d;
-        } catch (d) {
-          const p = e ? Date.now() - g : 0, v = d instanceof Error ? d.message : String(d);
-          e && console.debug(`[juneau] skill "${l}" → FAILED in ${p}ms: "${v}"`);
-          const T = a.labels.failed ?? { cs: "Nepodařilo se", en: "Failed" };
-          throw i.push(
-            h({
+          ), h;
+        } catch (h) {
+          const m = t ? Date.now() - k : 0, $ = h instanceof Error ? h.message : String(h);
+          t && console.debug(`[juneau] skill "${l}" → FAILED in ${m}ms: "${$}"`);
+          const A = f.labels.failed ?? { cs: "Nepodařilo se", en: "Failed" };
+          throw r.push(
+            y({
               type: "activity",
               id: l,
-              title: y(T, o),
+              title: w(A, i),
               status: "failed",
               metadata: { skill: l }
             })
-          ), s = !0, c = `Tool "${l}" failed: ${v}`, d;
+          ), c = !0, d = `Tool "${l}" failed: ${$}`, h;
         }
       }
     };
   return {
-    tools: f,
+    tools: a,
     skills: n,
-    calledSkillNames: r,
+    calledSkillNames: s,
+    calledSkillIds: o,
+    skillsById: g,
     drainActivities() {
-      return i.splice(0, i.length);
+      return r.splice(0, r.length);
     },
     get hadFailure() {
-      return s;
+      return c;
     },
     get failureContext() {
-      return c;
+      return d;
     }
   };
 }
-function A(n) {
-  return Object.entries(n.skills).map(([t, o]) => {
-    const e = [o.readOnly === !1 ? "write" : "read"];
-    return o.requiresConfirmation && e.push("requires confirmation"), `- ${t} (${e.join(", ")}): ${o.description}`;
+function P(n) {
+  return Object.entries(n.skills).map(([e, i]) => {
+    const t = [i.readOnly === !1 ? "write" : "read"];
+    return i.requiresConfirmation && t.push("requires confirmation"), `${`[${i.id}] `}${e} (${t.join(", ")}): ${i.description}`;
   }).join(`
 `);
 }
-function E(n, t) {
-  return t.map((o) => n.skills[o]).filter((o) => o?.instructions).map((o) => o.instructions).join(`
+function L(n, e) {
+  return e.map((i) => n.skills[i]).filter((i) => i?.instructions).map((i) => i.instructions).join(`
 
 `);
 }
-const w = /* @__PURE__ */ new Set(["text-delta", "text"]), S = /* @__PURE__ */ new Set([
+function I(n, e) {
+  return e.map((i) => n.skillsById.get(i)).filter((i) => i?.instructions).map((i) => i.instructions).join(`
+
+`);
+}
+const j = /* @__PURE__ */ new Set(["text-delta", "text"]), R = /* @__PURE__ */ new Set([
   "tool-call",
   "tool-result",
   "tool-input-start",
@@ -122,136 +137,203 @@ const w = /* @__PURE__ */ new Set(["text-delta", "text"]), S = /* @__PURE__ */ n
   "response-metadata",
   "stream-start"
 ]);
-async function* m(n, t, o) {
-  const e = o?.debug ?? !1;
-  for await (const i of n) {
-    const r = i, s = r.type;
-    if (e)
-      if (s && w.has(s)) {
-        const c = r.text ?? r.textDelta;
-        console.debug(`[juneau] streamToWire chunk: ${s} ${JSON.stringify(c ?? "")}`);
-      } else s === "tool-call" ? console.debug(`[juneau] streamToWire chunk: tool-call "${r.toolName ?? r.name ?? "?"}"`) : s === "tool-result" ? console.debug("[juneau] streamToWire chunk: tool-result (ignored)") : s && (S.has(s) ? console.debug(`[juneau] streamToWire chunk: ${s} (ignored)`) : console.debug(`[juneau] streamToWire chunk: ${s} (unknown)`));
-    if (s && w.has(s)) {
-      if (t) {
-        const f = t.drainActivities();
-        e && f.length > 0 && console.debug(`[juneau] streamToWire → draining ${f.length} activities`);
-        for (const l of f)
-          yield l;
+async function* p(n, e, i) {
+  const t = i?.debug ?? !1;
+  for await (const r of n) {
+    const s = r, o = s.type;
+    if (t)
+      if (o && j.has(o)) {
+        const c = s.text ?? s.textDelta;
+        console.debug(`[juneau] streamToWire chunk: ${o} ${JSON.stringify(c ?? "")}`);
+      } else o === "tool-call" ? console.debug(`[juneau] streamToWire chunk: tool-call "${s.toolName ?? s.name ?? "?"}"`) : o === "tool-result" ? console.debug("[juneau] streamToWire chunk: tool-result (ignored)") : o && (R.has(o) ? console.debug(`[juneau] streamToWire chunk: ${o} (ignored)`) : console.debug(`[juneau] streamToWire chunk: ${o} (unknown)`));
+    if (o && j.has(o)) {
+      if (e) {
+        const d = e.drainActivities();
+        t && d.length > 0 && console.debug(`[juneau] streamToWire → draining ${d.length} activities`);
+        for (const g of d)
+          yield g;
       }
-      const c = r.text ?? r.textDelta;
-      c && (e && console.debug(`[juneau] streamToWire → yielding text ${JSON.stringify(c)}`), yield `data: ${JSON.stringify({ type: "text", text: c })}
+      const c = s.text ?? s.textDelta;
+      c && (t && console.debug(`[juneau] streamToWire → yielding text ${JSON.stringify(c)}`), yield `data: ${JSON.stringify({ type: "text", text: c })}
 
 `);
     }
   }
-  if (t) {
-    const i = t.drainActivities();
-    e && i.length > 0 && console.debug(`[juneau] streamToWire → draining ${i.length} activities (end of stream)`);
-    for (const r of i)
-      yield r;
+  if (e) {
+    const r = e.drainActivities();
+    t && r.length > 0 && console.debug(`[juneau] streamToWire → draining ${r.length} activities (end of stream)`);
+    for (const s of r)
+      yield s;
   }
-  e && console.debug("[juneau] streamToWire → end of stream, emitting done"), yield `data: ${JSON.stringify({ type: "done" })}
+  t && console.debug("[juneau] streamToWire → end of stream, emitting done"), yield `data: ${JSON.stringify({ type: "done" })}
 
 `;
 }
-function j(n) {
+function v(n) {
   return `data: ${JSON.stringify({ type: "error", message: n })}
 
 `;
 }
-function b() {
+function x() {
   return `data: ${JSON.stringify({ type: "done" })}
 
 `;
 }
-function x(n) {
-  let t = "";
-  for (const o of n.split(`
+function b(n) {
+  let e = "";
+  for (const i of n.split(`
 `))
-    if (o.startsWith("data: "))
+    if (i.startsWith("data: "))
       try {
-        const e = JSON.parse(o.slice(6));
-        e.type === "text" && typeof e.text == "string" && (t += e.text);
+        const t = JSON.parse(i.slice(6));
+        t.type === "text" && typeof t.text == "string" && (e += t.text);
       } catch {
       }
-  return t;
+  return e;
 }
-async function* F(n) {
-  const { phase1: t, phase2: o, phase3: e, skillSet: i, onFinish: r, debug: s = !1 } = n;
-  s && console.debug("[juneau] withToolRecovery → phase 1 start");
-  let c = !1, f = "";
-  const l = t();
-  for await (const a of m(l.fullStream, i, { debug: s }))
-    f += x(a), a.includes('"type":"text"') && (c = !0), !a.includes('"type":"done"') && (yield a);
-  if (s && console.debug(
-    `[juneau] withToolRecovery → phase 1 complete, textProduced=${c}, hadFailure=${i.hadFailure}`
-  ), i.hadFailure && !c && i.failureContext) {
-    s && console.debug("[juneau] withToolRecovery → hadFailure=true, textProduced=false → triggering phase 2");
+async function* B(n) {
+  const { phase1: e, phase2: i, phase3: t, skillSet: r, onFinish: s, debug: o = !1 } = n;
+  o && console.debug("[juneau] withToolRecovery → phase 1 start");
+  let c = !1, d = "";
+  const g = e();
+  for await (const u of p(g.fullStream, r, { debug: o }))
+    d += b(u), u.includes('"type":"text"') && (c = !0), !u.includes('"type":"done"') && (yield u);
+  if (o && console.debug(
+    `[juneau] withToolRecovery → phase 1 complete, textProduced=${c}, hadFailure=${r.hadFailure}`
+  ), r.hadFailure && !c && r.failureContext) {
+    o && console.debug("[juneau] withToolRecovery → hadFailure=true, textProduced=false → triggering phase 2");
     try {
-      const a = o(i.failureContext);
-      for await (const u of m(a.fullStream, void 0, { debug: s }))
-        f += x(u), !u.includes('"type":"done"') && (yield u);
-      s && console.debug("[juneau] withToolRecovery → phase 2 complete"), r?.({ text: f }), yield b();
-    } catch (a) {
-      const u = a instanceof Error ? a.message : String(a);
-      s && console.debug(`[juneau] withToolRecovery → phase 2 FAILED: "${u}"`), yield j(u);
+      const u = i(r.failureContext);
+      for await (const a of p(u.fullStream, void 0, { debug: o }))
+        d += b(a), !a.includes('"type":"done"') && (yield a);
+      o && console.debug("[juneau] withToolRecovery → phase 2 complete"), s?.({ text: d }), yield x();
+    } catch (u) {
+      const a = u instanceof Error ? u.message : String(u);
+      o && console.debug(`[juneau] withToolRecovery → phase 2 FAILED: "${a}"`), yield v(a);
     }
     return;
   }
-  if (!c && !i.hadFailure && e) {
-    const a = await N(l);
-    if (a) {
-      s && (console.debug(
-        `[juneau] withToolRecovery → phase 3 messages resolved (${a.length}):`,
-        JSON.stringify(a, null, 2)
-      ), R(a) || console.debug(
+  if (!c && !r.hadFailure && t) {
+    const u = await W(g);
+    if (u) {
+      o && (console.debug(
+        `[juneau] withToolRecovery → phase 3 messages resolved (${u.length}):`,
+        JSON.stringify(u, null, 2)
+      ), F(u) || console.debug(
         "[juneau] withToolRecovery → WARNING: resolved history contains no tool-result turn — Gemini will likely reject it as an invalid conversation structure"
       ), console.debug("[juneau] withToolRecovery → no failure, no text → triggering phase 3"));
       try {
-        for await (const u of m(e(a).fullStream, void 0, { debug: s }))
-          f += x(u), !u.includes('"type":"done"') && (yield u);
-        s && console.debug("[juneau] withToolRecovery → phase 3 complete"), r?.({ text: f }), yield b();
-      } catch (u) {
-        const g = u instanceof Error ? u.message : String(u);
-        s && console.debug(`[juneau] withToolRecovery → phase 3 FAILED: "${g}"`), yield j(g);
+        for await (const a of p(t(u).fullStream, void 0, { debug: o }))
+          d += b(a), !a.includes('"type":"done"') && (yield a);
+        o && console.debug("[juneau] withToolRecovery → phase 3 complete"), s?.({ text: d }), yield x();
+      } catch (a) {
+        const l = a instanceof Error ? a.message : String(a);
+        o && console.debug(`[juneau] withToolRecovery → phase 3 FAILED: "${l}"`), yield v(l);
       }
       return;
     }
-    s && console.debug(
+    o && console.debug(
       "[juneau] withToolRecovery → phase 3 configured but phase 1 result exposes no message history — emitting done"
     );
-  } else !c && !i.hadFailure && s && console.debug(
+  } else !c && !r.hadFailure && o && console.debug(
     "[juneau] withToolRecovery → no failure, no text, no phase3 — emitting done (Gemini silent response)"
   );
-  r?.({ text: f }), yield b();
+  s?.({ text: d }), yield x();
 }
-async function N(n) {
+async function W(n) {
   if (n.messages) {
-    const t = await n.messages;
-    if (Array.isArray(t) && t.length > 0)
-      return t;
+    const e = await n.messages;
+    if (Array.isArray(e) && e.length > 0)
+      return e;
   }
   if (n.response) {
-    const t = await n.response;
-    if (Array.isArray(t?.messages) && t.messages.length > 0)
-      return t.messages;
+    const e = await n.response;
+    if (Array.isArray(e?.messages) && e.messages.length > 0)
+      return e.messages;
   }
   return null;
 }
-function R(n) {
-  return n.some((t) => {
-    const o = t;
-    return o.role === "tool" ? !0 : Array.isArray(o.content) ? o.content.some(
-      (e) => e.type === "tool-result"
+function F(n) {
+  return n.some((e) => {
+    const i = e;
+    return i.role === "tool" ? !0 : Array.isArray(i.content) ? i.content.some(
+      (t) => t.type === "tool-result"
     ) : !1;
   });
 }
+function T(n) {
+  return `data: ${JSON.stringify({ type: "error", message: n })}
+
+`;
+}
+function D() {
+  return `data: ${JSON.stringify({ type: "done" })}
+
+`;
+}
+function N(n) {
+  let e = "";
+  for (const i of n.split(`
+`))
+    if (i.startsWith("data: "))
+      try {
+        const t = JSON.parse(i.slice(6));
+        t.type === "text" && typeof t.text == "string" && (e += t.text);
+      } catch {
+      }
+  return e;
+}
+async function J(n) {
+  if (n.messages) {
+    const e = await n.messages;
+    if (Array.isArray(e) && e.length > 0) return e;
+  }
+  if (n.response) {
+    const e = await n.response;
+    if (Array.isArray(e?.messages) && e.messages.length > 0)
+      return e.messages;
+  }
+  return null;
+}
+async function* G(n) {
+  const { phase1: e, phase2: i, skillSet: t, onFinish: r, debug: s = !1 } = n;
+  s && console.debug("[juneau] withSkillDispatch → phase 1 start");
+  let o = "", c = !1;
+  const d = e();
+  for await (const a of p(d.fullStream, t, { debug: s }))
+    o += N(a), a.includes('"type":"text"') && (c = !0), !a.includes('"type":"done"') && (yield a);
+  if (s && console.debug(
+    `[juneau] withSkillDispatch → phase 1 complete, calledSkillIds=[${t.calledSkillIds.join(", ")}], textProduced=${c}`
+  ), t.calledSkillIds.length === 0) {
+    s && console.debug("[juneau] withSkillDispatch → no skill called, emitting done"), r?.({ text: o }), yield D();
+    return;
+  }
+  const g = await J(d);
+  if (!g) {
+    s && console.debug("[juneau] withSkillDispatch → could not resolve phase 1 history, emitting error"), yield T("withSkillDispatch: could not resolve phase 1 message history for phase 2");
+    return;
+  }
+  const u = I(t, t.calledSkillIds);
+  s && console.debug(
+    `[juneau] withSkillDispatch → phase 2 start, instructions length=${u.length}, history turns=${g.length}`
+  );
+  try {
+    for await (const a of p(i(u, g).fullStream, void 0, { debug: s }))
+      o += N(a), !a.includes('"type":"done"') && (yield a);
+    s && console.debug("[juneau] withSkillDispatch → phase 2 complete"), r?.({ text: o }), yield D();
+  } catch (a) {
+    const l = a instanceof Error ? a.message : String(a);
+    s && console.debug(`[juneau] withSkillDispatch → phase 2 FAILED: "${l}"`), yield T(l);
+  }
+}
 export {
-  A as buildSkillIndex,
-  W as createSkillSet,
-  E as selectSkills,
-  m as streamToWire,
-  O as toSdkMessages,
-  F as withToolRecovery
+  P as buildSkillIndex,
+  C as createSkillSet,
+  L as selectSkills,
+  I as selectSkillsById,
+  p as streamToWire,
+  M as toSdkMessages,
+  G as withSkillDispatch,
+  B as withToolRecovery
 };
 //# sourceMappingURL=index.js.map