xdog-coding 2.1.1__tar.gz → 2.2.0__tar.gz

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/.gitignore

@@ -45,7 +45,7 @@ env/
 *credential*
 *secret*
 # --- OS / editor ---
-# --- x-dog ---
+# --- xdog ---
 data/
 result.txt
 plan.txt

xdog_coding-2.2.0/PKG-INFO

@@ -0,0 +1,95 @@
+Metadata-Version: 2.5
+Name: xdog-coding
+Version: 2.2.0
+Summary: Interactive coding agent CLI
+Project-URL: Homepage, https://xdog.942295.xyz
+Project-URL: Repository, https://github.com/litterzhang/xdog
+Project-URL: Documentation, https://xdog.942295.xyz
+Project-URL: Issues, https://github.com/litterzhang/xdog/issues
+Author: HugeMan
+License-Expression: AGPL-3.0-or-later
+License-File: LICENSE
+License-File: LICENSE-EXCEPTION.md
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Software Development :: Libraries
+Classifier: Typing :: Typed
+Requires-Python: >=3.12
+Requires-Dist: click>=8.1.0
+Requires-Dist: pydantic>=2.0
+Requires-Dist: pyyaml>=6.0
+Requires-Dist: xdog-agent>=2.2.0
+Requires-Dist: xdog-ai[openai]>=2.2.0
+Requires-Dist: xdog-tui>=2.2.0
+Description-Content-Type: text/markdown
+
+# xdog-coding
+
+**Interactive coding-agent CLI.**
+
+A terminal coding agent with session management, built on
+[`xdog-agent`](https://pypi.org/project/xdog-agent/) and the
+[`xdog-tui`](https://pypi.org/project/xdog-tui/) rendering layer.
+
+```bash
+uv run xdog-coding
+```
+
+## Interactive terminal
+
+The interface uses native scrollback, one status row, and a shared multiline
+editor. Enter submits or queues; Shift/Alt+Enter inserts a newline. Ctrl+O opens
+recent tool/reasoning details: Left/Right chooses an entry and Page Up/Page Down
+scrolls. Escape closes autocomplete/details first, then cancels active work and
+restores queued text ahead of the current draft. Ctrl+Z suspends on POSIX.
+
+Permission prompts take priority. Up/Down chooses an action, Enter confirms,
+Escape denies that call, and Page Up/Page Down scrolls the command summary.
+The editor draft stays intact when panels open or the terminal resizes.
+See [terminal verification](../../docs/tui-pi-parity.md); remote coding and
+fullscreen application modes are excluded.
+
+## Tool permissions
+
+Potentially mutating tool calls are gated immediately before execution. By
+default, read-only filesystem operations and `current_time` run automatically;
+`bash`, filesystem writes/edits/deletes, and unknown extension tools ask first.
+
+```bash
+xdog-coding --permission-mode ask       # default: ask for dangerous calls
+xdog-coding --permission-mode ask-all   # ask before every tool
+xdog-coding --permission-mode allow-all # trusted unattended automation
+xdog-coding --permission-mode deny      # allow read-only calls only
+```
+
+Interactive approvals offer **Allow once**, **Allow for this session** (the exact
+same call only), and **Deny**. Non-interactive runs fail closed when no approver
+is available unless `allow-all` was explicitly selected.
+
+The same setting can be stored in `~/.config/xdog/coding/settings.json`:
+
+```json
+{"permission_mode": "ask"}
+```
+
+Permission prompts are an execution gate, not an OS sandbox: an approved shell
+command still has the permissions of the `xdog-coding` process.
+
+## Part of xdog
+
+This package is one piece of [xdog](https://github.com/litterzhang/xdog), a
+local-first toolkit for building, running and scheduling LLM workflows. The
+centrepiece is [`xdog-flow`](https://pypi.org/project/xdog-flow/) — a typed
+workflow format and compiler.
+
+Documentation: **https://xdog.942295.xyz**
+
+## Licence
+
+Copyright (c) 2026 HugeMan <942295.xyz>
+
+GNU Affero General Public License v3.0 or later — see
+[LICENSE](https://github.com/litterzhang/xdog/blob/main/LICENSE).

xdog_coding-2.2.0/README.md

@@ -0,0 +1,67 @@
+# xdog-coding
+
+**Interactive coding-agent CLI.**
+
+A terminal coding agent with session management, built on
+[`xdog-agent`](https://pypi.org/project/xdog-agent/) and the
+[`xdog-tui`](https://pypi.org/project/xdog-tui/) rendering layer.
+
+```bash
+uv run xdog-coding
+```
+
+## Interactive terminal
+
+The interface uses native scrollback, one status row, and a shared multiline
+editor. Enter submits or queues; Shift/Alt+Enter inserts a newline. Ctrl+O opens
+recent tool/reasoning details: Left/Right chooses an entry and Page Up/Page Down
+scrolls. Escape closes autocomplete/details first, then cancels active work and
+restores queued text ahead of the current draft. Ctrl+Z suspends on POSIX.
+
+Permission prompts take priority. Up/Down chooses an action, Enter confirms,
+Escape denies that call, and Page Up/Page Down scrolls the command summary.
+The editor draft stays intact when panels open or the terminal resizes.
+See [terminal verification](../../docs/tui-pi-parity.md); remote coding and
+fullscreen application modes are excluded.
+
+## Tool permissions
+
+Potentially mutating tool calls are gated immediately before execution. By
+default, read-only filesystem operations and `current_time` run automatically;
+`bash`, filesystem writes/edits/deletes, and unknown extension tools ask first.
+
+```bash
+xdog-coding --permission-mode ask       # default: ask for dangerous calls
+xdog-coding --permission-mode ask-all   # ask before every tool
+xdog-coding --permission-mode allow-all # trusted unattended automation
+xdog-coding --permission-mode deny      # allow read-only calls only
+```
+
+Interactive approvals offer **Allow once**, **Allow for this session** (the exact
+same call only), and **Deny**. Non-interactive runs fail closed when no approver
+is available unless `allow-all` was explicitly selected.
+
+The same setting can be stored in `~/.config/xdog/coding/settings.json`:
+
+```json
+{"permission_mode": "ask"}
+```
+
+Permission prompts are an execution gate, not an OS sandbox: an approved shell
+command still has the permissions of the `xdog-coding` process.
+
+## Part of xdog
+
+This package is one piece of [xdog](https://github.com/litterzhang/xdog), a
+local-first toolkit for building, running and scheduling LLM workflows. The
+centrepiece is [`xdog-flow`](https://pypi.org/project/xdog-flow/) — a typed
+workflow format and compiler.
+
+Documentation: **https://xdog.942295.xyz**
+
+## Licence
+
+Copyright (c) 2026 HugeMan <942295.xyz>
+
+GNU Affero General Public License v3.0 or later — see
+[LICENSE](https://github.com/litterzhang/xdog/blob/main/LICENSE).

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "xdog-coding"
-version = "2.1.1"
+version = "2.2.0"
 description = "Interactive coding agent CLI"
 requires-python = ">=3.12"
 classifiers = [
@@ -21,9 +21,9 @@ readme = "README.md"
 license = "AGPL-3.0-or-later"
 license-files = ["LICENSE", "LICENSE-EXCEPTION.md"]
 dependencies = [
-    "xdog-ai>=2.1.1",
-    "xdog-agent>=2.1.1",
-    "xdog-tui>=2.1.1",
+    "xdog-ai[openai]>=2.2.0",
+    "xdog-agent>=2.2.0",
+    "xdog-tui>=2.2.0",
     "pyyaml>=6.0",
     "click>=8.1.0",
     "pydantic>=2.0",
@@ -31,9 +31,9 @@ dependencies = [
 
 [project.urls]
 Homepage = "https://xdog.942295.xyz"
-Repository = "https://github.com/litterzhang/x-dog"
+Repository = "https://github.com/litterzhang/xdog"
 Documentation = "https://xdog.942295.xyz"
-Issues = "https://github.com/litterzhang/x-dog/issues"
+Issues = "https://github.com/litterzhang/xdog/issues"
 
 [project.scripts]
 xdog-coding = "xdog.coding.main:main"

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/src/xdog/coding/cli/args.py

@@ -60,10 +60,16 @@ from xdog.coding.cli.session_picker import pick_session_command
 )
 @click.option(
     "--thinking-level",
-    type=click.Choice(["none", "normal", "deep", "ultrathink"]),
+    type=click.Choice(["off", "minimal", "low", "medium", "high", "xhigh"]),
     default=None,
     help="Thinking / reasoning level.",
 )
+@click.option(
+    "--permission-mode",
+    type=click.Choice(["ask", "ask-all", "allow-all", "deny"]),
+    default=None,
+    help="Tool permission policy.",
+)
 @click.option(
     "--list-models",
     is_flag=True,
@@ -99,6 +105,7 @@ def cli(
     working_dir: Path | None,
     config_path: Path | None,
     thinking_level: str | None,
+    permission_mode: str | None,
     list_models: bool,
     pick_session: bool,
     rpc: bool,
@@ -124,6 +131,8 @@ def cli(
         overrides["model"] = model
     if thinking_level is not None:
         overrides["thinking_level"] = thinking_level
+    if permission_mode is not None:
+        overrides["permission_mode"] = permission_mode
 
     # Defer to the main entry-point for actual execution
     from xdog.coding.main import run_agent

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/src/xdog/coding/cli/config_selector.py

@@ -57,10 +57,19 @@ def config_selector(config_path: Path | None = None) -> GlobalConfig:
         cfg = cfg.model_copy(update={"default_model": new_model})
 
     # Thinking level
-    new_thinking = input(f"Thinking level [{cfg.thinking_level}] (off/normal/high): ").strip()
+    new_thinking = input(
+        f"Thinking level [{cfg.thinking_level}] (off/minimal/low/medium/high/xhigh): "
+    ).strip()
     if new_thinking:
         cfg = cfg.model_copy(update={"thinking_level": new_thinking})
 
+    # Tool permissions
+    new_permissions = input(
+        f"Permission mode [{cfg.permission_mode}] (ask/ask-all/allow-all/deny): "
+    ).strip()
+    if new_permissions:
+        cfg = cfg.model_copy(update={"permission_mode": new_permissions})
+
     # Custom instructions
     if cfg.custom_instructions:
         print(f"\nCurrent custom instructions: {cfg.custom_instructions[:80]}...")

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/src/xdog/coding/config.py

@@ -1,9 +1,9 @@
 """Global configuration and paths for the coding agent.
 
 Follows XDG Base Directory Specification:
-- Config:  $XDG_CONFIG_HOME/x-dog/coding/  (settings, models, keybindings)
-- Data:    $XDG_DATA_HOME/x-dog/coding/    (sessions, auth, extensions)
-- State:   $XDG_STATE_HOME/x-dog/coding/   (logs, cache)
+- Config:  $XDG_CONFIG_HOME/xdog/coding/  (settings, models, keybindings)
+- Data:    $XDG_DATA_HOME/xdog/coding/    (sessions, auth, extensions)
+- State:   $XDG_STATE_HOME/xdog/coding/   (logs, cache)
 - Project: <cwd>/.coding/                        (project-local config)
 
 Override all XDG paths with a single directory via CODING_DIR env var.
@@ -24,7 +24,7 @@ from pydantic import BaseModel, Field
 # Constants
 # ---------------------------------------------------------------------------
 
-MONOREPO_NAME = "x-dog"
+MONOREPO_NAME = "xdog"
 APP_NAME = "coding"
 VERSION = "0.57.1"
 PROJECT_DIR_NAME = ".coding"
@@ -45,7 +45,7 @@ def _env_override_dir() -> Path | None:
 
 
 def get_config_dir() -> Path:
-    """$XDG_CONFIG_HOME/x-dog/coding/"""
+    """$XDG_CONFIG_HOME/xdog/coding/"""
     override = _env_override_dir()
     if override is not None:
         return override
@@ -54,7 +54,7 @@ def get_config_dir() -> Path:
 
 
 def get_data_dir() -> Path:
-    """$XDG_DATA_HOME/x-dog/coding/"""
+    """$XDG_DATA_HOME/xdog/coding/"""
     override = _env_override_dir()
     if override is not None:
         return override
@@ -63,7 +63,7 @@ def get_data_dir() -> Path:
 
 
 def get_state_dir() -> Path:
-    """$XDG_STATE_HOME/x-dog/coding/"""
+    """$XDG_STATE_HOME/xdog/coding/"""
     override = _env_override_dir()
     if override is not None:
         return override
@@ -172,6 +172,7 @@ class GlobalConfig(BaseModel):
 
     default_model: str = ""
     thinking_level: str = "normal"
+    permission_mode: str = "ask"
     extensions: list[str] = Field(default_factory=list)
     allowed_tools: list[str] = Field(default_factory=list)
     custom_instructions: str = ""
@@ -207,6 +208,7 @@ class ProjectConfig(BaseModel):
 
     model: str | None = None
     thinking_level: str | None = None
+    permission_mode: str | None = None
     allowed_tools: list[str] = Field(default_factory=list)
     custom_instructions: str = ""
     extensions: list[str] = Field(default_factory=list)
@@ -233,6 +235,7 @@ class RuntimeConfig:
 
     model: str
     thinking_level: str
+    permission_mode: str
     allowed_tools: tuple[str, ...]
     custom_instructions: str
     extensions: tuple[str, ...]
@@ -253,6 +256,11 @@ class RuntimeConfig:
         pcfg = project_cfg or ProjectConfig()
         model = ov.get("model") or pcfg.model or global_cfg.default_model
         thinking = ov.get("thinking_level") or pcfg.thinking_level or global_cfg.thinking_level
+        permission_mode = (
+            ov.get("permission_mode")
+            or pcfg.permission_mode
+            or global_cfg.permission_mode
+        )
 
         merged_tools = list(global_cfg.allowed_tools) + list(pcfg.allowed_tools)
         merged_ext = list(global_cfg.extensions) + list(pcfg.extensions)
@@ -266,6 +274,7 @@ class RuntimeConfig:
         return cls(
             model=model,
             thinking_level=thinking,
+            permission_mode=permission_mode,
             allowed_tools=tuple(merged_tools),
             custom_instructions="\n\n".join(instructions_parts),
             extensions=tuple(merged_ext),

{xdog_coding-2.1.1 → xdog_coding-2.2.0}/src/xdog/coding/core/agent_session.py

@@ -24,6 +24,7 @@ from xdog.ai.types import (
 from xdog.coding.core.defaults import COMPACTION_THRESHOLD_RATIO, MAX_CONTEXT_TOKENS
 from xdog.coding.core.event_bus import EventBus, get_event_bus
 from xdog.coding.core.messages import dicts_to_messages, messages_to_dicts
+from xdog.coding.core.permissions import PermissionManager
 from xdog.coding.core.session_manager import SessionData, SessionManager
 from xdog.coding.core.settings_manager import SettingsManager
 from xdog.coding.core.system_prompt import build_system_prompt
@@ -47,6 +48,9 @@ class AgentSession:
     tool_registry: Any  # kept for backward compat, may be None
     bash: Any  # kept for backward compat, may be None
     working_dir: Path
+    context_window: int = MAX_CONTEXT_TOKENS
+    max_prompt_tokens: int = 0
+    permissions: PermissionManager = field(default_factory=PermissionManager)
     event_bus: EventBus = field(default_factory=get_event_bus)
     _unsubscribe: Any = field(default=None, init=False, repr=False)
     #: Slugs of skills whose instructions are currently in the system prompt.
@@ -59,6 +63,9 @@ class AgentSession:
         if self.session_data.settings:
             self.settings.load_session_settings(self.session_data.settings)
 
+        # Sessions constructed outside the SDK still receive enforcement.
+        self.agent.set_before_tool_call(self.permissions.before_tool_call)
+
         # Subscribe to agent events for persistence and event bus forwarding
         self._unsubscribe = self.agent.subscribe(self._on_agent_event)
 
@@ -80,6 +87,11 @@ class AgentSession:
     def is_streaming(self) -> bool:
         return self.agent.state.is_streaming
 
+    @property
+    def context_limit(self) -> int:
+        """Prompt limit used for compaction; falls back to the model window."""
+        return self.max_prompt_tokens or self.context_window or MAX_CONTEXT_TOKENS
+
     # -- Public API --
 
     @property
@@ -176,17 +188,35 @@ class AgentSession:
         """Cancel the current agent turn."""
         self.agent.abort()
 
+    def cancel(self) -> None:
+        """Cancel active work and discard agent-level queued messages."""
+        self.agent.clear_all_queues()
+        self.permissions.deny_all()
+        self.agent.abort()
+
     # -- Model / thinking --
 
     def set_model(self, model: str) -> None:
-        """Switch the active model."""
+        """Switch the active model and refresh its provider-reported limits."""
         self.agent.set_model(model)
+        try:
+            import xdog.ai as ai
+
+            model_info = ai.provider("copilot").model(model)
+            if model_info is not None:
+                self.context_window = model_info.context_window or MAX_CONTEXT_TOKENS
+                self.max_prompt_tokens = model_info.max_prompt_tokens
+        except Exception:
+            logger.debug("could not refresh model limits for %s", model, exc_info=True)
+        self.settings.set_session_model(model)
         self._persist()
 
     def set_thinking_level(self, level: ThinkingLevel | None) -> None:
-        """Switch the thinking/reasoning level."""
+        """Switch and persist the thinking/reasoning level."""
         from dataclasses import replace
+
         self.agent.set_options(replace(self.agent.options, thinking=level))
+        self.settings.set_session_thinking(level or "off")
         self._persist()
 
     # -- Compaction --
@@ -222,7 +252,7 @@ class AgentSession:
                 char_count += 200
 
         estimated_tokens = char_count / 4
-        threshold = MAX_CONTEXT_TOKENS * COMPACTION_THRESHOLD_RATIO
+        threshold = self.context_limit * COMPACTION_THRESHOLD_RATIO
 
         if estimated_tokens > threshold:
             await self._run_compaction()
@@ -257,6 +287,7 @@ class AgentSession:
             return False
 
         self.session_data = loaded
+        self.permissions.clear_session_rules()
         restored_messages = list(self.session_data.messages)
         self.agent.replace_messages(restored_messages)
 
@@ -335,6 +366,7 @@ class AgentSession:
             RuntimeConfig(
                 model=self.agent.state.model or "unknown",
                 thinking_level=str(self.agent.options.thinking or "normal"),
+                permission_mode=self.permissions.mode,
                 allowed_tools=tuple(t.name for t in self.agent.state.tools),
                 custom_instructions=self.settings.custom_instructions,
                 extensions=(),
@@ -372,6 +404,7 @@ class AgentSession:
 
     def dispose(self) -> None:
         """Clean up resources."""
+        self.permissions.close()
         if self._unsubscribe:
             self._unsubscribe()
             self._unsubscribe = None