Fix workflow and command documentation issues

- Fix review process to include uncommitted changes alongside committed changes
- Add fallback mechanism for base branch detection when origin/HEAD is not set
- Standardize timestamp format to YYYYMMDDTHHMM across all commands
- Add stash/restore protection to fix-pr workflow before git operations
- Add explicit cancel check after final await in async polling example
- Make stash/restore conditional on having uncommitted changes in codeit
- Add directory verification before destructive rm commands in debug-edge

Author: cursoragent

.cursor/agents/review-async.md

@@ -89,6 +89,7 @@ const pollForStatus = async (cancel: { cancelled: boolean }) => {
     if (cancel.cancelled) return
     if (status === 'complete') return status
     await sleep(2000)
+    if (cancel.cancelled) return
   }
 }
 ```

.cursor/commands/codeit.md

@@ -12,7 +12,10 @@ Execute a planning document and iteratively refine the implementation until it p
 
 ### Phase 1: Preparation
 
-1. Stash any uncommitted changes (preserve the working directory)
+1. Check for uncommitted changes and stash if present:
+   - Run `git diff --quiet && git diff --cached --quiet` to check for changes
+   - If there are changes (command returns non-zero), run `git stash push -m "codeit: preserving work"` and track that a stash was created
+   - If working directory is clean, skip stashing and note that no restore is needed
 2. Identify the target repository from the planning document
 3. Change to the repository directory
 
@@ -69,7 +72,7 @@ Iterate until the code passes review (maximum 5 iterations):
 
 1. Report success to the user
 2. Summarize the implementation and any fixes made
-3. Restore any stashed changes
+3. Restore stashed changes only if a stash was created in Phase 1 (run `git stash pop`)
 
 ## Constraints
 

.cursor/commands/scrapebugs.md

@@ -216,9 +216,9 @@ mkdir -p .cursor/tmp
 ```
 
 Then write the report to:
-`.cursor/tmp/MMDDhhmm_bug-analysis-<repo>.md`
+`.cursor/tmp/YYYYMMDDTHHMM_bug-analysis-<repo>.md`
 
-Example: `.cursor/tmp/01280406_bug-analysis-edge-react-gui.md`
+Example: `.cursor/tmp/20260128T0406_bug-analysis-edge-react-gui.md`
 
 ---
 

.cursor/skills/debug-edge/SKILL.md

@@ -37,9 +37,14 @@ yarn prepare
 
 ## Step 2: Clean iOS Build Artifacts
 
-Remove cached iOS build files:
+First verify you are in the correct directory, then remove cached iOS build files:
 
 ```bash
+# Verify working directory before destructive operations
+if [[ "$(basename "$(pwd)")" != "edge-react-gui" ]]; then
+  echo "Error: Must be in edge-react-gui directory, currently in $(pwd)"
+  exit 1
+fi
 rm -rf ios/Pods && rm -rf ios/build
 ```
 

.cursor/skills/fix-pr/SKILL.md

@@ -41,7 +41,7 @@ Skip comments where:
 
 ### Plan Document Format
 
-Name the document: `MMDDhhmm_[repository-name]_[branch-name]_pr-[pr-number]_fixplan.md`
+Name the document: `YYYYMMDDTHHMM_[repository-name]_[branch-name]_pr-[pr-number]_fixplan.md`
 
 Structure the plan as:
 
@@ -87,7 +87,14 @@ Do not proceed until the user explicitly confirms the plan.
 
 ## Implementing Fixes
 
-Once the user approves the plan, process each fix item:
+Once the user approves the plan:
+
+1. **Stash uncommitted changes** to preserve the working directory:
+   - Check if there are uncommitted changes: `git diff --quiet && git diff --cached --quiet`
+   - If there are changes (command returns non-zero), run `git stash push -m "fixpr: preserving work"` and note that a stash was created
+   - If working directory is clean, skip stashing
+
+2. Process each fix item:
 
 For each fix in the plan:
 
@@ -113,7 +120,8 @@ After all fixes are implemented:
    ```bash
    git push --force-with-lease origin <branch-name>
    ```
-3. Optionally, reply to resolved review comments on GitHub using the MCP server
+3. **Restore stashed changes** if a stash was created earlier: `git stash pop`
+4. Optionally, reply to resolved review comments on GitHub using the MCP server
 
 ## Important Warnings
 

.cursor/skills/review-code/SKILL.md

@@ -44,6 +44,11 @@ If a branch name is provided (not a PR):
    ```bash
    git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'
    ```
+   If this command fails (common in forked repos or non-standard configs), use fallback detection:
+   - Try `git remote show origin | grep 'HEAD branch' | sed 's/.*: //'`
+   - If that fails, check if `origin/master` exists: `git rev-parse --verify origin/master`
+   - If not, check if `origin/main` exists: `git rev-parse --verify origin/main`
+   - Use whichever branch exists, defaulting to `master` if neither can be verified
 5. If the branch has uncommitted or unstaged changes (no commits beyond the base), use `git diff` for unstaged changes and `git diff --cached` for staged changes instead of `git diff <base>...HEAD`. No git checkout operations are needed in this case.
 6. Skip the GitHub MCP sections and proceed directly to **Review Process**
 
@@ -133,7 +138,7 @@ If branch checkout fails (e.g., fork was deleted, network issues), use the attac
 ## Review Process
 
 1. Get the complete diff:
-   - **For local branches**: `git diff <base-branch>...HEAD` (e.g., `git diff master...HEAD`)
+   - **For local branches**: First check for uncommitted changes with `git diff` (unstaged) and `git diff --cached` (staged). If uncommitted changes exist, include them alongside `git diff <base-branch>...HEAD` so the review covers both committed and uncommitted work. If the branch has no commits beyond the base (HEAD equals base), use only `git diff` and `git diff --cached`.
    - **For PRs with local checkout**: `git diff <base>...HEAD`
    - **For PRs without checkout**: Read the attached diff from `/pull-requests/pr-<number>/all.diff`
 
@@ -176,8 +181,8 @@ cursor --reuse-window <review-document-path>
 ```
 
 Name the document:
-- **For PRs**: `MMDDhhmm_[repository-name]_[branch-name]_pr-[pr-number].md`
-- **For local branches**: `MMDDhhmm_[repository-name]_[branch-name]_review.md`
+- **For PRs**: `YYYYMMDDTHHMM_[repository-name]_[branch-name]_pr-[pr-number].md`
+- **For local branches**: `YYYYMMDDTHHMM_[repository-name]_[branch-name]_review.md`
 
 Pause for the user to review.