@hunyed15/codecgc 0.1.7 → 0.1.9

package/scripts/codecgc_workflow_runtime.py

@@ -1,71 +1,3 @@
-import json
-import os
-import subprocess
-import sys
-from pathlib import Path
-from typing import Any
-
-from codecgc_runtime_paths import PACKAGE_ROOT
-from codecgc_runtime_paths import PROJECT_ROOT
-
-WORKSPACE = PACKAGE_ROOT
-PROJECT_WORKSPACE = PROJECT_ROOT
-SCRIPTS_DIR = WORKSPACE / "scripts"
-
-
-def build_script_command(script_name: str, *args: str) -> list[str]:
-    return [sys.executable, str(SCRIPTS_DIR / script_name), *args]
-
-
-def parse_json_text(text: str) -> dict[str, Any]:
-    stripped = text.strip()
-    if not stripped:
-        raise ValueError("Command produced no JSON output.")
-    return json.loads(stripped)
-
-
-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,
-        stdin=subprocess.DEVNULL,
-        capture_output=True,
-        text=True,
-        encoding="utf-8",
-        errors="replace",
-        env=env,  # 传递环境变量
-    )
-
-    stdout = completed.stdout.strip()
-    stderr = completed.stderr.strip()
-
-    if completed.returncode == 0:
-        if not stdout:
-            return {"success": True}
-        return parse_json_text(stdout)
-
-    for candidate in (stdout, stderr):
-        if not candidate:
-            continue
-        try:
-            parsed = parse_json_text(candidate)
-        except Exception:
-            continue
-        if isinstance(parsed, dict):
-            parsed.setdefault("success", False)
-            parsed.setdefault("returncode", completed.returncode)
-            return parsed
-
-    return {
-        "success": False,
-        "returncode": completed.returncode,
-        "stdout": stdout,
-        "stderr": stderr,
-        "error": f"{script_name} failed with exit code {completed.returncode}.",
-    }
+from codecgc_runtime.workflow_runtime import build_script_command
+from codecgc_runtime.workflow_runtime import parse_json_text
+from codecgc_runtime.workflow_runtime import run_json_script

package/scripts/entry_codecgc_workflow.py

@@ -3033,6 +3033,10 @@ def run_existing_mode(args: argparse.Namespace, explain_only: bool) -> dict[str,
         "dispatched": False,
         "dispatch_result": None,
     }
+    if matches_command(recommended_command, "cgc-plan") and isinstance(route.get("replan_payload"), dict):
+        merged_replan_payload = dict(replan_payload)
+        merged_replan_payload.update(route.get("replan_payload", {}))
+        result["replan_payload"] = merged_replan_payload
     if explain_only or not effective_auto_dispatch:
         result["next"] = build_user_facing_next(result)
         result["human_summary"] = build_existing_mode_human_summary(result)