auto-coder 3.0.51__tar.gz → 3.0.52__tar.gz

{auto_coder-3.0.51/src/auto_coder.egg-info → auto_coder-3.0.52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 3.0.51
+Version: 3.0.52
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Author-email: allwefantasy <allwefantasy@gmail.com>
@@ -226,6 +226,8 @@ Requires-Dist: argcomplete
 Requires-Dist: psutil
 Requires-Dist: patch-ng
 Requires-Dist: firecrawl
+Requires-Dist: aiohttp
+Requires-Dist: httpx[socks]
 Dynamic: author
 Dynamic: license-file
 

{auto_coder-3.0.51 → auto_coder-3.0.52}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "auto-coder"
-version = "3.0.51"
+version = "3.0.52"
 description = "AutoCoder: AutoCoder"
 authors = [
     {name = "allwefantasy", email = "allwefantasy@gmail.com"}
@@ -77,6 +77,8 @@ dependencies = [
     "psutil",
     "patch-ng",
     "firecrawl",
+    "aiohttp",
+    "httpx[socks]",
 ]
 
 [project.scripts]

{auto_coder-3.0.51 → auto_coder-3.0.52}/requirements.txt

@@ -89,3 +89,5 @@ argcomplete
 psutil
 patch-ng
 firecrawl
+aiohttp
+httpx[socks]

{auto_coder-3.0.51 → auto_coder-3.0.52/src/auto_coder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-coder
-Version: 3.0.51
+Version: 3.0.52
 Summary: AutoCoder: AutoCoder
 Author: allwefantasy
 Author-email: allwefantasy <allwefantasy@gmail.com>
@@ -226,6 +226,8 @@ Requires-Dist: argcomplete
 Requires-Dist: psutil
 Requires-Dist: patch-ng
 Requires-Dist: firecrawl
+Requires-Dist: aiohttp
+Requires-Dist: httpx[socks]
 Dynamic: author
 Dynamic: license-file
 

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/auto_coder.egg-info/requires.txt

@@ -53,3 +53,5 @@ argcomplete
 psutil
 patch-ng
 firecrawl
+aiohttp
+httpx[socks]

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/auto_coder_terminal_v3.py

@@ -75,13 +75,21 @@ from autocoder.terminal_v3 import AutoCoderChatApp
 
 
 def parse_arguments():
+    from autocoder.version import __version__
+
     parser = argparse.ArgumentParser(
         description="Auto-Coder V3 - Claude-style Chat Interface"
     )
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"auto-coder.chat.lite {__version__}",
+        help="Show program version and exit",
+    )
     parser.add_argument("--debug", action="store_true", help="Enable debug mode")
     parser.add_argument(
-        "--quick",
-        action="store_true",
+        "--quick",        action="store_true",
         help="Enter the auto-coder.chat without initializing the system",
     )
     parser.add_argument(

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/common/llms/registry.py

@@ -277,13 +277,15 @@ DEFAULT_MODELS = [
         "input_price": 21.6,
         "output_price": 108.0,
         "cache_read_input_price": 2.16,  # $0.30/百万tokens ≈ 2.16元
+        "cache_creation_input_price": 27.0,  # $3.75/百万tokens ≈ 27元
         "pricing_rules": [
             {"category": "input_tokens", "price": 21.6, "min_tokens": 0, "priority": 10},
             {"category": "output_tokens", "price": 108.0, "min_tokens": 0, "priority": 10},
             {"category": "cache_read_input_tokens", "price": 2.16, "min_tokens": 0, "priority": 10},
+            {"category": "cache_creation_input_tokens", "price": 27.0, "min_tokens": 0, "priority": 10},
         ],
         "max_output_tokens": 128000,
-        "context_window": 1050000,
+        "context_window": 1000000,
     },
     {
         "name": "openrouter/claude-opus-4-6",
@@ -296,9 +298,13 @@ DEFAULT_MODELS = [
         "is_reasoning": True,
         "input_price": 36.0,  # $5/百万tokens ≈ 36元
         "output_price": 180.0,  # $25/百万tokens ≈ 180元
+        "cache_read_input_price": 3.6,  # $0.5/百万tokens ≈ 3.6元
+        "cache_creation_input_price": 45.0,  # $6.25/百万tokens ≈ 45元
         "pricing_rules": [
             {"category": "input_tokens", "price": 36.0, "min_tokens": 0, "priority": 10},
             {"category": "output_tokens", "price": 180.0, "min_tokens": 0, "priority": 10},
+            {"category": "cache_read_input_tokens", "price": 3.6, "min_tokens": 0, "priority": 10},
+            {"category": "cache_creation_input_tokens", "price": 45.0, "min_tokens": 0, "priority": 10},
         ],
         "max_output_tokens": 128000,
         "context_window": 1000000,
@@ -314,9 +320,13 @@ DEFAULT_MODELS = [
         "is_reasoning": True,
         "input_price": 36.0,  # $5/百万tokens ≈ 36元
         "output_price": 180.0,  # $25/百万tokens ≈ 180元
+        "cache_read_input_price": 3.6,  # $0.5/百万tokens ≈ 3.6元
+        "cache_creation_input_price": 45.0,  # $6.25/百万tokens ≈ 45元
         "pricing_rules": [
             {"category": "input_tokens", "price": 36.0, "min_tokens": 0, "priority": 10},
             {"category": "output_tokens", "price": 180.0, "min_tokens": 0, "priority": 10},
+            {"category": "cache_read_input_tokens", "price": 3.6, "min_tokens": 0, "priority": 10},
+            {"category": "cache_creation_input_tokens", "price": 45.0, "min_tokens": 0, "priority": 10},
         ],
         "max_output_tokens": 128000,
         "context_window": 1000000,
@@ -324,6 +334,27 @@ DEFAULT_MODELS = [
     {
         "name": "openrouter/openai/gpt-5",
         "description": "GPT-5 via OpenRouter，OpenAI 最新模型",
+        "model_name": "openai/gpt-5",
+        "model_type": "saas/openrouter",
+        "base_url": "https://openrouter.ai/api/v1",
+        "provider": "openrouter",
+        "api_key_path": "",
+        "is_reasoning": True,
+        "input_price": 9.0,  # $1.25/百万tokens ≈ 9元
+        "output_price": 72.0,  # $10/百万tokens ≈ 72元
+        "cache_read_input_price": 0.9,  # $0.125/百万tokens ≈ 0.9元
+        "pricing_rules": [
+            {"category": "input_tokens", "price": 9.0, "min_tokens": 0, "priority": 10},
+            {"category": "output_tokens", "price": 72.0, "min_tokens": 0, "priority": 10},
+            {"category": "cache_read_input_tokens", "price": 0.9, "min_tokens": 0, "priority": 10},
+        ],
+        "max_output_tokens": 128000,
+        "context_window": 400000,
+        "thinking": {"type": "enabled"},
+    },
+    {
+        "name": "openrouter/openai/gpt-5.4",
+        "description": "GPT-5.4 via OpenRouter，OpenAI 前沿模型",
         "model_name": "openai/gpt-5.4",
         "model_type": "saas/openrouter",
         "base_url": "https://openrouter.ai/api/v1",
@@ -345,6 +376,25 @@ DEFAULT_MODELS = [
     {
         "name": "openrouter/openai/gpt-5-pro",
         "description": "GPT-5 Pro via OpenRouter，OpenAI 最新模型",
+        "model_name": "openai/gpt-5-pro",
+        "model_type": "saas/openrouter",
+        "base_url": "https://openrouter.ai/api/v1",
+        "provider": "openrouter",
+        "api_key_path": "",
+        "is_reasoning": True,
+        "input_price": 108.0,  # $15/百万tokens ≈ 108元
+        "output_price": 864.0,  # $120/百万tokens ≈ 864元
+        "pricing_rules": [
+            {"category": "input_tokens", "price": 108.0, "min_tokens": 0, "priority": 10},
+            {"category": "output_tokens", "price": 864.0, "min_tokens": 0, "priority": 10},
+        ],
+        "max_output_tokens": 128000,
+        "context_window": 400000,
+        "thinking": {"type": "enabled"},
+    },
+    {
+        "name": "openrouter/openai/gpt-5.4-pro",
+        "description": "GPT-5.4 Pro via OpenRouter，OpenAI 前沿推理模型",
         "model_name": "openai/gpt-5.4-pro",
         "model_type": "saas/openrouter",
         "base_url": "https://openrouter.ai/api/v1",

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/terminal/args.py

@@ -14,11 +14,19 @@ from autocoder.terminal_core.cloud_config import (
 
 def parse_arguments():
     """解析命令行参数"""
+    from autocoder.version import __version__
+
     parser = argparse.ArgumentParser(description="Chat Auto Coder")
+    parser.add_argument(
+        "-v",
+        "--version",
+        action="version",
+        version=f"auto-coder.chat {__version__}",
+        help="Show program version and exit",
+    )
     parser.add_argument("--debug", action="store_true", help="Enable debug mode")
     parser.add_argument(
-        "--quick",
-        action="store_true",
+        "--quick",        action="store_true",
         help="Enter the auto-coder.chat without initializing the system",
     )
 

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/terminal_core/cloud_bridge.py

@@ -102,6 +102,39 @@ class PendingRun:
     forward_to_running: bool = False
 
 
+def _is_codex_shell_run(prompt_text: str) -> bool:
+    text = (prompt_text or "").strip()
+    return text.startswith("!") and "codex exec" in text and "--json" in text
+
+
+def _filter_codex_item_completed_events(result_text: str) -> Optional[str]:
+    thread_id: Optional[str] = None
+    lines: List[str] = []
+    for raw_line in (result_text or "").splitlines():
+        line = raw_line.strip()
+        if not line.startswith("{"):
+            continue
+        try:
+            event = json.loads(line)
+        except Exception:
+            continue
+        if not isinstance(event, dict):
+            continue
+        if event.get("type") == "thread.started" and isinstance(
+            event.get("thread_id"), str
+        ):
+            thread_id = event["thread_id"]
+            continue
+        if event.get("type") != "item.completed":
+            continue
+        if thread_id and not isinstance(event.get("thread_id"), str):
+            event["thread_id"] = thread_id
+        lines.append(
+            json.dumps(event, ensure_ascii=False, separators=(",", ":"))
+        )
+    return "\n".join(lines) if lines else None
+
+
 class CloudBridge:
     """
     云端桥接：注册、心跳、轮询任务、执行、结果回传。
@@ -721,10 +754,13 @@ class CloudBridge:
                 )
             else:
                 outcome = cmd_result.outcome
+                result_text = cmd_result.result_text or ""
+                if _is_codex_shell_run(run.prompt_text):
+                    result_text = _filter_codex_item_completed_events(result_text) or ""
                 await self._report_result(
                     run.id,
                     "COMPLETED",
-                    result_text=cmd_result.result_text or "",
+                    result_text=result_text,
                     result_payloads=outcome.payload if outcome and outcome.payload else None,
                 )
         except Exception as e:

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/terminal_v3/handlers/command_handler.py

@@ -56,7 +56,7 @@ _SUBAGENT_ORCHESTRATION_RULE_TEMPLATE = """1. Complete the user's request by com
      - the exact intended changes, including old-code to new-code change descriptions
      - the context and rationale for the changes
      - for multi-file changes, the dependencies between files and the required modification order
-     - the expected final output in the subagent's `attempt_completion` result; if you need a specific summary format, checklist, JSON shape, evidence section, or other structured deliverable, explicitly require it in the subagent task prompt so the user can precisely control what the subagent returns
+     - the expected final output in the subagent's `attempt_completion` result; if you need a specific summary format, checklist, JSON shape, evidence section, or other structured deliverable, explicitly require it in the subagent task prompt so you can precisely control what the subagent returns
    - **Global coordination**: decompose the user's request into multiple subagents whenever possible, ensure each subagent has a precise scope, run independent subagents in parallel when possible, and run dependent subagents serially.
    - **Result validation (critically important)**: after subagents finish, you must personally review their results, diffs, and evidence against the user's request. Do not outsource this review to another subagent; instead, launch follow-up fix subagents when needed.
    - **Task completion judgment**: only after your own review confirms that the implementation satisfies the user's request should you explain the changes in detail. If your review finds the result does not meet the requirements, you must not stop and you must not hand the task back to the user as "done". Instead, take the gap as the new input, produce an updated plan that addresses the specific shortcomings (which files, which locations, what to change, and the expected `attempt_completion` output), then dispatch new subagents to execute that plan and repeat the entire orchestrate → review → judge loop until the user's original request is fully satisfied."""

{auto_coder-3.0.51 → auto_coder-3.0.52}/src/autocoder/version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = "3.0.51"
+__version__ = "3.0.52"

{auto_coder-3.0.51 → auto_coder-3.0.52}/tests/test_llm_pricing_detailed.py

@@ -2,7 +2,7 @@ from types import SimpleNamespace
 
 from autocoder.common.llms.manager import LLMManager
 from autocoder.common.llms.pricing import PricingManager
-from autocoder.common.llms.registry import ModelRegistry
+from autocoder.common.llms.registry import DEFAULT_MODELS, ModelRegistry
 from autocoder.common.llms.schema import LLMModel, PricingRule
 from autocoder.common.v2.agent.agentic_edit_types import (
     AgentIdentity,
@@ -16,6 +16,94 @@ def _pricing_manager() -> PricingManager:
     return PricingManager(ModelRegistry())
 
 
+def test_default_openrouter_registry_entries_match_expected_model_ids_and_prices():
+    models = {
+        model["name"]: model
+        for model in DEFAULT_MODELS
+        if model.get("base_url") == "https://openrouter.ai/api/v1"
+    }
+
+    expected = {
+        "openrouter/claude-sonnet-4-6": {
+            "model_name": "anthropic/claude-sonnet-4.6",
+            "input_price": 21.6,
+            "output_price": 108.0,
+            "cache_read_input_price": 2.16,
+            "cache_creation_input_price": 27.0,
+            "context_window": 1_000_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/claude-opus-4-6": {
+            "model_name": "anthropic/claude-opus-4.6",
+            "input_price": 36.0,
+            "output_price": 180.0,
+            "cache_read_input_price": 3.6,
+            "cache_creation_input_price": 45.0,
+            "context_window": 1_000_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/claude-opus-4-7": {
+            "model_name": "anthropic/claude-opus-4.7",
+            "input_price": 36.0,
+            "output_price": 180.0,
+            "cache_read_input_price": 3.6,
+            "cache_creation_input_price": 45.0,
+            "context_window": 1_000_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/openai/gpt-5": {
+            "model_name": "openai/gpt-5",
+            "input_price": 9.0,
+            "output_price": 72.0,
+            "cache_read_input_price": 0.9,
+            "context_window": 400_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/openai/gpt-5.4": {
+            "model_name": "openai/gpt-5.4",
+            "input_price": 18.0,
+            "output_price": 108.0,
+            "cache_read_input_price": 1.8,
+            "context_window": 1_050_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/openai/gpt-5-pro": {
+            "model_name": "openai/gpt-5-pro",
+            "input_price": 108.0,
+            "output_price": 864.0,
+            "context_window": 400_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/openai/gpt-5.4-pro": {
+            "model_name": "openai/gpt-5.4-pro",
+            "input_price": 216.0,
+            "output_price": 1296.0,
+            "context_window": 1_050_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/gpt-5.5": {
+            "model_name": "openai/gpt-5.5",
+            "input_price": 36.0,
+            "output_price": 216.0,
+            "cache_read_input_price": 3.6,
+            "context_window": 1_050_000,
+            "max_output_tokens": 128_000,
+        },
+        "openrouter/gpt-5.5-pro": {
+            "model_name": "openai/gpt-5.5-pro",
+            "input_price": 216.0,
+            "output_price": 1296.0,
+            "context_window": 1_050_000,
+            "max_output_tokens": 128_000,
+        },
+    }
+
+    assert set(models) == set(expected)
+    for name, fields in expected.items():
+        for key, value in fields.items():
+            assert models[name].get(key) == value
+
+
 def test_detailed_cost_deducts_cache_tokens_from_total_input():
     model = LLMModel(
         name="test/cache-dedup",
@@ -45,6 +133,96 @@ def test_detailed_cost_deducts_cache_tokens_from_total_input():
     assert abs(cost_detail.total_cost - 1.63) < 1e-12
 
 
+def test_openrouter_claude_opus_4_7_cache_read_uses_discount_price():
+    model = LLMModel(
+        name="openrouter/claude-opus-4-7",
+        model_name="anthropic/claude-opus-4.7",
+        model_type="saas/openai",
+        base_url="https://openrouter.ai/api/v1",
+        provider="openrouter",
+        input_price=36.0,
+        output_price=180.0,
+        cache_read_input_price=3.6,
+        cache_creation_input_price=45.0,
+        pricing_rules=[
+            PricingRule(
+                category="input_tokens", price=36.0, priority=10, min_tokens=0
+            ),
+            PricingRule(
+                category="output_tokens", price=180.0, priority=10, min_tokens=0
+            ),
+            PricingRule(
+                category="cache_read_input_tokens",
+                price=3.6,
+                priority=10,
+                min_tokens=0,
+            ),
+            PricingRule(
+                category="cache_creation_input_tokens",
+                price=45.0,
+                priority=10,
+                min_tokens=0,
+            ),
+        ],
+    )
+    usage = {
+        "input_tokens_count": 932_043,
+        "generated_tokens_count": 3_084,
+        "cache_read_input_tokens": 869_192,
+        "cache_creation_input_tokens": 0,
+    }
+
+    cost_detail = _pricing_manager().calculate_detailed_cost(model, usage)
+
+    assert cost_detail is not None
+    assert cost_detail.items["input_tokens"].token_count == 62_851
+    assert abs(cost_detail.items["input_tokens"].cost - 2.262636) < 1e-12
+    assert abs(cost_detail.cache_read_cost - 3.1290912) < 1e-12
+    assert abs(cost_detail.output_cost - 0.55512) < 1e-12
+    assert abs(cost_detail.total_cost - 5.9468472) < 1e-12
+
+
+def test_openrouter_openai_gpt_5_uses_gpt_5_rates_and_cache_discount():
+    model = LLMModel(
+        name="openrouter/openai/gpt-5",
+        model_name="openai/gpt-5",
+        model_type="saas/openrouter",
+        base_url="https://openrouter.ai/api/v1",
+        provider="openrouter",
+        input_price=9.0,
+        output_price=72.0,
+        cache_read_input_price=0.9,
+        pricing_rules=[
+            PricingRule(
+                category="input_tokens", price=9.0, priority=10, min_tokens=0
+            ),
+            PricingRule(
+                category="output_tokens", price=72.0, priority=10, min_tokens=0
+            ),
+            PricingRule(
+                category="cache_read_input_tokens",
+                price=0.9,
+                priority=10,
+                min_tokens=0,
+            ),
+        ],
+    )
+    usage = {
+        "input_tokens_count": 1_000_000,
+        "generated_tokens_count": 100_000,
+        "cache_read_input_tokens": 600_000,
+    }
+
+    cost_detail = _pricing_manager().calculate_detailed_cost(model, usage)
+
+    assert cost_detail is not None
+    assert cost_detail.items["input_tokens"].token_count == 400_000
+    assert abs(cost_detail.items["input_tokens"].cost - 3.6) < 1e-12
+    assert abs(cost_detail.cache_read_cost - 0.54) < 1e-12
+    assert abs(cost_detail.output_cost - 7.2) < 1e-12
+    assert abs(cost_detail.total_cost - 11.34) < 1e-12
+
+
 def test_explicit_regular_input_tokens_are_used_when_present():
     model = LLMModel(
         name="test/regular-input",