@cloudcli-ai/cloudcli 1.31.5 → 1.33.0

package/dist-server/server/modules/providers/tests/provider-models.service.test.js

@@ -0,0 +1,270 @@
+import assert from 'node:assert/strict';
+import { mkdtemp, rm } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { createProviderModelsService, PROVIDER_MODELS_CACHE_TTL_MS, } from '../../../modules/providers/services/provider-models.service.js';
+import { writeProviderSessionActiveModelChange } from '../../../shared/utils.js';
+const createModels = (value) => ({
+    OPTIONS: [{ value, label: value }],
+    DEFAULT: value,
+});
+const createCurrentActiveModel = (model) => ({
+    model,
+});
+const createSessionActiveModelChange = (provider, input) => ({
+    provider,
+    sessionId: input.sessionId,
+    supported: true,
+    changed: true,
+    model: input.model,
+});
+const createEphemeralCachePath = () => path.join(os.tmpdir(), `provider-model-cache-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}.json`);
+test('provider models service delegates to the resolved provider model adapter', async () => {
+    const calls = [];
+    const service = createProviderModelsService({
+        cachePath: createEphemeralCachePath(),
+        resolveProvider: (provider) => {
+            calls.push(provider);
+            return {
+                models: {
+                    getSupportedModels: async () => createModels(`${provider}-models`),
+                    getCurrentActiveModel: async () => createCurrentActiveModel(`${provider}-active`),
+                    changeActiveModel: async (input) => createSessionActiveModelChange(provider, input),
+                },
+            };
+        },
+    });
+    const models = await service.getProviderModels('codex', { bypassCache: true });
+    assert.deepEqual(calls, ['codex']);
+    assert.equal(models.models.DEFAULT, 'codex-models');
+    assert.equal(models.cache.source, 'fresh');
+});
+test('provider models service returns each provider adapter result without rewriting it', async () => {
+    const expectedModels = {
+        OPTIONS: [
+            { value: 'cursor-a', label: 'Cursor A' },
+            { value: 'cursor-b', label: 'Cursor B' },
+        ],
+        DEFAULT: 'cursor-b',
+    };
+    const service = createProviderModelsService({
+        cachePath: createEphemeralCachePath(),
+        resolveProvider: () => ({
+            models: {
+                getSupportedModels: async () => expectedModels,
+                getCurrentActiveModel: async () => createCurrentActiveModel('cursor-active'),
+                changeActiveModel: async (input) => createSessionActiveModelChange('cursor', input),
+            },
+        }),
+    });
+    const models = await service.getProviderModels('cursor', { bypassCache: true });
+    assert.deepEqual(models.models, expectedModels);
+});
+test('provider models are cached for the three-day ttl', async () => {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'provider-model-cache-ttl-'));
+    let currentTime = 1_000;
+    let loadCount = 0;
+    try {
+        const service = createProviderModelsService({
+            cachePath: path.join(tempRoot, 'models-cache.json'),
+            now: () => currentTime,
+            resolveProvider: (provider) => ({
+                models: {
+                    getSupportedModels: async () => {
+                        loadCount += 1;
+                        return createModels(`${provider}-${loadCount}`);
+                    },
+                    getCurrentActiveModel: async () => createCurrentActiveModel(`${provider}-active`),
+                    changeActiveModel: async (input) => createSessionActiveModelChange(provider, input),
+                },
+            }),
+        });
+        const first = await service.getProviderModels('codex');
+        const cached = await service.getProviderModels('codex');
+        assert.equal(loadCount, 1);
+        assert.equal(cached.models.DEFAULT, first.models.DEFAULT);
+        assert.equal(cached.cache.source, 'memory');
+        currentTime += PROVIDER_MODELS_CACHE_TTL_MS - 1;
+        await service.getProviderModels('codex');
+        assert.equal(loadCount, 1);
+        currentTime += 2;
+        const refreshed = await service.getProviderModels('codex');
+        assert.equal(loadCount, 2);
+        assert.equal(refreshed.models.DEFAULT, 'codex-2');
+    }
+    finally {
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+test('provider model cache is persisted across service instances', async () => {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'provider-model-cache-file-'));
+    const cachePath = path.join(tempRoot, 'models-cache.json');
+    try {
+        const writer = createProviderModelsService({
+            cachePath,
+            resolveProvider: () => ({
+                models: {
+                    getSupportedModels: async () => createModels('gemini-cached'),
+                    getCurrentActiveModel: async () => createCurrentActiveModel('gemini-active'),
+                    changeActiveModel: async (input) => createSessionActiveModelChange('gemini', input),
+                },
+            }),
+        });
+        await writer.getProviderModels('gemini');
+        const reader = createProviderModelsService({
+            cachePath,
+            resolveProvider: () => ({
+                models: {
+                    getSupportedModels: async () => {
+                        throw new Error('loader should not be called for persisted cache hits');
+                    },
+                    getCurrentActiveModel: async () => createCurrentActiveModel('gemini-active'),
+                    changeActiveModel: async (input) => createSessionActiveModelChange('gemini', input),
+                },
+            }),
+        });
+        const models = await reader.getProviderModels('gemini');
+        assert.equal(models.models.DEFAULT, 'gemini-cached');
+        assert.equal(models.cache.source, 'disk');
+    }
+    finally {
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+test('concurrent provider model requests share one load operation', async () => {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'provider-model-cache-pending-'));
+    let loadCount = 0;
+    try {
+        const service = createProviderModelsService({
+            cachePath: path.join(tempRoot, 'models-cache.json'),
+            resolveProvider: () => ({
+                models: {
+                    getSupportedModels: async () => {
+                        loadCount += 1;
+                        await new Promise((resolve) => setTimeout(resolve, 20));
+                        return createModels('claude-cached');
+                    },
+                    getCurrentActiveModel: async () => createCurrentActiveModel('claude-active'),
+                    changeActiveModel: async (input) => createSessionActiveModelChange('claude', input),
+                },
+            }),
+        });
+        const [first, second] = await Promise.all([
+            service.getProviderModels('claude'),
+            service.getProviderModels('claude'),
+        ]);
+        assert.equal(loadCount, 1);
+        assert.equal(first.models.DEFAULT, 'claude-cached');
+        assert.equal(second.models.DEFAULT, 'claude-cached');
+    }
+    finally {
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+test('bypassCache forces a fresh provider fetch and updates cache metadata', async () => {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'provider-model-cache-refresh-'));
+    let currentTime = 1_000;
+    let loadCount = 0;
+    try {
+        const service = createProviderModelsService({
+            cachePath: path.join(tempRoot, 'models-cache.json'),
+            now: () => currentTime,
+            resolveProvider: (provider) => ({
+                models: {
+                    getSupportedModels: async () => {
+                        loadCount += 1;
+                        return createModels(`${provider}-${loadCount}`);
+                    },
+                    getCurrentActiveModel: async () => createCurrentActiveModel(`${provider}-active-${loadCount}`),
+                    changeActiveModel: async (input) => createSessionActiveModelChange(provider, input),
+                },
+            }),
+        });
+        const first = await service.getProviderModels('claude');
+        currentTime += 50;
+        const refreshed = await service.getProviderModels('claude', { bypassCache: true });
+        assert.equal(first.models.DEFAULT, 'claude-1');
+        assert.equal(refreshed.models.DEFAULT, 'claude-2');
+        assert.equal(refreshed.cache.source, 'fresh');
+        assert.notEqual(refreshed.cache.updatedAt, first.cache.updatedAt);
+        assert.equal(loadCount, 2);
+    }
+    finally {
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+test('provider models service delegates current active model lookups to the provider adapter', async () => {
+    const calls = [];
+    const service = createProviderModelsService({
+        resolveProvider: (provider) => ({
+            models: {
+                getSupportedModels: async () => createModels(`${provider}-models`),
+                getCurrentActiveModel: async (sessionId) => {
+                    calls.push({ provider, sessionId });
+                    return createCurrentActiveModel(`${provider}-${sessionId}`);
+                },
+                changeActiveModel: async (input) => createSessionActiveModelChange(provider, input),
+            },
+        }),
+    });
+    const activeModel = await service.getCurrentActiveModel('opencode', 'session-123');
+    assert.deepEqual(calls, [{ provider: 'opencode', sessionId: 'session-123' }]);
+    assert.equal(activeModel.model, 'opencode-session-123');
+});
+test('provider models service delegates active model change requests to the provider adapter', async () => {
+    const calls = [];
+    const service = createProviderModelsService({
+        resolveProvider: (provider) => ({
+            models: {
+                getSupportedModels: async () => createModels(`${provider}-models`),
+                getCurrentActiveModel: async () => createCurrentActiveModel(`${provider}-active`),
+                changeActiveModel: async (input) => {
+                    calls.push({ provider, input });
+                    return createSessionActiveModelChange(provider, input);
+                },
+            },
+        }),
+    });
+    const changedModel = await service.changeActiveModel('claude', {
+        sessionId: 'session-123',
+        model: 'opus',
+    });
+    assert.deepEqual(calls, [{
+            provider: 'claude',
+            input: {
+                sessionId: 'session-123',
+                model: 'opus',
+            },
+        }]);
+    assert.equal(changedModel.changed, true);
+    assert.equal(changedModel.model, 'opus');
+});
+test('resolveResumeModel prefers a stored changed model over the requested one', async () => {
+    const tempRoot = await mkdtemp(path.join(os.tmpdir(), 'provider-model-change-'));
+    const activeModelChangesPath = path.join(tempRoot, 'session-model-changes.json');
+    try {
+        const service = createProviderModelsService({
+            activeModelChangesPath,
+            resolveProvider: (provider) => ({
+                models: {
+                    getSupportedModels: async () => createModels(`${provider}-models`),
+                    getCurrentActiveModel: async () => createCurrentActiveModel(`${provider}-active`),
+                    changeActiveModel: async (input) => createSessionActiveModelChange(provider, input),
+                },
+            }),
+        });
+        await writeProviderSessionActiveModelChange('cursor', {
+            sessionId: 'session-456',
+            model: 'composer-2',
+        }, {
+            filePath: activeModelChangesPath,
+        });
+        const model = await service.resolveResumeModel('cursor', 'session-456', 'composer-2-fast');
+        assert.equal(model, 'composer-2');
+    }
+    finally {
+        await rm(tempRoot, { recursive: true, force: true });
+    }
+});
+//# sourceMappingURL=provider-models.service.test.js.map

package/dist-server/server/modules/providers/tests/provider-models.service.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"provider-models.service.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/provider-models.service.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/providers/tests/skills.test.js

@@ -0,0 +1,259 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import test from 'node:test';
+import { providerSkillsService } from '../../../modules/providers/services/skills.service.js';
+const patchHomeDir = (nextHomeDir) => {
+    const original = os.homedir;
+    os.homedir = () => nextHomeDir;
+    return () => {
+        os.homedir = original;
+    };
+};
+const writeSkill = async (skillsRoot, directoryName, name, description) => {
+    const skillDir = path.join(skillsRoot, directoryName);
+    await fs.mkdir(skillDir, { recursive: true });
+    const skillPath = path.join(skillDir, 'SKILL.md');
+    await fs.writeFile(skillPath, `---\nname: ${name}\ndescription: ${description}\n---\n\n`, 'utf8');
+    return skillPath;
+};
+const writeClaudePluginManifest = async (installPath, name) => {
+    const pluginConfigDir = path.join(installPath, '.claude-plugin');
+    await fs.mkdir(pluginConfigDir, { recursive: true });
+    await fs.writeFile(path.join(pluginConfigDir, 'plugin.json'), JSON.stringify({
+        name,
+        version: '0.1.0',
+        description: `${name} test plugin`,
+    }, null, 2), 'utf8');
+};
+const writeClaudePluginCommand = async (commandsRoot, commandName, description) => {
+    await fs.mkdir(commandsRoot, { recursive: true });
+    const commandPath = path.join(commandsRoot, `${commandName}.md`);
+    await fs.writeFile(commandPath, `---\ndescription: ${description}\nargument-hint: 'test args'\n---\n\nCommand body.\n`, 'utf8');
+    return commandPath;
+};
+/**
+ * This test covers Claude user/project skill folders plus plugin discovery from
+ * installed plugin command files and fallback plugin skill files.
+ */
+test('providerSkillsService lists claude user, project, and enabled plugin skills', { concurrency: false }, async () => {
+    const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-claude-'));
+    const workspacePath = path.join(tempRoot, 'workspace');
+    const commandPluginInstallPath = path.join(tempRoot, '.claude', 'plugins', 'cache', 'notion-plugin', 'notion', 'abc123');
+    const skillPluginInstallPath = path.join(tempRoot, '.claude', 'plugins', 'cache', 'anthropic-agent-skills', 'example-skills', 'def456');
+    const disabledPluginInstallPath = path.join(tempRoot, '.claude', 'plugins', 'cache', 'disabled-marketplace', 'disabled-skills', 'ghi789');
+    const emptyIdPluginInstallPath = path.join(tempRoot, '.claude', 'plugins', 'cache', 'invalid-empty-plugin', 'empty', '000');
+    const atIdPluginInstallPath = path.join(tempRoot, '.claude', 'plugins', 'cache', 'invalid-at-plugin', 'at', '000');
+    const siblingSkillPluginPath = path.join(path.dirname(skillPluginInstallPath), 'legacy777');
+    await fs.mkdir(workspacePath, { recursive: true });
+    const restoreHomeDir = patchHomeDir(tempRoot);
+    try {
+        await writeSkill(path.join(tempRoot, '.claude', 'skills'), 'claude-user-dir', 'claude-user', 'Claude user skill');
+        await writeSkill(path.join(workspacePath, '.claude', 'skills'), 'claude-project-dir', 'claude-project', 'Claude project skill');
+        await writeClaudePluginManifest(commandPluginInstallPath, 'Notion');
+        await writeClaudePluginCommand(path.join(commandPluginInstallPath, 'commands'), 'insert-row', 'Insert a Notion database row');
+        await writeSkill(path.join(commandPluginInstallPath, 'skills'), 'ignored-command-plugin-skill-dir', 'ignored-command-plugin-skill', 'Command plugin fallback skill should be ignored');
+        await writeClaudePluginManifest(skillPluginInstallPath, 'ExampleSkills');
+        await writeSkill(path.join(skillPluginInstallPath, 'skills'), 'claude-plugin-dir', 'claude-plugin', 'Claude plugin skill');
+        await writeSkill(path.join(skillPluginInstallPath, 'skills'), 'claude-plugin-second-dir', 'claude-plugin-second', 'Second Claude plugin skill');
+        await writeSkill(path.join(skillPluginInstallPath, 'skills', 'nested', 'collection'), 'claude-plugin-nested-dir', 'claude-plugin-nested', 'Nested Claude plugin skill');
+        await writeSkill(path.join(siblingSkillPluginPath, 'skills'), 'claude-plugin-sibling-dir', 'claude-plugin-sibling', 'Sibling Claude plugin skill');
+        await writeClaudePluginManifest(disabledPluginInstallPath, 'DisabledSkills');
+        await writeClaudePluginCommand(path.join(disabledPluginInstallPath, 'commands'), 'disabled-command', 'Disabled plugin command');
+        await writeClaudePluginCommand(path.join(emptyIdPluginInstallPath, 'commands'), 'invalid-empty-command', 'Invalid empty id command');
+        await writeClaudePluginCommand(path.join(atIdPluginInstallPath, 'commands'), 'invalid-at-command', 'Invalid at id command');
+        await writeSkill(path.join(disabledPluginInstallPath, 'skills'), 'disabled-plugin-dir', 'disabled-plugin', 'Disabled plugin skill');
+        await fs.writeFile(path.join(tempRoot, '.claude', 'settings.json'), JSON.stringify({
+            enabledPlugins: {
+                '': true,
+                '@': true,
+                'notion@notion-marketplace': true,
+                'example-skills@anthropic-agent-skills': true,
+                'disabled-skills@disabled-marketplace': false,
+            },
+        }, null, 2), 'utf8');
+        await fs.writeFile(path.join(tempRoot, '.claude', 'plugins', 'installed_plugins.json'), JSON.stringify({
+            version: 2,
+            plugins: {
+                '': [
+                    {
+                        scope: 'user',
+                        installPath: emptyIdPluginInstallPath,
+                        version: '000',
+                    },
+                ],
+                '@': [
+                    {
+                        scope: 'user',
+                        installPath: atIdPluginInstallPath,
+                        version: '000',
+                    },
+                ],
+                'notion@notion-marketplace': [
+                    {
+                        scope: 'user',
+                        installPath: commandPluginInstallPath,
+                        version: 'abc123',
+                    },
+                ],
+                'example-skills@anthropic-agent-skills': [
+                    {
+                        scope: 'user',
+                        installPath: skillPluginInstallPath,
+                        version: 'def456',
+                    },
+                ],
+                'disabled-skills@disabled-marketplace': [
+                    {
+                        scope: 'user',
+                        installPath: disabledPluginInstallPath,
+                        version: 'ghi789',
+                    },
+                ],
+            },
+        }, null, 2), 'utf8');
+        const skills = await providerSkillsService.listProviderSkills('claude', { workspacePath });
+        const byName = new Map(skills.map((skill) => [skill.name, skill]));
+        assert.equal(byName.get('claude-user')?.scope, 'user');
+        assert.equal(byName.get('claude-user')?.command, '/claude-user');
+        assert.equal(byName.get('claude-project')?.scope, 'project');
+        assert.equal(byName.get('claude-project')?.command, '/claude-project');
+        const pluginCommand = byName.get('insert-row');
+        assert.equal(pluginCommand?.scope, 'plugin');
+        assert.equal(pluginCommand?.pluginName, 'Notion');
+        assert.equal(pluginCommand?.pluginId, 'notion@notion-marketplace');
+        assert.equal(pluginCommand?.command, '/Notion:insert-row');
+        assert.equal(pluginCommand?.description, 'Insert a Notion database row');
+        assert.match(pluginCommand?.sourcePath ?? '', /commands[\\/]insert-row\.md$/);
+        assert.equal(byName.has('ignored-command-plugin-skill'), false);
+        const pluginSkill = byName.get('claude-plugin');
+        assert.equal(pluginSkill?.scope, 'plugin');
+        assert.equal(pluginSkill?.pluginName, 'ExampleSkills');
+        assert.equal(pluginSkill?.pluginId, 'example-skills@anthropic-agent-skills');
+        assert.equal(pluginSkill?.command, '/ExampleSkills:claude-plugin');
+        assert.equal(pluginSkill?.description, 'Claude plugin skill');
+        assert.match(pluginSkill?.sourcePath ?? '', /cache[\\/]anthropic-agent-skills[\\/]example-skills[\\/]def456[\\/]skills[\\/]/);
+        const secondPluginSkill = byName.get('claude-plugin-second');
+        assert.equal(secondPluginSkill?.scope, 'plugin');
+        assert.equal(secondPluginSkill?.command, '/ExampleSkills:claude-plugin-second');
+        const nestedPluginSkill = byName.get('claude-plugin-nested');
+        assert.equal(nestedPluginSkill?.scope, 'plugin');
+        assert.equal(nestedPluginSkill?.command, '/ExampleSkills:claude-plugin-nested');
+        assert.equal(nestedPluginSkill?.description, 'Nested Claude plugin skill');
+        const siblingPluginSkill = byName.get('claude-plugin-sibling');
+        assert.equal(siblingPluginSkill?.scope, 'plugin');
+        assert.equal(siblingPluginSkill?.pluginName, 'example-skills');
+        assert.equal(siblingPluginSkill?.command, '/example-skills:claude-plugin-sibling');
+        assert.equal(siblingPluginSkill?.description, 'Sibling Claude plugin skill');
+        assert.equal(byName.has('disabled-command'), false);
+        assert.equal(byName.has('disabled-plugin'), false);
+        assert.equal(byName.has('invalid-empty-command'), false);
+        assert.equal(byName.has('invalid-at-command'), false);
+        assert.equal(skills.some((skill) => skill.command.startsWith('/:')), false);
+    }
+    finally {
+        restoreHomeDir();
+        await fs.rm(tempRoot, { recursive: true, force: true });
+    }
+});
+/**
+ * This test covers Codex repository/user/system skill folders and verifies that
+ * repository lookup includes cwd, parent, and git root skill locations.
+ */
+test('providerSkillsService lists codex repository, user, and system skills', { concurrency: false }, async () => {
+    const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-codex-'));
+    const repoRoot = path.join(tempRoot, 'repo');
+    const workspacePath = path.join(repoRoot, 'packages', 'app');
+    await fs.mkdir(path.join(repoRoot, '.git'), { recursive: true });
+    await fs.mkdir(workspacePath, { recursive: true });
+    const restoreHomeDir = patchHomeDir(tempRoot);
+    try {
+        await writeSkill(path.join(workspacePath, '.agents', 'skills'), 'codex-cwd-dir', 'codex-cwd', 'Codex cwd skill');
+        await writeSkill(path.join(repoRoot, 'packages', '.agents', 'skills'), 'codex-parent-dir', 'codex-parent', 'Codex parent skill');
+        await writeSkill(path.join(repoRoot, '.agents', 'skills'), 'codex-root-dir', 'codex-root', 'Codex root skill');
+        await writeSkill(path.join(tempRoot, '.agents', 'skills'), 'codex-user-dir', 'codex-user', 'Codex user skill');
+        await writeSkill(path.join(tempRoot, '.codex', 'skills', '.system'), 'codex-system-dir', 'codex-system', 'Codex system skill');
+        const skills = await providerSkillsService.listProviderSkills('codex', { workspacePath });
+        const byName = new Map(skills.map((skill) => [skill.name, skill]));
+        assert.equal(byName.get('codex-cwd')?.scope, 'repo');
+        assert.equal(byName.get('codex-parent')?.scope, 'repo');
+        assert.equal(byName.get('codex-root')?.scope, 'repo');
+        assert.equal(byName.get('codex-user')?.scope, 'user');
+        assert.equal(byName.get('codex-system')?.scope, 'system');
+        assert.equal(byName.get('codex-root')?.command, '$codex-root');
+    }
+    finally {
+        restoreHomeDir();
+        await fs.rm(tempRoot, { recursive: true, force: true });
+    }
+});
+/**
+ * This test covers OpenCode skill lookup across cwd-to-git-root project folders
+ * plus the global OpenCode/Claude/Agents compatibility locations.
+ */
+test('providerSkillsService lists opencode project and user compatibility skills', { concurrency: false }, async () => {
+    const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-opencode-'));
+    const repoRoot = path.join(tempRoot, 'repo');
+    const workspacePath = path.join(repoRoot, 'packages', 'app');
+    await fs.mkdir(path.join(repoRoot, '.git'), { recursive: true });
+    await fs.mkdir(workspacePath, { recursive: true });
+    const restoreHomeDir = patchHomeDir(tempRoot);
+    try {
+        await writeSkill(path.join(workspacePath, '.opencode', 'skills'), 'opencode-cwd-dir', 'opencode-cwd', 'OpenCode cwd skill');
+        await writeSkill(path.join(repoRoot, 'packages', '.claude', 'skills'), 'opencode-claude-parent-dir', 'opencode-claude-parent', 'OpenCode Claude parent skill');
+        await writeSkill(path.join(repoRoot, '.agents', 'skills'), 'opencode-agents-root-dir', 'opencode-agents-root', 'OpenCode Agents root skill');
+        await writeSkill(path.join(tempRoot, '.config', 'opencode', 'skills'), 'opencode-user-dir', 'opencode-user', 'OpenCode user skill');
+        await writeSkill(path.join(tempRoot, '.claude', 'skills'), 'opencode-claude-user-dir', 'opencode-claude-user', 'OpenCode Claude user skill');
+        await writeSkill(path.join(tempRoot, '.agents', 'skills'), 'opencode-agents-user-dir', 'opencode-agents-user', 'OpenCode Agents user skill');
+        const skills = await providerSkillsService.listProviderSkills('opencode', { workspacePath });
+        const byName = new Map(skills.map((skill) => [skill.name, skill]));
+        assert.equal(byName.get('opencode-cwd')?.scope, 'project');
+        assert.equal(byName.get('opencode-claude-parent')?.scope, 'project');
+        assert.equal(byName.get('opencode-agents-root')?.scope, 'project');
+        assert.equal(byName.get('opencode-user')?.scope, 'user');
+        assert.equal(byName.get('opencode-claude-user')?.scope, 'user');
+        assert.equal(byName.get('opencode-agents-user')?.scope, 'user');
+        assert.equal(byName.get('opencode-cwd')?.command, '/opencode-cwd');
+    }
+    finally {
+        restoreHomeDir();
+        await fs.rm(tempRoot, { recursive: true, force: true });
+    }
+});
+/**
+ * This test covers Gemini and Cursor skill directory rules, including shared
+ * `.agents/skills` project support.
+ */
+test('providerSkillsService lists gemini and cursor skills from their configured directories', { concurrency: false }, async () => {
+    const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-gc-'));
+    const workspacePath = path.join(tempRoot, 'workspace');
+    await fs.mkdir(workspacePath, { recursive: true });
+    const restoreHomeDir = patchHomeDir(tempRoot);
+    try {
+        await writeSkill(path.join(tempRoot, '.gemini', 'skills'), 'gemini-user-dir', 'gemini-user', 'Gemini user skill');
+        await writeSkill(path.join(tempRoot, '.agents', 'skills'), 'agents-user-dir', 'agents-user', 'Agents user skill');
+        await writeSkill(path.join(workspacePath, '.gemini', 'skills'), 'gemini-project-dir', 'gemini-project', 'Gemini project skill');
+        await writeSkill(path.join(workspacePath, '.agents', 'skills'), 'agents-project-dir', 'agents-project', 'Agents project skill');
+        await writeSkill(path.join(workspacePath, '.cursor', 'skills'), 'cursor-project-dir', 'cursor-project', 'Cursor project skill');
+        await writeSkill(path.join(tempRoot, '.cursor', 'skills'), 'cursor-user-dir', 'cursor-user', 'Cursor user skill');
+        const geminiSkills = await providerSkillsService.listProviderSkills('gemini', { workspacePath });
+        const geminiByName = new Map(geminiSkills.map((skill) => [skill.name, skill]));
+        assert.equal(geminiByName.get('gemini-user')?.scope, 'user');
+        assert.equal(geminiByName.get('agents-user')?.scope, 'user');
+        assert.equal(geminiByName.get('gemini-project')?.scope, 'project');
+        assert.equal(geminiByName.get('agents-project')?.scope, 'project');
+        assert.equal(geminiByName.get('gemini-project')?.command, '/gemini-project');
+        const cursorSkills = await providerSkillsService.listProviderSkills('cursor', { workspacePath });
+        const cursorByName = new Map(cursorSkills.map((skill) => [skill.name, skill]));
+        assert.equal(cursorByName.get('agents-project')?.scope, 'project');
+        assert.equal(cursorByName.get('cursor-project')?.scope, 'project');
+        assert.equal(cursorByName.get('cursor-user')?.scope, 'user');
+        assert.equal(cursorByName.get('cursor-user')?.command, '/cursor-user');
+    }
+    finally {
+        restoreHomeDir();
+        await fs.rm(tempRoot, { recursive: true, force: true });
+    }
+});
+//# sourceMappingURL=skills.test.js.map

package/dist-server/server/modules/providers/tests/skills.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"skills.test.js","sourceRoot":"","sources":["../../../../../server/modules/providers/tests/skills.test.ts"],"names":[],"mappings":"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"}

package/dist-server/server/modules/websocket/services/chat-websocket.service.js

@@ -6,7 +6,7 @@ const DEFAULT_PROVIDER = 'claude';
  * Normalizes potentially invalid provider names coming from websocket payloads.
  */
 function readProvider(value) {
-    if (value === 'claude' || value === 'cursor' || value === 'codex' || value === 'gemini') {
+    if (value === 'claude' || value === 'cursor' || value === 'codex' || value === 'gemini' || value === 'opencode') {
         return value;
     }
     return DEFAULT_PROVIDER;
@@ -62,6 +62,10 @@ export function handleChatConnection(ws, request, dependencies) {
                 await dependencies.spawnGemini(data.command ?? '', data.options, writer);
                 return;
             }
+            if (messageType === 'opencode-command') {
+                await dependencies.spawnOpenCode(data.command ?? '', data.options, writer);
+                return;
+            }
             if (messageType === 'cursor-resume') {
                 await dependencies.spawnCursor('', {
                     sessionId: data.sessionId,
@@ -83,6 +87,9 @@ export function handleChatConnection(ws, request, dependencies) {
                 else if (provider === 'gemini') {
                     success = dependencies.abortGeminiSession(sessionId);
                 }
+                else if (provider === 'opencode') {
+                    success = dependencies.abortOpenCodeSession(sessionId);
+                }
                 else {
                     success = await dependencies.abortClaudeSDKSession(sessionId);
                 }
@@ -133,6 +140,9 @@ export function handleChatConnection(ws, request, dependencies) {
                 else if (provider === 'gemini') {
                     isActive = dependencies.isGeminiSessionActive(sessionId);
                 }
+                else if (provider === 'opencode') {
+                    isActive = dependencies.isOpenCodeSessionActive(sessionId);
+                }
                 else {
                     isActive = dependencies.isClaudeSDKSessionActive(sessionId);
                     if (isActive) {
@@ -167,6 +177,7 @@ export function handleChatConnection(ws, request, dependencies) {
                         cursor: dependencies.getActiveCursorSessions(),
                         codex: dependencies.getActiveCodexSessions(),
                         gemini: dependencies.getActiveGeminiSessions(),
+                        opencode: dependencies.getActiveOpenCodeSessions(),
                     },
                 });
             }