Skip to content

Commit c6a0ac0

Browse files
committed
Overlay branch overlay/opencode-textgen on top of origin/main via Merge
• b640049a6 Overlay branch overlay/opencode-textgen on top of origin/main via Merge |\ | • d5e383b fix(textGeneration): delete opencode helper sessions after one-shot calls |/ • de37964 feat(prs): navigate, merge and rebase GitHub stacks (pingdotgg#10875) • f0401c6 feat(search): find threads by linked pull request (pingdotgg#10870) • afb8489 feat(pull-requests): link multiple pull requests to threads (pingdotgg#10839) • 383cc40 fix(mobile): prevent text leaking through Android glass (pingdotgg#10998) • 75e4ceb fix(mobile): prevent Android chat rows overlapping during sync (pingdotgg#10983) • 50f918c fix(web): allow expanding duplicate tool call commands (pingdotgg#10981)
2 parents de37964 + d5e383b commit c6a0ac0

2 files changed

Lines changed: 98 additions & 33 deletions

File tree

‎apps/server/src/textGeneration/OpenCodeTextGeneration.test.ts‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ const runtimeMock = {
2323
authHeaders: [] as Array<string | null>,
2424
closeCalls: [] as string[],
2525
sessionCreateCalls: 0,
26+
sessionDeleteCalls: [] as string[],
2627
connectionError: undefined as Error | undefined,
2728
sessionCreateError: undefined as unknown,
2829
sessionResult: undefined as { data?: { id: string } } | undefined,
@@ -38,6 +39,7 @@ const runtimeMock = {
3839
this.state.authHeaders.length = 0;
3940
this.state.closeCalls.length = 0;
4041
this.state.sessionCreateCalls = 0;
42+
this.state.sessionDeleteCalls.length = 0;
4143
this.state.connectionError = undefined;
4244
this.state.sessionCreateError = undefined;
4345
this.state.sessionResult = undefined;
@@ -126,6 +128,10 @@ const OpenCodeRuntimeTestDouble: OpenCodeRuntime.OpenCodeRuntimeShape = {
126128
}
127129
);
128130
},
131+
delete: async (input: { readonly sessionID: string }) => {
132+
runtimeMock.state.sessionDeleteCalls.push(input.sessionID);
133+
return { data: true };
134+
},
129135
},
130136
}) as unknown as ReturnType<OpenCodeRuntime.OpenCodeRuntimeShape["createOpenCodeSdkClient"]>,
131137
loadOpenCodeInventory: () =>
@@ -235,6 +241,47 @@ const advanceIdleClock = Effect.gen(function* () {
235241
});
236242

237243
it.layer(OpenCodeTextGenerationTestLayer)("OpenCodeTextGeneration", (it) => {
244+
it.effect("deletes the helper session after a successful title generation", () =>
245+
withOpenCodeTextGeneration(DEFAULT_OPENCODE_SETTINGS, (textGeneration) =>
246+
Effect.gen(function* () {
247+
runtimeMock.state.sessionResult = { data: { id: "ses_helper_1" } };
248+
runtimeMock.state.promptResult = {
249+
data: {
250+
parts: [{ type: "text", text: '{"title":"Review uploaded report"}' }],
251+
},
252+
};
253+
254+
const title = yield* textGeneration.generateThreadTitle({
255+
cwd: process.cwd(),
256+
message: "Review these attachments.",
257+
modelSelection: DEFAULT_TEST_MODEL_SELECTION,
258+
});
259+
260+
expect(title.title).toBe("Review uploaded report");
261+
expect(runtimeMock.state.sessionDeleteCalls).toEqual(["ses_helper_1"]);
262+
}),
263+
),
264+
);
265+
266+
it.effect("deletes the helper session when the prompt fails", () =>
267+
withOpenCodeTextGeneration(DEFAULT_OPENCODE_SETTINGS, (textGeneration) =>
268+
Effect.gen(function* () {
269+
runtimeMock.state.sessionResult = { data: { id: "ses_helper_2" } };
270+
runtimeMock.state.promptRequestError = new Error("provider exploded");
271+
272+
yield* textGeneration
273+
.generateThreadTitle({
274+
cwd: process.cwd(),
275+
message: "Review these attachments.",
276+
modelSelection: DEFAULT_TEST_MODEL_SELECTION,
277+
})
278+
.pipe(Effect.flip);
279+
280+
expect(runtimeMock.state.sessionDeleteCalls).toEqual(["ses_helper_2"]);
281+
}),
282+
),
283+
);
284+
238285
it.effect("excludes generic files from thread title generation", () =>
239286
withOpenCodeTextGeneration(DEFAULT_OPENCODE_SETTINGS, (textGeneration) =>
240287
Effect.gen(function* () {

‎apps/server/src/textGeneration/OpenCodeTextGeneration.ts‎

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -230,49 +230,67 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration"
230230
cwd: input.cwd,
231231
});
232232
}
233+
const sessionId = session.data.id;
233234
const selectedAgent = getModelSelectionStringOptionValue(input.modelSelection, "agent");
234235
const selectedVariant = getModelSelectionStringOptionValue(input.modelSelection, "variant");
235236
const promptContext = {
236237
operation: input.operation,
237238
cwd: input.cwd,
238-
sessionId: session.data.id,
239+
sessionId,
239240
providerId: parsedModel.providerID,
240241
modelId: parsedModel.modelID,
241242
};
242243

243-
const result = yield* Effect.tryPromise({
244-
try: () =>
245-
client.session.prompt({
246-
sessionID: session.data.id,
247-
model: parsedModel,
248-
...(selectedAgent ? { agent: selectedAgent } : {}),
249-
...(selectedVariant ? { variant: selectedVariant } : {}),
250-
parts: [{ type: "text", text: input.prompt }, ...fileParts],
251-
}),
252-
catch: (cause) =>
253-
new OpenCodeTextGenerationPromptRequestError({
254-
...promptContext,
255-
cause,
256-
}),
257-
});
258-
const promptFailure = getOpenCodePromptFailure(result.data?.info?.error);
259-
if (promptFailure) {
260-
return yield* new OpenCodeTextGenerationPromptResponseError({
261-
...promptContext,
262-
...(promptFailure.name ? { providerErrorName: promptFailure.name } : {}),
263-
providerMessage: promptFailure.message,
244+
// The helper session exists only to satisfy session.prompt; opencode
245+
// persists it in the user's session store, so delete it on every exit
246+
// path (prime's --no-session is the parity point).
247+
return yield* Effect.gen(function* () {
248+
const result = yield* Effect.tryPromise({
249+
try: () =>
250+
client.session.prompt({
251+
sessionID: sessionId,
252+
model: parsedModel,
253+
...(selectedAgent ? { agent: selectedAgent } : {}),
254+
...(selectedVariant ? { variant: selectedVariant } : {}),
255+
parts: [{ type: "text", text: input.prompt }, ...fileParts],
256+
}),
257+
catch: (cause) =>
258+
new OpenCodeTextGenerationPromptRequestError({
259+
...promptContext,
260+
cause,
261+
}),
264262
});
265-
}
266-
const responseParts = result.data?.parts ?? [];
267-
const rawText = getOpenCodeTextResponse(responseParts);
268-
if (rawText.length === 0) {
269-
return yield* new OpenCodeTextGenerationEmptyOutputError({
270-
...promptContext,
271-
responsePartCount: responseParts.length,
272-
textPartCount: responseParts.filter(isOpenCodeTextPart).length,
273-
});
274-
}
275-
return rawText;
263+
const promptFailure = getOpenCodePromptFailure(result.data?.info?.error);
264+
if (promptFailure) {
265+
return yield* new OpenCodeTextGenerationPromptResponseError({
266+
...promptContext,
267+
...(promptFailure.name ? { providerErrorName: promptFailure.name } : {}),
268+
providerMessage: promptFailure.message,
269+
});
270+
}
271+
const responseParts = result.data?.parts ?? [];
272+
const rawText = getOpenCodeTextResponse(responseParts);
273+
if (rawText.length === 0) {
274+
return yield* new OpenCodeTextGenerationEmptyOutputError({
275+
...promptContext,
276+
responsePartCount: responseParts.length,
277+
textPartCount: responseParts.filter(isOpenCodeTextPart).length,
278+
});
279+
}
280+
return rawText;
281+
}).pipe(
282+
Effect.ensuring(
283+
Effect.tryPromise({
284+
try: () => client.session.delete({ sessionID: sessionId }),
285+
catch: (cause) =>
286+
new OpenCodeTextGenerationSessionRequestError({
287+
operation: input.operation,
288+
cwd: input.cwd,
289+
cause,
290+
}),
291+
}).pipe(Effect.ignore),
292+
),
293+
);
276294
},
277295
Effect.catchTags({
278296
OpenCodeTextGenerationSessionRequestError: (cause) =>

0 commit comments

Comments
 (0)