fix(chat): le transcript s'affiche à nouveau après redémarrage automatique d'un agent — #295 (app-tauri ChatBridge: cartes successors/owners, rebind_session déplace sink+scrolloback du logical chat vers la session de remplacement et canonical_session résout les écritures avec l'ancien id sur toutes les opérations register/scrollback/detach/send_output; backend stream: ReplayOutputBridge::rekey prépare le scrollback source devant le destination et invalide les générations pré-rekey des deux pumps; commands: agent_send binde l'owner stable (projectId,agentId) au tour humain et rebind avant le flux de continuation au handoff restart; reattach_agent_chat résout le successeur du bridge puis fallback identité stable projectId/agentId explicite ou owner bindé, renvoie sessionId effectif + conversationId, NOT_FOUND sinon; web-server chat.attach même fallback stale→live par project/agent; DTO ReattachChatDto/ReattachResultDto documentent l'id effectif post-restart; frontend: ReattachAgentChatOptions, conversationId dans ChatAttachedPayload, CustomAgentChatView réattache sur agentRestartCompleted (dédupe par restartId, scrollback appliqué, tours restart préservés), retry identité stable sur NOT_FOUND dans openOrAttach avant fallback launch frais, publication sessionId effectif + conversationId, état vide «Conversation liée» quand une conversation/run/workstate lié existe; QA verte reconfirmée par Git: git diff --check, cargo fmt --all --check, app-tauri chat_bridge 34/34 dont 3 nouveaux restart_rebind + dto_chat 24/24, cargo check -p app-tauri, backend 91+7 ignored permissions socket, web-server websocket_chat_attach 3/3, npm test 77/77 CustomAgentChatView+agentGateway, npm run build; réserves non bloquantes: warnings Vite esbuild/oxc et chunk >500kB connus)
This commit is contained in:
@ -1015,6 +1015,7 @@ export function CustomAgentChatView({
|
||||
const mountedRef = useRef(false);
|
||||
const openOrAttachCountRef = useRef(0);
|
||||
const selfEmittedSessionIdRef = useRef<string | null | undefined>(undefined);
|
||||
const reconciledRestartIdsRef = useRef(new Set<string>());
|
||||
const onSessionIdRef = useRef(onSessionId);
|
||||
onSessionIdRef.current = onSessionId;
|
||||
const onConversationIdRef = useRef(onConversationId);
|
||||
@ -1543,7 +1544,14 @@ export function CustomAgentChatView({
|
||||
}, []);
|
||||
|
||||
const reattachStructuredSession = useCallback(
|
||||
async (sid: string, options: { applyScrollback?: boolean } = {}) => {
|
||||
async (
|
||||
sid: string,
|
||||
options: {
|
||||
applyScrollback?: boolean;
|
||||
stableIdentity?: boolean;
|
||||
preserveRestartTurns?: boolean;
|
||||
} = {},
|
||||
) => {
|
||||
if (!agent.reattachAgentChat) throw new Error("Structured reattach unavailable");
|
||||
console.debug("[ticket149] reattachStructuredSession:start", {
|
||||
timestamp: new Date().toISOString(),
|
||||
@ -1552,7 +1560,9 @@ export function CustomAgentChatView({
|
||||
});
|
||||
let reattached: Awaited<ReturnType<NonNullable<typeof agent.reattachAgentChat>>>;
|
||||
try {
|
||||
reattached = await agent.reattachAgentChat(sid, receive);
|
||||
reattached = options.stableIdentity
|
||||
? await agent.reattachAgentChat(sid, receive, { projectId, agentId })
|
||||
: await agent.reattachAgentChat(sid, receive);
|
||||
} catch (e) {
|
||||
console.error("[ticket149] reattachStructuredSession:error", {
|
||||
timestamp: new Date().toISOString(),
|
||||
@ -1569,20 +1579,62 @@ export function CustomAgentChatView({
|
||||
});
|
||||
if (!mountedRef.current) return reattached.sessionId;
|
||||
setCurrentSession(reattached.sessionId);
|
||||
if (reattached.sessionId !== sid) {
|
||||
publishSessionId(reattached.sessionId);
|
||||
}
|
||||
if (reattached.conversationId) {
|
||||
onConversationIdRef.current(reattached.conversationId);
|
||||
}
|
||||
if (options.applyScrollback) {
|
||||
scrollbackChunkCountRef.current = reattached.scrollback.length;
|
||||
const replayed = reattached.scrollback.reduce(
|
||||
let replayed = reattached.scrollback.reduce(
|
||||
(state, chunk) => foldChunk(state, chunk),
|
||||
emptyChatViewState(),
|
||||
);
|
||||
if (options.preserveRestartTurns) {
|
||||
const restartTurns = turnsRef.current.filter((turn) => turn.role === "restart");
|
||||
if (restartTurns.length > 0) {
|
||||
replayed = { ...replayed, turns: [...replayed.turns, ...restartTurns] };
|
||||
}
|
||||
}
|
||||
applyChatViewState(replayed);
|
||||
setBusy(turnsIndicateBusy(replayed));
|
||||
}
|
||||
return reattached.sessionId;
|
||||
},
|
||||
[agent, applyChatViewState, receive],
|
||||
[agent, agentId, applyChatViewState, projectId, publishSessionId, receive],
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
const completed = [...restartEvents]
|
||||
.reverse()
|
||||
.find((event) => event.type === "agentRestartCompleted");
|
||||
if (!completed || reconciledRestartIdsRef.current.has(completed.restartId)) return;
|
||||
const sid = sessionRef.current ?? externalSessionId;
|
||||
if (!sid) return;
|
||||
|
||||
reconciledRestartIdsRef.current.add(completed.restartId);
|
||||
let cancelled = false;
|
||||
setOpening(true);
|
||||
setError(null);
|
||||
void reattachStructuredSession(sid, {
|
||||
applyScrollback: true,
|
||||
stableIdentity: true,
|
||||
preserveRestartTurns: true,
|
||||
})
|
||||
.catch((e) => {
|
||||
if (!cancelled) {
|
||||
setError({ message: describeOpenFailure(e), openFailure: true });
|
||||
}
|
||||
})
|
||||
.finally(() => {
|
||||
if (!cancelled) setOpening(false);
|
||||
});
|
||||
return () => {
|
||||
cancelled = true;
|
||||
};
|
||||
}, [externalSessionId, reattachStructuredSession, restartEvents]);
|
||||
|
||||
const recoverStructuredSession = useCallback(
|
||||
async (
|
||||
options: {
|
||||
@ -1749,6 +1801,23 @@ export function CustomAgentChatView({
|
||||
// the session is gone (closed/never live) and the caller falls back
|
||||
// to a fresh launch — any other error still surfaces to the user.
|
||||
if (!isNotFound(e)) throw e;
|
||||
try {
|
||||
const replacementSessionId = await reattachStructuredSession(externalSessionId, {
|
||||
applyScrollback: true,
|
||||
stableIdentity: true,
|
||||
});
|
||||
if (cancelled) return;
|
||||
publishSessionId(replacementSessionId);
|
||||
console.debug("[ticket295] openOrAttach:stable-reattach:success", {
|
||||
timestamp: new Date().toISOString(),
|
||||
execution,
|
||||
requestedSessionId: externalSessionId,
|
||||
replacementSessionId,
|
||||
});
|
||||
return;
|
||||
} catch (stableError) {
|
||||
if (!isNotFound(stableError)) throw stableError;
|
||||
}
|
||||
if (!cancelled) {
|
||||
setCurrentSession(null);
|
||||
publishSessionId(null);
|
||||
@ -1834,6 +1903,12 @@ export function CustomAgentChatView({
|
||||
!opening,
|
||||
[supported, draft, attachments.length, effectiveBusy, opening],
|
||||
);
|
||||
const hasLinkedConversation = Boolean(
|
||||
conversationId ||
|
||||
requesterDelegation.currentAgentBusy ||
|
||||
restart ||
|
||||
delegationActive,
|
||||
);
|
||||
|
||||
async function openProfileDialog() {
|
||||
const availableProfiles = (await profileGateway.listProfiles()).filter((candidate) =>
|
||||
@ -2412,6 +2487,10 @@ export function CustomAgentChatView({
|
||||
{externalSessionId ? "Reprise en cours..." : "Ouverture de la session structurée…"}
|
||||
</span>
|
||||
</div>
|
||||
) : displayTurns.length === 0 && hasLinkedConversation ? (
|
||||
<p className="m-auto text-xs text-muted">
|
||||
Conversation liée — récupération du transcript en cours.
|
||||
</p>
|
||||
) : displayTurns.length === 0 ? (
|
||||
<p className="m-auto text-xs text-muted">
|
||||
Envoyez un message pour démarrer la conversation structurée.
|
||||
|
||||
Reference in New Issue
Block a user