@@ -1,5 +1,5 @@
11 import { cel, HStack, ProcessTerminal, VStack } from "@cel-tui/core";
2-import { compactContext, streamAgent } from "./agent";
2+import { streamAgent } from "./agent";
33 import { getBranchLabel } from "./git";
44 import {
55 buildSystemPrompt,
@@ -158,10 +158,6 @@ async function streamAgentTUI(state: TUIState) {
158158 });
159159 state.prompt = "";
160160
161- // Compact at 80k tokens, the dumb zone threshold.
162- if (estimateTokens(JSON.stringify(state.messages)) > 80000)
163- compactContext(state.messages);
164-
165161 const systemPrompt = await buildSystemPrompt(MAIN_PROMPT);
166162 const ctx: AgentContex = {
167163 systemPrompt,
@@ -179,11 +175,13 @@ async function streamAgentTUI(state: TUIState) {
179175 switch (ev.type) {
180176 case "message_start":
181177 case "message_update":
178+ case "message_end": {
179+ const { systemPrompt, tools, messages } = ctx;
180+ state.contextSize = estimateTokens(
181+ JSON.stringify({ systemPrompt, tools, messages }),
182+ );
182183 break;
183-
184- case "message_end":
185- state.contextSize = estimateTokens(JSON.stringify(ctx));
186- break;
184+ }
187185
188186 case "tool_message_start":
189187 case "tool_message_update":
@@ -204,7 +202,10 @@ async function streamAgentTUI(state: TUIState) {
204202 state.messages[idx] = withReminder;
205203 }
206204
207- state.contextSize = estimateTokens(JSON.stringify(ctx));
205+ const { systemPrompt, tools, messages } = ctx;
206+ state.contextSize = estimateTokens(
207+ JSON.stringify({ systemPrompt, tools, messages }),
208+ );
208209 }
209210 }
210211 }
@@ -214,9 +215,6 @@ async function streamAgentTUI(state: TUIState) {
214215 const id = secureRandomString(10);
215216 state.sessionId = id;
216217 }
217- // TODO: Should we make this delta only so compaction doesn;t affect saves?
218- // I'm not sure since it we do, there is no trace in logs about compaction
219- // and that would mean the logs don't repesent the truth. Confusing decision.
220218 await updateSession(state.sessionId, state.messages);
221219 }