henosis-cli 0.6.6__py3-none-any.whl → 0.6.7__py3-none-any.whl

{henosis_cli-0.6.6.dist-info → henosis_cli-0.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: henosis-cli
-Version: 0.6.6
+Version: 0.6.7
 Summary: henosis-cli — interactive CLI for the Henosis multi-provider streaming chat backend, with optional local tools.
 Author-email: henosis <henosis@henosis.us>
 License-Expression: LicenseRef-Proprietary

{henosis_cli-0.6.6.dist-info → henosis_cli-0.6.7.dist-info}/RECORD

@@ -3,9 +3,9 @@ henosis_cli_tools/__init__.py,sha256=x3uaN_ub32uALx_oURna0VnuoSsj7i9NYY6uRsc2ZzM
 henosis_cli_tools/cli_entry.py,sha256=OZTe_s9Hfy3mcsYG77T3RTdtCDod-CSwmhskbXjmmqs,1713
 henosis_cli_tools/input_engine.py,sha256=kGW6AgDGbdcVxlx5mvTPKYe4lYhho5wztvUAw7WlmTs,15286
 henosis_cli_tools/settings_ui.py,sha256=8rWsp0S3wT-dgkP0y20FOBmBBy7jYbDy8AuftmKcp4w,21368
-henosis_cli_tools/tool_impl.py,sha256=oZGajJMkR2jfyuPVe-iq2s6ktOl5-2K3RzX2R7FIAFQ,37414
-henosis_cli-0.6.6.dist-info/METADATA,sha256=FTcN41P41geCQJDQ3l8gechD9F7V1SwKIzkUB_P98Rg,5787
-henosis_cli-0.6.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-henosis_cli-0.6.6.dist-info/entry_points.txt,sha256=KmXDdmIjq1SVMs8FK3wHPA2i89RMaerzZHIetllMLIk,74
-henosis_cli-0.6.6.dist-info/top_level.txt,sha256=u7XMBcJ8Kb0n91WaSU-4Db8yURSUXFuOxGMsXti0a-g,34
-henosis_cli-0.6.6.dist-info/RECORD,,
+henosis_cli_tools/tool_impl.py,sha256=0iojZbVZhhPJybcmb2qYAuCesgQMp83JgPL2Py4PjT8,39250
+henosis_cli-0.6.7.dist-info/METADATA,sha256=orIj5bXfMXfOSh3TeKpGkgOUWv6Ea2pBKB5rzkAbcKk,5787
+henosis_cli-0.6.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+henosis_cli-0.6.7.dist-info/entry_points.txt,sha256=KmXDdmIjq1SVMs8FK3wHPA2i89RMaerzZHIetllMLIk,74
+henosis_cli-0.6.7.dist-info/top_level.txt,sha256=u7XMBcJ8Kb0n91WaSU-4Db8yURSUXFuOxGMsXti0a-g,34
+henosis_cli-0.6.7.dist-info/RECORD,,

henosis_cli_tools/tool_impl.py

@@ -70,12 +70,37 @@ _DEFAULT_ALLOWED_EXTS = {
     ".conf",
 }
 
-_MAX_FILE_BYTES = int(os.getenv("HENOSIS_MAX_FILE_BYTES", str(1_073_741_824)))
-_MAX_EDIT_BYTES = int(os.getenv("HENOSIS_MAX_EDIT_BYTES", str(1_073_741_824)))
-_EDIT_SAFEGUARD_MAX_LINES = int(os.getenv("HENOSIS_EDIT_SAFEGUARD_MAX_LINES", "3000"))
-_COMMAND_TIMEOUT_SEC = float(os.getenv("HENOSIS_COMMAND_TIMEOUT_SEC", "30"))
-# Max chars for stdout/stderr before truncation notice is applied
-_CMD_OUTPUT_MAX_CHARS = 3000
+_MAX_FILE_BYTES = int(os.getenv("HENOSIS_MAX_FILE_BYTES", str(1_073_741_824)))
+_MAX_EDIT_BYTES = int(os.getenv("HENOSIS_MAX_EDIT_BYTES", str(1_073_741_824)))
+_EDIT_SAFEGUARD_MAX_LINES = int(os.getenv("HENOSIS_EDIT_SAFEGUARD_MAX_LINES", "3000"))
+
+# Command timeout behavior:
+# - The tool call can request a per-invocation timeout via the `timeout` argument.
+# - The client/user may configure a DEFAULT (used when the tool omits timeout)
+#   and a MAX (hard cap for safety).
+# - Backward compatibility: legacy env var HENOSIS_COMMAND_TIMEOUT_SEC is treated as MAX.
+def _env_float(name: str, default: float) -> float:
+    try:
+        v = os.getenv(name, "")
+        if v is None:
+            return float(default)
+        s = str(v).strip()
+        if not s:
+            return float(default)
+        return float(s)
+    except Exception:
+        return float(default)
+
+
+_COMMAND_TIMEOUT_DEFAULT_SEC = _env_float("HENOSIS_COMMAND_TIMEOUT_DEFAULT_SEC", 360.0)
+_LEGACY_COMMAND_TIMEOUT_SEC_RAW = os.getenv("HENOSIS_COMMAND_TIMEOUT_SEC", "")
+if str(_LEGACY_COMMAND_TIMEOUT_SEC_RAW or "").strip():
+    _COMMAND_TIMEOUT_MAX_SEC = _env_float("HENOSIS_COMMAND_TIMEOUT_SEC", 900.0)
+else:
+    _COMMAND_TIMEOUT_MAX_SEC = _env_float("HENOSIS_COMMAND_TIMEOUT_MAX_SEC", 900.0)
+
+# Max chars for stdout/stderr before truncation notice is applied
+_CMD_OUTPUT_MAX_CHARS = 3000
 
 _VERBOSE_NOTICE = (
     "console output was EXTEREMELY verbose the ouput was truncated as to not overflow your context. here are the last 3k chars:\n"
@@ -322,13 +347,22 @@ def run_command(cmd: str, policy: FileToolPolicy, cwd: Optional[str] = None, tim
     base = os.path.basename(exe).lower()
     if (not allow_all) and (base not in allow_set):
         return {"ok": False, "error": f"command '{base}' not allowed"}
-    try:
-        requested = float(timeout) if timeout is not None else _COMMAND_TIMEOUT_SEC
-    except Exception:
-        requested = _COMMAND_TIMEOUT_SEC
-    timeout_s = min(max(0.01, requested), float(_COMMAND_TIMEOUT_SEC))
-    start = time.time()
-    try:
+    # Determine effective timeout: tool-controlled within a user-configurable maximum.
+    try:
+        requested = float(timeout) if timeout is not None else float(_COMMAND_TIMEOUT_DEFAULT_SEC)
+    except Exception:
+        requested = float(_COMMAND_TIMEOUT_DEFAULT_SEC)
+    try:
+        max_sec = float(_COMMAND_TIMEOUT_MAX_SEC)
+    except Exception:
+        max_sec = 900.0
+    if max_sec <= 0:
+        # Degenerate config; keep tool safe.
+        max_sec = 0.01
+    timeout_s = min(max(0.01, requested), max_sec)
+    timeout_was_clamped = bool(requested > max_sec)
+    start = time.time()
+    try:
         # Force UTF-8 decoding with replacement to avoid locale-dependent decode errors
         # on Windows (e.g., cp1252 UnicodeDecodeError in reader thread).
         proc = subprocess.run(
@@ -341,39 +375,51 @@ def run_command(cmd: str, policy: FileToolPolicy, cwd: Optional[str] = None, tim
             errors="replace",
             timeout=timeout_s,
         )
-        dur_ms = int((time.time() - start) * 1000)
+        dur_ms = int((time.time() - start) * 1000)
         # Truncate very verbose outputs to protect context size
         out = _truncate_if_verbose(proc.stdout)
         err = _truncate_if_verbose(proc.stderr)
-        return {
-            "ok": True,
-            "data": {
-                "cmd": cmd_str,
-                "cwd": str(cwd_path),
-                "exit_code": proc.returncode,
-                "stdout": out,
-                "stderr": err,
-                "timed_out": False,
-                "duration_ms": dur_ms,
-            },
-        }
-    except subprocess.TimeoutExpired as e:
-        dur_ms = int((time.time() - start) * 1000)
+        return {
+            "ok": True,
+            "data": {
+                "cmd": cmd_str,
+                "cwd": str(cwd_path),
+                "exit_code": proc.returncode,
+                "stdout": out,
+                "stderr": err,
+                "timed_out": False,
+                "duration_ms": dur_ms,
+                "timeout_requested_sec": requested,
+                "timeout_effective_sec": timeout_s,
+                "timeout_max_sec": max_sec,
+                "timeout_was_clamped": timeout_was_clamped,
+            },
+        }
+    except subprocess.TimeoutExpired as e:
+        dur_ms = int((time.time() - start) * 1000)
         # Even in timeout, ensure any captured output is truncated if overly verbose
         out = _truncate_if_verbose(e.stdout or "")
         err = _truncate_if_verbose(e.stderr or "")
-        return {
-            "ok": True,
-            "data": {
-                "cmd": cmd_str,
-                "cwd": str(cwd_path),
-                "exit_code": None,
-                "stdout": out,
-                "stderr": err,
-                "timed_out": True,
-                "duration_ms": dur_ms,
-            },
-        }
+        return {
+            "ok": True,
+            "data": {
+                "cmd": cmd_str,
+                "cwd": str(cwd_path),
+                "exit_code": None,
+                "stdout": out,
+                "stderr": err,
+                "timed_out": True,
+                "duration_ms": dur_ms,
+                "timeout_requested_sec": requested,
+                "timeout_effective_sec": timeout_s,
+                "timeout_max_sec": max_sec,
+                "timeout_was_clamped": timeout_was_clamped,
+                "message": (
+                    f"Command exceeded timeout (effective_timeout={timeout_s}s). "
+                    "Process was terminated."
+                ),
+            },
+        }
 
 # ---------------------------- apply_patch ----------------------------#
 def _ap_normalize_unicode(s: str) -> str: