Solution for long term memory for agent coding CLIs and to facilitate handoff between different agent vendors
Rust
fix(wrapper): reconcile Docker manifest-list digests and split local inspects
Felipe Griloe560264d0f90
diff --git a/bin/ai-memory b/bin/ai-memoryindex 9d5db2a0..375ca890 100755--- a/bin/ai-memory+++ b/bin/ai-memory@@ -60,12 +60,31 @@ WRAPPER_SHA256_URL="${AI_MEMORY_WRAPPER_SHA256_URL:-${WRAPPER_URL}.sha256}"# ---- version-check helpers (best-effort; never block the wrapper) ---------local_digests() {- "${DOCKER}" image inspect --format='{{range .RepoDigests}}{{println .}}{{end}}{{println .Digest}}' "${IMAGE}" 2>/dev/null \+local_repo_digests() {+ "${DOCKER}" image inspect --format='{{range .RepoDigests}}{{println .}}{{end}}' "${IMAGE}" 2>/dev/null \| sed 's/.*@//' | grep -v '^$' || true}-remote_digest() {+local_instance_digest() {+ # Podman (and containerd image store) exposes .Digest for the per-arch child image.+ # Docker classic has no .Digest field in types.ImageInspect; fail gracefully.+ "${DOCKER}" image inspect --format='{{println .Digest}}' "${IMAGE}" 2>/dev/null \+ | sed 's/.*@//' | grep -v '^$' || true+}++local_digests() {+ local_repo_digests+ local_instance_digest+}++remote_list_digest() {+ # Docker standard: buildx imagetools inspect outputs the manifest list (index) digest+ # matching Docker's classic .RepoDigests.+ "${DOCKER}" buildx imagetools inspect "${IMAGE}" 2>/dev/null \+ | awk '/^Digest:[[:space:]]+/ { print $2; exit }' || true+}++remote_arch_digest() {local host_archcase "$(uname -m 2>/dev/null || true)" inx86_64 | amd64) host_arch="amd64" ;;@@ -103,6 +122,11 @@ remote_digest() {' || true}+remote_digest() {+ remote_list_digest+ remote_arch_digest+}+maybe_warn_outdated() {[ -z "${AI_MEMORY_NO_VERSION_CHECK:-}" ] || return 0# Skip in non-interactive contexts so we don't pollute pipes / CI.@@ -114,14 +138,45 @@ maybe_warn_outdated() {fimkdir -p "${CACHE_DIR}"touch "${VERSION_CHECK_FILE}"- local local_d remote_d- local_d=$(local_digests)- remote_d=$(remote_digest)- [ -n "${local_d}" ] && [ -n "${remote_d}" ] || return 0- if ! printf '%s\n' "${local_d}" | grep -qxF "${remote_d}"; then- printf '\033[33mai-memory: a newer image is available on Docker Hub.\033[0m\n' >&2- printf ' run `ai-memory upgrade` to pull it + refresh hooks.\n' >&2++ local local_repos local_inst remote_list remote_arch+ local_repos="$(local_repo_digests)"+ local_inst="$(local_instance_digest)"+ remote_list="$(remote_list_digest)"+ remote_arch="$(remote_arch_digest)"++ # If both remote sources failed (offline, timeout, etc.), skip.+ [ -n "${remote_list}" ] || [ -n "${remote_arch}" ] || return 0+ # If local has no digests at all, skip.+ [ -n "${local_repos}" ] || [ -n "${local_inst}" ] || return 0++ # 1. If remote list digest is available, compare against local repo digests (Docker matching).+ if [ -n "${remote_list}" ] && [ -n "${local_repos}" ]; then+ if printf '%s\n' "${local_repos}" | grep -qxF "${remote_list}"; then+ return 0+ fifi++ # 2. If per-arch remote digest is available:+ if [ -n "${remote_arch}" ]; then+ local local_per_arch="${local_inst}"+ if [ -z "${local_per_arch}" ] && [ "$(printf '%s\n' "${local_repos}" | grep -c .)" -gt 1 ]; then+ local_per_arch="${local_repos}"+ fi++ if [ -n "${local_per_arch}" ]; then+ if printf '%s\n' "${local_per_arch}" | grep -qxF "${remote_arch}"; then+ return 0+ fi+ elif [ -z "${remote_list}" ]; then+ # Classic Docker without buildx: local only has manifest-list digest,+ # remote only has per-arch digest. We cannot reliably compare them; gate out.+ return 0+ fi+ fi++ printf '\033[33mai-memory: a newer image is available on Docker Hub.\033[0m\n' >&2+ printf ' run `ai-memory upgrade` to pull it + refresh hooks.\n' >&2}# ---- upgrade subcommand --------------------------------------------------diff --git a/tests/wrapper_upgrade.sh b/tests/wrapper_upgrade.shindex eff809fe..fad5a044 100755--- a/tests/wrapper_upgrade.sh+++ b/tests/wrapper_upgrade.sh@@ -46,7 +46,13 @@ case "${1:-}" in'{{.Id}}') printf 'running-container-id\n' ;;'{{.Config.Image}}') printf 'akitaonrails/ai-memory:latest\n' ;;*PortBindings*) printf '%s\n' '-p 127.0.0.1:49374:49374/tcp ' ;;- *Mounts*) printf '%s\n' '-v ai-memory-data:/data:Z ' ;;+ *Mounts*)+ if printf '%s\n' "${4:-}" | grep -q 'if \.Mode'; then+ printf '%s\n' '-v ai-memory-data:/data:Z '+ else+ printf '%s\n' '-v ai-memory-data:/data '+ fi+ ;;*RestartPolicy*) printf '%s\n' '--restart unless-stopped' ;;'{{json .Config.Cmd}}') printf '[]\n' ;;*'.Config.Env'*)@@ -105,6 +111,7 @@ fi# ---- multi-arch manifest version-check tests -----------------------------if command -v python3 >/dev/null 2>&1; then+ H_INDEX="sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"H_ARM="sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"H_AMD="sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"H_OLD="sha256:0000000000000000000000000000000000000000000000000000000000000000"@@ -112,15 +119,44 @@ if command -v python3 >/dev/null 2>&1; thenMULTI_ARCH_JSON="{\"manifests\":[{\"digest\":\"${H_ARM}\",\"platform\":{\"architecture\":\"arm64\"}},{\"digest\":\"${H_AMD}\",\"platform\":{\"architecture\":\"amd64\"}}]}"run_version_check_case() {- local name="$1" uname_m="$2" local_inspect="$3" remote_manifest="$4" expect_warn="$5"+ local name="$1" engine_flavor="$2" uname_m="$3" repo_digests="$4" digest_field="$5" buildx_digest="$6" remote_manifest="$7" expect_warn="$8"local case_dir="${TMP_ROOT}/ver_${name}"mkdir -p "${case_dir}/cache"local fake_engine="${case_dir}/engine"cat >"${fake_engine}" <<ENGINE#!/usr/bin/env bashcase "\${1:-}" in+ buildx)+ if [ -n "${buildx_digest}" ]; then+ printf 'Name: %s\nDigest: %s\n' "\${4:-}" "${buildx_digest}"+ else+ printf 'Error: unrecognized command\n' >&2+ exit 1+ fi+ ;;image)- printf '%b\n' '${local_inspect}'+ fmt=""+ for arg in "\$@"; do+ case "\${arg}" in+ --format=*) fmt="\${arg#--format=}" ;;+ esac+ done+ case "\${fmt}" in+ *'.Digest'*)+ if [ "${engine_flavor}" = "docker" ]; then+ printf 'template parsing error: map has no entry for key "Digest"\n' >&2+ exit 1+ else+ printf '%b\n' "${digest_field}"+ fi+ ;;+ *'.RepoDigests'*)+ printf '%b\n' "${repo_digests}"+ ;;+ *)+ printf '%b\n' "${repo_digests}"+ ;;+ esac;;manifest)printf '%b\n' '${remote_manifest}'@@ -186,10 +222,20 @@ else:fi}- run_version_check_case amd64_matching "x86_64" "sha256:index\n${H_AMD}" "${MULTI_ARCH_JSON}" 0- run_version_check_case amd64_outdated "x86_64" "sha256:index\n${H_OLD}" "${MULTI_ARCH_JSON}" 1- run_version_check_case arm64_matching "aarch64" "${H_ARM}" "${MULTI_ARCH_JSON}" 0- run_version_check_case arm64_outdated "aarch64" "${H_OLD}" "${MULTI_ARCH_JSON}" 1+ # Podman cases: exposes .Digest and per-arch child digest in .RepoDigests+ run_version_check_case podman_amd64_matching "podman" "x86_64" "${H_INDEX}\n${H_AMD}" "${H_AMD}" "" "${MULTI_ARCH_JSON}" 0+ run_version_check_case podman_amd64_outdated "podman" "x86_64" "${H_INDEX}\n${H_OLD}" "${H_OLD}" "" "${MULTI_ARCH_JSON}" 1+ run_version_check_case podman_arm64_matching "podman" "aarch64" "${H_INDEX}\n${H_ARM}" "${H_ARM}" "" "${MULTI_ARCH_JSON}" 0+ run_version_check_case podman_arm64_outdated "podman" "aarch64" "${H_INDEX}\n${H_OLD}" "${H_OLD}" "" "${MULTI_ARCH_JSON}" 1++ # Docker cases: .Digest fails; .RepoDigests has manifest-list digest; buildx gets remote list digest+ run_version_check_case docker_amd64_matching "docker" "x86_64" "${H_INDEX}" "" "${H_INDEX}" "${MULTI_ARCH_JSON}" 0+ run_version_check_case docker_amd64_outdated "docker" "x86_64" "${H_OLD}" "" "${H_INDEX}" "${MULTI_ARCH_JSON}" 1+ run_version_check_case docker_arm64_matching "docker" "aarch64" "${H_INDEX}" "" "${H_INDEX}" "${MULTI_ARCH_JSON}" 0+ run_version_check_case docker_arm64_outdated "docker" "aarch64" "${H_OLD}" "" "${H_INDEX}" "${MULTI_ARCH_JSON}" 1++ # Classic Docker fallback: no buildx, only manifest-list locally; gated to avoid false positive+ run_version_check_case docker_classic_gated "docker" "x86_64" "${H_INDEX}" "" "" "${MULTI_ARCH_JSON}" 0fiprintf 'wrapper upgrade ownership checks passed\n'