Merge pull request #12 from kenryu42/refactor-commands

Refactor commands

Author: kenryu42

.gitignore

@@ -1,7 +1,6 @@
 # --- Project Specific ---
 .cursor/
 .claude/
-.opencode/
 log*
 plan-*.md
 *-plan-*.md

.opencode/command/set-custom-rules.md

@@ -0,0 +1,71 @@
+---
+description: Set custom rules for Safety Net
+---
+
+You are helping the user configure custom blocking rules for claude-code-safety-net.
+
+## Context
+
+### Schema Documentation
+
+!`npx -y cc-safety-net --custom-rules-doc`
+
+## Your Task
+
+Follow this flow exactly:
+
+### Step 1: Ask for Scope
+
+Ask: **Which scope would you like to configure?**
+- **User** (`~/.cc-safety-net/config.json`) - applies to all your projects
+- **Project** (`.safety-net.json`) - applies only to this project
+
+### Step 2: Show Examples and Ask for Rules
+
+Show examples in natural language:
+- "Block `git add -A` and `git add .` to prevent blanket staging"
+- "Block `npm install -g` to prevent global package installs"
+- "Block `docker system prune` to prevent accidental cleanup"
+
+Ask the user to describe rules in natural language. They can list multiple.
+
+### Step 3: Generate JSON Config
+
+Parse user input and generate valid schema JSON using the schema documentation above.
+
+### Step 4: Show Config and Confirm
+
+Display the generated JSON and ask:
+- "Does this look correct?"
+- "Would you like to modify anything?"
+
+### Step 5: Check and Handle Existing Config
+
+1. Check existing User Config with `cat ~/.cc-safety-net/config.json 2>/dev/null || echo "No user config found"`
+2. Check existing Project Config with `cat .safety-net.json 2>/dev/null || echo "No project config found"`
+
+If the chosen scope already has a config:
+Show the existing config to the user.
+Ask: **Merge** (add new rules, duplicates use new version) or **Replace**?
+
+### Step 6: Write and Validate
+
+Write the config to the chosen scope, then validate with `npx -y cc-safety-net --verify-config`.
+
+If validation errors:
+- Show specific errors
+- Offer to fix with your best suggestion
+- Confirm before proceeding
+
+### Step 7: Confirm Success
+
+Tell the user:
+1. Config saved to [path]
+2. **Changes take effect immediately** - no restart needed
+3. Summary of rules added
+
+## Important Notes
+
+- Custom rules can only ADD restrictions, not bypass built-in protections
+- Rule names must be unique (case-insensitive)
+- Invalid config → entire config ignored, only built-in rules apply

.opencode/command/verify-custom-rules.md

@@ -0,0 +1,16 @@
+---
+description: Verify custom rules for Safety Net
+---
+
+You are helping the user verify the custom rules config file.
+
+## Your Task
+
+Run `npx -y cc-safety-net --verify-config` to check current validation status
+
+If the config has validation errors:
+1. Show the specific validation errors
+2. Run `npx -y cc-safety-net --custom-rules-doc` to read the schema documentation
+3. Offer to fix them with your best suggestion
+4. Ask for confirmation before proceeding
+5. After fixing, run `npx -y cc-safety-net --verify-config` to verify again

AGENTS.md

@@ -23,6 +23,10 @@ A Claude Code / OpenCode plugin that blocks destructive git and filesystem comma
 
 Runs on commit (in order): knip → lint-staged (biome check --write)
 
+## Commit Conventions
+
+When committing changes to files in `commands/`, `hooks/`, or `.opencode/`, use only `fix` or `feat` commit types. These directories contain user-facing skill definitions and hook configurations that represent features or fixes to the plugin's capabilities.
+
 ## Code Style (TypeScript)
 
 ### Formatting

CLAUDE.md

@@ -60,6 +60,10 @@ The hook receives JSON input on stdin containing `tool_name` and `tool_input`. F
 - Use `type | null` syntax (not `undefined` where possible)
 - Use kebab-case for file names (`rules-git.ts`, not `rulesGit.ts`)
 
+## Commit Conventions
+
+When committing changes to files in `commands/`, `hooks/`, or `.opencode/`, use only `fix` or `feat` commit types. These directories contain user-facing skill definitions and hook configurations that represent features or fixes to the plugin's capabilities.
+
 ## Environment Variables
 
 - `SAFETY_NET_STRICT=1`: Strict mode (fail-closed on unparseable hook input/commands)

CONTRIBUTING.md

@@ -53,9 +53,9 @@ bun run check
 
 ## Claude Code
 
-1. **Build and link the project**:
+1. **Build the project**:
    ```bash
-   bun run build && bun link
+   bun run build
    ```
 
 2. **Disable the safety-net plugin** in Claude Code (if installed) and exit Claude Code completely.
@@ -74,19 +74,14 @@ bun run check
    git checkout -b test-branch
    ```
 
-5. **Unlink the project** when you're done:
-   ```bash
-   bun unlink
-   ```
-
 > [!NOTE]
 > See the [official documentation](https://docs.anthropic.com/en/docs/claude-code/plugins#test-your-plugins-locally) for more details on testing plugins locally.
 
 ## OpenCode
 
-1. **Build and link the project**:
+1. **Build the project**:
    ```bash
-   bun run build && bun link
+   bun run build
    ```
 
 2. **Update your OpenCode config** (`~/.config/opencode/opencode.json` or `opencode.jsonc`):
@@ -109,6 +104,7 @@ bun run check
 
 > [!NOTE]
 > Remove `"cc-safety-net"` from the plugin array if it exists, to avoid conflicts with the npm version.
+> Or comment out the line if you're using `opencode.jsonc`.
 
 3. **Restart OpenCode** to load the changes.
 
@@ -123,13 +119,6 @@ bun run check
    git checkout -b test-branch
    ```
 
-6. **Manually copy or add commands** to `~/.config/opencode/command` or `.opencode/command` if you modified or added any new commands. 
-
-7. **Unlink the project** when you're done:
-   ```bash
-   bun unlink
-   ```
-
 > [!NOTE]
 > See the [official documentation](https://opencode.ai/docs/plugins/) for more details on OpenCode plugins.
 

README.md

@@ -57,7 +57,7 @@ This hook provides **semantic command analysis**: it parses arguments, understan
 
 ## Prerequisites
 
-- **Node.js**: Version 18 or higher is required to run this plugin in *Claude Code*
+- **Node.js**: Version 18 or higher is required to run this plugin
 
 ## Quick Start
 
@@ -87,8 +87,8 @@ Paste this into any LLM agent (Claude Code, OpenCode, Cursor, etc.):
 Install the cc-safety-net plugin in `~/.config/opencode/opencode.json` (or `.jsonc`) according to the schema at: https://opencode.ai/config.json
 
 Then copy the following files to `~/.config/opencode/command/`:
-- https://raw.githubusercontent.com/kenryu42/claude-code-safety-net/main/commands/set-custom-rules.md
-- https://raw.githubusercontent.com/kenryu42/claude-code-safety-net/main/commands/verify-custom-rules.md
+- https://raw.githubusercontent.com/kenryu42/claude-code-safety-net/main/.opencode/command/set-custom-rules.md
+- https://raw.githubusercontent.com/kenryu42/claude-code-safety-net/main/.opencode/command/verify-custom-rules.md
 ```
 
 **Option B: Manual setup**

commands/set-custom-rules.md

@@ -1,74 +1,124 @@
 ---
-description: Set custom rules for the project
-allowed-tools: Bash, Read, Write, Glob, AskUserQuestion
+description: Set custom rules for Safety Net
+allowed-tools: Bash, Read, Write, AskUserQuestion
 ---
 
-# Set Custom Rules for Safety Net
-
 You are helping the user configure custom blocking rules for claude-code-safety-net.
-ALWAYS use AskUserQuestion tool when you need to ask the user questions.
+
+## Context
+
+### Schema Documentation
+
+!`npx -y cc-safety-net --custom-rules-doc`
 
 ## Your Task
 
 Follow this flow exactly:
 
-### Step 1: Run `npx -y cc-safety-net --custom-rules-doc` to read the full schema details, field constraints, and usage examples
+### Step 1: Ask for Scope
+
+Use AskUserQuestion to let user select scope:
+
+```json
+{
+  "questions": [
+    {
+      "question": "Which scope would you like to configure?",
+      "header": "Configure",
+      "multiSelect": false,
+      "options": [
+        {
+          "label": "User",
+          "description": "(`~/.cc-safety-net/config.json`) - applies to all your projects"
+        },
+        {
+          "label": "Project",
+          "description": "(`.safety-net.json`) - applies only to this project"
+        }
+      ]
+    }
+  ]
+}
+```
 
-### Step 2: Show Examples and Ask for Scope
+### Step 2: Show Examples and Ask for Rules
 
 Show examples in natural language:
 - "Block `git add -A` and `git add .` to prevent blanket staging"
 - "Block `npm install -g` to prevent global package installs"
 - "Block `docker system prune` to prevent accidental cleanup"
 
-Ask: **Which scope would you like to configure?**
-- **User** (`~/.cc-safety-net/config.json`) - applies to all your projects
-- **Project** (`.safety-net.json`) - applies only to this project
-
-### Step 3: Ask for Rules
-
 Ask the user to describe rules in natural language. They can list multiple.
 
-### Step 4: Generate JSON Config
-
-Parse user input and generate valid schema JSON.
-
-### Step 5: Show Config and Confirm
-
-Display the generated JSON and ask:
-- "Does this look correct?"
-- "Would you like to modify anything?"
-
-### Step 6: Check for Existing Config
-
-Check if config exists at target location:
-```bash
-cat ~/.cc-safety-net/config.json 2>/dev/null  # user scope
-cat .safety-net.json 2>/dev/null               # project scope
+### Step 3: Generate and Show JSON Config
+
+Parse user input and generate valid schema JSON using the schema documentation above.
+
+Then show the generated config JSON to the user.
+
+### Step 4: Ask for Confirmation
+
+Use AskUserQuestion to let user choose:
+
+```json
+{
+  "questions": [
+    {
+      "question": "Does this look correct?",
+      "header": "Confirmation",
+      "multiSelect": false,
+      "options": [
+        {
+          "label": "Yes",
+        },
+        {
+          "label": "No",
+        }
+      ]
+    }
+  ]
+}
 ```
 
-If exists:
-1. Show existing config
-2. Ask: **Merge** (add new rules, duplicates use new version) or **Replace**?
-
-### Step 7: Validate and Write
-
-For user scope, ensure directory exists:
-```bash
-mkdir -p ~/.cc-safety-net
+### Step 5: Check and Handle Existing Config
+
+1. Check existing User Config with `cat ~/.cc-safety-net/config.json 2>/dev/null || echo "No user config found"`
+2. Check existing Project Config with `cat .safety-net.json 2>/dev/null || echo "No project config found"`
+
+If the chosen scope already has a config:
+
+Show the existing config to the user.
+Use AskUserQuestion tool to let user choose:
+```json
+{
+"questions": [
+    {
+    "question": "The chosen scope already has a config. What would you like to do?",
+    "header": "Configure",
+    "multiSelect": false,
+    "options": [
+        {
+        "label": "Merge",
+        },
+        {
+        "label": "Replace",
+        }
+    ]
+    }
+]
+}
 ```
 
-Write config, then validate:
-```bash
-npx -y cc-safety-net --verify-config
-```
+### Step 6: Write and Validate
+
+Write the config to the chosen scope, then validate with `npx -y cc-safety-net --verify-config`.
 
 If validation errors:
 - Show specific errors
 - Offer to fix with your best suggestion
 - Confirm before proceeding
 
-### Step 8: Confirm Success
+### Step 7: Confirm Success
 
 Tell the user:
 1. Config saved to [path]

commands/verify-custom-rules.md

@@ -1,24 +1,16 @@
 ---
-description: Verify custom rules for the project
-allowed-tools: Bash, AskUserQuestion
+description: Verify custom rules for Safety Net
+allowed-tools: Bash, Read, Write, AskUserQuestion
 ---
 
-# Verify Custom Rules for Safety Net
-
 You are helping the user verify the custom rules config file.
-ALWAYS use AskUserQuestion tool when you need to ask the user questions.
 
 ## Your Task
 
-Follow this flow exactly:
-
-### Step 1: Run `npx -y cc-safety-net --custom-rules-doc` to read the full schema details, field constraints, and usage examples
-
-### Step 2: Run `npx -y cc-safety-net --verify-config` to verify the config file
-
-If the config has validation errors, inform the user:
-- Show the specific validation errors
-- Offer to fix them with your best suggestion
-- Ask for confirmation before proceeding
+Run `npx -y cc-safety-net --verify-config` to check current validation status
 
-After fixing the config, run `npx -y cc-safety-net --verify-config` to verify it again.
+If the config has validation errors:
+1. Show the specific validation errors
+2. Run `npx -y cc-safety-net --custom-rules-doc` to read the schema documentation
+3. Use AskUserQuestion tool to offer fixes with your best suggestions
+4. After fixing, run `npx -y cc-safety-net --verify-config` to verify again