smashimo/oh-my-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: repaired mis-applied conflict resolutions from title-state merge

Browse Source
This commit is contained in:
can1357
2026-07-23 17:34:13 +02:00
parent 154d4ace9f
commit 08be77c483
2 changed files with 3 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/coding-agent/src/modes/controllers/event-controller.ts
+2 -26
View File
@@ -82,22 +82,10 @@ export class EventController {
#lastVisibleBlockCount = 0;
#renderedCustomMessages = new Set<string>();
#lastIntent: string | undefined = undefined;
1: #backgroundTaskCallIds = new Set<string>();
#backgroundTaskCallIds = new Set<string>();
/** Tool calls whose approval prompt drove the title into `attention`; cleared
* at their tool_execution_end so the title returns to `working`. */
#approvalAttentionToolCallIds = new Set<string>();
2: this.#toolTimelineComponents.clear();
this.#postToolAssistantComponents.clear();
this.#backgroundTaskCallIds.clear();
this.#approvalAttentionToolCallIds.clear();
3: import {
disposeTerminalTitleState,
popTerminalTitle,
pushTerminalTitle,
setSessionTerminalTitle,
setTerminalTitleStateEnabled,
} from "../utils/title-generator";
import { aggregateVibeWorkerTokensPerSecond, VibeSessionRegistry } from "../vibe/runtime";
#readToolCallArgs = new Map<string, Record<string, unknown>>();
#readToolCallAssistantComponents = new Map<string, AssistantMessageComponent>();
#toolTimelineComponents = new Map<string, Component>();
@@ -336,22 +324,10 @@ import { aggregateVibeWorkerTokensPerSecond, VibeSessionRegistry } from "../vibe
this.#lastVisibleBlockCount = 0;
this.#renderedCustomMessages.clear();
this.#lastIntent = undefined;
1: #backgroundTaskCallIds = new Set<string>();
/** Tool calls whose approval prompt drove the title into `attention`; cleared
* at their tool_execution_end so the title returns to `working`. */
#approvalAttentionToolCallIds = new Set<string>();
2: this.#toolTimelineComponents.clear();
this.#toolTimelineComponents.clear();
this.#postToolAssistantComponents.clear();
this.#backgroundTaskCallIds.clear();
this.#approvalAttentionToolCallIds.clear();
3: import {
disposeTerminalTitleState,
popTerminalTitle,
pushTerminalTitle,
setSessionTerminalTitle,
setTerminalTitleStateEnabled,
} from "../utils/title-generator";
import { aggregateVibeWorkerTokensPerSecond, VibeSessionRegistry } from "../vibe/runtime";
this.#readToolCallArgs.clear();
this.#readToolCallAssistantComponents.clear();
this.#lastAssistantComponent = undefined;
packages/coding-agent/src/modes/interactive-mode.ts
+1 -9
View File
@@ -130,15 +130,7 @@ import type { EventBus } from "../utils/event-bus";
import { getEditorCommand, openInEditor } from "../utils/external-editor";
import { getSessionAccentAnsi, getSessionAccentHex } from "../utils/session-color";
import { messageHasDisplayableThinking } from "../utils/thinking-display";
1: #backgroundTaskCallIds = new Set<string>();
/** Tool calls whose approval prompt drove the title into `attention`; cleared
* at their tool_execution_end so the title returns to `working`. */
#approvalAttentionToolCallIds = new Set<string>();
2: this.#toolTimelineComponents.clear();
this.#postToolAssistantComponents.clear();
this.#backgroundTaskCallIds.clear();
this.#approvalAttentionToolCallIds.clear();
3: import {
import {
disposeTerminalTitleState,
popTerminalTitle,
pushTerminalTitle,