Agent Zero AI framework
Add current branch latest version display to self-update modal with collapsible last attempt section
frdelc1d709726e2c
diff --git a/helpers/self_update.py b/helpers/self_update.pyindex 1907d144e..264152b1a 100644--- a/helpers/self_update.py+++ b/helpers/self_update.py@@ -388,6 +388,49 @@ def _format_latest_selector_label(branch: str, describe: str) -> str:return f"latest ({short_tag}+{commits_since_tag})"+def _format_branch_head_version(branch: str, describe: str) -> str:+ short_tag, commits_since_tag = _split_describe_version(describe)+ if not short_tag:+ return ""+ if branch.strip().lower() == "main" or commits_since_tag <= 0:+ return short_tag+ return f"{short_tag}+{commits_since_tag}"+++def get_current_branch_latest_info(+ current_branch: str,+ *,+ repo_dir: str | Path | None = None,+) -> dict[str, Any]:+ repository = get_repo_dir(repo_dir)+ normalized_branch = current_branch.strip().lower()+ if normalized_branch not in SUPPORTED_BRANCHES:+ return {+ "branch": current_branch.strip(),+ "supported": False,+ "describe": "",+ "short_tag": "",+ "display_version": "",+ "commit": "",+ "short_commit": "",+ }++ branch_head_info = _get_branch_head_info(normalized_branch, repo_dir=repository)+ commit = branch_head_info.get("commit", "")+ return {+ "branch": normalized_branch,+ "supported": True,+ "describe": branch_head_info.get("describe", ""),+ "short_tag": branch_head_info.get("short_tag", ""),+ "display_version": _format_branch_head_version(+ normalized_branch,+ branch_head_info.get("describe", ""),+ ),+ "commit": commit,+ "short_commit": commit[:7] if commit else "",+ }++def get_available_tags(branch: str | None = None,*,@@ -477,6 +520,10 @@ def get_update_info(repo_dir: str | Path | None = None) -> dict[str, Any]:return {"repo_dir": str(repository),"current": version_info,+ "current_branch_latest": get_current_branch_latest_info(+ current_branch,+ repo_dir=repository,+ ),"pending": load_pending_update(),"last_status": load_last_status(),"branches": BRANCH_OPTIONS,diff --git a/tests/test_self_update_tag_filter.py b/tests/test_self_update_tag_filter.pyindex 065acc10e..7ba2ebbff 100644--- a/tests/test_self_update_tag_filter.py+++ b/tests/test_self_update_tag_filter.py@@ -99,6 +99,59 @@ def test_self_update_selector_tag_options_filter_to_current_major(monkeypatch):assert higher_major_versions == [2, 3]+def test_self_update_update_info_uses_current_branch_for_latest_version(monkeypatch):+ monkeypatch.setattr(+ self_update,+ "get_repo_version_info",+ lambda _repo=None: {+ "branch": "main",+ "describe": "v1.2",+ "short_tag": "v1.2",+ "commit": "abc1234def",+ "short_commit": "abc1234",+ },+ )+ monkeypatch.setattr(+ self_update,+ "get_selector_tag_options",+ lambda branch, *, repo_dir=None, current_version=None: (+ [{"value": "latest", "label": "latest (v1.4)"}],+ [],+ "",+ ),+ )+ monkeypatch.setattr(self_update, "load_pending_update", lambda: None)+ monkeypatch.setattr(self_update, "load_last_status", lambda: None)+ monkeypatch.setattr(+ self_update,+ "_get_branch_head_info",+ lambda branch, repo_dir=None: {+ "main": {+ "describe": "v1.4",+ "short_tag": "v1.4",+ "commit": "def5678abcd",+ },+ "development": {+ "describe": "v9.9-3-gfeedbee",+ "short_tag": "v9.9",+ "commit": "feedbee1234",+ },+ }[branch],+ )++ info = self_update.get_update_info()++ assert info["current_branch_latest"] == {+ "branch": "main",+ "supported": True,+ "describe": "v1.4",+ "short_tag": "v1.4",+ "display_version": "v1.4",+ "commit": "def5678abcd",+ "short_commit": "def5678",+ }++def test_self_update_frontend_uses_preloaded_select():store_path = (PROJECT_ROOT@@ -154,7 +207,10 @@ def test_self_update_modal_uses_standard_select_and_manual_backup():assert "$store.selfUpdateStore.versionSelectPlaceholder" in contentassert "$store.selfUpdateStore.higherMajorVersionMessage" in contentassert "$store.selfUpdateStore.availableTagOptions" in content+ assert "current_branch_latest?.display_version" in contentassert "tagOption.label" in content+ assert 'data-bs-target="#self-update-last-attempt-collapse"' in content+ assert "Latest version" in contentassert "Docker update guide" in contentassert "https://www.agent-zero.ai/p/docs/get-started/" in contentassert "Manual backup" in contentdiff --git a/webui/components/settings/external/self-update-modal.html b/webui/components/settings/external/self-update-modal.htmlindex 86fb8869e..f909d7e83 100644--- a/webui/components/settings/external/self-update-modal.html+++ b/webui/components/settings/external/self-update-modal.html@@ -14,20 +14,20 @@x-destroy="$store.selfUpdateStore.cleanup()"class="self-update-modal">- <div class="self-update-howto">+ <div class="self-update-panel"><buttontype="button"- class="self-update-howto-toggle"+ class="self-update-panel-toggle"data-bs-toggle="collapse"data-bs-target="#self-update-howto-collapse"aria-expanded="false"aria-controls="self-update-howto-collapse"><span>How it works?</span>- <span class="material-symbols-outlined self-update-howto-toggle-icon">expand_more</span>+ <span class="material-symbols-outlined self-update-panel-toggle-icon">expand_more</span></button><div class="collapse" id="self-update-howto-collapse">- <div class="self-update-howto-body self-update-copy">+ <div class="self-update-panel-body self-update-copy"><p>Agent Zero saves this request into<code x-text="$store.selfUpdateStore.info?.paths?.update_file || '/exe/a0-self-update.yaml'"></code>,@@ -44,15 +44,50 @@</div></div>- <div class="self-update-summary-grid">+ <div class="self-update-version-grid"><div class="self-update-summary-card"><div class="summary-label">Current version</div><div class="summary-value" x-text="$store.selfUpdateStore.currentVersion"></div>- <div class="summary-meta" x-text="$store.selfUpdateStore.info?.current?.short_commit || ''"></div>- <div class="summary-meta" x-text="$store.selfUpdateStore.currentBranch || ''"></div>+ <div class="summary-meta">+ Commit+ <code x-text="$store.selfUpdateStore.info?.current?.short_commit || 'unknown'"></code>+ </div>+ <div class="summary-meta" x-text="`Branch ${$store.selfUpdateStore.currentBranch || 'unknown'}`"></div></div>- <div class="self-update-summary-card" x-show="$store.selfUpdateStore.info?.pending">+ <div class="self-update-summary-card">+ <div class="summary-label">Latest version</div>+ <div+ class="summary-value"+ x-text="$store.selfUpdateStore.info?.current_branch_latest?.display_version || 'Unavailable'"+ ></div>+ <template x-if="$store.selfUpdateStore.info?.current_branch_latest?.short_commit && $store.selfUpdateStore.info?.current_branch_latest?.branch !== 'main'">+ <div class="summary-meta">+ Commit+ <code x-text="$store.selfUpdateStore.info?.current_branch_latest?.short_commit"></code>+ </div>+ </template>+ <div+ class="summary-meta"+ x-text="`Branch ${$store.selfUpdateStore.info?.current_branch_latest?.branch || $store.selfUpdateStore.currentBranch || 'unknown'}`"+ ></div>+ <template x-if="$store.selfUpdateStore.info?.current_branch_latest?.describe && $store.selfUpdateStore.info?.current_branch_latest?.describe !== $store.selfUpdateStore.info?.current_branch_latest?.short_tag">+ <div+ class="summary-meta"+ x-text="$store.selfUpdateStore.info?.current_branch_latest?.describe"+ ></div>+ </template>+ <template x-if="$store.selfUpdateStore.info?.current_branch_latest?.supported === false">+ <div class="summary-meta">+ Latest official version is only tracked for <code>main</code>, <code>testing</code>,+ and <code>development</code>.+ </div>+ </template>+ </div>+ </div>++ <div class="self-update-summary-grid" x-show="$store.selfUpdateStore.info?.pending">+ <div class="self-update-summary-card"><div class="summary-label">Pending request</div><divclass="summary-value"@@ -73,28 +108,42 @@</template><template x-if="$store.selfUpdateStore.info?.last_status">- <div class="self-update-status-card">- <div class="section-title">Last Attempt</div>- <div class="status-pill" x-text="$store.selfUpdateStore.info?.last_status?.status || 'unknown'"></div>- <div class="status-message" x-text="$store.selfUpdateStore.info?.last_status?.message || ''"></div>- <div class="summary-meta">- Trigger:- <code x-text="$store.selfUpdateStore.info?.paths?.update_file || '/exe/a0-self-update.yaml'"></code>- </div>- <div class="summary-meta">- Log:- <code x-text="$store.selfUpdateStore.info?.paths?.log_file || '/exe/a0-self-update.log'"></code>- </div>- <div- class="summary-meta"- x-text="$store.selfUpdateStore.formatTimestamp($store.selfUpdateStore.info?.last_status?.finished_at)"- ></div>- <template x-if="$store.selfUpdateStore.info?.last_status?.backup_zip_path">- <div class="status-path">- Backup:- <code x-text="$store.selfUpdateStore.info?.last_status?.backup_zip_path"></code>+ <div class="self-update-panel">+ <button+ type="button"+ class="self-update-panel-toggle"+ data-bs-toggle="collapse"+ data-bs-target="#self-update-last-attempt-collapse"+ aria-expanded="false"+ aria-controls="self-update-last-attempt-collapse"+ >+ <span>Last Attempt</span>+ <span class="material-symbols-outlined self-update-panel-toggle-icon">expand_more</span>+ </button>+ <div class="collapse" id="self-update-last-attempt-collapse">+ <div class="self-update-panel-body">+ <div class="status-pill" x-text="$store.selfUpdateStore.info?.last_status?.status || 'unknown'"></div>+ <div class="status-message" x-text="$store.selfUpdateStore.info?.last_status?.message || ''"></div>+ <div class="summary-meta">+ Trigger:+ <code x-text="$store.selfUpdateStore.info?.paths?.update_file || '/exe/a0-self-update.yaml'"></code>+ </div>+ <div class="summary-meta">+ Log:+ <code x-text="$store.selfUpdateStore.info?.paths?.log_file || '/exe/a0-self-update.log'"></code>+ </div>+ <div+ class="summary-meta"+ x-text="$store.selfUpdateStore.formatTimestamp($store.selfUpdateStore.info?.last_status?.finished_at)"+ ></div>+ <template x-if="$store.selfUpdateStore.info?.last_status?.backup_zip_path">+ <div class="status-path">+ Backup:+ <code x-text="$store.selfUpdateStore.info?.last_status?.backup_zip_path"></code>+ </div>+ </template></div>- </template>+ </div></div></template>@@ -325,13 +374,13 @@margin: 0 0 0.75rem;}- .self-update-howto {+ .self-update-panel {border: 1px solid var(--color-border);border-radius: 0.9rem;background: var(--color-panel);}- .self-update-howto-toggle {+ .self-update-panel-toggle {width: 100%;display: flex;align-items: center;@@ -346,15 +395,15 @@text-align: left;}- .self-update-howto-toggle-icon {+ .self-update-panel-toggle-icon {transition: transform 0.2s ease;}- .self-update-howto-toggle[aria-expanded="true"] .self-update-howto-toggle-icon {+ .self-update-panel-toggle[aria-expanded="true"] .self-update-panel-toggle-icon {transform: rotate(180deg);}- .self-update-howto-body {+ .self-update-panel-body {padding: 0 1rem 1rem;}@@ -408,16 +457,21 @@text-decoration: underline;}+ .self-update-version-grid {+ display: grid;+ gap: 0.75rem;+ grid-template-columns: repeat(2, minmax(0, 1fr));+ }+.self-update-summary-grid {display: grid;gap: 0.75rem;grid-template-columns: repeat(auto-fit, minmax(220px, 1fr));}- .self-update-summary-card,- .self-update-status-card {+ .self-update-summary-card {border: 1px solid var(--color-border);- border-radius: 10px;+ border-radius: 0.9rem;padding: 0.9rem 1rem;background: var(--color-panel);}@@ -487,6 +541,12 @@margin-top: 0.7rem;line-height: 1.5;}++ @media (max-width: 720px) {+ .self-update-version-grid {+ grid-template-columns: minmax(0, 1fr);+ }+ }</style></body></html>diff --git a/webui/components/welcome/welcome-screen.html b/webui/components/welcome/welcome-screen.htmlindex c6887bfc1..947dd6d84 100644--- a/webui/components/welcome/welcome-screen.html+++ b/webui/components/welcome/welcome-screen.html@@ -7,9 +7,10 @@</head><body>- <div x-data >- <template x-if="$store.welcomeStore && $store.welcomeStore.isVisible">- <div x-create="$store.welcomeStore.onCreate()" class="welcome-container">+ <div x-data>+ <template x-if="$store.welcomeStore">+ <div x-init="$store.welcomeStore.init(); if ($store.welcomeStore.isVisible) { $store.welcomeStore.onCreate(); } $watch('$store.welcomeStore.isVisible', (visible) => { if (visible) { $store.welcomeStore.onCreate(); } });"+ class="welcome-container"><x-extension id="welcome-screen-start"></x-extension><div class="welcome-content"><!-- Action Cards -->diff --git a/webui/components/welcome/welcome-store.js b/webui/components/welcome/welcome-store.jsindex 5d9185894..d43dfaa4e 100644--- a/webui/components/welcome/welcome-store.js+++ b/webui/components/welcome/welcome-store.js@@ -12,12 +12,16 @@ const model = {bannersLoading: false,lastBannerRefresh: 0,hasDismissedBanners: false,+ _initialized: false,get isVisible() {return !chatsStore.selected;},init() {+ if (this._initialized) return;+ this._initialized = true;+// Reload banners when a modal closes while the welcome screen is visible.document.addEventListener("modal-closed", () => {if (this.isVisible) {