agentwire-dev 1.25.0__tar.gz → 1.27.0__tar.gz

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentwire-dev
-Version: 1.25.0
+Version: 1.27.0
 Summary: Multi-session voice web interface for AI coding agents
 Project-URL: Homepage, https://agentwire.dev
 Project-URL: Repository, https://github.com/dotdevdotdev/agentwire-dev

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/__init__.py

@@ -1,3 +1,3 @@
 """AgentWire - Multi-session voice web interface for AI coding agents."""
 
-__version__ = "1.25.0"
+__version__ = "1.27.0"

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/__main__.py

@@ -3650,6 +3650,34 @@ def cmd_new(args) -> int:
 
     # Local session
     # Resolve path
+    base_branch = getattr(args, 'base', 'main') or 'main'
+    pull_first = getattr(args, 'pull_first', True)
+
+    def _spawn_worktree(project_path: Path, session_path: Path) -> tuple[bool, str | None]:
+        """Fetch origin/<base> if requested, then create worktree starting at that ref."""
+        worktree_commit: str | None = None
+        if pull_first:
+            fetch = subprocess.run(
+                ["git", "fetch", "origin", base_branch],
+                cwd=project_path,
+                capture_output=True,
+                text=True,
+            )
+            if fetch.returncode != 0:
+                stderr = (fetch.stderr or fetch.stdout or "").strip()
+                return False, f"git fetch origin {base_branch} failed: {stderr}"
+            worktree_commit = f"origin/{base_branch}"
+        ok = ensure_worktree(
+            project_path,
+            branch,
+            session_path,
+            auto_create_branch=auto_create_branch,
+            commit=worktree_commit,
+        )
+        if not ok:
+            return False, f"Failed to create worktree for branch '{branch}' in {project_path}"
+        return True, None
+
     if path and branch and worktrees_enabled:
         # Path + branch: use provided path as main repo, create worktree from it
         project_path = Path(path).expanduser().resolve()
@@ -3659,15 +3687,9 @@ def cmd_new(args) -> int:
         if not session_path.exists():
             if not project_path.exists():
                 return _output_result(False, json_mode, f"Project path does not exist: {project_path}")
-
-            success = ensure_worktree(
-                project_path,
-                branch,
-                session_path,
-                auto_create_branch=auto_create_branch,
-            )
-            if not success:
-                return _output_result(False, json_mode, f"Failed to create worktree for branch '{branch}' in {project_path}")
+            ok, err = _spawn_worktree(project_path, session_path)
+            if not ok:
+                return _output_result(False, json_mode, err or "worktree creation failed")
     elif path:
         session_path = Path(path).expanduser().resolve()
     elif branch and worktrees_enabled:
@@ -3679,15 +3701,9 @@ def cmd_new(args) -> int:
         if not session_path.exists():
             if not project_path.exists():
                 return _output_result(False, json_mode, f"Project path does not exist: {project_path}")
-
-            success = ensure_worktree(
-                project_path,
-                branch,
-                session_path,
-                auto_create_branch=auto_create_branch,
-            )
-            if not success:
-                return _output_result(False, json_mode, f"Failed to create worktree for branch '{branch}' in {project_path}")
+            ok, err = _spawn_worktree(project_path, session_path)
+            if not ok:
+                return _output_result(False, json_mode, err or "worktree creation failed")
     else:
         # Simple session: ~/projects/project/
         session_path = projects_dir / project
@@ -10552,6 +10568,9 @@ def main() -> int:
     new_parser.add_argument("--model", help="Model override (e.g., haiku, sonnet, opus)")
     new_parser.add_argument("--persist", action="store_true", help="Write --type/--roles to .agentwire.yml (default: session-level override only)")
     new_parser.add_argument("--env", action="append", metavar="KEY=VAL", help="Inject env var via `tmux set-environment` (repeatable, keeps secrets out of `ps`)")
+    new_parser.add_argument("--base", default="main", help="For worktree sessions: base branch to fork the new branch from (default: main)")
+    new_parser.add_argument("--pull-first", dest="pull_first", action="store_true", default=True, help="For worktree sessions: fetch origin/<base> before branching (default)")
+    new_parser.add_argument("--no-pull-first", dest="pull_first", action="store_false", help="Skip the fetch — branch from the local copy of <base> as-is")
     new_parser.add_argument("--json", action="store_true", help="Output as JSON")
     new_parser.set_defaults(func=cmd_new)
 

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/cli_safety.py

@@ -190,7 +190,10 @@ def query_audit_logs(
     if today:
         log_files = [LOGS_DIR / f"{datetime.now().strftime('%Y-%m-%d')}.jsonl"]
     else:
-        log_files = sorted(LOGS_DIR.glob("*.jsonl"), reverse=True)
+        # Sort chronologically (oldest first) so that within the merged list,
+        # entries are strictly in time order. Callers that want newest-first
+        # (e.g. the portal Safety section) reverse on their end after slicing.
+        log_files = sorted(LOGS_DIR.glob("*.jsonl"))
 
     for log_file in log_files:
         if not log_file.exists():

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/config.py

@@ -267,6 +267,14 @@ class OvernightConfig:
         self.live_state_file = _expand_path(self.live_state_file) or self.live_state_file
 
 
+@dataclass
+class SafetyConfig:
+    """Global damage-control safety knobs."""
+
+    enabled: bool = True
+    disabled_rules: list[str] = field(default_factory=list)
+
+
 @dataclass
 class Config:
     """Root configuration for AgentWire."""
@@ -285,6 +293,7 @@ class Config:
     repl: ReplConfig = field(default_factory=ReplConfig)
     scheduler: SchedulerConfig = field(default_factory=SchedulerConfig)
     overnight: OvernightConfig = field(default_factory=OvernightConfig)
+    safety: SafetyConfig = field(default_factory=SafetyConfig)
     channels: dict = field(default_factory=dict)
 
 
@@ -508,6 +517,18 @@ def _dict_to_config(data: dict) -> Config:
         theme_overrides = {}
     repl = ReplConfig(theme={str(k): str(v) for k, v in theme_overrides.items()})
 
+    # Safety (damage-control kill switch + disabled rules)
+    safety_data = data.get("safety", {}) or {}
+    if not isinstance(safety_data, dict):
+        safety_data = {}
+    disabled_rules_raw = safety_data.get("disabled_rules", []) or []
+    if not isinstance(disabled_rules_raw, list):
+        disabled_rules_raw = []
+    safety = SafetyConfig(
+        enabled=bool(safety_data.get("enabled", True)),
+        disabled_rules=[str(r) for r in disabled_rules_raw if r],
+    )
+
     return Config(
         server=server,
         projects=projects,
@@ -523,6 +544,7 @@ def _dict_to_config(data: dict) -> Config:
         overnight=overnight,
         channels=channel_configs,
         repl=repl,
+        safety=safety,
     )
 
 

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/hooks/damage-control/audit_logger.py

@@ -56,6 +56,9 @@ def log_entry(
     blocked_by: Optional[str] = None,
     user_approved: Optional[bool] = None,
     pattern_matched: Optional[str] = None,
+    rule_id: Optional[str] = None,
+    escape_reason: Optional[str] = None,
+    cwd: Optional[str] = None,
 ) -> None:
     """
     Write a log entry to the audit log.
@@ -63,11 +66,15 @@ def log_entry(
     Args:
         tool: Tool name (Bash, Edit, Write)
         command: Command or path that was checked
-        decision: "blocked", "asked", or "allowed"
+        decision: "blocked", "asked", "allowed", "allowed_by_escape", or "allowed_by_disabled"
         blocked_by: Reason/pattern that triggered block
         user_approved: Whether user approved (for ask patterns)
         pattern_matched: The regex pattern that matched
+        rule_id: Stable identifier of the matched rule (when applicable)
+        escape_reason: Reason supplied via "# allow:" escape hatch (when applicable)
+        cwd: Working directory where the command would have run
     """
+    import os
     context = get_session_context()
 
     entry = {
@@ -80,6 +87,9 @@ def log_entry(
         "blocked_by": blocked_by,
         "user_approved": user_approved,
         "pattern_matched": pattern_matched,
+        "rule_id": rule_id,
+        "escape_reason": escape_reason,
+        "cwd": cwd or os.environ.get("PWD") or os.getcwd(),
     }
 
     log_file = get_log_file()
@@ -94,6 +104,7 @@ def log_blocked(
     command: str,
     reason: str,
     pattern: Optional[str] = None,
+    rule_id: Optional[str] = None,
 ) -> None:
     """
     Log a blocked operation.
@@ -103,6 +114,7 @@ def log_blocked(
         command: Command or path that was blocked
         reason: Human-readable reason for block
         pattern: The regex pattern that matched
+        rule_id: Stable identifier of the matched rule
     """
     log_entry(
         tool=tool,
@@ -110,6 +122,39 @@ def log_blocked(
         decision="blocked",
         blocked_by=reason,
         pattern_matched=pattern,
+        rule_id=rule_id,
+    )
+
+
+def log_escape(
+    tool: str,
+    command: str,
+    escape_reason: str,
+) -> None:
+    """
+    Log a command that was allowed through the ``# allow: <reason>`` escape hatch.
+    """
+    log_entry(
+        tool=tool,
+        command=command,
+        decision="allowed_by_escape",
+        blocked_by=f"Escape hatch: {escape_reason}",
+        escape_reason=escape_reason,
+    )
+
+
+def log_disabled(
+    tool: str,
+    command: str,
+) -> None:
+    """
+    Log a command that was allowed because the safety system is disabled.
+    """
+    log_entry(
+        tool=tool,
+        command=command,
+        decision="allowed_by_disabled",
+        blocked_by="safety disabled",
     )
 
 

{agentwire_dev-1.25.0 → agentwire_dev-1.27.0}/agentwire/hooks/damage-control/bash-tool-damage-control.py

@@ -24,11 +24,13 @@ from pathlib import Path
 
 # audit_logger lives next to this script
 try:
-    from audit_logger import log_allowed, log_asked, log_blocked
+    from audit_logger import log_allowed, log_asked, log_blocked, log_disabled, log_escape
 except ImportError:
     def log_allowed(*args, **kwargs): pass
     def log_asked(*args, **kwargs): pass
     def log_blocked(*args, **kwargs): pass
+    def log_disabled(*args, **kwargs): pass
+    def log_escape(*args, **kwargs): pass
 
 
 # === BEGIN GENERATED FROM agentwire/safety/_core.py ===
@@ -408,11 +410,42 @@ def load_write_patterns_from_tooldefs(tooldefs_dir: Optional[Path]) -> List[Dict
     return patterns
 
 
+_RULE_ID_SLUG_RE = re.compile(r"[^a-z0-9]+")
+
+
+def _slug_for_rule(text: str, max_len: int = 60) -> str:
+    """Lowercase, ASCII, kebab-case slug suitable for rule IDs."""
+    s = _RULE_ID_SLUG_RE.sub("-", (text or "").lower()).strip("-")
+    return s[:max_len] or "rule"
+
+
+def _assign_rule_id(pattern_obj: Dict[str, Any], file_stem: str, taken: set) -> str:
+    """Generate (or honor) an ID for a bash pattern. Mutates pattern_obj in place."""
+    existing = pattern_obj.get("id")
+    if isinstance(existing, str) and existing.strip():
+        pattern_obj["id"] = existing.strip()
+        taken.add(pattern_obj["id"])
+        return pattern_obj["id"]
+    slug = _slug_for_rule(pattern_obj.get("reason", "rule"))
+    candidate = f"{file_stem}.{slug}"
+    n = 2
+    while candidate in taken:
+        candidate = f"{file_stem}.{slug}-{n}"
+        n += 1
+    pattern_obj["id"] = candidate
+    taken.add(candidate)
+    return candidate
+
+
 def load_config(
     rules_dir: Path,
     tooldefs_dir: Optional[Path] = None,
 ) -> Dict[str, Any]:
-    """Load and merge all rule YAMLs in ``rules_dir`` plus tooldef ask-patterns."""
+    """Load and merge all rule YAMLs in ``rules_dir`` plus tooldef ask-patterns.
+
+    Bash patterns get a stable ``id`` field (``"<file>.<slug-of-reason>"``) so
+    they can be referenced by the ``safety.disabled_rules`` config.
+    """
     merged: Dict[str, Any] = {
         "bashToolPatterns": [],
         "zeroAccessPaths": [],
@@ -422,22 +455,110 @@ def load_config(
     }
     if not yaml or not rules_dir.exists():
         return merged
+    taken_ids: set = set()
     yaml_files = sorted(rules_dir.glob("*.yaml"))
     for rules_file in yaml_files:
         try:
             with open(rules_file, "r") as f:
                 data = yaml.safe_load(f) or {}
             for key in merged:
-                merged[key].extend(data.get(key, []))
+                items = data.get(key, []) or []
+                if key == "bashToolPatterns":
+                    for it in items:
+                        if isinstance(it, dict):
+                            _assign_rule_id(it, rules_file.stem, taken_ids)
+                            it.setdefault("source", rules_file.stem)
+                merged[key].extend(items)
         except Exception:
             continue
     if tooldefs_dir is not None:
-        merged["bashToolPatterns"].extend(
-            load_write_patterns_from_tooldefs(tooldefs_dir)
-        )
+        tooldef_patterns = load_write_patterns_from_tooldefs(tooldefs_dir)
+        for it in tooldef_patterns:
+            _assign_rule_id(it, "tooldef", taken_ids)
+            it.setdefault("source", "tooldef")
+        merged["bashToolPatterns"].extend(tooldef_patterns)
     return merged
 
 
+def load_safety_config(
+    global_config_path: Optional[Path] = None,
+    cwd: Optional[str] = None,
+) -> Dict[str, Any]:
+    """Resolve the effective ``safety`` block from global + nearest project config.
+
+    Returns ``{enabled: bool, disabled_rules: list[str]}``. Project ``.agentwire.yml``
+    overrides global; ``disabled_rules`` are merged (set-union).
+    """
+    enabled = True
+    disabled_rules: List[str] = []
+    project_enabled: Optional[bool] = None
+    if not yaml:
+        return {"enabled": enabled, "disabled_rules": disabled_rules}
+
+    if global_config_path is None:
+        global_config_path = Path.home() / ".agentwire" / "config.yaml"
+    try:
+        if global_config_path.exists():
+            with open(global_config_path, "r") as f:
+                data = yaml.safe_load(f) or {}
+            safety = data.get("safety", {})
+            if isinstance(safety, dict):
+                if "enabled" in safety:
+                    enabled = bool(safety["enabled"])
+                rules = safety.get("disabled_rules", [])
+                if isinstance(rules, list):
+                    disabled_rules.extend(str(r) for r in rules if r)
+    except Exception:
+        pass
+
+    if cwd is None:
+        cwd = os.environ.get("PWD", os.getcwd())
+    current = os.path.abspath(cwd)
+    while True:
+        candidate = os.path.join(current, ".agentwire.yml")
+        if os.path.isfile(candidate):
+            try:
+                with open(candidate, "r") as f:
+                    pdata = yaml.safe_load(f) or {}
+                psafety = pdata.get("safety", {})
+                if isinstance(psafety, dict):
+                    if "enabled" in psafety and psafety["enabled"] is not None:
+                        project_enabled = bool(psafety["enabled"])
+                    prules = psafety.get("disabled_rules", [])
+                    if isinstance(prules, list):
+                        disabled_rules.extend(str(r) for r in prules if r)
+            except Exception:
+                pass
+            break
+        parent = os.path.dirname(current)
+        if parent == current:
+            break
+        current = parent
+
+    if project_enabled is not None:
+        enabled = project_enabled
+
+    return {"enabled": enabled, "disabled_rules": sorted(set(disabled_rules))}
+
+
+_ESCAPE_HATCH_RE = re.compile(r"#\s*allow:[ \t]*([^\n]+)", re.IGNORECASE)
+
+
+def detect_escape_hatch(command: str) -> Optional[str]:
+    """Return the reason if ``command`` contains a ``# allow: <reason>`` marker.
+
+    Non-empty reason required; matches the rest of the comment line so the
+    marker works on multi-line / chained commands too.
+    """
+    if not command:
+        return None
+    m = _ESCAPE_HATCH_RE.search(command)
+    if not m:
+        return None
+    reason = m.group(1).strip()
+    return reason or None
+
+
 # ============================================================================
 # DECISION LADDERS
 # ============================================================================
@@ -446,27 +567,57 @@ def load_config(
 def check_command(command: str, config: Dict[str, Any]) -> Dict[str, Any]:
     """Decide whether a bash command should be allowed/blocked/asked.
 
-    Returns ``{decision, reason, pattern, command}``.
+    Returns ``{decision, reason, pattern, command}`` plus optional ``id``,
+    ``escape_reason``, ``escape``, ``disabled``.
 
     Order:
-      1. Hard-blocked bash patterns (no ``bypassable`` flag) → BLOCK
-      2. Ask patterns → ASK
-      3. Bypassable bash patterns → check allowlist for required operation
-      4. zeroAccessPaths → check allowlist with ``read`` permission
-      5. readOnlyPaths → match against READ_ONLY_BLOCKED operation patterns
-      6. noDeletePaths → match against NO_DELETE_BLOCKED patterns
+      0. Escape hatch (``# allow: <reason>``) → ALLOW (escape=True)
+      1. Kill switch (``config["safety"]["enabled"] is False``) → ALLOW (disabled=True)
+      2. Hard-blocked bash patterns (skip if ``id`` in ``disabled_rules``)
+      3. Ask patterns
+      4. Bypassable bash patterns → check allowlist for required operation
+      5. zeroAccessPaths → check allowlist with ``read`` permission
+      6. readOnlyPaths → match against READ_ONLY_BLOCKED operation patterns
+      7. noDeletePaths → match against NO_DELETE_BLOCKED patterns
     """
+    safety_cfg = config.get("safety", {}) if isinstance(config.get("safety"), dict) else {}
+    disabled_rules = set(safety_cfg.get("disabled_rules", []) or [])
+    is_enabled = safety_cfg.get("enabled", True)
+
+    escape_reason = detect_escape_hatch(command)
+    if escape_reason:
+        return {
+            "decision": "allow",
+            "reason": f"Escape hatch: {escape_reason}",
+            "pattern": None,
+            "command": command,
+            "escape": True,
+            "escape_reason": escape_reason,
+        }
+
+    if is_enabled is False:
+        return {
+            "decision": "allow",
+            "reason": "safety disabled",
+            "pattern": None,
+            "command": command,
+            "disabled": True,
+        }
+
     bash_patterns = config.get("bashToolPatterns", [])
     zero_access = config.get("zeroAccessPaths", [])
     read_only = config.get("readOnlyPaths", [])
     no_delete = config.get("noDeletePaths", [])
     allowed = load_allowed_paths(config)
 
-    bypassable_matches: List[Tuple[str, str]] = []
+    bypassable_matches: List[Tuple[str, str, Optional[str]]] = []
 
     for pattern_obj in bash_patterns:
         if not isinstance(pattern_obj, dict):
             continue
+        rule_id = pattern_obj.get("id")
+        if rule_id and rule_id in disabled_rules:
+            continue
         pattern = pattern_obj.get("pattern", "")
         reason = pattern_obj.get("reason", "Matched pattern")
         should_ask = pattern_obj.get("ask", False)
@@ -479,20 +630,22 @@ def check_command(command: str, config: Dict[str, Any]) -> Dict[str, Any]:
                         "reason": reason,
                         "pattern": pattern,
                         "command": command,
+                        "id": rule_id,
                     }
                 elif bypassable:
-                    bypassable_matches.append((pattern, reason))
+                    bypassable_matches.append((pattern, reason, rule_id))
                 else:
                     return {
                         "decision": "block",
                         "reason": reason,
                         "pattern": pattern,
                         "command": command,
+                        "id": rule_id,
                     }
         except re.error:
             continue
 
-    for pattern, reason in bypassable_matches:
+    for pattern, reason, rule_id in bypassable_matches:
         operation = _infer_operation_from_reason(reason)
         if not is_command_path_allowed(command, allowed, operation):
             return {
@@ -500,6 +653,7 @@ def check_command(command: str, config: Dict[str, Any]) -> Dict[str, Any]:
                 "reason": reason,
                 "pattern": pattern,
                 "command": command,
+                "id": rule_id,
             }
 
     for path in zero_access:
@@ -548,6 +702,10 @@ def check_command(command: str, config: Dict[str, Any]) -> Dict[str, Any]:
 
 def check_path(file_path: str, config: Dict[str, Any]) -> Tuple[bool, str]:
     """File-path-only check used by edit/write hooks. Returns ``(blocked, reason)``."""
+    safety_cfg = config.get("safety", {}) if isinstance(config.get("safety"), dict) else {}
+    if safety_cfg.get("enabled", True) is False:
+        return False, ""
+
     allowed = load_allowed_paths(config)
 
     if is_path_allowed_for_op(file_path, allowed, "edit"):
@@ -591,6 +749,7 @@ def _resolve_tooldefs_dir():
 
 def main() -> None:
     config = load_config(_resolve_rules_dir(), _resolve_tooldefs_dir())
+    config["safety"] = load_safety_config()
 
     try:
         input_data = json.load(sys.stdin)
@@ -623,7 +782,10 @@ def main() -> None:
     reason = result["reason"]
 
     if decision == "block":
-        log_blocked("Bash", command, reason)
+        try:
+            log_blocked("Bash", command, reason, pattern=result.get("pattern"), rule_id=result.get("id"))
+        except TypeError:
+            log_blocked("Bash", command, reason)
         print(f"SECURITY: Blocked: {reason}", file=sys.stderr)
         print(f"Command: {command[:100]}{'...' if len(command) > 100 else ''}", file=sys.stderr)
         sys.exit(2)
@@ -638,6 +800,12 @@ def main() -> None:
         }
         print(json.dumps(output))
         sys.exit(0)
+    elif result.get("escape"):
+        log_escape("Bash", command, result.get("escape_reason") or "")
+        sys.exit(0)
+    elif result.get("disabled"):
+        log_disabled("Bash", command)
+        sys.exit(0)
     else:
         log_allowed("Bash", command, user_approved=False)
         sys.exit(0)