@seawork/server 1.0.7 → 1.0.10-rc.5

package/dist/server/server/agent/providers/codex-app-server-agent.js

@@ -862,6 +862,8 @@ function normalizeCodexThreadItemType(rawType) {
             return "mcpToolCall";
         case "WebSearch":
             return "webSearch";
+        case "ImageGeneration":
+            return "imageGeneration";
         default:
             return rawType;
     }
@@ -1121,6 +1123,46 @@ function mapCodexTerminalInteractionToToolCall(params) {
         ...(processId ? { metadata: { processId } } : {}),
     };
 }
+function normalizeCodexGeneratedImageSource(item) {
+    const savedPath = nonEmptyString(item.savedPath) ??
+        nonEmptyString(item.saved_path) ??
+        nonEmptyString(item.path) ??
+        null;
+    if (savedPath) {
+        return savedPath;
+    }
+    const result = nonEmptyString(item.result);
+    if (!result) {
+        return null;
+    }
+    return result.startsWith("data:") ? result : `data:image/png;base64,${result}`;
+}
+function markdownImageSource(source) {
+    if (/^(https?:|data:|blob:)/i.test(source)) {
+        return source;
+    }
+    return `<${source.replace(/>/g, "%3E")}>`;
+}
+function mapCodexImageGenerationToTimeline(item) {
+    const source = normalizeCodexGeneratedImageSource(item);
+    if (!source) {
+        return null;
+    }
+    return {
+        type: "assistant_message",
+        text: `![Generated image](${markdownImageSource(source)})`,
+    };
+}
+function rawResponseItemToThreadItem(item) {
+    if (item.type !== "image_generation_call") {
+        return null;
+    }
+    return {
+        ...item,
+        type: "imageGeneration",
+        revisedPrompt: item.revised_prompt ?? item.revisedPrompt ?? null,
+    };
+}
 function threadItemToTimeline(item, options) {
     if (!item || typeof item !== "object")
         return null;
@@ -1163,6 +1205,8 @@ function threadItemToTimeline(item, options) {
         case "mcpToolCall":
         case "webSearch":
             return mapCodexToolCallFromThreadItem(normalizedItem, { cwd });
+        case "imageGeneration":
+            return mapCodexImageGenerationToTimeline(normalizedItem);
         default:
             return null;
     }
@@ -1268,6 +1312,16 @@ const ItemLifecycleNotificationSchema = z
         .passthrough(),
 })
     .passthrough();
+const RawResponseItemCompletedNotificationSchema = z
+    .object({
+    item: z
+        .object({
+        id: z.string().optional(),
+        type: z.string().optional(),
+    })
+        .passthrough(),
+})
+    .passthrough();
 const CodexEventTurnAbortedNotificationSchema = z
     .object({
     msg: z
@@ -1519,6 +1573,20 @@ const CodexNotificationSchema = z.union([
         method,
         params,
     })),
+    z
+        .object({
+        method: z.literal("rawResponseItem/completed"),
+        params: RawResponseItemCompletedNotificationSchema,
+    })
+        .transform(({ params }) => ({
+        kind: "raw_response_item_completed",
+        item: params.item,
+    })),
+    z.object({ method: z.literal("rawResponseItem/completed"), params: z.unknown() }).transform(({ method, params }) => ({
+        kind: "invalid_payload",
+        method,
+        params,
+    })),
     z
         .object({ method: z.literal("item/started"), params: ItemLifecycleNotificationSchema })
         .transform(({ params }) => ({
@@ -2373,13 +2441,17 @@ class CodexAppServerAgentSession {
         }
         const turnId = this.createTurnId();
         this.activeForegroundTurnId = turnId;
+        const turnStartT0 = Date.now();
+        this.logger.info({ turnId }, "[timing] codex turn/start request sending");
         try {
             await this.client.request("turn/start", params, TURN_START_TIMEOUT_MS);
         }
         catch (error) {
+            this.logger.info({ turnId, elapsedMs: Date.now() - turnStartT0 }, "[timing] codex turn/start FAILED");
             this.activeForegroundTurnId = null;
             throw error;
         }
+        this.logger.info({ turnId, elapsedMs: Date.now() - turnStartT0 }, "[timing] codex turn/start acknowledged");
         return { turnId };
     }
     subscribe(callback) {
@@ -2947,6 +3019,27 @@ class CodexAppServerAgentSession {
             }
             return;
         }
+        if (parsed.kind === "raw_response_item_completed") {
+            const threadItem = rawResponseItemToThreadItem(parsed.item);
+            if (!threadItem) {
+                return;
+            }
+            const itemId = threadItem.id;
+            if (itemId && this.emittedItemCompletedIds.has(itemId)) {
+                return;
+            }
+            const timelineItem = threadItemToTimeline(threadItem, {
+                includeUserMessage: false,
+                cwd: this.config.cwd ?? null,
+            });
+            if (timelineItem) {
+                this.emitEvent({ type: "timeline", provider: CODEX_PROVIDER, item: timelineItem });
+                if (itemId) {
+                    this.emittedItemCompletedIds.add(itemId);
+                }
+            }
+            return;
+        }
         if (parsed.kind === "item_completed") {
             // Codex emits mirrored lifecycle notifications via both `codex/event/item_*`
             // and canonical `item/*`. We render only the canonical channel to avoid
@@ -3268,8 +3361,17 @@ export class CodexAppServerAgentClient {
             extraArgs.push("-c", `model_provider="seawork"`, "-c", `model_providers.seawork.name="Seawork"`, "-c", `model_providers.seawork.base_url="${seaworkBaseUrl}/v1"`, "-c", `model_providers.seawork.env_key="SEAWORK_API_KEY"`, "--disable", "js_repl");
             codexEnv.SEAWORK_API_KEY = codexEnv.OPENAI_API_KEY ?? "";
         }
-        this.logger.info({ extraArgs }, "Codex app-server extra args");
-        return spawnProcess(launchPrefix.command, [...launchPrefix.args, "app-server", ...extraArgs], {
+        const fullArgs = [...launchPrefix.args, "app-server", ...extraArgs];
+        this.logger.debug({
+            command: launchPrefix.command,
+            args: fullArgs,
+            hasOpenaiKey: !!codexEnv.OPENAI_API_KEY,
+            openaiKeyPrefix: codexEnv.OPENAI_API_KEY?.slice(0, 10) ?? null,
+            openaiBaseUrl: codexEnv.OPENAI_BASE_URL ?? null,
+            hasSeaworkKey: !!codexEnv.SEAWORK_API_KEY,
+            launchEnvKeys: Object.keys(launchEnv ?? {}),
+        }, "codex_spawn");
+        return spawnProcess(launchPrefix.command, fullArgs, {
             detached: process.platform !== "win32",
             stdio: ["pipe", "pipe", "pipe"],
             env: codexEnv,
@@ -3288,6 +3390,7 @@ export class CodexAppServerAgentClient {
             ...overrides,
             provider: CODEX_PROVIDER,
             cwd: overrides?.cwd ?? storedConfig.cwd ?? process.cwd(),
+            modeId: overrides?.modeId ?? storedConfig.modeId ?? "auto",
         };
         const session = new CodexAppServerAgentSession(merged, handle, this.logger, () => this.spawnAppServer(launchContext?.env));
         await session.connect();
@@ -3362,7 +3465,7 @@ export class CodexAppServerAgentClient {
         if (command?.mode === "replace") {
             return existsSync(command.argv[0]);
         }
-        return true;
+        return (await findExecutable("codex")) !== null;
     }
     async getDiagnostic() {
         try {