valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove unnecessary isLoggingEnabled() checks (#420)

Browse Source 
It appears that use of `isLoggingEnabled()` was erroneously copypasta'd
in many places. This PR updates its docstring to clarify that should
only be used to avoid constructing a potentially expensive docstring.
With this change, the only function that merits/uses this check is
`execCommand()`.

---
[//]: # (BEGIN SAPLING FOOTER)
Stack created with [Sapling](https://sapling-scm.com). Best reviewed
with [ReviewStack](https://reviewstack.dev/openai/codex/pull/420).
* #423
* __->__ #420
* #419
This commit is contained in:
Michael Bolin
2025-04-20 09:58:06 -07:00
committed by GitHub
parent 81cf47e591
commit b554b522f7
10 changed files with 199 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
codex-cli/src/components/chat/terminal-chat-input-thinking.tsx
View File

@@ -1,4 +1,4 @@
import { log, isLoggingEnabled } from "../../utils/agent/log.js";
import { log } from "../../utils/agent/log.js";
import { Box, Text, useInput, useStdin } from "ink";
import React, { useState } from "react";
import { useInterval } from "use-interval";
@@ -40,11 +40,9 @@ export default function TerminalChatInputThinking({
const str = Buffer.isBuffer(data) ? data.toString("utf8") : data;
if (str === "\x1b\x1b") {
if (isLoggingEnabled()) {
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
}
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}
@@ -65,15 +63,11 @@ export default function TerminalChatInputThinking({
}
if (awaitingConfirm) {
if (isLoggingEnabled()) {
log("useInput: second ESC detected – triggering onInterrupt()");
}
log("useInput: second ESC detected – triggering onInterrupt()");
onInterrupt();
setAwaitingConfirm(false);
} else {
if (isLoggingEnabled()) {
log("useInput: first ESC detected – waiting for confirmation");
}
log("useInput: first ESC detected – waiting for confirmation");
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}

18
codex-cli/src/components/chat/terminal-chat-input.tsx
View File

@@ -8,7 +8,7 @@ import type {
import MultilineTextEditor from "./multiline-editor";
import { TerminalChatCommandReview } from "./terminal-chat-command-review.js";
import { log, isLoggingEnabled } from "../../utils/agent/log.js";
import { log } from "../../utils/agent/log.js";
import { loadConfig } from "../../utils/config.js";
import { createInputItem } from "../../utils/input-utils.js";
import { setSessionId } from "../../utils/session.js";
@@ -738,11 +738,9 @@ function TerminalChatInputThinking({
const str = Buffer.isBuffer(data) ? data.toString("utf8") : data;
if (str === "\x1b\x1b") {
// Treat as the first Escape press – prompt the user for confirmation.
if (isLoggingEnabled()) {
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
}
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}
@@ -767,15 +765,11 @@ function TerminalChatInputThinking({
}
if (awaitingConfirm) {
if (isLoggingEnabled()) {
log("useInput: second ESC detected – triggering onInterrupt()");
}
log("useInput: second ESC detected – triggering onInterrupt()");
onInterrupt();
setAwaitingConfirm(false);
} else {
if (isLoggingEnabled()) {
log("useInput: first ESC detected – waiting for confirmation");
}
log("useInput: first ESC detected – waiting for confirmation");
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}

18
codex-cli/src/components/chat/terminal-chat-new-input.tsx
View File

@@ -8,7 +8,7 @@ import type {
import MultilineTextEditor from "./multiline-editor";
import { TerminalChatCommandReview } from "./terminal-chat-command-review.js";
import { log, isLoggingEnabled } from "../../utils/agent/log.js";
import { log } from "../../utils/agent/log.js";
import { loadConfig } from "../../utils/config.js";
import { createInputItem } from "../../utils/input-utils.js";
import { setSessionId } from "../../utils/session.js";
@@ -505,11 +505,9 @@ function TerminalChatInputThinking({
const str = Buffer.isBuffer(data) ? data.toString("utf8") : data;
if (str === "\x1b\x1b") {
// Treat as the first Escape press – prompt the user for confirmation.
if (isLoggingEnabled()) {
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
}
log(
"raw stdin: received collapsed ESC ESC – starting confirmation timer",
);
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}
@@ -531,15 +529,11 @@ function TerminalChatInputThinking({
}
if (awaitingConfirm) {
if (isLoggingEnabled()) {
log("useInput: second ESC detected – triggering onInterrupt()");
}
log("useInput: second ESC detected – triggering onInterrupt()");
onInterrupt();
setAwaitingConfirm(false);
} else {
if (isLoggingEnabled()) {
log("useInput: first ESC detected – waiting for confirmation");
}
log("useInput: first ESC detected – waiting for confirmation");
setAwaitingConfirm(true);
setTimeout(() => setAwaitingConfirm(false), 1500);
}

65
codex-cli/src/components/chat/terminal-chat.tsx
View File

@@ -15,7 +15,7 @@ import { formatCommandForDisplay } from "../../format-command.js";
import { useConfirmation } from "../../hooks/use-confirmation.js";
import { useTerminalSize } from "../../hooks/use-terminal-size.js";
import { AgentLoop } from "../../utils/agent/agent-loop.js";
import { isLoggingEnabled, log } from "../../utils/agent/log.js";
import { log } from "../../utils/agent/log.js";
import { ReviewDecision } from "../../utils/agent/review.js";
import { generateCompactSummary } from "../../utils/compact-summary.js";
import { OPENAI_BASE_URL } from "../../utils/config.js";
@@ -213,30 +213,25 @@ export default function TerminalChat({
// ────────────────────────────────────────────────────────────────
// DEBUG: log every render w/ key bits of state
// ────────────────────────────────────────────────────────────────
if (isLoggingEnabled()) {
log(
`render – agent? ${Boolean(agentRef.current)} loading=${loading} items=${
items.length
}`,
);
}
log(
`render – agent? ${Boolean(agentRef.current)} loading=${loading} items=${
items.length
}`,
);
useEffect(() => {
// Skip recreating the agent if awaiting a decision on a pending confirmation
if (confirmationPrompt != null) {
if (isLoggingEnabled()) {
log("skip AgentLoop recreation due to pending confirmationPrompt");
}
log("skip AgentLoop recreation due to pending confirmationPrompt");
return;
}
if (isLoggingEnabled()) {
log("creating NEW AgentLoop");
log(
`model=${model} instructions=${Boolean(
config.instructions,
)} approvalPolicy=${approvalPolicy}`,
);
}
log("creating NEW AgentLoop");
log(
`model=${model} instructions=${Boolean(
config.instructions,
)} approvalPolicy=${approvalPolicy}`,
);
// Tear down any existing loop before creating a new one
agentRef.current?.terminate();
@@ -304,14 +299,10 @@ export default function TerminalChat({
// force a render so JSX below can "see" the freshly created agent
forceUpdate();
if (isLoggingEnabled()) {
log(`AgentLoop created: ${inspect(agentRef.current, { depth: 1 })}`);
}
log(`AgentLoop created: ${inspect(agentRef.current, { depth: 1 })}`);
return () => {
if (isLoggingEnabled()) {
log("terminating AgentLoop");
}
log("terminating AgentLoop");
agentRef.current?.terminate();
agentRef.current = undefined;
forceUpdate(); // re‑render after teardown too
@@ -393,9 +384,7 @@ export default function TerminalChat({
// Let's also track whenever the ref becomes available
const agent = agentRef.current;
useEffect(() => {
if (isLoggingEnabled()) {
log(`agentRef.current is now ${Boolean(agent)}`);
}
log(`agentRef.current is now ${Boolean(agent)}`);
}, [agent]);
// ---------------------------------------------------------------------
@@ -541,11 +530,9 @@ export default function TerminalChat({
if (!agent) {
return;
}
if (isLoggingEnabled()) {
log(
"TerminalChat: interruptAgent invoked – calling agent.cancel()",
);
}
log(
"TerminalChat: interruptAgent invoked – calling agent.cancel()",
);
agent.cancel();
setLoading(false);
@@ -581,13 +568,11 @@ export default function TerminalChat({
currentModel={model}
hasLastResponse={Boolean(lastResponseId)}
onSelect={(newModel) => {
if (isLoggingEnabled()) {
log(
"TerminalChat: interruptAgent invoked – calling agent.cancel()",
);
if (!agent) {
log("TerminalChat: agent is not ready yet");
}
log(
"TerminalChat: interruptAgent invoked – calling agent.cancel()",
);
if (!agent) {
log("TerminalChat: agent is not ready yet");
}
agent?.cancel();
setLoading(false);