Fix watcher bugs

[tastelikefeet]

PR type

• Bug Fix
• New Feature
• Document Updates
• Server Enhancement

PR information

Write the detail information belongs to this PR.

Test results

Paste your test result here (if needed).

[gemini-code-assist]

Code Review

This pull request updates the daemon-stopping logic in ultron/cli/watcher.py to support custom pgrep patterns via an optional extra_patterns parameter. The review feedback recommends using Optional[List[str]] instead of string-quoted union types for consistency, deduplicating patterns to avoid redundant pgrep executions, and adding -- to the pgrep command to prevent potential option injection vulnerabilities.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

[gemini-code-assist]

Since Optional is already imported and used elsewhere in this file (e.g., for _logger), we should use Optional[List[str]] instead of the string-quoted "List[str] | None" union syntax for consistency and compatibility.

Suggested change

	def stop_daemon(extra_patterns: "List[str] | None" = None) -> bool:
	def stop_daemon(extra_patterns: Optional[List[str]] = None) -> bool:

[gemini-code-assist]

For consistency with the rest of the file and the use of Optional from typing, use Optional[List[str]] instead of "List[str] | None".

Suggested change

	def _find_watch_pids(extra_patterns: "List[str] | None" = None) -> List[int]:
	def _find_watch_pids(extra_patterns: Optional[List[str]] = None) -> List[int]:

[gemini-code-assist]

If extra_patterns contains patterns that are already in _DEFAULT_WATCH_PATTERNS or contains duplicate entries, pgrep will be executed multiple times for the same pattern. We can deduplicate the patterns while preserving their order using dict.fromkeys.

Suggested change

	patterns = list(_DEFAULT_WATCH_PATTERNS)
	if extra_patterns:
	patterns.extend(extra_patterns)
	patterns = list(dict.fromkeys(_DEFAULT_WATCH_PATTERNS + (extra_patterns or [])))

[gemini-code-assist]

If any pattern in extra_patterns starts with a hyphen (e.g., -v), it could be interpreted as a command-line option by pgrep, leading to unexpected behavior or option injection. To prevent this, use -- to explicitly signal the end of command options to pgrep.

Suggested change

	result = subprocess.run(
	["pgrep", "-f", pattern],
	capture_output=True, text=True, timeout=5,
	)
	result = subprocess.run(
	["pgrep", "-f", "--", pattern],
	capture_output=True, text=True, timeout=5,
	)