mirror of
https://github.com/tiennm99/ccs.git
synced 2026-08-07 00:23:05 +00:00
chore(sync): merge main into dev after release
# Conflicts: # package.json
This commit is contained in:
github-actions[bot]
@@ -1,3 +1,15 @@
|
||||
## [8.1.2](https://github.com/kaitranntt/ccs/compare/v8.1.1...v8.1.2) (2026-05-29)
|
||||
|
||||
### Hotfixes
|
||||
|
||||
* repair Docker image size inspection ([731d43e](https://github.com/kaitranntt/ccs/commit/731d43ec9a331fa34b77c9abc18d4608dde27252)), closes [#1400](https://github.com/kaitranntt/ccs/issues/1400)
|
||||
|
||||
## [8.1.1](https://github.com/kaitranntt/ccs/compare/v8.1.0...v8.1.1) (2026-05-29)
|
||||
|
||||
### Hotfixes
|
||||
|
||||
* repair Docker release publishing ([d49bbda](https://github.com/kaitranntt/ccs/commit/d49bbdaec3a1b391a819653f15985b3b48fdd5d2)), closes [#1400](https://github.com/kaitranntt/ccs/issues/1400)
|
||||
|
||||
## [8.1.0](https://github.com/kaitranntt/ccs/compare/v8.0.0...v8.1.0) (2026-05-23)
|
||||
|
||||
### Features
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@kaitranntt/ccs",
|
||||
"version": "8.1.1-dev.2",
|
||||
"version": "8.1.2",
|
||||
"description": "Claude Code Switch - Instant profile switching between Claude, GLM, Kimi, and more",
|
||||
"keywords": [
|
||||
"cli",
|
||||
|
||||
@@ -159,6 +159,54 @@ MOCK_EOF
|
||||
chmod +x "${MOCK_DIR}/docker"
|
||||
}
|
||||
|
||||
make_mock_docker_platform_raw_index() {
|
||||
# First inspect returns a multi-arch index; digest inspect returns the
|
||||
# platform manifest with real layer sizes. This mirrors GHCR OCI output.
|
||||
cat > "${MOCK_DIR}/docker" <<'MOCK_EOF'
|
||||
#!/usr/bin/env bash
|
||||
if [[ "$1" == "buildx" && "$2" == "imagetools" && "$3" == "inspect" ]]; then
|
||||
ref="$4"
|
||||
if [[ "$ref" == "mock-image:tag" ]]; then
|
||||
cat <<'JSON'
|
||||
{
|
||||
"schemaVersion": 2,
|
||||
"mediaType": "application/vnd.oci.image.index.v1+json",
|
||||
"manifests": [
|
||||
{
|
||||
"mediaType": "application/vnd.oci.image.manifest.v1+json",
|
||||
"digest": "sha256:amd64digest",
|
||||
"platform": { "os": "linux", "architecture": "amd64" }
|
||||
},
|
||||
{
|
||||
"mediaType": "application/vnd.oci.image.manifest.v1+json",
|
||||
"digest": "sha256:arm64digest",
|
||||
"platform": { "os": "linux", "architecture": "arm64" }
|
||||
}
|
||||
]
|
||||
}
|
||||
JSON
|
||||
exit 0
|
||||
fi
|
||||
if [[ "$ref" == "mock-image:tag@sha256:amd64digest" ]]; then
|
||||
cat <<'JSON'
|
||||
{
|
||||
"schemaVersion": 2,
|
||||
"mediaType": "application/vnd.oci.image.manifest.v1+json",
|
||||
"layers": [
|
||||
{ "size": 100000000 },
|
||||
{ "size": 57671680 }
|
||||
]
|
||||
}
|
||||
JSON
|
||||
exit 0
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
exit 0
|
||||
MOCK_EOF
|
||||
chmod +x "${MOCK_DIR}/docker"
|
||||
}
|
||||
|
||||
run_platform_test() {
|
||||
local name="$1"
|
||||
local expected_exit="$2"
|
||||
@@ -190,6 +238,10 @@ run_platform_test "--platform: pass when platform-scoped size < budget" 0 "20971
|
||||
make_mock_docker_platform "150000000 112000000"
|
||||
run_platform_test "--platform: fail when platform-scoped size > budget" 1 "209715200"
|
||||
|
||||
# --platform raw OCI index: resolve the platform digest then sum manifest layers
|
||||
make_mock_docker_platform_raw_index
|
||||
run_platform_test "--platform: resolves raw OCI index before summing layers" 0 "209715200"
|
||||
|
||||
# --platform inspect failure → must exit 1 (REV5 regression guard)
|
||||
make_mock_docker_platform_fail
|
||||
run_platform_test "--platform: fail loudly when imagetools inspect fails (REV5 guard)" 1 "209715200"
|
||||
|
||||
+72
-12
@@ -50,27 +50,87 @@ fi
|
||||
|
||||
MAX_MB=$(( MAX_BYTES / 1048576 ))
|
||||
|
||||
sum_manifest_layer_sizes() {
|
||||
local sum
|
||||
sum="$(jq -sr '
|
||||
.[0] as $manifest
|
||||
| if ($manifest | type) == "object" and ($manifest.layers | type) == "array" then
|
||||
([$manifest.layers[]?.size | numbers] | add) // 0
|
||||
else
|
||||
0
|
||||
end
|
||||
' 2>/dev/null)" || {
|
||||
echo "0"
|
||||
return
|
||||
}
|
||||
echo "${sum:-0}"
|
||||
}
|
||||
|
||||
select_platform_digest() {
|
||||
local os="$1"
|
||||
local arch="$2"
|
||||
local variant="$3"
|
||||
|
||||
jq -r \
|
||||
--arg os "$os" \
|
||||
--arg arch "$arch" \
|
||||
--arg variant "$variant" \
|
||||
'
|
||||
.manifests[]?
|
||||
| select((.platform.os // "") == $os)
|
||||
| select((.platform.architecture // "") == $arch)
|
||||
| select($variant == "" or (.platform.variant // "") == $variant)
|
||||
| .digest
|
||||
' 2>/dev/null | head -1 || true
|
||||
}
|
||||
|
||||
if [[ -n "$PLATFORM" ]]; then
|
||||
# Multi-arch path: sum compressed layer sizes from the registry manifest.
|
||||
# `docker buildx imagetools inspect --format` returns the manifest JSON for
|
||||
# the given platform. We sum the `size` field of each layer entry.
|
||||
# Read raw OCI/Docker manifests directly. Multi-arch tags first resolve the
|
||||
# requested platform digest from the index, then sum that manifest's layer
|
||||
# sizes. A single-platform tag can be summed immediately from its raw manifest.
|
||||
if ! command -v jq >/dev/null 2>&1; then
|
||||
echo "[X] jq is required for platform-scoped image size inspection" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ "$PLATFORM" != */* ]]; then
|
||||
echo "[X] --platform must use os/arch format, got: ${PLATFORM}" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
PLATFORM_OS="${PLATFORM%%/*}"
|
||||
PLATFORM_REST="${PLATFORM#*/}"
|
||||
PLATFORM_ARCH="${PLATFORM_REST%%/*}"
|
||||
PLATFORM_VARIANT=""
|
||||
if [[ "$PLATFORM_REST" == */* ]]; then
|
||||
PLATFORM_VARIANT="${PLATFORM_REST#*/}"
|
||||
fi
|
||||
|
||||
echo "[i] Inspecting ${IMAGE} for platform ${PLATFORM} via registry manifest..." >&2
|
||||
ACTUAL_BYTES=$(
|
||||
docker buildx imagetools inspect "${IMAGE}" \
|
||||
--format "{{ range .Manifest.Layers }}{{ .Size }} {{ end }}" \
|
||||
--raw 2>/dev/null \
|
||||
| tr ' ' '\n' \
|
||||
| awk 'NF && /^[0-9]+$/ { sum += $1 } END { print sum+0 }' \
|
||||
2>/dev/null || echo ""
|
||||
)
|
||||
RAW_MANIFEST="$(docker buildx imagetools inspect "${IMAGE}" --raw 2>/dev/null || true)"
|
||||
ACTUAL_BYTES="$(printf '%s' "$RAW_MANIFEST" | sum_manifest_layer_sizes)"
|
||||
|
||||
if [[ -z "$ACTUAL_BYTES" || "$ACTUAL_BYTES" == "0" ]]; then
|
||||
# Fallback: try the platform-specific sub-manifest
|
||||
PLATFORM_DIGEST="$(printf '%s' "$RAW_MANIFEST" | select_platform_digest "$PLATFORM_OS" "$PLATFORM_ARCH" "$PLATFORM_VARIANT")"
|
||||
if [[ -n "$PLATFORM_DIGEST" && "$PLATFORM_DIGEST" != "null" ]]; then
|
||||
# Fallback: inspect the selected platform sub-manifest.
|
||||
echo "[i] Falling back to platform-scoped manifest ${PLATFORM_DIGEST}..." >&2
|
||||
RAW_PLATFORM_MANIFEST="$(docker buildx imagetools inspect "${IMAGE}@${PLATFORM_DIGEST}" --raw 2>/dev/null || true)"
|
||||
ACTUAL_BYTES="$(printf '%s' "$RAW_PLATFORM_MANIFEST" | sum_manifest_layer_sizes)"
|
||||
else
|
||||
ACTUAL_BYTES="0"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -z "$ACTUAL_BYTES" || "$ACTUAL_BYTES" == "0" ]]; then
|
||||
# Last resort: support older buildx versions that expose layer sizes only
|
||||
# through the templated manifest object.
|
||||
echo "[i] Falling back to platform-scoped imagetools inspect..." >&2
|
||||
ACTUAL_BYTES=$(
|
||||
docker buildx imagetools inspect "${IMAGE}@$(
|
||||
docker buildx imagetools inspect "${IMAGE}" \
|
||||
--format "{{ range .Manifest.Manifests }}{{ if eq .Platform.OS \"$(echo "${PLATFORM}" | cut -d/ -f1)\" }}{{ if eq .Platform.Architecture \"$(echo "${PLATFORM}" | cut -d/ -f2)\" }}{{ .Digest }}{{ end }}{{ end }}{{ end }}" \
|
||||
--format "{{ range .Manifest.Manifests }}{{ if eq .Platform.OS \"${PLATFORM_OS}\" }}{{ if eq .Platform.Architecture \"${PLATFORM_ARCH}\" }}{{ .Digest }}{{ end }}{{ end }}{{ end }}" \
|
||||
2>/dev/null | head -1
|
||||
)" --format "{{ range .Manifest.Layers }}{{ .Size }} {{ end }}" 2>/dev/null \
|
||||
| tr ' ' '\n' \
|
||||
|
||||
Reference in New Issue
Block a user