@respan/cli 0.9.0 → 0.11.0

package/dist/commands/datasets/create-span.js

@@ -14,10 +14,12 @@ class DatasetsCreateSpan extends BaseCommand {
                 this.error('Invalid JSON for --body');
             }
             const spanData = parsed;
-            const data = await this.spin('Creating dataset span', () => client.datasets.createDatasetSpan({
+            const data = await this.spin('Creating dataset span', () => client.datasets.createDatasetLog({
+                Authorization: this.getAuthHeader(),
                 dataset_id: args['dataset-id'],
-                input: String(spanData.input || ''),
-                output: String(spanData.output || ''),
+                input: spanData.input,
+                output: spanData.output,
+                ...(spanData.expected_output !== undefined ? { expected_output: spanData.expected_output } : {}),
                 ...(spanData.metadata ? { metadata: spanData.metadata } : {}),
             }));
             this.log(JSON.stringify(data, null, 2));

package/dist/commands/datasets/create.js

@@ -6,10 +6,11 @@ class DatasetsCreate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const body = { name: flags.name };
-            if (flags.description)
-                body.description = flags.description;
-            const data = await this.spin('Creating dataset', () => client.datasets.createDataset(body));
+            const data = await this.spin('Creating dataset', () => client.datasets.createDataset({
+                Authorization: this.getAuthHeader(),
+                name: flags.name,
+                ...(flags.description ? { description: flags.description } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/datasets/get-span.js

@@ -6,7 +6,11 @@ class DatasetsGetSpan extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching dataset span', () => client.datasets.retrievespan({ dataset_id: args['dataset-id'], log_id: args['span-id'] }));
+            const data = await this.spin('Fetching dataset span', () => client.datasets.retrieveDatasetLog({
+                Authorization: this.getAuthHeader(),
+                dataset_id: args['dataset-id'],
+                unique_id: args['span-id'],
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/datasets/get.js

@@ -6,7 +6,7 @@ class DatasetsGet extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching dataset', () => client.datasets.retrieveDataset({ dataset_id: args.id }));
+            const data = await this.spin('Fetching dataset', () => client.datasets.retrieveDataset({ Authorization: this.getAuthHeader(), dataset_id: args.id }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/datasets/list.js

@@ -6,7 +6,11 @@ class DatasetsList extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching datasets', () => client.datasets.listDatasets());
+            const data = await this.spin('Fetching datasets', () => client.datasets.listDatasets({
+                Authorization: this.getAuthHeader(),
+                page: flags.page,
+                page_size: flags.limit,
+            }));
             this.outputResult(data, ['id', 'name', 'description', 'created_at']);
         }
         catch (error) {

package/dist/commands/datasets/spans.js

@@ -6,7 +6,7 @@ class DatasetsSpans extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching dataset spans', () => client.datasets.listspans({ dataset_id: args['dataset-id'] }));
+            const data = await this.spin('Fetching dataset spans', () => client.datasets.listDatasetLogs({ Authorization: this.getAuthHeader(), dataset_id: args['dataset-id'] }));
             this.outputResult(data, ['id', 'input', 'output', 'created_at']);
         }
         catch (error) {

package/dist/commands/datasets/update.js

@@ -6,14 +6,11 @@ class DatasetsUpdate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const updateBody = {};
-            if (flags.name)
-                updateBody.name = flags.name;
-            if (flags.description)
-                updateBody.description = flags.description;
             const data = await this.spin('Updating dataset', () => client.datasets.updateDataset({
+                Authorization: this.getAuthHeader(),
                 dataset_id: args.id,
-                body: updateBody,
+                ...(flags.name ? { name: flags.name } : {}),
+                ...(flags.description ? { description: flags.description } : {}),
             }));
             this.log(JSON.stringify(data, null, 2));
         }

package/dist/commands/{datasets/add-spans.d.ts → eval/index.d.ts}

@@ -1,11 +1,10 @@
 import { BaseCommand } from '../../lib/base-command.js';
-export default class DatasetsAddSpans extends BaseCommand {
+export default class EvalRun extends BaseCommand {
     static description: string;
     static args: {
-        'dataset-id': import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
+        file: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static flags: {
-        'span-ids': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
         'api-key': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'base-url': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         profile: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/dist/commands/eval/index.js

@@ -0,0 +1,26 @@
+import { Args } from '@oclif/core';
+import { resolve } from 'node:path';
+import { BaseCommand } from '../../lib/base-command.js';
+import { runEval } from '../../lib/eval/runner.js';
+class EvalRun extends BaseCommand {
+    async run() {
+        const { args, flags } = await this.parse(EvalRun);
+        this.globalFlags = flags;
+        try {
+            const client = this.getClient();
+            const filePath = resolve(args.file);
+            const result = await runEval(filePath, client, this.getAuthHeader(), this.getBaseUrl(), (msg) => this.log(msg));
+            this.log('');
+            this.log(JSON.stringify(result, null, 2));
+        }
+        catch (error) {
+            this.handleError(error);
+        }
+    }
+}
+EvalRun.description = 'Run an eval defined in a JSON file (creates prompt + dataset on the platform)';
+EvalRun.args = {
+    file: Args.string({ description: 'Path to eval JSON file', required: true }),
+};
+EvalRun.flags = { ...BaseCommand.baseFlags };
+export default EvalRun;

package/dist/commands/evaluators/create.js

@@ -6,20 +6,23 @@ class EvaluatorsCreate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const body = { name: flags.name };
-            if (flags.type)
-                body.type = flags.type;
-            if (flags.description)
-                body.description = flags.description;
+            let extra = {};
             if (flags.config) {
                 try {
-                    body.config = JSON.parse(flags.config);
+                    extra = JSON.parse(flags.config);
                 }
                 catch {
                     this.error('Invalid JSON for --config');
                 }
             }
-            const data = await this.spin('Creating evaluator', () => client.evaluators.createEvaluator(body));
+            const data = await this.spin('Creating evaluator', () => client.evaluators.createEvaluator({
+                Authorization: this.getAuthHeader(),
+                ...extra,
+                name: flags.name,
+                type: (flags.type ?? extra.type ?? 'llm'),
+                score_value_type: (extra.score_value_type ?? 'numerical'),
+                ...(flags.description ? { description: flags.description } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/evaluators/get.js

@@ -6,7 +6,7 @@ class EvaluatorsGet extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching evaluator', () => client.evaluators.retrieveEvaluator({ evaluator_id: args.id }));
+            const data = await this.spin('Fetching evaluator', () => client.evaluators.retrieveEvaluator({ Authorization: this.getAuthHeader(), evaluator_id: args.id }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/evaluators/list.js

@@ -7,7 +7,7 @@ class EvaluatorsList extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching evaluators', () => client.evaluators.listEvaluators());
+            const data = await this.spin('Fetching evaluators', () => client.evaluators.listEvaluators({ Authorization: this.getAuthHeader() }));
             this.outputResult(data, ['id', 'name', 'type', 'is_active', 'created_at']);
             const pagination = extractPagination(data, flags.page);
             this.log(formatPaginationInfo(pagination));

package/dist/commands/evaluators/run.js

@@ -6,22 +6,23 @@ class EvaluatorsRun extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const runBody = {};
-            if (flags['dataset-id'])
-                runBody.dataset_id = flags['dataset-id'];
-            if (flags['log-ids'])
-                runBody.log_ids = flags['log-ids'].split(',').map((s) => s.trim());
+            let extra = {};
             if (flags.params) {
                 try {
-                    Object.assign(runBody, JSON.parse(flags.params));
+                    extra = JSON.parse(flags.params);
                 }
                 catch {
                     this.error('Invalid JSON for --params');
                 }
             }
             const data = await this.spin('Running evaluator', () => client.evaluators.runEvaluator({
+                Authorization: this.getAuthHeader(),
+                ...extra,
                 evaluator_id: args.id,
-                body: runBody,
+                ...(flags['dataset-id'] ? { dataset_id: flags['dataset-id'] } : {}),
+                ...(flags['log-ids']
+                    ? { log_ids: flags['log-ids'].split(',').map((s) => s.trim()) }
+                    : {}),
             }));
             this.log(JSON.stringify(data, null, 2));
         }

package/dist/commands/evaluators/update.js

@@ -6,22 +6,21 @@ class EvaluatorsUpdate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const updateBody = {};
-            if (flags.name)
-                updateBody.name = flags.name;
-            if (flags.description)
-                updateBody.description = flags.description;
+            let extra = {};
             if (flags.config) {
                 try {
-                    Object.assign(updateBody, JSON.parse(flags.config));
+                    extra = JSON.parse(flags.config);
                 }
                 catch {
                     this.error('Invalid JSON for --config');
                 }
             }
             const data = await this.spin('Updating evaluator', () => client.evaluators.updateEvaluator({
+                Authorization: this.getAuthHeader(),
+                ...extra,
                 evaluator_id: args.id,
-                body: updateBody,
+                ...(flags.name ? { name: flags.name } : {}),
+                ...(flags.description ? { description: flags.description } : {}),
             }));
             this.log(JSON.stringify(data, null, 2));
         }

package/dist/commands/experiments/create.js

@@ -6,21 +6,22 @@ class ExperimentsCreate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const body = {
-                name: flags.name,
-                dataset_id: flags['dataset-id'],
-            };
-            if (flags.description)
-                body.description = flags.description;
+            let workflows = undefined;
             if (flags.workflows) {
                 try {
-                    body.workflows = JSON.parse(flags.workflows);
+                    workflows = JSON.parse(flags.workflows);
                 }
                 catch {
                     this.error('Invalid JSON for --workflows');
                 }
             }
-            const data = await this.spin('Creating experiment', () => client.experiments.createExperiment(body));
+            const data = await this.spin('Creating experiment', () => client.experiments.createExperiment({
+                Authorization: this.getAuthHeader(),
+                name: flags.name,
+                dataset_id: flags['dataset-id'],
+                ...(flags.description ? { description: flags.description } : {}),
+                ...(workflows ? { workflows: workflows } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/experiments/get.js

@@ -6,7 +6,7 @@ class ExperimentsGet extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching experiment', () => client.experiments.retrieveExperiment({ experiment_id: args.id }));
+            const data = await this.spin('Fetching experiment', () => client.experiments.retrieveExperiment({ Authorization: this.getAuthHeader(), experiment_id: args.id }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/experiments/list.js

@@ -6,7 +6,7 @@ class ExperimentsList extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching experiments', () => client.experiments.listExperiments());
+            const data = await this.spin('Fetching experiments', () => client.experiments.listExperiments({ Authorization: this.getAuthHeader() }));
             this.outputResult(data, ['id', 'name', 'dataset_id', 'status', 'created_at']);
         }
         catch (error) {

package/dist/commands/logs/create.js

@@ -6,20 +6,22 @@ class LogsCreate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const body = { input: flags.input };
-            if (flags.output)
-                body.output = flags.output;
-            if (flags.model)
-                body.model = flags.model;
+            let metadata;
             if (flags.metadata) {
                 try {
-                    body.metadata = JSON.parse(flags.metadata);
+                    metadata = JSON.parse(flags.metadata);
                 }
                 catch {
                     this.error('Invalid JSON for --metadata');
                 }
             }
-            const data = await this.spin('Creating span', () => client.logs.createSpan(body));
+            const data = await this.spin('Creating span', () => client.spans.createSpan({
+                Authorization: this.getAuthHeader(),
+                prompt: flags.input,
+                ...(flags.output ? { completion: flags.output } : {}),
+                ...(flags.model ? { model: flags.model } : {}),
+                ...(metadata ? { metadata } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/logs/get.js

@@ -6,7 +6,7 @@ class LogsGet extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching span', () => client.logs.retrieveSpan({ unique_id: args.id }));
+            const data = await this.spin('Fetching span', () => client.spans.retrieveSpan({ Authorization: this.getAuthHeader(), unique_id: args.id }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/logs/list.js

@@ -13,18 +13,19 @@ class LogsList extends BaseCommand {
                 filters = parseFilters(flags.filter);
             }
             const oneHourAgo = new Date(Date.now() - 60 * 60 * 1000).toISOString();
-            const data = await this.spin('Fetching logs', () => client.logs.listSpans({
+            const data = await this.spin('Fetching logs', () => client.spans.listSpans({
+                Authorization: this.getAuthHeader(),
                 start_time: flags['start-time'] || oneHourAgo,
                 end_time: flags['end-time'] || new Date().toISOString(),
                 sort_by: flags['sort-by'] || '-id',
-                operator: '',
+                operator: 'AND',
                 page_size: flags.limit,
                 page: flags.page,
                 is_test: flags['is-test'],
                 all_envs: flags['all-envs'],
                 fetch_filters: 'false',
                 include_fields: flags['include-fields'],
-                filters,
+                filters: filters,
             }));
             this.outputResult(data, ['id', 'model', 'prompt_tokens', 'completion_tokens', 'cost', 'latency', 'timestamp']);
             const pagination = extractPagination(data, flags.page);

package/dist/commands/logs/summary.js

@@ -11,12 +11,13 @@ class LogsSummary extends BaseCommand {
             if (flags.filter && flags.filter.length > 0) {
                 filters = parseFilters(flags.filter);
             }
-            const data = await this.spin('Fetching summary', () => client.logs.getSpansSummary({
+            const data = await this.spin('Fetching summary', () => client.spans.getSpansSummary({
+                Authorization: this.getAuthHeader(),
                 start_time: flags['start-time'],
                 end_time: flags['end-time'],
                 is_test: flags['is-test'],
                 all_envs: flags['all-envs'],
-                filters,
+                filters: filters,
             }));
             this.log(JSON.stringify(data, null, 2));
         }

package/dist/commands/prompts/create-version.js

@@ -14,17 +14,17 @@ class PromptsCreateVersion extends BaseCommand {
                 this.error('Invalid JSON for --messages');
             }
             // createVersion requires prompt_id, messages (string[]), and model (required)
-            const messagesStr = Array.isArray(messages) ? messages.map((m) => typeof m === 'string' ? m : JSON.stringify(m)) : [String(messages)];
-            const createBody = {
+            const messageList = Array.isArray(messages)
+                ? messages
+                : [{ role: 'user', content: String(messages) }];
+            const data = await this.spin('Creating prompt version', () => client.prompts.createPromptVersion({
+                Authorization: this.getAuthHeader(),
                 prompt_id: args['prompt-id'],
-                messages: messagesStr,
+                messages: messageList,
                 model: flags.model || 'gpt-4o',
-            };
-            if (flags.temperature)
-                createBody.temperature = parseFloat(flags.temperature);
-            if (flags['max-tokens'])
-                createBody.max_tokens = flags['max-tokens'];
-            const data = await this.spin('Creating prompt version', () => client.prompts.createVersion(createBody));
+                ...(flags.temperature ? { temperature: parseFloat(flags.temperature) } : {}),
+                ...(flags['max-tokens'] !== undefined ? { max_tokens: flags['max-tokens'] } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/prompts/create.js

@@ -6,10 +6,11 @@ class PromptsCreate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const body = { name: flags.name };
-            if (flags.description)
-                body.description = flags.description;
-            const data = await this.spin('Creating prompt', () => client.prompts.createPrompt(body));
+            const data = await this.spin('Creating prompt', () => client.prompts.createPrompt({
+                Authorization: this.getAuthHeader(),
+                name: flags.name,
+                ...(flags.description ? { description: flags.description } : {}),
+            }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/prompts/get.js

@@ -6,7 +6,7 @@ class PromptsGet extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching prompt', () => client.prompts.retrievePrompts({ prompt_id: args.id }));
+            const data = await this.spin('Fetching prompt', () => client.prompts.retrievePrompt({ Authorization: this.getAuthHeader(), prompt_id: args.id }));
             this.log(JSON.stringify(data, null, 2));
         }
         catch (error) {

package/dist/commands/prompts/list.js

@@ -6,7 +6,7 @@ class PromptsList extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching prompts', () => client.prompts.retrievePrompts());
+            const data = await this.spin('Fetching prompts', () => client.prompts.listPrompts({ Authorization: this.getAuthHeader(), page_size: flags.limit }));
             this.outputResult(data, ['id', 'name', 'description', 'is_active', 'current_version', 'updated_at']);
         }
         catch (error) {

package/dist/commands/prompts/update.js

@@ -6,14 +6,11 @@ class PromptsUpdate extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const updateBody = {};
-            if (flags.name)
-                updateBody.name = flags.name;
-            if (flags.description)
-                updateBody.description = flags.description;
             const data = await this.spin('Updating prompt', () => client.prompts.updatePrompt({
+                Authorization: this.getAuthHeader(),
                 prompt_id: args.id,
-                body: updateBody,
+                ...(flags.name ? { name: flags.name } : {}),
+                ...(flags.description ? { description: flags.description } : {}),
             }));
             this.log(JSON.stringify(data, null, 2));
         }

package/dist/commands/prompts/versions.js

@@ -6,7 +6,7 @@ class PromptsVersions extends BaseCommand {
         this.globalFlags = flags;
         try {
             const client = this.getClient();
-            const data = await this.spin('Fetching prompt versions', () => client.prompts.retrieveVersions({ prompt_id: args['prompt-id'] }));
+            const data = await this.spin('Fetching prompt versions', () => client.prompts.listPromptVersions({ Authorization: this.getAuthHeader(), prompt_id: args['prompt-id'] }));
             this.outputResult(data, ['id', 'version', 'is_active', 'created_at']);
         }
         catch (error) {

package/dist/commands/setup/doctor.d.ts

@@ -13,5 +13,4 @@ export default class SetupDoctor extends BaseCommand {
         verbose: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
-    private isBinaryInstalled;
 }

package/dist/commands/setup/doctor.js

@@ -5,12 +5,8 @@ import { execSync } from 'node:child_process';
 import { Flags } from '@oclif/core';
 import { BaseCommand } from '../../lib/base-command.js';
 import { findProjectRoot, expandHome, readTextFile } from '../../lib/integrate.js';
-const GREEN = '\x1b[32m';
-const RED = '\x1b[31m';
-const YELLOW = '\x1b[33m';
-const DIM = '\x1b[2m';
-const BOLD = '\x1b[1m';
-const RESET = '\x1b[0m';
+import { GREEN, RED, YELLOW, DIM, BOLD, RESET } from '../../lib/colors.js';
+import { isBinaryInstalled } from '../../lib/agents.js';
 class SetupDoctor extends BaseCommand {
     async run() {
         const { flags } = await this.parse(SetupDoctor);
@@ -43,7 +39,7 @@ class SetupDoctor extends BaseCommand {
         this.log('');
         // ── 2. Respan CLI ──────────────────────────────────────────────
         this.log(`  ${BOLD}Respan CLI${RESET}`);
-        const respanInstalled = this.isBinaryInstalled('respan');
+        const respanInstalled = isBinaryInstalled('respan');
         if (respanInstalled) {
             try {
                 const version = execSync('respan --version', { encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
@@ -66,44 +62,44 @@ class SetupDoctor extends BaseCommand {
                 name: 'Claude Code',
                 globalConfigs: ['~/.claude/settings.json'],
                 localConfigs: ['.claude/settings.local.json'],
-                globalSkills: ['~/.claude/skills/respan/SKILL.md', '~/.agents/skills/respan/SKILL.md'],
-                localSkills: ['.claude/skills/respan/SKILL.md', '.agents/skills/respan/SKILL.md'],
+                globalSkills: ['~/.claude/skills/respan/SKILL.md'],
+                localSkills: ['.claude/skills/respan/SKILL.md'],
             },
             'cursor': {
                 binary: 'cursor',
                 name: 'Cursor',
                 globalConfigs: ['~/.cursor/rules'],
                 localConfigs: ['.cursor/rules'],
-                globalSkills: ['~/.cursor/skills/respan/SKILL.md', '~/.agents/skills/respan/SKILL.md'],
-                localSkills: ['.cursor/skills/respan/SKILL.md', '.agents/skills/respan/SKILL.md'],
+                globalSkills: ['~/.agents/skills/respan/SKILL.md', '~/.cursor/skills/respan/SKILL.md'],
+                localSkills: ['.agents/skills/respan/SKILL.md', '.cursor/skills/respan/SKILL.md'],
             },
             'codex-cli': {
                 binary: 'codex',
                 name: 'Codex CLI',
                 globalConfigs: ['~/.codex/config.toml'],
                 localConfigs: ['.codex/respan.json'],
-                globalSkills: ['~/.codex/skills/respan/SKILL.md', '~/.agents/skills/respan/SKILL.md'],
-                localSkills: ['.codex/skills/respan/SKILL.md', '.agents/skills/respan/SKILL.md'],
+                globalSkills: ['~/.agents/skills/respan/SKILL.md', '~/.codex/skills/respan/SKILL.md'],
+                localSkills: ['.agents/skills/respan/SKILL.md', '.codex/skills/respan/SKILL.md'],
             },
             'gemini-cli': {
                 binary: 'gemini',
                 name: 'Gemini CLI',
                 globalConfigs: ['~/.gemini/settings.json'],
                 localConfigs: ['.gemini/settings.json'],
-                globalSkills: ['~/.gemini/skills/respan/SKILL.md', '~/.agents/skills/respan/SKILL.md'],
-                localSkills: ['.gemini/skills/respan/SKILL.md', '.agents/skills/respan/SKILL.md'],
+                globalSkills: ['~/.agents/skills/respan/SKILL.md', '~/.gemini/skills/respan/SKILL.md'],
+                localSkills: ['.agents/skills/respan/SKILL.md', '.gemini/skills/respan/SKILL.md'],
             },
             'opencode': {
                 binary: 'opencode',
                 name: 'OpenCode',
                 globalConfigs: ['~/.config/opencode'],
                 localConfigs: ['.opencode'],
-                globalSkills: ['~/.config/opencode/skills/respan/SKILL.md', '~/.agents/skills/respan/SKILL.md'],
-                localSkills: ['.opencode/skills/respan/SKILL.md', '.agents/skills/respan/SKILL.md'],
+                globalSkills: ['~/.agents/skills/respan/SKILL.md', '~/.config/opencode/skills/respan/SKILL.md'],
+                localSkills: ['.agents/skills/respan/SKILL.md', '.opencode/skills/respan/SKILL.md'],
             },
         };
         for (const [id, tool] of Object.entries(tools)) {
-            const binaryFound = this.isBinaryInstalled(tool.binary);
+            const binaryFound = isBinaryInstalled(tool.binary);
             this.log(`    ${BOLD}${tool.name}${RESET} ${DIM}(${tool.binary})${RESET}`);
             // Binary
             if (binaryFound) {
@@ -129,24 +125,22 @@ class SetupDoctor extends BaseCommand {
                     }
                 }
             }
-            // Skills
+            // Skills \u2014 each tool only lists dirs it actually reads (the shared
+            // ~/.agents, or ~/.claude for Claude Code) plus its own dir as a
+            // fallback. Report the first match.
             let hasSkill = false;
             if (checkGlobal) {
-                for (const skill of tool.globalSkills) {
-                    const resolved = expandHome(skill);
-                    if (fs.existsSync(resolved)) {
-                        this.log(`      ${GREEN}\u2713${RESET} Global skill: ${DIM}${skill}${RESET}`);
-                        hasSkill = true;
-                    }
+                const found = tool.globalSkills.find((skill) => fs.existsSync(expandHome(skill)));
+                if (found) {
+                    this.log(`      ${GREEN}\u2713${RESET} Global skill: ${DIM}${found}${RESET}`);
+                    hasSkill = true;
                 }
             }
             if (checkLocal) {
-                for (const skill of tool.localSkills) {
-                    const resolved = path.join(projectRoot, skill);
-                    if (fs.existsSync(resolved)) {
-                        this.log(`      ${GREEN}\u2713${RESET} Local skill: ${DIM}${skill}${RESET}`);
-                        hasSkill = true;
-                    }
+                const found = tool.localSkills.find((skill) => fs.existsSync(path.join(projectRoot, skill)));
+                if (found) {
+                    this.log(`      ${GREEN}\u2713${RESET} Local skill: ${DIM}${found}${RESET}`);
+                    hasSkill = true;
                 }
             }
             if (binaryFound && !hasSkill) {
@@ -193,15 +187,6 @@ class SetupDoctor extends BaseCommand {
         }
         this.log('');
     }
-    isBinaryInstalled(binary) {
-        try {
-            execSync(`command -v ${binary}`, { stdio: 'pipe' });
-            return true;
-        }
-        catch {
-            return false;
-        }
-    }
 }
 SetupDoctor.description = 'Diagnose coding-agent setup for Respan';
 SetupDoctor.examples = [