Don't require cwd in meta

Author: egor-baranov

src/CodexAcpClient.ts

@@ -338,11 +338,16 @@ export class CodexAcpClient {
         agentMode: AgentMode,
         modelId: ModelId,
         disableSummary: boolean,
+        cwd: string,
     ): Promise<TurnCompletedNotification> {
         const input = buildPromptItems(request.prompt);
         const effort = modelId.effort as ReasoningEffort | null; //TODO remove unsafe conversion
 
-        await this.additionalRootsProvider.refreshSkills(request);
+        const refreshSkillsRequest: { _meta?: Record<string, unknown> | null, cwd?: string } = { cwd: cwd };
+        if (request._meta !== undefined) {
+            refreshSkillsRequest._meta = request._meta;
+        }
+        await this.additionalRootsProvider.refreshSkills(refreshSkillsRequest);
         await this.codexClient.turnStart({
             outputSchema: null,
             threadId: request.sessionId,

src/CodexAcpServer.ts

@@ -637,7 +637,7 @@ export class CodexAcpServer implements acp.Agent {
             }
             const agentMode = sessionState.agentMode;
             const turnCompleted = await this.runWithProcessCheck(
-                () => this.codexAcpClient.sendPrompt(params, agentMode, modelId, disableSummary));
+                () => this.codexAcpClient.sendPrompt(params, agentMode, modelId, disableSummary, sessionState.cwd));
 
             // Check if turn was interrupted (cancelled)
             if (turnCompleted.turn.status === "interrupted") {

src/CodexAdditionalRootsProvider.ts

@@ -5,7 +5,7 @@ export class CodexAdditionalRootsProvider {
 
     async refreshSkills(request: { _meta?: Record<string, unknown> | null, cwd?: string }): Promise<void> {
         const additionalRoots = this.readAdditionalRoots(request._meta);
-        const cwd = this.nonEmpty(request.cwd) ?? this.nonEmpty(request._meta?.["cwd"]);
+        const cwd = this.nonEmpty(request.cwd);
         if (!cwd) {
             return;
         }

src/__tests__/CodexACPAgent/CodexAcpClient.test.ts

@@ -178,8 +178,7 @@ describe('ACP server test', { timeout: 40_000 }, () => {
             sessionId: "session-id",
             prompt: [{ type: "text", text: "Hello" }],
             _meta: {
-                additionalRoots: ["/skills/one", " /skills/two ", 7],
-                cwd: "/workspace"
+                additionalRoots: ["/skills/one", " /skills/two ", 7]
             }
         };
         await codexAcpAgent.prompt(promptRequest);

src/__tests__/CodexACPAgent/data/send-attachments-turn-start.json

@@ -1,3 +1,22 @@
+{
+  "eventType": "request",
+  "method": "skills/list",
+  "params": {
+    "cwds": [
+      "/test/cwd"
+    ],
+    "forceReload": true,
+    "perCwdExtraUserRoots": [
+      {
+        "cwd": "cwd",
+        "extraUserRoots": []
+      }
+    ]
+  }
+}
+{
+  "eventType": "response"
+}
 {
   "eventType": "request",
   "method": "turn/start",