github/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-30 08:51:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove unnecessary optional chaining from agent meta usage in reply and cron modules

Browse Source
This commit is contained in:
SK Akram
2026-02-16 12:09:22 +00:00
committed by Peter Steinberger
parent d649069184
commit c25c276e00
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/auto-reply/reply/agent-runner.ts
View File

@@ -409,13 +409,13 @@ export async function runReplyAgent(params: {
await Promise.allSettled(pendingToolTasks);
}
const usage = runResult?.meta?.agentMeta?.usage;
const promptTokens = runResult?.meta?.agentMeta?.promptTokens;
const modelUsed = runResult?.meta?.agentMeta?.model ?? fallbackModel ?? defaultModel;
const usage = runResult.meta?.agentMeta?.usage;
const promptTokens = runResult.meta?.agentMeta?.promptTokens;
const modelUsed = runResult.meta?.agentMeta?.model ?? fallbackModel ?? defaultModel;
const providerUsed =
runResult?.meta?.agentMeta?.provider ?? fallbackProvider ?? followupRun.run.provider;
runResult.meta?.agentMeta?.provider ?? fallbackProvider ?? followupRun.run.provider;
const cliSessionId = isCliProvider(providerUsed, cfg)
? runResult?.meta?.agentMeta?.sessionId?.trim()
? runResult.meta?.agentMeta?.sessionId?.trim()
: undefined;
const contextTokensUsed =
agentCfgContextTokens ??
@@ -427,12 +427,12 @@ export async function runReplyAgent(params: {
storePath,
sessionKey,
usage,
lastCallUsage: runResult?.meta?.agentMeta?.lastCallUsage,
lastCallUsage: runResult.meta?.agentMeta?.lastCallUsage,
promptTokens,
modelUsed,
providerUsed,
contextTokensUsed,
systemPromptReport: runResult?.meta?.systemPromptReport,
systemPromptReport: runResult.meta?.systemPromptReport,
cliSessionId,
});
@@ -509,7 +509,7 @@ export async function runReplyAgent(params: {
promptTokens,
total: totalTokens,
},
lastCallUsage: runResult?.meta?.agentMeta?.lastCallUsage,
lastCallUsage: runResult.meta?.agentMeta?.lastCallUsage,
context: {
limit: contextTokensUsed,
used: totalTokens,
@@ -555,7 +555,7 @@ export async function runReplyAgent(params: {
sessionStore: activeSessionStore,
sessionKey,
storePath,
lastCallUsage: runResult?.meta?.agentMeta?.lastCallUsage,
lastCallUsage: runResult.meta?.agentMeta?.lastCallUsage,
contextTokensUsed,
});

10
src/auto-reply/reply/followup-runner.ts
View File

@@ -194,9 +194,9 @@ export function createFollowupRunner(params: {
return;
}
const usage = runResult?.meta?.agentMeta?.usage;
const promptTokens = runResult?.meta?.agentMeta?.promptTokens;
const modelUsed = runResult?.meta?.agentMeta?.model ?? fallbackModel ?? defaultModel;
const usage = runResult.meta?.agentMeta?.usage;
const promptTokens = runResult.meta?.agentMeta?.promptTokens;
const modelUsed = runResult.meta?.agentMeta?.model ?? fallbackModel ?? defaultModel;
const contextTokensUsed =
agentCfgContextTokens ??
lookupContextTokens(modelUsed) ??
@@ -208,7 +208,7 @@ export function createFollowupRunner(params: {
storePath,
sessionKey,
usage,
lastCallUsage: runResult?.meta?.agentMeta?.lastCallUsage,
lastCallUsage: runResult.meta?.agentMeta?.lastCallUsage,
promptTokens,
modelUsed,
providerUsed: fallbackProvider,
@@ -275,7 +275,7 @@ export function createFollowupRunner(params: {
sessionStore,
sessionKey,
storePath,
lastCallUsage: runResult?.meta?.agentMeta?.lastCallUsage,
lastCallUsage: runResult.meta?.agentMeta?.lastCallUsage,
contextTokensUsed,
});
if (queued.run.verboseLevel && queued.run.verboseLevel !== "off") {

10
src/cron/isolated-agent/run.ts
View File

@@ -500,10 +500,10 @@ export async function runCronIsolatedAgentTurn(params: {
}
| undefined;
{
const usage = runResult?.meta?.agentMeta?.usage;
const promptTokens = runResult?.meta?.agentMeta?.promptTokens;
const modelUsed = runResult?.meta?.agentMeta?.model ?? fallbackModel ?? model;
const providerUsed = runResult?.meta?.agentMeta?.provider ?? fallbackProvider ?? provider;
const usage = runResult.meta?.agentMeta?.usage;
const promptTokens = runResult.meta?.agentMeta?.promptTokens;
const modelUsed = runResult.meta?.agentMeta?.model ?? fallbackModel ?? model;
const providerUsed = runResult.meta?.agentMeta?.provider ?? fallbackProvider ?? provider;
const contextTokens =
agentCfg?.contextTokens ?? lookupContextTokens(modelUsed) ?? DEFAULT_CONTEXT_TOKENS;
@@ -511,7 +511,7 @@ export async function runCronIsolatedAgentTurn(params: {
cronSession.sessionEntry.model = modelUsed;
cronSession.sessionEntry.contextTokens = contextTokens;
if (isCliProvider(providerUsed, cfgWithAgentDefaults)) {
const cliSessionId = runResult?.meta?.agentMeta?.sessionId?.trim();
const cliSessionId = runResult.meta?.agentMeta?.sessionId?.trim();
if (cliSessionId) {
setCliSessionId(cronSession.sessionEntry, providerUsed, cliSessionId);
}