@devries-cameron20 / composio-1 / commits / c8b1ddeb6
Fork 0

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): confirm managed skill removal

Kshitij Jhunjhunwala committed Jul 14, 2026 at 15:59 UTC c8b1ddeb647d05aa6225e1eec2fc41851a50b8b4
5 files changed +73 -2
ts/packages/cli/src/commands/setup.cmd.ts
+10 -2
@@ -12,6 +12,7 @@ import {
12 type SetupTarget,
13 } from 'src/services/setup';
14 import { TerminalUI } from 'src/services/terminal-ui';
15 +import { SetupSkillInstaller } from 'src/services/setup-skill-installer';
16 import { isInteractiveTerminal } from 'src/utils/stdio';
17
18 const target = Options.choice('target', SETUP_TARGETS).pipe(
@@ -97,6 +98,13 @@ const setupBaseCmd = Command.make(
98 if (uninstall) {
99 const installed = inspected.filter(status => status.plugin_installed);
100 const notInstalled = inspected.filter(status => !status.plugin_installed);
101 + const skillInstaller = yield* SetupSkillInstaller;
102 + const hasManagedClaudeSkill = inspected.some(status => status.target === 'claude')
103 + ? yield* skillInstaller.hasManagedClaudeSkill
104 + : false;
105 + const removable = inspected.filter(
106 + status => status.plugin_installed || (status.target === 'claude' && hasManagedClaudeSkill)
107 + );
108
109 for (const status of installed) {
110 yield* ui.log.success(
@@ -109,14 +117,14 @@ const setupBaseCmd = Command.make(
117 );
118 }
119
112 - if (!yes && installed.length > 0) {
120 + if (!yes && removable.length > 0) {
121 if (!isInteractiveTerminal()) {
122 return yield* Effect.fail(
123 new Error('Non-interactive uninstall requires `--yes` to approve local changes.')
124 );
125 }
126 const confirmed = yield* ui.confirm(
119 - `Uninstall the Composio plugin for ${formatTargets(installed.map(status => status.target))}?`,
127 + `Remove Composio from ${formatTargets(removable.map(status => status.target))}?`,
128 { defaultValue: false }
129 );
130 if (!confirmed) {
ts/packages/cli/src/services/setup-skill-installer.ts
+22
@@ -50,6 +50,27 @@ const isLinkedTo = (fs: FileSystem.FileSystem, path: Path.Path, source: string,
50 Effect.catchAll(() => Effect.succeed(false))
51 );
52
53 +export const hasManagedClaudeSkill = (home: string) =>
54 + Effect.gen(function* () {
55 + const fs = yield* FileSystem.FileSystem;
56 + const path = yield* Path.Path;
57 + const skillName = resolveInstalledSkillName();
58 + const canonicalSkill = path.join(home, '.agents', 'skills', skillName);
59 + const claudeSkill = resolveTargetSkillPath({ home, path, skillName, target: 'claude' });
60 +
61 + if (yield* isLinkedTo(fs, path, claudeSkill, canonicalSkill)) return true;
62 + const isManaged = yield* fs.exists(path.join(canonicalSkill, SKILL_RELEASE_TAG_FILENAME));
63 + if (!isManaged) return false;
64 +
65 + const otherTargets = (['codex', 'openclaw'] as const).map(target =>
66 + resolveTargetSkillPath({ home, path, skillName, target })
67 + );
68 + const references = yield* Effect.all(
69 + otherTargets.map(target => isLinkedTo(fs, path, target, canonicalSkill))
70 + );
71 + return !references.some(Boolean);
72 + });
73 +
74 export const removeManagedClaudeSkill = (home: string) =>
75 Effect.gen(function* () {
76 const fs = yield* FileSystem.FileSystem;
@@ -93,6 +114,7 @@ export class SetupSkillInstaller extends Effect.Service<SetupSkillInstaller>()(
114
115 return {
116 isClaudeSkillReady: isCurrent(resolveSetupSkillReleaseTag()),
117 + hasManagedClaudeSkill: hasManagedClaudeSkill(os.homedir),
118 ensureClaudeSkill: Effect.gen(function* () {
119 const releaseTag = resolveSetupSkillReleaseTag();
120 if (yield* isCurrent(releaseTag)) return false;
ts/packages/cli/test/__utils__/services/test-layer.ts
+1
@@ -1257,6 +1257,7 @@ export const TestLayer = (input?: TestLiveInput) =>
1257 input?.setupSkillInstaller ??
1258 new SetupSkillInstaller({
1259 isClaudeSkillReady: Effect.succeed(false),
1260 + hasManagedClaudeSkill: Effect.succeed(false),
1261 ensureClaudeSkill: Effect.succeed(false),
1262 removeClaudeSkill: Effect.succeed(false),
1263 })
ts/packages/cli/test/src/commands/setup.cmd.test.ts
+35
@@ -99,6 +99,7 @@ const makeSkillInstaller = (initiallyReady = false, failInstall = false) => {
99 };
100 return new SetupSkillInstaller({
101 isClaudeSkillReady: Effect.sync(() => ready),
102 + hasManagedClaudeSkill: Effect.sync(() => ready),
103 ensureClaudeSkill: ensureClaudeSkill(),
104 removeClaudeSkill: Effect.sync(() => {
105 const changed = ready;
@@ -264,6 +265,7 @@ describe('CLI: composio setup', () => {
265 let staleSkillReady = false;
266 const staleSkillInstaller = new SetupSkillInstaller({
267 isClaudeSkillReady: Effect.sync(() => staleSkillReady),
268 + hasManagedClaudeSkill: Effect.succeed(true),
269 ensureClaudeSkill: Effect.sync(() => {
270 staleSkillRepaired = true;
271 staleSkillReady = true;
@@ -522,6 +524,39 @@ describe('CLI: composio setup', () => {
524 }
525 );
526
527 + const orphanedClaudeSkill = makeFakeHosts({
528 + claude: { available: true, marketplace: 'canonical', plugin: 'missing' },
529 + });
530 + let managedClaudeSkill = true;
531 + layer(
532 + TestLive({
533 + commandRunner: orphanedClaudeSkill.runner,
534 + setupSkillInstaller: new SetupSkillInstaller({
535 + isClaudeSkillReady: Effect.sync(() => managedClaudeSkill),
536 + hasManagedClaudeSkill: Effect.sync(() => managedClaudeSkill),
537 + ensureClaudeSkill: Effect.succeed(false),
538 + removeClaudeSkill: Effect.sync(() => {
539 + const changed = managedClaudeSkill;
540 + managedClaudeSkill = false;
541 + return changed;
542 + }),
543 + }),
544 + })
545 + )('uninstall with an orphaned managed Claude skill', it => {
546 + it.scoped('requires approval before removing the managed skill', () =>
547 + Effect.gen(function* () {
548 + const withoutApproval = yield* Effect.exit(
549 + cli(['setup', '--uninstall', '--target', 'claude'])
550 + );
551 + expect(Exit.isFailure(withoutApproval)).toBe(true);
552 + expect(managedClaudeSkill).toBe(true);
553 +
554 + yield* cli(['setup', '--uninstall', '--target', 'claude', '--yes']);
555 + expect(managedClaudeSkill).toBe(false);
556 + })
557 + );
558 + });
559 +
560 const nonInteractiveUninstall = makeFakeHosts({
561 claude: { available: true, marketplace: 'canonical', plugin: 'enabled' },
562 });
ts/packages/cli/test/src/services/setup-skill-installer.test.ts
+5
@@ -5,6 +5,7 @@ import { Effect, Layer } from 'effect';
5 import * as tempy from 'tempy';
6 import { SKILL_RELEASE_TAG_FILENAME } from 'src/effects/install-skill';
7 import {
8 + hasManagedClaudeSkill,
9 isClaudeSkillCurrent,
10 removeManagedClaudeSkill,
11 resolveSetupSkillReleaseTag,
@@ -105,7 +106,9 @@ describe('SetupSkillInstaller', () => {
106 yield* fs.makeDirectory(path.dirname(claude), { recursive: true });
107 yield* fs.symlink(path.relative(path.dirname(claude), canonical), claude);
108
109 + expect(yield* hasManagedClaudeSkill(home)).toBe(true);
110 expect(yield* removeManagedClaudeSkill(home)).toBe(true);
111 + expect(yield* hasManagedClaudeSkill(home)).toBe(false);
112 expect(yield* fs.exists(claude)).toBe(false);
113 expect(yield* fs.exists(canonical)).toBe(false);
114 })
@@ -129,7 +132,9 @@ describe('SetupSkillInstaller', () => {
132 yield* fs.symlink(path.relative(path.dirname(claude), canonical), claude);
133 yield* fs.symlink(path.relative(path.dirname(openclaw), canonical), openclaw);
134
135 + expect(yield* hasManagedClaudeSkill(home)).toBe(true);
136 expect(yield* removeManagedClaudeSkill(home)).toBe(true);
137 + expect(yield* hasManagedClaudeSkill(home)).toBe(false);
138 expect(yield* fs.exists(claude)).toBe(false);
139 expect(yield* fs.exists(canonical)).toBe(true);
140 expect(yield* fs.exists(openclaw)).toBe(true);