Skip to content

Agent Zero AI framework

Use peeled commit refs (^{commit}) for tag resolution in self-update manager

frdel8078693e4120
diff --git a/docker/run/fs/exe/self_update_manager.py b/docker/run/fs/exe/self_update_manager.py
index 9643eae2c..d963541c2 100644
--- a/docker/run/fs/exe/self_update_manager.py
+++ b/docker/run/fs/exe/self_update_manager.py
@@ -166,6 +166,10 @@ def is_latest_selector_tag(tag: str) -> bool:
return tag.strip().lower() == LATEST_SELECTOR_TAG
+def get_tag_commit_ref(tag: str) -> str:
+ return f"refs/tags/{tag}^{{commit}}"
+
+
def build_default_backup_name() -> str:
timestamp = datetime.now(UTC).strftime("%Y%m%d-%H%M%S")
return f"usr-{timestamp}.zip"
@@ -493,6 +497,7 @@ def clean_repo_worktree(
def fetch_release_refs(repo_dir: Path, branch: str, tag: str, logger: AttemptLogger) -> None:
remote_branch_ref = f"refs/remotes/a0-self-update/{branch}"
+ tag_commit_ref = get_tag_commit_ref(tag)
logger.log(f"Fetching branch {branch} and tag {tag} from {OFFICIAL_REPO_URL}")
run_command(
[
@@ -516,7 +521,7 @@ def fetch_release_refs(repo_dir: Path, branch: str, tag: str, logger: AttemptLog
str(repo_dir),
"merge-base",
"--is-ancestor",
- f"refs/tags/{tag}",
+ tag_commit_ref,
remote_branch_ref,
],
cwd=None,
@@ -557,12 +562,13 @@ def resolve_requested_target(
if not is_latest_selector_tag(normalized_tag):
fetch_release_refs(repo_dir, branch, normalized_tag, logger)
+ tag_commit_ref = get_tag_commit_ref(normalized_tag)
return {
"requested_tag": normalized_tag,
"effective_tag": normalized_tag,
"target_ref": f"refs/tags/{normalized_tag}",
"expected_short_tag": normalized_tag,
- "expected_commit": git_output(repo_dir, "rev-parse", f"refs/tags/{normalized_tag}"),
+ "expected_commit": git_output(repo_dir, "rev-parse", tag_commit_ref),
"target_description": f"tag {normalized_tag}",
}
@@ -573,13 +579,14 @@ def resolve_requested_target(
branch_ref=remote_branch_ref,
current_version=current_version,
)
+ tag_commit_ref = get_tag_commit_ref(effective_tag)
logger.log(f"Resolved latest on main to tag {effective_tag}")
return {
"requested_tag": LATEST_SELECTOR_TAG,
"effective_tag": effective_tag,
"target_ref": f"refs/tags/{effective_tag}",
"expected_short_tag": effective_tag,
- "expected_commit": git_output(repo_dir, "rev-parse", f"refs/tags/{effective_tag}"),
+ "expected_commit": git_output(repo_dir, "rev-parse", tag_commit_ref),
"target_description": f"latest tag {effective_tag}",
}
diff --git a/tests/test_self_update_tag_filter.py b/tests/test_self_update_tag_filter.py
index d9671cd86..c5246bf1d 100644
--- a/tests/test_self_update_tag_filter.py
+++ b/tests/test_self_update_tag_filter.py
@@ -613,7 +613,7 @@ def test_self_update_manager_latest_on_main_uses_current_major_release(monkeypat
"git_output",
lambda repo_dir, *args: {
("tag", "--merged", "refs/remotes/a0-self-update/main"): "v2.0\nv1.4\nv1.2\n",
- ("rev-parse", "refs/tags/v1.4"): "deadbeef1234",
+ ("rev-parse", "refs/tags/v1.4^{commit}"): "deadbeef1234",
}[args],
)
@@ -627,6 +627,49 @@ def test_self_update_manager_latest_on_main_uses_current_major_release(monkeypat
assert resolved["effective_tag"] == "v1.4"
assert resolved["expected_short_tag"] == "v1.4"
+ assert resolved["expected_commit"] == "deadbeef1234"
+
+
+def test_self_update_manager_explicit_tag_uses_peeled_commit(monkeypatch):
+ manager = load_self_update_manager()
+ monkeypatch.setattr(manager, "fetch_release_refs", lambda repo_dir, branch, tag, logger: None)
+ monkeypatch.setattr(
+ manager,
+ "git_output",
+ lambda repo_dir, *args: {
+ ("rev-parse", "refs/tags/v1.10^{commit}"): "192d6e2cae1a85c0a2e7a6ecf41c153b39f1b4c6",
+ }[args],
+ )
+
+ resolved = manager.resolve_requested_target(
+ Path("/tmp/repo"),
+ "development",
+ "v1.10",
+ "v1.11",
+ manager.NullLogger(),
+ )
+
+ assert resolved["effective_tag"] == "v1.10"
+ assert resolved["expected_commit"] == "192d6e2cae1a85c0a2e7a6ecf41c153b39f1b4c6"
+
+
+def test_self_update_manager_fetch_release_refs_checks_peeled_tag_commit(monkeypatch):
+ manager = load_self_update_manager()
+ commands = []
+ monkeypatch.setattr(
+ manager,
+ "run_command",
+ lambda command, **kwargs: commands.append(command),
+ )
+
+ manager.fetch_release_refs(
+ Path("/tmp/repo"),
+ "development",
+ "v1.10",
+ manager.NullLogger(),
+ )
+
+ assert commands[1][-2] == "refs/tags/v1.10^{commit}"
def test_self_update_manager_latest_on_non_main_rejects_cross_major(monkeypatch):
diff --git a/webui/components/settings/external/self-update-modal.html b/webui/components/settings/external/self-update-modal.html
index f158b2278..8625f14e6 100644
--- a/webui/components/settings/external/self-update-modal.html
+++ b/webui/components/settings/external/self-update-modal.html
@@ -347,7 +347,7 @@
@click="$store.selfUpdateStore.scheduleUpdate()"
:disabled="!$store.selfUpdateStore.canScheduleUpdate"
>
- Schedule Update And Restart
+ Restart and Update
</button>
<button
type="button"