@hunyed15/codecgc 0.1.5 → 0.1.7

package/codexmcp/src/codexmcp/server.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import asyncio
+import functools
 import json
 import os
 import queue
@@ -134,12 +136,11 @@ def _validate_backend_target_paths(target_paths: List[Path]) -> tuple[bool, List
     return True, policy_checks, ""
 
 
-def run_shell_command(cmd: list[str], cwd: Optional[Path] = None) -> Generator[str, None, None]:
+def run_shell_command(cmd: list[str]) -> Generator[str, None, None]:
     """Execute a command and stream its output line-by-line.
 
     Args:
         cmd: Command and arguments as a list (e.g., ["codex", "exec", "prompt"])
-        cwd: Optional working directory for the command
 
     Yields:
         Output lines from the command
@@ -158,7 +159,6 @@ def run_shell_command(cmd: list[str], cwd: Optional[Path] = None) -> Generator[s
         stderr=subprocess.STDOUT,
         universal_newlines=True,
         encoding='utf-8',
-        cwd=str(cwd) if cwd else None,  # 添加 cwd 参数,确保在正确的工作目录中运行
     )
 
     output_queue: queue.Queue[str | None] = queue.Queue()
@@ -265,7 +265,7 @@ def _execute_codex_session(
     err_message = ""
     thread_id: Optional[str] = None
 
-    for line in run_shell_command(cmd, cwd=cd):
+    for line in run_shell_command(cmd):
         try:
             line_dict = json.loads(line.strip())
             all_messages.append(line_dict)
@@ -409,17 +409,20 @@ async def codex(
     ] = "",
 ) -> Dict[str, Any]:
     """Execute a Codex CLI session and return the results."""
-    return _execute_codex_session(
-        prompt=PROMPT,
-        cd=cd,
-        sandbox=sandbox,
-        session_id=SESSION_ID,
-        skip_git_repo_check=skip_git_repo_check,
-        return_all_messages=return_all_messages,
-        image=image,
-        model=model,
-        yolo=yolo,
-        profile=profile,
+    return await asyncio.to_thread(
+        functools.partial(
+            _execute_codex_session,
+            prompt=PROMPT,
+            cd=cd,
+            sandbox=sandbox,
+            session_id=SESSION_ID,
+            skip_git_repo_check=skip_git_repo_check,
+            return_all_messages=return_all_messages,
+            image=image,
+            model=model,
+            yolo=yolo,
+            profile=profile,
+        )
     )
 
 
@@ -495,17 +498,20 @@ async def implement_backend_task(
         constraints=constraints,
         acceptance_criteria=acceptance_criteria,
     )
-    result = _execute_codex_session(
-        prompt=prompt,
-        cd=cd,
-        sandbox=sandbox,
-        session_id=SESSION_ID,
-        skip_git_repo_check=True,
-        return_all_messages=return_all_messages,
-        image=[],
-        model=model,
-        yolo=False,
-        profile=profile,
+    result = await asyncio.to_thread(
+        functools.partial(
+            _execute_codex_session,
+            prompt=prompt,
+            cd=cd,
+            sandbox=sandbox,
+            session_id=SESSION_ID,
+            skip_git_repo_check=True,
+            return_all_messages=return_all_messages,
+            image=[],
+            model=model,
+            yolo=False,
+            profile=profile,
+        )
     )
 
     if not result.get("success"):

package/geminimcp/src/geminimcp/server.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import asyncio
+import functools
 import json
 import os
 import queue
@@ -359,13 +361,16 @@ async def gemini(
     ] = "",
 ) -> Dict[str, Any]:
     """Execute a gemini CLI session and return the results."""
-    return _execute_gemini_session(
-        prompt=PROMPT,
-        cd=cd,
-        sandbox=sandbox,
-        session_id=SESSION_ID,
-        return_all_messages=return_all_messages,
-        model=model,
+    return await asyncio.to_thread(
+        functools.partial(
+            _execute_gemini_session,
+            prompt=PROMPT,
+            cd=cd,
+            sandbox=sandbox,
+            session_id=SESSION_ID,
+            return_all_messages=return_all_messages,
+            model=model,
+        )
     )
 
 
@@ -433,13 +438,16 @@ async def implement_frontend_task(
         constraints=constraints,
         acceptance_criteria=acceptance_criteria,
     )
-    result = _execute_gemini_session(
-        prompt=prompt,
-        cd=cd,
-        sandbox=sandbox,
-        session_id=SESSION_ID,
-        return_all_messages=return_all_messages,
-        model=model,
+    result = await asyncio.to_thread(
+        functools.partial(
+            _execute_gemini_session,
+            prompt=prompt,
+            cd=cd,
+            sandbox=sandbox,
+            session_id=SESSION_ID,
+            return_all_messages=return_all_messages,
+            model=model,
+        )
     )
 
     if not result.get("success"):

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunyed15/codecgc",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Claude-hosted multi-model workflow product shell for CodeCGC.",
   "license": "MIT",
   "type": "commonjs",

package/scripts/codecgc_workflow_runtime.py

@@ -1,4 +1,5 @@
 import json
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -25,6 +26,11 @@ def parse_json_text(text: str) -> dict[str, Any]:
 
 def run_json_script(script_name: str, *args: str) -> dict[str, Any]:
     command = build_script_command(script_name, *args)
+
+    # 设置环境变量,确保子进程使用正确的工作目录
+    env = os.environ.copy()
+    env["CODECGC_WORKSPACE_ROOT"] = str(PROJECT_WORKSPACE)
+
     completed = subprocess.run(
         command,
         cwd=PROJECT_WORKSPACE,
@@ -33,6 +39,7 @@ def run_json_script(script_name: str, *args: str) -> dict[str, Any]:
         text=True,
         encoding="utf-8",
         errors="replace",
+        env=env,  # 传递环境变量
     )
 
     stdout = completed.stdout.strip()