aicortexpy 0.2.3__tar.gz → 0.2.5__tar.gz

{aicortexpy-0.2.3/aicortexpy.egg-info → aicortexpy-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aicortexpy
-Version: 0.2.3
+Version: 0.2.5
 Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
 Author: AICortex
 License: Apache-2.0

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/__init__.py

@@ -1,3 +1,3 @@
 """AICortex Python CLI + local agent runtime daemon."""
 
-__version__ = "0.2.3"
+__version__ = "0.2.5"

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/acp_conn.py

@@ -37,9 +37,20 @@ HANDSHAKE_TIMEOUT = 120.0
 PROMPT_TIMEOUT = 20 * 60.0
 STDOUT_MAX_LINE = 10 * 1024 * 1024  # match Go scanner max token
 
+# UI / agent form may send these; ACP session/set_model rejects them (e.g. Cursor -32602).
+_ACP_MODEL_SENTINELS = frozenset({"", "auto", "default", "none"})
+
 MessageCB = Callable[[dict[str, Any]], None]
 
 
+def normalize_acp_model(model: str | None) -> str:
+    """Return a concrete model id for ACP, or '' to keep the agent default."""
+    m = (model or "").strip()
+    if m.lower() in _ACP_MODEL_SENTINELS:
+        return ""
+    return m
+
+
 @dataclass
 class ACPPromptResult:
     status: str
@@ -533,26 +544,43 @@ class _BaseACPConn:
                 raise RuntimeError(f"{self.provider} acp session/new returned no session ID")
         self._session_id = session_id
         self._client.session_id = session_id
-        self._model = model
+        # UI may send sentinel "auto"/"default"; ACP session/set_model rejects those.
+        effective_model = normalize_acp_model(model)
+        self._model = effective_model
         log.info("%s acp session ready session_id=%s", self.provider, session_id)
-        if not model:
+        if not effective_model:
+            if (model or "").strip():
+                log.info(
+                    "%s acp skipping set_model for sentinel model=%r",
+                    self.provider,
+                    model,
+                )
             return
         try:
             if self.model_via_config_option:
                 self._client.request(
                     "session/set_config_option",
-                    {"sessionId": session_id, "configId": "model", "value": model},
+                    {
+                        "sessionId": session_id,
+                        "configId": "model",
+                        "value": effective_model,
+                    },
                     timeout=handshake_timeout,
                 )
             else:
                 self._client.request(
                     "session/set_model",
-                    {"sessionId": session_id, "modelId": model},
+                    {"sessionId": session_id, "modelId": effective_model},
                     timeout=handshake_timeout,
                 )
         except Exception as e:
             if self.soft_set_model:
-                log.debug("%s acp set_model skipped: %s", self.provider, e)
+                log.warning(
+                    "%s acp set_model soft-failed model=%r: %s (continuing with agent default)",
+                    self.provider,
+                    effective_model,
+                    e,
+                )
                 return
             self.close()
             raise RuntimeError(f"{self.provider} acp set model failed: {e}") from e
@@ -561,6 +589,8 @@ class _BaseACPConn:
 class CursorACPConn(_BaseACPConn):
     provider = "cursor"
     require_set_model = True
+    # Prefer pooled chat over hard-failing on an unknown model id.
+    soft_set_model = True
 
     @classmethod
     def open(

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/capabilities.py

@@ -37,7 +37,7 @@ CAPABILITIES: list[Capability] = [
     Capability("repo_cache", "Bare cache + worktree checkout", "repocache/", "done", "per-ws bare + lock + worktree + co-authored hook"),
     Capability("pinned_workdir", "Pinned project workdir", "pinned_workdir.go", "done", "projects/<id> stages"),
     Capability("attachments", "Materialize attachments", "materialize_attachments.go", "done", "_incoming/"),
-    Capability("auto_commit", "Auto-commit agent changes", "auto_commit.go", "done", "best-effort commit/push"),
+    Capability("auto_commit", "Auto-commit agent changes", "auto_commit.go", "skipped", "disabled — user decides when to commit"),
     Capability("artifacts", "Artifacts metadata + WS browse/chunk", "artifact/", "done", "scan metadata + wakeup artifact ops"),
     Capability("agent_claude", "Claude stream-json backend", "claude.go", "done", "stream-json + resume + mcp-config"),
     Capability("agent_codex", "Codex exec backend", "codex.go", "done", "codex exec + CODEX_HOME + semantic inactivity"),

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/cli.py

@@ -63,11 +63,21 @@ def _setup_logging(
         level = logging.INFO
     else:
         level = logging.WARNING
+    # Windows consoles are often GBK; force UTF-8 so agent names like 小政 log cleanly.
+    for stream in (sys.stdout, sys.stderr):
+        reconf = getattr(stream, "reconfigure", None)
+        if callable(reconf):
+            try:
+                reconf(encoding="utf-8", errors="replace")
+            except Exception:
+                pass
     logging.basicConfig(
         level=level,
         format="%(asctime)s %(levelname)s %(name)s: %(message)s",
         datefmt="%H:%M:%S",
         force=True,
+        encoding="utf-8",
+        errors="replace",
     )
 
 

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/config.py

@@ -12,6 +12,8 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import Any
 
+from . import __version__ as _PKG_VERSION
+
 
 DEFAULT_SERVER_URL = "http://localhost:8080"
 DEFAULT_POLL_INTERVAL = 30.0
@@ -27,7 +29,8 @@ DEFAULT_CHAT_ACP_IDLE_TIMEOUT = 300.0
 DEFAULT_CHAT_ACP_MAX_CONNECTIONS = 50
 DEFAULT_AGENT_IDLE_WATCHDOG = 300.0  # 5m; 0 disables
 DEFAULT_CODEX_SEMANTIC_INACTIVITY = 600.0  # 10m; 0 disables
-CLI_VERSION = "0.2.0-python"
+
+CLI_VERSION = f"{_PKG_VERSION}-python"
 
 # provider -> (env path override, default binary name, model env)
 # Keep in sync with server/internal/daemon/config.go probe list.

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/daemon.py

@@ -16,7 +16,6 @@ from .app_workdir import (
     read_app_index_html,
 )
 from .artifacts import report_issue_artifacts
-from .auto_commit import auto_commit_and_push
 from .chat_acp_pool import ChatACPPool
 from .client import APIError, DaemonClient, Task, is_not_found
 from .config import Config, as_register_runtimes, detect_local_timezone
@@ -646,12 +645,6 @@ class Daemon:
                 fail_reason = poisoned_reason
 
         if result.ok:
-            try:
-                auto_commit_and_push(
-                    result.work_dir, task.id, str(agent_name)
-                )
-            except Exception as e:
-                log.warning("auto-commit: %s", e)
             if task.issue_id:
                 try:
                     report_issue_artifacts(

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/aicortexpy/runner.py

@@ -432,7 +432,10 @@ def run_agent(
             cleanup_plan(plan)
             _cleanup_mcp_tmp(mcp_tmp)
             return acp_result
-        log.warning("%s chat acp pool failed, falling back to one-shot backend", provider)
+        log.warning(
+            "%s chat acp pool failed, falling back to one-shot backend",
+            provider,
+        )
 
     # Non-chat ACP providers (kiro/hermes/kimi/dsh) — always JSON-RPC, not argv prompt.
     if provider in ACP_ONESHOT_PROVIDERS:
@@ -929,6 +932,11 @@ def _run_via_acp_pool(
 
     # Open failed → caller falls back to one-shot.
     if result.status == "failed" and "chat acp open failed" in (result.error or ""):
+        log.warning(
+            "%s chat acp open failed (will fall back): %s",
+            provider,
+            result.error,
+        )
         return None
 
     # Resume failed before a session was established → retry fresh once.

{aicortexpy-0.2.3 → aicortexpy-0.2.5/aicortexpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: aicortexpy
-Version: 0.2.3
+Version: 0.2.5
 Summary: AICortex Python CLI and local agent runtime daemon (Go CLI compatible)
 Author: AICortex
 License: Apache-2.0

{aicortexpy-0.2.3 → aicortexpy-0.2.5}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 # PyPI + import + console script entry for full Go CLI replacement.
 name = "aicortexpy"
-version = "0.2.3"
+version = "0.2.5"
 description = "AICortex Python CLI and local agent runtime daemon (Go CLI compatible)"
 readme = "README.md"
 license = { text = "Apache-2.0" }