Make skill layout marketplace compatible

.agents/plugins/marketplace.json

@@ -8,7 +8,7 @@
       "name": "computer-usage-summary-skill",
       "source": {
         "source": "local",
-        "path": "./plugins/computer-usage-summary-skill"
+        "path": "."
       },
       "policy": {
         "installation": "AVAILABLE",

.github/workflows/test.yml

@@ -23,6 +23,6 @@ jobs:
       - name: Install time zone data
         run: python -m pip install -r requirements.txt
       - name: Compile script
-        run: python -m py_compile plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py
+        run: python -m py_compile skills/computer-usage-summary/scripts/activitywatch_summary.py
       - name: Run unit tests
         run: python -m unittest discover -s tests -v

CONTRIBUTING.md

@@ -6,7 +6,7 @@ dependency-free at runtime.
 Before opening a pull request, run:
 
 ```bash
-python3 -m py_compile plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py
+python3 -m py_compile skills/computer-usage-summary/scripts/activitywatch_summary.py
 python3 -m unittest discover -s tests -v
 ```
 

README.md

@@ -36,15 +36,15 @@ repository never downloads, installs, or starts ActivityWatch automatically.
 ## Install In Codex
 
 Install the repository as a skill-only Codex plugin, or install the
-`plugins/computer-usage-summary-skill/skills/computer-usage-summary` directory
-directly with Codex's skill installer.
+`skills/computer-usage-summary` directory directly with Codex's skill
+installer.
 For a local clone, the skill directory can also be copied into
 `~/.codex/skills/computer-usage-summary/`.
 
 After this repository is published, a GitHub-directory install looks like:
 
 ```text
-$skill-installer install https://github.com/liuyewang/computer-usage-summary-skill/tree/main/plugins/computer-usage-summary-skill/skills/computer-usage-summary
+$skill-installer install https://github.com/liuyewang/computer-usage-summary-skill/tree/main/skills/computer-usage-summary
 ```
 
 ## Usage
@@ -55,28 +55,28 @@ Or run the bundled script directly:
 
 ```bash
 # Default JSON report for an agent or another program
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date today
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date today
 
 # Paste an application table into Excel, Numbers, or Feishu Sheets
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format tsv --table apps
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format tsv --table apps
 
 # Review the Monday-Sunday week containing the anchor date
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date 2026-07-26 --period week --format markdown --table trend
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date 2026-07-26 --period week --format markdown --table trend
 
 # Review the month containing the anchor date
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date 2026-07-26 --period month --format tsv --table categories
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date 2026-07-26 --period month --format tsv --table categories
 
 # A readable timeline in Markdown
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format markdown --table timeline
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format markdown --table timeline
 
 # Keep timeline titles out of the output
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format tsv --table timeline --hide-titles
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --format tsv --table timeline --hide-titles
 
 # An Excel-friendly CSV file with a UTF-8 BOM
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --start 2026-07-20 --end 2026-07-26 --format csv --table apps --csv-bom --output weekly-apps.csv
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --start 2026-07-20 --end 2026-07-26 --format csv --table apps --csv-bom --output weekly-apps.csv
 
 # Create a client-ready timesheet from local app/title mapping rules
-python3 plugins/computer-usage-summary-skill/skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --period week --rules examples/rules.json --format csv --report client-timesheet --csv-bom --output client-timesheet.csv
+python3 skills/computer-usage-summary/scripts/activitywatch_summary.py --date today --period week --rules examples/rules.json --format csv --report client-timesheet --csv-bom --output client-timesheet.csv
 ```
 
 Tables are available as `summary`, `apps`, `projects`, `categories`, `trend`,

tests/test_activitywatch_summary.py

@@ -7,7 +7,7 @@
 
 
 ROOT = Path(__file__).resolve().parents[1]
-SKILL_ROOT = ROOT / "plugins" / "computer-usage-summary-skill" / "skills" / "computer-usage-summary"
+SKILL_ROOT = ROOT / "skills" / "computer-usage-summary"
 SCRIPT = SKILL_ROOT / "scripts" / "activitywatch_summary.py"
 SPEC = importlib.util.spec_from_file_location("activitywatch_summary", SCRIPT)
 summary_script = importlib.util.module_from_spec(SPEC)