@markusylisiurunen/tau 0.3.32 → 0.3.34

package/dist/tui/session_chat_controller.js

@@ -6,7 +6,7 @@ import { captureDiffReviewSnapshot, DiffReviewBridge, } from "../core/diff_revie
 import { buildDiffReviewInstructions } from "../core/diff_review/review_instructions.js";
 import { createDefaultCoreDeps } from "../core/runtime/deps.js";
 import { runDirectBashCommand } from "../core/session/direct_bash.js";
-import { parseSessionPruneFraction, parseSessionPruneFractionAndGuidance, } from "../core/session/pruning.js";
+import { SUBAGENT_ACTIVITY_FACET_KIND } from "../core/subagents/types.js";
 import { REASONING_LEVELS } from "../core/types.js";
 import { formatAdaptiveNumber, formatTokenWindow } from "../core/utils/format.js";
 import { extractAssistantText } from "../core/utils/messages.js";
@@ -103,9 +103,6 @@ export class SessionChatController {
             diff: (argsText) => this.startDiffReview(argsText),
             compactSummaryOnly: (extra) => this.compactSession("summary-only", extra),
             compactSummaryAndLast: (extra) => this.compactSession("summary-and-last", extra),
-            pruneEarliest: (extra) => this.pruneSession("earliest", extra),
-            pruneLargest: (extra) => this.pruneSession("largest", extra),
-            pruneSmart: (extra) => this.pruneSession("smart", extra),
             reload: () => this.reloadContent(),
             listen: () => this.startListenCaptureFromCommand(),
             speak: () => this.speakLastAssistantMessage(),
@@ -170,7 +167,7 @@ export class SessionChatController {
             onCtrlP: () => void this.cyclePersonality(),
             onCtrlS: () => void this.stashEditorToClipboard(),
             onCtrlY: () => void this.toggleListenCapture(),
-            onCtrlG: () => this.terminateSelectedSubagent(),
+            onCtrlG: () => this.interruptSelectedSubagent(),
             onEscape: () => void this.interrupt(),
             beforeSubmit: (text) => this.beforeSubmit(text),
             onChange: (text) => this.handleEditorChange(text),
@@ -409,12 +406,18 @@ export class SessionChatController {
         this.isStreaming = true;
         this.startTurnTimer();
         this.view.startWorkingIcon();
-        this.view.handleToolUiEvent({
-            type: "bash_started",
+        this.view.updateLocalToolUi({
             toolCallId,
-            command,
+            toolName: "bash",
+            status: "running",
             headerTarget,
-        }, "local");
+            activity: {
+                type: "bash_started",
+                toolCallId,
+                command,
+                headerTarget,
+            },
+        });
         this.refreshStatus();
         try {
             const backend = createSdkToolExecutionBackend({
@@ -436,27 +439,42 @@ export class SessionChatController {
                 this.hiddenHistoryEntryIds.add(result.userHistoryEntryId);
                 this.renderedMessageIds.push(result.userHistoryEntryId);
             }
-            this.view.handleToolUiEvent({
-                type: "bash_execution",
+            this.view.updateLocalToolUi({
                 toolCallId,
-                command: result.command,
+                toolName: "bash",
+                status: result.exitCode === 0 ? "succeeded" : "failed",
                 headerTarget,
-                exitCode: result.exitCode,
-                truncationInfo: result.truncationInfo,
-                uiText: result.uiText,
-                durationMs: result.durationMs,
-                labelOverride: options.labelOverride,
-            }, "local");
+                activity: {
+                    type: "bash_execution",
+                    toolCallId,
+                    command: result.command,
+                    headerTarget,
+                    exitCode: result.exitCode,
+                    truncationInfo: result.truncationInfo,
+                    uiText: result.uiText,
+                    durationMs: result.durationMs,
+                    labelOverride: options.labelOverride,
+                },
+                resultText: result.uiText.fullLines.map((line) => line.text).join("\n"),
+            });
             await this.syncFromSessionSnapshot();
         }
         catch (error) {
-            this.view.handleToolUiEvent({
-                type: "bash_blocked",
+            const reason = error.message || "bash failed";
+            this.view.updateLocalToolUi({
                 toolCallId,
-                command,
+                toolName: "bash",
+                status: "blocked",
                 headerTarget,
-                reason: error.message || "bash failed",
-            }, "local");
+                activity: {
+                    type: "bash_blocked",
+                    toolCallId,
+                    command,
+                    headerTarget,
+                    reason,
+                },
+                resultText: reason,
+            });
             await this.syncFromSessionSnapshot();
         }
         finally {
@@ -492,9 +510,7 @@ export class SessionChatController {
         });
     }
     submitSteeringText(text) {
-        void this.session
-            .steer(text, { historyEntryId: `session-steer-${randomUUID()}` })
-            .catch((error) => {
+        void this.session.steer(text).catch((error) => {
             if (!this.isPendingMessageCancellation(error)) {
                 this.view.addSystemMessage(`steering failed: ${error.message}`, "error");
             }
@@ -941,7 +957,7 @@ export class SessionChatController {
             if (this.tryApplyFastContentAppendDelta(delta)) {
                 return true;
             }
-            if (this.tryApplyFastToolFacetDelta(delta)) {
+            if (this.tryApplyFastToolUiDelta(delta)) {
                 return true;
             }
             if (this.tryApplyFastAgentDelta(delta)) {
@@ -1015,30 +1031,19 @@ export class SessionChatController {
         this.refreshStatus();
         return true;
     }
-    tryApplyFastToolFacetDelta(delta) {
-        if (delta.delta.type !== "snapshot.patch") {
-            return false;
-        }
-        const facetChanges = delta.delta.changes.filter((change) => change.type === "facet.set");
-        if (facetChanges.length !== 1 ||
+    tryApplyFastToolUiDelta(delta) {
+        if (delta.delta.type !== "snapshot.patch" ||
+            delta.delta.changes.length === 0 ||
             delta.delta.changes.some((change) => change.type !== "tool.set" && change.type !== "facet.set")) {
             return false;
         }
-        const facetChange = facetChanges[0];
-        const nextFacet = facetChange.facet;
-        if (nextFacet.kind !== "tau.tool-ui-events" || nextFacet.subject.type !== "tool") {
-            return false;
-        }
-        const previousEvents = toolUiEventsFromFacet(this.snapshot.facets[nextFacet.id]);
-        const nextEvents = toolUiEventsFromFacet(nextFacet);
-        if (!canAppendToolUiEvents(nextEvents, previousEvents)) {
+        const facetChanges = delta.delta.changes.filter((change) => change.type === "facet.set");
+        if (facetChanges.some(({ facet }) => facet.kind !== "tau.tool-ui-events" || facet.subject.type !== "tool")) {
             return false;
         }
         this.snapshot = applySessionProtocolDelta(this.snapshot, delta);
         this.observedSessionRevision = Math.max(this.observedSessionRevision, this.snapshot.revision);
-        for (const event of nextEvents.slice(previousEvents.length)) {
-            this.view.handleToolUiEvent(event, "session");
-        }
+        this.view.reconcileToolUiSession(getToolUiModelsInModelOrder(this.snapshot));
         this.refreshStatus();
         return true;
     }
@@ -1127,7 +1132,7 @@ export class SessionChatController {
             };
         }
         if (message.message.role === "toolResult" &&
-            hasToolUiFacetForToolCall(this.snapshot, message.message.toolCallId)) {
+            this.snapshot.tools[message.message.toolCallId]) {
             return undefined;
         }
         if (isCoreMessage(message.message)) {
@@ -1143,15 +1148,11 @@ export class SessionChatController {
         this.finishObservedSessionTurn();
     }
     syncSnapshotToolAndAgentUi(snapshot) {
-        this.view.reconcileToolUiSession(Object.keys(snapshot.tools));
-        for (const event of getToolUiEventsInModelOrder(snapshot)) {
-            this.view.handleToolUiEvent(event, "session");
-        }
-        for (const agent of Object.values(snapshot.agents)) {
-            for (const event of subagentUiEventsFromAgentRun(agent)) {
-                this.view.handleSubagentEvent(event);
-            }
-        }
+        this.view.reconcileToolUiSession(getToolUiModelsInModelOrder(snapshot));
+        this.view.reconcileSubagentUiSession(Object.values(snapshot.agents).map((agent) => ({
+            state: structuredClone(agent),
+            activity: getSubagentActivity(snapshot, agent.id),
+        })));
     }
     collectAssistantMessages(snapshot) {
         const messages = [];
@@ -1425,37 +1426,6 @@ export class SessionChatController {
             this.refreshStatus();
         }
     }
-    async pruneSession(strategy, extraText) {
-        if (this.isSessionOperationActive()) {
-            this.view.addSystemMessage("cannot prune while a session turn is running", "warn");
-            return;
-        }
-        const extra = extraText?.trim() ?? "";
-        const parsed = strategy === "smart"
-            ? parseSessionPruneFractionAndGuidance(extra)
-            : { fraction: parseSessionPruneFraction(extra) };
-        if (parsed.fraction === null) {
-            this.view.addSystemMessage("invalid prune fraction. use a number between 0 and 1.", "error");
-            return;
-        }
-        if (strategy === "smart" && parsed.fraction !== 0) {
-            this.view.addSystemMessage("sampling prune candidates...", "success");
-        }
-        try {
-            const result = await this.session.pruneToolResults(strategy, {
-                fraction: parsed.fraction,
-                ...("guidance" in parsed && parsed.guidance !== undefined
-                    ? { guidance: parsed.guidance }
-                    : {}),
-            });
-            this.syncRenderedHistory(result.snapshot);
-            this.refreshStatus();
-            this.view.addSystemMessage(result.message, result.noop ? "warn" : "success");
-        }
-        catch (error) {
-            this.view.addSystemMessage(`prune failed: ${error.message}`, "error");
-        }
-    }
     async speakLastAssistantMessage() {
         if (this.speakTask) {
             this.view.addSystemMessage("speech playback already in progress", "warn");
@@ -1870,21 +1840,21 @@ export class SessionChatController {
             this.view.addSystemMessage("rewind failed.", "error");
         }
     }
-    terminateSelectedSubagent() {
+    interruptSelectedSubagent() {
         const selectedId = this.view.getSelectedSubagentId();
         if (!selectedId) {
             this.view.addSystemMessage("no active subagent selected", "warn");
             return;
         }
         void this.session
-            .terminateSubagent(selectedId)
+            .interruptSubagent(selectedId)
             .then((result) => {
             if (!result.found) {
                 this.view.addSystemMessage(`unknown subagent id: ${selectedId}`, "warn");
             }
         })
             .catch((err) => {
-            this.view.addSystemMessage(`failed to terminate subagent: ${err.message}`, "error");
+            this.view.addSystemMessage(`failed to interrupt subagent: ${err.message}`, "error");
         });
     }
     async stashEditorToClipboard() {
@@ -1922,11 +1892,6 @@ function getTimelineMessages(snapshot) {
 function isMessageInTimeline(snapshot, messageId) {
     return snapshot.timeline.some((item) => item.type === "message" && item.messageId === messageId);
 }
-function hasToolUiFacetForToolCall(snapshot, toolCallId) {
-    return Object.values(snapshot.facets).some((facet) => facet.kind === "tau.tool-ui-events" &&
-        facet.subject.type === "tool" &&
-        facet.subject.id === toolCallId);
-}
 function assistantPartialFromProtocolMessage(message) {
     if (message.message.role !== "assistant") {
         return { text: "", thinking: "" };
@@ -2017,30 +1982,54 @@ function isToolUiEvent(value) {
         "toolCallId" in value &&
         typeof value.toolCallId === "string");
 }
-function getToolUiEventsInModelOrder(snapshot) {
+function getToolUiModelsInModelOrder(snapshot) {
     const facetsByToolId = new Map();
     for (const facet of Object.values(snapshot.facets)) {
         if (facet.kind === "tau.tool-ui-events" && facet.subject.type === "tool") {
             facetsByToolId.set(facet.subject.id, facet);
         }
     }
-    const events = [];
-    const emittedFacetIds = new Set();
-    for (const toolId of getToolIdsInModelOrder(snapshot)) {
-        const facet = facetsByToolId.get(toolId);
-        if (!facet) {
-            continue;
-        }
-        emittedFacetIds.add(facet.id);
-        events.push(...toolUiEventsFromFacet(facet));
-    }
-    for (const facet of Object.values(snapshot.facets)) {
-        if (emittedFacetIds.has(facet.id)) {
-            continue;
-        }
-        events.push(...toolUiEventsFromFacet(facet));
+    const messagesById = new Map(snapshot.messages.map((message) => [message.id, message]));
+    return getToolIdsInModelOrder(snapshot).map((toolId) => {
+        const tool = snapshot.tools[toolId];
+        const activities = toolUiEventsFromFacet(facetsByToolId.get(toolId));
+        const activity = activities.at(-1);
+        const resultMessage = tool.status === "streaming" ? undefined : messagesById.get(tool.resultMessageId ?? "");
+        const resultMessageText = resultMessage?.message.role === "toolResult"
+            ? resultMessage.message.content
+                .flatMap((content) => (content.type === "text" ? [content.text] : []))
+                .join("\n")
+            : undefined;
+        const resultText = resultMessageText || (tool.status === "streaming" ? undefined : (tool.error ?? tool.summary));
+        const activityCode = activity && "code" in activity ? activity.code : undefined;
+        const code = activityCode ?? getToolCallCode(tool, messagesById);
+        return {
+            toolCallId: tool.toolCallId,
+            toolName: tool.toolName,
+            status: tool.status,
+            headerTarget: activity?.headerTarget ?? tool.toolName,
+            ...(code !== undefined ? { code } : {}),
+            ...(activity ? { activity } : {}),
+            ...(resultText ? { resultText } : {}),
+        };
+    });
+}
+function getToolCallCode(tool, messagesById) {
+    if (tool.status === "streaming")
+        return undefined;
+    const message = messagesById.get(tool.call.messageId);
+    if (message?.message.role !== "assistant")
+        return undefined;
+    const content = message.message.content[tool.call.contentIndex];
+    if (content?.type !== "toolCall" ||
+        content.id !== tool.toolCallId ||
+        typeof content.arguments !== "object" ||
+        content.arguments === null ||
+        !("code" in content.arguments) ||
+        typeof content.arguments.code !== "string") {
+        return undefined;
     }
-    return events;
+    return content.arguments.code;
 }
 function getToolIdsInModelOrder(snapshot) {
     const messageOrder = new Map(snapshot.messages.map((message, index) => [message.id, index]));
@@ -2061,25 +2050,19 @@ function toolUiEventsFromFacet(facet) {
     }
     return facet.data.events.filter(isToolUiEvent);
 }
-function canAppendToolUiEvents(events, previousEvents) {
-    if (previousEvents.length > events.length) {
-        return false;
-    }
-    if (previousEvents.length === 0) {
-        return true;
-    }
-    return previousEvents.every((event, index) => JSON.stringify(event) === JSON.stringify(events[index]));
+function getSubagentActivity(snapshot, agentId) {
+    const facet = Object.values(snapshot.facets).find((candidate) => candidate.kind === SUBAGENT_ACTIVITY_FACET_KIND &&
+        candidate.subject.type === "agent" &&
+        candidate.subject.id === agentId);
+    return typeof facet?.data.text === "string" ? facet.data.text : undefined;
 }
-function subagentUiEventsFromAgentRun(agent) {
-    const state = subagentStateFromAgentRun(agent);
-    const events = [{ type: "subagent_spawned", state }];
-    if (agent.progress !== undefined) {
-        events.push(subagentProgressEventFromAgentRun(agent));
-    }
-    if (agent.abortRequested) {
-        events.push({ type: "subagent_abort_requested", id: agent.id });
+function subagentUiEventsFromAgentRun(agent, startedType = "subagent_spawned") {
+    const state = structuredClone(agent);
+    const events = [{ type: startedType, state }];
+    if (agent.run.interruptRequested) {
+        events.push({ type: "subagent_interrupt_requested", state });
     }
-    if (agent.status !== "running") {
+    if (agent.run.status !== "running") {
         events.push({ type: "subagent_finished", state });
     }
     return events;
@@ -2088,64 +2071,25 @@ function subagentUiEventsForAgentDelta(previous, next) {
     if (!previous) {
         return subagentUiEventsFromAgentRun(next);
     }
+    if (previous.run.revision !== next.run.revision) {
+        return subagentUiEventsFromAgentRun(next, "subagent_run_started");
+    }
+    const state = structuredClone(next);
     const events = [];
-    if (!previous.abortRequested && next.abortRequested) {
-        events.push({ type: "subagent_abort_requested", id: next.id });
+    if (!previous.run.interruptRequested && next.run.interruptRequested) {
+        events.push({ type: "subagent_interrupt_requested", state });
     }
-    if (next.status !== "running") {
-        events.push({
-            type: "subagent_finished",
-            state: subagentStateFromAgentRun(next),
-        });
+    if (previous.run.status === "running" && next.run.status !== "running") {
+        events.push({ type: "subagent_finished", state });
         return events;
     }
-    if (agentProgressChanged(previous, next)) {
-        events.push(subagentProgressEventFromAgentRun(next));
+    if (agentStateChanged(previous, next)) {
+        events.push({ type: "subagent_updated", state });
     }
     return events;
 }
-function subagentStateFromAgentRun(agent) {
-    const status = agent.status === "succeeded"
-        ? "success"
-        : agent.status === "failed"
-            ? "error"
-            : agent.status === "cancelled"
-                ? "aborted"
-                : "running";
-    const state = {
-        id: agent.id,
-        name: agent.name,
-        title: agent.title,
-        status,
-        ...(agent.modelLabel !== undefined ? { modelLabel: agent.modelLabel } : {}),
-        costTotal: agent.costTotal,
-        turns: agent.turns,
-        toolCalls: agent.toolCalls,
-        usage: { ...agent.usage },
-        startedAt: agent.startedAt,
-        ...(agent.finishedAt !== undefined ? { finishedAt: agent.finishedAt } : {}),
-        abortRequested: agent.abortRequested,
-        ...(agent.error !== undefined ? { error: agent.error } : {}),
-        ...(agent.finalText !== undefined ? { finalText: agent.finalText } : {}),
-    };
-    return state;
-}
-function subagentProgressEventFromAgentRun(agent) {
-    return {
-        type: "subagent_progress",
-        id: agent.id,
-        text: agent.progress ?? "",
-        costTotal: agent.costTotal,
-        turns: agent.turns,
-        toolCalls: agent.toolCalls,
-        usage: { ...agent.usage },
-    };
-}
-function agentProgressChanged(previous, next) {
-    return (previous.progress !== next.progress ||
-        previous.costTotal !== next.costTotal ||
-        previous.turns !== next.turns ||
-        previous.toolCalls !== next.toolCalls ||
+function agentStateChanged(previous, next) {
+    return (previous.costTotal !== next.costTotal ||
         previous.usage.input !== next.usage.input ||
         previous.usage.output !== next.usage.output ||
         previous.usage.cacheRead !== next.usage.cacheRead ||