mirror of
https://github.com/langchain-ai/deepagents.git
synced 2026-07-21 17:25:26 -04:00
641b906157
`Ctrl+X` now opens the active `/goal` criteria or rejection-feedback field in the configured external editor. --- When a user was editing proposed goal criteria or entering regeneration feedback, `Ctrl+X` still opened the unrelated chat draft because the priority app binding always targeted the composer. This moved focus out of the review and made external-editor composition unusable in both goal-review modes. `Ctrl+X` now detects the active goal-review field and opens its complete logical value, including expanded collapsed-paste content, in `$VISUAL` or `$EDITOR`. Saved text returns to the same field without submitting; cancellation or failure preserves the existing value and focus. Hidden, stale, detached, or unfocused goal editors fall through to the unchanged chat-input behavior.
170 lines
5.1 KiB
Python
170 lines
5.1 KiB
Python
"""External editor support for composing prompts."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import contextlib
|
|
import logging
|
|
import os
|
|
import shlex
|
|
import subprocess # noqa: S404
|
|
import sys
|
|
import tempfile
|
|
from pathlib import Path
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
GUI_WAIT_FLAG: dict[str, str] = {
|
|
"code": "--wait",
|
|
"cursor": "--wait",
|
|
"zed": "--wait",
|
|
"atom": "--wait",
|
|
"subl": "-w",
|
|
"windsurf": "--wait",
|
|
}
|
|
"""Mapping of GUI editor base names to their blocking flag."""
|
|
|
|
VIM_EDITORS = {"vi", "vim", "nvim"}
|
|
"""Set of vim-family editor base names that receive the `-i NONE` flag."""
|
|
|
|
|
|
class ExternalEditorError(RuntimeError):
|
|
"""Raised when an external editor cannot be opened or read."""
|
|
|
|
|
|
def resolve_editor() -> list[str] | None:
|
|
"""Resolve editor command from environment.
|
|
|
|
Checks $VISUAL, then $EDITOR, then falls back to platform default.
|
|
|
|
Returns:
|
|
Tokenized command list, or `None` if the env var was set but empty after
|
|
tokenization.
|
|
"""
|
|
editor = os.environ.get("VISUAL") or os.environ.get("EDITOR")
|
|
if not editor:
|
|
if sys.platform == "win32":
|
|
return ["notepad"]
|
|
return ["vi"]
|
|
tokens = shlex.split(editor)
|
|
return tokens or None
|
|
|
|
|
|
def _prepare_command(cmd: list[str], filepath: str) -> list[str]:
|
|
"""Build the full command list with appropriate flags.
|
|
|
|
Adds --wait/-w for GUI editors and `-i NONE` for vim-family editors.
|
|
|
|
Returns:
|
|
The complete command list with flags and filepath appended.
|
|
"""
|
|
cmd = list(cmd) # copy
|
|
exe = Path(cmd[0]).stem.lower()
|
|
|
|
# Auto-inject wait flag for GUI editors
|
|
if exe in GUI_WAIT_FLAG:
|
|
flag = GUI_WAIT_FLAG[exe]
|
|
if flag not in cmd:
|
|
cmd.insert(1, flag)
|
|
|
|
# Vim workaround: avoid viminfo errors in temp environments
|
|
if exe in VIM_EDITORS and "-i" not in cmd:
|
|
cmd.extend(["-i", "NONE"])
|
|
|
|
cmd.append(filepath)
|
|
return cmd
|
|
|
|
|
|
def open_in_editor(
|
|
current_text: str,
|
|
*,
|
|
allow_empty: bool = False,
|
|
raise_on_error: bool = False,
|
|
) -> str | None:
|
|
"""Open current_text in an external editor.
|
|
|
|
Creates a temp .md file, launches the editor, and reads back the result.
|
|
|
|
Args:
|
|
current_text: The text to pre-populate in the editor.
|
|
allow_empty: Return an empty or whitespace-only edited result instead of
|
|
treating it as cancellation.
|
|
raise_on_error: Re-raise editor launch and file errors instead of treating
|
|
them as cancellation.
|
|
|
|
Returns:
|
|
The edited text with normalized line endings, or `None` if the editor
|
|
exited with a non-zero status, returned blank text while `allow_empty`
|
|
is false, or failed while `raise_on_error` is false.
|
|
|
|
Raises:
|
|
ExternalEditorError: If opening or reading the editor file fails while
|
|
`raise_on_error` is true.
|
|
"""
|
|
cmd = resolve_editor()
|
|
if cmd is None:
|
|
if raise_on_error:
|
|
msg = "Editor command resolved to no arguments"
|
|
raise ExternalEditorError(msg)
|
|
return None
|
|
|
|
tmp_path: str | None = None
|
|
try:
|
|
with tempfile.NamedTemporaryFile(
|
|
suffix=".md",
|
|
prefix="deepagents-edit-",
|
|
delete=False,
|
|
mode="w",
|
|
encoding="utf-8",
|
|
) as tmp:
|
|
tmp_path = tmp.name
|
|
tmp.write(current_text)
|
|
|
|
full_cmd = _prepare_command(cmd, tmp_path)
|
|
|
|
# S603: editor command comes from user's own $EDITOR env var
|
|
result = subprocess.run( # noqa: S603
|
|
full_cmd,
|
|
stdin=sys.stdin,
|
|
stdout=sys.stdout,
|
|
stderr=sys.stderr,
|
|
check=False,
|
|
)
|
|
if result.returncode != 0:
|
|
logger.warning(
|
|
"Editor exited with code %d: %s", result.returncode, full_cmd
|
|
)
|
|
return None
|
|
|
|
edited = Path(tmp_path).read_text(encoding="utf-8")
|
|
|
|
# Normalize line endings
|
|
edited = edited.replace("\r\n", "\n").replace("\r", "\n")
|
|
|
|
# Most editors append a final newline on save (POSIX convention).
|
|
# Strip exactly one so the cursor lands on content, not a blank line,
|
|
# while preserving any intentional trailing newlines the user added.
|
|
edited = edited.removesuffix("\n")
|
|
|
|
# Chat composition historically treats a blank result as cancellation;
|
|
# callers with their own submit-time validation may opt in to preserving it.
|
|
if not allow_empty and not edited.strip():
|
|
return None
|
|
|
|
except FileNotFoundError as exc:
|
|
if raise_on_error:
|
|
msg = "External editor executable or temporary file was not found"
|
|
raise ExternalEditorError(msg) from exc
|
|
return None
|
|
except Exception as exc:
|
|
logger.warning("Editor failed", exc_info=True)
|
|
if raise_on_error:
|
|
msg = "External editor failed"
|
|
raise ExternalEditorError(msg) from exc
|
|
return None
|
|
else:
|
|
return edited
|
|
finally:
|
|
if tmp_path is not None:
|
|
with contextlib.suppress(OSError):
|
|
Path(tmp_path).unlink(missing_ok=True)
|