github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-08 13:31:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: decouple owner display secret from gateway auth token

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-22 09:34:48 +01:00
parent 1e76ca593e
commit c99e7696e6
8 changed files with 237 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/agents/pi-embedded-runner/compact.ts
View File

@@ -33,6 +33,7 @@ import { DEFAULT_MODEL, DEFAULT_PROVIDER } from "../defaults.js";
import { resolveOpenClawDocsPath } from "../docs-path.js";
import { getApiKeyForModel, resolveModelAuthMode } from "../model-auth.js";
import { ensureOpenClawModelsJson } from "../models-config.js";
import { resolveOwnerDisplaySetting } from "../owner-display.js";
import {
ensureSessionHeader,
validateAnthropicTurns,
@@ -480,17 +481,15 @@ export async function compactEmbeddedPiSessionDirect(
moduleUrl: import.meta.url,
});
const ttsHint = params.config ? buildTtsSystemPromptHint(params.config) : undefined;
const ownerDisplay = resolveOwnerDisplaySetting(params.config);
const appendPrompt = buildEmbeddedSystemPrompt({
workspaceDir: effectiveWorkspace,
defaultThinkLevel: params.thinkLevel,
reasoningLevel: params.reasoningLevel ?? "off",
extraSystemPrompt: params.extraSystemPrompt,
ownerNumbers: params.ownerNumbers,
ownerDisplay: params.config?.commands?.ownerDisplay,
ownerDisplaySecret:
params.config?.commands?.ownerDisplaySecret ??
params.config?.gateway?.auth?.token ??
params.config?.gateway?.remote?.token,
ownerDisplay: ownerDisplay.ownerDisplay,
ownerDisplaySecret: ownerDisplay.ownerDisplaySecret,
reasoningTagHint,
heartbeatPrompt: isDefaultAgent
? resolveHeartbeatPrompt(params.config?.agents?.defaults?.heartbeat?.prompt)

9
src/agents/pi-embedded-runner/run/attempt.ts
View File

@@ -47,6 +47,7 @@ import { resolveImageSanitizationLimits } from "../../image-sanitization.js";
import { resolveModelAuthMode } from "../../model-auth.js";
import { resolveDefaultModelForAgent } from "../../model-selection.js";
import { createOllamaStreamFn, OLLAMA_NATIVE_BASE_URL } from "../../ollama-stream.js";
import { resolveOwnerDisplaySetting } from "../../owner-display.js";
import {
isCloudCodeAssistFormatError,
resolveBootstrapMaxChars,
@@ -505,6 +506,7 @@ export async function runEmbeddedAttempt(
moduleUrl: import.meta.url,
});
const ttsHint = params.config ? buildTtsSystemPromptHint(params.config) : undefined;
const ownerDisplay = resolveOwnerDisplaySetting(params.config);
const appendPrompt = buildEmbeddedSystemPrompt({
workspaceDir: effectiveWorkspace,
@@ -512,11 +514,8 @@ export async function runEmbeddedAttempt(
reasoningLevel: params.reasoningLevel ?? "off",
extraSystemPrompt: params.extraSystemPrompt,
ownerNumbers: params.ownerNumbers,
ownerDisplay: params.config?.commands?.ownerDisplay,
ownerDisplaySecret:
params.config?.commands?.ownerDisplaySecret ??
params.config?.gateway?.auth?.token ??
params.config?.gateway?.remote?.token,
ownerDisplay: ownerDisplay.ownerDisplay,
ownerDisplaySecret: ownerDisplay.ownerDisplaySecret,
reasoningTagHint,
heartbeatPrompt: isDefaultAgent
? resolveHeartbeatPrompt(params.config?.agents?.defaults?.heartbeat?.prompt)