Merge pull request #694 from antons/fix/heartbeat-reasoning

Fix/heartbeat reasoning
This commit is contained in:
Peter Steinberger
2026-01-11 02:52:12 +00:00
committed by GitHub
6 changed files with 111 additions and 15 deletions

View File

@@ -5,6 +5,8 @@
### Fixes ### Fixes
- CLI/Status: make the “More” footer shorter and easier to scan (newlines + context-aware suggestions). - CLI/Status: make the “More” footer shorter and easier to scan (newlines + context-aware suggestions).
- Docs/FAQ: make `clawdbot status` the first diagnostic step (and point to `status --all` for pasteable reports). - Docs/FAQ: make `clawdbot status` the first diagnostic step (and point to `status --all` for pasteable reports).
- CLI/Status: format non-JSON-serializable provider issue values more predictably.
- Gateway/Heartbeat: deliver reasoning even when the main heartbeat reply is `HEARTBEAT_OK`. (#694) — thanks @antons.
## 2026.1.11-7 ## 2026.1.11-7

View File

@@ -32,6 +32,7 @@ describe("getApiKeyForModel", () => {
); );
vi.resetModules(); vi.resetModules();
const { ensureAuthProfileStore } = await import("./auth-profiles.js");
const { getApiKeyForModel } = await import("./model-auth.js"); const { getApiKeyForModel } = await import("./model-auth.js");
const model = { const model = {
@@ -40,6 +41,9 @@ describe("getApiKeyForModel", () => {
api: "openai-codex-responses", api: "openai-codex-responses",
} as Model<Api>; } as Model<Api>;
const store = ensureAuthProfileStore(process.env.CLAWDBOT_AGENT_DIR, {
allowKeychainPrompt: false,
});
const apiKey = await getApiKeyForModel({ const apiKey = await getApiKeyForModel({
model, model,
cfg: { cfg: {
@@ -52,6 +56,8 @@ describe("getApiKeyForModel", () => {
}, },
}, },
}, },
store,
agentDir: process.env.CLAWDBOT_AGENT_DIR,
}); });
expect(apiKey.apiKey).toBe(oauthFixture.access); expect(apiKey.apiKey).toBe(oauthFixture.access);

View File

@@ -129,6 +129,7 @@ export async function initSessionState(params: {
let persistedThinking: string | undefined; let persistedThinking: string | undefined;
let persistedVerbose: string | undefined; let persistedVerbose: string | undefined;
let persistedReasoning: string | undefined;
let persistedModelOverride: string | undefined; let persistedModelOverride: string | undefined;
let persistedProviderOverride: string | undefined; let persistedProviderOverride: string | undefined;
@@ -194,6 +195,7 @@ export async function initSessionState(params: {
abortedLastRun = entry.abortedLastRun ?? false; abortedLastRun = entry.abortedLastRun ?? false;
persistedThinking = entry.thinkingLevel; persistedThinking = entry.thinkingLevel;
persistedVerbose = entry.verboseLevel; persistedVerbose = entry.verboseLevel;
persistedReasoning = entry.reasoningLevel;
persistedModelOverride = entry.modelOverride; persistedModelOverride = entry.modelOverride;
persistedProviderOverride = entry.providerOverride; persistedProviderOverride = entry.providerOverride;
} else { } else {
@@ -213,6 +215,7 @@ export async function initSessionState(params: {
// Persist previously stored thinking/verbose levels when present. // Persist previously stored thinking/verbose levels when present.
thinkingLevel: persistedThinking ?? baseEntry?.thinkingLevel, thinkingLevel: persistedThinking ?? baseEntry?.thinkingLevel,
verboseLevel: persistedVerbose ?? baseEntry?.verboseLevel, verboseLevel: persistedVerbose ?? baseEntry?.verboseLevel,
reasoningLevel: persistedReasoning ?? baseEntry?.reasoningLevel,
responseUsage: baseEntry?.responseUsage, responseUsage: baseEntry?.responseUsage,
modelOverride: persistedModelOverride ?? baseEntry?.modelOverride, modelOverride: persistedModelOverride ?? baseEntry?.modelOverride,
providerOverride: persistedProviderOverride ?? baseEntry?.providerOverride, providerOverride: persistedProviderOverride ?? baseEntry?.providerOverride,

View File

@@ -321,6 +321,75 @@ describe("runHeartbeatOnce", () => {
} }
}); });
it("delivers reasoning even when the main heartbeat reply is HEARTBEAT_OK", async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-"));
const storePath = path.join(tmpDir, "sessions.json");
const replySpy = vi.spyOn(replyModule, "getReplyFromConfig");
try {
await fs.writeFile(
storePath,
JSON.stringify(
{
main: {
sessionId: "sid",
updatedAt: Date.now(),
lastProvider: "whatsapp",
lastTo: "+1555",
},
},
null,
2,
),
);
const cfg: ClawdbotConfig = {
agents: {
defaults: {
heartbeat: {
every: "5m",
target: "whatsapp",
to: "+1555",
includeReasoning: true,
},
},
},
whatsapp: { allowFrom: ["*"] },
session: { store: storePath },
};
replySpy.mockResolvedValue([
{ text: "Reasoning:\nBecause it helps" },
{ text: "HEARTBEAT_OK" },
]);
const sendWhatsApp = vi.fn().mockResolvedValue({
messageId: "m1",
toJid: "jid",
});
await runHeartbeatOnce({
cfg,
deps: {
sendWhatsApp,
getQueueSize: () => 0,
nowMs: () => 0,
webAuthExists: async () => true,
hasActiveWebListener: () => true,
},
});
expect(sendWhatsApp).toHaveBeenCalledTimes(1);
expect(sendWhatsApp).toHaveBeenNthCalledWith(
1,
"+1555",
"Reasoning:\nBecause it helps",
expect.any(Object),
);
} finally {
replySpy.mockRestore();
await fs.rm(tmpDir, { recursive: true, force: true });
}
});
it("loads the default agent session from templated stores", async () => { it("loads the default agent session from templated stores", async () => {
const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-")); const tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-hb-"));
const storeTemplate = path.join( const storeTemplate = path.join(

View File

@@ -262,6 +262,11 @@ export async function runHeartbeatOnce(opts: {
const replyPayload = resolveHeartbeatReplyPayload(replyResult); const replyPayload = resolveHeartbeatReplyPayload(replyResult);
const includeReasoning = const includeReasoning =
cfg.agents?.defaults?.heartbeat?.includeReasoning === true; cfg.agents?.defaults?.heartbeat?.includeReasoning === true;
const reasoningPayloads = includeReasoning
? resolveHeartbeatReasoningPayloads(replyResult).filter(
(payload) => payload !== replyPayload,
)
: [];
if ( if (
!replyPayload || !replyPayload ||
@@ -291,7 +296,8 @@ export async function runHeartbeatOnce(opts: {
).responsePrefix, ).responsePrefix,
ackMaxChars, ackMaxChars,
); );
if (normalized.shouldSkip && !normalized.hasMedia) { const shouldSkipMain = normalized.shouldSkip && !normalized.hasMedia;
if (shouldSkipMain && reasoningPayloads.length === 0) {
await restoreHeartbeatUpdatedAt({ await restoreHeartbeatUpdatedAt({
storePath, storePath,
sessionKey, sessionKey,
@@ -309,18 +315,19 @@ export async function runHeartbeatOnce(opts: {
const mediaUrls = const mediaUrls =
replyPayload.mediaUrls ?? replyPayload.mediaUrls ??
(replyPayload.mediaUrl ? [replyPayload.mediaUrl] : []); (replyPayload.mediaUrl ? [replyPayload.mediaUrl] : []);
// Reasoning payloads are text-only; any attachments stay on the main reply.
const reasoningPayloads = includeReasoning const previewText = shouldSkipMain
? resolveHeartbeatReasoningPayloads(replyResult).filter( ? reasoningPayloads
(payload) => payload !== replyPayload, .map((payload) => payload.text)
) .filter((text): text is string => Boolean(text?.trim()))
: []; .join("\n")
: normalized.text;
if (delivery.provider === "none" || !delivery.to) { if (delivery.provider === "none" || !delivery.to) {
emitHeartbeatEvent({ emitHeartbeatEvent({
status: "skipped", status: "skipped",
reason: delivery.reason ?? "no-target", reason: delivery.reason ?? "no-target",
preview: normalized.text?.slice(0, 200), preview: previewText?.slice(0, 200),
durationMs: Date.now() - startedAt, durationMs: Date.now() - startedAt,
hasMedia: mediaUrls.length > 0, hasMedia: mediaUrls.length > 0,
}); });
@@ -333,7 +340,7 @@ export async function runHeartbeatOnce(opts: {
emitHeartbeatEvent({ emitHeartbeatEvent({
status: "skipped", status: "skipped",
reason: readiness.reason, reason: readiness.reason,
preview: normalized.text?.slice(0, 200), preview: previewText?.slice(0, 200),
durationMs: Date.now() - startedAt, durationMs: Date.now() - startedAt,
hasMedia: mediaUrls.length > 0, hasMedia: mediaUrls.length > 0,
}); });
@@ -350,10 +357,14 @@ export async function runHeartbeatOnce(opts: {
to: delivery.to, to: delivery.to,
payloads: [ payloads: [
...reasoningPayloads, ...reasoningPayloads,
...(shouldSkipMain
? []
: [
{ {
text: normalized.text, text: normalized.text,
mediaUrls, mediaUrls,
}, },
]),
], ],
deps: opts.deps, deps: opts.deps,
}); });
@@ -361,7 +372,7 @@ export async function runHeartbeatOnce(opts: {
emitHeartbeatEvent({ emitHeartbeatEvent({
status: "sent", status: "sent",
to: delivery.to, to: delivery.to,
preview: normalized.text?.slice(0, 200), preview: previewText?.slice(0, 200),
durationMs: Date.now() - startedAt, durationMs: Date.now() - startedAt,
hasMedia: mediaUrls.length > 0, hasMedia: mediaUrls.length > 0,
}); });

View File

@@ -67,7 +67,12 @@ function formatValue(value: unknown): string | undefined {
try { try {
return JSON.stringify(value); return JSON.stringify(value);
} catch { } catch {
return String(value); if (typeof value === "bigint") return value.toString();
if (typeof value === "number" || typeof value === "boolean") {
return value.toString();
}
if (typeof value === "symbol") return value.toString();
return Object.prototype.toString.call(value);
} }
} }