feat: cherry-pick 2.7.x workspace routing into feature/2.0.x

loong10k · loong10k · commit c120645c8b7b · 2026-07-17T00:07:55.000+08:00
Adopt 2.7.x API additions for OpenCodeRequestContext:
- OpenCodeClient: pass-through RequestContext for workspace routing
- OpenCodeHttpClient: ensureSession/promptAsync accept RequestContext
- OpenCodeSseClient: subscribe accepts RequestContext
diff --git a/src/main/java/io/github/hiwepy/opencode/OpenCodeClient.java b/src/main/java/io/github/hiwepy/opencode/OpenCodeClient.java
@@ -6,6 +6,7 @@
 import io.github.hiwepy.opencode.cli.OpenCodeCli;
 import io.github.hiwepy.opencode.cli.OpenCodeCliExecutor;
 import io.github.hiwepy.opencode.api.OpenCodeHttpClient;
+import io.github.hiwepy.opencode.api.OpenCodeRequestContext;
 import io.github.hiwepy.opencode.api.OpenCodeSseClient;
 import okhttp3.OkHttpClient;
 
@@ -242,13 +243,26 @@ public ChatResponse chatCompletionWithSession(ChatRequest request, String sessio
      * @return 流式响应（CompletableFuture，完成时携带完整文本）
      */
     public ChatStreamingResponse chatCompletionStream(ChatRequest request, String sessionKey) {
-        String sessionId = httpClient.ensureSession(sessionKey);
+        return chatCompletionStream(request, sessionKey, null);
+    }
+
+    /**
+     * 在指定 OpenCode 工作目录中按 sessionKey 流式发送消息。
+     *
+     * @param request 请求
+     * @param sessionKey 稳定会话键
+     * @param context 包含受控工作目录的请求上下文
+     * @return 流式响应
+     */
+    public ChatStreamingResponse chatCompletionStream(ChatRequest request, String sessionKey,
+                                                       OpenCodeRequestContext context) {
+        String sessionId = httpClient.ensureSession(sessionKey, context);
         PromptRequest promptRequest = ChatMessageMapper.toPromptRequest(request);
 
         ChatStreamingResponse stream = new ChatStreamingResponse();
 
         // 订阅全局 SSE，按 sessionId 过滤事件
-        java.util.concurrent.BlockingQueue<Event> queue = sseClient.subscribeQueue();
+        java.util.concurrent.BlockingQueue<Event> queue = sseClient.subscribeQueue(context);
 
         // 异步消费事件
         java.util.concurrent.CompletableFuture.runAsync(() -> {
@@ -310,7 +324,7 @@ public ChatStreamingResponse chatCompletionStream(ChatRequest request, String se
         });
 
         // 触发异步 prompt（不阻塞，SSE 事件驱动结果）
-        httpClient.promptAsync(sessionId, promptRequest);
+        httpClient.promptAsync(sessionId, promptRequest, context);
 
         return stream;
     }
diff --git a/src/main/java/io/github/hiwepy/opencode/api/OpenCodeHttpClient.java b/src/main/java/io/github/hiwepy/opencode/api/OpenCodeHttpClient.java
@@ -30,6 +30,7 @@
 public class OpenCodeHttpClient implements AutoCloseable {
 
     private static final MediaType JSON = MediaType.get("application/json; charset=utf-8");
+    private static final String HEADER_OPENCODE_DIRECTORY = "X-OpenCode-Directory";
 
     private final OpenCodeHttpClientConfig config;
     private final OkHttpClient httpClient;
@@ -66,8 +67,12 @@ public HealthStatus health() {
     // ============================================================
 
     public Session createSession(String title) {
+        return createSession(title, null);
+    }
+
+    public Session createSession(String title, OpenCodeRequestContext context) {
         Map<String, Object> body = title != null ? Collections.singletonMap("title", title) : Collections.emptyMap();
-        return post("/session", body, Session.class);
+        return post("/session", body, Session.class, context);
     }
 
     public Session getSession(String sessionId) {
@@ -87,22 +92,31 @@ public List<Session> listSessions() {
      * @return 匹配的 session 列表
      */
     public List<Session> listSessions(String search, Integer limit, Integer start) {
+        return listSessions(search, limit, start, null);
+    }
+
+    public List<Session> listSessions(String search, Integer limit, Integer start,
+                                      OpenCodeRequestContext context) {
         HttpUrl.Builder urlBuilder = HttpUrl.get(url("/session")).newBuilder();
         if (search != null) urlBuilder.addQueryParameter("search", search);
         if (limit != null) urlBuilder.addQueryParameter("limit", String.valueOf(limit));
         if (start != null) urlBuilder.addQueryParameter("start", String.valueOf(start));
-        Request request = authedRequest(urlBuilder.build().toString()).get().build();
+        Request request = authedRequest(urlBuilder.build().toString(), context).get().build();
         return executeList(request, new TypeReference<List<Session>>() {});
     }
 
     /**
      * 按 title 精确查找 session。
      */
     public Optional<Session> findSessionByTitle(String title) {
+        return findSessionByTitle(title, null);
+    }
+
+    public Optional<Session> findSessionByTitle(String title, OpenCodeRequestContext context) {
         if (title == null || title.isEmpty()) {
             return Optional.empty();
         }
-        return listSessions(title, 50, null).stream()
+        return listSessions(title, 50, null, context).stream()
                 .filter(s -> Objects.equals(title, s.getTitle()))
                 .findFirst();
     }
@@ -136,22 +150,30 @@ public boolean chatCompletionWithSessionAsync(PromptRequest request, String sess
     }
 
     public String ensureSession(String sessionKey) {
+        return ensureSession(sessionKey, null);
+    }
+
+    public String ensureSession(String sessionKey, OpenCodeRequestContext context) {
         try {
-            Optional<Session> existing = findSessionByTitle(sessionKey);
+            Optional<Session> existing = findSessionByTitle(sessionKey, context);
             if (existing.isPresent()) {
                 return existing.get().getId();
             }
         } catch (Exception e) {
             log.debug("findSessionByTitle failed, sessionKey={}, error={}", sessionKey, e.getMessage());
         }
-        Session session = createSession(sessionKey);
+        Session session = createSession(sessionKey, context);
         return session.getId();
     }
 
     public boolean promptAsync(String sessionId, PromptRequest request) {
+        return promptAsync(sessionId, request, null);
+    }
+
+    public boolean promptAsync(String sessionId, PromptRequest request, OpenCodeRequestContext context) {
         try {
             RequestBody body = RequestBody.create(objectMapper.writeValueAsBytes(request), JSON);
-            Request httpReq = new Request.Builder().url(url("/session/" + sessionId + "/prompt_async"))
+            Request httpReq = authedRequest(url("/session/" + sessionId + "/prompt_async"), context)
                     .post(body).build();
             try (Response response = httpClient.newCall(httpReq).execute()) {
                 return response.isSuccessful();
@@ -206,12 +228,20 @@ private String url(String path) {
     }
 
     private Request.Builder authedRequest(String url) {
+        return authedRequest(url, null);
+    }
+
+    private Request.Builder authedRequest(String url, OpenCodeRequestContext context) {
         Request.Builder builder = new Request.Builder().url(url);
         String password = config.resolvePassword();
         if (!password.isEmpty()) {
             String credential = Credentials.basic(config.getUsername(), password);
             builder.header("Authorization", credential);
         }
+        if (Objects.nonNull(context) && context.getDirectory() != null
+                && !context.getDirectory().trim().isEmpty()) {
+            builder.header(HEADER_OPENCODE_DIRECTORY, context.getDirectory());
+        }
         return builder;
     }
 
@@ -228,7 +258,11 @@ private <T> T getList(String path, TypeReference<T> typeRef) {
 
 
     private <T> T post(String path, Object body, Class<T> type) {
-        Request request = authedRequest(url(path))
+        return post(path, body, type, null);
+    }
+
+    private <T> T post(String path, Object body, Class<T> type, OpenCodeRequestContext context) {
+        Request request = authedRequest(url(path), context)
                 .post(RequestBody.create(toJson(body), JSON))
                 .build();
         return execute(request, type);
diff --git a/src/main/java/io/github/hiwepy/opencode/api/OpenCodeSseClient.java b/src/main/java/io/github/hiwepy/opencode/api/OpenCodeSseClient.java
@@ -58,7 +58,11 @@ private static OkHttpClient buildOkHttpClient(OpenCodeHttpClientConfig config) {
      * @return EventSource（可用于 cancel）
      */
     public EventSource subscribe(Consumer<Event> consumer) {
-        Request request = buildRequest();
+        return subscribe(consumer, null);
+    }
+
+    public EventSource subscribe(Consumer<Event> consumer, OpenCodeRequestContext context) {
+        Request request = buildRequest(context);
         EventSourceListener listener = new EventSourceListener() {
             @Override
             public void onOpen(EventSource es, Response response) {
@@ -99,12 +103,16 @@ public void onFailure(EventSource es, Throwable t, Response response) {
      * 阻塞式订阅，返回一个 BlockingQueue，事件入队供外部消费。
      */
     public BlockingQueue<Event> subscribeQueue() {
+        return subscribeQueue(null);
+    }
+
+    public BlockingQueue<Event> subscribeQueue(OpenCodeRequestContext context) {
         BlockingQueue<Event> queue = new LinkedBlockingQueue<>();
-        subscribe(queue::add);
+        subscribe(queue::add, context);
         return queue;
     }
 
-    private Request buildRequest() {
+    private Request buildRequest(OpenCodeRequestContext context) {
         String url = config.getServerUrl() + "/event";
         Request.Builder builder = new Request.Builder().url(url)
                 .header("Accept", "text/event-stream")
@@ -113,6 +121,10 @@ private Request buildRequest() {
         if (!password.isEmpty()) {
             builder.header("Authorization", Credentials.basic(config.getUsername(), password));
         }
+        if (Objects.nonNull(context) && context.getDirectory() != null
+                && !context.getDirectory().trim().isEmpty()) {
+            builder.header("X-OpenCode-Directory", context.getDirectory());
+        }
         return builder.build();
     }
 
