@turmind/halo 2.2.0 → 2.2.2

package/dist/index.js

@@ -1929,7 +1929,7 @@ var init_init = __esm({
       path8.resolve(__dirname, "..", "bundled-docs"),
       path8.resolve(__dirname, "..", "..", "..", ".halo", "docs")
     ];
-    TEMPLATE_VERSION = 118;
+    TEMPLATE_VERSION = 119;
     VERSION_FILE = ".template-version";
     SKIP_NAMES = /* @__PURE__ */ new Set([".DS_Store", "schema.sql", "__pycache__", ".pytest_cache"]);
     BUILTIN_AGENT_IDS = /* @__PURE__ */ new Set([
@@ -16976,7 +16976,7 @@ async function initObservability(haloProcess = "server") {
     return true;
   }
   const { registerSdk: registerSdk2 } = await Promise.resolve().then(() => (init_otel_sdk(), otel_sdk_exports));
-  providers = await registerSdk2(process.env.OTEL_SERVICE_NAME, "2.2.0", haloProcess);
+  providers = await registerSdk2(process.env.OTEL_SERVICE_NAME, "2.2.2", haloProcess);
   console.log(`[Observability] OTLP export \u2192 ${process.env.OTEL_EXPORTER_OTLP_ENDPOINT} (service.name=${process.env.OTEL_SERVICE_NAME}, halo.process=${haloProcess}, capture_content=${config.observability.captureContent})`);
   return true;
 }
@@ -28938,6 +28938,23 @@ var init_handler = __esm({
 });
 
 // ../core/dist/protocol/session-message.js
+function inferMessageType(msg) {
+  if (msg.type)
+    return msg.type;
+  if (msg.role === "user")
+    return "user";
+  if (msg.role === "assistant")
+    return "assistant";
+  if (msg.toolName)
+    return "tool_call";
+  if (msg.toolOutput !== void 0 && !msg.toolName)
+    return "tool_result";
+  if (msg.usage)
+    return "usage";
+  if (msg.systemPrompt)
+    return "context";
+  return "notification";
+}
 var init_session_message = __esm({
   "../core/dist/protocol/session-message.js"() {
     "use strict";
@@ -29990,7 +30007,7 @@ function createSttModelManager(opts = {}) {
     }
   };
 }
-var SENSE_VOICE_MODEL, SENSE_VOICE_TOKENS, SILERO_VAD_MODEL, HF_SENSE_VOICE, MS_SENSE_VOICE, STT_MODEL_FILES, sttModels;
+var SENSE_VOICE_MODEL, SENSE_VOICE_TOKENS, SILERO_VAD_MODEL, PYANNOTE_SEG_MODEL, CAMPLUS_MODEL, HF_SENSE_VOICE, MS_SENSE_VOICE, STT_MODEL_FILES, sttModels;
 var init_models = __esm({
   "../server/dist/stt/models.js"() {
     "use strict";
@@ -29998,6 +30015,8 @@ var init_models = __esm({
     SENSE_VOICE_MODEL = "sense-voice-zh-en-ja-ko-yue-2024-07-17/model.int8.onnx";
     SENSE_VOICE_TOKENS = "sense-voice-zh-en-ja-ko-yue-2024-07-17/tokens.txt";
     SILERO_VAD_MODEL = "silero-vad-v4/silero_vad.onnx";
+    PYANNOTE_SEG_MODEL = "pyannote-segmentation-3-0/model.int8.onnx";
+    CAMPLUS_MODEL = "campplus-zh-en-advanced/3dspeaker_speech_campplus_sv_zh_en_16k-common_advanced.onnx";
     HF_SENSE_VOICE = "https://huggingface.co/csukuangfj/sherpa-onnx-sense-voice-zh-en-ja-ko-yue-2024-07-17/resolve/2365baeacb507f821a0c8120fcee3d484dba7a07";
     MS_SENSE_VOICE = "https://www.modelscope.cn/api/v1/models/pengzhendong/sherpa-onnx-sense-voice-zh-en-ja-ko-yue/repo?Revision=master&FilePath=";
     STT_MODEL_FILES = [
@@ -30027,29 +30046,205 @@ var init_models = __esm({
           { name: "huggingface", url: "https://huggingface.co/csukuangfj/vad/resolve/fba88cd2e921609e7675c3aaf51e0b9b295da4bc/silero_vad.onnx" },
           { name: "modelscope", url: "https://www.modelscope.cn/api/v1/models/pengzhendong/silero-vad/repo?Revision=master&FilePath=v4/silero_vad.onnx" }
         ]
+      },
+      {
+        path: PYANNOTE_SEG_MODEL,
+        size: 1540506,
+        sha256: "d582f4b4c6b48205de7e0643c57df0df5615a3c176189be3fc461e9d18827b5d",
+        sources: [
+          { name: "huggingface", url: "https://huggingface.co/csukuangfj/sherpa-onnx-pyannote-segmentation-3-0/resolve/9403a6902bb58e3d5ae8c7e77c3422de279db2e0/model.int8.onnx" },
+          { name: "modelscope", url: "https://www.modelscope.cn/api/v1/models/pengzhendong/sherpa-onnx-pyannote-segmentation-3-0/repo?Revision=master&FilePath=model.int8.onnx" }
+        ]
+      },
+      {
+        path: CAMPLUS_MODEL,
+        size: 28281164,
+        sha256: "aa3cfc16963a10586a9393f5035d6d6b57e98d358b347f80c2a30bf4f00ceba2",
+        sources: [
+          { name: "huggingface", url: "https://huggingface.co/csukuangfj/speaker-embedding-models/resolve/0743f301363dec56491a490f6d6cbc9d67f9a3bf/3dspeaker_speech_campplus_sv_zh_en_16k-common_advanced.onnx" },
+          { name: "modelscope", url: "https://www.modelscope.cn/api/v1/models/lijiu09/speaker-embedding-models/repo?Revision=master&FilePath=3dspeaker_speech_campplus_sv_zh_en_16k-common_advanced.onnx" },
+          { name: "github", url: "https://github.com/k2-fsa/sherpa-onnx/releases/download/speaker-recongition-models/3dspeaker_speech_campplus_sv_zh_en_16k-common_advanced.onnx" }
+        ]
       }
     ];
     sttModels = createSttModelManager();
   }
 });
 
+// ../server/dist/stt/speakers.js
+function normalize(v) {
+  let n = 0;
+  for (const x of v)
+    n += x * x;
+  n = Math.sqrt(n) || 1;
+  return v.map((x) => x / n);
+}
+function cosine(a, b) {
+  let d = 0, x = 0, y = 0;
+  for (let i = 0; i < a.length; i++) {
+    d += a[i] * b[i];
+    x += a[i] * a[i];
+    y += b[i] * b[i];
+  }
+  return x && y ? d / Math.sqrt(x * y) : 0;
+}
+function createSpeakerTracker(threshold = SPEAKER_MATCH_THRESHOLD) {
+  const centroids = [];
+  return {
+    /** One local cluster (its embedding + seconds of audio) → speaker index. */
+    assign(embedding, seconds) {
+      const e = normalize(embedding);
+      let best = -1;
+      let bestSim = -2;
+      centroids.forEach((c, k) => {
+        const s = cosine(c, e);
+        if (s > bestSim) {
+          bestSim = s;
+          best = k;
+        }
+      });
+      if (best < 0 || bestSim < threshold && seconds >= MIN_NEW_SPEAKER_S) {
+        centroids.push(e);
+        return centroids.length - 1;
+      }
+      if (bestSim >= threshold) {
+        const c = centroids[best];
+        for (let i = 0; i < c.length; i++)
+          c[i] += e[i];
+      }
+      return best;
+    }
+  };
+}
+function runAt(runs, t2) {
+  let hit = null;
+  for (const r of runs)
+    if (r.start <= t2 && t2 <= r.end && (!hit || r.start > hit.start))
+      hit = r;
+  if (hit)
+    return hit;
+  let best = runs[0];
+  let dist = Infinity;
+  for (const r of runs) {
+    const d = Math.min(Math.abs(t2 - r.start), Math.abs(t2 - r.end));
+    if (d < dist) {
+      dist = d;
+      best = r;
+    }
+  }
+  return best;
+}
+function splitBySpeakerRuns(text6, tokens, timestamps, runs, duration) {
+  const audio = /* @__PURE__ */ new Map();
+  for (const r of runs)
+    audio.set(r.speaker, (audio.get(r.speaker) ?? 0) + r.end - r.start);
+  const top = [...audio.entries()].reduce((a, b) => b[1] > a[1] ? b : a)[0];
+  const whole = [{ start: 0, end: duration, text: text6, speaker: top }];
+  if (audio.size === 1 || !tokens || !timestamps || tokens.length !== timestamps.length || tokens.join("").trim() !== text6)
+    return whole;
+  const pieces = [];
+  for (let i = 0; i < tokens.length; i++) {
+    const cur = pieces.at(-1);
+    if (!WORD.test(tokens[i])) {
+      if (cur)
+        cur.last = i;
+      continue;
+    }
+    const run = runAt(runs, timestamps[i]);
+    if (cur && cur.speaker === run.speaker) {
+      cur.last = i;
+      continue;
+    }
+    pieces.push(cur ? { speaker: run.speaker, first: i, last: i, at: Math.min(Math.max(run.start, timestamps[cur.last]), timestamps[i]) } : { speaker: run.speaker, first: 0, last: i, at: 0 });
+  }
+  for (let k = pieces.length - 1; k >= 0 && pieces.length > 1; k--) {
+    if ((pieces[k + 1]?.at ?? duration) > pieces[k].at)
+      continue;
+    if (k > 0)
+      pieces[k - 1].last = pieces[k].last;
+    else
+      Object.assign(pieces[1], { first: pieces[0].first, at: 0 });
+    pieces.splice(k, 1);
+  }
+  for (let k = pieces.length - 1; k > 0; k--) {
+    if (pieces[k].speaker !== pieces[k - 1].speaker)
+      continue;
+    pieces[k - 1].last = pieces[k].last;
+    pieces.splice(k, 1);
+  }
+  if (pieces.length === 0)
+    return whole;
+  return pieces.map((p, k) => ({
+    start: p.at,
+    end: pieces[k + 1]?.at ?? duration,
+    text: tokens.slice(p.first, p.last + 1).join("").trim(),
+    speaker: p.speaker
+  }));
+}
+var SPEAKER_MATCH_THRESHOLD, MIN_NEW_SPEAKER_S, WORD;
+var init_speakers = __esm({
+  "../server/dist/stt/speakers.js"() {
+    "use strict";
+    SPEAKER_MATCH_THRESHOLD = 0.55;
+    MIN_NEW_SPEAKER_S = 1;
+    WORD = /[\p{L}\p{N}]/u;
+  }
+});
+
 // ../server/dist/stt/engine.js
 import os8 from "node:os";
+function withTimeout(p, ms) {
+  let timer2;
+  const timeout = new Promise((_, reject) => {
+    timer2 = setTimeout(() => reject(new Error("timed out")), ms);
+  });
+  return Promise.race([p, timeout]).finally(() => clearTimeout(timer2));
+}
 function createSttEngine(deps = {}) {
   const loadSherpa = deps.loadSherpa ?? defaultLoadSherpa;
   const models = deps.models ?? sttModels;
   let sherpa = null;
   let recognizer = null;
   let loading = null;
+  let diarizer = null;
+  let extractor = null;
+  let diarLoading = null;
   const queue = [];
   let decoding = false;
-  function load2() {
-    if (recognizer)
-      return Promise.resolve();
-    loading ??= doLoad().finally(() => {
-      loading = null;
-    });
-    return loading;
+  async function load2(opts = {}) {
+    if (!recognizer)
+      await (loading ??= doLoad().finally(() => {
+        loading = null;
+      }));
+    if (opts.speakers && !diarizer)
+      await (diarLoading ??= doLoadDiarizer().finally(() => {
+        diarLoading = null;
+      }));
+  }
+  async function doLoadDiarizer() {
+    const t0 = Date.now();
+    try {
+      const embedding = { model: models.filePath(CAMPLUS_MODEL), numThreads: NUM_THREADS, provider: "cpu", debug: 0 };
+      const d = new sherpa.OfflineSpeakerDiarization({
+        segmentation: { pyannote: { model: models.filePath(PYANNOTE_SEG_MODEL) }, numThreads: NUM_THREADS, provider: "cpu", debug: 0 },
+        embedding,
+        clustering: { numClusters: -1, threshold: DIAR_CLUSTER_THRESHOLD },
+        minDurationOn: DIAR_MIN_ON_S,
+        minDurationOff: DIAR_MIN_OFF_S
+      });
+      extractor = new sherpa.SpeakerEmbeddingExtractor(embedding);
+      diarizer = d;
+      console.log(`[STT] speaker diarizer loaded in ${Date.now() - t0}ms`);
+    } catch (err) {
+      console.log(`[STT] speaker diarizer load failed: ${errMsg2(err)}`);
+      throw new SttError("engine", `speaker labelling unavailable: ${errMsg2(err)}`);
+    }
+  }
+  function embed(samples) {
+    const s = extractor.createStream();
+    s.acceptWaveform({ samples: samples.subarray(0, EMBED_MAX_S * SAMPLE_RATE), sampleRate: SAMPLE_RATE });
+    s.inputFinished();
+    return extractor.compute(s, false);
   }
   async function doLoad() {
     const t0 = Date.now();
@@ -30079,20 +30274,32 @@ function createSttEngine(deps = {}) {
     decoding = true;
     while (queue.length > 0) {
       const job = queue.shift();
+      let phase = "decode";
       try {
         const stream = recognizer.createStream();
         stream.acceptWaveform({ samples: job.samples, sampleRate: SAMPLE_RATE });
         await recognizer.decodeAsync(stream);
-        job.owner.done(job, recognizer.getResult(stream));
+        const result = recognizer.getResult(stream);
+        let diar = null;
+        if (job.owner.wantsSpeakers() && (result.text ?? "").trim()) {
+          phase = "speaker diarization";
+          diar = await withTimeout(sherpa.offlineSpeakerDiarizationProcessAsync(diarizer.handle, job.samples, () => {
+          }), DIAR_TIMEOUT_MS);
+        }
+        await job.owner.done(job, result, diar);
       } catch (err) {
-        job.owner.fail(new SttError("engine", `decode failed: ${errMsg2(err)}`));
+        job.owner.fail(new SttError("engine", `${phase} failed: ${errMsg2(err)}`));
       }
     }
     decoding = false;
   }
-  function open(handlers) {
+  function open(handlers, opts = {}) {
     if (!sherpa)
       throw new SttError("engine", "speech engine not loaded");
+    if (opts.speakers && !diarizer)
+      throw new SttError("engine", "speaker labelling not loaded");
+    const speakers = opts.speakers ? createSpeakerTracker() : null;
+    const labels = /* @__PURE__ */ new Map();
     let vad;
     try {
       vad = new sherpa.Vad({
@@ -30148,16 +30355,67 @@ function createSttEngine(deps = {}) {
       handlers.onError(err);
       checkDrain();
     }
+    async function speakerRuns(samples, diar) {
+      const duration = samples.length / SAMPLE_RATE;
+      const tick = async () => {
+        await new Promise((r) => setImmediate(r));
+        return !stopped;
+      };
+      if (diar.length === 0)
+        return await tick() ? [{ start: 0, end: duration, speaker: speakers.assign(embed(samples), duration) }] : null;
+      const clusters = /* @__PURE__ */ new Map();
+      for (const d of [...diar].sort((a, b) => a.start - b.start))
+        clusters.set(d.speaker, [...clusters.get(d.speaker) ?? [], d]);
+      const seconds = (segs) => segs.reduce((n, d) => n + d.end - d.start, 0);
+      const runs = [];
+      for (const segs of [...clusters.values()].sort((a, b) => seconds(b) - seconds(a))) {
+        const parts = segs.map((d) => samples.subarray(Math.round(d.start * SAMPLE_RATE), Math.round(d.end * SAMPLE_RATE)));
+        const audio = new Float32Array(Math.min(parts.reduce((n, p) => n + p.length, 0), EMBED_MAX_S * SAMPLE_RATE));
+        let at = 0;
+        for (const p of parts) {
+          if (at >= audio.length)
+            break;
+          audio.set(p.subarray(0, audio.length - at), at);
+          at += p.length;
+        }
+        if (!await tick())
+          return null;
+        const speaker = speakers.assign(embed(audio), seconds(segs));
+        for (const d of segs)
+          runs.push({ start: d.start, end: d.end, speaker });
+      }
+      return runs;
+    }
     const owner = {
-      done(job, result) {
+      wantsSpeakers: () => speakers !== null && !stopped,
+      async done(job, result, diar) {
+        const text6 = (result.text ?? "").trim();
+        let pieces = null;
+        if (text6 && diar && !stopped) {
+          try {
+            const runs = await speakerRuns(job.samples, diar);
+            if (runs)
+              pieces = splitBySpeakerRuns(text6, result.tokens, result.timestamps, runs, job.samples.length / SAMPLE_RATE);
+          } catch (err) {
+            failStream(new SttError("engine", `speaker labelling failed: ${errMsg2(err)}`));
+          }
+        }
         pendingSamples -= job.samples.length;
         inFlight2--;
         if (!stopped) {
           segments++;
           decodedSamples += job.samples.length;
-          const text6 = (result.text ?? "").trim();
-          if (text6)
-            handlers.onFinal({ start: round3(job.start / SAMPLE_RATE), end: round3(job.end / SAMPLE_RATE), text: text6, lang: (result.lang ?? "").replace(/<\|([^|]*)\|>/g, "$1") });
+          const lang = (result.lang ?? "").replace(/<\|([^|]*)\|>/g, "$1");
+          const start3 = job.start / SAMPLE_RATE;
+          const end = job.end / SAMPLE_RATE;
+          if (pieces) {
+            for (const p of pieces) {
+              if (!labels.has(p.speaker))
+                labels.set(p.speaker, String(labels.size));
+              handlers.onFinal({ start: round3(start3 + p.start), end: round3(Math.min(start3 + p.end, end)), text: p.text, lang, speaker: labels.get(p.speaker) });
+            }
+          } else if (text6)
+            handlers.onFinal({ start: round3(start3), end: round3(end), text: text6, lang });
         }
         checkDrain();
       },
@@ -30246,16 +30504,17 @@ function createSttEngine(deps = {}) {
         dropQueued();
         checkDrain();
       },
-      stats: () => ({ segments, audioSeconds: round3(decodedSamples / SAMPLE_RATE) })
+      stats: () => ({ segments, audioSeconds: round3(decodedSamples / SAMPLE_RATE), ...speakers ? { speakers: labels.size } : {} })
     };
   }
   return { load: load2, open };
 }
-var SAMPLE_RATE, VAD_WINDOW, VAD_THRESHOLD, VAD_MIN_SILENCE_S, VAD_MIN_SPEECH_S, VAD_MAX_SPEECH_S, PAD_BEFORE_S, PAD_AFTER_S, RING_S, MAX_QUEUED_SEGMENTS, MAX_PENDING_AUDIO_S, NUM_THREADS, SttError, defaultLoadSherpa, errMsg2, round3, sttEngine;
+var SAMPLE_RATE, VAD_WINDOW, VAD_THRESHOLD, VAD_MIN_SILENCE_S, VAD_MIN_SPEECH_S, VAD_MAX_SPEECH_S, PAD_BEFORE_S, PAD_AFTER_S, RING_S, MAX_QUEUED_SEGMENTS, MAX_PENDING_AUDIO_S, NUM_THREADS, DIAR_CLUSTER_THRESHOLD, DIAR_MIN_ON_S, DIAR_MIN_OFF_S, EMBED_MAX_S, DIAR_TIMEOUT_MS, SttError, defaultLoadSherpa, errMsg2, round3, sttEngine;
 var init_engine = __esm({
   "../server/dist/stt/engine.js"() {
     "use strict";
     init_models();
+    init_speakers();
     SAMPLE_RATE = 16e3;
     VAD_WINDOW = 512;
     VAD_THRESHOLD = 0.5;
@@ -30268,6 +30527,11 @@ var init_engine = __esm({
     MAX_QUEUED_SEGMENTS = 32;
     MAX_PENDING_AUDIO_S = 60;
     NUM_THREADS = Math.min(4, Math.max(1, Math.floor(os8.availableParallelism() / 2)));
+    DIAR_CLUSTER_THRESHOLD = 0.6;
+    DIAR_MIN_ON_S = 0.3;
+    DIAR_MIN_OFF_S = 0.5;
+    EMBED_MAX_S = 6;
+    DIAR_TIMEOUT_MS = 6e4;
     SttError = class extends Error {
       code;
       constructor(code, message) {
@@ -30276,7 +30540,10 @@ var init_engine = __esm({
         this.name = "SttError";
       }
     };
-    defaultLoadSherpa = async () => (await import("sherpa-onnx-node")).default;
+    defaultLoadSherpa = async () => {
+      const [m, addon] = await Promise.all([import("sherpa-onnx-node"), import("sherpa-onnx-node/addon.js")]);
+      return { ...m.default, offlineSpeakerDiarizationProcessAsync: addon.default.offlineSpeakerDiarizationProcessAsync };
+    };
     errMsg2 = (err) => err instanceof Error ? err.message : String(err);
     round3 = (s) => Math.round(s * 1e3) / 1e3;
     sttEngine = createSttEngine();
@@ -30308,7 +30575,9 @@ function createSttProxy(deps = {}) {
     }
   });
   wss2.on("connection", (ws, req) => {
-    const extId = parseQuery2(req).get("ext");
+    const q = parseQuery2(req);
+    const extId = q.get("ext");
+    const speakers = q.get("speakers") === "1";
     const openedAt = Date.now();
     let closed = false;
     let failed = false;
@@ -30332,14 +30601,14 @@ function createSttProxy(deps = {}) {
     };
     async function startEngine() {
       try {
-        await engine.load();
+        await engine.load({ speakers });
         if (closed || failed || ended)
           return;
         stream = engine.open({
           // Recognized text goes to the client only — never to the log.
           onFinal: (f) => send2({ type: "final", ...f }),
           onError: (err) => fail2(err.code, err.message)
-        });
+        }, { speakers });
       } catch (err) {
         if (err instanceof SttError)
           fail2(err.code, err.message);
@@ -30364,7 +30633,7 @@ function createSttProxy(deps = {}) {
       else if (s.state === "error")
         fail2("model", s.message ?? "model download failed");
     };
-    console.log(`[STT] stream open ext=${extId}`);
+    console.log(`[STT] stream open ext=${extId}${speakers ? " speakers=1" : ""}`);
     ws.on("message", (data, isBinary) => {
       if (ended || failed)
         return;
@@ -30400,7 +30669,7 @@ function createSttProxy(deps = {}) {
       unsubscribe = null;
       stream?.abort();
       const st = stream?.stats();
-      console.log(`[STT] stream closed after ${((Date.now() - openedAt) / 1e3).toFixed(1)}s ext=${extId}${st ? ` segments=${st.segments} audio=${st.audioSeconds.toFixed(1)}s` : ""}`);
+      console.log(`[STT] stream closed after ${((Date.now() - openedAt) / 1e3).toFixed(1)}s ext=${extId}${st ? ` segments=${st.segments} audio=${st.audioSeconds.toFixed(1)}s${st.speakers !== void 0 ? ` speakers=${st.speakers}` : ""}` : ""}`);
     });
     const initial = models.status();
     if (initial.state === "ready") {
@@ -31566,6 +31835,12 @@ var init_terminal_manager = __esm({
 
 // ../server/dist/ws/handler.js
 import path78 from "node:path";
+function adminSnapshotRows(rows) {
+  return rows.filter((m) => {
+    const t2 = inferMessageType(m);
+    return t2 !== "tool_call" && t2 !== "tool_result";
+  });
+}
 function setupWebSocketHandler(deps) {
   const { wss: wss2, registry: registry2 } = deps;
   const clients = /* @__PURE__ */ new Set();
@@ -31689,8 +31964,10 @@ function setupWebSocketHandler(deps) {
     }
     if (client.subscriptions.has(targetSessionId)) {
       const state = getState(client, targetSessionId);
-      const messages2 = state ? [...createSaveSnapshot(state)] : [];
-      sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: targetSessionId } });
+      const log2 = state?.messageLog ?? [];
+      const deletedIds = log2.filter((m) => m.deleted).map((m) => m.id);
+      const userRows = log2.filter((m) => m.role === "user" && !m.taskId).length;
+      sendJson(ws, { type: "exchange:deleted", sessionId: targetSessionId, deletedIds, userOrdinal: msg.userOrdinal, userRows });
     }
   }
   function createEventListener(client, sessionId) {
@@ -32074,7 +32351,7 @@ ${msg.message}` : markers.join("\n");
         const state2 = getState(client2, sid);
         const ctxConfig = await sm.getContextConfig(sid);
         const running = sm.isSessionRunning(sid);
-        const messages3 = state2 ? running ? [...state2.messageLog] : [...createSaveSnapshot(state2)] : [];
+        const messages3 = state2 ? adminSnapshotRows(running ? state2.messageLog : createSaveSnapshot(state2)) : [];
         const detachedSession = sm.getSessionById(sid);
         sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages3, sessionId: sid, maxContextTokens: ctxConfig.maxTokens, agentId: detachedSession?.agentId, archiveCount: archiveCountFor(client2, sid, detachedSession?.agentId), accessLevel: detachedSession?.accessLevel ?? null } });
         if (state2 && state2.contextTokens > 0) {
@@ -32131,7 +32408,7 @@ ${msg.message}` : markers.join("\n");
         }
       }
       const state = sid ? getState(client2, sid) : null;
-      const messages2 = state ? [...createSaveSnapshot(state)] : [];
+      const messages2 = state ? adminSnapshotRows(createSaveSnapshot(state)) : [];
       sendJson(ws, { type: "state:snapshot", snapshot: { recentMessages: messages2, sessionId: sid, maxContextTokens, agentId, archiveCount: sid ? archiveCountFor(client2, sid, agentId) : 0, accessLevel } });
       if (state && state.contextTokens > 0) {
         sendJson(ws, { type: "chat:usage", contextTokens: state.contextTokens, outputTokens: state.outputTokens, sessionId: sid });
@@ -32161,6 +32438,7 @@ var CLIENT_SILENCE_LIMIT_MS, detachedSessions;
 var init_handler2 = __esm({
   "../server/dist/ws/handler.js"() {
     "use strict";
+    init_session_types();
     init_sandbox();
     init_ui_log_builder();
     init_config();
@@ -32291,7 +32569,7 @@ function buildCard(workspace, interfaceUrl, caps) {
   return {
     name: raw.name,
     description: raw.description,
-    version: typeof raw.version === "string" ? raw.version : "2.2.0",
+    version: typeof raw.version === "string" ? raw.version : "2.2.2",
     supportedInterfaces: [{ url: interfaceUrl, protocolBinding: "JSONRPC", protocolVersion: A2A_VERSION }],
     capabilities: { streaming: caps.streaming, pushNotifications: true, extendedAgentCard: false },
     ...caps.tokenAuth === false ? {} : {
@@ -34046,6 +34324,8 @@ async function runJob(jobId, triggerKind) {
       kickPendingEvents(jobId);
     return runId;
   };
+  if (triggerKind === "manual" && !job.userPrompt)
+    return skip("nothing to run: the job has no prompt, and run-now carries no webhook events");
   if (_inflight.has(jobId))
     return skip("previous run still in progress");
   if (_inflightSessions.has(sessionKeyFor(job.workspacePath, sessionId)))
@@ -34131,9 +34411,9 @@ async function runJob(jobId, triggerKind) {
     const events = webhook ? claimPendingEvents(jobId, runId, sessionId) : [];
     try {
       const texts = events.map((ev) => eventText(ev, job.workspacePath, false));
-      const stamp = host.appendUserMessage(sessionId, [job.userPrompt, ...texts.map((t2) => t2.ui)].join("\n\n"));
+      const stamp = host.appendUserMessage(sessionId, [job.userPrompt, ...texts.map((t2) => t2.ui)].filter(Boolean).join("\n\n"));
       stampEvents(events.map((ev) => ev.id), stamp);
-      await host.sendUserMessage(sessionId, [UNATTENDED_PREAMBLE2, job.userPrompt, ...texts.map((t2) => t2.model)].join("\n\n"), void 0, void 0, stamp);
+      await host.sendUserMessage(sessionId, [UNATTENDED_PREAMBLE2, job.userPrompt, ...texts.map((t2) => t2.model)].filter(Boolean).join("\n\n"), void 0, void 0, stamp);
     } catch (err) {
       untrackRun(runId);
       tracked = false;
@@ -34531,7 +34811,7 @@ function createCronRoutes() {
     const body = await c.req.json().catch(() => null);
     if (!body)
       return c.json({ error: "invalid body" }, 400);
-    for (const k of ["workspacePath", "agentId", "userPrompt"]) {
+    for (const k of ["workspacePath", "agentId"]) {
       if (!body[k] || typeof body[k] !== "string")
         return c.json({ error: `${k} required` }, 400);
     }
@@ -34540,6 +34820,11 @@ function createCronRoutes() {
     const hasSchedule = typeof body.schedule === "string" && body.schedule.trim().length > 0;
     const hasRunAt = typeof body.runAt === "number" && Number.isFinite(body.runAt);
     const webhook = body.webhook === true;
+    const userPrompt = body.userPrompt ?? "";
+    if (typeof userPrompt !== "string")
+      return c.json({ error: "userPrompt must be a string" }, 400);
+    if (!userPrompt && !webhook)
+      return c.json({ error: "userPrompt required" }, 400);
     if (!hasSchedule && !hasRunAt && !webhook)
       return c.json({ error: "schedule, runAt or webhook required" }, 400);
     if (hasSchedule && hasRunAt)
@@ -34570,8 +34855,6 @@ function createCronRoutes() {
     const stateless = body.stateless === true;
     if (stateless && session.sessionId)
       return c.json({ error: STATELESS_SESSION_ERR }, 400);
-    if (webhook && session.sessionId)
-      return c.json({ error: WEBHOOK_SESSION_ERR }, 400);
     const folder = await parseWorkingDir(body.workspacePath, body.workingDir);
     if ("error" in folder)
       return c.json({ error: folder.error }, 400);
@@ -34598,7 +34881,7 @@ function createCronRoutes() {
       label: body.label && body.label.trim().length > 0 ? body.label.trim() : null,
       workspacePath: body.workspacePath,
       agentId: body.agentId,
-      userPrompt: body.userPrompt,
+      userPrompt,
       schedule: hasSchedule ? body.schedule : "",
       runAt: hasRunAt ? body.runAt : null,
       webhookSecret: webhook ? newWebhookSecret() : null,
@@ -34694,8 +34977,12 @@ function createCronRoutes() {
     if (!nextWebhookSecret && nextSchedule.trim().length === 0 && typeof nextRunAt !== "number") {
       return c.json({ error: "schedule, runAt or webhook required" }, 400);
     }
-    if (nextWebhookSecret && merged.sessionId)
-      return c.json({ error: WEBHOOK_SESSION_ERR }, 400);
+    if (body.userPrompt !== void 0 && typeof body.userPrompt !== "string")
+      return c.json({ error: "userPrompt must be a string" }, 400);
+    const nextPrompt = body.userPrompt ?? existing.userPrompt;
+    if (!nextWebhookSecret && !nextPrompt && (body.userPrompt !== void 0 || existing.webhookSecret !== null)) {
+      return c.json({ error: "userPrompt required (only a webhook job may leave it empty)" }, 400);
+    }
     for (const k of ["activeFrom", "activeUntil"]) {
       const err = validateActiveBound(k, body[k]);
       if (err)
@@ -34720,7 +35007,7 @@ function createCronRoutes() {
     if (body.agentId !== void 0)
       patch.agentId = body.agentId;
     if (body.userPrompt !== void 0)
-      patch.userPrompt = body.userPrompt;
+      patch.userPrompt = nextPrompt;
     if (body.schedule !== void 0 || clearSchedule)
       patch.schedule = nextSchedule;
     if (body.runAt !== void 0 || clearRunAt)
@@ -34871,7 +35158,7 @@ function computeNextRun(j) {
     return null;
   }
 }
-var WEBHOOK_SESSION_ERR, TIMEOUT_SEC_MIN, TIMEOUT_SEC_MAX, STATELESS_SESSION_ERR;
+var TIMEOUT_SEC_MIN, TIMEOUT_SEC_MAX, STATELESS_SESSION_ERR;
 var init_cron = __esm({
   "../server/dist/routes/cron.js"() {
     "use strict";
@@ -34881,7 +35168,6 @@ var init_cron = __esm({
     init_dispatcher();
     init_broadcast();
     init_session_id();
-    WEBHOOK_SESSION_ERR = "a webhook job runs in its own session (or a new one every run), not a picked sessionId";
     TIMEOUT_SEC_MIN = 60;
     TIMEOUT_SEC_MAX = 21600;
     STATELESS_SESSION_ERR = "stateless (new session every run) and sessionId are mutually exclusive";
@@ -35381,7 +35667,7 @@ function createCoreChecker(opts) {
 }
 function getCoreStatus(force) {
   checker ??= createCoreChecker({
-    haloVersion: "2.2.0",
+    haloVersion: "2.2.2",
     fetchLatest: fetchNpmLatest,
     onChange: (status) => broadcast({ type: "updates:changed", scope: "core", status })
   });
@@ -35549,7 +35835,7 @@ function hubBase() {
 }
 function serverChecker() {
   checker2 ??= createExtensionsChecker({
-    haloVersion: "2.2.0",
+    haloVersion: "2.2.2",
     installed: () => {
       const s = getSnapshot();
       return [...s.extensions, ...s.disabled];
@@ -41920,7 +42206,7 @@ var init_dist2 = __esm({
     init_git_ssh();
     __dirname3 = path93.dirname(fileURLToPath3(import.meta.url));
     PORT = config.server.port;
-    HALO_VERSION = "2.2.0";
+    HALO_VERSION = "2.2.2";
     PROJECT_ROOT = findProjectRoot();
     HALO_HOME4 = path93.join(homedir25(), ".halo");
     GIT_SHA = readGitSha();
@@ -42073,8 +42359,21 @@ var init_dist2 = __esm({
     }
     FRONTEND_DIR = resolveFrontendDir();
     if (!AGENTCORE) {
-      app.use("/*", serveStatic({ root: path93.relative(process.cwd(), FRONTEND_DIR) }));
+      app.use("/*", serveStatic({
+        root: path93.relative(process.cwd(), FRONTEND_DIR),
+        // Next's `/_next/static/` files are content-hashed (under a buildId dir),
+        // so they can be cached forever. Only on a found file — the SPA fallback
+        // below must stay uncached, or a missing chunk caches index.html as js.
+        // `c.res.headers`, not `c.header`: node-server calls onFound after the
+        // body is built, so only c.res (merged into the result by compose) lands.
+        onFound: (_path, c) => {
+          if (c.req.path.startsWith("/_next/static/"))
+            c.res.headers.set("Cache-Control", "public, max-age=31536000, immutable");
+        }
+      }));
       app.get("/*", (c) => {
+        if (c.req.path.startsWith("/_next/static/"))
+          return c.notFound();
         const indexPath = path93.join(FRONTEND_DIR, "index.html");
         try {
           const html = fs88.readFileSync(indexPath, "utf-8");
@@ -42102,6 +42401,7 @@ var init_dist2 = __esm({
     });
     wss = new WebSocketServer5({
       noServer: true,
+      perMessageDeflate: { zlibDeflateOptions: { level: 1 }, threshold: 1024 },
       verifyClient: (info, callback) => {
         const token = getTokenFromCookieHeader(info.req.headers.cookie);
         if (isAuthenticated(token)) {
@@ -43981,7 +44281,7 @@ function runNode(opts) {
     shellTimeoutMs: config.timeout.shellExec,
     os: process.platform,
     hostname: os13.hostname(),
-    version: "2.2.0"
+    version: "2.2.2"
   };
   const exec2 = createNodeExecutor({ root, base, allowShell }, log2);
   const instance = crypto17.randomUUID();
@@ -44497,7 +44797,7 @@ function installUserUnit(opts, run = runCommand) {
 }
 
 // src/index.ts
-var VERSION = "2.2.0";
+var VERSION = "2.2.2";
 var HELP_TOP = `Usage: halo <command> [options]
 
 Commands: