easy-coding-harness 0.8.2-beta.0 → 0.8.3-beta.0

package/CHANGELOG.md

@@ -6,6 +6,18 @@
 - `y`：常规功能升级
 - `z`：日常 bug 修复
 
+## 0.8.3-beta.0
+
+- 修复 Codex App 未在 hook payload 中提供 `session_id` 时仍回退到 PPID、导致同一 App 进程内多个逻辑会话共享 Easy Coding session 的问题；Codex 现在会在标准 hook session ID 缺失时使用 `CODEX_THREAD_ID`，仅在两者都不可用时保留 PPID 兼容回退。
+- 修复 Qoder CLI 同时暴露 Claude 兼容环境变量时被识别为 Claude Code 的问题；共享 hook 统一按脚本平台目录优先、Qoder 专属环境次之、Claude 环境最后的顺序解析 Agent，避免各入口判断逻辑漂移。
+- 新增 Codex App thread fallback、标准 payload 优先级、legacy PPID 和 Qoder/Claude 双环境变量回归测试，并同步设计文档与安装后 hook 验证。
+
+## 0.8.2
+
+- 正式发布原生选择超时恢复：平台明确保证永久等待时禁用或省略 timeout / auto-resolution，无法保证时在调用原生选择前预先展示持久化文本编号。
+- 原生选择超时、取消或返回无效结果后保留 `pending_transition` 且不重试；用户稍后可直接回复普通门 `1/2/3` 或特殊 IMPLEMENT 门 `1/2/3/4` 继续流程。
+- 汇总 `0.8.2-beta.0` 的 workflow、analysis、Claude/Codex/Qoder 主约束、文档、安装回归和 npm 包内容验证结果。
+
 ## 0.8.2-beta.0
 
 - 原生选择工具明确保证永久等待时，确认门禁用或省略 timeout / auto-resolution；有限超时不再视为“永久等待”。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-coding-harness",
-  "version": "0.8.2-beta.0",
+  "version": "0.8.3-beta.0",
   "description": "CLI scaffold for installing Easy Coding harness files into agent-native directories.",
   "repository": {
     "type": "git",

package/templates/shared-hooks/easy_coding_state.py

@@ -142,17 +142,18 @@ def normalize_session_agent(agent: str | None) -> str:
 
 
 def detect_runtime_agent() -> str:
-    if os.environ.get("CLAUDE_PROJECT_DIR"):
-        return "claude-code"
-    if os.environ.get("QODER_PROJECT_DIR"):
-        return "qoder"
     script_path = Path(sys.argv[0]).as_posix()
-    if ".claude/" in script_path:
-        return "claude-code"
+    if ".qoder/" in script_path or ".qodercn/" in script_path:
+        return "qoder"
     if ".codex/" in script_path:
         return "codex"
-    if ".qoder/" in script_path or ".qodercn/" in script_path:
+    if ".claude/" in script_path:
+        return "claude-code"
+    # Qoder CLI 会暴露 Claude 兼容环境变量，专属信号必须优先于兼容信号。
+    if os.environ.get("QODER_PROJECT_DIR"):
         return "qoder"
+    if os.environ.get("CLAUDE_PROJECT_DIR"):
+        return "claude-code"
     return "unknown"
 
 
@@ -167,7 +168,7 @@ def normalize_session_component(value: str) -> str:
     return f"sha256-{digest}"
 
 
-# 逻辑会话由 Agent 命名空间与 hook session_id 共同标识；PPID 只用于缺少逻辑 ID 的兼容回退。
+# 逻辑会话由 Agent 命名空间与平台会话 ID 共同标识；PPID 只用于缺少逻辑 ID 的兼容回退。
 def hook_session_identity(
     payload: dict,
     agent: str | None,
@@ -176,9 +177,18 @@ def hook_session_identity(
     namespace = normalize_session_agent(agent)
     raw_session_id = payload.get("session_id") or payload.get("sessionId")
     external_session_id = str(raw_session_id).strip() if raw_session_id is not None else ""
+    source = "hook-session-id"
+    if not external_session_id and namespace == "codex":
+        # Codex App 当前会把 thread ID 暴露在进程环境中；标准 hook session_id 仍保持最高优先级。
+        raw_thread_id = (
+            payload.get("thread_id")
+            or payload.get("threadId")
+            or os.environ.get("CODEX_THREAD_ID")
+        )
+        external_session_id = str(raw_thread_id).strip() if raw_thread_id is not None else ""
+        source = "codex-thread-id"
     if external_session_id:
         component = normalize_session_component(external_session_id)
-        source = "hook-session-id"
     else:
         component = f"ppid-{ppid if ppid is not None else os.getppid()}"
         source = "legacy-ppid"
@@ -637,7 +647,8 @@ def resolve_session_path(root: Path, session_file: str | Path | None = None) ->
                 f"{session_file}. Must be a file under .easy-coding/sessions/."
             )
         return resolved
-    return sessions_dir / f"{detect_runtime_agent()}-ppid-{os.getppid()}.json"
+    identity = hook_session_identity({}, detect_runtime_agent())
+    return sessions_dir / f"{identity['session_key']}.json"
 
 
 def resolve_hook_session_path(

package/templates/shared-hooks/inject-subagent-context.py

@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import sys
 
-from easy_coding_state import ensure_hook_session, snapshot_state
+from easy_coding_state import detect_runtime_agent, ensure_hook_session, snapshot_state
 
 
 def configure_stdio() -> None:
@@ -30,21 +30,6 @@ def find_ec_root(start: Path) -> Path | None:
         current = current.parent
 
 
-def detect_agent() -> str:
-    if os.environ.get("CLAUDE_PROJECT_DIR"):
-        return "claude-code"
-    if os.environ.get("QODER_PROJECT_DIR"):
-        return "qoder"
-    hook_path = Path(sys.argv[0]).as_posix()
-    if ".claude/" in hook_path:
-        return "claude-code"
-    if ".codex/" in hook_path:
-        return "codex"
-    if ".qoder/" in hook_path or ".qodercn/" in hook_path:
-        return "qoder"
-    return "unknown"
-
-
 def emit(event_name: str, context: str) -> None:
     print(
         json.dumps(
@@ -69,7 +54,7 @@ def main() -> int:
     if root is None:
         return 0
 
-    agent = detect_agent()
+    agent = detect_runtime_agent()
     session, session_path = ensure_hook_session(root, payload, agent)
     if session and session.get("harness_disabled") is True:
         return 0

package/templates/shared-hooks/inject-workflow-state.py

@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import sys
 
-from easy_coding_state import ensure_hook_session
+from easy_coding_state import detect_runtime_agent, ensure_hook_session
 from easy_coding_status import build_status_context
 
 
@@ -31,21 +31,6 @@ def find_ec_root(start: Path) -> Path | None:
         current = current.parent
 
 
-def detect_agent() -> str:
-    if os.environ.get("CLAUDE_PROJECT_DIR"):
-        return "claude-code"
-    if os.environ.get("QODER_PROJECT_DIR"):
-        return "qoder"
-    hook_path = Path(sys.argv[0]).as_posix()
-    if ".claude/" in hook_path:
-        return "claude-code"
-    if ".codex/" in hook_path:
-        return "codex"
-    if ".qoder/" in hook_path or ".qodercn/" in hook_path:
-        return "qoder"
-    return "unknown"
-
-
 def emit(event_name: str, context: str) -> None:
     print(
         json.dumps(
@@ -71,7 +56,7 @@ def main() -> int:
         return 0
 
     event_name = payload.get("hook_event_name") or payload.get("hookEventName") or "UserPromptSubmit"
-    agent = detect_agent()
+    agent = detect_runtime_agent()
     session, session_path = ensure_hook_session(root, payload, agent)
     emit(event_name, build_status_context(root, session, agent, session_path))
     return 0

package/templates/shared-hooks/session-start.py

@@ -4,7 +4,7 @@ import os
 from pathlib import Path
 import sys
 
-from easy_coding_state import ensure_hook_session
+from easy_coding_state import detect_runtime_agent, ensure_hook_session
 from easy_coding_status import build_status_context
 
 
@@ -31,21 +31,6 @@ def find_ec_root(start: Path) -> Path | None:
         current = current.parent
 
 
-def detect_agent() -> str:
-    if os.environ.get("CLAUDE_PROJECT_DIR"):
-        return "claude-code"
-    if os.environ.get("QODER_PROJECT_DIR"):
-        return "qoder"
-    hook_path = Path(sys.argv[0]).as_posix()
-    if ".claude/" in hook_path:
-        return "claude-code"
-    if ".codex/" in hook_path:
-        return "codex"
-    if ".qoder/" in hook_path or ".qodercn/" in hook_path:
-        return "qoder"
-    return "unknown"
-
-
 def emit(event_name: str, context: str) -> None:
     print(
         json.dumps(
@@ -70,7 +55,7 @@ def main() -> int:
     if root is None:
         return 0
 
-    agent = detect_agent()
+    agent = detect_runtime_agent()
     event_name = payload.get("hook_event_name") or payload.get("hookEventName") or "SessionStart"
     session, session_path = ensure_hook_session(root, payload, agent)
     emit(event_name, build_status_context(root, session, agent, session_path))