Skip to content

Commit 739c3eb

Browse files
committed
fix(codex): reconcile computer-use startup changes
1 parent b7ec7ad commit 739c3eb

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

extensions/codex/src/app-server/attempt-startup.test.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -503,9 +503,9 @@ describe("startCodexAttemptThread", () => {
503503
it("closes the shared app-server when startup times out during initialize", async () => {
504504
const initializeTimeoutPluginConfig = {
505505
...pluginConfig,
506-
appServer: { command: "codex", requestTimeoutMs: 100 },
506+
appServer: { command: "codex", requestTimeoutMs: 1_000 },
507507
} satisfies CodexPluginConfig;
508-
const { harness, run } = startThreadWithHarness(500, new AbortController().signal, {
508+
const { harness, run } = startThreadWithHarness(2_000, new AbortController().signal, {
509509
pluginConfig: initializeTimeoutPluginConfig,
510510
});
511511
const runError = run.then(
@@ -531,21 +531,21 @@ describe("startCodexAttemptThread", () => {
531531
it("does not retire shared startup when this attempt's initialize wait expires", async () => {
532532
const sharedInitializePluginConfig = {
533533
...pluginConfig,
534-
appServer: { command: "codex", requestTimeoutMs: 100 },
534+
appServer: { command: "codex", requestTimeoutMs: 1_000 },
535535
} satisfies CodexPluginConfig;
536536
const appServer = resolveCodexAppServerRuntimeOptions({
537537
pluginConfig: sharedInitializePluginConfig,
538538
});
539539
const paths = createAttemptPaths();
540-
const { harness, run, startSpy } = startThreadWithHarness(1_000, new AbortController().signal, {
540+
const { harness, run, startSpy } = startThreadWithHarness(3_000, new AbortController().signal, {
541541
pluginConfig: sharedInitializePluginConfig,
542542
paths,
543543
});
544544
await waitForRequest(harness, "initialize");
545545
const peerAcquire = getLeasedSharedCodexAppServerClient({
546546
startOptions: appServer.start,
547547
agentDir: paths.agentDir,
548-
timeoutMs: 1_000,
548+
timeoutMs: 3_000,
549549
});
550550

551551
await expect(run).rejects.toThrow("codex app-server initialize timed out");
@@ -556,7 +556,7 @@ describe("startCodexAttemptThread", () => {
556556
getLeasedSharedCodexAppServerClient({
557557
startOptions: appServer.start,
558558
agentDir: paths.agentDir,
559-
timeoutMs: 1_000,
559+
timeoutMs: 3_000,
560560
}),
561561
).resolves.toBe(harness.client);
562562
expect(startSpy).toHaveBeenCalledTimes(1);
@@ -713,7 +713,7 @@ describe("startCodexAttemptThread", () => {
713713
it("clears the shared app-server when a startup RPC times out", async () => {
714714
const perRpcTimeoutPluginConfig = {
715715
...pluginConfig,
716-
appServer: { command: "codex", requestTimeoutMs: 100 },
716+
appServer: { command: "codex", requestTimeoutMs: 1_000 },
717717
computerUse: { enabled: true, marketplaceDiscoveryTimeoutMs: 1 },
718718
} satisfies CodexPluginConfig;
719719
const { harness, run } = startThreadWithHarness(5_000, new AbortController().signal, {

extensions/codex/src/app-server/computer-use.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*/
55
import { execFile } from "node:child_process";
66
import { existsSync } from "node:fs";
7-
import path from "node:path";
87
import { promisify } from "node:util";
98
import { describeControlFailure } from "./capabilities.js";
109
import {
@@ -683,7 +682,6 @@ async function resolveMarketplaceRef(params: {
683682
if (
684683
candidates.length === 0 &&
685684
bundledMarketplacePath &&
686-
existsSync(path.join(bundledMarketplacePath, "plugins", params.config.pluginName)) &&
687685
shouldAddBundledComputerUseMarketplace(params)
688686
) {
689687
const added = await params.request<{ marketplaceName?: string }>("marketplace/add", {

0 commit comments

Comments
 (0)