Sync skills and rules from ~/.cursor

Author: j0ntz

.cursor/README.md

@@ -91,7 +91,7 @@ All GitHub API operations use **`gh` CLI** (`gh api`, `gh api graphql`, `gh pr`)
 | [`/asana-task-update`](.cursor/skills/asana-task-update/SKILL.md) | Generic Asana mutations (attach PR, assign, status/field updates) |
 | [`/standup`](.cursor/skills/standup/SKILL.md) | Generate daily standup from Asana + GitHub activity |
 | [`/chat-audit`](.cursor/skills/chat-audit/SKILL.md) | Audit chat sessions for workflow/rule issues |
-| [`/convention-sync`](.cursor/skills/convention-sync/SKILL.md) | Sync `~/.cursor` changes with this repo and update PR description |
+| [`/convention-sync`](.cursor/skills/convention-sync/SKILL.md) | Sync `~/.cursor` changes with the `edge-conventions` repo and update PR description |
 | [`/author`](.cursor/skills/author/SKILL.md) | Create/update/debug skills and related scripts/rules |
 
 ---
@@ -102,7 +102,7 @@ All GitHub API operations use **`gh` CLI** (`gh api`, `gh api graphql`, `gh pr`)
 
 | Script | What it does | API |
 |--------|-------------|-----|
-| [`pr-create.sh`](.cursor/skills/pr-create/scripts/pr-create.sh) | Create PR for current branch with auto-generated title/body | `gh pr create` |
+| [`pr-create.sh`](.cursor/skills/pr-create/scripts/pr-create.sh) | Create PR for current branch with repo-template-aligned title/body | `gh pr create` |
 | [`pr-address.sh`](.cursor/skills/pr-address/scripts/pr-address.sh) | Fetch unresolved feedback, post replies, resolve threads, mark addressed | `gh api` REST + GraphQL |
 | [`github-pr-review.sh`](.cursor/skills/pr-review/scripts/github-pr-review.sh) | Fetch PR context (metadata + patches) and submit reviews | `gh pr view` + `gh api` REST |
 | [`github-pr-activity.sh`](.cursor/skills/standup/scripts/github-pr-activity.sh) | List PRs by activity (recent reviews, comments, CI status) | `gh api graphql` |
@@ -151,8 +151,8 @@ These scripts run sequentially. Each handles one phase of the landing workflow:
 
 | Script | What it does |
 |--------|-------------|
-| [`lint-commit.sh`](.cursor/skills/lint-commit.sh) | ESLint `--fix` before commit, auto-runs `update-eslint-warnings` when available |
-| [`lint-warnings.sh`](.cursor/skills/im/scripts/lint-warnings.sh) | Update `eslint-warnings.mdc` knowledge base from current lint output |
+| [`lint-commit.sh`](.cursor/skills/lint-commit.sh) | ESLint `--fix`, localize, graduate warnings, and report effective commit scope before commit |
+| [`lint-warnings.sh`](.cursor/skills/im/scripts/lint-warnings.sh) | Run `eslint --fix`, then summarize any remaining lint findings with matched fix patterns |
 | [`install-deps.sh`](.cursor/skills/install-deps.sh) | Install dependencies and run prepare script |
 | [`upgrade-dep.sh`](.cursor/skills/pr-land/scripts/upgrade-dep.sh) | Upgrade a dependency in the GUI repo |
 

.cursor/rules/workflow-halt-on-error.mdc

@@ -9,15 +9,15 @@ alwaysApply: true
 
 <rule id="skill-script-path-resolution">When a skill mentions a script path, resolve it under `~/.cursor/skills/<skill>/scripts/` unless the skill explicitly specifies an absolute path elsewhere. Do not assume repo-relative `scripts/` paths without verifying the skill directory contents.</rule>
 
-<rule id="halt-on-error">When ANY shell command fails (non-zero exit code) during a workflow (except where explicitly allowed by `auto-fix-verification-failures` or `companion-script-nonzero-contracts`):
+<rule id="halt-on-error">When ANY shell command fails (non-zero exit code) while executing an active skill workflow, a delegated subskill from that workflow, or a companion-script step required by that workflow (except where explicitly allowed by `auto-fix-verification-failures` or `companion-script-nonzero-contracts`):
 1. **STOP** — do not retry, work around, substitute, or continue the workflow.
 2. **Report** — show the user the exact command, exit code, and error output.
 3. **Diagnose** — classify the failure: missing tool (`command not found`), wrong path, permissions, or logic error.
 4. **Evaluate workflow** — if the failure reveals a gap in a skill definition, follow the fix-workflow-first rules below.
 5. **Wait** — do not resume until the user responds.
 </rule>
 
-<rule id="fix-workflow-first">When a workflow gap is discovered in a skill definition:
+<rule id="fix-workflow-first">When a workflow gap is discovered in an active skill definition:
 1. **Stop immediately** — do not continue the current task or apply any workaround.
 2. **Identify the root cause** in the skill (`.cursor/skills/*/SKILL.md`) definition.
 3. **Propose the fix** to the user and wait for approval before proceeding.
@@ -27,6 +27,8 @@ alwaysApply: true
 Fixing the skill takes **absolute priority** over all other actions — including workarounds, continuing the original task, or applying temporary fixes. Do NOT apply workarounds or manual fixes before proposing the skill update. The correct sequence is: identify gap → propose fix → get approval → apply fix → then resume original task. This applies to all workflow issues — missed steps, incorrect output, wrong tool usage, shell failures, formatting problems, etc. The skill is the source of truth; patching around it creates drift.
 </rule>
 
+<rule id="skill-scope-only">These workflow halt rules are for skill-driven execution, especially hands-off/orchestrated skills and their dependencies. They do not automatically apply to ad hoc exploration, incidental verification, or low-risk authoring work unless that command is part of an active skill contract.</rule>
+
 <rule id="auto-fix-verification-failures">Exception to `halt-on-error`: For verification/code-quality failures where diagnostics are explicit and local, continue automatically with bounded remediation.
 
 Allowed auto-fix scope:
@@ -52,13 +54,13 @@ Never auto-fix:
 <rule id="companion-script-nonzero-contracts">Respect documented companion script exit-code contracts. Non-zero does NOT always mean fatal.
 
 For `~/.cursor/skills/im/scripts/lint-warnings.sh`:
-- `0` = no warnings
-- `1` = warnings found (expected actionable state)
+- `0` = no remaining lint findings after auto-fix
+- `1` = remaining lint findings after auto-fix (expected actionable state)
 - `2` = execution error (fatal)
 
 Required behavior:
-1. If exit `1`, continue workflow by fixing warnings before implementation.
-2. If warnings exist, commit warning fixes in a separate lint-fix commit immediately before feature commits.
+1. If exit `1`, continue workflow by fixing the remaining lint findings before implementation.
+2. If the script auto-fixes pre-existing lint issues, commit those changes in a separate lint-fix commit immediately before feature commits, even if no findings remain.
 3. If exit `2`, apply `halt-on-error`.
 </rule>
 

.cursor/skills/asana-task-update/SKILL.md

@@ -12,7 +12,7 @@ metadata:
 <rule id="use-companion-script">Use `~/.cursor/skills/asana-task-update/scripts/asana-task-update.sh` for all Asana task mutations. Do not call raw Asana APIs directly from skills that can delegate here.</rule>
 <rule id="task-required">Every operation requires `--task <task_gid>`.</rule>
 <rule id="attach-requires-secret">`--attach-pr` requires `ASANA_GITHUB_SECRET`. Other operations require `ASANA_TOKEN`.</rule>
-<rule id="prompt-codes">If the script exits code 2 with `PROMPT_REVIEWER` or `PROMPT_IMPLEMENTOR`, ask the user and re-run with explicit `--reviewer` or `--implementor`.</rule>
+<rule id="prompt-codes">If the script exits code 2 with `PROMPT_REVIEWER` or `PROMPT_IMPLEMENTOR`, ask the user and re-run with explicit `--reviewer` or `--implementor`. Hands-off callers may instead pass `--skip-assign-if-missing` to convert missing-reviewer assignment into a non-blocking skip.</rule>
 <rule id="script-timeouts">Asana updates can take time. Use `block_until_ms: 120000` for script calls.</rule>
 </rules>
 
@@ -29,6 +29,12 @@ metadata:
   --attach-pr --pr-url <url> --pr-title "<title>" --pr-number <num> \
   --assign --set-status "Review Needed" --auto-est-review-hrs
 
+# Hands-off attach + best-effort assign (skip if reviewer missing)
+~/.cursor/skills/asana-task-update/scripts/asana-task-update.sh \
+  --task <task_gid> \
+  --attach-pr --pr-url <url> --pr-title "<title>" --pr-number <num> \
+  --assign --skip-assign-if-missing --set-status "Review Needed" --auto-est-review-hrs
+
 # Publish Needed -> Verification Needed (and unassign)
 ~/.cursor/skills/asana-task-update/scripts/asana-task-update.sh \
   --task <task_gid> \
@@ -41,6 +47,7 @@ Determine which updates are needed by the caller and build one command with all
 
 - `--attach-pr --pr-url --pr-title --pr-number`
 - `--assign` or `--assign <user_gid>`
+- `--skip-assign-if-missing`
 - `--unassign`
 - `--set-status "Review Needed|Publish Needed|Verification Needed"`
 - `--set-reviewer <user_gid>`
@@ -59,6 +66,8 @@ If exit code is 2:
 
 - `PROMPT_REVIEWER`: ask who to assign, then re-run with `--reviewer <gid>` and `--assign`
 - `PROMPT_IMPLEMENTOR`: ask who to set as implementor, then re-run with `--implementor <gid>`
+
+If the caller used `--skip-assign-if-missing`, do not ask about `PROMPT_REVIEWER` because the script will not emit it for missing-reviewer cases.
 </step>
 
 <step id="4" name="Report result">

.cursor/skills/asana-task-update/scripts/asana-task-update.sh

@@ -16,6 +16,7 @@ PR_NUMBER=""
 
 DO_ASSIGN=false
 ASSIGN_GID=""
+SKIP_ASSIGN_IF_MISSING=false
 DO_UNASSIGN=false
 
 SET_STATUS=""
@@ -41,6 +42,7 @@ while [[ $# -gt 0 ]]; do
         shift
       fi
       ;;
+    --skip-assign-if-missing) SKIP_ASSIGN_IF_MISSING=true; shift ;;
     --unassign) DO_UNASSIGN=true; shift ;;
     --set-status) SET_STATUS="$2"; shift 2 ;;
     --set-reviewer|--reviewer) SET_REVIEWER_GID="$2"; shift 2 ;;
@@ -143,26 +145,33 @@ if $DO_ASSIGN; then
     ASSIGN_GID="${SET_REVIEWER_GID:-$(read_people_field "$REVIEWER_FIELD")}"
   fi
   if [[ -z "$ASSIGN_GID" ]]; then
-    echo ">> PROMPT_REVIEWER"
-    exit 2
+    if $SKIP_ASSIGN_IF_MISSING; then
+      echo ">> Assignee: skipped (no reviewer provided or found on task)"
+      DO_ASSIGN=false
+    else
+      echo ">> PROMPT_REVIEWER"
+      exit 2
+    fi
   fi
 
-  if [[ -z "$SET_REVIEWER_GID" ]]; then
-    SET_REVIEWER_GID="$ASSIGN_GID"
-  fi
+  if $DO_ASSIGN; then
+    if [[ -z "$SET_REVIEWER_GID" ]]; then
+      SET_REVIEWER_GID="$ASSIGN_GID"
+    fi
 
-  if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
-    SET_IMPLEMENTOR_GID="$(read_people_field "$IMPLEMENTOR_FIELD")"
-  fi
-  if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
-    SET_IMPLEMENTOR_GID="$("$SCRIPT_DIR/../../asana-whoami.sh" 2>/dev/null || true)"
-    if [[ -n "$SET_IMPLEMENTOR_GID" ]]; then
-      echo ">> Implementor: auto-resolved to current user ($SET_IMPLEMENTOR_GID)"
+    if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
+      SET_IMPLEMENTOR_GID="$(read_people_field "$IMPLEMENTOR_FIELD")"
+    fi
+    if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
+      SET_IMPLEMENTOR_GID="$("$SCRIPT_DIR/../../asana-whoami.sh" 2>/dev/null || true)"
+      if [[ -n "$SET_IMPLEMENTOR_GID" ]]; then
+        echo ">> Implementor: auto-resolved to current user ($SET_IMPLEMENTOR_GID)"
+      fi
+    fi
+    if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
+      echo ">> PROMPT_IMPLEMENTOR"
+      exit 2
     fi
-  fi
-  if [[ -z "$SET_IMPLEMENTOR_GID" ]]; then
-    echo ">> PROMPT_IMPLEMENTOR"
-    exit 2
   fi
 fi
 

.cursor/skills/convention-sync/SKILL.md

@@ -15,22 +15,25 @@ metadata:
 <rule id="no-script-bypass">If the script fails, report the error and STOP.</rule>
 <rule id="readme-is-source">`.cursor/README.md` is the source of truth for documentation. The script mirrors it to the PR description automatically.</rule>
 <rule id="claude-compat">Every run ensures `~/.claude/skills` symlinks to `~/.cursor/skills` and regenerates `~/.claude/CLAUDE.md` from `alwaysApply: true` rules. This enables OpenCode and Claude Code to discover skills and rules without separate config.</rule>
+<rule id="target-repo-resolution">For user-to-repo sync, target the `edge-conventions` checkout. Do NOT assume the current repo is correct just because it contains a `.cursor/` folder. Let the companion script resolve and validate the repo path.</rule>
 </rules>
 
 <step id="1" name="Detect changes and PR status">
-Determine the repo directory — default to the current working directory if it contains a `.cursor/` folder, otherwise use the `edge-conventions` checkout.
-
-Run **in parallel**:
-1. Sync script in dry-run mode:
-   ```bash
-   ~/.cursor/skills/convention-sync/scripts/convention-sync.sh <repo-dir>
-   ```
-2. Check for open PR:
-   ```bash
-   cd <repo-dir> && gh pr view --json number,url --jq '{number: .number, url: .url}' 2>/dev/null || echo '{}'
-   ```
-
-Parse the JSON output. If `total` is 0, report "Everything is in sync" and stop.
+Use the companion script's default repo resolution first. It targets the `edge-conventions` checkout and fails if the resolved or provided repo is not actually `edge-conventions`.
+
+Run the sync script in dry-run mode:
+
+```bash
+~/.cursor/skills/convention-sync/scripts/convention-sync.sh
+```
+
+Parse the JSON output and extract `repoDir`. Then check for an open PR:
+
+```bash
+cd <repo-dir> && gh pr view --json number,url --jq '{number: .number, url: .url}' 2>/dev/null || echo '{}'
+```
+
+Use the resolved repo path from the script for subsequent git and PR commands. If the script reports `total` as 0, report "Everything is in sync" and stop.
 </step>
 
 <step id="2" name="Present summary">
@@ -75,6 +78,8 @@ cd <repo-dir> && gh pr edit --body-file .cursor/README.md
 
 <edge-cases>
 <case name="Reverse sync (repo → user)">If the user says "pull from repo" or "update my local", run with `--repo-to-user --stage` instead. No git operations needed.</case>
+<case name="Current repo has a .cursor folder but is not edge-conventions">Do not sync into that repo. Fall back to `~/git/edge-conventions` or ask for the correct repo path.</case>
+<case name="Dry-run resolved a repo path">Reuse the `repoDir` value from the script's JSON output for the PR query, commit run, push, and PR edit steps.</case>
 <case name="Selective sync">To permanently exclude files, add glob patterns to `~/.cursor/.syncignore` (one per line, `#` comments). The script skips matching entries and reports them in the `ignored` array. To exclude ad-hoc, remove files from staging with `git reset HEAD .cursor/<file>` before committing.</case>
 <case name="No README">If `.cursor/README.md` doesn't exist, skip PR description update and warn the user.</case>
 </edge-cases>

.cursor/skills/convention-sync/scripts/convention-sync.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # convention-sync.sh — Sync ~/.cursor/ files with the edge-conventions repo.
-# Usage: ./convention-sync.sh <repo-dir> [--stage] [--commit -m "message"] [--repo-to-user]
+# Usage: ./convention-sync.sh [repo-dir] [--stage] [--commit -m "message"] [--repo-to-user]
 # Compares ~/.cursor/{skills,rules,scripts} against <repo-dir>/.cursor/ and
 # outputs a structured JSON summary of new, modified, and deleted files.
 # With --stage: copies changed files and stages them in git (or copies to user dir with --repo-to-user).
@@ -18,6 +18,56 @@ DO_COMMIT=false
 COMMIT_MSG=""
 DIRECTION="user-to-repo"
 
+resolve_default_repo_dir() {
+  local cwd remote_url default_repo
+
+  cwd="$(pwd)"
+  if [[ "$(basename "$cwd")" == "edge-conventions" ]]; then
+    printf '%s\n' "$cwd"
+    return 0
+  fi
+
+  if git -C "$cwd" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    remote_url="$(git -C "$cwd" remote get-url origin 2>/dev/null || true)"
+    if [[ "$remote_url" == *"edge-conventions"* ]]; then
+      printf '%s\n' "$cwd"
+      return 0
+    fi
+  fi
+
+  default_repo="$HOME/git/edge-conventions"
+  if [[ -d "$default_repo/.git" || -f "$default_repo/.git" ]]; then
+    printf '%s\n' "$default_repo"
+    return 0
+  fi
+
+  return 1
+}
+
+validate_repo_dir() {
+  local repo_dir remote_url
+  repo_dir="$1"
+
+  if [[ ! -d "$repo_dir/.cursor" ]]; then
+    echo "ERROR: Repo directory must contain .cursor/: $repo_dir" >&2
+    return 1
+  fi
+
+  if [[ "$(basename "$repo_dir")" == "edge-conventions" ]]; then
+    return 0
+  fi
+
+  if git -C "$repo_dir" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+    remote_url="$(git -C "$repo_dir" remote get-url origin 2>/dev/null || true)"
+    if [[ "$remote_url" == *"edge-conventions"* ]]; then
+      return 0
+    fi
+  fi
+
+  echo "ERROR: Repo directory does not appear to be the edge-conventions checkout: $repo_dir" >&2
+  return 1
+}
+
 while [[ $# -gt 0 ]]; do
   case "$1" in
     --stage) DO_STAGE=true; shift ;;
@@ -29,7 +79,14 @@ while [[ $# -gt 0 ]]; do
 done
 
 if [[ -z "$REPO_DIR" ]]; then
-  echo "Usage: convention-sync.sh <repo-dir> [--stage] [--commit -m \"message\"]" >&2
+  if ! REPO_DIR="$(resolve_default_repo_dir)"; then
+    echo "ERROR: Could not resolve the edge-conventions repo. Run with an explicit repo path." >&2
+    echo "Usage: convention-sync.sh [repo-dir] [--stage] [--commit -m \"message\"]" >&2
+    exit 1
+  fi
+fi
+
+if ! validate_repo_dir "$REPO_DIR"; then
   exit 1
 fi
 
@@ -191,11 +248,12 @@ if [[ "$DO_STAGE" == true && "$total" -gt 0 ]]; then
 fi
 
 jq -n \
+  --arg repoDir "$REPO_DIR" \
   --argjson new "$new_json" \
   --argjson modified "$mod_json" \
   --argjson deleted "$del_json" \
   --argjson ignored "$ignored_json" \
   --argjson total "$total" \
   --arg staged "$DO_STAGE" \
   --arg committed "$DO_COMMIT" \
-  '{total: $total, new: $new, modified: $modified, deleted: $deleted, ignored: $ignored, staged: ($staged == "true"), committed: ($committed == "true")}'
+  '{repoDir: $repoDir, total: $total, new: $new, modified: $modified, deleted: $deleted, ignored: $ignored, staged: ($staged == "true"), committed: ($committed == "true")}'