@zhijiewang/openharness 2.8.0 → 2.10.0

package/data/registry.json

@@ -0,0 +1,262 @@
+{
+  "skills": [
+    {
+      "name": "code-review",
+      "description": "Systematic code review for bugs, security, and style",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/code-review.md",
+      "tags": ["review", "quality", "security"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "debug",
+      "description": "Systematic debugging approach",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/debug.md",
+      "tags": ["debug", "fix", "troubleshoot"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "tdd",
+      "description": "Test-driven development workflow",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/tdd.md",
+      "tags": ["test", "tdd", "testing"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "commit",
+      "description": "Create well-formed git commits",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/commit.md",
+      "tags": ["git", "commit", "version-control"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "diagnose",
+      "description": "Diagnose why an agent run failed, regressed, or produced unexpected output",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/diagnose.md",
+      "tags": ["agent", "debug", "diagnose", "ops"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "plan",
+      "description": "Design an implementation plan before coding",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/plan.md",
+      "tags": ["plan", "design", "architecture"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+    {
+      "name": "simplify",
+      "description": "Refactor code to be simpler and more maintainable without changing behavior",
+      "author": "zhijiewong",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/zhijiewong/openharness/main/data/skills/simplify.md",
+      "tags": ["refactor", "simplify", "quality"],
+      "license": "MIT",
+      "attribution": "© 2025 OpenHarness contributors",
+      "upstream": "https://github.com/zhijiewong/openharness"
+    },
+
+    {
+      "name": "superpowers-brainstorming",
+      "description": "Explores user intent, requirements and design before implementation. Use before any creative work.",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/brainstorming/SKILL.md",
+      "tags": ["plan", "brainstorm", "design", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-systematic-debugging",
+      "description": "Structured debugging approach before proposing fixes",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/systematic-debugging/SKILL.md",
+      "tags": ["debug", "fix", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-test-driven-development",
+      "description": "Strict TDD workflow — test first, minimal implementation, refactor",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/test-driven-development/SKILL.md",
+      "tags": ["test", "tdd", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-writing-plans",
+      "description": "Author detailed implementation plans for multi-step tasks before touching code",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/writing-plans/SKILL.md",
+      "tags": ["plan", "write", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-executing-plans",
+      "description": "Execute a written implementation plan with review checkpoints",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/executing-plans/SKILL.md",
+      "tags": ["execute", "plan", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-using-git-worktrees",
+      "description": "Create isolated git worktrees for feature development with safety verification",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/using-git-worktrees/SKILL.md",
+      "tags": ["git", "worktree", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-verification-before-completion",
+      "description": "Run verification commands and confirm output before claiming work is complete",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/verification-before-completion/SKILL.md",
+      "tags": ["verify", "complete", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+    {
+      "name": "superpowers-dispatching-parallel-agents",
+      "description": "Dispatch multiple independent tasks to parallel sub-agents",
+      "author": "Jesse Vincent",
+      "version": "5.0.7",
+      "source": "https://raw.githubusercontent.com/obra/superpowers/main/skills/dispatching-parallel-agents/SKILL.md",
+      "tags": ["parallel", "agent", "superpowers"],
+      "license": "MIT",
+      "attribution": "© 2025 Jesse Vincent — superpowers plugin",
+      "upstream": "https://github.com/obra/superpowers"
+    },
+
+    {
+      "name": "cli-anything-shotcut",
+      "description": "CLI for Shotcut — stateful video editing via MLT XML, designed for agents",
+      "author": "HKUDS",
+      "version": "0.1.0",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/shotcut/agent-harness/cli_anything/shotcut/skills/SKILL.md",
+      "tags": ["video", "editing", "shotcut", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+    {
+      "name": "cli-anything-obsidian",
+      "description": "CLI for Obsidian via the Local REST API — knowledge management harness",
+      "author": "HKUDS",
+      "version": "0.1.0",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/obsidian/agent-harness/cli_anything/obsidian/skills/SKILL.md",
+      "tags": ["obsidian", "notes", "kb", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+    {
+      "name": "cli-anything-zotero",
+      "description": "CLI for Zotero — reference management automation",
+      "author": "HKUDS",
+      "version": "0.4.1",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/zotero/agent-harness/cli_anything/zotero/skills/SKILL.md",
+      "tags": ["zotero", "research", "references", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+    {
+      "name": "cli-anything-blender",
+      "description": "CLI for Blender — 3D modeling automation",
+      "author": "HKUDS",
+      "version": "0.1.0",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/blender/agent-harness/cli_anything/blender/skills/SKILL.md",
+      "tags": ["blender", "3d", "modeling", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+    {
+      "name": "cli-anything-inkscape",
+      "description": "CLI for Inkscape — vector graphics automation",
+      "author": "HKUDS",
+      "version": "0.1.0",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/inkscape/agent-harness/cli_anything/inkscape/skills/SKILL.md",
+      "tags": ["inkscape", "svg", "vector", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+    {
+      "name": "cli-anything-godot",
+      "description": "CLI for Godot — game engine automation with E2E demo pipeline",
+      "author": "HKUDS",
+      "version": "0.1.0",
+      "source": "https://raw.githubusercontent.com/HKUDS/CLI-Anything/main/godot/agent-harness/cli_anything/godot/skills/SKILL.md",
+      "tags": ["godot", "game", "engine", "cli-anything"],
+      "license": "Apache-2.0",
+      "attribution": "© HKUDS CLI-Anything contributors",
+      "upstream": "https://github.com/HKUDS/CLI-Anything"
+    },
+
+    {
+      "name": "tob-smart-contract-audit",
+      "description": "Trail of Bits — smart contract security audit workflow (link-only, CC-BY-SA)",
+      "author": "Trail of Bits",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/trailofbits/skills/main/skills/smart-contract-audit/SKILL.md",
+      "tags": ["security", "audit", "smart-contract", "tob"],
+      "license": "CC-BY-SA-4.0",
+      "attribution": "© Trail of Bits — CC-BY-SA-4.0 (ShareAlike)",
+      "upstream": "https://github.com/trailofbits/skills",
+      "installable": false
+    },
+    {
+      "name": "tob-malware-detection",
+      "description": "Trail of Bits — malware detection workflow (link-only, CC-BY-SA)",
+      "author": "Trail of Bits",
+      "version": "1.0.0",
+      "source": "https://raw.githubusercontent.com/trailofbits/skills/main/skills/malware-detection/SKILL.md",
+      "tags": ["security", "malware", "detection", "tob"],
+      "license": "CC-BY-SA-4.0",
+      "attribution": "© Trail of Bits — CC-BY-SA-4.0 (ShareAlike)",
+      "upstream": "https://github.com/trailofbits/skills",
+      "installable": false
+    }
+  ]
+}

package/data/skills/code-review.md

@@ -0,0 +1,19 @@
+---
+name: code-review
+description: Systematic code review for bugs, security, and quality
+whenToUse: When reviewing code changes, PRs, or completed implementations
+allowedTools: [Read, Glob, Grep, Bash]
+---
+
+# Code Review
+
+Review the code systematically for:
+
+1. **Correctness** — Does the code do what it claims? Logic errors?
+2. **Security** — SQL injection, XSS, command injection, path traversal, secrets in code?
+3. **Error handling** — Are errors caught and handled appropriately?
+4. **Edge cases** — Null/empty inputs, boundary conditions, concurrent access?
+5. **Performance** — Unnecessary loops, missing indexes, N+1 queries?
+6. **Readability** — Clear naming, reasonable complexity, adequate (not excessive) comments?
+
+Report findings with file path, line number, severity (critical/warning/info), and suggested fix.

package/data/skills/commit.md

@@ -0,0 +1,17 @@
+---
+name: commit
+description: Create well-formed git commits
+whenToUse: When the user asks to commit changes or create a PR
+allowedTools: [Bash, Read, Glob]
+---
+
+# Git Commit Workflow
+
+1. Run `git status` and `git diff` to see what changed
+2. Run `git log --oneline -5` to match the repo's commit message style
+3. Stage specific files (not `git add -A`) to avoid committing secrets or binaries
+4. Write a concise commit message:
+   - First line: imperative mood, under 72 chars, describes the "why"
+   - Body (if needed): explain context, not just what changed
+5. Create the commit
+6. Run `git status` to verify success

package/data/skills/debug.md

@@ -0,0 +1,24 @@
+---
+name: debug
+description: Systematic debugging approach
+whenToUse: When encountering any bug, test failure, or unexpected behavior
+allowedTools: [Read, Bash, Grep, Glob]
+---
+
+# Systematic Debugging
+
+Follow this process:
+
+1. **Reproduce** — Confirm the bug exists. Run the failing test or command.
+2. **Read the error** — What does the error message actually say? Read the full stack trace.
+3. **Locate** — Find the exact line where the error occurs. Read the surrounding code.
+4. **Understand** — Why does this code produce the wrong result? Trace the data flow.
+5. **Hypothesize** — Form a specific theory about the cause.
+6. **Verify** — Test your theory with a minimal change or print statement.
+7. **Fix** — Make the smallest change that fixes the bug.
+8. **Confirm** — Run the test/command again to verify the fix works.
+
+Rules:
+- Don't guess. Read the error message carefully.
+- Don't change multiple things at once.
+- Don't skip the reproduce step.

package/data/skills/diagnose.md

@@ -0,0 +1,24 @@
+---
+name: diagnose
+description: Diagnose why an agent run failed, regressed, or produced unexpected output — using structured evidence instead of intuition
+whenToUse: When an agent run produced wrong output, crashed mid-execution, or regressed from a previous successful run
+allowedTools: [Read, Bash, Grep, Glob]
+---
+
+# Diagnose Agent Run
+
+Apply this when something an agent did went wrong — not for ordinary code bugs (use `debug` for those).
+
+1. **Define the failure precisely** — What was the expected output? What was the actual output? One sentence each.
+2. **Locate the artifacts** — Find the run's logs, transcripts, tool-call traces, and any files it produced. Common locations: `.oh/logs/`, `.oh/tasks.json`, `.oh/sessions/`, stderr capture.
+3. **Reconstruct the timeline** — Walk through tool calls in order. Where did the trajectory diverge from what should have happened?
+4. **Isolate the inflection point** — Find the single tool call, prompt step, or input that turned a working run into a broken one.
+5. **Form a hypothesis** — Was it bad input, model regression, missing context, tool timeout, permission denial, or stale memory? Be specific.
+6. **Verify with a minimal repro** — Re-run only the inflection step in isolation. Confirm the same wrong behavior reproduces.
+7. **Report** — Write up: failure mode, inflection point (file:line or message index), root cause, suggested fix.
+
+Rules:
+- Don't guess from the symptom. Read the actual logs.
+- Distinguish "the model made a bad decision" from "the harness broke" — they need different fixes.
+- If the run is non-deterministic, repro at least 3 times before claiming a hypothesis.
+- Never edit code as part of diagnosis. The output is a report, not a fix.

package/data/skills/plan.md

@@ -0,0 +1,25 @@
+---
+name: plan
+description: Design an implementation plan before coding
+whenToUse: When the user asks to build a feature, fix a non-trivial bug, or refactor — anything beyond a one-line change
+allowedTools: [Read, Glob, Grep]
+---
+
+# Implementation Planning
+
+Plan before you code. The output is a written plan, not edited files.
+
+1. **Restate the goal** — One sentence describing what success looks like. Confirm with the user if ambiguous.
+2. **Map the affected surface** — List every file you'll touch and every public interface you'll change.
+3. **Find existing patterns** — Search the codebase for similar features. Reuse existing utilities; don't invent parallel ones.
+4. **Identify the minimal change** — What's the smallest set of edits that delivers the goal? Resist scope creep.
+5. **Sequence the work** — Order the changes so each step is independently testable. Each step should leave the build green.
+6. **Plan verification** — How will you know each step worked? List the commands or manual checks.
+7. **Surface risks** — What could go wrong? Migration data loss, breaking changes, perf regression, security holes? Note each with a mitigation.
+8. **Write it up** — A short doc with: goal, files touched, sequence, verification, risks. Get user approval before coding.
+
+Rules:
+- Don't write code in this phase. Only research and write the plan.
+- A plan that lists "all the things" is not a plan. Pick the recommended approach.
+- Cite files and functions you'll reuse with `path:line` references.
+- If you can't write the plan in one page, the scope is too big — split it.

package/data/skills/simplify.md

@@ -0,0 +1,24 @@
+---
+name: simplify
+description: Refactor code to be simpler and more maintainable without changing behavior
+whenToUse: When code is hard to read, has duplicated logic, over-abstracts, or accumulated dead branches
+allowedTools: [Read, Edit, Bash, Glob, Grep]
+---
+
+# Simplify Code
+
+Simpler code is easier to read, change, and debug. Behavior must not change.
+
+1. **Read the code in scope** — Understand what it does end-to-end before touching anything.
+2. **List the smells** — Duplication, dead branches, premature abstraction, deeply nested conditionals, vague names, comments that explain WHAT instead of WHY.
+3. **Confirm tests cover the behavior** — If there are no tests, write characterization tests first. Refactoring without tests is gambling.
+4. **Make one change at a time** — Inline a wrapper, extract a function, rename a variable, delete dead code. Run tests after each.
+5. **Prefer deletion over addition** — If you can remove code without breaking tests, that's almost always the right move.
+6. **Stop when it's good enough** — Don't refactor for its own sake. Stop when further changes wouldn't meaningfully improve readability.
+
+Rules:
+- Never change behavior. If you discover a bug, file it separately — don't fix it during a refactor.
+- Three similar lines is better than a premature abstraction. Wait until the third or fourth occurrence before extracting.
+- Delete comments that explain what well-named code already says.
+- If the change touches more than one file or one concern, split it into separate refactors.
+- Don't introduce new dependencies, frameworks, or patterns.

package/data/skills/tdd.md

@@ -0,0 +1,22 @@
+---
+name: tdd
+description: Test-driven development workflow
+whenToUse: When implementing any feature or bugfix, before writing implementation code
+allowedTools: [Read, Edit, Write, Bash, Glob, Grep]
+---
+
+# Test-Driven Development
+
+Follow this workflow strictly:
+
+1. **Write the test first** — Create a failing test that describes the expected behavior
+2. **Run the test** — Verify it fails for the right reason
+3. **Write minimal implementation** — Only enough code to make the test pass
+4. **Run tests again** — Verify all tests pass
+5. **Refactor** — Clean up the code while keeping tests green
+
+Rules:
+- Never write implementation before the test
+- Each test should test one thing
+- Keep tests fast and isolated
+- Use descriptive test names that explain the behavior

package/dist/agents/roles.d.ts

@@ -13,10 +13,20 @@ export type AgentRole = {
     name: string;
     description: string;
     systemPromptSupplement: string;
-    /** Suggested tools to include (empty = all tools) */
+    /** Suggested tools to include (empty = all tools) — Anthropic alias: `tools` */
     suggestedTools?: string[];
+    /** Tool denylist applied after suggestedTools — Anthropic standard: `disallowedTools` */
+    disallowedTools?: string[];
+    /** Per-agent model override (e.g. "sonnet", "opus", "haiku", or a full model ID) */
+    model?: string;
+    /** Isolation mode for sub-agent execution. Default: inherits parent. */
+    isolation?: "none" | "worktree";
+    /** Per-agent MCP servers injected only when this agent runs (parsed via raw passthrough; dispatcher wiring is a future task). */
+    mcpServers?: Record<string, unknown>;
+    /** Per-agent hooks (parsed via raw passthrough; dispatcher wiring is a future task). */
+    hooks?: Record<string, unknown>;
 };
-/** Discover markdown agent roles from .oh/agents/ and ~/.oh/agents/ */
+/** Discover markdown agent roles from .oh/agents/ + ~/.oh/agents/ + .claude/agents/ + ~/.claude/agents/ */
 export declare function discoverMarkdownAgents(): AgentRole[];
 /** Get a role by ID (checks built-in first, then markdown agents) */
 export declare function getRole(id: string): AgentRole | undefined;

package/dist/agents/roles.js

@@ -163,14 +163,37 @@ import { homedir } from "node:os";
 import { basename, join } from "node:path";
 const PROJECT_AGENTS_DIR = join(".oh", "agents");
 const GLOBAL_AGENTS_DIR = join(homedir(), ".oh", "agents");
+// Claude Code ecosystem mirror paths
+const CC_PROJECT_AGENTS_DIR = join(".claude", "agents");
+const CC_GLOBAL_AGENTS_DIR = join(homedir(), ".claude", "agents");
+/** Parse a frontmatter list value. Accepts `[a, b]` (YAML inline) OR `a b c` (Claude Code style). */
+function parseAgentList(raw) {
+    const trimmed = raw.trim();
+    if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
+        return trimmed
+            .slice(1, -1)
+            .split(",")
+            .map((t) => t.trim())
+            .filter(Boolean);
+    }
+    // Claude Code spec: comma-separated OR space-separated bare tokens. Handle both.
+    return trimmed
+        .replace(/^["']|["']$/g, "")
+        .split(/[,\s]+/)
+        .map((t) => t.trim())
+        .filter(Boolean);
+}
 /**
  * Parse a markdown agent file into an AgentRole.
  *
- * Format:
+ * Format (OH-native + Claude Code interoperable):
  * ---
  * name: My Agent
  * description: What it does
- * tools: [Read, Grep, Bash]
+ * tools: Read, Grep, Bash         # space- or comma-separated, OR YAML array
+ * disallowedTools: Write, Edit    # tool denylist
+ * model: sonnet                   # model override
+ * isolation: worktree             # explicit isolation mode
  * ---
  *
  * System prompt content...
@@ -182,20 +205,43 @@ function parseAgentMarkdown(raw, filePath) {
     const fm = fmMatch[1];
     const nameMatch = fm.match(/^name:\s*(.+)$/m);
     const descMatch = fm.match(/^description:\s*(.+)$/m);
-    const toolsMatch = fm.match(/^tools:\s*\[(.+)\]$/m);
+    const toolsMatch = fm.match(/^tools:\s*(.+)$/m);
+    const disallowedMatch = fm.match(/^disallowedTools:\s*(.+)$/m) ?? fm.match(/^disallowed-tools:\s*(.+)$/m);
+    const modelMatch = fm.match(/^model:\s*(.+)$/m);
+    const isolationMatch = fm.match(/^isolation:\s*(.+)$/m);
     const fmEnd = raw.indexOf("---", raw.indexOf("---") + 3);
     const content = fmEnd > 0 ? raw.slice(fmEnd + 3).trim() : "";
     const id = basename(filePath, ".md")
         .toLowerCase()
         .replace(/[^a-z0-9]+/g, "-");
+    const isolation = isolationMatch?.[1]?.trim().replace(/^["']|["']$/g, "");
+    const validIsolation = isolation === "worktree" || isolation === "none" ? isolation : undefined;
+    // Parse optional inline-JSON fields (mcpServers, hooks). These are block fields in
+    // Anthropic's YAML but we support single-line JSON for lightweight frontmatter use.
+    const mcpServersMatch = fm.match(/^mcpServers:\s*(\{[\s\S]*?\})\s*$/m);
+    const hooksMatch = fm.match(/^hooks:\s*(\{[\s\S]*?\})\s*$/m);
     return {
         id,
         name: nameMatch?.[1]?.trim() ?? id,
         description: descMatch?.[1]?.trim() ?? "",
         systemPromptSupplement: content,
-        suggestedTools: toolsMatch ? toolsMatch[1].split(",").map((t) => t.trim()) : undefined,
+        suggestedTools: toolsMatch ? parseAgentList(toolsMatch[1]) : undefined,
+        disallowedTools: disallowedMatch ? parseAgentList(disallowedMatch[1]) : undefined,
+        model: modelMatch?.[1]?.trim().replace(/^["']|["']$/g, ""),
+        isolation: validIsolation,
+        mcpServers: mcpServersMatch ? tryParseJson(mcpServersMatch[1]) : undefined,
+        hooks: hooksMatch ? tryParseJson(hooksMatch[1]) : undefined,
     };
 }
+function tryParseJson(raw) {
+    try {
+        const v = JSON.parse(raw);
+        return v && typeof v === "object" ? v : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 /** Load agent roles from a directory of .md files */
 function loadAgentsFromDir(dir) {
     if (!existsSync(dir))
@@ -213,9 +259,22 @@ function loadAgentsFromDir(dir) {
     })
         .filter((r) => r !== null);
 }
-/** Discover markdown agent roles from .oh/agents/ and ~/.oh/agents/ */
+/** Discover markdown agent roles from .oh/agents/ + ~/.oh/agents/ + .claude/agents/ + ~/.claude/agents/ */
 export function discoverMarkdownAgents() {
-    return [...loadAgentsFromDir(PROJECT_AGENTS_DIR), ...loadAgentsFromDir(GLOBAL_AGENTS_DIR)];
+    const all = [
+        ...loadAgentsFromDir(PROJECT_AGENTS_DIR),
+        ...loadAgentsFromDir(GLOBAL_AGENTS_DIR),
+        ...loadAgentsFromDir(CC_PROJECT_AGENTS_DIR),
+        ...loadAgentsFromDir(CC_GLOBAL_AGENTS_DIR),
+    ];
+    // De-duplicate by id (first wins — OH paths take precedence over .claude paths)
+    const seen = new Set();
+    return all.filter((r) => {
+        if (seen.has(r.id))
+            return false;
+        seen.add(r.id);
+        return true;
+    });
 }
 /** Get a role by ID (checks built-in first, then markdown agents) */
 export function getRole(id) {

package/dist/commands/ai.js

@@ -109,12 +109,29 @@ export function registerAICommands(register) {
         lines.push("Send messages with: Agent({ prompt: 'ask the other agent...', allowed_tools: ['SendMessage'] })");
         return { output: lines.join("\n"), handled: true };
     });
-    register("plugins", "Manage plugins: list, search, install, uninstall, marketplace", (args) => {
+    const pluginsHandler = (args) => {
         const { discoverPlugins, discoverSkills } = require("../harness/plugins.js");
         const { searchMarketplace, installPlugin, uninstallPlugin, getInstalledPlugins, listMarketplaces, addMarketplace, removeMarketplace, formatMarketplaceSearch, formatInstalledPlugins, } = require("../harness/marketplace.js");
         const parts = args.trim().split(/\s+/);
         const subcommand = parts[0] ?? "";
         const rest = parts.slice(1).join(" ");
+        if (subcommand === "info" && rest) {
+            const installed = getInstalledPlugins();
+            const p = installed.find((x) => x.name === rest);
+            if (!p)
+                return { output: `Plugin "${rest}" not found among installed plugins.`, handled: true };
+            const lines = [
+                `${p.name}@${p.version}`,
+                p.description ? `  ${p.description}` : "",
+                p.author ? `  by ${p.author}` : "",
+                p.license ? `  license: ${p.license}` : "",
+                p.homepage ? `  homepage: ${p.homepage}` : "",
+                p.keywords?.length ? `  keywords: ${p.keywords.join(", ")}` : "",
+                `  marketplace: ${p.marketplace}`,
+                `  cachePath: ${p.cachePath}`,
+            ].filter(Boolean);
+            return { output: lines.join("\n"), handled: true };
+        }
         if (subcommand === "marketplace") {
             const action = parts[1];
             const source = parts.slice(2).join(" ");
@@ -192,13 +209,16 @@ export function registerAICommands(register) {
         }
         lines.push("");
         lines.push("Commands:");
-        lines.push("  /plugins search <query>          Search marketplaces");
-        lines.push("  /plugins install <name>          Install from marketplace");
-        lines.push("  /plugins uninstall <name>        Remove a plugin");
-        lines.push("  /plugins marketplace add <src>   Add a marketplace");
-        lines.push("  /plugins marketplace             List marketplaces");
+        lines.push("  /plugin info <name>              Show full manifest for a plugin");
+        lines.push("  /plugin search <query>           Search marketplaces");
+        lines.push("  /plugin install <name>           Install from marketplace");
+        lines.push("  /plugin uninstall <name>         Remove a plugin");
+        lines.push("  /plugin marketplace add <src>    Add a marketplace");
+        lines.push("  /plugin marketplace              List marketplaces");
         return { output: lines.join("\n"), handled: true };
-    });
+    };
+    register("plugins", "Manage plugins: list, search, install, uninstall, marketplace, info", pluginsHandler);
+    register("plugin", "Alias of /plugins (Claude Code-style singular)", pluginsHandler);
     register("cybergotchi", "Manage your cybergotchi — feed · pet · rest · status · rename · reset", (args) => {
         return handleCybergotchiCommand(args);
     });

package/dist/commands/skills.d.ts

@@ -1,5 +1,5 @@
 /**
- * Skill management commands — /skill-create, /skill-delete, /skill-edit, /skill-search, /skill-install
+ * Skill management commands — /skills, /skill-create, /skill-delete, /skill-edit, /skill-search, /skill-install
  */
 import type { CommandHandler } from "./types.js";
 export declare function registerSkillCommands(register: (name: string, description: string, handler: CommandHandler) => void): void;