consult-llm-mcp 2.5.0 → 2.5.2

package/README.md

@@ -680,21 +680,40 @@ always reliably triggered. See the [example skill](#example-skill) below.
 **Recommendation:** Start with no custom activation. Use slash commands if you
 need reliability or custom instructions.
 
-## Example skill
+## Installing skills
 
-Here's an example [Claude Code skill](https://code.claude.com/docs/en/skills)
-that uses the `consult_llm` MCP tool to create commands like "ask gemini" or
-"ask codex". See [skills/consult/SKILL.md](skills/consult/SKILL.md) for the full
-content.
+Install all skills globally with a single command:
 
-Save it as `~/.claude/skills/consult-llm/SKILL.md` and you can then use it by
-typing "ask gemini about X" or "ask codex about X" in Claude Code.
+```bash
+curl -fsSL https://raw.githubusercontent.com/raine/consult-llm-mcp/main/scripts/install-skills | bash
+```
+
+This installs skills for all detected platforms:
+
+- **Claude Code** → `~/.claude/skills/`
+- **OpenCode** → `~/.config/opencode/skills/`
+- **Codex** → `~/.codex/skills/`
+
+To uninstall:
+
+```bash
+curl -fsSL https://raw.githubusercontent.com/raine/consult-llm-mcp/main/scripts/install-skills | bash -s uninstall
+```
+
+## Skills
+
+### consult
+
+An example [Claude Code skill](https://code.claude.com/docs/en/skills) that uses
+the `consult_llm` MCP tool to create commands like "ask gemini" or "ask codex".
+See [skills/consult/SKILL.md](skills/consult/SKILL.md) for the full content.
 
-This one is not strictly necessary either, Claude (or other agent) can infer
-from the schema that "Ask gemini" should call this MCP, but it might be helpful
-in case you want to have more precise control over how the agent calls this MCP.
+Type "ask gemini about X" or "ask codex about X" in Claude Code. This is not
+strictly necessary since Claude can infer from the schema that "ask gemini"
+should call this MCP, but it gives more precise control over how the agent calls
+this MCP.
 
-## Example slash command
+## Slash command
 
 Here's an example
 [Claude Code slash command](https://code.claude.com/docs/en/slash-commands) that

package/dist/executors/codex-cli.js

@@ -1,5 +1,7 @@
 import { relative } from 'node:path';
 import { config } from '../config.js';
+import { getExternalDirectories } from '../external-dirs.js';
+import { getMainWorktreePath } from '../git-worktree.js';
 import { runCli } from './cli-runner.js';
 export function parseCodexJsonl(output) {
     let threadId;
@@ -45,21 +47,29 @@ export function createCodexExecutor() {
             const fullPrompt = threadId
                 ? message // On resume, include files but skip system prompt
                 : `${systemPrompt}\n\n${message}`;
-            const args = [];
+            const args = ['exec'];
             if (threadId) {
-                args.push('exec', 'resume', '--json', '--skip-git-repo-check');
-                if (config.codexReasoningEffort) {
-                    args.push('-c', `model_reasoning_effort="${config.codexReasoningEffort}"`);
-                }
-                args.push('-m', model, threadId, fullPrompt);
+                args.push('resume');
             }
-            else {
-                args.push('exec', '--json', '--skip-git-repo-check');
-                if (config.codexReasoningEffort) {
-                    args.push('-c', `model_reasoning_effort="${config.codexReasoningEffort}"`);
+            args.push('--json', '--skip-git-repo-check');
+            if (config.codexReasoningEffort) {
+                args.push('-c', `model_reasoning_effort="${config.codexReasoningEffort}"`);
+            }
+            // --add-dir is not supported by `codex exec resume`
+            if (!threadId) {
+                const extraDirs = [
+                    getMainWorktreePath(),
+                    ...getExternalDirectories(filePaths),
+                ].filter((d) => d !== null);
+                for (const dir of extraDirs) {
+                    args.push('--add-dir', dir);
                 }
-                args.push('-m', model, fullPrompt);
             }
+            args.push('-m', model);
+            if (threadId) {
+                args.push(threadId);
+            }
+            args.push(fullPrompt);
             const { stdout, stderr, code } = await runCli('codex', args);
             if (code === 0) {
                 const parsed = parseCodexJsonl(stdout);

package/dist/executors/gemini-cli.js

@@ -1,4 +1,6 @@
 import { relative } from 'node:path';
+import { getExternalDirectories } from '../external-dirs.js';
+import { getMainWorktreePath } from '../git-worktree.js';
 import { logCliDebug } from '../logger.js';
 import { runCli } from './cli-runner.js';
 export function parseGeminiJson(output) {
@@ -29,6 +31,13 @@ export function createGeminiExecutor() {
                 ? messageWithFiles
                 : `${systemPrompt}\n\n${messageWithFiles}`;
             const args = ['-m', model, '-o', 'json'];
+            const extraDirs = [
+                getMainWorktreePath(),
+                ...getExternalDirectories(filePaths),
+            ].filter((d) => d !== null);
+            for (const dir of extraDirs) {
+                args.push('--include-directories', dir);
+            }
             if (threadId) {
                 args.push('-r', threadId);
             }

package/dist/external-dirs.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Given a list of absolute file paths, return the unique parent directories
+ * of files that live outside `cwd`.  A directory is "external" when the
+ * relative path from `cwd` starts with `..`.
+ */
+export declare function getExternalDirectories(filePaths: string[] | undefined, cwd?: string): string[];

package/dist/external-dirs.js

@@ -0,0 +1,19 @@
+import { dirname, resolve, relative } from 'node:path';
+/**
+ * Given a list of absolute file paths, return the unique parent directories
+ * of files that live outside `cwd`.  A directory is "external" when the
+ * relative path from `cwd` starts with `..`.
+ */
+export function getExternalDirectories(filePaths, cwd = process.cwd()) {
+    if (!filePaths || filePaths.length === 0)
+        return [];
+    const dirs = new Set();
+    for (const filePath of filePaths) {
+        const abs = resolve(filePath);
+        const rel = relative(cwd, abs);
+        if (rel.startsWith('..')) {
+            dirs.add(dirname(abs));
+        }
+    }
+    return [...dirs];
+}

package/dist/external-dirs.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/external-dirs.test.js

@@ -0,0 +1,23 @@
+import { describe, it, expect } from 'vitest';
+import { getExternalDirectories } from './external-dirs.js';
+describe('getExternalDirectories', () => {
+    it('returns empty array for no files', () => {
+        expect(getExternalDirectories(undefined, '/project')).toEqual([]);
+        expect(getExternalDirectories([], '/project')).toEqual([]);
+    });
+    it('returns empty array when all files are within cwd', () => {
+        expect(getExternalDirectories(['/project/src/a.ts', '/project/lib/b.ts'], '/project')).toEqual([]);
+    });
+    it('returns parent directories of external files', () => {
+        expect(getExternalDirectories(['/other/docs/readme.md'], '/project')).toEqual(['/other/docs']);
+    });
+    it('deduplicates directories', () => {
+        expect(getExternalDirectories(['/other/docs/a.md', '/other/docs/b.md'], '/project')).toEqual(['/other/docs']);
+    });
+    it('returns multiple directories for files in different locations', () => {
+        const result = getExternalDirectories(['/other/a.ts', '/another/b.ts', '/project/c.ts'], '/project');
+        expect(result).toHaveLength(2);
+        expect(result).toContain('/other');
+        expect(result).toContain('/another');
+    });
+});

package/dist/git-worktree.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Detect if we're running inside a git worktree and return the main
+ * worktree path.  Returns `null` when we're already in the main worktree
+ * (or not in a git repo at all).  The result is cached for the process
+ * lifetime since the worktree layout doesn't change at runtime.
+ */
+export declare function getMainWorktreePath(): string | null;
+/** Reset the cache – useful for tests. */
+export declare function _resetCache(): void;

package/dist/git-worktree.js

@@ -0,0 +1,40 @@
+import { execSync } from 'node:child_process';
+import { resolve } from 'node:path';
+let cachedMainWorktreePath;
+/**
+ * Detect if we're running inside a git worktree and return the main
+ * worktree path.  Returns `null` when we're already in the main worktree
+ * (or not in a git repo at all).  The result is cached for the process
+ * lifetime since the worktree layout doesn't change at runtime.
+ */
+export function getMainWorktreePath() {
+    if (cachedMainWorktreePath !== undefined)
+        return cachedMainWorktreePath;
+    cachedMainWorktreePath = detectMainWorktreePath();
+    return cachedMainWorktreePath;
+}
+function detectMainWorktreePath() {
+    try {
+        // --git-dir returns the .git path for the current worktree
+        // --git-common-dir returns the shared .git path of the main worktree
+        // In the main worktree they are identical; in a linked worktree they differ.
+        // This works from any subdirectory.
+        const output = execSync('git rev-parse --git-dir --git-common-dir', {
+            encoding: 'utf8',
+            stdio: ['ignore', 'pipe', 'ignore'],
+        }).trim();
+        const [gitDir, commonDir] = output.split('\n');
+        if (!gitDir || !commonDir || gitDir === commonDir)
+            return null;
+        // The common dir is the .git directory of the main worktree.
+        // Its parent is the main worktree root.
+        return resolve(commonDir, '..');
+    }
+    catch {
+        return null;
+    }
+}
+/** Reset the cache – useful for tests. */
+export function _resetCache() {
+    cachedMainWorktreePath = undefined;
+}

package/dist/git-worktree.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/git-worktree.test.js

@@ -0,0 +1,35 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { getMainWorktreePath, _resetCache } from './git-worktree.js';
+const execSyncMock = vi.hoisted(() => vi.fn());
+vi.mock('child_process', () => ({
+    execSync: execSyncMock,
+}));
+beforeEach(() => {
+    _resetCache();
+    execSyncMock.mockReset();
+});
+afterEach(() => {
+    _resetCache();
+});
+describe('getMainWorktreePath', () => {
+    it('returns null when git-dir and git-common-dir are identical (main worktree)', () => {
+        execSyncMock.mockReturnValue('/repo/.git\n/repo/.git\n');
+        expect(getMainWorktreePath()).toBeNull();
+    });
+    it('returns main worktree path when in a linked worktree', () => {
+        execSyncMock.mockReturnValue('/repo/.git/worktrees/my-branch\n/repo/.git\n');
+        expect(getMainWorktreePath()).toBe('/repo');
+    });
+    it('caches the result across calls', () => {
+        execSyncMock.mockReturnValue('/repo/.git/worktrees/my-branch\n/repo/.git\n');
+        getMainWorktreePath();
+        getMainWorktreePath();
+        expect(execSyncMock).toHaveBeenCalledTimes(1);
+    });
+    it('returns null when git command fails', () => {
+        execSyncMock.mockImplementation(() => {
+            throw new Error('not a git repo');
+        });
+        expect(getMainWorktreePath()).toBeNull();
+    });
+});

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const GIT_HASH = "c310fe4";
+export declare const GIT_HASH = "e6c6469";

package/dist/version.js

@@ -1 +1 @@
-export const GIT_HASH = "c310fe4";
+export const GIT_HASH = "e6c6469";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "consult-llm-mcp",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "MCP server for consulting powerful AI models",
   "type": "module",
   "main": "dist/main.js",