test: remove marketplace extMethod, simplify test

Author: NikolaiSviridov

src/AcpExtensions.ts

@@ -1,24 +1,14 @@
 export type ExtMethodRequest =
     | AuthenticationStatusRequest
     | AuthenticationLogoutRequest
-    | MarketplaceListRequest
-    | MarketplaceRemoveRequest
 
 export function isExtMethodRequest(request: { method: string, params: Record<string, unknown> }): request is ExtMethodRequest {
     return request.method === "authentication/status"
         || request.method === "authentication/logout"
-        || request.method === "marketplace/list"
-        || request.method === "marketplace/remove";
 }
 
 export type AuthenticationStatusRequest = { method: "authentication/status", params: {} }
 export type AuthenticationStatusResponse = { type: "api-key" } | { type: "chat-gpt", email: string } | { type: "gateway", name: string } | { type: "unauthenticated" }
 
 export type AuthenticationLogoutRequest = { method: "authentication/logout", params: {} }
 export type AuthenticationLogoutResponse = {}
-
-export type MarketplaceListRequest = { method: "marketplace/list", params: { cwd?: string } }
-export type MarketplaceListResponse = { marketplaces: Array<{ name: string }> }
-
-export type MarketplaceRemoveRequest = { method: "marketplace/remove", params: { marketplaceName: string } }
-export type MarketplaceRemoveResponse = {}

src/CodexAcpServer.ts

@@ -141,19 +141,6 @@ export class CodexAcpServer implements acp.Agent {
                 await this.unstable_logout({});
                 return {};
             }
-            case "marketplace/list": {
-                const cwd = typeof methodRequest.params.cwd === "string" ? methodRequest.params.cwd : "";
-                const marketplaces = await this.runWithProcessCheck(() =>
-                    this.codexAcpClient.listMarketplaces(cwd)
-                );
-                return {
-                    marketplaces: marketplaces.map((name) => ({name})),
-                };
-            }
-            case "marketplace/remove": {
-                await this.runWithProcessCheck(() => this.codexAcpClient.removeMarketplace(methodRequest.params.marketplaceName));
-                return {};
-            }
         }
     }
 

src/__tests__/CodexACPAgent/e2e/acp-e2e.test.ts

@@ -12,7 +12,6 @@ import {
 } from "./acp-e2e-test-utils";
 
 const HELLO_WORLD_ADDITIONAL_ROOT_NAME = "hello-world";
-const HELLO_WORLD_MARKETPLACE_NAME = "additional-roots-hello-world";
 const HELLO_WORLD_SKILL = {
     name: "hello",
     description: "Use when the user asks for a hello world skill.",
@@ -137,20 +136,6 @@ describeE2E("E2E tests", () => {
         });
     });
 
-    it("removes an additional root marketplace", async () => {
-        fixture = await createAuthenticatedFixture();
-        const additionalRoot = await prepareHelloWorldAdditionalRoot(fixture);
-        await fixture.createSession({
-            additionalDirectories: [additionalRoot],
-        });
-
-        expect(await fixture.hasMarketplace(HELLO_WORLD_MARKETPLACE_NAME)).toBe(true);
-
-        await fixture.removeMarketplace(HELLO_WORLD_MARKETPLACE_NAME);
-
-        expect(await fixture.hasMarketplace(HELLO_WORLD_MARKETPLACE_NAME)).toBe(false);
-    });
-
     it("lists a skill from additionalDirectories", async () => {
         fixture = await createAuthenticatedFixture();
         const additionalRoot = await prepareHelloWorldAdditionalRoot(fixture);
@@ -177,7 +162,6 @@ describeE2E("E2E tests", () => {
 async function prepareHelloWorldAdditionalRoot(fixture: SpawnedAgentFixture): Promise<string> {
     const additionalRoot = path.join(fixture.workspaceDir, "..", "additional-roots", HELLO_WORLD_ADDITIONAL_ROOT_NAME);
     fixture.writeSkill(HELLO_WORLD_SKILL, path.join(additionalRoot, ".agents", "skills"));
-    await fixture.removeMarketplace(HELLO_WORLD_MARKETPLACE_NAME);
     return additionalRoot;
 }
 

src/__tests__/CodexACPAgent/e2e/spawned-agent-fixture.ts

@@ -28,8 +28,6 @@ export interface SpawnedAgentFixture {
     readonly connection: acp.ClientSideConnection;
     readonly workspaceDir: string;
     createSession(options?: CreateSessionOptions): Promise<acp.NewSessionResponse>;
-    hasMarketplace(marketplaceName: string): Promise<boolean>;
-    removeMarketplace(marketplaceName: string): Promise<void>;
     restart(): Promise<SpawnedAgentFixture>;
     writeSkill(skill: TestSkill, rootDir?: string): void;
     setPermissionResponder(responder: PermissionResponder): void;
@@ -177,24 +175,6 @@ class SpawnedAgentFixtureImpl implements SpawnedAgentFixture {
         });
     }
 
-    async hasMarketplace(marketplaceName: string): Promise<boolean> {
-        const response = await this.connection.extMethod("marketplace/list", {
-            cwd: this.workspaceDir,
-            marketplaceKinds: ["local", "workspace-directory"],
-        });
-        const marketplaces = response["marketplaces"];
-        if (!Array.isArray(marketplaces)) {
-            return false;
-        }
-        return marketplaces.some((marketplace) =>
-            isRecord(marketplace) && marketplace["name"] === marketplaceName
-        );
-    }
-
-    async removeMarketplace(marketplaceName: string): Promise<void> {
-        await this.connection.extMethod("marketplace/remove", {marketplaceName});
-    }
-
     async restart(): Promise<SpawnedAgentFixture> {
         await this.stopProcess(false);
         return await createSpawnedAgentFixture(this.initializeConnection, this.extraEnv, this.paths);
@@ -307,10 +287,6 @@ function redactLogSecrets(content: string): string {
         .replace(/(Incorrect API key provided: )[^.,\s]+/g, "$1[REDACTED]");
 }
 
-function isRecord(value: unknown): value is Record<string, unknown> {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
 async function waitForProcessExit(proc: ChildProcessWithoutNullStreams, timeoutMs: number): Promise<boolean> {
     if (proc.exitCode !== null || proc.signalCode !== null) {
         return true;