Skip to content

Commit fdcf914

Browse files
committed
fix(server): preserve mixed ACP protocol diagnostics
1 parent 69871e7 commit fdcf914

2 files changed

Lines changed: 125 additions & 20 deletions

File tree

‎apps/server/src/provider/acp/AcpNativeLogging.test.ts‎

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,10 @@ nodeServicesIt("ACP native logging", (it) => {
117117
yield* protocolLogger({
118118
direction: "incoming",
119119
stage: "raw",
120-
payload: encodeUnknownJson({
120+
payload: `${encodeUnknownJson({
121121
method: "session/update",
122122
params: { update: { sessionUpdate: updateType } },
123-
}),
123+
})}\n`,
124124
});
125125
yield* protocolLogger({
126126
direction: "incoming",
@@ -152,6 +152,90 @@ nodeServicesIt("ACP native logging", (it) => {
152152
}),
153153
);
154154

155+
it.effect("keeps mixed and incomplete raw diagnostics", () =>
156+
Effect.gen(function* () {
157+
const records: Array<unknown> = [];
158+
const makeLogger = yield* makeAcpNativeLoggerFactory();
159+
const logger = makeLogger({
160+
nativeEventLogger: {
161+
filePath: "/tmp/provider-native.ndjson",
162+
write: (event) => Effect.sync(() => void records.push(event)),
163+
close: () => Effect.void,
164+
},
165+
provider: ProviderDriverKind.make("cursor"),
166+
threadId: ThreadId.make("thread-1"),
167+
verboseProtocolLogging: true,
168+
});
169+
const protocolLogger = logger.protocolLogging?.logger;
170+
assert.exists(protocolLogger);
171+
if (!protocolLogger) return;
172+
173+
const transient = encodeUnknownJson({
174+
method: "session/update",
175+
params: { update: { sessionUpdate: "agent_message_chunk" } },
176+
});
177+
const lifecycle = encodeUnknownJson({ method: "session/new", params: {} });
178+
179+
yield* protocolLogger({
180+
direction: "incoming",
181+
stage: "raw",
182+
payload: `${transient}\n${lifecycle}\n`,
183+
});
184+
yield* protocolLogger({
185+
direction: "incoming",
186+
stage: "raw",
187+
payload: transient,
188+
});
189+
yield* protocolLogger({
190+
direction: "incoming",
191+
stage: "raw",
192+
payload: `${transient}\n{malformed}\n`,
193+
});
194+
195+
assert.lengthOf(records, 3);
196+
}),
197+
);
198+
199+
it.effect("filters transient entries from mixed decoded batches", () =>
200+
Effect.gen(function* () {
201+
const records: Array<unknown> = [];
202+
const makeLogger = yield* makeAcpNativeLoggerFactory();
203+
const logger = makeLogger({
204+
nativeEventLogger: {
205+
filePath: "/tmp/provider-native.ndjson",
206+
write: (event) => Effect.sync(() => void records.push(event)),
207+
close: () => Effect.void,
208+
},
209+
provider: ProviderDriverKind.make("grok"),
210+
threadId: ThreadId.make("thread-1"),
211+
verboseProtocolLogging: true,
212+
});
213+
const protocolLogger = logger.protocolLogging?.logger;
214+
assert.exists(protocolLogger);
215+
if (!protocolLogger) return;
216+
217+
yield* protocolLogger({
218+
direction: "incoming",
219+
stage: "decoded",
220+
payload: [
221+
{
222+
_tag: "Request",
223+
tag: "session/update",
224+
payload: { update: { sessionUpdate: "agent_thought_chunk" } },
225+
},
226+
{
227+
_tag: "Request",
228+
tag: "session/new",
229+
payload: {},
230+
},
231+
],
232+
});
233+
234+
assert.lengthOf(records, 1);
235+
assert.include(encodeUnknownJson(records), '"itemCount":1');
236+
}),
237+
);
238+
155239
it.effect("logs a structural tag when the native writer defects", () => {
156240
const messages: Array<unknown> = [];
157241
const logCapture = Logger.make<unknown, void>(({ message }) => {

‎apps/server/src/provider/acp/AcpNativeLogging.ts‎

Lines changed: 39 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,41 @@ function isTransientProtocolMessage(message: unknown): boolean {
7979
return typeof updateType === "string" && transientProtocolUpdates.has(updateType);
8080
}
8181

82-
function isTransientProtocolLog(event: EffectAcpProtocol.AcpProtocolLogEvent): boolean {
83-
if (event.direction !== "incoming") return false;
84-
85-
const payload = event.payload;
86-
if (event.stage === "raw" && typeof payload === "string") {
87-
return (
88-
payload.includes('"session/update"') &&
89-
(payload.includes('"agent_message_chunk"') || payload.includes('"agent_thought_chunk"'))
90-
);
91-
}
82+
function rawChunkContainsOnlyTransientMessages(payload: string): boolean {
83+
const lines = payload.split("\n");
84+
const remainder = lines.pop() ?? "";
85+
if (remainder.trim().length > 0) return false;
9286

93-
if (event.stage !== "decoded") return false;
94-
const messages = Array.isArray(payload) ? payload : [payload];
87+
const messages: Array<unknown> = [];
88+
for (const line of lines) {
89+
if (line.trim().length === 0) continue;
90+
try {
91+
messages.push(JSON.parse(line));
92+
} catch {
93+
return false;
94+
}
95+
}
9596
return messages.length > 0 && messages.every(isTransientProtocolMessage);
9697
}
9798

99+
function filterTransientProtocolLog(
100+
event: EffectAcpProtocol.AcpProtocolLogEvent,
101+
): EffectAcpProtocol.AcpProtocolLogEvent | undefined {
102+
if (event.direction !== "incoming") return event;
103+
104+
if (event.stage === "raw" && typeof event.payload === "string") {
105+
return rawChunkContainsOnlyTransientMessages(event.payload) ? undefined : event;
106+
}
107+
108+
if (event.stage !== "decoded") return event;
109+
if (!Array.isArray(event.payload)) {
110+
return isTransientProtocolMessage(event.payload) ? undefined : event;
111+
}
112+
113+
const payload = event.payload.filter((message) => !isTransientProtocolMessage(message));
114+
return payload.length === 0 ? undefined : { ...event, payload };
115+
}
116+
98117
export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory")(function* () {
99118
const crypto = yield* Crypto.Crypto;
100119
return (input: {
@@ -148,13 +167,15 @@ export const makeAcpNativeLoggerFactory = Effect.fn("makeAcpNativeLoggerFactory"
148167
protocolLogging: {
149168
logIncoming: true,
150169
logOutgoing: true,
151-
logger: (event: EffectAcpProtocol.AcpProtocolLogEvent) =>
152-
isTransientProtocolLog(event)
153-
? Effect.void
154-
: writeNativeAcpLog({
170+
logger: (event: EffectAcpProtocol.AcpProtocolLogEvent) => {
171+
const filtered = filterTransientProtocolLog(event);
172+
return filtered
173+
? writeNativeAcpLog({
155174
kind: "protocol",
156-
payload: formatProtocolLogPayload(event),
157-
}),
175+
payload: formatProtocolLogPayload(filtered),
176+
})
177+
: Effect.void;
178+
},
158179
} satisfies NonNullable<AcpSessionRuntime.AcpSessionRuntimeOptions["protocolLogging"]>,
159180
}
160181
: {}),

0 commit comments

Comments
 (0)