mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-28 20:44:50 +02:00
* [eric] ci: gitleaks-ignore the known historical secrets so our branch stops failing on leaks it didnt add * [eric] workflows: restore scheduled-tasks on the workflow line (revert removal, keep windows fixes + 1.1.69) * [eric] workflows: re-apply uncommitted scheduling wip (schedule pill, calendar view, slice) * [eric] ops: gitignore dev-team local state files * [eric] ops: backlog item for download-tracking visibility * [eric] ci: allowlist the cdp-routes redaction-test token in gitleaks * [aidan] feat/scheduled-tasks: keep step labels in sync on edit and show chevron on every step * [aidan] fix: schedule time in chat * [aidan] ux/workflows: add workflow step removal (#91) * [aidan] feat/scheduled-tasks: remember workflow tool permissions across runs * [aidan] feat/task-scheduling: add hourly and minute (15-min minimum) schedule intervals (#93) * [aidan] feat/scheduled-tasks: calendar, rename, and edit workflows (#94) * [aidan] bug: fix schedule button * [aidan] fix/agent-errors: surface provider rate limits * [aidan] ux/cards: click-to-rename for chat and workflow titles Single-click a card's title to enter edit mode inline. Commit on Enter/blur, cancel on Escape. Rename persists via PATCH for workflows and sessions. * [aidan] feat/workflows: seed build prompt for zero-step workflows When a new workflow has no steps, seed the agent with a prompt asking the user to describe what the workflow should do, rather than starting blank. * [aidan] feat/workflows: add-to-schedule popover for unscheduled workflows Clicking the "+" on an unscheduled workflow row opens a popover with two options: - Keep this schedule: enables the workflow's existing cadence and moves it to Scheduled - Change schedule: opens the scheduling editor to pick a different time * [aidan] ux/workflows: wire add-to-schedule popover and simplify New button - Made the "+" icon on unscheduled workflow rows clickable, opening a popover to keep or change the schedule - Removed AddIcon from toolbar "New" button (now reads "New" instead of "+ New") * [aidan] fix/scheduled-tasks: open schedule calendar when Schedule pill clicked Fixed the Schedule pill click being swallowed by the toolbar's dismiss handler. Exempted the toolbar pills via data-toolbar-pills so their click handlers fire. * [aidan] ux/workflows: open New workflow in agent build chat instead of empty card When creating a new workflow from the hub, open it in edit_agent view (with the agent builder chat) instead of a preview card. The workflow is created on the backend first so the embedded session has a real ID. * [aidan] feat/workflow-edit: add draft testing save flow * [aidan] ux/chat: remove continue chat button * [aidan] ux/workflows: polish workflow card interactions * [aidan] fix/workflow-scheduling: save unscheduled workflows as drafts * aidan ui: schedule naming changes * [aidan] ui: tool calling desc/naming * [aidan] ui: calendar sidebar naming * [aidan] ui: fix stop viewing closing chat * [aidan] feat/workflows: auto-name workflows and polish the build flow (#95) * [aidan] feat/workflow-auto-naming: auto-generate workflow titles from steps Generate a title + description from a workflow's steps (one aux call, reused for step labels) whenever it is still auto_named, so a workflow built in the Edit Agent names itself on commit instead of staying "New workflow". A manual rename sets auto_named=False and is never overwritten. Stream the aux call (non-streaming drops content on some 9router lanes) and fall back to a step-derived title when the model is unavailable. * [aidan] feat/workflows: hide unsaved new workflows until first save A brand-new "+ New" workflow is created with unsaved=true and kept out of the hub's scheduled/unscheduled lists while the user is still building it in the Edit Agent. The first commit (Save) clears the flag and the workflow appears. Every other create path stays visible immediately. * [aidan] ux/workflows: remove redundant save workflow button The Edit Agent already has Discard/Save controls in its strip, so the header "Save Workflow" button was a duplicate save path. Remove it and its pulse/edit-session-id wiring; the model/time subtitle stays. * [aidan] ux/workflows: animate title on auto-rename Wrap the workflow card title in the same Typewriter the chat card uses, so when the auto-generated name replaces the placeholder after Save it retypes letter-by-letter. Gated on a real (non-placeholder) title so it never animates on mount or for already-named workflows. * [aidan] ux/workflows: animate sidebar title on auto-rename Wrap the calendar hub's sidebar row title in the same Typewriter the workflow card uses, so a title that auto-renames retypes letter-by-letter in the sidebar too. Extract the placeholder/isRealTitle guard into the shared workflowVisuals so the card and sidebar stay in sync. * [aidan] fix/workflows: connect watch tether, keep watched chat open, wire draft run/history * [aidan] ui: grey out chat pill when not selected * [aidan] ui: fix running agent display * [aidan] feat/history-popover: add chat history and scheduled tasks run log tabs (#96) * [aidan] ux/schedule: toast when calendar view already open on expand * [aidan] ui: fix popover descs * [aidan] feat/workflow-runs: add pause, resume, and stop controls for live runs * [aidan] feat/schedule-calendar: add calendar occurrences endpoint and concrete timezones * [aidan] feat/workflows: require at least one step to save a workflow * [aidan] ux/edit-agent: hide Discard for an unsaved new workflow * [aidan] ux/edit-agent: move fix-prefix card below the step list * [aidan] feat/workflows: toast when an unattended scheduled run starts * [aidan] fix/dashboard-tethers: anchor workflow-sidecar tethers to measured card rects * [aidan] feat/workflows: validate steps before scheduling and keep chat tool memory * [aidan] feat/mcp-suggestions: dismissable integration banner with per-session cooldown * [aidan] feat/workflows: add scheduled-run "running now" toast with click-to-view (#97) * [aidan] ux/workflows: surface paused state on card, sidebar, and calendar; tidy run history * [aidan] feat/mcp-suggestions: suggest both Google and Microsoft when provider is ambiguous * [aidan] fix/agent-tokens: friendly out-of-tokens card across all agent surfaces * [aidan] feat/workflow-model: persist edit-agent model on save with switch notice and fresh drafts * [aidan] fix/workflow-chat: force stop on watched run mirrors workflow card stop * [aidan] fix/workflow-cards: keep watched run tethered on finish to avoid duplicate chat * [aidan] feat/schedule-calendar: mark current time with a now line in week view * [aidan] refactor/private-names: rename error and schedule classifiers from _ to p_ * [aidan] feat/scheduled-tasks: agent workflow scheduling and in-chat convert (#98) * [aidan] feat/workflow-suggest: nudge user to convert repeatable chat to workflow Add SuggestConvertToWorkflow MCP tool that agents call at the end of a task when they've completed something worth repeating (daily report, weekly check, recurring data pull). Frontend detects the tool call and glows the "Convert to workflow" button 3 times to draw the eye. When user clicks it, the suggested cadence (e.g. "every weekday at 9am") is stored in the draft and seeded into the scheduling agent's first prompt, so the agent can act on the suggestion rather than asking the user again. Tool is never auto-called — agents decide when a task is genuinely repeatable (not debugging, creative work, one-off lookup). Tool description emphasizes sparse, high-confidence use only (once per session max). Files changed: - backend/apps/agents/schedule_mcp_server.py: add SuggestConvertToWorkflow tool - frontend/src/shared/mcpToolMeta.ts: add label for new tool - frontend/src/app/pages/Dashboard/cards/AgentCard.tsx: detect suggestion in session messages, show+glow "Convert to workflow" button, pass cadence to draft - frontend/src/shared/state/workflowsSlice.ts: add suggested_cadence field to Workflow interface - frontend/src/app/pages/Workflows/SchedulingView.tsx: seed scheduling agent prompt with suggested cadence hint * [aidan] feat/agent-scheduling: route recurring asks through native workflows, deny claude cron skill * [aidan] feat/workflow-convert: in-chat convert popup and auto-open scheduled workflow card * [aidan] ux/calendar-page: schedule calendar restyle + popover fixes (#99) * [aidan] fix/dashboard-delete: remove workflows calendar panel on delete key * [aidan] ux/workflows-calendar: restyle hub, fix today highlight, add toolbar toggle * [aidan] ux/schedule-popover: compact density, fix sticky header bleed, add header spacing * [aidan] ux/schedule-calendar: hollow ring dot for past fires in month view * [aidan] ux/schedule-calendar: clickable +N more opens day's full run list * [aidan] feat/run-log-filters: add success and skipped pills to scheduled task history * [aidan] fix/convert-button: stop drag capture so convert-to-workflow click fires * [aidan] ux/calendar-card: match border color and radius to chat and workflow cards * [aidan] fix/minimap: render missed-runs card on the minimap * [aidan] ux/run-sparkline: simplify tooltip to plain run tally * [aidan] ux/run-history: collapse expanded run view to one clickable line * [aidan] ux/calendar-card: match corner radius to browser cards * [aidan] feat/workflows: launch-time scheduling UX and workflow-card polish (#101) * [aidan] feat/schedule-list: lazy-load list view via scroll sentinel * [aidan] feat/missed-runs: launch toast with per-workflow counts and pan-to-card * [aidan] fix/dashboard-tethers: keep watching line anchored on canvas zoom * [aidan] feat/scheduled-tasks: review missed runs at launch instead of auto-firing on_missed * [aidan] refactor/workflow-cards: use radius and status design tokens, polish card chrome * [aidan] ux/agent-card: keep convert-to-workflow visible during runs with mid-turn toast * [aidan] ux/mcp-bubble: drop redundant verb label when a workflow label is shown * [aidan] chore/backend: remove stale explanatory comments * [aidan] fix/workflows-hub: load workflows on hub mount so calendar fills at launch * [aidan] feat/workflows: generate title, description, step labels at convert time * [aidan] fix/tidy-layout: include workflows hub in tidy and fit-to-view * [aidan] feat/schedule-list: window long list via measured-height virtualizer * [aidan] ux/workflows-hub: remove time-saved badge from calendar header * [aidan] fix/types: add missing semantic-type labels and drop stray fade arg * [aidan] feat/schedule: pin monthly day-of-month and honor repeat-every intervals * [aidan] feat/schedule: inherit source-session tool surface for scheduled runs * [aidan] ux/calendar: restack hour-cell events as bars with overflow affordance * [aidan] feat/calendar: open the run card when clicking a scheduled occurrence * [aidan] ux/missed-runs: add per-group select-all toggle and rename skip action * [aidan] feat: new scheduled task design ported * [aidan] ui: sidebar reorder, repeat controls on schedule card * [aidan] ui: sidebar, scheduling time * [aidan] feat/schedule: pin monthly last-day-of-month * [aidan] feat/steps: per-step enable toggle * [aidan] feat/workflows: per-workflow color swatch * [aidan] feat/trash: soft-delete workflows with restore and purge * [aidan] feat/run-monitor: live run monitor card on the canvas * [aidan] feat/run-context: attach a run as removable chat context * [aidan] feat/compose: new-workflow landing page and auto-commit build flow * [aidan] ui/workflows: dark mode and design-system cohesion * [aidan] ui/calendar: overflow popover, condensed week view, scroll fix * [aidan] feat/home: ongoing runs, missed review, and accurate Coming-up counts * [aidan] fix/run-status: sync ongoing runs and heal stuck/interrupted runs * [aidan] ux/schedule: last-day-of-month UI, Run-at time typing, interval input * [aidan] ux/workflows: default window size and toolbar icon * [aidan] fix/schedule: measure ran_late from start and anchor recurrences to created_at * [aidan] feat/calendar: render fire times from backend, drop JS recurrence reimpl * [aidan] chore/dashboard: drop dead configure/missed-run cards, refetch on reconnect * [aidan] chore/agent-card: remove unreachable convert-to-workflow action * [aidan] fix/workflows: don't bump updated_at on a no-op draft commit so viewing a workflow doesn't reorder the sidebar * [aidan] feat/schedule: warn when scheduling a workflow that has no steps * [aidan] fix/selection-tool: never select the workflows app, and exit the tool on Escape without dropping selections * [aidan] ux/compose: diversify new-workflow starter prompts across personas * [aidan] ux/run-monitor: spawn the run card a bit farther right of the workflows app * [aidan] fix/schedule: harden run recovery and storage writes against crashes * [aidan] ux/compose: restyle new-workflow starters as a clean pill cluster with rich prompts * [aidan] fix/workflows: optimistically apply edits so the schedule banner updates instantly * [aidan] ui/workflows: three-tone surface depth so the window lifts off the canvas in both themes * [aidan] ui/workflows: close buttons turn red on hover, matching the chat card * [aidan] test/schedule: cover executor pipeline, storage durability, and recurrence gaps * [aidan] fix: remove package-lock json * [aidan] fix/workflows-compose: keep compose view until edit agent replies * [aidan] feat/workflows: auto-generate workflow + step titles with typewriter animation * [eric] deps: restore frontend/package-lock.json (PR #105 deletion broke npm ci) --------- Co-authored-by: Eric <ciregenz@berkeley.edu> Co-authored-by: cire <134991075+ciregenz@users.noreply.github.com>
706 lines
22 KiB
Python
706 lines
22 KiB
Python
from __future__ import annotations
|
|
|
|
import collections.abc as cabc
|
|
import os
|
|
import re
|
|
import typing as t
|
|
from gettext import gettext as _
|
|
|
|
from .core import Argument
|
|
from .core import Command
|
|
from .core import Context
|
|
from .core import Group
|
|
from .core import Option
|
|
from .core import Parameter
|
|
from .core import ParameterSource
|
|
from .utils import echo
|
|
|
|
|
|
def shell_complete(
|
|
cli: Command,
|
|
ctx_args: cabc.MutableMapping[str, t.Any],
|
|
prog_name: str,
|
|
complete_var: str,
|
|
instruction: str,
|
|
) -> t.Literal[0, 1]:
|
|
"""Perform shell completion for the given CLI program.
|
|
|
|
:param cli: Command being called.
|
|
:param ctx_args: Extra arguments to pass to
|
|
``cli.make_context``.
|
|
:param prog_name: Name of the executable in the shell.
|
|
:param complete_var: Name of the environment variable that holds
|
|
the completion instruction.
|
|
:param instruction: Value of ``complete_var`` with the completion
|
|
instruction and shell, in the form ``instruction_shell``.
|
|
:return: Status code to exit with.
|
|
"""
|
|
shell, _, instruction = instruction.partition("_")
|
|
comp_cls = get_completion_class(shell)
|
|
|
|
if comp_cls is None:
|
|
return 1
|
|
|
|
comp = comp_cls(cli, ctx_args, prog_name, complete_var)
|
|
|
|
# Write bytes, otherwise Windows text stdout translates LF to CRLF and breaks.
|
|
if instruction == "source":
|
|
echo(comp.source().encode(), nl=False)
|
|
return 0
|
|
|
|
if instruction == "complete":
|
|
echo(comp.complete().encode())
|
|
return 0
|
|
|
|
return 1
|
|
|
|
|
|
if t.TYPE_CHECKING:
|
|
from typing_extensions import TypeVar
|
|
|
|
# `Any` is used as default for backwards compatibility (instead of e.g. `str`)
|
|
_ValueT_co = TypeVar("_ValueT_co", covariant=True, default=t.Any)
|
|
else:
|
|
_ValueT_co = t.TypeVar("_ValueT_co", covariant=True)
|
|
|
|
|
|
class CompletionItem(t.Generic[_ValueT_co]):
|
|
"""Represents a completion value and metadata about the value. The
|
|
default metadata is ``type`` to indicate special shell handling,
|
|
and ``help`` if a shell supports showing a help string next to the
|
|
value.
|
|
|
|
Arbitrary parameters can be passed when creating the object, and
|
|
accessed using ``item.attr``. If an attribute wasn't passed,
|
|
accessing it returns ``None``.
|
|
|
|
:param value: The completion suggestion.
|
|
:param type: Tells the shell script to provide special completion
|
|
support for the type. Click uses ``"dir"`` and ``"file"``.
|
|
:param help: String shown next to the value if supported.
|
|
:param kwargs: Arbitrary metadata. The built-in implementations
|
|
don't use this, but custom type completions paired with custom
|
|
shell support could use it.
|
|
"""
|
|
|
|
__slots__ = ("value", "type", "help", "_info")
|
|
|
|
def __init__(
|
|
self,
|
|
value: _ValueT_co,
|
|
type: str = "plain",
|
|
help: str | None = None,
|
|
**kwargs: t.Any,
|
|
) -> None:
|
|
self.value: _ValueT_co = value
|
|
self.type: str = type
|
|
self.help: str | None = help
|
|
self._info = kwargs
|
|
|
|
def __getattr__(self, name: str) -> t.Any:
|
|
return self._info.get(name)
|
|
|
|
|
|
# Only Bash >= 4.4 has the nosort option.
|
|
_SOURCE_BASH = """\
|
|
%(complete_func)s() {
|
|
local IFS=$'\\n'
|
|
local response
|
|
|
|
response=$(env COMP_WORDS="${COMP_WORDS[*]}" COMP_CWORD=$COMP_CWORD \
|
|
%(complete_var)s=bash_complete $1)
|
|
|
|
for completion in $response; do
|
|
IFS=',' read type value <<< "$completion"
|
|
|
|
if [[ $type == 'dir' ]]; then
|
|
COMPREPLY=()
|
|
compopt -o dirnames
|
|
elif [[ $type == 'file' ]]; then
|
|
COMPREPLY=()
|
|
compopt -o default
|
|
elif [[ $type == 'plain' ]]; then
|
|
COMPREPLY+=($value)
|
|
fi
|
|
done
|
|
|
|
return 0
|
|
}
|
|
|
|
%(complete_func)s_setup() {
|
|
complete -o nosort -F %(complete_func)s %(prog_name)s
|
|
}
|
|
|
|
%(complete_func)s_setup;
|
|
"""
|
|
|
|
# See ZshComplete.format_completion below, and issue #2703, before
|
|
# changing this script.
|
|
#
|
|
# (TL;DR: _describe is picky about the format, but this Zsh script snippet
|
|
# is already widely deployed. So freeze this script, and use clever-ish
|
|
# handling of colons in ZshComplet.format_completion.)
|
|
_SOURCE_ZSH = """\
|
|
#compdef %(prog_name)s
|
|
|
|
%(complete_func)s() {
|
|
local -a completions
|
|
local -a completions_with_descriptions
|
|
local -a response
|
|
(( ! $+commands[%(prog_name)s] )) && return 1
|
|
|
|
response=("${(@f)$(env COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) \
|
|
%(complete_var)s=zsh_complete %(prog_name)s)}")
|
|
|
|
for type key descr in ${response}; do
|
|
if [[ "$type" == "plain" ]]; then
|
|
if [[ "$descr" == "_" ]]; then
|
|
completions+=("$key")
|
|
else
|
|
completions_with_descriptions+=("$key":"$descr")
|
|
fi
|
|
elif [[ "$type" == "dir" ]]; then
|
|
_path_files -/
|
|
elif [[ "$type" == "file" ]]; then
|
|
_path_files -f
|
|
fi
|
|
done
|
|
|
|
if [ -n "$completions_with_descriptions" ]; then
|
|
_describe -V unsorted completions_with_descriptions -U
|
|
fi
|
|
|
|
if [ -n "$completions" ]; then
|
|
compadd -U -V unsorted -a completions
|
|
fi
|
|
}
|
|
|
|
if [[ $zsh_eval_context[-1] == loadautofunc ]]; then
|
|
# autoload from fpath, call function directly
|
|
%(complete_func)s "$@"
|
|
else
|
|
# eval/source/. command, register function for later
|
|
compdef %(complete_func)s %(prog_name)s
|
|
fi
|
|
"""
|
|
|
|
_SOURCE_FISH = """\
|
|
function %(complete_func)s;
|
|
set -l response (env %(complete_var)s=fish_complete COMP_WORDS=(commandline -cp) \
|
|
COMP_CWORD=(commandline -t) %(prog_name)s);
|
|
|
|
for completion in $response;
|
|
set -l metadata (string split "," $completion);
|
|
|
|
if test $metadata[1] = "dir";
|
|
__fish_complete_directories $metadata[2];
|
|
else if test $metadata[1] = "file";
|
|
__fish_complete_path $metadata[2];
|
|
else if test $metadata[1] = "plain";
|
|
echo $metadata[2];
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
complete --no-files --command %(prog_name)s --arguments \
|
|
"(%(complete_func)s)";
|
|
"""
|
|
|
|
|
|
class _SourceVarsDict(t.TypedDict):
|
|
complete_func: str
|
|
complete_var: str
|
|
prog_name: str
|
|
|
|
|
|
class ShellComplete:
|
|
"""Base class for providing shell completion support. A subclass for
|
|
a given shell will override attributes and methods to implement the
|
|
completion instructions (``source`` and ``complete``).
|
|
|
|
:param cli: Command being called.
|
|
:param prog_name: Name of the executable in the shell.
|
|
:param complete_var: Name of the environment variable that holds
|
|
the completion instruction.
|
|
|
|
.. versionadded:: 8.0
|
|
"""
|
|
|
|
name: t.ClassVar[str]
|
|
"""Name to register the shell as with :func:`add_completion_class`.
|
|
This is used in completion instructions (``{name}_source`` and
|
|
``{name}_complete``).
|
|
"""
|
|
|
|
source_template: t.ClassVar[str]
|
|
"""Completion script template formatted by :meth:`source`. This must
|
|
be provided by subclasses.
|
|
"""
|
|
|
|
cli: Command
|
|
ctx_args: cabc.MutableMapping[str, t.Any]
|
|
prog_name: str
|
|
complete_var: str
|
|
|
|
def __init__(
|
|
self,
|
|
cli: Command,
|
|
ctx_args: cabc.MutableMapping[str, t.Any],
|
|
prog_name: str,
|
|
complete_var: str,
|
|
) -> None:
|
|
self.cli = cli
|
|
self.ctx_args = ctx_args
|
|
self.prog_name = prog_name
|
|
self.complete_var = complete_var
|
|
|
|
@property
|
|
def func_name(self) -> str:
|
|
"""The name of the shell function defined by the completion
|
|
script.
|
|
"""
|
|
safe_name = re.sub(r"\W*", "", self.prog_name.replace("-", "_"), flags=re.ASCII)
|
|
return f"_{safe_name}_completion"
|
|
|
|
def source_vars(self) -> _SourceVarsDict:
|
|
"""Vars for formatting :attr:`source_template`.
|
|
|
|
By default this provides ``complete_func``, ``complete_var``,
|
|
and ``prog_name``.
|
|
"""
|
|
return {
|
|
"complete_func": self.func_name,
|
|
"complete_var": self.complete_var,
|
|
"prog_name": self.prog_name,
|
|
}
|
|
|
|
def source(self) -> str:
|
|
"""Produce the shell script that defines the completion
|
|
function. By default this ``%``-style formats
|
|
:attr:`source_template` with the dict returned by
|
|
:meth:`source_vars`.
|
|
"""
|
|
return self.source_template % self.source_vars()
|
|
|
|
def get_completion_args(self) -> tuple[list[str], str]:
|
|
"""Use the env vars defined by the shell script to return a
|
|
tuple of ``args, incomplete``. This must be implemented by
|
|
subclasses.
|
|
"""
|
|
raise NotImplementedError
|
|
|
|
def get_completions(
|
|
self, args: list[str], incomplete: str
|
|
) -> list[CompletionItem[str]]:
|
|
"""Determine the context and last complete command or parameter
|
|
from the complete args. Call that object's ``shell_complete``
|
|
method to get the completions for the incomplete value.
|
|
|
|
:param args: List of complete args before the incomplete value.
|
|
:param incomplete: Value being completed. May be empty.
|
|
"""
|
|
ctx = _resolve_context(self.cli, self.ctx_args, self.prog_name, args)
|
|
obj, incomplete = _resolve_incomplete(ctx, args, incomplete)
|
|
return obj.shell_complete(ctx, incomplete)
|
|
|
|
def format_completion(self, item: CompletionItem[str]) -> str:
|
|
"""Format a completion item into the form recognized by the
|
|
shell script. This must be implemented by subclasses.
|
|
|
|
:param item: Completion item to format.
|
|
"""
|
|
raise NotImplementedError
|
|
|
|
def complete(self) -> str:
|
|
"""Produce the completion data to send back to the shell.
|
|
|
|
By default this calls :meth:`get_completion_args`, gets the
|
|
completions, then calls :meth:`format_completion` for each
|
|
completion.
|
|
"""
|
|
args, incomplete = self.get_completion_args()
|
|
completions = self.get_completions(args, incomplete)
|
|
out = [self.format_completion(item) for item in completions]
|
|
return "\n".join(out)
|
|
|
|
|
|
class BashComplete(ShellComplete):
|
|
"""Shell completion for Bash."""
|
|
|
|
name: t.ClassVar[str] = "bash"
|
|
source_template: t.ClassVar[str] = _SOURCE_BASH
|
|
|
|
@staticmethod
|
|
def _check_version() -> None:
|
|
import shutil
|
|
import subprocess
|
|
|
|
bash_exe = shutil.which("bash")
|
|
|
|
if bash_exe is None:
|
|
match = None
|
|
else:
|
|
output = subprocess.run(
|
|
[bash_exe, "--norc", "-c", 'echo "${BASH_VERSION}"'],
|
|
stdout=subprocess.PIPE,
|
|
)
|
|
match = re.search(r"^(\d+)\.(\d+)\.\d+", output.stdout.decode())
|
|
|
|
if match is not None:
|
|
major, minor = match.groups()
|
|
|
|
if major < "4" or major == "4" and minor < "4":
|
|
echo(
|
|
_(
|
|
"Shell completion is not supported for Bash"
|
|
" versions older than 4.4."
|
|
),
|
|
err=True,
|
|
)
|
|
else:
|
|
echo(
|
|
_("Couldn't detect Bash version, shell completion is not supported."),
|
|
err=True,
|
|
)
|
|
|
|
def source(self) -> str:
|
|
self._check_version()
|
|
return super().source()
|
|
|
|
def get_completion_args(self) -> tuple[list[str], str]:
|
|
cwords = split_arg_string(os.environ["COMP_WORDS"])
|
|
cword = int(os.environ["COMP_CWORD"])
|
|
args = cwords[1:cword]
|
|
|
|
try:
|
|
incomplete = cwords[cword]
|
|
except IndexError:
|
|
incomplete = ""
|
|
|
|
return args, incomplete
|
|
|
|
def format_completion(self, item: CompletionItem[t.Any]) -> str:
|
|
return f"{item.type},{item.value}"
|
|
|
|
|
|
class ZshComplete(ShellComplete):
|
|
"""Shell completion for Zsh."""
|
|
|
|
name: t.ClassVar[str] = "zsh"
|
|
source_template: t.ClassVar[str] = _SOURCE_ZSH
|
|
|
|
def get_completion_args(self) -> tuple[list[str], str]:
|
|
cwords = split_arg_string(os.environ["COMP_WORDS"])
|
|
cword = int(os.environ["COMP_CWORD"])
|
|
args = cwords[1:cword]
|
|
|
|
try:
|
|
incomplete = cwords[cword]
|
|
except IndexError:
|
|
incomplete = ""
|
|
|
|
return args, incomplete
|
|
|
|
def format_completion(self, item: CompletionItem[str]) -> str:
|
|
help_ = item.help or "_"
|
|
# The zsh completion script uses `_describe` on items with help
|
|
# texts (which splits the item help from the item value at the
|
|
# first unescaped colon) and `compadd` on items without help
|
|
# text (which uses the item value as-is and does not support
|
|
# colon escaping). So escape colons in the item value if and
|
|
# only if the item help is not the sentinel "_" value, as used
|
|
# by the completion script.
|
|
#
|
|
# (The zsh completion script is potentially widely deployed, and
|
|
# thus harder to fix than this method.)
|
|
#
|
|
# See issue #1812 and issue #2703 for further context.
|
|
value = item.value.replace(":", r"\:") if help_ != "_" else item.value
|
|
return f"{item.type}\n{value}\n{help_}"
|
|
|
|
|
|
class FishComplete(ShellComplete):
|
|
"""Shell completion for Fish."""
|
|
|
|
name: t.ClassVar[str] = "fish"
|
|
source_template: t.ClassVar[str] = _SOURCE_FISH
|
|
|
|
def get_completion_args(self) -> tuple[list[str], str]:
|
|
cwords = split_arg_string(os.environ["COMP_WORDS"])
|
|
incomplete = os.environ["COMP_CWORD"]
|
|
if incomplete:
|
|
incomplete = split_arg_string(incomplete)[0]
|
|
args = cwords[1:]
|
|
|
|
# Fish stores the partial word in both COMP_WORDS and
|
|
# COMP_CWORD, remove it from complete args.
|
|
if incomplete and args and args[-1] == incomplete:
|
|
args.pop()
|
|
|
|
return args, incomplete
|
|
|
|
def format_completion(self, item: CompletionItem[str]) -> str:
|
|
"""
|
|
.. versionchanged:: 8.4.2
|
|
Escape newlines and replace tabs with spaces in the help text to
|
|
fix completion errors with multi-line help strings.
|
|
"""
|
|
# According to https://fishshell.com/docs/current/cmds/complete.html
|
|
# Command substitutions found in ARGUMENTS should return a newline-
|
|
# separated list of arguments, and each argument may optionally have a tab
|
|
# character followed by the argument description.
|
|
if item.help:
|
|
help_ = item.help.replace("\n", "\\n").replace("\t", " ")
|
|
return f"{item.type},{item.value}\t{help_}"
|
|
|
|
return f"{item.type},{item.value}"
|
|
|
|
|
|
_available_shells: t.Final[dict[str, type[ShellComplete]]] = {
|
|
"bash": BashComplete,
|
|
"fish": FishComplete,
|
|
"zsh": ZshComplete,
|
|
}
|
|
|
|
_ShellCompleteT = t.TypeVar("_ShellCompleteT", bound="ShellComplete")
|
|
|
|
|
|
def add_completion_class(
|
|
cls: type[_ShellCompleteT], name: str | None = None
|
|
) -> type[_ShellCompleteT]:
|
|
"""Register a :class:`ShellComplete` subclass under the given name.
|
|
The name will be provided by the completion instruction environment
|
|
variable during completion.
|
|
|
|
:param cls: The completion class that will handle completion for the
|
|
shell.
|
|
:param name: Name to register the class under. Defaults to the
|
|
class's ``name`` attribute.
|
|
"""
|
|
if name is None:
|
|
name = cls.name
|
|
|
|
_available_shells[name] = cls
|
|
|
|
return cls
|
|
|
|
|
|
@t.overload
|
|
def get_completion_class(shell: t.Literal["bash"]) -> type[BashComplete]: ...
|
|
@t.overload
|
|
def get_completion_class(shell: t.Literal["fish"]) -> type[FishComplete]: ...
|
|
@t.overload
|
|
def get_completion_class(shell: t.Literal["zsh"]) -> type[ZshComplete]: ...
|
|
@t.overload
|
|
def get_completion_class(shell: str) -> type[ShellComplete] | None: ...
|
|
def get_completion_class(shell: str) -> type[ShellComplete] | None:
|
|
"""Look up a registered :class:`ShellComplete` subclass by the name
|
|
provided by the completion instruction environment variable. If the
|
|
name isn't registered, returns ``None``.
|
|
|
|
:param shell: Name the class is registered under.
|
|
"""
|
|
return _available_shells.get(shell)
|
|
|
|
|
|
def split_arg_string(string: str) -> list[str]:
|
|
"""Split an argument string as with :func:`shlex.split`, but don't
|
|
fail if the string is incomplete. Ignores a missing closing quote or
|
|
incomplete escape sequence and uses the partial token as-is.
|
|
|
|
.. code-block:: python
|
|
|
|
split_arg_string("example 'my file")
|
|
["example", "my file"]
|
|
|
|
split_arg_string("example my\\")
|
|
["example", "my"]
|
|
|
|
:param string: String to split.
|
|
|
|
.. versionchanged:: 8.2
|
|
Moved to ``shell_completion`` from ``parser``.
|
|
"""
|
|
import shlex
|
|
|
|
lex = shlex.shlex(string, posix=True)
|
|
lex.whitespace_split = True
|
|
lex.commenters = ""
|
|
out = []
|
|
|
|
try:
|
|
for token in lex:
|
|
out.append(token)
|
|
except ValueError:
|
|
# Raised when end-of-string is reached in an invalid state. Use
|
|
# the partial token as-is. The quote or escape character is in
|
|
# lex.state, not lex.token.
|
|
out.append(lex.token)
|
|
|
|
return out
|
|
|
|
|
|
def _is_incomplete_argument(ctx: Context, param: Parameter) -> bool:
|
|
"""Determine if the given parameter is an argument that can still
|
|
accept values.
|
|
|
|
:param ctx: Invocation context for the command represented by the
|
|
parsed complete args.
|
|
:param param: Argument object being checked.
|
|
"""
|
|
if not isinstance(param, Argument):
|
|
return False
|
|
|
|
value = ctx.params.get(param.name)
|
|
return (
|
|
param.nargs == -1
|
|
or ctx.get_parameter_source(param.name) is not ParameterSource.COMMANDLINE
|
|
or (
|
|
param.nargs > 1
|
|
and isinstance(value, (tuple, list))
|
|
and len(value) < param.nargs
|
|
)
|
|
)
|
|
|
|
|
|
def _start_of_option(ctx: Context, value: str) -> bool:
|
|
"""Check if the value looks like the start of an option."""
|
|
if not value:
|
|
return False
|
|
|
|
c = value[0]
|
|
return c in ctx._opt_prefixes
|
|
|
|
|
|
def _is_incomplete_option(ctx: Context, args: list[str], param: Parameter) -> bool:
|
|
"""Determine if the given parameter is an option that needs a value.
|
|
|
|
:param args: List of complete args before the incomplete value.
|
|
:param param: Option object being checked.
|
|
"""
|
|
if not isinstance(param, Option):
|
|
return False
|
|
|
|
if param.is_flag or param.count:
|
|
return False
|
|
|
|
last_option = None
|
|
|
|
for index, arg in enumerate(reversed(args)):
|
|
if index + 1 > param.nargs:
|
|
break
|
|
|
|
if _start_of_option(ctx, arg):
|
|
last_option = arg
|
|
break
|
|
|
|
return last_option is not None and last_option in param.opts
|
|
|
|
|
|
def _resolve_context(
|
|
cli: Command,
|
|
ctx_args: cabc.MutableMapping[str, t.Any],
|
|
prog_name: str,
|
|
args: list[str],
|
|
) -> Context:
|
|
"""Produce the context hierarchy starting with the command and
|
|
traversing the complete arguments. This only follows the commands,
|
|
it doesn't trigger input prompts or callbacks.
|
|
|
|
:param cli: Command being called.
|
|
:param prog_name: Name of the executable in the shell.
|
|
:param args: List of complete args before the incomplete value.
|
|
"""
|
|
ctx_args["resilient_parsing"] = True
|
|
with cli.make_context(prog_name, args.copy(), **ctx_args) as ctx:
|
|
args = ctx._protected_args + ctx.args
|
|
|
|
while args:
|
|
command = ctx.command
|
|
|
|
if isinstance(command, Group):
|
|
if not command.chain:
|
|
name, cmd, args = command.resolve_command(ctx, args)
|
|
|
|
if cmd is None:
|
|
return ctx
|
|
|
|
with cmd.make_context(
|
|
name, args, parent=ctx, resilient_parsing=True
|
|
) as sub_ctx:
|
|
ctx = sub_ctx
|
|
args = ctx._protected_args + ctx.args
|
|
else:
|
|
sub_ctx = ctx
|
|
|
|
while args:
|
|
name, cmd, args = command.resolve_command(ctx, args)
|
|
|
|
if cmd is None:
|
|
return ctx
|
|
|
|
with cmd.make_context(
|
|
name,
|
|
args,
|
|
parent=ctx,
|
|
allow_extra_args=True,
|
|
allow_interspersed_args=False,
|
|
resilient_parsing=True,
|
|
) as sub_sub_ctx:
|
|
sub_ctx = sub_sub_ctx
|
|
args = sub_ctx.args
|
|
|
|
ctx = sub_ctx
|
|
args = [*sub_ctx._protected_args, *sub_ctx.args]
|
|
else:
|
|
break
|
|
|
|
return ctx
|
|
|
|
|
|
def _resolve_incomplete(
|
|
ctx: Context, args: list[str], incomplete: str
|
|
) -> tuple[Command | Parameter, str]:
|
|
"""Find the Click object that will handle the completion of the
|
|
incomplete value. Return the object and the incomplete value.
|
|
|
|
:param ctx: Invocation context for the command represented by
|
|
the parsed complete args.
|
|
:param args: List of complete args before the incomplete value.
|
|
:param incomplete: Value being completed. May be empty.
|
|
"""
|
|
# Different shells treat an "=" between a long option name and
|
|
# value differently. Might keep the value joined, return the "="
|
|
# as a separate item, or return the split name and value. Always
|
|
# split and discard the "=" to make completion easier.
|
|
if incomplete == "=":
|
|
incomplete = ""
|
|
elif "=" in incomplete and _start_of_option(ctx, incomplete):
|
|
name, _, incomplete = incomplete.partition("=")
|
|
args.append(name)
|
|
|
|
# The "--" marker tells Click to stop treating values as options
|
|
# even if they start with the option character. If it hasn't been
|
|
# given and the incomplete arg looks like an option, the current
|
|
# command will provide option name completions.
|
|
if "--" not in args and _start_of_option(ctx, incomplete):
|
|
return ctx.command, incomplete
|
|
|
|
params = ctx.command.get_params(ctx)
|
|
|
|
# If the last complete arg is an option name with an incomplete
|
|
# value, the option will provide value completions.
|
|
for param in params:
|
|
if _is_incomplete_option(ctx, args, param):
|
|
return param, incomplete
|
|
|
|
# It's not an option name or value. The first argument without a
|
|
# parsed value will provide value completions.
|
|
for param in params:
|
|
if _is_incomplete_argument(ctx, param):
|
|
return param, incomplete
|
|
|
|
# There were no unparsed arguments, the command may be a group that
|
|
# will provide command name completions.
|
|
return ctx.command, incomplete
|