diff --git a/AGENTS.md b/AGENTS.md
index 8c00bf1..9d77104 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -6,7 +6,7 @@ You are an expert Software Engineer working on this project. Your primary respon
 **"If it's not documented in `docs/tasks/`, it didn't happen."**
 
 ## Workflow
-1.  **Pick a Task**: Run `python3 scripts/tasks.py context` to see active tasks, or `list` to see pending ones.
+1.  **Pick a Task**: Run `python3 scripts/tasks.py next` to find the best task, `context` to see active tasks, or `list` to see pending ones.
 2.  **Plan & Document**:
     *   **Memory Check**: Run `python3 scripts/memory.py list` (or use the Memory Skill) to recall relevant long-term information.
     *   **Security Check**: Ask the user about specific security considerations for this task.
diff --git a/templates/task.md b/templates/task.md
new file mode 100644
index 0000000..58a9703
--- /dev/null
+++ b/templates/task.md
@@ -0,0 +1,23 @@
+# Task: {title}
+
+## Task Information
+- **Task ID**: {task_id}
+- **Status**: pending
+- **Priority**: medium
+- **Phase**: 1
+- **Estimated Effort**: 1 day
+- **Dependencies**: None
+
+## Task Details
+
+### Description
+{description}
+
+### Acceptance Criteria
+- [ ] Criterion 1
+- [ ] Criterion 2
+
+---
+
+*Created: {date}*
+*Status: pending*