Merge pull request #92 from phantom5099/refactor

phantom5099 · web-flow · commit 0236bd985ee1 · 2026-06-15T21:24:55.000+08:00
Refactor
diff --git a/packages/codingcode/src/agent/agent.ts b/packages/codingcode/src/agent/agent.ts
@@ -28,6 +28,8 @@ import { LLMFactoryService } from '../llm/factory.js';
 import { getBuiltinTools } from '../tools/providers.js';
 import { canonicalizeSchema } from '../tools/utils/canonicalize-schema.js';
 import { normalizePath } from '../core/path.js';
+
+const REACTIVE_COMPACT_MAX_RETRIES = 3;
 import { RulesService } from '../rules/index.js';
 
 const logger = createLogger();
@@ -250,7 +252,7 @@ export function agentLoop(
     const system = [basePrompt, memorySection].filter(Boolean).join('\n\n');
 
     const config = getContextConfig();
-    const maxOverflowRetries = config.reactiveCompactMaxRetries;
+    const maxOverflowRetries = REACTIVE_COMPACT_MAX_RETRIES;
     const model = state.sessionMeta?.model ?? 'unknown';
     const effectiveMaxSteps = opts.maxStepsOverride ?? maxSteps;
 
diff --git a/packages/codingcode/src/context/service.ts b/packages/codingcode/src/context/service.ts
@@ -29,6 +29,12 @@ const COMPACTABLE_TOOLS = new Set([
   'edit_file',
 ]);
 
+const MICRO_COMPACT_THRESHOLD = 0.25;
+const MICRO_COMPACT_MIN_CHARS = 120;
+const COMPACTION_THRESHOLD = 0.9;
+const KEEP_RECENT_TURNS = 1;
+const REACTIVE_COMPACT_MAX_RETRIES = 3;
+
 export class ContextService extends Effect.Service<ContextService>()('Context', {
   effect: Effect.gen(function* () {
     const session = yield* SessionService;
@@ -107,7 +113,7 @@ export class ContextService extends Effect.Service<ContextService>()('Context',
       contextWindow: number,
       jsonlPath: string
     ): boolean {
-      if (promptEstimate <= contextWindow * config.microCompactThreshold) return false;
+      if (promptEstimate <= contextWindow * MICRO_COMPACT_THRESHOLD) return false;
 
       const compactedTurnIds = new Set<number>();
       for (const ev of events) {
@@ -124,7 +130,7 @@ export class ContextService extends Effect.Service<ContextService>()('Context',
         if (ev.turnId >= currentTurnId - 1) continue;
         if (compactedTurnIds.has(ev.turnId)) continue;
         if (!COMPACTABLE_TOOLS.has(ev.toolName.toLowerCase())) continue;
-        if (ev.output.length <= config.microCompactMinChars) continue;
+        if (ev.output.length <= MICRO_COMPACT_MIN_CHARS) continue;
         oldResults.push(ev);
       }
 
@@ -165,7 +171,7 @@ export class ContextService extends Effect.Service<ContextService>()('Context',
         return { didCompress: false, released: 0, promptEstimate };
       }
 
-      const threshold = modelMaxTokens * config.compactionThreshold;
+      const threshold = modelMaxTokens * COMPACTION_THRESHOLD;
       if (promptEstimate <= threshold) {
         return { didCompress: false, released: 0, promptEstimate };
       }
@@ -208,7 +214,7 @@ export class ContextService extends Effect.Service<ContextService>()('Context',
 
       let released = 0;
 
-      const threshold = modelMaxTokens ? modelMaxTokens * config.compactionThreshold : Infinity;
+      const threshold = modelMaxTokens ? modelMaxTokens * COMPACTION_THRESHOLD : Infinity;
       if (usage === undefined || usage - released > threshold) {
         released += await tryCompaction(
           sessionId,
@@ -236,7 +242,7 @@ export class ContextService extends Effect.Service<ContextService>()('Context',
       currentTurnId: number,
       compactedTurnIds: Set<number>
     ): Promise<number> {
-      const endTurn = currentTurnId - config.keepRecentTurns - 1;
+      const endTurn = currentTurnId - KEEP_RECENT_TURNS - 1;
       if (endTurn < 1) return 0;
 
       const inRange = compactedEvents.filter((ev) => {
diff --git a/packages/codingcode/src/session/messages.ts b/packages/codingcode/src/session/messages.ts
@@ -15,6 +15,8 @@ const COMPACTABLE_TOOLS = new Set([
   'edit_file',
 ]);
 
+const MICRO_COMPACT_MIN_CHARS = 120;
+
 export interface VisibilityResult {
   hidden: Set<string>;
   compactedTurnIds: Set<number>;
@@ -109,7 +111,7 @@ export function buildMessagesFromEvents(
         if (
           compactedTurnIds.has(event.turnId) &&
           COMPACTABLE_TOOLS.has(event.toolName.toLowerCase()) &&
-          event.output.length > getContextConfig().microCompactMinChars
+          event.output.length > MICRO_COMPACT_MIN_CHARS
         ) {
           output = `[Earlier: used ${event.toolName}]`;
         }
diff --git a/packages/codingcode/test/agent/agent-cache-stability.test.ts b/packages/codingcode/test/agent/agent-cache-stability.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/agent-concurrent.test.ts b/packages/codingcode/test/agent/agent-concurrent.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/agent-todo-event.test.ts b/packages/codingcode/test/agent/agent-todo-event.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/agent.test.ts b/packages/codingcode/test/agent/agent.test.ts
@@ -15,12 +15,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/config.test.ts b/packages/codingcode/test/agent/config.test.ts
@@ -4,12 +4,7 @@ import { resolveConfig } from '../../src/agent/config.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/hooks-deps-type.test.ts b/packages/codingcode/test/agent/hooks-deps-type.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/loop-options.test.ts b/packages/codingcode/test/agent/loop-options.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/memory-snapshot.test.ts b/packages/codingcode/test/agent/memory-snapshot.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/agent/stop-hook.test.ts b/packages/codingcode/test/agent/stop-hook.test.ts
@@ -9,12 +9,7 @@ import { MemoryService } from '../../src/memory/index.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
diff --git a/packages/codingcode/test/context/append-turn-end.test.ts b/packages/codingcode/test/context/append-turn-end.test.ts
@@ -1,4 +1,4 @@
-﻿﻿import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
+﻿import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
 import { mkdirSync, writeFileSync, rmSync, existsSync } from 'fs';
 import { join } from 'path';
 import { homedir } from 'os';
@@ -9,12 +9,7 @@ import { getContextConfig } from '../../src/context/config.js';
 vi.mock('@codingcode/infra/config', () => ({
   loadConfig: () => ({
     context: {
-      microCompactThreshold: 0.7,
-      microCompactMinChars: 200,
-      compactionThreshold: 0.8,
-      keepRecentTurns: 10,
       compactionModel: '',
-      reactiveCompactMaxRetries: 1,
     },
     memory: {
       enabled: false,
@@ -74,8 +69,4 @@ describe('appendTurnEnd', () => {
     expect(parsed.tokenCount).toBe(tokens);
   });
 
-  it('compression thresholds have sensible defaults', () => {
-    const config = getContextConfig();
-    expect(config.compactionThreshold).toBeGreaterThan(0);
-  });
 });
diff --git a/packages/codingcode/test/context/budget-integration.test.ts b/packages/codingcode/test/context/budget-integration.test.ts
@@ -13,12 +13,7 @@ const PROJECT_BASE = join(homedir(), '.codingcode', 'project');
 
 function makeConfig() {
   return {
-    microCompactThreshold: 0.5,
-    microCompactMinChars: 120,
-    compactionThreshold: 0.9,
-    keepRecentTurns: 1,
     compactionModel: '',
-    reactiveCompactMaxRetries: 3,
   };
 }
 
diff --git a/packages/codingcode/test/context/compressor/behavior.test.ts b/packages/codingcode/test/context/compressor/behavior.test.ts
@@ -110,12 +110,7 @@ function readSummaryEvents(jsonlPath: string): SummaryEvent[] {
 
 function tinyConfig(overrides: Partial<ContextConfig> = {}): ContextConfig {
   return {
-    microCompactThreshold: 0.5,
-    microCompactMinChars: 120,
-    compactionThreshold: 0.5,
-    keepRecentTurns: 2,
     compactionModel: '',
-    reactiveCompactMaxRetries: 1,
     ...overrides,
   };
 }
@@ -164,7 +159,7 @@ describe('compressor behavior', () => {
     it('writes summary event with five-section system summary', async () => {
       const fx = makeFixture({ numTurns: 5 });
       try {
-        const cfg = tinyConfig({ keepRecentTurns: 2 });
+        const cfg = tinyConfig();
         const summary =
           '## Compacted History\n\n### Goal\nfix bug\n\n### Instructions\nbe careful\n\n### Discoveries\nrace condition\n\n### Accomplished\npatched\n\n### Relevant Files\nsrc/x.ts';
         const llm = makeMockLLM(summary);
@@ -182,7 +177,7 @@ describe('compressor behavior', () => {
     it('returns no-op when no LLM available', async () => {
       const fx = makeFixture({ numTurns: 5 });
       try {
-        const cfg = tinyConfig({ keepRecentTurns: 2 });
+        const cfg = tinyConfig();
         const ctx = await getCtxService();
         const result = await ctx.compactWithLLM(fx.sessionId, fx.slug, cfg, null);
         expect(result.didCompress).toBe(false);
@@ -198,7 +193,7 @@ describe('compressor behavior', () => {
     it('appends summary event directly to JSONL after L5', async () => {
       const fx = makeFixture({ numTurns: 5 });
       try {
-        const cfg = tinyConfig({ keepRecentTurns: 2 });
+        const cfg = tinyConfig();
         const llm = makeMockLLM(
           '## Compacted History\n\n### Goal\na\n\n### Instructions\nb\n\n### Discoveries\nc\n\n### Accomplished\nd\n\n### Relevant Files\ne'
         );
@@ -219,7 +214,7 @@ describe('compressor behavior', () => {
       const fx = makeFixture({ numTurns: 5 });
       try {
         const before = estimateTokens(buildMessages(fx.transcriptPath));
-        const cfg = tinyConfig({ keepRecentTurns: 2 });
+        const cfg = tinyConfig();
         const llm = makeMockLLM(
           '## Compacted History\n\n### Goal\na\n\n### Instructions\nb\n\n### Discoveries\nc\n\n### Accomplished\nd\n\n### Relevant Files\ne'
         );
diff --git a/packages/codingcode/test/context/compressor/compact-if-needed.test.ts b/packages/codingcode/test/context/compressor/compact-if-needed.test.ts
@@ -90,12 +90,7 @@ async function getCtxService(): Promise<ContextService> {
 
 function config(threshold: number, maxTokens = 10000) {
   return {
-    microCompactThreshold: 0.5,
-    microCompactMinChars: 120,
-    compactionThreshold: threshold,
-    keepRecentTurns: 1,
     compactionModel: '',
-    reactiveCompactMaxRetries: 1,
   } as any;
 }
 
diff --git a/packages/codingcode/test/context/organizer.test.ts b/packages/codingcode/test/context/organizer.test.ts
@@ -6,12 +6,7 @@ import { LLMFactoryService } from '../../src/llm/factory.js';
 import type { SessionEvent, ToolResultEvent } from '../../src/session/types.js';
 
 const baseConfig = {
-  microCompactThreshold: 0.5,
-  microCompactMinChars: 120,
-  compactionThreshold: 0.9,
-  keepRecentTurns: 1,
   compactionModel: '',
-  reactiveCompactMaxRetries: 3,
 };
 
 function makeUserEvent(content: string, turnId: number): SessionEvent {
diff --git a/packages/codingcode/test/session/record-tool-result-persist.test.ts b/packages/codingcode/test/session/record-tool-result-persist.test.ts
@@ -4,12 +4,7 @@ import { SessionService } from '../../src/session/store.js';
 
 vi.mock('../../src/context/config.js', () => ({
   getContextConfig: vi.fn(() => ({
-    microCompactThreshold: 0.5,
-    microCompactMinChars: 120,
-    compactionThreshold: 0.9,
-    keepRecentTurns: 1,
     compactionModel: '',
-    reactiveCompactMaxRetries: 3,
   })),
 }));
 
diff --git a/packages/desktop/src/agent/AgentWorkspace.tsx b/packages/desktop/src/agent/AgentWorkspace.tsx
@@ -370,7 +370,7 @@ export default function AgentWorkspace({ sendMessage, abort }: AgentWorkspacePro
 
   return (
     <div className="flex-1 flex flex-col overflow-hidden bg-[var(--bg-panel)]">
-      <MessageStream threadId={currentThreadId} />
+      <MessageStream key={currentThreadId} threadId={currentThreadId} />
       <ApprovalPanel threadId={currentThreadId} />
       <TodoPanel threadId={currentThreadId} />
       {isCompressing && (
diff --git a/packages/desktop/src/agent/MessageStream.tsx b/packages/desktop/src/agent/MessageStream.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState, useCallback, useMemo } from 'react';
+import { useEffect, useLayoutEffect, useRef, useState, useCallback, useMemo } from 'react';
 import { Copy, Check } from 'lucide-react';
 import { useVirtualizer } from '@tanstack/react-virtual';
 import { useGlobalStore } from '../stores/global.store';
@@ -229,6 +229,7 @@ export default function MessageStream({ threadId }: MessageStreamProps) {
   } = useAgentRollback();
   const { copiedId, copy } = useCopyToClipboard();
   const parentRef = useRef<HTMLDivElement>(null);
+  const didScrollToEndRef = useRef(false);
   const markFileRestored = useGlobalStore((s) => s.markFileRestored);
   const setPendingInput = useGlobalStore((s) => s.setPendingInput);
 
@@ -371,8 +372,16 @@ export default function MessageStream({ threadId }: MessageStreamProps) {
     anchorTo: 'end',
     followOnAppend: 'smooth',
     scrollEndThreshold: 80,
+    initialOffset: () => Number.MAX_SAFE_INTEGER,
   });
 
+  useLayoutEffect(() => {
+    if (renderEntries.length === 0) return;
+    if (didScrollToEndRef.current) return;
+    virtualizer.scrollToEnd({ behavior: 'instant' });
+    didScrollToEndRef.current = true;
+  }, [renderEntries.length, virtualizer]);
+
   const turnStatusKey = useMemo(() => turns.map((t) => `${t.id}:${t.status}`).join(','), [turns]);
 
   const handleLoadDiff = useCallback(
diff --git a/packages/desktop/src/shared/MessageItem.tsx b/packages/desktop/src/shared/MessageItem.tsx
@@ -44,13 +44,12 @@ const MessageItem = memo(function MessageItem({
   useLayoutEffect(() => {
     if (!rollbackMenuOpen || !rollbackMenuRef.current || !rollbackBtnRef.current) return;
     const menuRect = rollbackMenuRef.current.getBoundingClientRect();
-    const btnRect = rollbackBtnRef.current.getBoundingClientRect();
     const flip: { vertical?: boolean; horizontal?: boolean } = {};
-    // If menu goes above viewport, flip to below button
-    if (menuRect.top < 0) {
+    // Account for title bar overlay (~36px on Windows, ~28px on macOS)
+    const safeTop = 40;
+    if (menuRect.top < safeTop) {
       flip.vertical = true;
     }
-    // If menu goes beyond right edge, flip to left-align
     if (menuRect.right > window.innerWidth) {
       flip.horizontal = true;
     }
diff --git a/packages/desktop/test/message-stream-scroll.test.tsx b/packages/desktop/test/message-stream-scroll.test.tsx
diff --git a/packages/desktop/test/scroll-layout.test.ts b/packages/desktop/test/scroll-layout.test.ts
diff --git a/packages/infra/src/config.ts b/packages/infra/src/config.ts
