Fixes after merge

Author: C-Koelbl

config/services.yaml

@@ -20,6 +20,11 @@ parameters:
     docker.host_base_path_default: "/var/www"
     docker.host_base_path: "%env(default:docker.host_base_path_default:HOST_PROJECT_PATH)%"
 
+    # Docker image that contains the Cursor Agent CLI.
+    # Set via CURSOR_AGENT_IMAGE env var (docker-compose sets this to the app image).
+    cursor_agent.image_default: "node:22-slim"
+    cursor_agent.image: "%env(default:cursor_agent.image_default:CURSOR_AGENT_IMAGE)%"
+
 services:
     # default configuration for services in *this* file
     _defaults:
@@ -135,7 +140,9 @@ services:
 
     App\LlmContentEditor\Infrastructure\LlmContentEditorAdapter: ~
 
-    App\CursorAgentContentEditor\Infrastructure\CursorAgentContentEditorAdapter: ~
+    App\CursorAgentContentEditor\Infrastructure\CursorAgentContentEditorAdapter:
+        arguments:
+            $cursorAgentImage: "%cursor_agent.image%"
 
     App\AgenticContentEditor\Facade\AgenticContentEditorFacadeInterface:
         class: App\AgenticContentEditor\Facade\AgenticContentEditorFacade

docker/app/Dockerfile

@@ -77,6 +77,17 @@ RUN mkdir -p /opt/mise/data /opt/mise/cache /opt/mise/state && \
     chmod -R 777 /opt/mise && \
     mise install node@24
 
+# Create a custom entrypoint that adds the mise node bin directory to PATH.
+# This makes node/npm/npx available in the default PATH for all invocations:
+# docker-compose services, docker run commands, and non-interactive sh -c calls.
+# The resolved path is baked at build time so there is no runtime lookup overhead.
+RUN NODE_BIN="$(mise where node)/bin" && \
+    printf '#!/bin/sh\nset -e\nexport PATH="%s:$PATH"\nexec docker-php-entrypoint "$@"\n' "$NODE_BIN" \
+        > /usr/local/bin/app-entrypoint && \
+    chmod +x /usr/local/bin/app-entrypoint
+
+ENTRYPOINT ["app-entrypoint"]
+
 # Shell activation for interactive use (debugging)
 RUN echo 'eval "$(/usr/bin/env mise activate bash)"' >> ~/.bashrc
 RUN echo 'eval "$(/usr/bin/env mise activate zsh)"' >> ~/.zshrc

src/CursorAgentContentEditor/Domain/Agent/ContentEditorAgent.php

@@ -51,12 +51,9 @@ private function buildCommand(string $prompt, string $apiKey, ?string $resumeSes
             $sessionArg = '--resume ' . escapeshellarg($resumeSessionId);
         }
 
-        // Create a script that sets up PATH with mise node installation, then set BASH_ENV to source it.
-        // The Cursor CLI spawns fresh bash processes for shellToolCall that don't inherit environment
-        // variables from the parent. BASH_ENV tells non-interactive bash to source this file first.
+        // Node/npm are symlinked into /usr/local/bin in the Dockerfile, so they are
+        // available in the default PATH for all shells (including Cursor CLI subprocesses).
         return sprintf(
-            'echo \'export PATH="/opt/mise/data/installs/node/24.13.0/bin:$PATH"\' > /etc/profile.d/mise-path.sh && ' .
-            'export BASH_ENV=/etc/profile.d/mise-path.sh && ' .
             'AGENT_BIN=%s; ' .
             'if [ ! -x "$AGENT_BIN" ]; then echo "agent not found" >&2; exit 127; fi; ' .
             '"$AGENT_BIN" --output-format stream-json --stream-partial-output --force %s --api-key %s -p %s',

src/CursorAgentContentEditor/Infrastructure/CursorAgentContentEditorAdapter.php

@@ -30,6 +30,7 @@ final class CursorAgentContentEditorAdapter implements AgenticContentEditorAdapt
     public function __construct(
         private readonly WorkspaceToolingServiceInterface $workspaceTooling,
         private readonly AgentExecutionContextInterface   $executionContext,
+        private readonly string                           $cursorAgentImage,
     ) {
     }
 
@@ -65,6 +66,10 @@ public function streamEdit(
 
             yield new EditStreamChunkDto(EditStreamChunkType::Event, null, new AgentEventDto('inference_start'));
 
+            // The Cursor CLI is installed in the app image, not in the project's agent image.
+            // Override the agent image so the IsolatedShellExecutor uses the correct image.
+            $this->executionContext->overrideAgentImage($this->cursorAgentImage);
+
             $agent   = new ContentEditorAgent($this->workspaceTooling);
             $process = $agent->startAsync('/workspace', $prompt, $apiKey, $backendSessionState);
 
@@ -85,6 +90,9 @@ public function streamEdit(
                 yield $chunk;
             }
 
+            // Restore the project's agent image for the build step
+            $this->executionContext->restoreAgentImage();
+
             $lastSessionId = $collector->getLastSessionId();
 
             // Always run the build after the agent completes. The Cursor CLI cannot run shell
@@ -114,6 +122,7 @@ public function streamEdit(
             yield new EditStreamChunkDto(EditStreamChunkType::Event, null, new AgentEventDto('inference_stop'));
             yield new EditStreamChunkDto(EditStreamChunkType::Done, null, null, false, $e->getMessage());
         } finally {
+            $this->executionContext->restoreAgentImage();
             $this->executionContext->setOutputCallback(null);
         }
     }

src/WorkspaceTooling/Facade/AgentExecutionContextInterface.php

@@ -86,4 +86,20 @@ public function getSuggestedCommitMessage(): ?string;
      * @return string|null The agent image, or null if not set
      */
     public function getAgentImage(): ?string;
+
+    /**
+     * Temporarily override the agent image.
+     *
+     * Use this when a specific adapter needs a different Docker image than the
+     * project-level default (e.g., the Cursor agent needs the app image with
+     * the CLI installed, not the project's node image).
+     *
+     * The original image is preserved and can be restored via restoreAgentImage().
+     */
+    public function overrideAgentImage(string $image): void;
+
+    /**
+     * Restore the agent image to the value before the last overrideAgentImage() call.
+     */
+    public function restoreAgentImage(): void;
 }

src/WorkspaceTooling/Infrastructure/Execution/AgentExecutionContext.php

@@ -33,6 +33,7 @@ final class AgentExecutionContext implements AgentExecutionContextInterface
     private ?string $conversationId         = null;
     private ?string $projectName            = null;
     private ?string $agentImage             = null;
+    private ?string $originalAgentImage     = null;
     private ?string $suggestedCommitMessage = null;
     private ?Closure $outputCallback        = null;
 
@@ -72,6 +73,7 @@ public function clearContext(): void
         $this->conversationId                  = null;
         $this->projectName                     = null;
         $this->agentImage                      = null;
+        $this->originalAgentImage              = null;
         $this->suggestedCommitMessage          = null;
         $this->remoteContentAssetsManifestUrls = null;
         $this->outputCallback                  = null;
@@ -129,6 +131,20 @@ public function getAgentImage(): ?string
         return $this->agentImage;
     }
 
+    public function overrideAgentImage(string $image): void
+    {
+        $this->originalAgentImage = $this->agentImage;
+        $this->agentImage         = $image;
+    }
+
+    public function restoreAgentImage(): void
+    {
+        if ($this->originalAgentImage !== null) {
+            $this->agentImage         = $this->originalAgentImage;
+            $this->originalAgentImage = null;
+        }
+    }
+
     /**
      * Set a suggested commit message from the agent.
      *

src/WorkspaceTooling/Infrastructure/Execution/DockerExecutor.php

@@ -250,13 +250,6 @@ private function buildDockerCommand(
         $dockerCmd[] = '-e';
         $dockerCmd[] = 'NODE_OPTIONS=--max-old-space-size=1536';
 
-        // Set BASH_ENV to source a script that sets up PATH with mise node installation.
-        // The Cursor CLI spawns fresh bash processes for shellToolCall that don't inherit
-        // environment variables from the parent. BASH_ENV tells non-interactive bash to
-        // source a file before running commands.
-        $dockerCmd[] = '-e';
-        $dockerCmd[] = 'BASH_ENV=/etc/profile.d/mise-path.sh';
-
         // Add the image
         $dockerCmd[] = $image;
 

tests/Unit/CursorAgentContentEditor/CursorAgentContentEditorAdapterTest.php

@@ -22,7 +22,7 @@ protected function setUp(): void
 
         $executionContext = $this->createMock(AgentExecutionContextInterface::class);
 
-        $this->adapter = new CursorAgentContentEditorAdapter($workspaceTooling, $executionContext);
+        $this->adapter = new CursorAgentContentEditorAdapter($workspaceTooling, $executionContext, 'test-cursor-image');
     }
 
     public function testBuildAgentContextDumpIncludesSystemContextOnFirstMessage(): void

tests/Unit/WorkspaceTooling/AgentExecutionContextTest.php

@@ -82,4 +82,45 @@ public function testClearContextResetsRemoteContentAssetsManifestUrls(): void
 
         self::assertSame([], $context->getRemoteContentAssetsManifestUrls());
     }
+
+    public function testOverrideAgentImageReplacesCurrentImage(): void
+    {
+        $context = new AgentExecutionContext();
+        $context->setContext('ws-id', '/path', null, 'project', 'node:22-slim');
+
+        $context->overrideAgentImage('app-image-with-cursor-cli');
+
+        self::assertSame('app-image-with-cursor-cli', $context->getAgentImage());
+    }
+
+    public function testRestoreAgentImageBringsBackOriginal(): void
+    {
+        $context = new AgentExecutionContext();
+        $context->setContext('ws-id', '/path', null, 'project', 'node:22-slim');
+
+        $context->overrideAgentImage('app-image-with-cursor-cli');
+        $context->restoreAgentImage();
+
+        self::assertSame('node:22-slim', $context->getAgentImage());
+    }
+
+    public function testRestoreAgentImageIsNoOpWithoutOverride(): void
+    {
+        $context = new AgentExecutionContext();
+        $context->setContext('ws-id', '/path', null, 'project', 'node:22-slim');
+
+        $context->restoreAgentImage();
+
+        self::assertSame('node:22-slim', $context->getAgentImage());
+    }
+
+    public function testClearContextResetsOverriddenAgentImage(): void
+    {
+        $context = new AgentExecutionContext();
+        $context->setContext('ws-id', '/path', null, 'project', 'node:22-slim');
+        $context->overrideAgentImage('app-image');
+        $context->clearContext();
+
+        self::assertNull($context->getAgentImage());
+    }
 }