orchex 0.2.2__tar.gz → 0.2.3__tar.gz

{orchex-0.2.2 → orchex-0.2.3}/.claude/skills/checkpointing/scripts/checkpoint.py

@@ -205,7 +205,7 @@ def get_file_stats(since: str | None = None) -> dict[str, tuple[int, int]]:
     return stats
 
 
-def summarize_entries(entries: list[dict]) -> dict[str, list[dict]]:
+def summarize_entries(entries: list[dict]) -> dict[str, dict[str, list[dict]]]:
     """Group and summarize entries by tool and date."""
     by_date: dict[str, dict[str, list]] = {}
 

{orchex-0.2.2 → orchex-0.2.3}/.codex/skills/checkpointing/scripts/checkpoint.py

@@ -205,7 +205,7 @@ def get_file_stats(since: str | None = None) -> dict[str, tuple[int, int]]:
     return stats
 
 
-def summarize_entries(entries: list[dict]) -> dict[str, list[dict]]:
+def summarize_entries(entries: list[dict]) -> dict[str, dict[str, list[dict]]]:
     """Group and summarize entries by tool and date."""
     by_date: dict[str, dict[str, list]] = {}
 

{orchex-0.2.2 → orchex-0.2.3}/.gitignore

@@ -30,6 +30,7 @@ env/
 *.log
 
 .claude/.mcp-proxy.pid
+.worktrees/
 
 # CocoIndex local search index
 .cocoindex_code/

{orchex-0.2.2 → orchex-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: orchex
-Version: 0.2.2
+Version: 0.2.3
 Summary: Multi-agent orchestration framework for Claude Code + Codex CLI + Gemini CLI
 License-Expression: MIT
 Requires-Python: >=3.12

orchex-0.2.3/ai_orchestra/_version.py

@@ -0,0 +1,24 @@
+# file generated by vcs-versioning
+# don't change, don't track in version control
+from __future__ import annotations
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+version: str
+__version__: str
+__version_tuple__: tuple[int | str, ...]
+version_tuple: tuple[int | str, ...]
+commit_id: str | None
+__commit_id__: str | None
+
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
+
+__commit_id__ = commit_id = None

{orchex-0.2.2 → orchex-0.2.3}/facets/scripts/checkpoint.py

@@ -205,7 +205,7 @@ def get_file_stats(since: str | None = None) -> dict[str, tuple[int, int]]:
     return stats
 
 
-def summarize_entries(entries: list[dict]) -> dict[str, list[dict]]:
+def summarize_entries(entries: list[dict]) -> dict[str, dict[str, list[dict]]]:
     """Group and summarize entries by tool and date."""
     by_date: dict[str, dict[str, list]] = {}
 

{orchex-0.2.2 → orchex-0.2.3}/packages/codex-suggestions/tests/test_check_codex_after_plan.py

@@ -62,7 +62,7 @@ def test_is_plan_agent_task_false_for_missing_fields() -> None:
 # --- main (stdout/exit-code integration) ---
 
 
-def _run_main_with_stdin(data: dict) -> tuple[str, int]:
+def _run_main_with_stdin(data: dict) -> tuple[str, str | int]:
     """main() を stdin モックで実行し (stdout, exit_code) を返す。"""
     import io
     import sys

{orchex-0.2.2 → orchex-0.2.3}/packages/core/hooks/inject-shared-context.py

@@ -188,14 +188,17 @@ def main() -> None:
     if not injection:
         return
 
+    # additionalContext: オーケストレーターに表示される
+    # updatedInput: サブエージェントの prompt に直接注入される
     original_prompt = tool_input.get("prompt") or ""
-    new_prompt = original_prompt + injection
-
-    new_tool_input = {**tool_input, "prompt": new_prompt}
+    new_tool_input = {**tool_input, "prompt": original_prompt + injection}
 
     output = {
-        "decision": "approve",
-        "tool_input": new_tool_input,
+        "hookSpecificOutput": {
+            "hookEventName": "PreToolUse",
+            "additionalContext": injection.strip(),
+            "updatedInput": new_tool_input,
+        }
     }
     print(json.dumps(output, ensure_ascii=False))
 

{orchex-0.2.2 → orchex-0.2.3}/packages/core/hooks/load-task-state.py

@@ -130,7 +130,7 @@ def parse_tasks(
     content: str,
     marker_pattern: re.Pattern[str] | None = None,
     marker_to_state: dict[str, str] | None = None,
-) -> dict[str, list[dict[str, str]]]:
+) -> dict[str, list[dict[str, str | None]]]:
     """Plans.md の内容からタスクを状態別に分類する。
 
     Returns:
@@ -142,7 +142,7 @@ def parse_tasks(
     if marker_to_state is None:
         marker_to_state = DEFAULT_MARKER_TO_STATE
 
-    tasks: dict[str, list[dict[str, str]]] = {
+    tasks: dict[str, list[dict[str, str | None]]] = {
         "WIP": [],
         "TODO": [],
         "done": [],
@@ -182,7 +182,7 @@ def parse_tasks(
     return tasks
 
 
-def format_summary(tasks: dict[str, list[dict[str, str]]], max_display: int | None) -> str:
+def format_summary(tasks: dict[str, list[dict[str, str | None]]], max_display: int | None) -> str:
     """タスク状態のサマリーをフォーマットする。"""
     parts: list[str] = []
 

{orchex-0.2.2 → orchex-0.2.3}/packages/core/hooks/update-working-context.py

@@ -54,6 +54,8 @@ try:
 
     _CONTEXT_STORE_AVAILABLE = True
 except ImportError:
+    from typing import Any
+
     _CONTEXT_STORE_AVAILABLE = False
 
     def get_project_dir(data: dict) -> str:  # type: ignore[misc]
@@ -63,6 +65,9 @@ except ImportError:
             return cwd
         return os.environ.get("CLAUDE_PROJECT_DIR", os.getcwd())
 
+    def update_working_context(project_dir: str, updates: dict[str, Any]) -> None:
+        """フォールバック: context_store が利用不可なら何もしない。"""
+
 
 def to_relative_path(file_path: str, project_dir: str) -> str:
     """file_path から project_dir プレフィックスを除去して相対パスに変換する。

{orchex-0.2.2 → orchex-0.2.3}/packages/core/tests/test_hook_common.py

@@ -3,6 +3,8 @@ import json
 import sys
 from pathlib import Path
 
+import pytest
+
 from tests.module_loader import load_module
 
 hook_common = load_module("hook_common", "packages/core/hooks/hook_common.py")
@@ -39,7 +41,7 @@ def _write_json(path: Path, data: dict) -> None:
 
 class TestLoadPackageConfig:
     def test_project_local_overrides_orchestra_base(
-        self, tmp_path: Path, monkeypatch: object
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
     ) -> None:
         """base が orchestra dir にあっても project dir の .local が優先される。"""
         orchestra_dir = tmp_path / "orchestra"
@@ -59,7 +61,9 @@ class TestLoadPackageConfig:
         assert result["key"] == "local"  # local override が効いている
         assert result["only_base"] is True  # base のキーは保持
 
-    def test_falls_back_to_base_dir_local(self, tmp_path: Path, monkeypatch: object) -> None:
+    def test_falls_back_to_base_dir_local(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         """project dir に .local がない場合は base と同じディレクトリの .local を使う。"""
         config_dir = tmp_path / "project" / ".claude" / "config" / "mypkg"
         _write_json(config_dir / "settings.json", {"key": "base"})
@@ -70,7 +74,9 @@ class TestLoadPackageConfig:
         )
         assert result["key"] == "local-same-dir"
 
-    def test_no_local_returns_base_only(self, tmp_path: Path, monkeypatch: object) -> None:
+    def test_no_local_returns_base_only(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
         """local ファイルが存在しない場合は base のみ返す。"""
         config_dir = tmp_path / "project" / ".claude" / "config" / "mypkg"
         _write_json(config_dir / "settings.json", {"key": "base", "nested": {"a": 1}})

{orchex-0.2.2 → orchex-0.2.3}/scripts/lib/hook_utils.py

@@ -48,7 +48,7 @@ def add_hook_to_settings(
 
     hook_obj = {"type": "command", "command": command, "timeout": timeout}
 
-    target_entry = None
+    target_entry: dict[str, Any] | None = None
     for entry in settings_hooks[event]:
         if matcher:
             if entry.get("matcher") == matcher:

{orchex-0.2.2 → orchex-0.2.3}/scripts/lib/orchestra_context.py

@@ -4,18 +4,35 @@ from __future__ import annotations
 
 import sys
 from pathlib import Path
+from typing import TYPE_CHECKING, Protocol
+
+if TYPE_CHECKING:
+    ContextSpecEntry = tuple[str, str, str, str]
+
+
+class _ContextHost(Protocol):
+    """ContextMixin が利用側に要求するインターフェース。"""
+
+    orchestra_dir: Path
+    CONTEXT_SPECS: tuple[ContextSpecEntry, ...]
+    CONTEXT_SHARED_REL: str
+
+    def get_project_dir(self, project: str | None) -> Path: ...
 
 
 class ContextMixin:
     """OrchestraManager に context 管理機能を提供する Mixin。
 
-    利用側で以下の属性・メソッドが必要:
-    - self.orchestra_dir: Path
-    - self.CONTEXT_SPECS: tuple
-    - self.CONTEXT_SHARED_REL: str
-    - self.get_project_dir(project) -> Path
+    利用側は _ContextHost Protocol を満たすこと。
     """
 
+    # Protocol で宣言した属性を型チェッカーに認識させる
+    orchestra_dir: Path
+    CONTEXT_SPECS: tuple[ContextSpecEntry, ...]
+    CONTEXT_SHARED_REL: str
+
+    def get_project_dir(self, project: str | None) -> Path: ...
+
     def _load_context_file(self, path: Path) -> str:
         """context テンプレートファイルを読み込む（存在しなければ終了）。"""
         if not path.exists():

{orchex-0.2.2 → orchex-0.2.3}/scripts/lib/orchestra_hooks.py

@@ -27,12 +27,13 @@ from lib.settings_io import (
 class HooksMixin:
     """OrchestraManager にフック管理機能を提供する Mixin。
 
-    利用側で以下の属性・メソッドが必要:
-    - self.orchestra_dir: Path
-    - self.SYNC_HOOK_COMMAND: str
-    - self.SYNC_HOOK_TIMEOUT: int
+    利用側は以下の属性を定義すること。
     """
 
+    orchestra_dir: Path
+    SYNC_HOOK_COMMAND: str
+    SYNC_HOOK_TIMEOUT: int
+
     # --- settings / orchestra.json I/O（settings_io に委譲） ---
 
     @staticmethod

orchex-0.2.2/ai_orchestra/_version.py

@@ -1,34 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = [
-    "__version__",
-    "__version_tuple__",
-    "version",
-    "version_tuple",
-    "__commit_id__",
-    "commit_id",
-]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-    COMMIT_ID = Union[str, None]
-else:
-    VERSION_TUPLE = object
-    COMMIT_ID = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-commit_id: COMMIT_ID
-__commit_id__: COMMIT_ID
-
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
-
-__commit_id__ = commit_id = None