Skip to content

Composio powers 1000+ toolkits, tool search, context management, authentication, and a sandboxed workbench to help you build AI agents that turn intent into action.

fix(cli): install bundles with atomic replacement

jkomyno94c21f2ed10b
diff --git a/.github/workflows/cli.test-installation.yml b/.github/workflows/cli.test-installation.yml
index 00e11dbb8..14514d572 100644
--- a/.github/workflows/cli.test-installation.yml
+++ b/.github/workflows/cli.test-installation.yml
@@ -33,6 +33,9 @@ jobs:
- name: Test release resolution fallback
run: bash test/install-sh-release-resolution.test.sh
+ - name: Test atomic install replacement
+ run: bash test/install-sh-atomic-replace.test.sh
+
- name: Lint POSIX install scripts
run: shellcheck -s sh install.sh install/*.sh
diff --git a/install.sh b/install.sh
index 6cf3362da..eb884e53d 100755
--- a/install.sh
+++ b/install.sh
@@ -234,6 +234,32 @@ resolve_directory() {
(cd "$resolve_directory_value" && pwd -P)
}
+publish_staged_entry() {
+ publish_source=$1
+ publish_name=${publish_source##*/}
+ publish_target=$resolved_install_dir/$publish_name
+
+ if [ -d "$publish_source" ] && [ ! -L "$publish_source" ] &&
+ { [ -e "$publish_target" ] || [ -L "$publish_target" ]; }; then
+ publish_aside=$stage/.composio-aside.$publish_name
+ mv "$publish_target" "$publish_aside" ||
+ error "Failed to move existing install entry aside: $publish_target"
+ if mv "$publish_source" "$publish_target"; then
+ rm -rf "$publish_aside" || error "Failed to remove old install entry: $publish_aside"
+ return 0
+ fi
+
+ if mv "$publish_aside" "$publish_target"; then
+ error "Failed to publish install entry: $publish_target"
+ fi
+
+ preserve_stage=1
+ error "Failed to publish install entry and restore the previous entry. Recover it from $publish_aside"
+ fi
+
+ mv "$publish_source" "$publish_target" || error "Failed to publish install entry: $publish_target"
+}
+
install_bundle() {
install_bundle_root=$1
install_bundle_dir=$install_bundle_root/composio-$target
@@ -248,11 +274,31 @@ install_bundle() {
warn 'This release archive has no bundled support files. Some CLI features may be unavailable.'
fi
- cp -Rp "$install_bundle_dir"/. "$resolved_install_dir/" ||
- error "Failed to install the CLI bundle to \"$resolved_install_dir\""
- chmod +x "$resolved_install_dir/composio" || error 'Failed to set permissions on executable'
- printf '%s\n' "$version" >"$resolved_install_dir/release-tag.txt" ||
- error "Failed to write install metadata to \"$resolved_install_dir/release-tag.txt\""
+ stage=$(mktemp -d "$resolved_install_dir/.composio-install.XXXXXX") ||
+ error "Failed to create staging directory in \"$resolved_install_dir\""
+ debug "install staging directory: $stage"
+
+ # Staging briefly holds a second copy of the bundle until the binary is published last.
+ cp -Rp "$install_bundle_dir"/. "$stage/" ||
+ error "Failed to stage the CLI bundle in \"$resolved_install_dir\""
+ chmod +x "$stage/composio" || error 'Failed to set permissions on staged executable'
+ printf '%s\n' "$version" >"$stage/release-tag.txt" ||
+ error "Failed to stage install metadata in \"$resolved_install_dir\""
+
+ for staged_entry in "$stage"/* "$stage"/.[!.]* "$stage"/..?*; do
+ if [ ! -e "$staged_entry" ] && [ ! -L "$staged_entry" ]; then
+ continue
+ fi
+ case ${staged_entry##*/} in
+ composio | release-tag.txt) continue ;;
+ esac
+ publish_staged_entry "$staged_entry"
+ done
+
+ publish_staged_entry "$stage/release-tag.txt"
+ publish_staged_entry "$stage/composio"
+ rmdir "$stage" || error "Failed to remove staging directory: $stage"
+ stage=
}
install_entry_point() {
@@ -323,6 +369,9 @@ cleanup() {
if [ -n "${tmpdir:-}" ] && [ -d "$tmpdir" ]; then
rm -rf "$tmpdir"
fi
+ if [ "${preserve_stage:-0}" != 1 ] && [ -n "${stage:-}" ] && [ -d "$stage" ]; then
+ rm -rf "$stage"
+ fi
}
main() {
diff --git a/package.json b/package.json
index 755170122..c434054fd 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
"cli:record": "turbo run record --filter=./ts/packages/cli",
"record": "turbo run record",
"test": "pnpm run test:install-sh && pnpm run test:release-workflow && turbo test --filter=./ts/packages/** --filter=!@e2e-tests/* && pnpm run test:examples",
- "test:install-sh": "bash test/install-sh-release-resolution.test.sh",
+ "test:install-sh": "bash test/install-sh-release-resolution.test.sh && bash test/install-sh-atomic-replace.test.sh",
"test:release-workflow": "bun run test/release-workflow.test.ts",
"test:examples": "tsx ts/scripts/validate-examples.ts",
"test:e2e": "turbo test:e2e --filter='@e2e-tests/*'",
diff --git a/test/install-sh-atomic-replace.test.sh b/test/install-sh-atomic-replace.test.sh
new file mode 100644
index 000000000..699e32a23
--- /dev/null
+++ b/test/install-sh-atomic-replace.test.sh
@@ -0,0 +1,215 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+suite_tmp="$(mktemp -d)"
+survivor_pid=
+
+cleanup() {
+ if [[ -n ${survivor_pid:-} ]]; then
+ kill "$survivor_pid" 2>/dev/null || true
+ wait "$survivor_pid" 2>/dev/null || true
+ fi
+ rm -rf "$suite_tmp"
+}
+trap cleanup EXIT
+
+fail() {
+ printf 'FAIL: %s\n' "$*" >&2
+ exit 1
+}
+
+stat_inode() {
+ if stat -f '%i' "$1" >/dev/null 2>&1; then
+ stat -f '%i' "$1"
+ else
+ stat -c '%i' "$1"
+ fi
+}
+
+assert_no_residue() {
+ local install_dir=$1
+ if find "$install_dir" -maxdepth 1 \( -name '.composio-install.*' -o -name '.composio-aside.*' \) -print -quit | grep -q .; then
+ fail "installer residue remains in $install_dir"
+ fi
+}
+
+platform=$(uname -ms)
+case $platform in
+'Darwin x86_64') target=darwin-x64 ;;
+'Darwin arm64') target=darwin-aarch64 ;;
+'Linux aarch64'|'Linux arm64') target=linux-aarch64 ;;
+'Linux x86_64') target=linux-x64 ;;
+*) fail "unsupported test platform: $platform" ;;
+esac
+
+fake_bin="$suite_tmp/bin"
+mkdir -p "$fake_bin"
+
+cat >"$fake_bin/curl" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+output=
+url=
+while (($# > 0)); do
+ case $1 in
+ --output|-o)
+ output=$2
+ shift 2
+ ;;
+ --proto|--proto-redir)
+ shift 2
+ ;;
+ --fail|--silent|--show-error|--location|--progress-bar)
+ shift
+ ;;
+ --*) shift ;;
+ *)
+ url=$1
+ shift
+ ;;
+ esac
+done
+
+case $url in
+*/checksums.txt) exit 22 ;;
+*) printf 'fixture archive\n' >"$output" ;;
+esac
+EOF
+chmod +x "$fake_bin/curl"
+
+cat >"$fake_bin/unzip" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+dest=
+while (($# > 0)); do
+ case $1 in
+ -d)
+ dest=$2
+ shift 2
+ ;;
+ -*d)
+ dest=$2
+ shift 2
+ ;;
+ *) shift ;;
+ esac
+done
+
+bundle="$dest/composio-$TEST_TARGET"
+mkdir -p "$bundle/services" "$bundle/local-tools-binaries"
+printf '%s\n' 'new-support' >"$bundle/run-bun.mjs"
+printf '%s\n' 'new-service' >"$bundle/services/example.txt"
+printf '%s\n' 'new-local-tool' >"$bundle/local-tools-binaries/current.txt"
+
+if [[ ${TEST_ARCHIVE_MODE:-complete} == missing-binary ]]; then
+ exit 0
+fi
+
+cat >"$bundle/composio" <<'BIN'
+#!/bin/sh
+# new-binary-marker
+case ${1:-} in
+--version|version) printf '%s\n' 'composio fixture 98.0.0' ;;
+*) printf '%s\n' 'new-binary' ;;
+esac
+BIN
+chmod +x "$bundle/composio"
+EOF
+chmod +x "$fake_bin/unzip"
+
+interpreters=("$(command -v sh)")
+if command -v dash >/dev/null 2>&1 && [[ $(command -v dash) != "${interpreters[0]}" ]]; then
+ interpreters+=("$(command -v dash)")
+fi
+
+version='@composio/[email protected]'
+for interpreter in "${interpreters[@]}"; do
+ interpreter_name=$(basename "$interpreter")
+ case_root="$suite_tmp/$interpreter_name"
+ install_dir="$case_root/install"
+ home="$case_root/home"
+ mkdir -p "$install_dir" "$home"
+
+ run_installer() {
+ local archive_mode=$1
+ env \
+ PATH="$fake_bin:$PATH" \
+ HOME="$home" \
+ COMPOSIO_INSTALL_DIR="$install_dir" \
+ COMPOSIO_BIN_DIR="$install_dir" \
+ COMPOSIO_INSTALL_PLUGINS=0 \
+ COMPOSIO_INSTALL_HELP=0 \
+ COMPOSIO_QUIET=1 \
+ COMPOSIO_GITHUB_URL=https://github.example.test \
+ COMPOSIO_GITHUB_OWNER=FakeOwner \
+ COMPOSIO_GITHUB_REPO=fake-repo \
+ TEST_TARGET="$target" \
+ TEST_ARCHIVE_MODE="$archive_mode" \
+ "$interpreter" "$repo_root/install.sh" "$version"
+ }
+
+ run_installer complete >/dev/null 2>&1
+ [[ -x "$install_dir/composio" ]] || fail "$interpreter_name empty install executable"
+ [[ -f "$install_dir/run-bun.mjs" ]] || fail "$interpreter_name empty install support file"
+ [[ -f "$install_dir/services/example.txt" ]] || fail "$interpreter_name empty install service"
+ [[ -f "$install_dir/local-tools-binaries/current.txt" ]] ||
+ fail "$interpreter_name empty install local tool"
+ [[ $(<"$install_dir/release-tag.txt") == "$version" ]] ||
+ fail "$interpreter_name empty install metadata"
+ assert_no_residue "$install_dir"
+
+ marker="$case_root/old-process"
+ cat >"$install_dir/composio" <<'EOF'
+#!/bin/sh
+marker=$1
+: >"$marker.ready"
+while [ ! -f "$marker.release" ]; do
+ sleep 0.05
+done
+printf '%s\n' old-process >"$marker.result"
+EOF
+ chmod +x "$install_dir/composio"
+ printf '%s\n' stale >"$install_dir/local-tools-binaries/stale.txt"
+ old_inode=$(stat_inode "$install_dir/composio")
+ "$install_dir/composio" "$marker" &
+ survivor_pid=$!
+ for _ in {1..100}; do
+ [[ -f "$marker.ready" ]] && break
+ sleep 0.05
+ done
+ [[ -f "$marker.ready" ]] || fail "$interpreter_name old process did not start"
+
+ run_installer complete >/dev/null 2>&1
+ new_inode=$(stat_inode "$install_dir/composio")
+ [[ $new_inode != "$old_inode" ]] || fail "$interpreter_name reinstall kept the binary inode"
+ grep -Fq 'new-binary-marker' "$install_dir/composio" ||
+ fail "$interpreter_name reinstall binary contents"
+ [[ ! -e "$install_dir/local-tools-binaries/stale.txt" ]] ||
+ fail "$interpreter_name reinstall retained stale directory contents"
+ : >"$marker.release"
+ wait "$survivor_pid"
+ survivor_pid=
+ [[ $(<"$marker.result") == old-process ]] || fail "$interpreter_name old process changed"
+ assert_no_residue "$install_dir"
+
+ binary_before=$(<"$install_dir/composio")
+ support_before=$(<"$install_dir/run-bun.mjs")
+ tag_before=$(<"$install_dir/release-tag.txt")
+ if missing_output=$(run_installer missing-binary 2>&1); then
+ fail "$interpreter_name missing binary archive succeeded"
+ fi
+ grep -Fq 'Binary not found in extracted archive' <<<"$missing_output" ||
+ fail "$interpreter_name missing binary error"
+ [[ $(<"$install_dir/composio") == "$binary_before" ]] ||
+ fail "$interpreter_name missing binary changed executable"
+ [[ $(<"$install_dir/run-bun.mjs") == "$support_before" ]] ||
+ fail "$interpreter_name missing binary changed support file"
+ [[ $(<"$install_dir/release-tag.txt") == "$tag_before" ]] ||
+ fail "$interpreter_name missing binary changed metadata"
+ assert_no_residue "$install_dir"
+
+ printf 'install.sh atomic replacement passed under %s\n' "$interpreter_name"
+done
+
+printf 'install.sh atomic replacement tests passed\n'