fix: address review findings

Author: elkaix

apps/pythinker-code/src/tui/constant/hatch.ts

@@ -0,0 +1,4 @@
+/** Frame interval for the rainbow flow animation. */
+export const HATCH_FRAME_MS = 110;
+/** How long the rainbow flows before settling (fading out, or freezing). */
+export const HATCH_FLOW_MS = 3000;

apps/pythinker-code/src/tui/controllers/editor-keyboard.ts

@@ -527,8 +527,12 @@ export class EditorKeyboardController {
     void this.host.session?.cancel();
   }
 
+  /** Guards Shift-Tab cycling while a setThinking round-trip is still pending. */
+  private thinkingCycleInFlight = false;
+
   /** Shift-Tab: cycle the thinking effort to the current model's next level (wraps). */
   private async cycleThinkingEffort(): Promise<void> {
+    if (this.thinkingCycleInFlight) return;
     const { host } = this;
     if (host.state.appState.streamingPhase !== 'idle' || host.state.appState.isCompacting) {
       host.showError('Cannot change thinking effort while streaming — press Esc or Ctrl-C first.');
@@ -549,32 +553,37 @@ export class EditorKeyboardController {
       host.showNotice(`${alias} does not offer selectable thinking effort levels.`);
       return;
     }
-    const prev = host.state.appState.thinkingEffort;
-    const currentIndex = levels.indexOf(prev);
-    // An out-of-list live effort (e.g. a provider-specific value) restarts the
-    // cycle from the off entry when offered, else from the first level.
-    const startIndex = currentIndex !== -1 ? currentIndex + 1 : Math.max(0, levels.indexOf('off'));
-    const next = levels[startIndex % levels.length] ?? levels[0]!;
-    if (host.session !== undefined) {
-      try {
-        await host.session.setThinking(next);
-      } catch (error) {
-        host.showError(`Failed to set thinking effort: ${formatErrorMessage(error)}`);
+    this.thinkingCycleInFlight = true;
+    try {
+      const prev = host.state.appState.thinkingEffort;
+      const currentIndex = levels.indexOf(prev);
+      // An out-of-list live effort (e.g. a provider-specific value) restarts the
+      // cycle from the off entry when offered, else from the first level.
+      const startIndex = currentIndex !== -1 ? currentIndex + 1 : Math.max(0, levels.indexOf('off'));
+      const next = levels[startIndex % levels.length] ?? levels[0]!;
+      if (host.session !== undefined) {
+        try {
+          await host.session.setThinking(next);
+        } catch (error) {
+          host.showError(`Failed to set thinking effort: ${formatErrorMessage(error)}`);
+          return;
+        }
+      } else if (!host.engineV2) {
+        host.showError(NO_ACTIVE_SESSION_MESSAGE);
         return;
       }
-    } else if (!host.engineV2) {
-      host.showError(NO_ACTIVE_SESSION_MESSAGE);
-      return;
+      // v2 session-less: carry the choice into the first lazy-created session,
+      // the same way a session-only Alt+S choice is applied on creation.
+      const patch: Partial<AppState> = { thinkingEffort: next };
+      if (host.session === undefined) patch.lazySessionThinking = next;
+      host.setAppState(patch);
+      host.track('thinking_toggle', { enabled: next !== 'off', effort: next, from: prev });
+      // No transcript notice: the footer already shows the new level live, and
+      // rapid cycling would stack a line per keypress in the chat history.
+      await this.persistDefaultEffort(alias, model, next);
+    } finally {
+      this.thinkingCycleInFlight = false;
     }
-    // v2 session-less: carry the choice into the first lazy-created session,
-    // the same way a session-only Alt+S choice is applied on creation.
-    const patch: Partial<AppState> = { thinkingEffort: next };
-    if (host.session === undefined) patch.lazySessionThinking = next;
-    host.setAppState(patch);
-    host.track('thinking_toggle', { enabled: next !== 'off', effort: next, from: prev });
-    // No transcript notice: the footer already shows the new level live, and
-    // rapid cycling would stack a line per keypress in the chat history.
-    await this.persistDefaultEffort(alias, model, next);
   }
 
   /** Best-effort persist of the cycled effort as the config default. */

apps/pythinker-code/src/tui/easter-eggs/hatch.ts

@@ -1,7 +1,7 @@
 /**
- * `/hatch` easter egg — everything it needs lives in this one file: the
- * rainbow text coloring, the animation state machine, and the command handler.
- * Removing the feature is "delete this file + its import sites".
+ * `/hatch` easter egg — the rainbow text coloring, the animation state
+ * machine, and the command handler. Removing the feature is "delete this
+ * file, `constant/hatch.ts`, and the import sites".
  *
  * It is deliberately NOT registered in BUILTIN_SLASH_COMMANDS, so it stays out
  * of `/help` and autocomplete; `executeSlashCommand` calls the handler as a
@@ -13,13 +13,9 @@ import chalk from 'chalk';
 
 import type { SlashCommandHost } from '../commands/dispatch';
 import type { ParsedSlashInput } from '../commands/types';
+import { HATCH_FLOW_MS, HATCH_FRAME_MS } from '../constant/hatch';
 import { currentTheme } from '../theme';
 
-/** Frame interval for the rainbow flow animation. */
-export const HATCH_FRAME_MS = 110;
-/** How long the rainbow flows before settling (fading out, or freezing). */
-export const HATCH_FLOW_MS = 3000;
-
 const DARK_RAINBOW = [
   '#4FA8FF',
   '#5BC0BE',

apps/pythinker-code/src/utils/usage/debug-timing.ts

@@ -46,8 +46,12 @@ export function computeDecodeTps(
   outputTokens: number | undefined,
   streamMs: number | undefined,
 ): number | null {
-  if (outputTokens === undefined || outputTokens <= 0) return null;
-  if (streamMs === undefined || streamMs < MIN_STREAM_MS_FOR_TPS) return null;
+  if (outputTokens === undefined || !Number.isFinite(outputTokens) || outputTokens <= 0) {
+    return null;
+  }
+  if (streamMs === undefined || !Number.isFinite(streamMs) || streamMs < MIN_STREAM_MS_FOR_TPS) {
+    return null;
+  }
   return outputTokens / (streamMs / 1000);
 }
 

apps/pythinker-code/test/tui/controllers/editor-keyboard.test.ts

@@ -490,6 +490,25 @@ describe('EditorKeyboardController Shift-Tab effort cycle', () => {
     });
   });
 
+  it('ignores shift-tab pressed again while a thinking update is in flight', async () => {
+    const h = createEffortHarness({ supportEfforts: ['low', 'high', 'max'] });
+    let release!: () => void;
+    const gate = new Promise<void>((resolve) => {
+      release = resolve;
+    });
+    h.setThinking.mockImplementation(() => gate);
+
+    h.onShiftTab();
+    await new Promise((resolve) => setImmediate(resolve));
+    h.onShiftTab();
+    release();
+    await settle();
+
+    expect(h.setThinking).toHaveBeenCalledTimes(1);
+    expect(h.setThinking).toHaveBeenCalledWith('low');
+    expect(h.statePatches.at(-1)?.['thinkingEffort']).toBe('low');
+  });
+
   it('refuses to cycle while a turn is streaming', async () => {
     const h = createEffortHarness({
       supportEfforts: ['low', 'high'],

apps/pythinker-code/test/tui/easter-eggs/hatch.test.ts

@@ -2,15 +2,14 @@ import chalk from 'chalk';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import {
-  HATCH_FLOW_MS,
-  HATCH_FRAME_MS,
   getRainbowHatchView,
   installRainbowHatch,
   RainbowHatch,
   rainbowText,
   setRainbowHatch,
   tryHandleHatchCommand,
 } from '#/tui/easter-eggs/hatch';
+import { HATCH_FLOW_MS, HATCH_FRAME_MS } from '#/tui/constant/hatch';
 import type { SlashCommandHost } from '#/tui/commands/dispatch';
 import { darkColors } from '#/tui/theme/colors';
 

apps/pythinker-code/test/utils/usage/debug-timing.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest';
 
-import { formatStepDebugTiming } from '#/utils/usage/debug-timing';
+import { computeDecodeTps, formatStepDebugTiming } from '#/utils/usage/debug-timing';
 
 describe('formatStepDebugTiming', () => {
   it('returns undefined when timing fields are missing', () => {
@@ -145,3 +145,16 @@ describe('formatStepDebugTiming', () => {
     expect(result).toContain('10.0s');
   });
 });
+
+describe('computeDecodeTps', () => {
+  it('rejects non-finite inputs', () => {
+    expect(computeDecodeTps(Number.NaN, 1000)).toBeNull();
+    expect(computeDecodeTps(Number.POSITIVE_INFINITY, 1000)).toBeNull();
+    expect(computeDecodeTps(200, Number.NaN)).toBeNull();
+    expect(computeDecodeTps(200, Number.POSITIVE_INFINITY)).toBeNull();
+  });
+
+  it('computes the ratio for finite values', () => {
+    expect(computeDecodeTps(200, 5000)).toBeCloseTo(40);
+  });
+});

apps/pythinker-web/src/components/chat/ToolRow.vue

@@ -1,13 +1,14 @@
 <!-- apps/pythinker-web/src/components/chat/ToolRow.vue -->
 <script setup lang="ts">
 import { inject, nextTick, ref } from 'vue';
+import type { ToolStatus } from '../../types';
 import Icon from '../ui/Icon.vue';
 import Tooltip from '../ui/Tooltip.vue';
 import StatusDot from '../ui/StatusDot.vue';
 
 withDefaults(
   defineProps<{
-    status: 'running' | 'ok' | 'error' | 'suspended';
+    status: ToolStatus;
     /** Inline-SVG glyph string (toolGlyph), or empty for none. */
     icon?: string;
     name: string;

apps/pythinker-web/src/components/chat/tool-calls/EditTool.vue

@@ -36,7 +36,7 @@ const emit = defineEmits<{
 
 const { t } = useI18n();
 
-const status = computed<'running' | 'ok' | 'error'>(() => props.tool.status as 'running' | 'ok' | 'error');
+const status = computed(() => props.tool.status);
 const label = computed(() => toolLabel(props.tool.name));
 const glyph = computed(() => toolGlyph(props.tool.name));
 const isWrite = computed(() => normalizeToolName(props.tool.name) === 'write');

apps/pythinker-web/src/types.ts

@@ -87,7 +87,7 @@ export interface WorkspaceGroup {
 /** Sidebar session-list scope: only the active workspace, or all workspaces. */
 export type WorkspaceScope = 'current' | 'all';
 
-export type ToolStatus = 'ok' | 'running' | 'error';
+export type ToolStatus = 'ok' | 'running' | 'error' | 'suspended';
 
 export interface ToolCall {
   id: string;