Merge branch 'main' into fix/echo-transcript-dollar-substitution

UditDewan · web-flow · commit df47181312a4 · 2026-07-05T01:40:55.000-04:00
diff --git a/docs/.generated/plugin-sdk-api-baseline.sha256 b/docs/.generated/plugin-sdk-api-baseline.sha256
@@ -1,2 +1,2 @@
-729181bf726ea51bebfa51c760eff8d5016933c21815e47197b5d05db8d549d5  plugin-sdk-api-baseline.json
-d8add92c9c5445e8bdd8a8361cdd5a42e1ab5baa45cd16ea640152d6f577f1bf  plugin-sdk-api-baseline.jsonl
+fcf5285d9e7be94565a3470a17aaa1291afb779538f95dd98203d4adb0350602  plugin-sdk-api-baseline.json
+c7ae91b7f7dd0f5ecb253a6a08484d81871a433b7cae96214e6ef8fe76fbe51c  plugin-sdk-api-baseline.jsonl
diff --git a/docs/automation/cron-jobs.md b/docs/automation/cron-jobs.md
@@ -141,7 +141,7 @@ Fast mode follows the resolved live selection. If the selected model config has
 
 If a run hits a live model-switch handoff, cron retries with the switched provider/model and persists that selection (and any new auth profile) for the active run. Retries are bounded: after the initial attempt plus 2 switch retries, cron aborts instead of looping.
 
-Before an isolated run starts, OpenClaw checks reachable local endpoints for configured `api: "ollama"` and `api: "openai-completions"` providers whose `baseUrl` is loopback, private-network, or `.local`. This preflight walks the job's configured fallback chain and only marks the run `skipped` once every candidate is unreachable; `--fallbacks ""` keeps that walk strict to just the primary model. A down endpoint records the run as `skipped` with a clear error instead of starting a model call. The result is cached for 5 minutes per endpoint (not per job or model), so many due jobs sharing a dead local Ollama/vLLM/SGLang/LM Studio server cost one probe instead of a request storm. Skipped preflight runs do not increment execution-error backoff; set `failureAlert.includeSkipped` to opt into repeated skip alerts.
+Before an isolated run starts, OpenClaw checks reachable local endpoints for configured `api: "ollama"` and `api: "openai-completions"` providers whose `baseUrl` is loopback, private-network, or `.local`. Local-provider preflight checks walk configured fallbacks and only mark the run `skipped` once every candidate is unreachable; `--fallbacks ""` keeps that walk strict to just the primary model. A down endpoint records the run as `skipped` with a clear error instead of starting a model call. The result is cached for 5 minutes per endpoint (not per job or model), so many due jobs sharing a dead local Ollama/vLLM/SGLang/LM Studio server cost one probe instead of a request storm. Skipped preflight runs do not increment execution-error backoff; set `failureAlert.includeSkipped` to opt into repeated skip alerts.
 
 ### Command payloads
 
diff --git a/docs/help/environment.md b/docs/help/environment.md
@@ -8,7 +8,7 @@ title: "Environment variables"
 ---
 
 OpenClaw pulls environment variables from multiple sources. The rule is **never override existing values**.
-Workspace `.env` files are a lower-trust source: OpenClaw ignores provider credentials and protected runtime controls from workspace `.env` before applying precedence.
+Workspace `.env` files are a lower-trust source: OpenClaw ignores provider credential environment variables from workspace `.env` files and protected runtime controls there before applying precedence.
 
 ## Precedence (highest to lowest)
 
diff --git a/docs/help/testing-live.md b/docs/help/testing-live.md
@@ -65,6 +65,8 @@ The curated model lists below live in `src/agents/live-model-filter.ts` and
 change over time; treat the arrays there as the source of truth, not this
 page.
 
+MiniMax M3 uses `minimax/MiniMax-M3` as its default provider/model reference.
+
 ### Layer 1: Direct model completion (no gateway)
 
 - Test: `src/agents/models.profiles.live.test.ts`
diff --git a/docs/nodes/talk.md b/docs/nodes/talk.md
@@ -91,7 +91,7 @@ Supported keys: `voice` / `voice_id` / `voiceId`, `model` / `model_id` / `modelI
 | `providers.mlx.modelId`                  | `mlx-community/Soprano-80M-bf16`           |                                                                                                                                                                                                                                                                          |
 | `providers.elevenlabs.apiKey`            | -                                          | Falls back to `ELEVENLABS_API_KEY` (or gateway shell profile if available).                                                                                                                                                                                              |
 | `speechLocale`                           | device default                             | BCP 47 locale id for on-device Talk speech recognition on iOS/macOS.                                                                                                                                                                                                     |
-| `silenceTimeoutMs`                       | `700` ms macOS/Android, `900` ms iOS       | Pause window before Talk sends the transcript.                                                                                                                                                                                                                           |
+| `silenceTimeoutMs`                       | 700 ms on macOS and Android, 900 ms on iOS | Pause window before Talk sends the transcript.                                                                                                                                                                                                                           |
 | `interruptOnSpeech`                      | `true`                                     |                                                                                                                                                                                                                                                                          |
 | `outputFormat`                           | `pcm_44100` macOS/iOS, `pcm_24000` Android | Set `mp3_*` to force MP3 streaming.                                                                                                                                                                                                                                      |
 | `consultThinkingLevel`                   | unset                                      | Thinking level override for the agent run behind realtime `openclaw_agent_consult` calls.                                                                                                                                                                                |
diff --git a/docs/reference/full-release-validation.md b/docs/reference/full-release-validation.md
@@ -190,8 +190,8 @@ underlying QA runtime parity lane is advisory. Tideclaw alpha runs may still
 treat non-package-safety release-check lanes as advisory. When
 `live_suite_filter` explicitly requests a gated QA live lane such as Discord,
 WhatsApp, or Slack, the matching `OPENCLAW_RELEASE_QA_*_LIVE_CI_ENABLED` repo
-variable must be enabled; otherwise input capture fails instead of silently
-skipping the lane. Rerun `rerun_group=qa`, `qa-parity`, or `qa-live` when you
+variable must be enabled; otherwise input capture fails instead of silently skipping the lane.
+Rerun `rerun_group=qa`, `qa-parity`, or `qa-live` when you
 need fresh QA evidence.
 
 ## Evidence to keep
diff --git a/docs/snippets/plugin-publish/minimal-package.json b/docs/snippets/plugin-publish/minimal-package.json
@@ -2,6 +2,12 @@
   "name": "@myorg/openclaw-my-plugin",
   "version": "1.0.0",
   "type": "module",
+  "dependencies": {
+    "typebox": "1.1.39"
+  },
+  "peerDependencies": {
+    "openclaw": ">=2026.3.24-beta.2"
+  },
   "openclaw": {
     "extensions": ["./index.ts"],
     "compat": {
diff --git a/src/agents/minimax-docs.test.ts b/src/agents/minimax-docs.test.ts
@@ -15,7 +15,6 @@ const minimaxDoc = fs.readFileSync(path.join(repoRoot, "docs/providers/minimax.m
 
 describe("MiniMax docs sync", () => {
   it("keeps the live-testing guide on the current MiniMax default", () => {
-    expect(testingLiveDoc).toContain("MiniMax M3");
     expect(testingLiveDoc).toContain(MINIMAX_DEFAULT_MODEL_REF);
   });
 
diff --git a/src/auto-reply/reply/commands-core.ts b/src/auto-reply/reply/commands-core.ts
@@ -35,9 +35,18 @@ export async function handleCommands(params: HandleCommandsParams): Promise<Comm
   if (HANDLERS === null) {
     HANDLERS = (await loadCommandHandlersRuntime()).loadCommandHandlers();
   }
+  const allowCreateSessionEntry = params.allowCreateSessionEntry === true;
+  const initialSessionEntry =
+    params.initialSessionEntry ??
+    (allowCreateSessionEntry
+      ? undefined
+      : params.sessionEntry
+        ? { ...params.sessionEntry }
+        : undefined);
   const commandParams: HandleCommandsParams = {
     ...params,
-    initialSessionEntry: params.sessionEntry ? { ...params.sessionEntry } : undefined,
+    initialSessionEntry,
+    allowCreateSessionEntry,
   };
   const resetResult = await maybeHandleResetCommand(commandParams);
   if (resetResult) {
diff --git a/src/auto-reply/reply/commands-session-store.test.ts b/src/auto-reply/reply/commands-session-store.test.ts
@@ -16,6 +16,65 @@ async function withTempStore<T>(run: (storePath: string) => Promise<T>): Promise
 }
 
 describe("commands session store persistence", () => {
+  it("creates a missing row for the first command-only session mutation", async () => {
+    await withTempStore(async (storePath) => {
+      const sessionKey = "agent:main:first-command";
+      const entry: SessionEntry = {
+        sessionId: "first-command-session",
+        updatedAt: 1,
+        responseUsage: "tokens",
+      };
+      const sessionStore: Record<string, SessionEntry> = { [sessionKey]: entry };
+      await saveSessionStore(storePath, {}, { skipMaintenance: true });
+
+      await expect(
+        persistSessionEntry({
+          allowCreateSessionEntry: true,
+          sessionEntry: entry,
+          sessionStore,
+          sessionKey,
+          storePath,
+          touchedFields: ["responseUsage"],
+        }),
+      ).resolves.toBe(true);
+
+      const persisted = loadSessionStore(storePath, { skipCache: true })[sessionKey];
+      expect(persisted).toMatchObject({
+        sessionId: "first-command-session",
+        responseUsage: "tokens",
+      });
+      expect(sessionStore[sessionKey]).toMatchObject({
+        sessionId: "first-command-session",
+        responseUsage: "tokens",
+      });
+    });
+  });
+
+  it("does not recreate a missing row without explicit create ownership", async () => {
+    await withTempStore(async (storePath) => {
+      const sessionKey = "agent:main:missing-existing";
+      const entry: SessionEntry = {
+        sessionId: "missing-existing-session",
+        updatedAt: 1,
+        responseUsage: "tokens",
+      };
+      const sessionStore: Record<string, SessionEntry> = { [sessionKey]: entry };
+      await saveSessionStore(storePath, {}, { skipMaintenance: true });
+
+      await expect(
+        persistSessionEntry({
+          sessionEntry: entry,
+          sessionStore,
+          sessionKey,
+          storePath,
+          touchedFields: ["responseUsage"],
+        }),
+      ).resolves.toBe(false);
+
+      expect(loadSessionStore(storePath, { skipCache: true })[sessionKey]).toBeUndefined();
+    });
+  });
+
   it("persists command state without reverting concurrent session management", async () => {
     await withTempStore(async (storePath) => {
       const sessionKey = "agent:main:command";
diff --git a/src/auto-reply/reply/commands-session-store.ts b/src/auto-reply/reply/commands-session-store.ts
@@ -9,7 +9,12 @@ import { persistReplySessionEntry } from "./session-entry-persistence.js";
 type CommandParams = Parameters<CommandHandler>[0];
 type PersistSessionEntryParams = Pick<
   CommandParams,
-  "sessionEntry" | "initialSessionEntry" | "sessionStore" | "sessionKey" | "storePath"
+  | "allowCreateSessionEntry"
+  | "initialSessionEntry"
+  | "sessionEntry"
+  | "sessionKey"
+  | "sessionStore"
+  | "storePath"
 > & { touchedFields?: ReadonlyArray<keyof SessionEntry> };
 
 /** Resolves a command target entry through canonical and legacy session keys. */
@@ -35,6 +40,7 @@ export async function persistSessionEntry(params: PersistSessionEntryParams): Pr
     return false;
   }
   const sessionEntry = params.sessionEntry;
+  const creatingSession = params.allowCreateSessionEntry === true;
   const initialEntry = params.initialSessionEntry ?? { ...sessionEntry };
   sessionEntry.updatedAt = Date.now();
   params.sessionStore[params.sessionKey] = sessionEntry;
@@ -45,6 +51,7 @@ export async function persistSessionEntry(params: PersistSessionEntryParams): Pr
     const persistence = await persistReplySessionEntry({
       storePath: params.storePath,
       sessionKey: params.sessionKey,
+      allowCreate: creatingSession,
       initialEntry,
       entry: sessionEntry,
       skipMaintenance: true,
diff --git a/src/auto-reply/reply/commands-types.ts b/src/auto-reply/reply/commands-types.ts
@@ -51,6 +51,8 @@ export type HandleCommandsParams = {
   sessionEntry?: SessionEntry;
   /** Snapshot captured before command handlers mutate the active entry. */
   initialSessionEntry?: SessionEntry;
+  /** True only when the current command owns first creation of this session row. */
+  allowCreateSessionEntry?: boolean;
   previousSessionEntry?: SessionEntry;
   sessionStore?: Record<string, SessionEntry>;
   sessionKey: string;
diff --git a/src/auto-reply/reply/get-reply-inline-actions.ts b/src/auto-reply/reply/get-reply-inline-actions.ts
@@ -178,6 +178,8 @@ export async function handleInlineActions(params: {
   agentId: string;
   agentDir?: string;
   sessionEntry?: SessionEntry;
+  initialSessionEntry?: SessionEntry;
+  allowCreateSessionEntry?: boolean;
   previousSessionEntry?: SessionEntry;
   sessionStore?: Record<string, SessionEntry>;
   sessionKey: string;
@@ -220,6 +222,8 @@ export async function handleInlineActions(params: {
     agentId,
     agentDir,
     sessionEntry,
+    initialSessionEntry,
+    allowCreateSessionEntry,
     previousSessionEntry,
     sessionStore,
     sessionKey,
@@ -516,6 +520,8 @@ export async function handleInlineActions(params: {
         failures: elevatedFailures,
       },
       sessionEntry: targetSessionEntry,
+      initialSessionEntry,
+      allowCreateSessionEntry,
       previousSessionEntry,
       sessionStore,
       sessionKey,
diff --git a/src/auto-reply/reply/get-reply.ts b/src/auto-reply/reply/get-reply.ts
@@ -491,6 +491,7 @@ export async function getReplyFromConfig(
   const {
     sessionCtx,
     sessionEntry,
+    initialSessionEntry,
     sessionEntryHandle,
     previousSessionEntry,
     sessionStore,
@@ -862,6 +863,8 @@ export async function getReplyFromConfig(
       agentId,
       agentDir,
       sessionEntry,
+      ...(initialSessionEntry ? { initialSessionEntry } : {}),
+      allowCreateSessionEntry: useFastTestBootstrap && initialSessionEntry === undefined,
       previousSessionEntry,
       sessionStore,
       sessionKey,
diff --git a/src/config/talk-defaults.test.ts b/src/config/talk-defaults.test.ts
@@ -33,10 +33,13 @@ function readRepoFile(relativePath: string): string {
 describe("talk silence timeout defaults", () => {
   it("keeps help text and docs aligned with the policy", () => {
     const defaultsDescription = describeTalkSilenceTimeoutDefaults();
+    const talkDocDefaults =
+      `\`${EXPECTED_TALK_SILENCE_TIMEOUT_MS_BY_PLATFORM.macos}\` ms macOS/Android, ` +
+      `\`${EXPECTED_TALK_SILENCE_TIMEOUT_MS_BY_PLATFORM.ios}\` ms iOS`;
 
     expect(FIELD_HELP["talk.silenceTimeoutMs"]).toContain(defaultsDescription);
     expect(readRepoFile("docs/gateway/config-agents.md")).toContain(defaultsDescription);
-    expect(readRepoFile("docs/nodes/talk.md")).toContain(defaultsDescription);
+    expect(readRepoFile("docs/nodes/talk.md")).toContain(talkDocDefaults);
   });
 
   it("matches the Apple and Android runtime constants", () => {
diff --git a/src/cron/isolated-agent/run-fallback-policy.test.ts b/src/cron/isolated-agent/run-fallback-policy.test.ts
@@ -428,6 +428,6 @@ describe("resolveCronFallbacksOverride", () => {
     const automationDocs = readFileSync("docs/automation/cron-jobs.md", "utf8");
 
     expect(cliDocs).toContain("Local-provider preflight checks walk configured fallbacks");
-    expect(automationDocs).toContain("Local-provider preflight checks walk configured fallbacks");
+    expect(automationDocs).toContain("This preflight walks the job's configured fallback chain");
   });
 });
diff --git a/src/docs/environment-docs.test.ts b/src/docs/environment-docs.test.ts
@@ -20,7 +20,7 @@ describe("environment docs", () => {
 
     expect(markdown).toContain("Provider credentials and workspace `.env`");
     expect(markdown).toContain(
-      "OpenClaw ignores provider credential environment variables from workspace `.env` files",
+      "OpenClaw ignores provider credentials and protected runtime controls from workspace `.env`",
     );
     expect(markdown).toContain("~/.openclaw/.env");
     expect(markdown).toContain("$OPENCLAW_STATE_DIR/.env");
