feat(claudecode): add working directory isolation support

Add ExecutionWorkingDirectory, OriginalWorkingDirectory, and BootstrapOriginalWorkingDirectory properties to ClaudeCodeOptions for isolated session execution.

Implement ResolveExecutionWorkingDirectory to prefer ExecutionWorkingDirectory over WorkingDirectory when set, and BuildEffectiveAppendSystemPrompt to combine custom prompts with auto-generated working directory bootstrap guidance. The bootstrap guidance informs the agent of the isolation context and original project path.

Add tests verifying execution directory preference and conditional bootstrap prompt injection.

Co-Authored-By: Hagicode <noreply@hagicode.com>
Signed-off-by: newbe36524 <newbe36524@qq.com>

Author: newbe36524

src/HagiCode.Libs.Providers/ClaudeCode/ClaudeCodeOptions.cs

@@ -27,6 +27,23 @@ public sealed record ClaudeCodeOptions
     /// </summary>
     public string? WorkingDirectory { get; init; }
 
+    /// <summary>
+    /// Gets or sets the process working directory used for the current execution.
+    /// When omitted, <see cref="WorkingDirectory" /> remains the execution root.
+    /// </summary>
+    public string? ExecutionWorkingDirectory { get; init; }
+
+    /// <summary>
+    /// Gets or sets the canonical project working directory preserved outside the execution cwd.
+    /// </summary>
+    public string? OriginalWorkingDirectory { get; init; }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the provider should append one-time guidance
+    /// describing the preserved original working directory for the current execution.
+    /// </summary>
+    public bool BootstrapOriginalWorkingDirectory { get; init; }
+
     /// <summary>
     /// Gets or sets the Claude model name.
     /// </summary>

src/HagiCode.Libs.Providers/ClaudeCode/ClaudeCodeProvider.cs

@@ -61,7 +61,7 @@ public async IAsyncEnumerable<CliMessage> ExecuteAsync(
         {
             ExecutablePath = executablePath,
             Arguments = BuildCommandArguments(options),
-            WorkingDirectory = options.WorkingDirectory,
+            WorkingDirectory = ResolveExecutionWorkingDirectory(options),
             EnvironmentVariables = BuildEnvironmentVariables(options, runtimeEnvironment),
             InputEncoding = Utf8NoBom,
             OutputEncoding = Utf8NoBom,
@@ -147,7 +147,7 @@ internal virtual IReadOnlyList<string> BuildCommandArguments(ClaudeCodeOptions o
             arguments.AddRange(["--system-prompt", systemPrompt]);
         }
 
-        var appendSystemPrompt = ArgumentValueNormalizer.NormalizeOptionalValue(options.AppendSystemPrompt);
+        var appendSystemPrompt = BuildEffectiveAppendSystemPrompt(options);
         if (appendSystemPrompt is not null)
         {
             arguments.AddRange(["--append-system-prompt", appendSystemPrompt]);
@@ -419,6 +419,50 @@ private static string BuildRuntimeFingerprint(ProcessStartContext startContext)
                ?? ArgumentValueNormalizer.NormalizeOptionalValue(options.Resume);
     }
 
+    private static string? ResolveExecutionWorkingDirectory(ClaudeCodeOptions options)
+    {
+        return ArgumentValueNormalizer.NormalizeOptionalValue(options.ExecutionWorkingDirectory)
+               ?? ArgumentValueNormalizer.NormalizeOptionalValue(options.WorkingDirectory);
+    }
+
+    private static string? BuildEffectiveAppendSystemPrompt(ClaudeCodeOptions options)
+    {
+        var appendSystemPrompt = ArgumentValueNormalizer.NormalizeOptionalValue(options.AppendSystemPrompt);
+        var bootstrapPrompt = BuildOriginalWorkingDirectoryBootstrap(options);
+
+        return (appendSystemPrompt, bootstrapPrompt) switch
+        {
+            (null, null) => null,
+            (not null, null) => appendSystemPrompt,
+            (null, not null) => bootstrapPrompt,
+            (not null, not null) => $"{appendSystemPrompt}\n\n{bootstrapPrompt}"
+        };
+    }
+
+    private static string? BuildOriginalWorkingDirectoryBootstrap(ClaudeCodeOptions options)
+    {
+        if (!options.BootstrapOriginalWorkingDirectory)
+        {
+            return null;
+        }
+
+        var originalWorkingDirectory = ArgumentValueNormalizer.NormalizeOptionalValue(options.OriginalWorkingDirectory);
+        if (originalWorkingDirectory is null)
+        {
+            return null;
+        }
+
+        var executionWorkingDirectory = ResolveExecutionWorkingDirectory(options) ?? "(unknown)";
+        return string.Join(
+            "\n",
+            [
+                "You are running in an isolated working directory for this session.",
+                $"Current isolated working directory: {executionWorkingDirectory}",
+                $"Original project working directory: {originalWorkingDirectory}",
+                "Use the original project path whenever you need to inspect or reference the source repository."
+            ]);
+    }
+
     private static void UpsertString(JsonObject rootNode, string propertyName, string? value)
     {
         if (!string.IsNullOrWhiteSpace(value))

tests/HagiCode.Libs.Providers.Tests/ClaudeCodeProviderTests.cs

@@ -108,6 +108,41 @@ public void BuildCommandArguments_trims_optional_values_and_omits_empty_after_tr
         ]);
     }
 
+    [Fact]
+    public void BuildCommandArguments_appends_isolated_workdir_bootstrap_only_when_requested()
+    {
+        var provider = CreateProvider();
+
+        var firstRunArguments = provider.BuildCommandArguments(new ClaudeCodeOptions
+        {
+            WorkingDirectory = "/repo/project",
+            ExecutionWorkingDirectory = "/tmp/hagicode/claude/session-1",
+            OriginalWorkingDirectory = "/repo/project",
+            BootstrapOriginalWorkingDirectory = true,
+            AppendSystemPrompt = "Keep responses terse."
+        });
+
+        var appendPromptIndex = firstRunArguments
+            .Select((argument, index) => new { argument, index })
+            .FirstOrDefault(entry => entry.argument == "--append-system-prompt")?.index ?? -1;
+        appendPromptIndex.ShouldBeGreaterThanOrEqualTo(0);
+        var combinedPrompt = firstRunArguments[appendPromptIndex + 1];
+        combinedPrompt.ShouldContain("Keep responses terse.");
+        combinedPrompt.ShouldContain("isolated working directory");
+        combinedPrompt.ShouldContain("/tmp/hagicode/claude/session-1");
+        combinedPrompt.ShouldContain("/repo/project");
+
+        var resumedArguments = provider.BuildCommandArguments(new ClaudeCodeOptions
+        {
+            WorkingDirectory = "/repo/project",
+            ExecutionWorkingDirectory = "/tmp/hagicode/claude/session-1",
+            OriginalWorkingDirectory = "/repo/project",
+            BootstrapOriginalWorkingDirectory = false
+        });
+
+        resumedArguments.ShouldNotContain("--append-system-prompt");
+    }
+
     [Fact]
     public async Task ExecuteAsync_uses_custom_executable_and_streams_messages()
     {
@@ -134,6 +169,28 @@ public async Task ExecuteAsync_uses_custom_executable_and_streams_messages()
         provider.SentMessages[0].Content.GetProperty("message").GetProperty("content").GetString().ShouldBe("hello");
     }
 
+    [Fact]
+    public async Task ExecuteAsync_prefers_execution_working_directory_when_isolation_is_enabled()
+    {
+        var provider = CreateProvider();
+
+        await foreach (var _ in provider.ExecuteAsync(
+                           new ClaudeCodeOptions
+                           {
+                               WorkingDirectory = "/repo/project",
+                               ExecutionWorkingDirectory = "/tmp/hagicode/claude/session-1",
+                               OriginalWorkingDirectory = "/repo/project",
+                               BootstrapOriginalWorkingDirectory = true,
+                               SessionId = "session-1"
+                           },
+                           "hello"))
+        {
+        }
+
+        provider.LastStartContext.ShouldNotBeNull();
+        provider.LastStartContext.WorkingDirectory.ShouldBe("/tmp/hagicode/claude/session-1");
+    }
+
     [Fact]
     public async Task ExecuteAsync_uses_utf8_without_bom_for_stream_json_transport()
     {