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.

refactor(cli): use Effect filesystem for setup skill

jkomynoa14ee316a6cc
diff --git a/ts/packages/cli/src/cli-main.ts b/ts/packages/cli/src/cli-main.ts
index 8b60bebb7..9c30230e1 100644
--- a/ts/packages/cli/src/cli-main.ts
+++ b/ts/packages/cli/src/cli-main.ts
@@ -95,6 +95,11 @@ export const ProjectContextLive = Layer.provide(
Layer.mergeAll(BunFileSystem.layer, NodeOs.Default, NodeProcess.Default)
) satisfies RequiredLayer;
+export const SetupSkillInstallerLive = Layer.provide(
+ SetupSkillInstaller.Default,
+ Layer.mergeAll(BunFileSystem.layer, NodeOs.Default)
+) satisfies RequiredLayer;
+
const layers = Layer.mergeAll(
CliConfigLive.pipe(Layer.provide(ConfigLive)),
NodeOs.Default,
@@ -109,7 +114,7 @@ const layers = Layer.mergeAll(
JsPackageManagerDetector.Default,
ProjectEnvironmentDetector.Default,
CommandRunner.Default,
- SetupSkillInstaller.Default,
+ SetupSkillInstallerLive,
TriggersRealtimeLive,
ProjectContextLive,
BunContext.layer,
diff --git a/ts/packages/cli/src/services/setup-skill-installer.ts b/ts/packages/cli/src/services/setup-skill-installer.ts
index 055638c1e..90d449757 100644
--- a/ts/packages/cli/src/services/setup-skill-installer.ts
+++ b/ts/packages/cli/src/services/setup-skill-installer.ts
@@ -1,11 +1,11 @@
-import fs from 'node:fs';
import path from 'node:path';
+import { FileSystem } from '@effect/platform';
import { Effect } from 'effect';
import {
installSkill,
- readInstalledSkillReleaseTag,
resolveInstalledSkillName,
resolveTargetSkillPath,
+ SKILL_RELEASE_TAG_FILENAME,
} from 'src/effects/install-skill';
import { APP_VERSION } from 'src/constants';
import { readInstalledReleaseTag } from 'src/services/run-companion-modules';
@@ -16,37 +16,47 @@ export const resolveSetupSkillReleaseTag = (
fallbackVersion = APP_VERSION
): string => readInstalledReleaseTag(execPath) ?? `@composio/cli@${fallbackVersion}`;
-export const isClaudeSkillCurrent = (home: string, releaseTag: string): boolean => {
- const skillName = resolveInstalledSkillName();
- const target = resolveTargetSkillPath({ home, skillName, target: 'claude' });
- if (readInstalledSkillReleaseTag(target) !== releaseTag) return false;
- try {
- fs.readFileSync(path.join(target, 'SKILL.md'), 'utf8');
- return true;
- } catch {
- return false;
- }
-};
+const checkClaudeSkillCurrent = (fs: FileSystem.FileSystem, home: string, releaseTag: string) =>
+ Effect.gen(function* () {
+ const skillName = resolveInstalledSkillName();
+ const target = resolveTargetSkillPath({ home, skillName, target: 'claude' });
+ const installedReleaseTag = yield* fs
+ .readFileString(path.join(target, SKILL_RELEASE_TAG_FILENAME), 'utf8')
+ .pipe(
+ Effect.map(value => value.trim()),
+ Effect.catchAll(() => Effect.succeed(undefined))
+ );
+ if (installedReleaseTag !== releaseTag) return false;
+ return yield* fs.readFileString(path.join(target, 'SKILL.md'), 'utf8').pipe(
+ Effect.as(true),
+ Effect.catchAll(() => Effect.succeed(false))
+ );
+ });
+
+export const isClaudeSkillCurrent = (home: string, releaseTag: string) =>
+ Effect.flatMap(FileSystem.FileSystem, fs => checkClaudeSkillCurrent(fs, home, releaseTag));
export class SetupSkillInstaller extends Effect.Service<SetupSkillInstaller>()(
'services/SetupSkillInstaller',
{
- sync: () => ({
- isClaudeSkillReady: Effect.gen(function* () {
- const os = yield* NodeOs;
- return isClaudeSkillCurrent(os.homedir, resolveSetupSkillReleaseTag());
- }),
- ensureClaudeSkill: Effect.gen(function* () {
- const os = yield* NodeOs;
- const releaseTag = resolveSetupSkillReleaseTag();
- if (isClaudeSkillCurrent(os.homedir, releaseTag)) return false;
+ effect: Effect.gen(function* () {
+ const fs = yield* FileSystem.FileSystem;
+ const os = yield* NodeOs;
+ const isCurrent = (releaseTag: string) => checkClaudeSkillCurrent(fs, os.homedir, releaseTag);
+
+ return {
+ isClaudeSkillReady: isCurrent(resolveSetupSkillReleaseTag()),
+ ensureClaudeSkill: Effect.gen(function* () {
+ const releaseTag = resolveSetupSkillReleaseTag();
+ if (yield* isCurrent(releaseTag)) return false;
- yield* installSkill({
- target: 'claude',
- releaseTag,
- });
- return true;
- }),
+ yield* installSkill({
+ target: 'claude',
+ releaseTag,
+ });
+ return true;
+ }),
+ };
}),
dependencies: [],
}
diff --git a/ts/packages/cli/test/src/services/setup-skill-installer.test.ts b/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
index 15f49838f..b44b2d0a7 100644
--- a/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
+++ b/ts/packages/cli/test/src/services/setup-skill-installer.test.ts
@@ -1,5 +1,7 @@
import { mkdirSync, symlinkSync, writeFileSync } from 'node:fs';
import path from 'node:path';
+import { BunFileSystem } from '@effect/platform-bun';
+import { Effect } from 'effect';
import { describe, expect, it } from 'vitest';
import * as tempy from 'tempy';
import { SKILL_RELEASE_TAG_FILENAME } from 'src/effects/install-skill';
@@ -8,6 +10,12 @@ import {
resolveSetupSkillReleaseTag,
} from 'src/services/setup-skill-installer';
+const runIsClaudeSkillCurrent = (home: string, releaseTag: string) =>
+ isClaudeSkillCurrent(home, releaseTag).pipe(
+ Effect.provide(BunFileSystem.layer),
+ Effect.runPromise
+ );
+
describe('SetupSkillInstaller', () => {
it('uses the packaged CLI release tag', () => {
const installDir = tempy.temporaryDirectory();
@@ -25,7 +33,7 @@ describe('SetupSkillInstaller', () => {
);
});
- it('only accepts a Claude skill installed from the running CLI release', () => {
+ it('only accepts a Claude skill installed from the running CLI release', async () => {
const home = tempy.temporaryDirectory();
const target = path.join(home, '.claude', 'skills', 'composio-cli');
const skillDir = path.join(home, '.agents', 'skills', 'composio-cli');
@@ -38,23 +46,23 @@ describe('SetupSkillInstaller', () => {
);
writeFileSync(path.join(skillDir, 'SKILL.md'), '# composio-cli\n');
- expect(isClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(true);
- expect(isClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
+ expect(await runIsClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(true);
+ expect(await runIsClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
});
- it('treats an unversioned existing Claude skill as stale', () => {
+ it('treats an unversioned existing Claude skill as stale', async () => {
const home = tempy.temporaryDirectory();
mkdirSync(path.join(home, '.claude', 'skills', 'composio-cli'), { recursive: true });
- expect(isClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
+ expect(await runIsClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
});
- it('treats a release marker without a readable skill as stale', () => {
+ it('treats a release marker without a readable skill as stale', async () => {
const home = tempy.temporaryDirectory();
const target = path.join(home, '.claude', 'skills', 'composio-cli');
mkdirSync(target, { recursive: true });
writeFileSync(path.join(target, SKILL_RELEASE_TAG_FILENAME), '@composio/[email protected]\n');
- expect(isClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
+ expect(await runIsClaudeSkillCurrent(home, '@composio/[email protected]')).toBe(false);
});
});