From 43e1f82303ad8f3d3ffd174cf255c144620f3073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E6=A9=98?= <xiaoju@shazhou.work>
Date: Thu, 7 May 2026 01:27:12 +0000
Subject: [PATCH] refactor: extractPrompt out of ExtractContext, into ExtractFn
 parameter
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ExtractFn = (schema, prompt, ctx) => Promise<T>
extractPrompt stays in RoleDefinition (definition layer), not in context (state layer).
Callers pass their own prompt — engine uses roleDef.extractPrompt, cursor agent uses its own.

小橘 <xiaoju@shazhou.work>
---
 .../workflow-agent-cursor/__tests__/cursor-agent.test.ts  | 1 +
 packages/workflow-agent-cursor/src/index.ts               | 8 +++++---
 packages/workflow/src/create-workflow.ts                  | 7 +++++--
 packages/workflow/src/extract-fn.ts                       | 6 ++++--
 packages/workflow/src/types.ts                            | 3 +--
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts b/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
index ae9cfd1..1cb859d 100644
--- a/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
+++ b/packages/workflow-agent-cursor/__tests__/cursor-agent.test.ts
@@ -5,6 +5,7 @@ import { createCursorAgent, validateCursorAgentConfig } from "../src/index.js";
 
 const testExtract: ExtractFn = async <T extends Record<string, unknown>>(
   _schema: z.ZodType<T>,
+  _prompt: string,
   _ctx: ExtractContext,
 ): Promise<T> => ({ workspace: "/tmp" }) as unknown as T;
 
diff --git a/packages/workflow-agent-cursor/src/index.ts b/packages/workflow-agent-cursor/src/index.ts
index 7165457..a2262af 100644
--- a/packages/workflow-agent-cursor/src/index.ts
+++ b/packages/workflow-agent-cursor/src/index.ts
@@ -48,10 +48,12 @@ export function createCursorAgent(config: CursorAgentConfig): AgentFn {
     const extractCtx: ExtractContext = {
       ...ctx,
       agentContent: "",
-      extractPrompt:
-        "From the thread context, determine the absolute filesystem path where the project/repository is located.",
     };
-    const { workspace } = await config.extract(cursorWorkspaceSchema, extractCtx);
+    const { workspace } = await config.extract(
+      cursorWorkspaceSchema,
+      "From the thread context, determine the absolute filesystem path where the project/repository is located.",
+      extractCtx,
+    );
     const fullPrompt = buildAgentPrompt(ctx);
     const args = [
       "-p",
diff --git a/packages/workflow/src/create-workflow.ts b/packages/workflow/src/create-workflow.ts
index 4d32e3c..e9b6062 100644
--- a/packages/workflow/src/create-workflow.ts
+++ b/packages/workflow/src/create-workflow.ts
@@ -88,10 +88,13 @@ export function createWorkflow<M extends RoleMeta>(
       const extractCtx: ExtractContext<M> = {
         ...agentCtx,
         agentContent: raw,
-        extractPrompt: roleDef.extractPrompt,
       };
 
-      const meta = await extract(roleDef.schema, extractCtx as unknown as ExtractContext);
+      const meta = await extract(
+        roleDef.schema,
+        roleDef.extractPrompt,
+        extractCtx as unknown as ExtractContext,
+      );
 
       const ts = Date.now();
       const step = {
diff --git a/packages/workflow/src/extract-fn.ts b/packages/workflow/src/extract-fn.ts
index a97bb7f..e1ca2d5 100644
--- a/packages/workflow/src/extract-fn.ts
+++ b/packages/workflow/src/extract-fn.ts
@@ -5,16 +5,18 @@ import type { ExtractContext, LlmProvider } from "./types.js";
 
 export type ExtractFn = <T extends Record<string, unknown>>(
   schema: z.ZodType<T>,
+  prompt: string,
   ctx: ExtractContext,
 ) => Promise<T>;
 
 /**
  * Create an ExtractFn backed by an LLM provider.
- * Builds prompt text from {@link ExtractContext} and calls structured extraction.
+ * Builds prompt text from {@link ExtractContext} plus `prompt` and calls structured extraction.
  */
 export function createExtract(provider: LlmProvider): ExtractFn {
   return async <T extends Record<string, unknown>>(
     schema: z.ZodType<T>,
+    prompt: string,
     ctx: ExtractContext,
   ): Promise<T> => {
     const lines: string[] = [];
@@ -37,7 +39,7 @@ export function createExtract(provider: LlmProvider): ExtractFn {
     lines.push(ctx.agentContent);
     lines.push("");
     lines.push("## Extraction Instruction");
-    lines.push(ctx.extractPrompt);
+    lines.push(prompt);
 
     const text = lines.join("\n");
     const result = await llmExtractWithRetry({ text, schema, provider });
diff --git a/packages/workflow/src/types.ts b/packages/workflow/src/types.ts
index 1483f23..374c1cd 100644
--- a/packages/workflow/src/types.ts
+++ b/packages/workflow/src/types.ts
@@ -73,10 +73,9 @@ export type AgentContext<M extends RoleMeta = RoleMeta> = ModeratorContext<M> &
   };
 };
 
-/** Phase 3: Extractor runs — has agent output and extract instruction. */
+/** Phase 3: Extractor runs — has agent output; the extraction instruction is a separate argument to the extract function. */
 export type ExtractContext<M extends RoleMeta = RoleMeta> = AgentContext<M> & {
   agentContent: string;
-  extractPrompt: string;
 };
 
 /** Alias — most external consumers see the agent-phase context. */