mirror of
https://github.com/openswarm-ai/openswarm.git
synced 2026-09-22 17:44:53 +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>
303 lines
10 KiB
Python
303 lines
10 KiB
Python
from __future__ import annotations
|
|
|
|
import re
|
|
from collections.abc import Mapping, Sequence
|
|
|
|
from .errors import _ErrorCollector
|
|
from .requirements import Requirement
|
|
|
|
__all__ = [
|
|
"CyclicDependencyGroup",
|
|
"DependencyGroupInclude",
|
|
"DependencyGroupResolver",
|
|
"DuplicateGroupNames",
|
|
"InvalidDependencyGroupObject",
|
|
"resolve_dependency_groups",
|
|
]
|
|
|
|
|
|
def __dir__() -> list[str]:
|
|
return __all__
|
|
|
|
|
|
# -----------
|
|
# Error Types
|
|
# -----------
|
|
|
|
|
|
class DuplicateGroupNames(ValueError):
|
|
"""
|
|
The same dependency groups were defined twice, with different non-normalized names.
|
|
"""
|
|
|
|
|
|
class CyclicDependencyGroup(ValueError):
|
|
"""
|
|
The dependency group includes form a cycle.
|
|
"""
|
|
|
|
def __init__(self, requested_group: str, group: str, include_group: str) -> None:
|
|
self.requested_group = requested_group
|
|
self.group = group
|
|
self.include_group = include_group
|
|
|
|
if include_group == group:
|
|
reason = f"{group} includes itself"
|
|
else:
|
|
reason = f"{include_group} -> {group}, {group} -> {include_group}"
|
|
super().__init__(
|
|
"Cyclic dependency group include while resolving "
|
|
f"{requested_group}: {reason}"
|
|
)
|
|
|
|
|
|
# in the PEP 735 spec, the tables in dependency group lists were described as
|
|
# "Dependency Object Specifiers", but the only defined type of object was a
|
|
# "Dependency Group Include" -- hence the naming of this error as "Object"
|
|
class InvalidDependencyGroupObject(ValueError):
|
|
"""
|
|
A member of a dependency group was identified as a dict, but was not in a valid
|
|
format.
|
|
"""
|
|
|
|
|
|
# ------------------------
|
|
# Object Model & Interface
|
|
# ------------------------
|
|
|
|
|
|
class DependencyGroupInclude:
|
|
__slots__ = ("include_group",)
|
|
|
|
def __init__(self, include_group: str) -> None:
|
|
"""
|
|
Initialize a DependencyGroupInclude.
|
|
|
|
:param include_group: The name of the group referred to by this include.
|
|
"""
|
|
self.include_group = include_group
|
|
|
|
def __repr__(self) -> str:
|
|
return f"{self.__class__.__name__}({self.include_group!r})"
|
|
|
|
|
|
class DependencyGroupResolver:
|
|
"""
|
|
A resolver for Dependency Group data.
|
|
|
|
This class handles caching, name normalization, cycle detection, and other
|
|
parsing requirements. There are only two public methods for exploring the data:
|
|
``lookup()`` and ``resolve()``.
|
|
|
|
:param dependency_groups: A mapping, as provided via pyproject
|
|
``[dependency-groups]``.
|
|
"""
|
|
|
|
def __init__(
|
|
self,
|
|
dependency_groups: Mapping[str, Sequence[str | Mapping[str, str]]],
|
|
) -> None:
|
|
errors = _ErrorCollector()
|
|
|
|
self.dependency_groups = _normalize_group_names(dependency_groups, errors)
|
|
|
|
# a map of group names to parsed data
|
|
self._parsed_groups: dict[
|
|
str, tuple[Requirement | DependencyGroupInclude, ...]
|
|
] = {}
|
|
# a map of group names to their ancestors, used for cycle detection
|
|
self._include_graph_ancestors: dict[str, tuple[str, ...]] = {}
|
|
# a cache of completed resolutions to Requirement lists
|
|
self._resolve_cache: dict[str, tuple[Requirement, ...]] = {}
|
|
|
|
errors.finalize("[dependency-groups] data was invalid")
|
|
|
|
def lookup(self, group: str) -> tuple[Requirement | DependencyGroupInclude, ...]:
|
|
"""
|
|
Lookup a group name, returning the parsed dependency data for that group.
|
|
This will not resolve includes.
|
|
|
|
:param group: the name of the group to lookup
|
|
"""
|
|
group = _normalize_name(group)
|
|
|
|
with _ErrorCollector().on_exit(
|
|
f"[dependency-groups] data for {group!r} was malformed"
|
|
) as errors:
|
|
return self._parse_group(group, errors)
|
|
|
|
def resolve(self, group: str) -> tuple[Requirement, ...]:
|
|
"""
|
|
Resolve a dependency group to a list of requirements.
|
|
|
|
:param group: the name of the group to resolve
|
|
"""
|
|
group = _normalize_name(group)
|
|
|
|
with _ErrorCollector().on_exit(
|
|
f"[dependency-groups] data for {group!r} was malformed"
|
|
) as errors:
|
|
return self._resolve(group, group, errors)
|
|
|
|
def _resolve(
|
|
self, group: str, requested_group: str, errors: _ErrorCollector
|
|
) -> tuple[Requirement, ...]:
|
|
"""
|
|
This is a helper for cached resolution to strings. It preserves the name of the
|
|
group which the user initially requested in order to present a clearer error in
|
|
the event that a cycle is detected.
|
|
|
|
:param group: The normalized name of the group to resolve.
|
|
:param requested_group: The group which was used in the original, user-facing
|
|
request.
|
|
"""
|
|
if group in self._resolve_cache:
|
|
return self._resolve_cache[group]
|
|
|
|
parsed = self._parse_group(group, errors)
|
|
|
|
resolved_group = []
|
|
|
|
for item in parsed:
|
|
if isinstance(item, Requirement):
|
|
resolved_group.append(item)
|
|
elif isinstance(item, DependencyGroupInclude):
|
|
include_group = _normalize_name(item.include_group)
|
|
|
|
# if a group is cyclic, record the error
|
|
# otherwise, follow the include_group reference
|
|
#
|
|
# this allows us to examine all includes in a group, even in the
|
|
# presence of errors
|
|
if include_group in self._include_graph_ancestors.get(group, ()):
|
|
errors.error(
|
|
CyclicDependencyGroup(
|
|
requested_group, group, item.include_group
|
|
)
|
|
)
|
|
else:
|
|
self._include_graph_ancestors[include_group] = (
|
|
*self._include_graph_ancestors.get(group, ()),
|
|
group,
|
|
)
|
|
resolved_group.extend(
|
|
self._resolve(include_group, requested_group, errors)
|
|
)
|
|
else: # pragma: no cover
|
|
raise NotImplementedError(
|
|
f"Invalid dependency group item after parse: {item}"
|
|
)
|
|
|
|
# in the event that errors were detected, present the group as empty and do not
|
|
# cache the result
|
|
# this ensures that repeated access to a cyclic group will raise multiple errors
|
|
if errors.errors:
|
|
return ()
|
|
|
|
self._resolve_cache[group] = tuple(resolved_group)
|
|
return self._resolve_cache[group]
|
|
|
|
def _parse_group(
|
|
self, group: str, errors: _ErrorCollector
|
|
) -> tuple[Requirement | DependencyGroupInclude, ...]:
|
|
# short circuit -- never do the work twice
|
|
if group in self._parsed_groups:
|
|
return self._parsed_groups[group]
|
|
|
|
if group not in self.dependency_groups:
|
|
errors.error(LookupError(f"Dependency group '{group}' not found"))
|
|
return ()
|
|
|
|
raw_group = self.dependency_groups[group]
|
|
if isinstance(raw_group, str):
|
|
errors.error(
|
|
TypeError(
|
|
f"Dependency group {group!r} contained a string rather than a list."
|
|
)
|
|
)
|
|
return ()
|
|
|
|
if not isinstance(raw_group, Sequence):
|
|
errors.error(
|
|
TypeError(f"Dependency group {group!r} is not a sequence type.")
|
|
)
|
|
return ()
|
|
|
|
elements: list[Requirement | DependencyGroupInclude] = []
|
|
for item in raw_group:
|
|
if isinstance(item, str):
|
|
# packaging.requirements.Requirement parsing ensures that this is a
|
|
# valid PEP 508 Dependency Specifier
|
|
# raises InvalidRequirement on failure
|
|
elements.append(Requirement(item))
|
|
elif isinstance(item, Mapping):
|
|
if tuple(item.keys()) != ("include-group",):
|
|
errors.error(
|
|
InvalidDependencyGroupObject(
|
|
f"Invalid dependency group item: {item!r}"
|
|
)
|
|
)
|
|
else:
|
|
include_group = item["include-group"]
|
|
elements.append(DependencyGroupInclude(include_group=include_group))
|
|
else:
|
|
errors.error(TypeError(f"Invalid dependency group item: {item!r}"))
|
|
|
|
self._parsed_groups[group] = tuple(elements)
|
|
return self._parsed_groups[group]
|
|
|
|
|
|
# --------------------
|
|
# Functional Interface
|
|
# --------------------
|
|
|
|
|
|
def resolve_dependency_groups(
|
|
dependency_groups: Mapping[str, Sequence[str | Mapping[str, str]]], /, *groups: str
|
|
) -> tuple[str, ...]:
|
|
"""
|
|
Resolve a dependency group to a tuple of requirements, as strings.
|
|
|
|
:param dependency_groups: the parsed contents of the ``[dependency-groups]`` table
|
|
from ``pyproject.toml``
|
|
:param groups: the name of the group(s) to resolve
|
|
"""
|
|
resolver = DependencyGroupResolver(dependency_groups)
|
|
return tuple(str(r) for group in groups for r in resolver.resolve(group))
|
|
|
|
|
|
# ----------------
|
|
# internal helpers
|
|
# ----------------
|
|
|
|
|
|
_NORMALIZE_PATTERN = re.compile(r"[-_.]+")
|
|
|
|
|
|
def _normalize_name(name: str) -> str:
|
|
return _NORMALIZE_PATTERN.sub("-", name).lower()
|
|
|
|
|
|
def _normalize_group_names(
|
|
dependency_groups: Mapping[str, Sequence[str | Mapping[str, str]]],
|
|
errors: _ErrorCollector,
|
|
) -> dict[str, Sequence[str | Mapping[str, str]]]:
|
|
original_names: dict[str, list[str]] = {}
|
|
normalized_groups: dict[str, Sequence[str | Mapping[str, str]]] = {}
|
|
|
|
for group_name, value in dependency_groups.items():
|
|
normed_group_name = _normalize_name(group_name)
|
|
original_names.setdefault(normed_group_name, []).append(group_name)
|
|
normalized_groups[normed_group_name] = value
|
|
|
|
for normed_name, names in original_names.items():
|
|
if len(names) > 1:
|
|
errors.error(
|
|
DuplicateGroupNames(
|
|
"Duplicate dependency group names: "
|
|
f"{normed_name} ({', '.join(names)})"
|
|
)
|
|
)
|
|
|
|
return normalized_groups
|