Merge remote-tracking branch 'origin/codex/effect-lint-execution-engine' into codex/effect-lint-integration

Rhys Sullivan committed 6 months ago

Commit ed4a5d72 parents b9a25b4 253b0111 file · +14 −18Browse files

Unified · Split

packages/core/execution/src/engine.ts+14−18

-import { Deferred, Effect, Fiber, Ref } from "effect";
+import { Deferred, Effect, Fiber, Predicate, Ref } from "effect";
 import type * as Cause from "effect/Cause";
 import type {
 // Types
 // ---------------------------------------------------------------------------
-export type ExecutionEngineConfig<
+export type ExecutionEngineConfig<E extends Cause.YieldableError = CodeExecutionError> = {
-  E extends Cause.YieldableError = CodeExecutionError,
-> = {
   readonly executor: Executor;
   readonly codeExecutor: CodeExecutor<E>;
 };
 } => {
   const req = paused.elicitationContext.request;
   const lines: string[] = [`Execution paused: ${req.message}`];
+  const isUrlElicitation = Predicate.isTagged(req, "UrlElicitation");
+  const isFormElicitation = Predicate.isTagged(req, "FormElicitation");
-  if (req._tag === "UrlElicitation") {
+  if (isUrlElicitation) {
     lines.push(`\nOpen this URL in a browser:\n${req.url}`);
     lines.push("\nAfter the browser flow, resume with the executionId below:");
   } else {
       status: "waiting_for_interaction",
       executionId: paused.id,
       interaction: {
-        kind: req._tag === "UrlElicitation" ? "url" : "form",
+        kind: isUrlElicitation ? "url" : "form",
         message: req.message,
-        ...(req._tag === "UrlElicitation" ? { url: req.url } : {}),
+        ...(isUrlElicitation ? { url: req.url } : {}),
-        ...(req._tag === "FormElicitation" ? { requestedSchema: req.requestedSchema } : {}),
+        ...(isFormElicitation ? { requestedSchema: req.requestedSchema } : {}),
       },
     },
   };
         }
         const limit = readOptionalLimit(args.limit, "tools.search");
-        if (limit instanceof ExecutionToolError) {
+        if (Predicate.isTagged(limit, "ExecutionToolError")) {
           return Effect.fail(limit);
         }
         const offset = readOptionalOffset(args.offset, "tools.search");
-        if (offset instanceof ExecutionToolError) {
+        if (Predicate.isTagged(offset, "ExecutionToolError")) {
           return Effect.fail(offset);
         }
           isRecord(args) ? args.limit : undefined,
           "tools.executor.sources.list",
         );
-        if (limit instanceof ExecutionToolError) {
+        if (Predicate.isTagged(limit, "ExecutionToolError")) {
           return Effect.fail(limit);
         }
           isRecord(args) ? args.offset : undefined,
           "tools.executor.sources.list",
         );
-        if (offset instanceof ExecutionToolError) {
+        if (Predicate.isTagged(offset, "ExecutionToolError")) {
           return Effect.fail(offset);
         }
   readonly getDescription: Effect.Effect<string>;
 };
-export const createExecutionEngine = <
+export const createExecutionEngine = <E extends Cause.YieldableError = CodeExecutionError>(
-  E extends Cause.YieldableError = CodeExecutionError,
->(
   config: ExecutionEngineConfig<E>,
 ): ExecutionEngine<E> => {
   const { executor, codeExecutor } = config;
     const invoker = makeFullInvoker(executor, {
       onElicitation: options.onElicitation,
     });
-    return yield* codeExecutor
+    return yield* codeExecutor.execute(code, invoker).pipe(Effect.withSpan("executor.code.exec"));
-      .execute(code, invoker)
-      .pipe(Effect.withSpan("executor.code.exec"));
   });
   return {