more lifeops changes

Author: Shaw

packages/app-core/scripts/lib/patch-bun-exports.mjs

@@ -453,7 +453,7 @@ const ELIZA_CORE_STREAM_RETRY_PLACEHOLDER_BROWSER_FROM = `if(this.state="retryin
 const ELIZA_CORE_STREAM_RETRY_PLACEHOLDER_BROWSER_TO = `this.state="retrying";`;
 
 /**
- * `ValidationStreamExtractor.signalRetry` in @elizaos/core calls `onChunk` with a
+ * Older @elizaos/core structured stream retry handling called `onChunk` with a
  * fixed apology line for non-rich streaming consumers on every parse/validation
  * retry. That duplicates in the saved message (e.g. 3× with maxRetries 3).
  * Remove the placeholder; `emitEvent({ eventType: "retry_start" })` is unchanged.

packages/app-core/src/benchmark/mock-plugin.ts

@@ -79,12 +79,12 @@ function extractArithmeticAnswer(prompt: string): string | null {
 }
 
 function buildReplyToon(answer: string): string {
-  return `<response>
-<thought>Answering the benchmark question directly.</thought>
-<actions>REPLY</actions>
-<providers></providers>
-<text>${answer}</text>
-</response>`;
+  return buildToonResponse("", {
+    thought: "Answering the benchmark question directly.",
+    actions: "REPLY",
+    providers: "",
+    text: answer,
+  });
 }
 
 function buildHyperliquidPlanToon(): string {
@@ -177,32 +177,27 @@ function buildAdhdBenchToon(prompt: string): string {
   const action = extractAdhdAction(prompt);
   const text = action === "REPLY" ? "Replying directly with the requested information." : `Selected ${action}`;
   if (["REPLY", "IGNORE", "NONE"].includes(action)) {
-    return `<response>
-<thought>Selecting ${action} for this ADHDBench turn.</thought>
-<actions>${action}</actions>
-<providers>RECENT_MESSAGES,ENTITIES,KNOWLEDGE,ROLES</providers>
-<text>${text}</text>
-</response>`;
+    return buildToonResponse(prompt, {
+      thought: `Selecting ${action} for this ADHDBench turn.`,
+      actions: action,
+      providers: "RECENT_MESSAGES,ENTITIES,KNOWLEDGE,ROLES",
+      text,
+    });
   }
-  return `<response>
-<thought>Selecting ${action} for this ADHDBench turn.</thought>
-<actions>BENCHMARK_ACTION</actions>
-<providers>RECENT_MESSAGES,ENTITIES,KNOWLEDGE,ROLES</providers>
-<text>${text}</text>
-<params>
-<BENCHMARK_ACTION>
-<command>${action}</command>
-</BENCHMARK_ACTION>
-</params>
-</response>`;
+  return buildToonResponse(prompt, {
+    thought: `Selecting ${action} for this ADHDBench turn.`,
+    actions: "BENCHMARK_ACTION",
+    providers: "RECENT_MESSAGES,ENTITIES,KNOWLEDGE,ROLES",
+    text,
+    params: `BENCHMARK_ACTION:\n  command: ${action}`,
+  });
 }
 
 function extractValidationFields(prompt: string): Record<string, string> {
   const tags: Record<string, string> = {};
 
-  // Per-field validation tags (context check levels 0/1)
   const matches = prompt.matchAll(
-    /<(code_[A-Za-z0-9_-]+_(?:start|end)|one_(?:initial|middle|end)_code|two_(?:initial|middle|end)_code)>([\s\S]*?)<\/\1>/g,
+    /"(code_[A-Za-z0-9_-]+_(?:start|end)|one_(?:initial|middle|end)_code|two_(?:initial|middle|end)_code)"\s*:\s*"([^"]+)"/g,
   );
   for (const [, key, value] of matches) {
     tags[key] = value.trim();
@@ -212,7 +207,7 @@ function extractValidationFields(prompt: string): Record<string, string> {
   // "initial code: ...", "middle code: ...", "end code: ..."
   // and optionally "second initial code: ..." for the second checkpoint set.
   const checkpointMatches = prompt.matchAll(
-    /(second\s+)?(initial|middle|end)\s+code:\s*([a-f0-9-]{16,})/gi,
+    /(second\s+)?(initial|middle|end)\s+code:\s*([a-f0-9-]{8,})/gi,
   );
   for (const [, second, stage, value] of checkpointMatches) {
     const prefix = second ? "two" : "one";
@@ -231,10 +226,17 @@ function buildToonResponse(
     (entry): entry is [string, string] =>
       typeof entry[1] === "string" && entry[1].length > 0,
   );
-  const body = entries
-    .map(([key, value]) => `<${key}>${value}</${key}>`)
-    .join("\n");
-  return `<response>\n${body}\n</response>`;
+  return entries.map(([key, value]) => renderToonField(key, value)).join("\n");
+}
+
+function renderToonField(key: string, value: string): string {
+  if (value.includes("\n")) {
+    return `${key}:\n${value
+      .split(/\r?\n/)
+      .map((line) => `  ${line}`)
+      .join("\n")}`;
+  }
+  return `${key}: ${value}`;
 }
 
 function buildCompletion(prompt: string): string {
@@ -252,7 +254,7 @@ function buildCompletion(prompt: string): string {
   // multiStepDecisionTemplate
   if (
     prompt.includes("Determine the next step") &&
-    prompt.includes("<isFinish>")
+    prompt.includes("isFinish")
   ) {
     return buildToonResponse(prompt, {
       thought: "The benchmark task can be completed in this step.",
@@ -295,24 +297,13 @@ function buildCompletion(prompt: string): string {
     return buildAdhdBenchToon(prompt);
   }
 
-  // Default message handler path (single-shot core)
-  const validationTags = extractValidationFields(prompt);
-  const validationToon = Object.entries(validationTags)
-    .map(([key, value]) => `<${key}>${value}</${key}>`)
-    .join("\n");
-
-  return `<response>
-<thought>Execute deterministic benchmark action using ${command}.</thought>
-<actions>BENCHMARK_ACTION</actions>
-<providers></providers>
-<text>Executed ${command}</text>
-<params>
-<BENCHMARK_ACTION>
-<command>${command}</command>
-</BENCHMARK_ACTION>
-</params>
-${validationToon}
-</response>`;
+  return buildToonResponse(prompt, {
+    thought: `Execute deterministic benchmark action using ${command}.`,
+    actions: "BENCHMARK_ACTION",
+    providers: "",
+    text: `Executed ${command}`,
+    params: `BENCHMARK_ACTION:\n  command: ${command}`,
+  });
 }
 
 function mockTextModel(

packages/app-core/src/components/chat/MessageContent.tsx

@@ -68,36 +68,11 @@ type Segment =
 const CONFIG_RE = /\[CONFIG:([@\w][\w@./:-]*)\]/g;
 const FENCED_JSON_RE = /```(?:json)?\s*\n([\s\S]*?)```/g;
 
-/**
- * Strip elizaOS action XML blocks (`<actions>...</actions>` and
- * `<params>...</params>`) from displayed text. These are framework
- * metadata, not user-facing content.
- */
-const ACTION_XML_RE =
-  /\s*<actions>[\s\S]*?(?:<\/actions>|$)\s*|\s*<params>[\s\S]*?(?:<\/params>|$)\s*/g;
-const HIDDEN_XML_BLOCK_RE =
+const HIDDEN_TAG_BLOCK_RE =
   /<(think|analysis|reasoning|scratchpad|tool_calls?|tools?)\b[^>]*>[\s\S]*?(?:<\/\1>|$)/gi;
 
-function extractXmlTag(
-  raw: string,
-  tag: string,
-  opts?: { allowPartial?: boolean },
-): string | null {
-  const open = `<${tag}>`;
-  const close = `</${tag}>`;
-  const start = raw.indexOf(open);
-  if (start < 0) return null;
-
-  const contentStart = start + open.length;
-  const end = raw.indexOf(close, contentStart);
-  if (end < 0) {
-    return opts?.allowPartial ? raw.slice(contentStart) : null;
-  }
-  return raw.slice(contentStart, end);
-}
-
 /**
- * Strip partial/incomplete XML tags at the end of a streaming text chunk.
+ * Strip partial/incomplete hidden tags at the end of a streaming text chunk.
  * During streaming, the buffer may end mid-tag (e.g. `"Hello<thi"`,
  * `"Hello</respon"`, or just `"Hello<"`).  These fragments are not
  * user-facing content and must be hidden from both the display and voice
@@ -111,30 +86,12 @@ export function normalizeDisplayText(text: string): string {
   let normalized =
     text.length > MAX_DISPLAY_LEN ? text.slice(0, MAX_DISPLAY_LEN) : text;
 
-  // Hide framework-selected actions and tool params from chat bubbles.
-  normalized = normalized.replace(ACTION_XML_RE, "");
-  normalized = normalized.replace(HIDDEN_XML_BLOCK_RE, " ");
-
-  // Some prompts emit structured XML wrappers like:
-  // <response><thought>...</thought><text>...</text></response>
-  // Show only the user-facing <text>, even while it is still streaming.
-  if (normalized.includes("<response>")) {
-    const wrappedText = extractXmlTag(normalized, "text", {
-      allowPartial: true,
-    });
-    if (wrappedText !== null) {
-      normalized = wrappedText;
-    } else {
-      return "";
-    }
-  }
-
-  // Drop any leftover wrapper tags without disturbing plain text.
-  normalized = normalized.replace(/<\/?(response|text|thought)\b[^>]*>/gi, "");
+  // Hide hidden reasoning/tool scratchpad blocks from chat bubbles.
+  normalized = normalized.replace(HIDDEN_TAG_BLOCK_RE, " ");
 
-  // During streaming, a chunk may end mid-tag (e.g. "<thi", "</respon").
+  // During streaming, a chunk may end mid-tag (e.g. "<thi").
   // Strip any incomplete opening or closing tag at the very end so the
-  // user never sees raw XML fragments while tokens arrive.
+  // user never sees hidden-tag fragments while tokens arrive.
   normalized = normalized.replace(TRAILING_PARTIAL_TAG_RE, "");
 
   normalized = stripAssistantStageDirections(normalized);

packages/app-core/src/styles/styles.css

@@ -140,9 +140,19 @@ electrobun-wgpu {
 
 /* ── Global resets ──────────────────────────────────────────────────── */
 
+html,
+body {
+  width: 100%;
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+  overscroll-behavior: none;
+}
+
 #root {
   display: flex;
   flex-direction: column;
+  width: 100vw;
   height: 100vh;
   height: 100dvh;
   overflow: hidden;

plugins/app-2004scape/vitest.config.ts

@@ -6,6 +6,7 @@ const here = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(here, "../..");
 
 export default defineConfig({
+  root: here,
   resolve: {
     alias: {
       "@elizaos/core": path.join(repoRoot, "packages/core/src/index.ts"),

plugins/app-lifeops/src/actions/autofill.ts

@@ -19,7 +19,6 @@
  * credential.
  */
 
-import { extractActionParamsViaLlm } from "@elizaos/agent/actions/extract-params";
 import { hasOwnerAccess } from "@elizaos/agent/security/access";
 import {
   type Action,
@@ -29,6 +28,8 @@ import {
   type IAgentRuntime,
   logger,
   type Memory,
+  ModelType,
+  type State,
 } from "@elizaos/core";
 import {
   DEFAULT_AUTOFILL_WHITELIST,
@@ -38,6 +39,7 @@ import {
 } from "../lifeops/autofill-whitelist.js";
 import { requireFeatureEnabled } from "../lifeops/feature-flags.js";
 import { FeatureNotEnabledError } from "../lifeops/feature-flags.types.js";
+import { runLifeOpsToonModel } from "./lifeops-google-helpers.js";
 
 const FIELD_PURPOSES = [
   "email",
@@ -48,6 +50,14 @@ const FIELD_PURPOSES = [
 ] as const;
 type FieldPurpose = (typeof FIELD_PURPOSES)[number];
 
+type AutofillSubaction = "request_fill" | "add_whitelist" | "list_whitelist";
+
+type AutofillParameters = RequestFieldFillParameters &
+  AddAutofillWhitelistParameters & {
+    readonly subaction?: AutofillSubaction | string;
+    readonly intent?: string;
+  };
+
 const WHITELIST_CACHE_KEY = "eliza:lifeops-autofill-whitelist";
 const DEVICE_BUS_URL_ENV = "ELIZA_DEVICE_BUS_URL";
 const DEVICE_BUS_TOKEN_ENV = "ELIZA_DEVICE_BUS_TOKEN";

plugins/app-lifeops/src/actions/cross-channel-send.ts

@@ -25,11 +25,7 @@ import type {
   MessageConnector,
   State,
 } from "@elizaos/core";
-import {
-  ModelType,
-  parseToonKeyValue,
-  sendMessageAction,
-} from "@elizaos/core";
+import { ModelType, parseToonKeyValue, sendMessageAction } from "@elizaos/core";
 import {
   createCalendlySingleUseLink,
   readCalendlyCredentialsFromEnv,
@@ -310,8 +306,7 @@ async function resolveCrossChannelSendPlanWithLlm(args: {
       prompt,
     });
     const rawResponse = typeof result === "string" ? result : "";
-    const parsed =
-      parseToonKeyValue<Record<string, unknown>>(rawResponse);
+    const parsed = parseToonKeyValue<Record<string, unknown>>(rawResponse);
     if (!parsed) {
       return {};
     }
@@ -501,13 +496,18 @@ async function dispatchViaSendMessageAction(
     }
   }
 
-  const result = await sendMessageAction.handler(ctx.runtime, ctx.message, ctx.state, {
-    parameters: {
-      source,
-      target: ctx.target,
-      message: ctx.body,
+  const result = await sendMessageAction.handler(
+    ctx.runtime,
+    ctx.message,
+    ctx.state,
+    {
+      parameters: {
+        source,
+        target: ctx.target,
+        message: ctx.body,
+      },
     },
-  });
+  );
   if (!result?.success) {
     return buildDispatchFailure({
       channel: ctx.channel,

plugins/app-lifeops/src/actions/inbox.ts

@@ -10,11 +10,7 @@ import type {
   State,
   UUID,
 } from "@elizaos/core";
-import {
-  logger,
-  ModelType,
-  parseToonKeyValue,
-} from "@elizaos/core";
+import { logger, ModelType, parseToonKeyValue } from "@elizaos/core";
 import { getRecentMessagesData } from "@elizaos/shared";
 import { loadInboxTriageConfig } from "../inbox/config.js";
 import { fetchAllMessages } from "../inbox/message-fetcher.js";
@@ -113,6 +109,16 @@ function formatInboxDraftContext(draft: DeferredInboxDraft | null): string {
   ].join("\n");
 }
 
+async function runInboxTextModel(
+  runtime: IAgentRuntime,
+  prompt: string,
+): Promise<string> {
+  // Keep inbox planning/generation on runtime.useModel so core trajectory
+  // capture records the call site; do not call provider SDKs directly here.
+  const result = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
+  return typeof result === "string" ? result : "";
+}
+
 function buildInboxPolicyAcknowledgement(
   userText: string,
 ): ActionResult | null {
@@ -264,10 +270,8 @@ async function resolveSubactionPlan(
   ].join("\n");
 
   try {
-    const result = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
-    const raw = typeof result === "string" ? result : "";
-    const parsed =
-      parseToonKeyValue<Record<string, unknown>>(raw);
+    const raw = await runInboxTextModel(runtime, prompt);
+    const parsed = parseToonKeyValue<Record<string, unknown>>(raw);
     if (!parsed) {
       return {
         subaction: null,
@@ -1413,8 +1417,7 @@ async function draftResponse(
     .join("\n");
 
   try {
-    const result = await runtime.useModel(ModelType.TEXT_SMALL, { prompt });
-    const text = typeof result === "string" ? result.trim() : "";
+    const text = (await runInboxTextModel(runtime, prompt)).trim();
     return (
       text || seed || "Thanks for reaching out. I'll get back to you soon."
     );