feat: add cli agent choice by mooreds · Pull Request #23 · hookdeck/webhook-skills

mooreds · 2026-02-04T17:08:57Z

This PR adds the option for using a different CLI than claude. The default remains claude, but now you can pass in another cli tool if that's what you prefer.

Needed abstraction and support for the copilot CLI was added.

It also updates the documentation with information about using the new option.

also added support for copilot as that tool

mooreds · 2026-02-04T17:11:48Z

Oops, I don't know how to edit the PR and add the feat: prefix. Sorry!

leggetter · 2026-02-04T19:45:11Z

@claude please review

Copilot

Pull request overview

This PR adds support for using different CLI tools (not just Claude) to generate and review webhook skills. The implementation introduces a pluggable adapter system where each CLI tool can have its own configuration and command structure. The default remains claude for backward compatibility, but users can now specify alternative tools like copilot via the --cli flag.

Changes:

Added a CLI adapter system with interfaces and factory pattern for supporting multiple AI CLI tools
Renamed claude.ts to cli.ts and refactored it to be CLI-agnostic
Added adapters for Claude CLI and Copilot CLI
Threaded cliTool option through all relevant functions and types
Updated documentation with examples and instructions for using different CLI tools and adding new adapters

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
scripts/skill-generator/lib/types.ts	Added `cliTool` field to `BaseOptions` interface
scripts/skill-generator/lib/reviewer.ts	Updated imports and threaded `cliTool` option through review functions
scripts/skill-generator/lib/generator.ts	Updated imports and threaded `cliTool` option through generation functions
scripts/skill-generator/lib/cli.ts	Refactored from `claude.ts` to support multiple CLI tools via adapters
scripts/skill-generator/lib/cli-adapters/types.ts	Defined interfaces for CLI adapter system
scripts/skill-generator/lib/cli-adapters/index.ts	Implemented adapter registry and factory function
scripts/skill-generator/lib/cli-adapters/copilot.ts	Added Copilot CLI adapter implementation
scripts/skill-generator/lib/cli-adapters/claude.ts	Added Claude CLI adapter implementation
scripts/skill-generator/index.ts	Added CLI tool options to commands and updated imports
CONTRIBUTING.md	Updated prerequisites, added CLI tool usage examples, and documented how to add new CLI adapters

Comments suppressed due to low confidence (1)

scripts/skill-generator/lib/cli.ts:10

Unused import DEFAULT_MODEL.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-04T21:08:06Z

CONTRIBUTING.md

- **[Claude CLI](https://docs.anthropic.com/en/docs/claude-cli)** — Install and authenticate with `claude login`
+- **AI CLI Tool** — One of the following:
+  - [Claude CLI](https://docs.anthropic.com/en/docs/claude-cli) — Install and authenticate with `claude login` (default)
+  - [Copilot CLI](https://githubnext.com/projects/copilot-cli) — GitHub Copilot command-line tool


The URL for the Copilot CLI points to githubnext.com which was GitHub's experimental playground. Please verify this is the correct and current URL for the GitHub Copilot CLI tool. The CLI may have moved to a different location or the project may have been deprecated or renamed. Consider checking the official GitHub Copilot documentation for the correct installation instructions.

Suggested change

- [Copilot CLI](https://githubnext.com/projects/copilot-cli) — GitHub Copilot command-line tool

- [Copilot CLI](https://docs.github.com/en/copilot/github-copilot-in-the-cli/github-copilot-in-the-cli) — GitHub Copilot command-line tool

Copilot · 2026-02-04T21:08:07Z

scripts/skill-generator/lib/cli-adapters/claude.ts

+
+import type { CliAdapter, CliAdapterOptions, CliCommandConfig } from './types';
+
+const DEFAULT_MODEL = 'claude-opus-4-20250514';


DEFAULT_MODEL needs to be exported from this file since it's imported by cli-adapters/index.ts. Change const DEFAULT_MODEL to export const DEFAULT_MODEL to fix the import error.

Suggested change

const DEFAULT_MODEL = 'claude-opus-4-20250514';

export const DEFAULT_MODEL = 'claude-opus-4-20250514';

not applicable any more.

CONTRIBUTING.md

scripts/skill-generator/lib/cli-adapters/copilot.ts

Copilot · 2026-02-04T21:08:07Z

scripts/skill-generator/index.ts

  .option('--config <file>', 'Load provider configs from YAML file')
-  .option('--model <model>', 'Claude model to use', DEFAULT_MODEL)
+  .option('--cli <tool>', `CLI tool to use (${AVAILABLE_CLI_TOOLS.join(', ')})`, DEFAULT_CLI_TOOL)
+  .option('--model <model>', 'Model to use', DEFAULT_MODEL)


The default model is hardcoded to Claude's default ('claude-opus-4-20250514') regardless of which CLI tool is selected. When a user specifies --cli copilot without --model, they will get Claude's default model instead of Copilot's default model. Consider removing the default value from the --model option and passing undefined to the adapter when no model is specified, allowing each adapter to use its own appropriate default model.

Copilot · 2026-02-04T21:08:08Z

scripts/skill-generator/index.ts

  .option('--config <file>', 'Load provider configs from YAML file')
-  .option('--model <model>', 'Claude model to use', DEFAULT_MODEL)
+  .option('--cli <tool>', `CLI tool to use (${AVAILABLE_CLI_TOOLS.join(', ')})`, DEFAULT_CLI_TOOL)
+  .option('--model <model>', 'Model to use', DEFAULT_MODEL)


The default model is hardcoded to Claude's default ('claude-opus-4-20250514') regardless of which CLI tool is selected. When a user specifies --cli copilot without --model, they will get Claude's default model instead of Copilot's default model. Consider removing the default value from the --model option and passing undefined to the adapter when no model is specified, allowing each adapter to use its own appropriate default model.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-05T03:41:56Z

scripts/skill-generator/lib/cli.ts

+// Re-export DEFAULT_MODEL from cli-adapters for backwards compatibility
+export { DEFAULT_MODEL } from './cli-adapters';


This re-export creates a circular dependency concern since DEFAULT_MODEL is originally defined in cli-adapters/claude.ts but exported through cli-adapters/index.ts, then re-exported here. Consider removing this re-export and updating imports to use the canonical source from './cli-adapters' directly.

Copilot · 2026-02-05T03:41:56Z

scripts/skill-generator/lib/cli-adapters/index.ts

+import { claudeAdapter, DEFAULT_MODEL } from './claude';
+import { copilotAdapter } from './copilot';
+
+// Re-export types and default model
+export type { CliAdapter, CliAdapterOptions, CliCommandConfig } from './types';
+export { DEFAULT_MODEL };
+


DEFAULT_MODEL is being exported from the index but is specific to the Claude adapter. This creates an implicit assumption that Claude's default model is the global default. Consider either defining DEFAULT_MODEL at the index level or having each adapter export its own default and letting the consumer choose which to use based on the selected CLI tool.

Suggested change

import { claudeAdapter, DEFAULT_MODEL } from './claude';

import { copilotAdapter } from './copilot';

// Re-export types and default model

export type { CliAdapter, CliAdapterOptions, CliCommandConfig } from './types';

export { DEFAULT_MODEL };

import { claudeAdapter } from './claude';

import { copilotAdapter } from './copilot';

// Re-export types

export type { CliAdapter, CliAdapterOptions, CliCommandConfig } from './types';

Copilot · 2026-02-05T03:41:56Z

scripts/skill-generator/index.ts

  .option('--config <file>', 'Load provider configs from YAML file')
-  .option('--model <model>', 'Claude model to use', DEFAULT_MODEL)
+  .option('--cli <tool>', `CLI tool to use (${AVAILABLE_CLI_TOOLS.join(', ')})`, DEFAULT_CLI_TOOL)
+  .option('--model <model>', 'Model to use', undefined)


The help text 'Model to use' is vague and doesn't indicate what happens when undefined (uses CLI tool's default). Consider changing to 'Model to use (defaults to CLI tool's default model)' for clarity.

Copilot · 2026-02-05T03:41:56Z

scripts/skill-generator/index.ts

  .option('--config <file>', 'Load provider configs from YAML file')
-  .option('--model <model>', 'Claude model to use', DEFAULT_MODEL)
+  .option('--cli <tool>', `CLI tool to use (${AVAILABLE_CLI_TOOLS.join(', ')})`, DEFAULT_CLI_TOOL)
+  .option('--model <model>', 'Model to use', undefined)


The help text 'Model to use' is vague and doesn't indicate what happens when undefined (uses CLI tool's default). Consider changing to 'Model to use (defaults to CLI tool's default model)' for clarity.

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-02-05T03:51:50Z

scripts/skill-generator/lib/cli.ts

+// Re-export DEFAULT_MODEL from cli-adapters for backwards compatibility
+export { DEFAULT_MODEL } from './cli-adapters';



The DEFAULT_MODEL is being re-exported for backwards compatibility after being removed from this file, but this creates a duplicate export. Lines 115-116 re-export DEFAULT_MODEL from cli-adapters, while the original export on line 117 in the diff context was supposed to be removed. Remove the duplicate export statement.

Suggested change

// Re-export DEFAULT_MODEL from cli-adapters for backwards compatibility

export { DEFAULT_MODEL } from './cli-adapters';

Copilot · 2026-02-05T03:51:50Z

scripts/skill-generator/index.ts

  .option('--config <file>', 'Load provider configs from YAML file')
-  .option('--model <model>', 'Claude model to use', DEFAULT_MODEL)
+  .option('--cli <tool>', `CLI tool to use (${AVAILABLE_CLI_TOOLS.join(', ')})`, DEFAULT_CLI_TOOL)
+  .option('--model <model>', "Model to use (defaults to CLI tool's default model)", undefined)


The help text states 'defaults to CLI tool's default model', but doesn't indicate what those defaults are. Consider mentioning that Claude defaults to 'claude-opus-4-20250514' and Copilot to 'gpt-4o', or link to documentation where users can find this information.

I think we can assume folks know how to find the model for their given CLI.

Copilot

Pull request overview

Copilot reviewed 10 out of 10 changed files in this pull request and generated no new comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

mooreds · 2026-02-05T04:00:49Z

@leggetter I think this is ready for human eyes or whatever the next step is :)

leggetter · 2026-02-05T13:58:26Z

Hi @mooreds! 👋

Thank you for this excellent foundation for the CLI adapter system! We've tested it extensively and found a few fixes needed for Copilot CLI compatibility:

--allow-all-tools → --allow-all: The former blocks URL fetches in non-interactive mode, which caused failures when the agent tried to fetch documentation
Default model: Changed from gpt-4o to claude-sonnet-4 as gpt-5 has issues with web fetching
CLI validation: Added Commander's choices() for better error messages

We've created PR #29 which builds on your work with these fixes. It includes Co-authored-by attribution in the commits.

We successfully generated two skills using both adapters:

Claude CLI → Postmark webhooks (feat: add postmark-webhooks skill #24)
Copilot CLI → WooCommerce webhooks (feat: add woocommerce-webhooks skill #25)

Thanks again for the great work on the adapter architecture! 🙏

mooreds · 2026-02-05T15:10:10Z

Excellent, glad it helped!

mooreds added 2 commits February 4, 2026 10:04

feat: added ability to specify a different cli tool

e61aa19

also added support for copilot as that tool

Merge branch 'main' of github.com:hookdeck/webhook-skills

182d59f

use default copilot model that actually exists

ef5ac75

leggetter changed the title ~~Add cli choice~~ feat: add cli agent choice Feb 4, 2026

leggetter requested a review from Copilot February 4, 2026 21:02

Copilot started reviewing on behalf of leggetter February 4, 2026 21:02 View session

Copilot AI reviewed Feb 4, 2026

View reviewed changes

mooreds and others added 4 commits February 4, 2026 20:37

Apply suggestions from code review

8db9c38

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

updated link to copilot doc

8d96540

updated doc for better default model name handling

8ce6f54

don't have a default model, just a default adapter

0b9b43e

mooreds requested a review from Copilot February 5, 2026 03:41

Copilot AI reviewed Feb 5, 2026

View reviewed changes

mooreds added 2 commits February 4, 2026 20:48

cleaning up default model value handling

ea15a74

fixes from my mistakes

533912e

mooreds requested a review from Copilot February 5, 2026 03:51

Copilot AI reviewed Feb 5, 2026

View reviewed changes

cleanup of unused export

e8f7fc5

mooreds requested a review from Copilot February 5, 2026 03:59

Copilot AI reviewed Feb 5, 2026

View reviewed changes

leggetter mentioned this pull request Feb 5, 2026

feat: add pluggable CLI adapter system (Claude + Copilot support) #29

Merged

4 tasks

leggetter merged commit e8f7fc5 into hookdeck:main Feb 5, 2026
22 checks passed

	- [Copilot CLI](https://githubnext.com/projects/copilot-cli) — GitHub Copilot command-line tool
	- [Copilot CLI](https://docs.github.com/en/copilot/github-copilot-in-the-cli/github-copilot-in-the-cli) — GitHub Copilot command-line tool


		import type { CliAdapter, CliAdapterOptions, CliCommandConfig } from './types';

		const DEFAULT_MODEL = 'claude-opus-4-20250514';

	const DEFAULT_MODEL = 'claude-opus-4-20250514';
	export const DEFAULT_MODEL = 'claude-opus-4-20250514';

		// Re-export DEFAULT_MODEL from cli-adapters for backwards compatibility
		export { DEFAULT_MODEL } from './cli-adapters';

Conversation

mooreds commented Feb 4, 2026

Uh oh!

mooreds commented Feb 4, 2026

Uh oh!

leggetter commented Feb 4, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

mooreds Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 4, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

mooreds Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

mooreds commented Feb 5, 2026

Uh oh!

leggetter commented Feb 5, 2026

Uh oh!

Uh oh!

mooreds commented Feb 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants