ocuclaw 1.2.4 → 1.3.0

package/dist/domain/code-span-regions.js

@@ -0,0 +1,103 @@
+// Markdown code-region scanner for the tagged-span grammar passes.
+// Leaf module by design: no imports (CJS emitter import-cycle hazard).
+//
+// Computes [start, end) regions of text covered by markdown code so that
+// tagged-span grammar (<emoji:…>, <dwell>, <skim>) quoted inside backticks
+// or fenced blocks is treated as literal text instead of live tags.
+//
+// Streaming-partial semantics: an unclosed fence runs to end-of-text
+// (CommonMark), while an unclosed inline backtick stays literal until its
+// closer arrives — the cumulative re-parse on the next flush re-interprets,
+// matching how the markdown pass already behaves on partial text.
+
+/**
+ * @param {string} text
+ * @returns {Array<[number, number]>} sorted, non-overlapping [start, end) regions
+ */
+export function computeCodeSpanRegions(text) {
+  if (typeof text !== "string" || !text) return [];
+  const n = text.length;
+  const regions = [];
+
+  // --- Pass 1: fenced code blocks (line-oriented, ``` or ~~~) ---
+  const FENCE_OPEN_RE = /^ {0,3}(`{3,}|~{3,})(.*)$/;
+  const FENCE_CLOSE_RE = /^ {0,3}(`{3,}|~{3,})[ \t]*$/;
+  let fence = null; // { char, len, start }
+  let lineStart = 0;
+  while (lineStart < n) {
+    const nl = text.indexOf("\n", lineStart);
+    const lineEnd = nl === -1 ? n : nl;
+    const line = text.slice(lineStart, lineEnd);
+    if (!fence) {
+      const open = FENCE_OPEN_RE.exec(line);
+      // Backtick fence info strings must not contain backticks (CommonMark).
+      if (open && !(open[1][0] === "`" && open[2].includes("`"))) {
+        fence = { char: open[1][0], len: open[1].length, start: lineStart };
+      }
+    } else {
+      const close = FENCE_CLOSE_RE.exec(line);
+      if (close && close[1][0] === fence.char && close[1].length >= fence.len) {
+        regions.push([fence.start, nl === -1 ? n : nl + 1]);
+        fence = null;
+      }
+    }
+    if (nl === -1) break;
+    lineStart = nl + 1;
+  }
+  if (fence) regions.push([fence.start, n]);
+
+  const inFence = (pos) => {
+    for (const [s, e] of regions) {
+      if (pos >= s && pos < e) return true;
+    }
+    return false;
+  };
+
+  // --- Pass 2: inline backtick code spans outside fences ---
+  // CommonMark: a run of N backticks closes only on the next run of exactly
+  // N backticks, and a code span cannot cross a blank line.
+  let i = 0;
+  while (i < n) {
+    if (text[i] !== "`" || inFence(i)) {
+      i += 1;
+      continue;
+    }
+    let runEnd = i;
+    while (runEnd < n && text[runEnd] === "`") runEnd += 1;
+    const runLen = runEnd - i;
+
+    let close = -1;
+    let k = runEnd;
+    scan: while (k < n) {
+      const ch = text[k];
+      if (ch === "`" && !inFence(k)) {
+        let ke = k;
+        while (ke < n && text[ke] === "`") ke += 1;
+        if (ke - k === runLen) {
+          close = k;
+          break;
+        }
+        k = ke;
+        continue;
+      }
+      if (ch === "\n") {
+        // Blank line ends the paragraph — no closer for this opener.
+        let p = k + 1;
+        while (p < n && (text[p] === " " || text[p] === "\t")) p += 1;
+        if (p < n && text[p] === "\n") break scan;
+      }
+      k += 1;
+    }
+
+    if (close === -1) {
+      // Unmatched run: literal backticks, keep scanning after the run.
+      i = runEnd;
+      continue;
+    }
+    regions.push([i, close + runLen]);
+    i = close + runLen;
+  }
+
+  regions.sort((a, b) => a[0] - b[0]);
+  return regions;
+}

package/dist/domain/conversation-state.js

@@ -1,4 +1,5 @@
 import { filterDisplayEmojiText } from "./message-emoji-filter.js";
+import { stripAllTaggedSpans } from "./tagged-span-strip.js";
 import { marked } from "marked";
 
 // --- Constants ---
@@ -39,9 +40,13 @@ let transcriptDirty = false;
 function buildDisplayEntry(msg, options = {}) {
   if (!msg || (msg.role !== "user" && msg.role !== "assistant")) return null;
 
-  const text = extractText(msg.content);
+  let text = extractText(msg.content);
   if (!text) return null;
 
+  if (msg.role === "assistant") {
+    text = stripAllTaggedSpans(text);
+  }
+
   const { text: plainText } = markdownToPlainText(text, {
     stripReplyTags: msg.role === "assistant",
   });
@@ -212,6 +217,14 @@ function renderBlockTokens(tokens) {
         blocks.push(token.tokens ? renderInlineTokens(token.tokens) : token.text);
         break;
 
+      case "text":
+        // Block-level text token (marked wraps list-item content in these).
+        // Without this case it falls through to default, which recurses over
+        // the INLINE children as blocks — putting every bold/code span on its
+        // own line once the list join("\n") runs.
+        blocks.push(token.tokens ? renderInlineTokens(token.tokens) : token.text);
+        break;
+
       case "code":
         blocks.push(token.text);
         break;

package/dist/domain/debug-store.js

@@ -1,10 +1,14 @@
 const DEFAULT_DEBUG_CATEGORIES = Object.freeze([
   "relay.transport",
   "relay.protocol",
+  "relay.health",
+  "relay.worker.health",
+  "relay.operation",
   "relay.session",
   "openclaw.run",
   "openclaw.seq",
   "openclaw.history",
+  "openclaw.message",
   "sdk.frames",
   "sdk.results",
   "sdk.events",
@@ -16,15 +20,16 @@ const DEFAULT_DEBUG_CATEGORIES = Object.freeze([
   "probe.runtime.memory",
   "probe.runtime.bridge",
   "probe.runtime.bridge_timing",
-  "probe.runtime.screen_off",
   "probe.perf.conversation_upgrade",
   "app.state.diff",
   "render.ownership",
   "render.virtual_pager",
   "render.virtual_pager.summary",
   "render.virtual_pager.diagnostics",
+  "render.header_animation",
   "screen.nav",
   "screen.dim",
+  "glasses.lifecycle",
   "probe.webview.trace",
   "session.timeline",
   "approvals.timeline",
@@ -47,7 +52,6 @@ const DEBUG_CATEGORY_ALIASES = Object.freeze({
     "probe.runtime.memory",
     "probe.runtime.bridge",
     "probe.runtime.bridge_timing",
-    "probe.runtime.screen_off",
     "probe.perf.conversation_upgrade",
   ]),
   "voice.timeline": Object.freeze([
@@ -67,8 +71,24 @@ const DEBUG_CATEGORY_ALIASES = Object.freeze({
 });
 
 const DEFAULT_NOISY_CATEGORY_POLICIES = Object.freeze({
+  "relay.health": Object.freeze({
+    sampleEvery: 1,
+    dedupeWindowMs: 250,
+    alwaysAllow: Object.freeze([
+      "event_loop_lag_spike",
+      "gc_pause",
+      "ws_send_buffer_high_water",
+      "relay_queue_depth",
+    ]),
+  }),
   "sdk.frames": Object.freeze({
-    sampleEvery: 5,
+    // sampleEvery: 1 disables the 1-in-N sampler. Every sdk.frames emit from
+    // MessageScreenWritePipeline is a sparse pipeline-invariant marker (flush,
+    // pipeline_exit, dedup_skipped, etc.) — none are high-rate enough to need
+    // sampling, and dropping them breaks flush↔exit pairing analyses that
+    // depend on seeing every iteration. dedupeWindowMs stays as a narrow
+    // safety net for adjacent same-name/same-prefix bursts.
+    sampleEvery: 1,
     dedupeWindowMs: 150,
     alwaysAllow: Object.freeze([
       "coalescing_summary",
@@ -81,21 +101,6 @@ const DEFAULT_NOISY_CATEGORY_POLICIES = Object.freeze({
   }),
 });
 
-const REDACTION_SAFE = "safe";
-const REDACTION_FULL = "full";
-const DEFAULT_REDACTION_MODE = REDACTION_SAFE;
-const SUPPORTED_REDACTION_MODES = new Set([
-  REDACTION_SAFE,
-  REDACTION_FULL,
-]);
-const SENSITIVE_KEY_PATTERN =
-  /(?:api[-_]?key|auth(?:orization)?|bearer|cookie|credential|jwt|pass(?:word|phrase)?|private[-_]?key|secret|signature|token)/i;
-const FULL_ONLY_KEY_PATTERN =
-  /^(?:renderedtext|fulltext|screentext)$/i;
-const SECRET_VALUE_PATTERN =
-  /(?:^sk-[A-Za-z0-9_-]{8,}$)|(?:^Bearer\s+[^\s]+$)|(?:eyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,})/;
-const MAX_REDACTION_DEPTH = 6;
-
 function clampInt(value, min, max, fallback) {
   const n = Number(value);
   if (!Number.isFinite(n)) return fallback;
@@ -132,23 +137,11 @@ function expandCategoryAliases(list) {
   return Array.from(dedup.values());
 }
 
-function normalizeRedactionMode(raw) {
-  if (raw === undefined || raw === null) return DEFAULT_REDACTION_MODE;
-  if (typeof raw !== "string") return null;
-  const mode = raw.trim().toLowerCase();
-  if (!mode) return DEFAULT_REDACTION_MODE;
-  if (!SUPPORTED_REDACTION_MODES.has(mode)) return null;
-  return mode;
-}
-
 function createDebugStore(opts) {
   const options = opts || {};
-  const capacity = clampInt(options.capacity, 1, 50000, 5000);
-  const payloadMaxBytes = clampInt(options.payloadMaxBytes, 256, 65536, 2048);
+  const capacity = clampInt(options.capacity, 1, 100000, 100000);
   const defaultTtlMs = clampInt(options.defaultTtlMs, 1, 600000, 120000);
   const maxTtlMs = clampInt(options.maxTtlMs, 1, 3600000, 600000);
-  const dumpDefaultLimit = clampInt(options.dumpDefaultLimit, 1, 2000, 300);
-  const dumpMaxLimit = clampInt(options.dumpMaxLimit, 1, 10000, 2000);
   const nowFn = typeof options.now === "function" ? options.now : () => Date.now();
 
   const configuredCategories =
@@ -161,19 +154,6 @@ function createDebugStore(opts) {
     ...DEFAULT_NOISY_CATEGORY_POLICIES,
     ...(options.noisyPolicies || {}),
   };
-  const safeStringTailChars = clampInt(
-    options.safeStringTailChars,
-    16,
-    2048,
-    Math.max(64, Math.min(payloadMaxBytes, 160)),
-  );
-  const fullStringTailChars = clampInt(
-    options.fullStringTailChars,
-    safeStringTailChars,
-    4096,
-    Math.max(256, Math.min(payloadMaxBytes * 2, 1024)),
-  );
-
   /** @type {Map<string, number>} */
   const enabledUntil = new Map();
 
@@ -189,102 +169,6 @@ function createDebugStore(opts) {
   let ringSize = 0;
   let seq = 0;
 
-function isSensitiveKeyName(keyName) {
-  if (typeof keyName !== "string" || !keyName) return false;
-  return SENSITIVE_KEY_PATTERN.test(keyName);
-}
-
-function isFullOnlyKeyName(keyName) {
-  if (typeof keyName !== "string" || !keyName) return false;
-  return FULL_ONLY_KEY_PATTERN.test(keyName);
-}
-
-function redactInlineSecrets(value) {
-    if (typeof value !== "string" || !value) return value;
-    return value
-      .replace(/(Bearer\s+)[^\s"']+/gi, "$1[REDACTED]")
-      .replace(
-        /((?:api[-_]?key|token|secret|password|passphrase)\s*(?:=|:)\s*)([^,\s"']+)/gi,
-        "$1[REDACTED]",
-      );
-  }
-
-function redactStringValue(value, mode, keyName) {
-  const sensitiveByKey = isSensitiveKeyName(keyName);
-  if (mode === REDACTION_SAFE) {
-    if (isFullOnlyKeyName(keyName)) {
-      return {
-        _fullOnly: true,
-        _chars: value.length,
-      };
-    }
-    if (sensitiveByKey || SECRET_VALUE_PATTERN.test(value)) {
-      return "[REDACTED]";
-    }
-      const redactedInline = redactInlineSecrets(value);
-      if (redactedInline.length <= safeStringTailChars) {
-        return redactedInline;
-      }
-      return {
-        _truncated: true,
-        _chars: redactedInline.length,
-        _tail: redactedInline.slice(-safeStringTailChars),
-      };
-    }
-
-    if (value.length <= fullStringTailChars) {
-      return value;
-    }
-    return {
-      _truncated: true,
-      _chars: value.length,
-      _tail: value.slice(-fullStringTailChars),
-    };
-  }
-
-  function redactDataByMode(value, mode, keyName, depth) {
-    if (depth > MAX_REDACTION_DEPTH) {
-      return { _truncated: true, _depth: depth };
-    }
-
-    if (typeof value === "string") {
-      return redactStringValue(value, mode, keyName);
-    }
-    if (
-      value === null ||
-      typeof value === "number" ||
-      typeof value === "boolean"
-    ) {
-      return value;
-    }
-    if (Array.isArray(value)) {
-      return value.map((entry) =>
-        redactDataByMode(entry, mode, keyName, depth + 1),
-      );
-    }
-    if (typeof value === "object") {
-      const out = {};
-      for (const [key, entry] of Object.entries(value)) {
-        out[key] = redactDataByMode(entry, mode, key, depth + 1);
-      }
-      return out;
-    }
-
-    return { value };
-  }
-
-  function buildRedactedDataModes(data) {
-    const safe = redactDataByMode(data, REDACTION_SAFE, null, 0);
-    const full = redactDataByMode(data, REDACTION_FULL, null, 0);
-    let safeSerialized;
-    try {
-      safeSerialized = JSON.stringify(safe);
-    } catch {
-      safeSerialized = "{\"_serializationError\":true}";
-    }
-    return { safe, full, safeSerialized };
-  }
-
   function pruneExpired(nowMs) {
     for (const [cat, expiresAt] of enabledUntil) {
       if (expiresAt <= nowMs) {
@@ -403,21 +287,7 @@ function redactStringValue(value, mode, keyName) {
       serialized = JSON.stringify(normalized);
     }
 
-    const bytes = Buffer.byteLength(serialized, "utf8");
-    if (bytes <= payloadMaxBytes) {
-      return { data: normalized, serialized };
-    }
-
-    const tailMaxChars = Math.max(64, Math.min(payloadMaxBytes, 1024));
-    const truncated = {
-      _truncated: true,
-      _bytes: bytes,
-      _tail: serialized.slice(-tailMaxChars),
-    };
-    return {
-      data: truncated,
-      serialized: JSON.stringify(truncated),
-    };
+    return { data: normalized, serialized };
   }
 
   function allowByNoisyPolicy(cat, eventName, serializedData, ts) {
@@ -478,8 +348,7 @@ function redactStringValue(value, mode, keyName) {
         : "debug";
 
     const normalized = normalizeData(raw.data);
-    const redactedDataModes = buildRedactedDataModes(normalized.data);
-    if (!allowByNoisyPolicy(cat, eventName, redactedDataModes.safeSerialized, ts)) {
+    if (!allowByNoisyPolicy(cat, eventName, normalized.serialized, ts)) {
       return false;
     }
 
@@ -489,8 +358,7 @@ function redactStringValue(value, mode, keyName) {
       event: eventName,
       severity,
       seq: ++seq,
-      dataSafe: redactedDataModes.safe,
-      dataFull: redactedDataModes.full,
+      data: normalized.data,
     };
 
     if (typeof raw.sessionKey === "string" && raw.sessionKey) {
@@ -517,17 +385,14 @@ function redactStringValue(value, mode, keyName) {
     return out;
   }
 
-  function formatEventForDump(evt, redactionMode) {
+  function formatEventForDump(evt) {
     const out = {
       ts: evt.ts,
       cat: evt.cat,
       event: evt.event,
       severity: evt.severity,
       seq: evt.seq,
-      data:
-        redactionMode === REDACTION_FULL
-          ? evt.dataFull
-          : evt.dataSafe,
+      data: evt.data,
     };
 
     if (typeof evt.sessionKey === "string" && evt.sessionKey) {
@@ -546,13 +411,6 @@ function redactStringValue(value, mode, keyName) {
   function dump(request) {
     const req = request || {};
     const nowMs = nowFn();
-    const redaction = normalizeRedactionMode(req.redaction);
-    if (!redaction) {
-      return {
-        ok: false,
-        error: "debug-dump redaction must be one of: safe, full",
-      };
-    }
     const categoriesFilter = expandCategoryAliases(
       normalizeCategoryList(req.categories),
     );
@@ -604,7 +462,10 @@ function redactStringValue(value, mode, keyName) {
       };
     }
 
-    const limit = clampInt(req.limit, 1, dumpMaxLimit, dumpDefaultLimit);
+    const limit =
+      req.limit !== undefined && Number.isFinite(Number(req.limit)) && Number(req.limit) > 0
+        ? Math.floor(Number(req.limit))
+        : null;
     const sinceMs =
       req.sinceMs !== undefined
         ? Math.floor(Number(req.sinceMs))
@@ -639,26 +500,25 @@ function redactStringValue(value, mode, keyName) {
     }
 
     const events =
-      filtered.length > limit
+      limit !== null && filtered.length > limit
         ? filtered.slice(filtered.length - limit)
         : filtered;
-    const formattedEvents = events.map((evt) =>
-      formatEventForDump(evt, redaction),
-    );
+    const formattedEvents = events.map((evt) => formatEventForDump(evt));
 
     return {
       ok: true,
       nowMs,
       sinceMs,
       untilMs,
-      redaction,
       categories: categoriesFilter,
-      limit,
+      limit: limit === null ? undefined : limit,
       totalMatched: filtered.length,
       returned: formattedEvents.length,
       dropped: Math.max(0, filtered.length - formattedEvents.length),
       enabled: getEnabledCategories(nowMs),
       events: formattedEvents,
+      ringEvents: ringSize,
+      ringCapacity: capacity,
     };
   }
 
@@ -683,12 +543,8 @@ function redactStringValue(value, mode, keyName) {
     getConfig() {
       return {
         capacity,
-        payloadMaxBytes,
         defaultTtlMs,
         maxTtlMs,
-        dumpDefaultLimit,
-        dumpMaxLimit,
-        defaultRedaction: DEFAULT_REDACTION_MODE,
       };
     },
   };

package/dist/domain/glasses-ui-content-summary.js

@@ -0,0 +1,62 @@
+const LABEL_MAX = 32;
+const TITLE_MAX = 64;
+const ITEMS_SHOWN = 8;
+const BODY_MAX = 120;
+const SUMMARY_MAX = 400;
+
+function truncate(value, max) {
+  if (typeof value !== "string") return "";
+  if (value.length <= max) return value;
+  return value.slice(0, Math.max(0, max - 1)) + "…";
+}
+
+/**
+ * Summarize a glasses-UI render spec OR surface-update patch into a
+ * token-bounded, structured shape: { kind, title?, items?, itemsMore?, body? }.
+ * Pure; never throws.
+ */
+function summarizeGlassesUiContent(specOrPatch) {
+  const o = specOrPatch && typeof specOrPatch === "object" ? specOrPatch : {};
+  const rawItems = Array.isArray(o.items) ? o.items : null;
+  const out = {};
+
+  const hasDetail =
+    !!rawItems &&
+    rawItems.some((i) => i && typeof i === "object" && typeof i.body === "string");
+  if (rawItems) out.kind = hasDetail ? "list_with_details" : "list";
+  else if (typeof o.body === "string") out.kind = "text";
+  else out.kind = "unknown";
+
+  if (typeof o.title === "string") out.title = truncate(o.title, TITLE_MAX);
+
+  if (rawItems) {
+    const labels = rawItems
+      .map((i) =>
+        typeof i === "string"
+          ? i
+          : i && typeof i === "object" && typeof i.label === "string"
+            ? i.label
+            : "",
+      )
+      .filter((l) => l.length > 0)
+      .map((l) => truncate(l, LABEL_MAX));
+    out.items = labels.slice(0, ITEMS_SHOWN);
+    if (labels.length > ITEMS_SHOWN) out.itemsMore = labels.length - ITEMS_SHOWN;
+  }
+
+  if (typeof o.body === "string") out.body = truncate(o.body, BODY_MAX);
+
+  // Defensive cap: drop trailing items until under SUMMARY_MAX.
+  while (
+    Array.isArray(out.items) &&
+    out.items.length > 1 &&
+    JSON.stringify(out).length > SUMMARY_MAX
+  ) {
+    out.items.pop();
+    out.itemsMore = (out.itemsMore || 0) + 1;
+  }
+
+  return out;
+}
+
+export { summarizeGlassesUiContent };

package/dist/domain/glasses-ui-system-prompt.js

@@ -0,0 +1,28 @@
+export const GLASSES_UI_NUDGE_SYSTEM_PROMPT = [
+  "On the user's Even G2 glasses, prefer calling the render_glasses_ui tool over",
+  "a multi-line text reply when the answer is a short list of choices the user",
+  "could pick from (use list_surface), a list where each option has a short",
+  "detail the user needs to read before choosing (use list_with_details_surface,",
+  "with a one-to-two-sentence body per item), or a single formatted block they",
+  "should read (use text_surface). The user can double-tap to back up one popup; if a",
+  "tool call returns { result: \"back\" }, they want to revise their previous",
+  "answer — re-render the previous step or pivot.",
+  "",
+  "After the tool call resolves, your NEXT output decides what the glasses show",
+  "next:",
+  "  • another render_glasses_ui call → replaces the current surface (use this",
+  "    for a drill-down or follow-up step in the flow);",
+  "  • a short text reply → the chat screen takes over and the surface",
+  "    disappears, so the user sees your text instead of the now-stale list;",
+  "  • silent run-end (no further output) → the surface lingers on glass until",
+  "    the user dismisses; only do this if you intentionally want the user to",
+  "    keep interacting with the same surface.",
+  "After result \"selected\", default to either a follow-up render (next step in",
+  "the flow) or a brief one-line text ack confirming the choice; avoid ending",
+  "the run silently unless the rendered surface is still the right thing to",
+  "look at.",
+].join(" ");
+
+export function composeGlassesUiNudgeSystemPrompt() {
+  return GLASSES_UI_NUDGE_SYSTEM_PROMPT;
+}

package/dist/domain/message-emoji-allowlist.js

@@ -0,0 +1,16 @@
+// Single source of truth for the 50-emoji allowlist used by the
+// message body-text filter, the Neural Emoji Reactor stream parser,
+// and the Neural Emoji Reactor system-prompt composer.
+//
+// Adding/removing entries here is a wire-protocol change in spirit:
+// the agent's prompt enumerates this list verbatim and the parser
+// rejects any tag with an off-list emoji.
+export const MESSAGE_EMOJI_ALLOWLIST = [
+  "😂", "❤️", "🤣", "👍", "😭", "🙏", "😘", "🥰", "😍", "😊",
+  "🎉", "😁", "💕", "🥺", "😅", "🔥", "☺️", "🤦", "🤷", "🙄",
+  "😆", "🤗", "😉", "🎂", "🤔", "👏", "🙂", "😳", "🥳", "😎",
+  "👌", "😔", "💪", "✨", "💖", "💞", "👀", "😋", "😏", "😢",
+  "👉", "💗", "😩", "💯", "🌹", "🎈", "😚", "😐", "😒", "😀",
+];
+
+export const MESSAGE_EMOJI_ALLOWLIST_SET = new Set(MESSAGE_EMOJI_ALLOWLIST);