@devries-cameron20 / composio Mirror · read-only / commits / a14ee316a
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.

Mirrored from https://github.com/Camo67/composio.git

Synced Nov 21, 18:30 UTC

refactor(cli): use Effect filesystem for setup skill

jkomyno committed Jul 14, 2026 at 18:26 UTC a14ee316a6cc4ac29ec6137fd924601a7fe308c9
3 files changed +59 -36
ts/packages/cli/src/cli-main.ts
+6 -1
@@ -95,6 +95,11 @@ export const ProjectContextLive = Layer.provide(
95 Layer.mergeAll(BunFileSystem.layer, NodeOs.Default, NodeProcess.Default)
96 ) satisfies RequiredLayer;
97
98 +export const SetupSkillInstallerLive = Layer.provide(
99 + SetupSkillInstaller.Default,
100 + Layer.mergeAll(BunFileSystem.layer, NodeOs.Default)
101 +) satisfies RequiredLayer;
102 +
103 const layers = Layer.mergeAll(
104 CliConfigLive.pipe(Layer.provide(ConfigLive)),
105 NodeOs.Default,
@@ -109,7 +114,7 @@ const layers = Layer.mergeAll(
114 JsPackageManagerDetector.Default,
115 ProjectEnvironmentDetector.Default,
116 CommandRunner.Default,
112 - SetupSkillInstaller.Default,
117 + SetupSkillInstallerLive,
118 TriggersRealtimeLive,
119 ProjectContextLive,
120 BunContext.layer,
ts/packages/cli/src/services/setup-skill-installer.ts
+38 -28
@@ -1,11 +1,11 @@
1 -import fs from 'node:fs';
1 import path from 'node:path';
2 +import { FileSystem } from '@effect/platform';
3 import { Effect } from 'effect';
4 import {
5 installSkill,
6 - readInstalledSkillReleaseTag,
6 resolveInstalledSkillName,
7 resolveTargetSkillPath,
8 + SKILL_RELEASE_TAG_FILENAME,
9 } from 'src/effects/install-skill';
10 import { APP_VERSION } from 'src/constants';
11 import { readInstalledReleaseTag } from 'src/services/run-companion-modules';
@@ -16,37 +16,47 @@ export const resolveSetupSkillReleaseTag = (
16 fallbackVersion = APP_VERSION
17 ): string => readInstalledReleaseTag(execPath) ?? `@composio/cli@${fallbackVersion}`;
18
19 -export const isClaudeSkillCurrent = (home: string, releaseTag: string): boolean => {
20 - const skillName = resolveInstalledSkillName();
21 - const target = resolveTargetSkillPath({ home, skillName, target: 'claude' });
22 - if (readInstalledSkillReleaseTag(target) !== releaseTag) return false;
23 - try {
24 - fs.readFileSync(path.join(target, 'SKILL.md'), 'utf8');
25 - return true;
26 - } catch {
27 - return false;
28 - }
29 -};
19 +const checkClaudeSkillCurrent = (fs: FileSystem.FileSystem, home: string, releaseTag: string) =>
20 + Effect.gen(function* () {
21 + const skillName = resolveInstalledSkillName();
22 + const target = resolveTargetSkillPath({ home, skillName, target: 'claude' });
23 + const installedReleaseTag = yield* fs
24 + .readFileString(path.join(target, SKILL_RELEASE_TAG_FILENAME), 'utf8')
25 + .pipe(
26 + Effect.map(value => value.trim()),
27 + Effect.catchAll(() => Effect.succeed(undefined))
28 + );
29 + if (installedReleaseTag !== releaseTag) return false;
30 + return yield* fs.readFileString(path.join(target, 'SKILL.md'), 'utf8').pipe(
31 + Effect.as(true),
32 + Effect.catchAll(() => Effect.succeed(false))
33 + );
34 + });
35 +
36 +export const isClaudeSkillCurrent = (home: string, releaseTag: string) =>
37 + Effect.flatMap(FileSystem.FileSystem, fs => checkClaudeSkillCurrent(fs, home, releaseTag));
38
39 export class SetupSkillInstaller extends Effect.Service<SetupSkillInstaller>()(
40 'services/SetupSkillInstaller',
41 {
34 - sync: () => ({
35 - isClaudeSkillReady: Effect.gen(function* () {
36 - const os = yield* NodeOs;
37 - return isClaudeSkillCurrent(os.homedir, resolveSetupSkillReleaseTag());
38 - }),
39 - ensureClaudeSkill: Effect.gen(function* () {
40 - const os = yield* NodeOs;
41 - const releaseTag = resolveSetupSkillReleaseTag();
42 - if (isClaudeSkillCurrent(os.homedir, releaseTag)) return false;
42 + effect: Effect.gen(function* () {
43 + const fs = yield* FileSystem.FileSystem;
44 + const os = yield* NodeOs;
45 + const isCurrent = (releaseTag: string) => checkClaudeSkillCurrent(fs, os.homedir, releaseTag);
46 +
47 + return {
48 + isClaudeSkillReady: isCurrent(resolveSetupSkillReleaseTag()),
49 + ensureClaudeSkill: Effect.gen(function* () {
50 + const releaseTag = resolveSetupSkillReleaseTag();
51 + if (yield* isCurrent(releaseTag)) return false;
52
44 - yield* installSkill({
45 - target: 'claude',
46 - releaseTag,
47 - });
48 - return true;
49 - }),
53 + yield* installSkill({
54 + target: 'claude',
55 + releaseTag,
56 + });
57 + return true;
58 + }),
59 + };
60 }),
61 dependencies: [],
62 }
ts/packages/cli/test/src/services/setup-skill-installer.test.ts
+15 -7
@@ -1,5 +1,7 @@
1 import { mkdirSync, symlinkSync, writeFileSync } from 'node:fs';
2 import path from 'node:path';
3 +import { BunFileSystem } from '@effect/platform-bun';
4 +import { Effect } from 'effect';
5 import { describe, expect, it } from 'vitest';
6 import * as tempy from 'tempy';
7 import { SKILL_RELEASE_TAG_FILENAME } from 'src/effects/install-skill';
@@ -8,6 +10,12 @@ import {
10 resolveSetupSkillReleaseTag,
11 } from 'src/services/setup-skill-installer';
12
13 +const runIsClaudeSkillCurrent = (home: string, releaseTag: string) =>
14 + isClaudeSkillCurrent(home, releaseTag).pipe(
15 + Effect.provide(BunFileSystem.layer),
16 + Effect.runPromise
17 + );
18 +
19 describe('SetupSkillInstaller', () => {
20 it('uses the packaged CLI release tag', () => {
21 const installDir = tempy.temporaryDirectory();
@@ -25,7 +33,7 @@ describe('SetupSkillInstaller', () => {
33 );
34 });
35
28 - it('only accepts a Claude skill installed from the running CLI release', () => {
36 + it('only accepts a Claude skill installed from the running CLI release', async () => {
37 const home = tempy.temporaryDirectory();
38 const target = path.join(home, '.claude', 'skills', 'composio-cli');
39 const skillDir = path.join(home, '.agents', 'skills', 'composio-cli');
@@ -38,23 +46,23 @@ describe('SetupSkillInstaller', () => {
46 );
47 writeFileSync(path.join(skillDir, 'SKILL.md'), '# composio-cli\n');
48
41 - expect(isClaudeSkillCurrent(home, '@composio/cli@0.2.20-beta.42')).toBe(true);
42 - expect(isClaudeSkillCurrent(home, '@composio/cli@0.2.20-beta.43')).toBe(false);
49 + expect(await runIsClaudeSkillCurrent(home, '@composio/cli@0.2.20-beta.42')).toBe(true);
50 + expect(await runIsClaudeSkillCurrent(home, '@composio/cli@0.2.20-beta.43')).toBe(false);
51 });
52
45 - it('treats an unversioned existing Claude skill as stale', () => {
53 + it('treats an unversioned existing Claude skill as stale', async () => {
54 const home = tempy.temporaryDirectory();
55 mkdirSync(path.join(home, '.claude', 'skills', 'composio-cli'), { recursive: true });
56
49 - expect(isClaudeSkillCurrent(home, '@composio/cli@0.3.0')).toBe(false);
57 + expect(await runIsClaudeSkillCurrent(home, '@composio/cli@0.3.0')).toBe(false);
58 });
59
52 - it('treats a release marker without a readable skill as stale', () => {
60 + it('treats a release marker without a readable skill as stale', async () => {
61 const home = tempy.temporaryDirectory();
62 const target = path.join(home, '.claude', 'skills', 'composio-cli');
63 mkdirSync(target, { recursive: true });
64 writeFileSync(path.join(target, SKILL_RELEASE_TAG_FILENAME), '@composio/cli@0.3.0\n');
65
58 - expect(isClaudeSkillCurrent(home, '@composio/cli@0.3.0')).toBe(false);
66 + expect(await runIsClaudeSkillCurrent(home, '@composio/cli@0.3.0')).toBe(false);
67 });
68 });