feat(agent): conversation par paire + entrée médiée + pivot terminal/MCP
Coeur inter-agents consolidé et surface front réalignée sur la décision "terminal natif PTY, pas d'UI chat" (Option 1). Domaine - nouveaux modules conversation, mailbox, input, fileguard (ports + types) - orchestrator/profile/events étendus (conversation par paire, FIFO) Application / Infrastructure - orchestrator/service + context_guard : sérialisation FIFO par agent, garde RW mémoire/contexte, dispatch ask/reply - adapters in-memory conversation / mailbox / input / fileguard - registry session + lifecycle agent durcis (1 agent = 1 session vivante) - outils MCP idea_* alignés sur le nouveau dispatch Frontend - MediatedInput + useAgentBusy : entrée utilisateur médiée par IdeA, terminal = vue sortie inchangée - suppression de la vue chat structurée (AgentChatView) — abandonnée - adapter input + ports mis à jour Divers - .ideai/ : mémoire projet + briefs de cadrage versionnés ; requests/ runtime ignoré ; agents projet réels (DevBackend/DevFrontend/QA) Tests : Rust (domain/application/infrastructure/app-tauri) + front (346) verts. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@ -27,10 +27,8 @@ import type {
|
||||
MemoryIndexEntry,
|
||||
MemoryLink,
|
||||
MemoryType,
|
||||
CellKind,
|
||||
Project,
|
||||
ProfileAvailability,
|
||||
ReplyChunk,
|
||||
ResumableAgent,
|
||||
Skill,
|
||||
SkillScope,
|
||||
@ -47,6 +45,7 @@ import type {
|
||||
EmbedderGateway,
|
||||
CreateTemplateInput,
|
||||
Gateways,
|
||||
InputGateway,
|
||||
LiveAgent,
|
||||
MemoryGateway,
|
||||
GitGateway,
|
||||
@ -161,68 +160,6 @@ class MockPtySession {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* A live in-memory mock **chat** session (the structured-AI twin of
|
||||
* {@link MockPtySession}). It retains a conversation scrollback (every
|
||||
* {@link ReplyChunk} streamed) and tracks the current reply sink so a view can
|
||||
* detach (sink cleared, session stays alive) and later re-attach (new sink,
|
||||
* scrollback replayed by the caller). `sendPrompt` streams a scripted turn:
|
||||
* a couple of `textDelta`s, an optional `toolActivity`, then one `final`.
|
||||
*/
|
||||
class MockChatSession {
|
||||
/** Accumulated reply chunks (the conversation scrollback). */
|
||||
private scrollback: ReplyChunk[] = [];
|
||||
/** Current reply sink; `null` while detached. */
|
||||
private sink: ((chunk: ReplyChunk) => void) | null = null;
|
||||
/** Whether the session was explicitly closed (shut down). */
|
||||
closed = false;
|
||||
|
||||
constructor(readonly sessionId: string) {}
|
||||
|
||||
/** Records a chunk into the scrollback and forwards it to the current sink. */
|
||||
private emit(chunk: ReplyChunk): void {
|
||||
if (this.closed) return;
|
||||
this.scrollback.push(chunk);
|
||||
this.sink?.(chunk);
|
||||
}
|
||||
|
||||
/** Re-attaches a new reply sink, returning the retained scrollback to replay. */
|
||||
reattach(sink: (chunk: ReplyChunk) => void): ReplyChunk[] {
|
||||
this.sink = sink;
|
||||
return structuredClone(this.scrollback);
|
||||
}
|
||||
|
||||
/** Detaches the current view: stop delivering, keep the session alive. */
|
||||
detach(): void {
|
||||
this.sink = null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Streams a scripted reply turn for `prompt`: two text deltas, a tool-activity
|
||||
* badge, then the deterministic `final` carrying the aggregated content. Each
|
||||
* chunk is recorded into the scrollback (so a re-attach replays the whole
|
||||
* turn) and forwarded live to the current sink.
|
||||
*/
|
||||
send(prompt: string, onReply: (chunk: ReplyChunk) => void): void {
|
||||
if (this.closed) return;
|
||||
this.sink = onReply;
|
||||
const content = `echo: ${prompt}`;
|
||||
const half = Math.ceil(content.length / 2);
|
||||
queueMicrotask(() => {
|
||||
this.emit({ kind: "textDelta", text: content.slice(0, half) });
|
||||
this.emit({ kind: "toolActivity", label: "thinking" });
|
||||
this.emit({ kind: "textDelta", text: content.slice(half) });
|
||||
this.emit({ kind: "final", content });
|
||||
});
|
||||
}
|
||||
|
||||
/** Shuts the session down (idempotent). */
|
||||
shutdown(): void {
|
||||
this.closed = true;
|
||||
this.sink = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Stateful in-memory agent gateway — mirrors the backend `CreateAgentFromScratch`,
|
||||
* `ListAgents`, `ReadAgentContext`, `UpdateAgentContext`, `DeleteAgent`, and
|
||||
@ -249,19 +186,6 @@ export class MockAgentGateway implements AgentGateway {
|
||||
private liveByAgent = new Map<string, string>();
|
||||
/** Live PTY session id per agent (`agentId → sessionId`). */
|
||||
private liveSessionByAgent = new Map<string, string>();
|
||||
/** Live structured (chat) sessions, kept across detach so reattach finds them. */
|
||||
private chatSessions = new Map<string, MockChatSession>();
|
||||
/**
|
||||
* Agents that launch as a **chat** cell (`structured_adapter` present). Seeded
|
||||
* by tests via {@link _setChatAgents}; absent ⇒ the agent launches as a `pty`
|
||||
* cell (the historical default), so existing tests are unaffected.
|
||||
*/
|
||||
private chatAgents = new Set<string>();
|
||||
|
||||
/** Marks the given agents as structured (chat) cells for `launchAgent`. */
|
||||
_setChatAgents(agentIds: string[]): void {
|
||||
for (const id of agentIds) this.chatAgents.add(id);
|
||||
}
|
||||
|
||||
private getAgents(projectId: string): Agent[] {
|
||||
if (!this.agents.has(projectId)) this.agents.set(projectId, []);
|
||||
@ -450,7 +374,6 @@ export class MockAgentGateway implements AgentGateway {
|
||||
cwd: `/home/user/mock-project`,
|
||||
rows,
|
||||
cols,
|
||||
cellKind: this.chatAgents.has(agentId) ? "chat" : "pty",
|
||||
},
|
||||
};
|
||||
}
|
||||
@ -535,10 +458,9 @@ export class MockAgentGateway implements AgentGateway {
|
||||
this.sessionSeq += 1;
|
||||
const sessionId = `mock-agent-session-${this.sessionSeq}`;
|
||||
const cwd = options.cwd;
|
||||
const cellKind: CellKind = this.chatAgents.has(agentId) ? "chat" : "pty";
|
||||
|
||||
// Record liveness for `listLiveAgents` + the guard above (only when the
|
||||
// caller pins a node) — shared by both cell kinds.
|
||||
// caller pins a node).
|
||||
if (options.nodeId) {
|
||||
this.liveByAgent.set(agentId, options.nodeId);
|
||||
this.liveSessionByAgent.set(agentId, sessionId);
|
||||
@ -550,37 +472,19 @@ export class MockAgentGateway implements AgentGateway {
|
||||
}
|
||||
};
|
||||
|
||||
let handle: TerminalHandle;
|
||||
if (cellKind === "chat") {
|
||||
// Structured AI cell (§17.6): spawn a chat session (no PTY). The reply
|
||||
// stream is driven by `sendPrompt`; the returned handle is mostly inert
|
||||
// (no bytes), but its `close` shuts the structured session down.
|
||||
const chat = new MockChatSession(sessionId);
|
||||
this.chatSessions.set(sessionId, chat);
|
||||
handle = {
|
||||
...makeInertHandle(sessionId, () => {
|
||||
chat.shutdown();
|
||||
this.chatSessions.delete(sessionId);
|
||||
clearLive();
|
||||
}),
|
||||
cellKind,
|
||||
};
|
||||
} else {
|
||||
const enc = new TextEncoder();
|
||||
const session = new MockPtySession(sessionId, onData);
|
||||
this.sessions.set(sessionId, session);
|
||||
// Greet so something is visible immediately (mirrors MockTerminalGateway).
|
||||
queueMicrotask(() =>
|
||||
session.emit(enc.encode(`agent ${agentId} @ ${cwd}\r\n`)),
|
||||
);
|
||||
handle = {
|
||||
...makeMockHandle(session, () => {
|
||||
this.sessions.delete(sessionId);
|
||||
clearLive();
|
||||
}),
|
||||
cellKind,
|
||||
};
|
||||
}
|
||||
// Every agent cell is a raw PTY (Option 1 — Terminal + MCP). The former
|
||||
// structured "chat" cell routing is retired.
|
||||
const enc = new TextEncoder();
|
||||
const session = new MockPtySession(sessionId, onData);
|
||||
this.sessions.set(sessionId, session);
|
||||
// Greet so something is visible immediately (mirrors MockTerminalGateway).
|
||||
queueMicrotask(() =>
|
||||
session.emit(enc.encode(`agent ${agentId} @ ${cwd}\r\n`)),
|
||||
);
|
||||
const handle: TerminalHandle = makeMockHandle(session, () => {
|
||||
this.sessions.delete(sessionId);
|
||||
clearLive();
|
||||
});
|
||||
|
||||
// Simulate session assignment (T4b): a fresh cell (no conversation id) gets a
|
||||
// newly-minted id surfaced on the handle so the caller persists it; a cell
|
||||
@ -594,58 +498,6 @@ export class MockAgentGateway implements AgentGateway {
|
||||
return handle;
|
||||
}
|
||||
|
||||
async sendPrompt(
|
||||
sessionId: string,
|
||||
prompt: string,
|
||||
onReply: (chunk: ReplyChunk) => void,
|
||||
): Promise<void> {
|
||||
const session = this.chatSessions.get(sessionId);
|
||||
if (!session || session.closed) {
|
||||
const err: GatewayError = {
|
||||
code: "NOT_FOUND",
|
||||
message: `structured session ${sessionId} is not alive`,
|
||||
};
|
||||
throw err;
|
||||
}
|
||||
session.send(prompt, onReply);
|
||||
}
|
||||
|
||||
async reattachChat(
|
||||
sessionId: string,
|
||||
onReply: (chunk: ReplyChunk) => void,
|
||||
): Promise<ReplyChunk[]> {
|
||||
const session = this.chatSessions.get(sessionId);
|
||||
if (!session || session.closed) {
|
||||
const err: GatewayError = {
|
||||
code: "NOT_FOUND",
|
||||
message: `structured session ${sessionId} is not alive`,
|
||||
};
|
||||
throw err;
|
||||
}
|
||||
// Re-attach the reply sink and return the retained conversation scrollback —
|
||||
// no new turn is started here (mirrors the backend `reattach_agent_chat`).
|
||||
return session.reattach(onReply);
|
||||
}
|
||||
|
||||
async closeAgentSession(sessionId: string): Promise<void> {
|
||||
const session = this.chatSessions.get(sessionId);
|
||||
if (!session) {
|
||||
const err: GatewayError = {
|
||||
code: "NOT_FOUND",
|
||||
message: `structured session ${sessionId} is not alive`,
|
||||
};
|
||||
throw err;
|
||||
}
|
||||
session.shutdown();
|
||||
this.chatSessions.delete(sessionId);
|
||||
for (const [agentId, liveSessionId] of this.liveSessionByAgent) {
|
||||
if (liveSessionId === sessionId) {
|
||||
this.liveSessionByAgent.delete(agentId);
|
||||
this.liveByAgent.delete(agentId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async reattach(
|
||||
sessionId: string,
|
||||
onData: (bytes: Uint8Array) => void,
|
||||
@ -730,28 +582,6 @@ function makeMockHandle(
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Builds an inert {@link TerminalHandle} for a structured **chat** session: it
|
||||
* carries no PTY, so `write`/`resize` are no-ops and `detach` does nothing
|
||||
* (the chat view manages its own reply subscription). Only `close` is live —
|
||||
* it shuts the structured session down. The chat cell never feeds bytes through
|
||||
* this handle; it drives the session via `sendPrompt`/`reattachChat`.
|
||||
*/
|
||||
function makeInertHandle(
|
||||
sessionId: string,
|
||||
shutdown: () => void,
|
||||
): TerminalHandle {
|
||||
return {
|
||||
sessionId,
|
||||
async write(): Promise<void> {},
|
||||
async resize(): Promise<void> {},
|
||||
detach(): void {},
|
||||
async close(): Promise<void> {
|
||||
shutdown();
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* In-memory fake terminal: a shell-less PTY that **echoes** whatever is written
|
||||
* back to `onData` (so the xterm wrapper renders typed input) and greets on
|
||||
@ -1703,12 +1533,48 @@ export class MockEmbedderGateway implements EmbedderGateway {
|
||||
}
|
||||
}
|
||||
|
||||
/** One recorded mediated-input call (for test assertions). */
|
||||
export interface MockInputCall {
|
||||
projectId: string;
|
||||
agentId: string;
|
||||
/** Present for `submit`, absent for `interrupt`. */
|
||||
text?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
* In-memory {@link InputGateway} (lot F1). Records every `submit`/`interrupt`
|
||||
* so tests can assert the component routed through the port with the right
|
||||
* args — no backend. `submit` always resolves (the FIFO never refuses an
|
||||
* enqueue; the forward/fallback rule lives backend-side, §4.2/§6).
|
||||
*
|
||||
* Exported so tests can instantiate it directly (same pattern as the other mocks).
|
||||
*/
|
||||
export class MockInputGateway implements InputGateway {
|
||||
/** All recorded submit calls, in order. */
|
||||
readonly submits: MockInputCall[] = [];
|
||||
/** All recorded interrupt calls, in order. */
|
||||
readonly interrupts: MockInputCall[] = [];
|
||||
|
||||
async submit(
|
||||
projectId: string,
|
||||
agentId: string,
|
||||
text: string,
|
||||
): Promise<void> {
|
||||
this.submits.push({ projectId, agentId, text });
|
||||
}
|
||||
|
||||
async interrupt(projectId: string, agentId: string): Promise<void> {
|
||||
this.interrupts.push({ projectId, agentId });
|
||||
}
|
||||
}
|
||||
|
||||
/** Builds the full set of mock gateways. */
|
||||
export function createMockGateways(): Gateways {
|
||||
const agentGateway = new MockAgentGateway();
|
||||
return {
|
||||
system: new MockSystemGateway(),
|
||||
agent: agentGateway,
|
||||
input: new MockInputGateway(),
|
||||
terminal: new MockTerminalGateway(),
|
||||
project: new MockProjectGateway(),
|
||||
layout: new MockLayoutGateway(),
|
||||
|
||||
Reference in New Issue
Block a user