diff --git a/templates/commands/constitution.md b/templates/commands/constitution.md
index 29ae9a09e2..b335155822 100644
--- a/templates/commands/constitution.md
+++ b/templates/commands/constitution.md
@@ -80,7 +80,7 @@ Follow this execution flow:
    - Read `.specify/templates/plan-template.md` and ensure any "Constitution Check" or rules align with updated principles.
    - Read `.specify/templates/spec-template.md` for scope/requirements alignment—update if constitution adds/removes mandatory sections or constraints.
    - Read `.specify/templates/tasks-template.md` and ensure task categorization reflects new or removed principle-driven task types (e.g., observability, versioning, testing discipline).
-   - Read each command file in `.specify/templates/commands/*.md` (including this one) to verify no outdated references (agent-specific names like CLAUDE only) remain when generic guidance is required.
+   - Review each installed command file to verify no outdated references (agent-specific names like CLAUDE only) remain when generic guidance is required. Paths vary by integration — e.g. `.claude/skills/speckit-*/SKILL.md` (Claude Code), `.github/prompts/speckit.*.prompt.md` (Copilot), or `.specify/templates/commands/*.md` when a preset ships them. Consult the active integration's skills/commands directory rather than assuming a single location.
    - Read any runtime guidance docs (e.g., `README.md`, `docs/quickstart.md`, or agent-specific guidance files if present). Update references to principles changed.
 
 5. Produce a Sync Impact Report (prepend as an HTML comment at top of the constitution file after update):
diff --git a/templates/commands/implement.md b/templates/commands/implement.md
index 9a91d2dc4b..c5bf2e5bf4 100644
--- a/templates/commands/implement.md
+++ b/templates/commands/implement.md
@@ -135,7 +135,7 @@ You **MUST** consider the user input before proceeding (if not empty).
    - **Kubernetes/k8s**: `*.secret.yaml`, `secrets/`, `.kube/`, `kubeconfig*`, `*.key`, `*.crt`
 
 5. Parse tasks.md structure and extract:
-   - **Task phases**: Setup, Tests, Core, Integration, Polish
+   - **Task phases**: Setup, Foundational, User Stories (one phase per story, in priority order), Polish (matches the phase structure emitted by `/speckit.tasks`; see `templates/commands/tasks.md`)
    - **Task dependencies**: Sequential vs parallel execution rules
    - **Task details**: ID, description, file paths, parallel markers [P]
    - **Execution flow**: Order and dependency requirements
diff --git a/templates/commands/plan.md b/templates/commands/plan.md
index 04db94ffaa..e4f3cc4c2e 100644
--- a/templates/commands/plan.md
+++ b/templates/commands/plan.md
@@ -70,7 +70,7 @@ You **MUST** consider the user input before proceeding (if not empty).
    - Phase 1: Update agent context by running the agent script
    - Re-evaluate Constitution Check post-design
 
-4. **Stop and report**: Command ends after Phase 2 planning. Report branch, IMPL_PLAN path, and generated artifacts.
+4. **Stop and report**: Command ends after Phase 1 (data-model & contracts). Report branch, IMPL_PLAN path, and generated artifacts.
 
 5. **Check for extension hooks**: After reporting, check if `.specify/extensions.yml` exists in the project root.
    - If it exists, read it and look for entries under the `hooks.after_plan` key
diff --git a/templates/commands/taskstoissues.md b/templates/commands/taskstoissues.md
index 77db7be130..7c4ff5710a 100644
--- a/templates/commands/taskstoissues.md
+++ b/templates/commands/taskstoissues.md
@@ -51,8 +51,8 @@ You **MUST** consider the user input before proceeding (if not empty).
 ## Outline
 
 1. Run `{SCRIPT}` from repo root and parse FEATURE_DIR and AVAILABLE_DOCS list. All paths must be absolute. For single quotes in args like "I'm Groot", use escape syntax: e.g 'I'\''m Groot' (or double-quote if possible: "I'm Groot").
-1. From the executed script, extract the path to **tasks**.
-1. Get the Git remote by running:
+2. From the executed script, extract the path to **tasks**.
+3. Get the Git remote by running:
 
 ```bash
 git config --get remote.origin.url
@@ -61,7 +61,7 @@ git config --get remote.origin.url
 > [!CAUTION]
 > ONLY PROCEED TO NEXT STEPS IF THE REMOTE IS A GITHUB URL
 
-1. For each task in the list, use the GitHub MCP server to create a new issue in the repository that is representative of the Git remote.
+4. For each task in the list, use the GitHub MCP server to create a new issue in the repository that is representative of the Git remote.
 
 > [!CAUTION]
 > UNDER NO CIRCUMSTANCES EVER CREATE ISSUES IN REPOSITORIES THAT DO NOT MATCH THE REMOTE URL