History

refactor(server): use idiomatic Effect for OpenCode SDK errors

Cursor Agent committed 4 months ago

Commit 654d5521 parent 8b546984 files · +126 −132Browse files

Showing the changes to apps/server/src/textGeneration/OpenCodeTextGeneration.ts (1 of 4 files). Show all

Unified · Split

apps/server/src/textGeneration/OpenCodeTextGeneration.ts+32−28
@@ -389,19 +389,21 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration" · 388 unmodified lines
389389 ? { serverPassword: openCodeSettings.serverPassword }
390390 : {}),
391391 });
392− const session = yield* Effect.tryPromise({
393− try: () =>
394− client.session.create({
395− title: `T3 Code ${input.operation}`,
396− permission: [{ permission: "*", pattern: "*", action: "deny" }],
397− }),
398− catch: (cause) =>
399− new OpenCodeTextGenerationSessionRequestError({
400− operation: input.operation,
401− cwd: input.cwd,
402− cause,
403− }),
404− });
392+ const session = yield* OpenCodeRuntime.runOpenCodeSdk("session.create", () =>
393+ client.session.create({
394+ title: `T3 Code ${input.operation}`,
395+ permission: [{ permission: "*", pattern: "*", action: "deny" }],
396+ }),
397+ ).pipe(
398+ Effect.mapError(
399+ (cause) =>
400+ new OpenCodeTextGenerationSessionRequestError({
401+ operation: input.operation,
402+ cwd: input.cwd,
403+ cause: cause.cause,
404+ }),
405+ ),
406+ );
405407 if (!session.data) {
406408 return yield* new OpenCodeTextGenerationSessionPayloadError({
407409 operation: input.operation,
@@ -418,21 +420,23 @@ export const makeOpenCodeTextGeneration = Effect.fn("makeOpenCodeTextGeneration" · 10 unmodified lines
418420 modelId: parsedModel.modelID,
419421 };
420422
421− const result = yield* Effect.tryPromise({
422− try: () =>
423− client.session.prompt({
424− sessionID: session.data.id,
425− model: parsedModel,
426− ...(selectedAgent ? { agent: selectedAgent } : {}),
427− ...(selectedVariant ? { variant: selectedVariant } : {}),
428− parts: [{ type: "text", text: input.prompt }, ...fileParts],
429− }),
430− catch: (cause) =>
431− new OpenCodeTextGenerationPromptRequestError({
432− ...promptContext,
433− cause,
434− }),
435− });
423+ const result = yield* OpenCodeRuntime.runOpenCodeSdk("session.prompt", () =>
424+ client.session.prompt({
425+ sessionID: session.data.id,
426+ model: parsedModel,
427+ ...(selectedAgent ? { agent: selectedAgent } : {}),
428+ ...(selectedVariant ? { variant: selectedVariant } : {}),
429+ parts: [{ type: "text", text: input.prompt }, ...fileParts],
430+ }),
431+ ).pipe(
432+ Effect.mapError(
433+ (cause) =>
434+ new OpenCodeTextGenerationPromptRequestError({
435+ ...promptContext,
436+ cause: cause.cause,
437+ }),
438+ ),
439+ );
436440 const promptFailure = getOpenCodePromptFailure(result.data?.info?.error);
437441 if (promptFailure) {
438442 return yield* new OpenCodeTextGenerationPromptResponseError({

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t