can1357
5ff277349c
- Added the `xd://` virtual device protocol (`internal-urls/xd-protocol.ts`, `tools/xdev.ts`): tools declaring `loadMode: "discoverable"` are unmounted from the request tools array and driven via `read xd://` (list/docs+schema) and `write xd://<tool>` (execute), gated by the `tools.xdev` setting (default on) and inlined into the system prompt. - Merged the `irc`, `job`, and `launch` tools into a single `hub` tool (`tools/hub/`, `async/job-manager.ts`): messaging keeps `send`/`inbox`/`list`, job control maps to `wait`/`cancel`/`jobs`, process supervision keeps `start`/`logs`/`stop`/`restart`/`describe` with `ps`, and the unified `wait` races background jobs against peer messages; SDK `IrcTool`/`JobTool`/`LaunchTool` are replaced by `HubTool`. - Removed the hidden `resolve` tool in favor of the `xd://resolve`/`xd://reject`/`xd://propose` resolution devices, auto-including `write` whenever a deferrable tool or plan mode is present. - Removed the BM25 tool-discovery system: the `search_tool_bm25` tool, the `tool-discovery` module, the `tools.discoveryMode`/`mcp.discoveryMode`/`mcp.discoveryDefaultServers`/`tools.essentialOverride` settings, per-tool MCP selection, and the `mcp_tool_selection` message type. - Unified tool presentation on `ToolLoadMode` (`essential`|`discoverable`), replacing the custom-tool `xdev?: boolean` opt-out; custom, extension, MCP, RPC host, image-generation, and TTS tools now default to `discoverable`, and added a `satisfies` predicate to `SoftToolRequirement`. - Removed the standalone `ssh` command tool and `ssh/ssh-executor` (the `ssh://` read/write/search protocol stays), and made `--tools` address hidden built-ins. - Updated collab-web to render `xd://` dispatches and `hub` op families, dropped the `search_tool_bm25`/`ssh`/`report-finding` renderers, refreshed tool docs and prompts, and migrated the affected tests and changelogs.
934 lines
36 KiB
TypeScript
934 lines
36 KiB
TypeScript
import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
|
|
import type { AssistantMessage, ImageContent, Message, Usage } from "@oh-my-pi/pi-ai";
|
|
import { getStreamingPartialJson } from "@oh-my-pi/pi-ai/utils/block-symbols";
|
|
import { type Component, Spacer, Text, TruncatedText } from "@oh-my-pi/pi-tui";
|
|
import type { AdvisorMessageDetails } from "../../advisor";
|
|
import { COLLAB_PROMPT_MESSAGE_TYPE, type CollabPromptDetails } from "../../collab/protocol";
|
|
import { settings } from "../../config/settings";
|
|
import { getFileSnapshotStore } from "../../edit/file-snapshot-store";
|
|
import { createAdvisorMessageCard } from "../../modes/components/advisor-message";
|
|
import { AssistantMessageComponent } from "../../modes/components/assistant-message";
|
|
import { createBackgroundTanDispatchBlock } from "../../modes/components/background-tan-message";
|
|
import { BashExecutionComponent } from "../../modes/components/bash-execution";
|
|
import { detectCacheInvalidation } from "../../modes/components/cache-invalidation-marker";
|
|
import { CollabPromptMessageComponent } from "../../modes/components/collab-prompt-message";
|
|
import {
|
|
BranchSummaryMessageComponent,
|
|
CompactionSummaryMessageComponent,
|
|
createHandoffSummaryMessageComponent,
|
|
} from "../../modes/components/compaction-summary-message";
|
|
import { CustomMessageComponent } from "../../modes/components/custom-message";
|
|
import { DynamicBorder } from "../../modes/components/dynamic-border";
|
|
import { EvalExecutionComponent } from "../../modes/components/eval-execution";
|
|
import {
|
|
type LateDiagnosticsFile,
|
|
LateDiagnosticsMessageComponent,
|
|
} from "../../modes/components/late-diagnostics-message";
|
|
import { ReadToolGroupComponent, readArgsCollapseIntoGroup } from "../../modes/components/read-tool-group";
|
|
import { SkillMessageComponent } from "../../modes/components/skill-message";
|
|
import { ToolExecutionComponent } from "../../modes/components/tool-execution";
|
|
import { TranscriptBlock } from "../../modes/components/transcript-container";
|
|
import { createUsageRowBlock } from "../../modes/components/usage-row";
|
|
import { UserMessageComponent } from "../../modes/components/user-message";
|
|
import { decodeStreamedToolArgs, streamingStringKeysForTool } from "../../modes/controllers/tool-args-reveal";
|
|
import { materializeImageReferenceLinksSync } from "../../modes/image-references";
|
|
import { theme } from "../../modes/theme/theme";
|
|
import type { CompactionQueuedMessage, InteractiveModeContext } from "../../modes/types";
|
|
import {
|
|
BACKGROUND_TAN_DISPATCH_MESSAGE_TYPE,
|
|
type CustomMessage,
|
|
LSP_LATE_DIAGNOSTIC_MESSAGE_TYPE,
|
|
SKILL_PROMPT_MESSAGE_TYPE,
|
|
type SkillPromptDetails,
|
|
} from "../../session/messages";
|
|
import type { SessionContext, StrippedToolCallsMarker } from "../../session/session-context";
|
|
import { replaceTabs } from "../../tools/render-utils";
|
|
import { buildSkillCommandPrompt, invokeSkillCommandFromText, isKnownSkillCommand } from "../skill-command";
|
|
import { createAssistantMessageComponent } from "./interactive-context-helpers";
|
|
import {
|
|
assistantHasVisibleContent,
|
|
assistantUsageIsBilled,
|
|
buildAsyncResultBlock,
|
|
buildFileMentionBlock,
|
|
buildIrcMessageCard,
|
|
normalizeToolArgs,
|
|
resolveAssistantErrorPresentation,
|
|
splitAssistantMessageToolTimeline,
|
|
} from "./transcript-render-helpers";
|
|
|
|
type TextBlock = { type: "text"; text: string };
|
|
interface RenderInitialMessagesOptions {
|
|
preserveExistingChat?: boolean;
|
|
clearTerminalHistory?: boolean;
|
|
}
|
|
|
|
type QueuedMessages = {
|
|
steering: string[];
|
|
followUp: string[];
|
|
};
|
|
|
|
function imageLinksForMessage(
|
|
message: Extract<AgentMessage, { role: "developer" | "user" }>,
|
|
putBlobSync: InteractiveModeContext["sessionManager"]["putBlobSync"],
|
|
): (string | undefined)[] | undefined {
|
|
if (typeof message.content === "string") return undefined;
|
|
const images = message.content.filter(
|
|
(content): content is ImageContent =>
|
|
content.type === "image" && typeof content.data === "string" && typeof content.mimeType === "string",
|
|
);
|
|
return materializeImageReferenceLinksSync(images, putBlobSync);
|
|
}
|
|
|
|
export class UiHelpers {
|
|
constructor(private ctx: InteractiveModeContext) {}
|
|
|
|
/** Extract text content from a user message */
|
|
getUserMessageText(message: Message): string {
|
|
if (message.role !== "user") return "";
|
|
const textBlocks =
|
|
typeof message.content === "string"
|
|
? [{ type: "text", text: message.content }]
|
|
: message.content.filter((content): content is TextBlock => content.type === "text");
|
|
return textBlocks.map(block => block.text).join("");
|
|
}
|
|
|
|
/**
|
|
* Show a status message in the chat.
|
|
*
|
|
* If multiple status messages are emitted back-to-back (without anything else being added to the chat),
|
|
* we update the previous status line instead of appending new ones to avoid log spam.
|
|
*/
|
|
showStatus(message: string, options?: { dim?: boolean }): void {
|
|
const children = this.ctx.chatContainer.children;
|
|
const last = children.length > 0 ? children[children.length - 1] : undefined;
|
|
const secondLast = children.length > 1 ? children[children.length - 2] : undefined;
|
|
const useDim = options?.dim ?? true;
|
|
const rendered = useDim ? theme.fg("dim", message) : message;
|
|
|
|
if (last && secondLast && last === this.ctx.lastStatusText && secondLast === this.ctx.lastStatusSpacer) {
|
|
this.ctx.lastStatusText.setText(rendered);
|
|
this.ctx.ui.requestRender();
|
|
return;
|
|
}
|
|
|
|
const spacer = new Spacer(1);
|
|
const text = new Text(rendered, 1, 0);
|
|
this.ctx.present([spacer, text]);
|
|
this.ctx.lastStatusSpacer = spacer;
|
|
this.ctx.lastStatusText = text;
|
|
}
|
|
|
|
addMessageToChat(
|
|
message: AgentMessage,
|
|
options?: { populateHistory?: boolean; imageLinks?: readonly (string | undefined)[] },
|
|
): Component[] {
|
|
switch (message.role) {
|
|
case "bashExecution": {
|
|
const component = new BashExecutionComponent(message.command, this.ctx.ui, message.excludeFromContext);
|
|
if (message.output) {
|
|
component.appendOutput(message.output);
|
|
}
|
|
component.setComplete(message.exitCode, message.cancelled, {
|
|
truncation: message.meta?.truncation,
|
|
});
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
case "pythonExecution": {
|
|
const component = new EvalExecutionComponent(message.code, this.ctx.ui, message.excludeFromContext);
|
|
if (message.output) {
|
|
component.appendOutput(message.output);
|
|
}
|
|
component.setComplete(message.exitCode, message.cancelled, {
|
|
truncation: message.meta?.truncation,
|
|
});
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
case "hookMessage":
|
|
case "custom": {
|
|
if (message.display) {
|
|
if (message.customType === "async-result") {
|
|
this.ctx.chatContainer.addChild(buildAsyncResultBlock(message));
|
|
break;
|
|
}
|
|
if (message.customType === LSP_LATE_DIAGNOSTIC_MESSAGE_TYPE) {
|
|
const details = (
|
|
message as CustomMessage<{
|
|
files?: LateDiagnosticsFile[];
|
|
}>
|
|
).details;
|
|
const component = new LateDiagnosticsMessageComponent(details?.files ?? []);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
if (message.customType === COLLAB_PROMPT_MESSAGE_TYPE) {
|
|
const component = new CollabPromptMessageComponent(message as CustomMessage<CollabPromptDetails>);
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
if (message.customType === SKILL_PROMPT_MESSAGE_TYPE) {
|
|
const component = new SkillMessageComponent(message as CustomMessage<SkillPromptDetails>);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
if (
|
|
message.customType === "irc:incoming" ||
|
|
message.customType === "irc:autoreply" ||
|
|
message.customType === "irc:relay"
|
|
) {
|
|
const card = buildIrcMessageCard(message, () => this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(card);
|
|
return [card];
|
|
}
|
|
if (message.customType === "advisor") {
|
|
const details = (message as CustomMessage<AdvisorMessageDetails>).details;
|
|
this.ctx.chatContainer.addChild(
|
|
createAdvisorMessageCard(details, () => this.ctx.toolOutputExpanded, theme),
|
|
);
|
|
break;
|
|
}
|
|
if (message.customType === BACKGROUND_TAN_DISPATCH_MESSAGE_TYPE) {
|
|
this.ctx.chatContainer.addChild(createBackgroundTanDispatchBlock(message as CustomMessage<unknown>));
|
|
break;
|
|
}
|
|
const handoffComponent = createHandoffSummaryMessageComponent(
|
|
message as CustomMessage<unknown>,
|
|
this.ctx.toolOutputExpanded,
|
|
);
|
|
if (handoffComponent) {
|
|
this.ctx.chatContainer.addChild(handoffComponent);
|
|
break;
|
|
}
|
|
const renderer = this.ctx.viewSession.extensionRunner?.getMessageRenderer(message.customType);
|
|
// Both HookMessage and CustomMessage have the same structure, cast for compatibility
|
|
const component = new CustomMessageComponent(message as CustomMessage<unknown>, renderer);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
}
|
|
break;
|
|
}
|
|
case "compactionSummary": {
|
|
const component = new CompactionSummaryMessageComponent(message);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
case "branchSummary": {
|
|
const component = new BranchSummaryMessageComponent(message);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
break;
|
|
}
|
|
case "fileMention": {
|
|
// Render compact file mention display
|
|
const block = buildFileMentionBlock(message.files, 0);
|
|
if (block.children.length > 0) this.ctx.chatContainer.addChild(block);
|
|
break;
|
|
}
|
|
case "user":
|
|
case "developer": {
|
|
const textContent = this.ctx.getUserMessageText(message);
|
|
if (textContent) {
|
|
const isSynthetic = message.role === "developer" ? true : (message.synthetic ?? false);
|
|
const imageLinks =
|
|
options?.imageLinks ??
|
|
imageLinksForMessage(
|
|
message,
|
|
this.ctx.viewSession.sessionManager.putBlobSync.bind(this.ctx.viewSession.sessionManager),
|
|
);
|
|
const userComponent = new UserMessageComponent(textContent, isSynthetic, imageLinks);
|
|
this.ctx.chatContainer.addChild(userComponent);
|
|
if (options?.populateHistory && message.role === "user" && !isSynthetic) {
|
|
this.ctx.editor.addToHistory(textContent);
|
|
}
|
|
}
|
|
break;
|
|
}
|
|
case "assistant": {
|
|
const assistantComponent = createAssistantMessageComponent(
|
|
this.ctx,
|
|
splitAssistantMessageToolTimeline(message).beforeTools,
|
|
);
|
|
this.ctx.chatContainer.addChild(assistantComponent);
|
|
break;
|
|
}
|
|
case "toolResult": {
|
|
// Tool results are rendered inline with tool calls, handled separately
|
|
break;
|
|
}
|
|
default: {
|
|
message satisfies never;
|
|
}
|
|
}
|
|
return [];
|
|
}
|
|
|
|
/**
|
|
* Render session context to chat. Used for initial load and rebuild after compaction.
|
|
* @param sessionContext Session context to render
|
|
* @param options.updateFooter Update footer state
|
|
* @param options.populateHistory Add user messages to editor history
|
|
*/
|
|
renderSessionContext(
|
|
sessionContext: SessionContext,
|
|
options: { updateFooter?: boolean; populateHistory?: boolean } = {},
|
|
): void {
|
|
// Preserved: message_start handler owns this lifecycle (see #783)
|
|
this.ctx.pendingTools.clear();
|
|
// Reseed the cache-invalidation baseline: this rebuild re-derives every
|
|
// turn's marker from usage, and the last turn becomes the live baseline.
|
|
this.ctx.lastAssistantUsage = undefined;
|
|
|
|
if (options.updateFooter) {
|
|
this.ctx.statusLine.invalidate();
|
|
this.ctx.updateEditorBorderColor();
|
|
}
|
|
|
|
let readGroup: ReadToolGroupComponent | null = null;
|
|
const readToolCallArgs = new Map<string, Record<string, unknown>>();
|
|
const readToolCallAssistantComponents = new Map<string, AssistantMessageComponent>();
|
|
// The per-turn token-usage row (display.showTokenUsage) must land below the
|
|
// turn's tool blocks. Read tool blocks are only created when their toolResult
|
|
// message is processed (below), so appending the row in the assistant branch
|
|
// would place it above a read run. Defer instead: stash the usage on the
|
|
// assistant message, then flush it once the turn's tools are placed — right
|
|
// before the next non-toolResult message and at end of rebuild — sealing the
|
|
// read run so the row sits under it. Mirrors the live path, where the read
|
|
// group is created during streaming and the row is appended below it.
|
|
let pendingUsage: Usage | undefined;
|
|
let pendingUsageDuration: number | undefined;
|
|
let pendingUsageTtft: number | undefined;
|
|
const flushPendingUsage = () => {
|
|
if (!pendingUsage) return;
|
|
readGroup?.seal();
|
|
readGroup = null;
|
|
this.ctx.chatContainer.addChild(createUsageRowBlock(pendingUsage, pendingUsageDuration, pendingUsageTtft));
|
|
pendingUsage = undefined;
|
|
pendingUsageDuration = undefined;
|
|
pendingUsageTtft = undefined;
|
|
};
|
|
// Rebuild-time mirror of the event controller's displaceable-poll
|
|
// bookkeeping: a `hub` wait that found every watched job still running is
|
|
// superseded by the next `hub` call, so a rebuilt transcript collapses a
|
|
// repeated-poll run to its final snapshot instead of replaying the spam.
|
|
let waitingPoll: ToolExecutionComponent | null = null;
|
|
const resolveWaitingPoll = (nextToolName?: string) => {
|
|
const previous = waitingPoll;
|
|
if (!previous) return;
|
|
waitingPoll = null;
|
|
if (
|
|
nextToolName === "hub" &&
|
|
previous.isDisplaceableBlock() &&
|
|
this.ctx.chatContainer.isBlockUncommitted(previous)
|
|
) {
|
|
this.ctx.chatContainer.removeChild(previous);
|
|
}
|
|
// Sealing freezes the block and stops the waiting-poll spinner that
|
|
// updateResult armed.
|
|
previous.seal();
|
|
};
|
|
let todoSnapshot: ToolExecutionComponent | null = null;
|
|
const resolveTodoSnapshot = (nextToolName?: string) => {
|
|
const previous = todoSnapshot;
|
|
if (!previous) return;
|
|
if (!previous.isDisplaceableBlock()) {
|
|
todoSnapshot = null;
|
|
return;
|
|
}
|
|
if (previous.canBeDisplacedBy(nextToolName)) {
|
|
todoSnapshot = null;
|
|
if (this.ctx.chatContainer.isBlockUncommitted(previous)) {
|
|
this.ctx.chatContainer.removeChild(previous);
|
|
}
|
|
previous.seal();
|
|
return;
|
|
}
|
|
if (nextToolName !== undefined) return;
|
|
todoSnapshot = null;
|
|
previous.seal();
|
|
};
|
|
const messages = sessionContext.messages;
|
|
const count = messages.length;
|
|
for (let i = 0; i < count; i++) {
|
|
const message = messages[i]!;
|
|
if (message.role !== "toolResult") flushPendingUsage();
|
|
// Assistant messages need special handling for tool calls
|
|
if (message.role === "assistant") {
|
|
const timeline = splitAssistantMessageToolTimeline(message);
|
|
this.ctx.addMessageToChat(message);
|
|
const lastChild = this.ctx.chatContainer.children[this.ctx.chatContainer.children.length - 1];
|
|
const assistantComponent = lastChild instanceof AssistantMessageComponent ? lastChild : undefined;
|
|
if (assistantComponent) {
|
|
const usage = message.usage;
|
|
const explained = sessionContext.cacheMissExplainedAt?.[i] ?? false;
|
|
if (this.ctx.settings.get("display.cacheMissMarker") && !explained) {
|
|
const invalidation = detectCacheInvalidation(this.ctx.lastAssistantUsage, usage);
|
|
if (invalidation) assistantComponent.setCacheInvalidation(invalidation);
|
|
}
|
|
if (usage.cacheRead + usage.cacheWrite + usage.input > 0) {
|
|
this.ctx.lastAssistantUsage = usage;
|
|
}
|
|
}
|
|
const hasVisibleAssistantContent = assistantHasVisibleContent(message);
|
|
if (hasVisibleAssistantContent) {
|
|
// Rebuild reconstructs immutable history; seal (not finalize) so the
|
|
// group freezes even if a read's result was never persisted —
|
|
// finalize alone keeps a pending entry live and would stop the whole
|
|
// transcript below it from committing to native scrollback.
|
|
readGroup?.seal();
|
|
readGroup = null;
|
|
}
|
|
const errorPresentation = resolveAssistantErrorPresentation(message, this.ctx.viewSession.retryAttempt);
|
|
const hasErrorStop = errorPresentation.kind === "full";
|
|
const errorMessage = hasErrorStop ? errorPresentation.text : null;
|
|
const appendAssistantSegment = (segment: AssistantMessage | undefined) => {
|
|
if (!segment || !assistantHasVisibleContent(segment)) return;
|
|
const component = createAssistantMessageComponent(this.ctx, segment);
|
|
this.ctx.chatContainer.addChild(component);
|
|
};
|
|
|
|
// Render tool call components
|
|
for (const content of message.content) {
|
|
if (content.type !== "toolCall") {
|
|
continue;
|
|
}
|
|
resolveWaitingPoll(content.name);
|
|
const afterToolSegment = timeline.afterToolCalls.get(content.id);
|
|
|
|
if (content.name === "read" && readArgsCollapseIntoGroup(content.arguments)) {
|
|
if (hasErrorStop && errorMessage) {
|
|
if (!readGroup) {
|
|
readGroup = new ReadToolGroupComponent({
|
|
showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
|
|
});
|
|
readGroup.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(readGroup);
|
|
}
|
|
readGroup.updateArgs(content.arguments, content.id);
|
|
readGroup.updateResult(
|
|
{ content: [{ type: "text", text: errorMessage }], isError: true },
|
|
false,
|
|
content.id,
|
|
);
|
|
} else if (afterToolSegment) {
|
|
if (!readGroup) {
|
|
readGroup = new ReadToolGroupComponent({
|
|
showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
|
|
});
|
|
readGroup.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(readGroup);
|
|
}
|
|
readGroup.updateArgs(content.arguments, content.id);
|
|
this.ctx.pendingTools.set(content.id, readGroup);
|
|
if (assistantComponent) {
|
|
readToolCallAssistantComponents.set(content.id, assistantComponent);
|
|
}
|
|
} else {
|
|
const normalizedArgs = normalizeToolArgs(content.arguments);
|
|
readToolCallArgs.set(content.id, normalizedArgs);
|
|
if (assistantComponent) {
|
|
readToolCallAssistantComponents.set(content.id, assistantComponent);
|
|
}
|
|
}
|
|
appendAssistantSegment(afterToolSegment);
|
|
continue;
|
|
}
|
|
|
|
readGroup?.seal();
|
|
readGroup = null;
|
|
const tool = this.ctx.viewSession.getToolByName(content.name);
|
|
const partialJson = getStreamingPartialJson(content);
|
|
// Mid-stream rebuild (theme change, settings, focus replay): decode
|
|
// display args from the raw stream exactly like the live reveal path.
|
|
// The provider-parsed `arguments` lag the stream by up to a throttled
|
|
// parse window, so spreading them alone would freeze a long write/edit
|
|
// preview at its last full parse.
|
|
const rawInput = content.customWireName !== undefined;
|
|
const renderArgs = partialJson
|
|
? decodeStreamedToolArgs(partialJson, {
|
|
rawInput,
|
|
fullArgs: content.arguments,
|
|
streamingStringKeys: streamingStringKeysForTool(content.name, rawInput),
|
|
})
|
|
: content.arguments;
|
|
const component = new ToolExecutionComponent(
|
|
content.name,
|
|
renderArgs,
|
|
{
|
|
snapshots: getFileSnapshotStore(this.ctx.viewSession),
|
|
showImages: settings.get("terminal.showImages"),
|
|
editFuzzyThreshold: settings.get("edit.fuzzyThreshold"),
|
|
editAllowFuzzy: settings.get("edit.fuzzyMatch"),
|
|
liveRegion: this.ctx.chatContainer,
|
|
},
|
|
tool,
|
|
this.ctx.ui,
|
|
this.ctx.viewSession.sessionManager.getCwd(),
|
|
content.id,
|
|
);
|
|
component.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(component);
|
|
|
|
if (hasErrorStop && errorMessage) {
|
|
component.updateResult(
|
|
{ content: [{ type: "text", text: errorMessage }], isError: true },
|
|
false,
|
|
content.id,
|
|
);
|
|
} else {
|
|
this.ctx.pendingTools.set(content.id, component);
|
|
}
|
|
appendAssistantSegment(afterToolSegment);
|
|
}
|
|
// Dangling toolCalls (no result on the resolved path — failed or
|
|
// retried turns, results on sibling branches) were stripped by the
|
|
// context build; surface a placeholder so the turn's activity is
|
|
// visibly elided instead of silently vanishing (the "bare thinking
|
|
// lines" transcript trap).
|
|
const strippedToolCalls = (message as AgentMessage & StrippedToolCallsMarker).strippedToolCalls ?? 0;
|
|
if (strippedToolCalls > 0) {
|
|
this.ctx.chatContainer.addChild(
|
|
new Text(
|
|
theme.fg(
|
|
"dim",
|
|
theme.italic(
|
|
`${strippedToolCalls} tool call${strippedToolCalls === 1 ? "" : "s"} elided — no result on this branch`,
|
|
),
|
|
),
|
|
1,
|
|
0,
|
|
),
|
|
);
|
|
}
|
|
pendingUsage =
|
|
this.ctx.settings.get("display.showTokenUsage") && assistantUsageIsBilled(message.usage)
|
|
? message.usage
|
|
: undefined;
|
|
pendingUsageDuration = message.duration;
|
|
pendingUsageTtft = message.ttft;
|
|
} else if (message.role === "toolResult") {
|
|
const pendingReadComponent = this.ctx.pendingTools.get(message.toolCallId);
|
|
const isReadGroupResult =
|
|
message.toolName === "read" &&
|
|
(!pendingReadComponent || pendingReadComponent instanceof ReadToolGroupComponent);
|
|
if (isReadGroupResult) {
|
|
const assistantComponent = readToolCallAssistantComponents.get(message.toolCallId);
|
|
const images: ImageContent[] = message.content.filter(
|
|
(content): content is ImageContent => content.type === "image",
|
|
);
|
|
if (images.length > 0 && assistantComponent && settings.get("terminal.showImages")) {
|
|
assistantComponent.setToolResultImages(message.toolCallId, images);
|
|
const hasText = message.content.some(c => c.type === "text");
|
|
if (!hasText) {
|
|
readToolCallArgs.delete(message.toolCallId);
|
|
readToolCallAssistantComponents.delete(message.toolCallId);
|
|
continue;
|
|
}
|
|
}
|
|
let component = this.ctx.pendingTools.get(message.toolCallId);
|
|
if (!component) {
|
|
if (!readGroup) {
|
|
readGroup = new ReadToolGroupComponent({
|
|
showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
|
|
});
|
|
readGroup.setExpanded(this.ctx.toolOutputExpanded);
|
|
this.ctx.chatContainer.addChild(readGroup);
|
|
}
|
|
const args = readToolCallArgs.get(message.toolCallId);
|
|
if (args) {
|
|
readGroup.updateArgs(args, message.toolCallId);
|
|
}
|
|
component = readGroup;
|
|
this.ctx.pendingTools.set(message.toolCallId, readGroup);
|
|
}
|
|
component.updateResult(message, false, message.toolCallId);
|
|
this.ctx.pendingTools.delete(message.toolCallId);
|
|
readToolCallArgs.delete(message.toolCallId);
|
|
readToolCallAssistantComponents.delete(message.toolCallId);
|
|
continue;
|
|
}
|
|
|
|
// Match tool results to pending tool components
|
|
const component = this.ctx.pendingTools.get(message.toolCallId);
|
|
if (component) {
|
|
component.updateResult(message, false, message.toolCallId);
|
|
this.ctx.pendingTools.delete(message.toolCallId);
|
|
if (
|
|
message.toolName === "hub" &&
|
|
component instanceof ToolExecutionComponent &&
|
|
component.isDisplaceableBlock()
|
|
) {
|
|
waitingPoll = component;
|
|
} else if (
|
|
message.toolName === "todo" &&
|
|
component instanceof ToolExecutionComponent &&
|
|
component.canBeDisplacedBy("todo")
|
|
) {
|
|
// A successful todo result supersedes the prior live snapshot. Failed
|
|
// follow-ups return false from canBeDisplacedBy("todo"), so the
|
|
// last-good panel stays on screen.
|
|
resolveTodoSnapshot("todo");
|
|
todoSnapshot = component;
|
|
}
|
|
}
|
|
} else {
|
|
// A user prompt closes the displacement window, same as the live path.
|
|
if (message.role === "user") resolveWaitingPoll();
|
|
if (message.role === "user") resolveTodoSnapshot();
|
|
// All other messages use standard rendering
|
|
this.ctx.addMessageToChat(message, options);
|
|
}
|
|
}
|
|
flushPendingUsage();
|
|
|
|
// The trailing read run has no following break to close it; seal so the
|
|
// rebuilt group freezes (even with a never-persisted result) and commits to
|
|
// native scrollback like every other historical block.
|
|
readGroup?.seal();
|
|
// A trailing waiting poll is final history on rebuild; seal it so it
|
|
// freezes (and its spinner timer stops) like every other block.
|
|
resolveWaitingPoll();
|
|
// A trailing todo snapshot is live state, not history: when the rebuild
|
|
// runs mid-turn (settings overlay close, focus attach during streaming),
|
|
// hand it back to the controller so a follow-up `todo` update keeps
|
|
// displacing instead of stacking. Idle rebuilds (resume / compaction)
|
|
// fall through to the seal path so the snapshot freezes as history.
|
|
if (todoSnapshot && this.ctx.viewSession.isStreaming) {
|
|
this.ctx.eventController?.inheritDisplaceableTodo(todoSnapshot);
|
|
todoSnapshot = null;
|
|
} else {
|
|
resolveTodoSnapshot();
|
|
}
|
|
|
|
// Entries still in `pendingTools` are toolCalls whose result never landed
|
|
// during the replay — with `keepDanglingToolCalls` these are exactly the
|
|
// turn's in-flight calls (assistant turn persisted at message_end, tool
|
|
// still executing). While the viewed session streams, keep them tracked so
|
|
// the live event stream routes `tool_execution_update`/`_end` into the
|
|
// rebuilt components instead of dropping the result; their args are final,
|
|
// so mark them complete. Idle rebuilds have no result coming: seal so the
|
|
// blocks freeze as history instead of pinning the live region, then clear
|
|
// so reconstructed historical components never leak into live tracking.
|
|
// (`rebuildChatFromMessages` builds its context WITHOUT dangling calls and
|
|
// restores its own preserved live components afterwards — for that caller
|
|
// the map is empty here either way.)
|
|
if (this.ctx.viewSession.isStreaming) {
|
|
for (const [toolCallId, component] of this.ctx.pendingTools) {
|
|
component.setArgsComplete(toolCallId);
|
|
}
|
|
} else {
|
|
for (const component of this.ctx.pendingTools.values()) {
|
|
component.seal();
|
|
}
|
|
this.ctx.pendingTools.clear();
|
|
}
|
|
this.ctx.ui.requestRender();
|
|
}
|
|
|
|
renderInitialMessages(options: RenderInitialMessagesOptions = {}): void {
|
|
// This path is used to rebuild the visible chat transcript (e.g. after custom/debug UI).
|
|
// Clear existing rendered chat first to avoid duplicating the full session in the container.
|
|
// On a non-preserving rebuild the existing blocks are discarded for good, so
|
|
// dispose them (stopping any live timers/subscriptions) before clearing. When
|
|
// preserving, the same instances are re-added below, so detach without dispose.
|
|
const preservedChatChildren = options.preserveExistingChat ? this.ctx.chatContainer.children : undefined;
|
|
this.ctx.initialChatRendered = true;
|
|
if (preservedChatChildren) {
|
|
this.ctx.chatContainer.clear();
|
|
} else {
|
|
this.ctx.resetTranscript();
|
|
}
|
|
this.ctx.pendingMessagesContainer.disposeChildren();
|
|
this.ctx.pendingBashComponents = [];
|
|
this.ctx.pendingPythonComponents = [];
|
|
|
|
// Live display collapses to the compacted transcript tail unless the
|
|
// user opted into the full inline history; export/resume callers can
|
|
// still request either mode. Mid-turn rebuilds
|
|
// (focus attach/unfocus while a tool executes) keep dangling toolCalls so
|
|
// the in-flight call re-renders as pending instead of vanishing;
|
|
// renderSessionContext then keeps it in `pendingTools` for live routing.
|
|
const context = this.ctx.viewSession.buildTranscriptSessionContext({
|
|
collapseCompactedHistory: settings.get("display.collapseCompacted"),
|
|
keepDanglingToolCalls: this.ctx.viewSession.isStreaming,
|
|
});
|
|
this.ctx.renderSessionContext(context, {
|
|
updateFooter: true,
|
|
populateHistory: !this.ctx.focusedAgentId,
|
|
});
|
|
|
|
// Show compaction info if session was compacted
|
|
const allEntries = this.ctx.viewSession.sessionManager.getEntries();
|
|
let compactionCount = 0;
|
|
for (const entry of allEntries) {
|
|
if (entry.type === "compaction") {
|
|
compactionCount++;
|
|
}
|
|
}
|
|
if (compactionCount > 0) {
|
|
const times = compactionCount === 1 ? "1 time" : `${compactionCount} times`;
|
|
this.ctx.showStatus(`Session compacted ${times}`);
|
|
}
|
|
if (options.clearTerminalHistory) {
|
|
this.ctx.ui.requestRender(true, { clearScrollback: true });
|
|
}
|
|
if (preservedChatChildren && preservedChatChildren.length > 0) {
|
|
for (const child of preservedChatChildren) {
|
|
this.ctx.chatContainer.addChild(child);
|
|
}
|
|
this.ctx.ui.requestRender();
|
|
}
|
|
}
|
|
|
|
clearEditor(): void {
|
|
this.ctx.editor.clearDraft();
|
|
this.ctx.ui.requestRender();
|
|
}
|
|
|
|
showError(errorMessage: string): void {
|
|
this.ctx.present([new Spacer(1), new Text(theme.fg("error", `Error: ${errorMessage}`), 1, 0)]);
|
|
}
|
|
|
|
showWarning(warningMessage: string): void {
|
|
this.ctx.present([new Spacer(1), new Text(theme.fg("warning", `Warning: ${warningMessage}`), 1, 0)]);
|
|
}
|
|
|
|
showNewVersionNotification(newVersion: string): void {
|
|
const block = new TranscriptBlock();
|
|
block.addChild(new DynamicBorder(text => theme.fg("warning", text)));
|
|
block.addChild(
|
|
new Text(
|
|
theme.bold(theme.fg("warning", "Update Available")) +
|
|
"\n" +
|
|
theme.fg("muted", `New version ${newVersion} is available. Run: `) +
|
|
theme.fg("accent", "omp update"),
|
|
1,
|
|
0,
|
|
),
|
|
);
|
|
block.addChild(new DynamicBorder(text => theme.fg("warning", text)));
|
|
this.ctx.present(block);
|
|
}
|
|
|
|
updatePendingMessagesDisplay(): void {
|
|
this.ctx.pendingMessagesContainer.disposeChildren();
|
|
const queuedMessages = this.ctx.viewSession.getQueuedMessages() as QueuedMessages;
|
|
|
|
const steeringMessages = [...queuedMessages.steering];
|
|
for (const entry of this.ctx.compactionQueuedMessages as CompactionQueuedMessage[]) {
|
|
if (entry.mode === "steer") steeringMessages.push(entry.text);
|
|
}
|
|
|
|
const followUpMessages = [...queuedMessages.followUp];
|
|
for (const entry of this.ctx.compactionQueuedMessages as CompactionQueuedMessage[]) {
|
|
if (entry.mode === "followUp") followUpMessages.push(entry.text);
|
|
}
|
|
|
|
const groups = [
|
|
{ label: "Steering", messages: steeringMessages },
|
|
{ label: "After yield", messages: followUpMessages },
|
|
].filter(group => group.messages.length > 0);
|
|
if (groups.length > 0) {
|
|
this.ctx.pendingMessagesContainer.addChild(new Spacer(1));
|
|
for (const group of groups) {
|
|
const heading = theme.fg("muted", `${group.label}${theme.sep.dot}${group.messages.length}`);
|
|
this.ctx.pendingMessagesContainer.addChild(new TruncatedText(heading, 1, 0));
|
|
for (let index = 0; index < group.messages.length; index++) {
|
|
const message = replaceTabs(group.messages[index] ?? "").replace(/\r?\n/g, " ↵ ");
|
|
const queuedText = theme.fg("dim", ` ${index + 1}. ${message}`);
|
|
this.ctx.pendingMessagesContainer.addChild(new TruncatedText(queuedText, 1, 0));
|
|
}
|
|
}
|
|
const dequeueKey = this.ctx.keybindings.getDisplayString("app.message.dequeue") || "Alt+Up";
|
|
const hintText = theme.fg("dim", ` ${theme.tree.hook} ${dequeueKey} to edit`);
|
|
this.ctx.pendingMessagesContainer.addChild(new TruncatedText(hintText, 1, 0));
|
|
}
|
|
}
|
|
|
|
queueCompactionMessage(text: string, mode: "steer" | "followUp", images?: ImageContent[]): void {
|
|
const queuedImages = images && images.length > 0 ? images : undefined;
|
|
this.ctx.compactionQueuedMessages.push({ text, mode, images: queuedImages } as CompactionQueuedMessage);
|
|
this.ctx.editor.clearDraft(text);
|
|
this.ctx.updatePendingMessagesDisplay();
|
|
this.ctx.showStatus(
|
|
queuedImages ? "Queued message with image for after compaction" : "Queued message for after compaction",
|
|
);
|
|
}
|
|
|
|
async #deliverQueuedMessage(message: CompactionQueuedMessage): Promise<void> {
|
|
if (
|
|
await invokeSkillCommandFromText(this.ctx, message.text, message.mode, {
|
|
propagateErrors: true,
|
|
queueOnly: true,
|
|
images: message.images,
|
|
})
|
|
) {
|
|
return;
|
|
}
|
|
if (this.ctx.isKnownSlashCommand(message.text)) {
|
|
await this.ctx.session.prompt(message.text);
|
|
return;
|
|
}
|
|
await this.ctx.withLocalSubmission(
|
|
message.text,
|
|
() =>
|
|
message.mode === "followUp"
|
|
? this.ctx.session.followUp(message.text, message.images)
|
|
: this.ctx.session.steer(message.text, message.images),
|
|
{ imageCount: message.images?.length ?? 0 },
|
|
);
|
|
}
|
|
|
|
isKnownSlashCommand(text: string): boolean {
|
|
if (!text.startsWith("/")) return false;
|
|
const spaceIndex = text.indexOf(" ");
|
|
const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
|
|
if (!commandName) return false;
|
|
|
|
if (this.ctx.session.extensionRunner?.getCommand(commandName)) {
|
|
return true;
|
|
}
|
|
|
|
for (const command of this.ctx.session.customCommands) {
|
|
if (command.command.name === commandName) {
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return this.ctx.fileSlashCommands.has(commandName);
|
|
}
|
|
|
|
async flushCompactionQueue(options?: { willRetry?: boolean }): Promise<void> {
|
|
if (this.ctx.compactionQueuedMessages.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const queuedMessages = [...(this.ctx.compactionQueuedMessages as CompactionQueuedMessage[])];
|
|
this.ctx.compactionQueuedMessages = [] as CompactionQueuedMessage[];
|
|
this.ctx.updatePendingMessagesDisplay();
|
|
|
|
const restoreQueue = (error: unknown) => {
|
|
this.ctx.session.clearQueue();
|
|
this.ctx.compactionQueuedMessages = queuedMessages;
|
|
this.ctx.updatePendingMessagesDisplay();
|
|
this.ctx.showError(
|
|
`Failed to send queued message${queuedMessages.length > 1 ? "s" : ""}: ${
|
|
error instanceof Error ? error.message : String(error)
|
|
}`,
|
|
);
|
|
};
|
|
|
|
try {
|
|
if (options?.willRetry) {
|
|
for (const message of queuedMessages) {
|
|
await this.#deliverQueuedMessage(message);
|
|
}
|
|
this.ctx.updatePendingMessagesDisplay();
|
|
return;
|
|
}
|
|
|
|
let firstPromptIndex = -1;
|
|
for (let i = 0; i < queuedMessages.length; i++) {
|
|
if (!this.ctx.isKnownSlashCommand(queuedMessages[i].text)) {
|
|
firstPromptIndex = i;
|
|
break;
|
|
}
|
|
}
|
|
if (firstPromptIndex === -1) {
|
|
for (const message of queuedMessages) {
|
|
await this.ctx.session.prompt(message.text);
|
|
}
|
|
return;
|
|
}
|
|
|
|
const preCommands = queuedMessages.slice(0, firstPromptIndex);
|
|
const firstPrompt = queuedMessages[firstPromptIndex];
|
|
const rest = queuedMessages.slice(firstPromptIndex + 1);
|
|
|
|
for (const message of preCommands) {
|
|
// preCommands are all slash commands; #deliverQueuedMessage handles
|
|
// that branch (no local-submission marking needed since slash
|
|
// commands don't generate a matching user message_start).
|
|
await this.#deliverQueuedMessage(message);
|
|
}
|
|
|
|
// First prompt is fire-and-forget — its rejection is funneled through
|
|
// `restoreQueue` rather than rethrown. Plain prompts use primitive
|
|
// recordLocalSubmission and dispose manually in the catch. Skill prompts
|
|
// are rebuilt as user-attributed custom messages so queued `/skill:` text
|
|
// is not sent as a literal prompt after compaction.
|
|
let promptPromise: Promise<unknown>;
|
|
if (isKnownSkillCommand(this.ctx, firstPrompt.text)) {
|
|
const built = await buildSkillCommandPrompt(
|
|
this.ctx,
|
|
firstPrompt.text,
|
|
firstPrompt.mode,
|
|
firstPrompt.images,
|
|
);
|
|
promptPromise = built
|
|
? this.ctx.session.promptCustomMessage(built.message, built.options).catch(restoreQueue)
|
|
: Promise.resolve();
|
|
} else {
|
|
const disposeFirstPrompt = this.ctx.recordLocalSubmission(
|
|
firstPrompt.text,
|
|
firstPrompt.images?.length ?? 0,
|
|
);
|
|
promptPromise = this.ctx.session
|
|
.prompt(firstPrompt.text, {
|
|
streamingBehavior: firstPrompt.mode === "followUp" ? "followUp" : "steer",
|
|
images: firstPrompt.images,
|
|
})
|
|
.catch((error: unknown) => {
|
|
disposeFirstPrompt();
|
|
restoreQueue(error);
|
|
});
|
|
}
|
|
|
|
for (const message of rest) {
|
|
await this.#deliverQueuedMessage(message);
|
|
}
|
|
this.ctx.updatePendingMessagesDisplay();
|
|
void promptPromise;
|
|
} catch (error) {
|
|
restoreQueue(error);
|
|
}
|
|
}
|
|
|
|
/** Move pending bash components from pending area to chat */
|
|
flushPendingBashComponents(): void {
|
|
for (const component of this.ctx.pendingBashComponents) {
|
|
this.ctx.pendingMessagesContainer.removeChild(component);
|
|
this.ctx.chatContainer.addChild(component);
|
|
}
|
|
this.ctx.pendingBashComponents = [];
|
|
for (const component of this.ctx.pendingPythonComponents) {
|
|
this.ctx.pendingMessagesContainer.removeChild(component);
|
|
this.ctx.chatContainer.addChild(component);
|
|
}
|
|
this.ctx.pendingPythonComponents = [];
|
|
}
|
|
|
|
findLastAssistantMessage(): AssistantMessage | undefined {
|
|
for (let i = this.ctx.viewSession.messages.length - 1; i >= 0; i--) {
|
|
const message = this.ctx.viewSession.messages[i];
|
|
if (message?.role === "assistant") {
|
|
return message as AssistantMessage;
|
|
}
|
|
}
|
|
return undefined;
|
|
}
|
|
|
|
extractAssistantText(message: AssistantMessage): string {
|
|
let text = "";
|
|
for (const content of message.content) {
|
|
if (content.type === "text") {
|
|
text += content.text;
|
|
}
|
|
}
|
|
return text.trim();
|
|
}
|
|
}
|