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): tolerate post-publish cleanup failures

jkomyno5093ca5d6acd
diff --git a/install.sh b/install.sh
index eb884e53d..7ff507c57 100755
--- a/install.sh
+++ b/install.sh
@@ -245,7 +245,8 @@ publish_staged_entry() {
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"
+ rm -rf "$publish_aside" ||
+ warn "Published install entry; previous contents retained at $publish_aside"
return 0
fi
@@ -297,7 +298,7 @@ install_bundle() {
publish_staged_entry "$stage/release-tag.txt"
publish_staged_entry "$stage/composio"
- rmdir "$stage" || error "Failed to remove staging directory: $stage"
+ rmdir "$stage" || warn "Published CLI; retained recovery staging directory at $stage"
stage=
}
diff --git a/test/install-sh-atomic-replace.test.sh b/test/install-sh-atomic-replace.test.sh
index 699e32a23..6faa29143 100644
--- a/test/install-sh-atomic-replace.test.sh
+++ b/test/install-sh-atomic-replace.test.sh
@@ -118,6 +118,22 @@ chmod +x "$bundle/composio"
EOF
chmod +x "$fake_bin/unzip"
+cat >"$fake_bin/rm" <<'EOF'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [[ ${TEST_FAIL_ASIDE_CLEANUP:-} == 1 ]]; then
+ for arg in "$@"; do
+ case $arg in
+ */.composio-aside.local-tools-binaries) exit 23 ;;
+ esac
+ done
+fi
+
+exec /bin/rm "$@"
+EOF
+chmod +x "$fake_bin/rm"
+
interpreters=("$(command -v sh)")
if command -v dash >/dev/null 2>&1 && [[ $(command -v dash) != "${interpreters[0]}" ]]; then
interpreters+=("$(command -v dash)")
@@ -133,6 +149,7 @@ for interpreter in "${interpreters[@]}"; do
run_installer() {
local archive_mode=$1
+ local fail_aside_cleanup=${2:-0}
env \
PATH="$fake_bin:$PATH" \
HOME="$home" \
@@ -146,6 +163,7 @@ for interpreter in "${interpreters[@]}"; do
COMPOSIO_GITHUB_REPO=fake-repo \
TEST_TARGET="$target" \
TEST_ARCHIVE_MODE="$archive_mode" \
+ TEST_FAIL_ASIDE_CLEANUP="$fail_aside_cleanup" \
"$interpreter" "$repo_root/install.sh" "$version"
}
@@ -209,6 +227,21 @@ EOF
fail "$interpreter_name missing binary changed metadata"
assert_no_residue "$install_dir"
+ printf '%s\n' old-aside >"$install_dir/local-tools-binaries/recoverable.txt"
+ if ! aside_cleanup_output=$(run_installer complete 1 2>&1); then
+ fail "$interpreter_name aside cleanup failure aborted published install"
+ fi
+ grep -Fq 'Published install entry; previous contents retained at' <<<"$aside_cleanup_output" ||
+ fail "$interpreter_name aside cleanup warning"
+ grep -Fq 'Published CLI; retained recovery staging directory at' <<<"$aside_cleanup_output" ||
+ fail "$interpreter_name retained staging warning"
+ grep -Fq 'new-binary-marker' "$install_dir/composio" ||
+ fail "$interpreter_name aside cleanup did not publish executable"
+ retained_stage=$(find "$install_dir" -maxdepth 1 -type d -name '.composio-install.*' -print -quit)
+ [[ -n $retained_stage ]] || fail "$interpreter_name missing retained recovery staging directory"
+ [[ $(<"$retained_stage/.composio-aside.local-tools-binaries/recoverable.txt") == old-aside ]] ||
+ fail "$interpreter_name retained aside is not recoverable"
+
printf 'install.sh atomic replacement passed under %s\n' "$interpreter_name"
done
diff --git a/ts/packages/cli/src/utils/atomic-replace.ts b/ts/packages/cli/src/utils/atomic-replace.ts
index cdcc9ca10..82a26b501 100644
--- a/ts/packages/cli/src/utils/atomic-replace.ts
+++ b/ts/packages/cli/src/utils/atomic-replace.ts
@@ -100,7 +100,16 @@ export const atomicReplaceDirectory = ({
);
yield* fs.rename(stagedPath, targetPath).pipe(
Effect.matchEffect({
- onSuccess: () => fs.remove(recoveryDirectory, { recursive: true }),
+ onSuccess: () =>
+ fs
+ .remove(recoveryDirectory, { recursive: true })
+ .pipe(
+ Effect.catchAll(cause =>
+ Effect.logWarning(
+ `Published replacement at ${targetPath}; previous contents remain at ${asidePath}: ${String(cause)}`
+ )
+ )
+ ),
onFailure: publishCause =>
fs.rename(asidePath, targetPath).pipe(
Effect.matchEffect({
diff --git a/ts/packages/cli/test/src/utils/atomic-replace.test.ts b/ts/packages/cli/test/src/utils/atomic-replace.test.ts
index b3f20e45b..570b0e5ad 100644
--- a/ts/packages/cli/test/src/utils/atomic-replace.test.ts
+++ b/ts/packages/cli/test/src/utils/atomic-replace.test.ts
@@ -44,6 +44,34 @@ const failDirectoryPublish = (targetPath: string, failRestore = false) =>
)
).pipe(Layer.provide(BunFileSystem.layer));
+const failDirectoryCleanup = () =>
+ Layer.effect(
+ FileSystem.FileSystem,
+ Effect.map(
+ FileSystem.FileSystem,
+ fs =>
+ new Proxy(fs, {
+ get(target, property, receiver) {
+ if (property !== 'remove') {
+ return Reflect.get(target, property, receiver);
+ }
+
+ return (path: string, options?: FileSystem.RemoveOptions) =>
+ path.includes('.composio-atomic-recovery-')
+ ? Effect.fail(
+ new PlatformError.SystemError({
+ reason: 'Busy',
+ module: 'FileSystem',
+ method: 'remove',
+ pathOrDescriptor: path,
+ })
+ )
+ : target.remove(path, options);
+ },
+ })
+ )
+ ).pipe(Layer.provide(BunFileSystem.layer));
+
const makeDirectoryFixture = (withTarget = true) =>
Effect.gen(function* () {
const fs = yield* FileSystem.FileSystem;
@@ -173,6 +201,25 @@ describe('atomic replace', () => {
})
);
+ it.scoped('keeps the published directory when old-content cleanup fails', () =>
+ Effect.gen(function* () {
+ const { directory, fs, path, sourcePath, targetPath } = yield* makeDirectoryFixture();
+
+ yield* Effect.scoped(atomicReplaceDirectory({ sourcePath, targetPath })).pipe(
+ Effect.provide(failDirectoryCleanup())
+ );
+
+ const recoveryDirectory = (yield* fs.readDirectory(directory)).find(entry =>
+ entry.startsWith('.composio-atomic-recovery-')
+ );
+ expect(yield* fs.readFileString(path.join(targetPath, 'new.txt'))).toBe('new contents');
+ expect(recoveryDirectory).toBeDefined();
+ expect(
+ yield* fs.readFileString(path.join(directory, recoveryDirectory!, 'target', 'old.txt'))
+ ).toBe('old contents');
+ })
+ );
+
it.scoped('retains the previous directory when publishing and restoration fail', () =>
Effect.gen(function* () {
const { directory, fs, path, sourcePath, targetPath } = yield* makeDirectoryFixture();