Merge branch 'vivace'
This commit is contained in:
+24
-3
@@ -453,6 +453,25 @@ export function createStructuredConnection(
|
||||
}
|
||||
}
|
||||
// pending at end of a turn = final text/approvals, stays outside (not flushed).
|
||||
|
||||
// While the turn is still active, keep the last intermediate text/thought
|
||||
// row outside the collapsed group so it's visible as the agent's current
|
||||
// narration. It gets absorbed on the next rebuild once newer content
|
||||
// arrives or the turn ends.
|
||||
const turnActive = state.turn.responding || state.turn.thinking;
|
||||
if (turnActive) {
|
||||
const lastGroup = groups.get(currentGid);
|
||||
if (lastGroup) {
|
||||
for (let i = lastGroup.rows.length - 1; i >= 0; i--) {
|
||||
const kind = lastGroup.rows[i].kind;
|
||||
if (kind === "agent_text" || kind === "agent_thought") {
|
||||
lastGroup.rows.splice(i, 1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return groups;
|
||||
}
|
||||
|
||||
@@ -741,15 +760,17 @@ export function createStructuredConnection(
|
||||
}
|
||||
|
||||
function applyState(next: ReducedState, connectionGeneration: number): void {
|
||||
const wasTurnActive = state.turn.responding || state.turn.thinking;
|
||||
state = next;
|
||||
stateSocketGeneration = connectionGeneration;
|
||||
reconcileAwaitingBegin();
|
||||
const isTurnActive = state.turn.responding || state.turn.thinking;
|
||||
const newPendingId = state.pending_approval ? lastRowIdOfKind("approval") : null;
|
||||
if (newPendingId !== pendingApprovalRowId) {
|
||||
const needsRebuild = newPendingId !== pendingApprovalRowId || wasTurnActive !== isTurnActive;
|
||||
if (needsRebuild) {
|
||||
updateTranscriptLayout(() => {
|
||||
const prev = pendingApprovalRowId;
|
||||
pendingApprovalRowId = newPendingId;
|
||||
if (prev !== null || newPendingId !== null) rebuildTranscript();
|
||||
rebuildTranscript();
|
||||
});
|
||||
}
|
||||
renderConfig();
|
||||
|
||||
Reference in New Issue
Block a user