diff --git a/drizzle/0008_harsh_overlord.sql b/drizzle/0008_harsh_overlord.sql
new file mode 100644
index 000000000..fd4d83682
--- /dev/null
+++ b/drizzle/0008_harsh_overlord.sql
@@ -0,0 +1,10 @@
+CREATE TABLE `prompt_templates` (
+	`id` text PRIMARY KEY NOT NULL,
+	`name` text NOT NULL,
+	`text` text NOT NULL,
+	`sort_order` integer DEFAULT 0 NOT NULL,
+	`created_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL,
+	`updated_at` text DEFAULT CURRENT_TIMESTAMP NOT NULL
+);
+--> statement-breakpoint
+CREATE INDEX `idx_prompt_templates_sort_order` ON `prompt_templates` (`sort_order`);
\ No newline at end of file
diff --git a/drizzle/meta/0008_snapshot.json b/drizzle/meta/0008_snapshot.json
new file mode 100644
index 000000000..f2ddc7361
--- /dev/null
+++ b/drizzle/meta/0008_snapshot.json
@@ -0,0 +1,1351 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "16c733f3-096d-4755-ad6a-c0e7fc0ac08d",
+  "prevId": "68b5cc95-67aa-4078-94fa-c10caad8d9eb",
+  "tables": {
+    "app_secrets": {
+      "name": "app_secrets",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "secret": {
+          "name": "secret",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_app_secrets_key": {
+          "name": "idx_app_secrets_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "app_settings": {
+      "name": "app_settings",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_app_settings_key": {
+          "name": "idx_app_settings_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "conversations": {
+      "name": "conversations",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "config": {
+          "name": "config",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_conversations_task_id": {
+          "name": "idx_conversations_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "conversations_project_id_projects_id_fk": {
+          "name": "conversations_project_id_projects_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "conversations_task_id_tasks_id_fk": {
+          "name": "conversations_task_id_tasks_id_fk",
+          "tableFrom": "conversations",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "editor_buffers": {
+      "name": "editor_buffers",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "file_path": {
+          "name": "file_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_editor_buffers_workspace_file": {
+          "name": "idx_editor_buffers_workspace_file",
+          "columns": ["workspace_id", "file_path"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "editor_buffers_project_id_projects_id_fk": {
+          "name": "editor_buffers_project_id_projects_id_fk",
+          "tableFrom": "editor_buffers",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "kv": {
+      "name": "kv",
+      "columns": {
+        "key": {
+          "name": "key",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_kv_key": {
+          "name": "idx_kv_key",
+          "columns": ["key"],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "messages": {
+      "name": "messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conversation_id": {
+          "name": "conversation_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sender": {
+          "name": "sender",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "timestamp": {
+          "name": "timestamp",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_messages_conversation_id": {
+          "name": "idx_messages_conversation_id",
+          "columns": ["conversation_id"],
+          "isUnique": false
+        },
+        "idx_messages_timestamp": {
+          "name": "idx_messages_timestamp",
+          "columns": ["timestamp"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "messages_conversation_id_conversations_id_fk": {
+          "name": "messages_conversation_id_conversations_id_fk",
+          "tableFrom": "messages",
+          "tableTo": "conversations",
+          "columnsFrom": ["conversation_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "project_remotes": {
+      "name": "project_remotes",
+      "columns": {
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_name": {
+          "name": "remote_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "remote_url": {
+          "name": "remote_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "project_remotes_project_id_projects_id_fk": {
+          "name": "project_remotes_project_id_projects_id_fk",
+          "tableFrom": "project_remotes",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "project_remotes_project_id_remote_name_pk": {
+          "columns": ["project_id", "remote_name"],
+          "name": "project_remotes_project_id_remote_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "projects": {
+      "name": "projects",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "path": {
+          "name": "path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'local'"
+        },
+        "base_ref": {
+          "name": "base_ref",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "ssh_connection_id": {
+          "name": "ssh_connection_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_projects_path": {
+          "name": "idx_projects_path",
+          "columns": ["path"],
+          "isUnique": true
+        },
+        "idx_projects_ssh_connection_id": {
+          "name": "idx_projects_ssh_connection_id",
+          "columns": ["ssh_connection_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "projects_ssh_connection_id_ssh_connections_id_fk": {
+          "name": "projects_ssh_connection_id_ssh_connections_id_fk",
+          "tableFrom": "projects",
+          "tableTo": "ssh_connections",
+          "columnsFrom": ["ssh_connection_id"],
+          "columnsTo": ["id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "prompt_templates": {
+      "name": "prompt_templates",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "text": {
+          "name": "text",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sort_order": {
+          "name": "sort_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_prompt_templates_sort_order": {
+          "name": "idx_prompt_templates_sort_order",
+          "columns": ["sort_order"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_assignees": {
+      "name": "pull_request_assignees",
+      "columns": {
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_pra_pull_request_url": {
+          "name": "idx_pra_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        },
+        "idx_pra_user_id": {
+          "name": "idx_pra_user_id",
+          "columns": ["user_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_assignees_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_assignees_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "pull_request_assignees_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_request_assignees_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_request_assignees",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_assignees_pull_request_url_user_id_pk": {
+          "columns": ["pull_request_url", "user_id"],
+          "name": "pull_request_assignees_pull_request_url_user_id_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_checks": {
+      "name": "pull_request_checks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pull_request_url": {
+          "name": "pull_request_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "commit_sha": {
+          "name": "commit_sha",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "conclusion": {
+          "name": "conclusion",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "details_url": {
+          "name": "details_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "started_at": {
+          "name": "started_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "completed_at": {
+          "name": "completed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workflow_name": {
+          "name": "workflow_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_name": {
+          "name": "app_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "app_logo_url": {
+          "name": "app_logo_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prc_pull_request_url": {
+          "name": "idx_prc_pull_request_url",
+          "columns": ["pull_request_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_checks_pull_request_url_pull_requests_url_fk": {
+          "name": "pull_request_checks_pull_request_url_pull_requests_url_fk",
+          "tableFrom": "pull_request_checks",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_url"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_request_labels": {
+      "name": "pull_request_labels",
+      "columns": {
+        "pull_request_id": {
+          "name": "pull_request_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "color": {
+          "name": "color",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_prl_name": {
+          "name": "idx_prl_name",
+          "columns": ["name"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_request_labels_pull_request_id_pull_requests_url_fk": {
+          "name": "pull_request_labels_pull_request_id_pull_requests_url_fk",
+          "tableFrom": "pull_request_labels",
+          "tableTo": "pull_requests",
+          "columnsFrom": ["pull_request_id"],
+          "columnsTo": ["url"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "pull_request_labels_pull_request_id_name_pk": {
+          "columns": ["pull_request_id", "name"],
+          "name": "pull_request_labels_pull_request_id_name_pk"
+        }
+      },
+      "uniqueConstraints": {}
+    },
+    "pull_request_users": {
+      "name": "pull_request_users",
+      "columns": {
+        "user_id": {
+          "name": "user_id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "user_name": {
+          "name": "user_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "display_name": {
+          "name": "display_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "avatar_url": {
+          "name": "avatar_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_updated_at": {
+          "name": "user_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "user_created_at": {
+          "name": "user_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "pull_requests": {
+      "name": "pull_requests",
+      "columns": {
+        "url": {
+          "name": "url",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'github'"
+        },
+        "repository_url": {
+          "name": "repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_name": {
+          "name": "base_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "base_ref_oid": {
+          "name": "base_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_repository_url": {
+          "name": "head_repository_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_name": {
+          "name": "head_ref_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "head_ref_oid": {
+          "name": "head_ref_oid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'open'"
+        },
+        "is_draft": {
+          "name": "is_draft",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "author_user_id": {
+          "name": "author_user_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "additions": {
+          "name": "additions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "deletions": {
+          "name": "deletions",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "changed_files": {
+          "name": "changed_files",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "commit_count": {
+          "name": "commit_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mergeable_status": {
+          "name": "mergeable_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "merge_state_status": {
+          "name": "merge_state_status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "review_decision": {
+          "name": "review_decision",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "pull_request_created_at": {
+          "name": "pull_request_created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "pull_request_updated_at": {
+          "name": "pull_request_updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_pull_requests_url": {
+          "name": "idx_pull_requests_url",
+          "columns": ["url"],
+          "isUnique": true
+        },
+        "idx_pull_requests_repository_url": {
+          "name": "idx_pull_requests_repository_url",
+          "columns": ["repository_url"],
+          "isUnique": false
+        },
+        "idx_pull_requests_head_repository_url": {
+          "name": "idx_pull_requests_head_repository_url",
+          "columns": ["head_repository_url"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "pull_requests_author_user_id_pull_request_users_user_id_fk": {
+          "name": "pull_requests_author_user_id_pull_request_users_user_id_fk",
+          "tableFrom": "pull_requests",
+          "tableTo": "pull_request_users",
+          "columnsFrom": ["author_user_id"],
+          "columnsTo": ["user_id"],
+          "onDelete": "set null",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "ssh_connections": {
+      "name": "ssh_connections",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "host": {
+          "name": "host",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "port": {
+          "name": "port",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 22
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "auth_type": {
+          "name": "auth_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'agent'"
+        },
+        "private_key_path": {
+          "name": "private_key_path",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "use_agent": {
+          "name": "use_agent",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_ssh_connections_name": {
+          "name": "idx_ssh_connections_name",
+          "columns": ["name"],
+          "isUnique": true
+        },
+        "idx_ssh_connections_host": {
+          "name": "idx_ssh_connections_host",
+          "columns": ["host"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "tasks": {
+      "name": "tasks",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "source_branch": {
+          "name": "source_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "task_branch": {
+          "name": "task_branch",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "linked_issue": {
+          "name": "linked_issue",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "archived_at": {
+          "name": "archived_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "last_interacted_at": {
+          "name": "last_interacted_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status_changed_at": {
+          "name": "status_changed_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "is_pinned": {
+          "name": "is_pinned",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "workspace_provider": {
+          "name": "workspace_provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_id": {
+          "name": "workspace_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "workspace_provider_data": {
+          "name": "workspace_provider_data",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "idx_tasks_project_id": {
+          "name": "idx_tasks_project_id",
+          "columns": ["project_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "tasks_project_id_projects_id_fk": {
+          "name": "tasks_project_id_projects_id_fk",
+          "tableFrom": "tasks",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "terminals": {
+      "name": "terminals",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "project_id": {
+          "name": "project_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "task_id": {
+          "name": "task_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "ssh": {
+          "name": "ssh",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": 0
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "CURRENT_TIMESTAMP"
+        }
+      },
+      "indexes": {
+        "idx_terminals_task_id": {
+          "name": "idx_terminals_task_id",
+          "columns": ["task_id"],
+          "isUnique": false
+        }
+      },
+      "foreignKeys": {
+        "terminals_project_id_projects_id_fk": {
+          "name": "terminals_project_id_projects_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "projects",
+          "columnsFrom": ["project_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "terminals_task_id_tasks_id_fk": {
+          "name": "terminals_task_id_tasks_id_fk",
+          "tableFrom": "terminals",
+          "tableTo": "tasks",
+          "columnsFrom": ["task_id"],
+          "columnsTo": ["id"],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index 236853131..fcfcbb433 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -57,6 +57,13 @@
       "when": 1777399834705,
       "tag": "0007_bent_spitfire",
       "breakpoints": true
+    },
+    {
+      "idx": 8,
+      "version": "6",
+      "when": 1777551942949,
+      "tag": "0008_harsh_overlord",
+      "breakpoints": true
     }
   ]
 }
diff --git a/src/main/core/prompt-templates/controller.ts b/src/main/core/prompt-templates/controller.ts
new file mode 100644
index 000000000..40ad6763a
--- /dev/null
+++ b/src/main/core/prompt-templates/controller.ts
@@ -0,0 +1,26 @@
+import { createRPCController } from '@shared/ipc/rpc';
+import type {
+  CreatePromptTemplateInput,
+  PromptTemplate,
+  UpdatePromptTemplateInput,
+} from '@shared/prompt-templates';
+import { db } from '@main/db/client';
+import { PromptTemplateService } from './service';
+
+const promptTemplateService = new PromptTemplateService(db);
+
+export const promptTemplatesController = createRPCController({
+  list: (): Promise<PromptTemplate[]> => promptTemplateService.list(),
+
+  getById: (id: string): Promise<PromptTemplate | null> => promptTemplateService.getById(id),
+
+  create: (input: CreatePromptTemplateInput): Promise<PromptTemplate> =>
+    promptTemplateService.create(input),
+
+  update: (id: string, input: UpdatePromptTemplateInput): Promise<PromptTemplate> =>
+    promptTemplateService.update(id, input),
+
+  delete: (id: string): Promise<void> => promptTemplateService.delete(id),
+
+  reorder: (ids: string[]): Promise<void> => promptTemplateService.reorder(ids),
+});
diff --git a/src/main/core/prompt-templates/service.test.ts b/src/main/core/prompt-templates/service.test.ts
new file mode 100644
index 000000000..a8238bfd9
--- /dev/null
+++ b/src/main/core/prompt-templates/service.test.ts
@@ -0,0 +1,123 @@
+import Database from 'better-sqlite3';
+import { drizzle } from 'drizzle-orm/better-sqlite3';
+import { beforeEach, describe, expect, it } from 'vitest';
+import * as schema from '@main/db/schema';
+import { PromptTemplateService } from './service';
+
+function createTestDb() {
+  const sqlite = new Database(':memory:');
+  const db = drizzle(sqlite, { schema });
+  // Create the prompt_templates table manually since we're not running migrations
+  sqlite.exec(`
+    CREATE TABLE prompt_templates (
+      id TEXT PRIMARY KEY NOT NULL,
+      name TEXT NOT NULL,
+      text TEXT NOT NULL,
+      sort_order INTEGER DEFAULT 0 NOT NULL,
+      created_at TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL,
+      updated_at TEXT DEFAULT CURRENT_TIMESTAMP NOT NULL
+    );
+    CREATE INDEX idx_prompt_templates_sort_order ON prompt_templates (sort_order);
+  `);
+  return db;
+}
+
+describe('PromptTemplateService', () => {
+  let service: PromptTemplateService;
+
+  beforeEach(() => {
+    const db = createTestDb();
+    service = new PromptTemplateService(db);
+  });
+
+  it('lists templates ordered by sortOrder', async () => {
+    const t1 = await service.create({ name: 'A', text: 'text A' });
+    const t2 = await service.create({ name: 'B', text: 'text B' });
+    await service.reorder([t2.id, t1.id]);
+
+    const list = await service.list();
+    expect(list.map((t) => t.name)).toEqual(['B', 'A']);
+  });
+
+  it('creates a template with incremental sortOrder', async () => {
+    const t1 = await service.create({ name: 'First', text: 'hello' });
+    const t2 = await service.create({ name: 'Second', text: 'world' });
+    expect(t1.sortOrder).toBe(0);
+    expect(t2.sortOrder).toBe(1);
+  });
+
+  it('rejects empty name', async () => {
+    await expect(service.create({ name: '   ', text: 'valid' })).rejects.toThrow(
+      'Template name is required'
+    );
+  });
+
+  it('rejects empty text', async () => {
+    await expect(service.create({ name: 'valid', text: '   ' })).rejects.toThrow(
+      'Template text is required'
+    );
+  });
+
+  it('rejects name over 64 chars', async () => {
+    await expect(service.create({ name: 'x'.repeat(65), text: 'valid' })).rejects.toThrow(
+      'Template name must be 64 characters or fewer'
+    );
+  });
+
+  it('rejects text over 4000 chars', async () => {
+    await expect(service.create({ name: 'valid', text: 'x'.repeat(4001) })).rejects.toThrow(
+      'Template text must be 4000 characters or fewer'
+    );
+  });
+
+  it('updates a template', async () => {
+    const t = await service.create({ name: 'Old', text: 'old text' });
+    const updated = await service.update(t.id, { name: 'New', text: 'new text' });
+    expect(updated.name).toBe('New');
+    expect(updated.text).toBe('new text');
+  });
+
+  it('throws when updating non-existent template', async () => {
+    await expect(service.update('nonexistent', { name: 'X' })).rejects.toThrow(
+      'Prompt template nonexistent not found'
+    );
+  });
+
+  it('deletes a template', async () => {
+    const t = await service.create({ name: 'ToDelete', text: 'bye' });
+    await service.delete(t.id);
+    const found = await service.getById(t.id);
+    expect(found).toBeNull();
+  });
+
+  it('reorders templates', async () => {
+    const t1 = await service.create({ name: '1', text: 'a' });
+    const t2 = await service.create({ name: '2', text: 'b' });
+    const t3 = await service.create({ name: '3', text: 'c' });
+    await service.reorder([t3.id, t1.id, t2.id]);
+
+    const list = await service.list();
+    expect(list.map((t) => t.name)).toEqual(['3', '1', '2']);
+    expect(list[0]!.sortOrder).toBe(0);
+    expect(list[1]!.sortOrder).toBe(1);
+    expect(list[2]!.sortOrder).toBe(2);
+  });
+
+  it('rejects partial reorder lists', async () => {
+    const t1 = await service.create({ name: '1', text: 'a' });
+    await service.create({ name: '2', text: 'b' });
+
+    await expect(service.reorder([t1.id])).rejects.toThrow(
+      'Reorder request must include all prompt templates'
+    );
+  });
+
+  it('rejects duplicate ids in reorder list', async () => {
+    const t1 = await service.create({ name: '1', text: 'a' });
+    await service.create({ name: '2', text: 'b' });
+
+    await expect(service.reorder([t1.id, t1.id])).rejects.toThrow(
+      'Reorder request contains duplicate template IDs'
+    );
+  });
+});
diff --git a/src/main/core/prompt-templates/service.ts b/src/main/core/prompt-templates/service.ts
new file mode 100644
index 000000000..9ddc93e01
--- /dev/null
+++ b/src/main/core/prompt-templates/service.ts
@@ -0,0 +1,155 @@
+import { randomUUID } from 'node:crypto';
+import { count, desc, eq, inArray } from 'drizzle-orm';
+import {
+  MAX_PROMPT_TEMPLATES,
+  type CreatePromptTemplateInput,
+  type PromptTemplate,
+  type UpdatePromptTemplateInput,
+} from '@shared/prompt-templates';
+import type { AppDb } from '@main/db/client';
+import { promptTemplates } from '@main/db/schema';
+
+const MAX_NAME_LENGTH = 64;
+const MAX_TEXT_LENGTH = 4000;
+
+function validateName(name: string): void {
+  const trimmed = name.trim();
+  if (!trimmed) throw new Error('Template name is required');
+  if (trimmed.length > MAX_NAME_LENGTH)
+    throw new Error(`Template name must be ${MAX_NAME_LENGTH} characters or fewer`);
+}
+
+function validateText(text: string): void {
+  const trimmed = text.trim();
+  if (!trimmed) throw new Error('Template text is required');
+  if (trimmed.length > MAX_TEXT_LENGTH)
+    throw new Error(`Template text must be ${MAX_TEXT_LENGTH} characters or fewer`);
+}
+
+function toModel(row: typeof promptTemplates.$inferSelect): PromptTemplate {
+  return {
+    id: row.id,
+    name: row.name,
+    text: row.text,
+    sortOrder: row.sortOrder,
+    createdAt: row.createdAt,
+    updatedAt: row.updatedAt,
+  };
+}
+
+export class PromptTemplateService {
+  private db: AppDb;
+
+  constructor(database: AppDb) {
+    this.db = database;
+  }
+
+  async list(): Promise<PromptTemplate[]> {
+    const rows = await this.db
+      .select()
+      .from(promptTemplates)
+      .orderBy(promptTemplates.sortOrder, promptTemplates.createdAt);
+    return rows.map(toModel);
+  }
+
+  async getById(id: string): Promise<PromptTemplate | null> {
+    const [row] = await this.db
+      .select()
+      .from(promptTemplates)
+      .where(eq(promptTemplates.id, id))
+      .limit(1);
+    return row ? toModel(row) : null;
+  }
+
+  async create(input: CreatePromptTemplateInput): Promise<PromptTemplate> {
+    validateName(input.name);
+    validateText(input.text);
+
+    const [countRow] = await this.db.select({ value: count() }).from(promptTemplates);
+    if (countRow.value >= MAX_PROMPT_TEMPLATES) {
+      throw new Error(`You can create up to ${MAX_PROMPT_TEMPLATES} templates`);
+    }
+
+    const [maxRow] = await this.db
+      .select({ sortOrder: promptTemplates.sortOrder })
+      .from(promptTemplates)
+      .orderBy(desc(promptTemplates.sortOrder))
+      .limit(1);
+    const nextSortOrder = (maxRow?.sortOrder ?? -1) + 1;
+
+    const id = randomUUID();
+    const now = new Date().toISOString();
+    const insertData = {
+      id,
+      name: input.name.trim(),
+      text: input.text.trim(),
+      sortOrder: nextSortOrder,
+      createdAt: now,
+      updatedAt: now,
+    };
+
+    await this.db.insert(promptTemplates).values(insertData);
+    return toModel(insertData);
+  }
+
+  async update(id: string, input: UpdatePromptTemplateInput): Promise<PromptTemplate> {
+    const existing = await this.getById(id);
+    if (!existing) throw new Error(`Prompt template ${id} not found`);
+
+    if (input.name !== undefined) validateName(input.name);
+    if (input.text !== undefined) validateText(input.text);
+
+    const updates: Partial<typeof promptTemplates.$inferInsert> = {};
+    if (input.name !== undefined) updates.name = input.name.trim();
+    if (input.text !== undefined) updates.text = input.text.trim();
+    if (input.sortOrder !== undefined) updates.sortOrder = input.sortOrder;
+    updates.updatedAt = new Date().toISOString();
+
+    await this.db.update(promptTemplates).set(updates).where(eq(promptTemplates.id, id));
+
+    return {
+      ...existing,
+      name: updates.name ?? existing.name,
+      text: updates.text ?? existing.text,
+      sortOrder: updates.sortOrder ?? existing.sortOrder,
+      updatedAt: updates.updatedAt ?? existing.updatedAt,
+    };
+  }
+
+  async delete(id: string): Promise<void> {
+    await this.db.delete(promptTemplates).where(eq(promptTemplates.id, id));
+  }
+
+  async reorder(ids: string[]): Promise<void> {
+    const [countRow] = await this.db.select({ value: count() }).from(promptTemplates);
+    const totalTemplates = countRow.value;
+    if (totalTemplates === 0 && ids.length === 0) return;
+
+    if (ids.length !== totalTemplates) {
+      throw new Error('Reorder request must include all prompt templates');
+    }
+
+    if (new Set(ids).size !== ids.length) {
+      throw new Error('Reorder request contains duplicate template IDs');
+    }
+
+    const existingRows = await this.db
+      .select({ id: promptTemplates.id })
+      .from(promptTemplates)
+      .where(inArray(promptTemplates.id, ids));
+
+    if (existingRows.length !== ids.length) {
+      throw new Error('One or more prompt templates were not found');
+    }
+
+    const now = new Date().toISOString();
+    this.db.transaction((tx) => {
+      for (let i = 0; i < ids.length; i++) {
+        tx.update(promptTemplates)
+          .set({ sortOrder: i, updatedAt: now })
+          .where(eq(promptTemplates.id, ids[i]))
+          .run();
+      }
+    });
+  }
+}
diff --git a/src/main/db/schema.ts b/src/main/db/schema.ts
index 2de8e420b..af8d19e6c 100644
--- a/src/main/db/schema.ts
+++ b/src/main/db/schema.ts
@@ -86,6 +86,25 @@ export const appSettings = sqliteTable(
   })
 );
 
+export const promptTemplates = sqliteTable(
+  'prompt_templates',
+  {
+    id: text('id').primaryKey(),
+    name: text('name').notNull(),
+    text: text('text').notNull(),
+    sortOrder: integer('sort_order').notNull().default(0),
+    createdAt: text('created_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+    updatedAt: text('updated_at')
+      .notNull()
+      .default(sql`CURRENT_TIMESTAMP`),
+  },
+  (table) => ({
+    sortOrderIdx: index('idx_prompt_templates_sort_order').on(table.sortOrder),
+  })
+);
+
 export const tasks = sqliteTable(
   'tasks',
   {
@@ -391,6 +410,8 @@ export const messagesRelations = relations(messages, ({ one }) => ({
 
 export type SshConnectionRow = typeof sshConnections.$inferSelect;
 export type SshConnectionInsert = typeof sshConnections.$inferInsert;
+export type PromptTemplateRow = typeof promptTemplates.$inferSelect;
+export type PromptTemplateInsert = typeof promptTemplates.$inferInsert;
 export type ProjectRow = typeof projects.$inferSelect;
 export type TaskRow = typeof tasks.$inferSelect;
 export type ConversationRow = typeof conversations.$inferSelect;
diff --git a/src/main/index.ts b/src/main/index.ts
index 93410235e..603f3fc90 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -3,6 +3,7 @@ import { app, BrowserWindow, dialog, ipcMain } from 'electron';
 import dockIcon from '@/assets/images/emdash/icon-dock.png?asset';
 import { PRODUCT_NAME } from '@shared/app-identity';
 import { registerRPCRouter } from '@shared/ipc/rpc';
+import { STARTER_PROMPT_TEMPLATES } from '@shared/prompt-templates';
 import { setupApplicationMenu } from './app/menu';
 import { registerAppScheme, setupAppProtocol } from './app/protocol';
 import { createMainWindow } from './app/window';
@@ -15,9 +16,11 @@ import { editorBufferService } from './core/editor/editor-buffer-service';
 import { gitWatcherRegistry } from './core/git/git-watcher-registry';
 import { githubConnectionService } from './core/github/services/github-connection-service';
 import { projectManager } from './core/projects/project-manager';
+import { PromptTemplateService } from './core/prompt-templates/service';
 import { prSyncScheduler } from './core/pull-requests/pr-sync-scheduler';
 import { appSettingsService } from './core/settings/settings-service';
 import { updateService } from './core/updates/update-service';
+import { db } from './db/client';
 import { initializeDatabase } from './db/initialize';
 import { log } from './lib/logger';
 import * as telemetry from './lib/telemetry';
@@ -28,6 +31,32 @@ if (process.platform === 'linux') {
   app.commandLine.appendSwitch('ozone-platform-hint', 'auto');
 }
 
+async function migrateReviewPromptToTemplates(): Promise<void> {
+  const service = new PromptTemplateService(db);
+  const existing = await service.list();
+  if (existing.length > 0) return;
+
+  // Migrate old reviewPrompt if it exists and is non-empty
+  let migrated = false;
+  try {
+    const reviewPrompt = await appSettingsService.get('reviewPrompt');
+    const text = (reviewPrompt ?? '').trim();
+    if (text) {
+      await service.create({ name: 'Review prompt', text });
+      migrated = true;
+    }
+  } catch {
+    // If reviewPrompt setting doesn't exist or fails, skip silently
+  }
+
+  // If nothing was migrated, seed the default starter templates
+  if (!migrated) {
+    for (const template of STARTER_PROMPT_TEMPLATES) {
+      await service.create(template);
+    }
+  }
+}
+
 registerAppScheme();
 
 app.setName(PRODUCT_NAME);
@@ -90,6 +119,7 @@ app.whenReady().then(async () => {
   prSyncScheduler.initialize();
   appService.initialize();
   await appSettingsService.initialize();
+  await migrateReviewPromptToTemplates();
 
   agentHookService.initialize().catch((e) => {
     log.error('Failed to start agent event service:', e);
diff --git a/src/main/rpc.ts b/src/main/rpc.ts
index 620286047..a85ced77a 100644
--- a/src/main/rpc.ts
+++ b/src/main/rpc.ts
@@ -15,6 +15,7 @@ import { linearController } from './core/linear/controller';
 import { mcpController } from './core/mcp/controller';
 import { plainController } from './core/plain/controller';
 import { projectController } from './core/projects/controller';
+import { promptTemplatesController } from './core/prompt-templates/controller';
 import { ptyController } from './core/pty/controller';
 import { pullRequestController } from './core/pull-requests/controller';
 import { repositoryController } from './core/repository/controller';
@@ -49,6 +50,7 @@ export const rpcRouter = createRPCRouter({
   skills: skillsController,
   ssh: sshController,
   projects: projectController,
+  promptTemplates: promptTemplatesController,
   tasks: taskController,
   conversations: conversationController,
   terminals: terminalsController,
diff --git a/src/renderer/features/settings/components/PromptTemplatesSettingsCard.tsx b/src/renderer/features/settings/components/PromptTemplatesSettingsCard.tsx
new file mode 100644
index 000000000..d43bed03e
--- /dev/null
+++ b/src/renderer/features/settings/components/PromptTemplatesSettingsCard.tsx
@@ -0,0 +1,352 @@
+import { ArrowDown, ArrowUp, Copy, FileSearch, Pencil, Plus, Trash2, X } from 'lucide-react';
+import { useState } from 'react';
+import {
+  MAX_PROMPT_TEMPLATES,
+  STARTER_PROMPT_TEMPLATES,
+  type PromptTemplate,
+} from '@shared/prompt-templates';
+import { usePromptTemplates } from '@renderer/features/settings/use-prompt-templates';
+import { useToast } from '@renderer/lib/hooks/use-toast';
+import { Button } from '@renderer/lib/ui/button';
+import { Input } from '@renderer/lib/ui/input';
+import { Textarea } from '@renderer/lib/ui/textarea';
+
+const MAX_NAME_LENGTH = 64;
+const MAX_TEXT_LENGTH = 4000;
+
+function PromptTemplateEditor({
+  template,
+  onSave,
+  onCancel,
+  isSaving,
+}: {
+  template?: PromptTemplate;
+  onSave: (name: string, text: string) => void;
+  onCancel: () => void;
+  isSaving: boolean;
+}) {
+  const [name, setName] = useState(template?.name ?? '');
+  const [text, setText] = useState(template?.text ?? '');
+  const canSave = name.trim().length > 0 && text.trim().length > 0 && !isSaving;
+
+  return (
+    <div className="flex flex-col gap-3 rounded-lg border border-border bg-background p-4">
+      <Input
+        placeholder="Template name"
+        value={name}
+        onChange={(e) => setName(e.target.value)}
+        disabled={isSaving}
+        className="text-sm"
+        maxLength={MAX_NAME_LENGTH}
+      />
+      <div className="relative">
+        <Textarea
+          placeholder="Prompt text..."
+          value={text}
+          onChange={(e) => setText(e.target.value)}
+          disabled={isSaving}
+          className="min-h-24 text-sm"
+          maxLength={MAX_TEXT_LENGTH}
+        />
+        <span className="absolute bottom-2 right-2 text-xs text-muted-foreground">
+          {text.length} / {MAX_TEXT_LENGTH}
+        </span>
+      </div>
+      <div className="flex justify-end gap-2">
+        <Button variant="ghost" size="sm" onClick={onCancel} disabled={isSaving}>
+          <X className="mr-1 h-3.5 w-3.5" />
+          Cancel
+        </Button>
+        <Button variant="default" size="sm" onClick={() => onSave(name, text)} disabled={!canSave}>
+          {template ? 'Update' : 'Add'}
+        </Button>
+      </div>
+    </div>
+  );
+}
+
+function EmptyState({
+  onAdd,
+  onPickStarter,
+}: {
+  onAdd: () => void;
+  onPickStarter: (name: string, text: string) => void;
+}) {
+  return (
+    <div className="flex flex-col items-center gap-4 rounded-lg border border-dashed border-border bg-background py-10">
+      <FileSearch className="h-8 w-8 text-muted-foreground" />
+      <div className="flex flex-col items-center gap-1">
+        <p className="text-sm font-medium">No prompt templates yet</p>
+        <p className="text-xs text-muted-foreground">
+          Create reusable prompts for common tasks like review, summarize, and testing.
+        </p>
+      </div>
+      <div className="flex flex-wrap justify-center gap-2 px-4">
+        {STARTER_PROMPT_TEMPLATES.map((starter) => (
+          <Button
+            key={starter.name}
+            variant="outline"
+            size="sm"
+            onClick={() => onPickStarter(starter.name, starter.text)}
+          >
+            <Plus className="mr-1 h-3.5 w-3.5" />
+            {starter.name}
+          </Button>
+        ))}
+      </div>
+      <Button variant="ghost" size="sm" onClick={onAdd}>
+        <Plus className="mr-1 h-3.5 w-3.5" />
+        Create custom template
+      </Button>
+    </div>
+  );
+}
+
+export function PromptTemplatesSettingsCard() {
+  const {
+    templates,
+    isLoading,
+    isSaving,
+    create,
+    update,
+    delete: deleteTemplate,
+    reorder,
+  } = usePromptTemplates();
+  const { toast } = useToast();
+  const [editingId, setEditingId] = useState<string | null>(null);
+  const [isAdding, setIsAdding] = useState(false);
+  const [deletingId, setDeletingId] = useState<string | null>(null);
+  const [draftName, setDraftName] = useState('');
+  const [draftText, setDraftText] = useState('');
+  const isAtMaxTemplates = templates.length >= MAX_PROMPT_TEMPLATES;
+
+  if (isLoading) {
+    return <div className="text-sm text-muted-foreground">Loading...</div>;
+  }
+
+  const handleCreate = (name: string, text: string) => {
+    create(
+      { name, text },
+      {
+        onError: (err) => {
+          toast({
+            title: 'Failed to add template',
+            description: err.message,
+            variant: 'destructive',
+          });
+        },
+        onSuccess: () => {
+          setIsAdding(false);
+          setDraftName('');
+          setDraftText('');
+        },
+      }
+    );
+  };
+
+  const handleUpdate = (id: string, name: string, text: string) => {
+    update(
+      { id, input: { name, text } },
+      {
+        onError: (err) => {
+          toast({
+            title: 'Failed to update template',
+            description: err.message,
+            variant: 'destructive',
+          });
+        },
+        onSuccess: () => setEditingId(null),
+      }
+    );
+  };
+
+  const handleDelete = (id: string) => {
+    deleteTemplate(id, {
+      onError: (err) => {
+        toast({
+          title: 'Failed to delete template',
+          description: err.message,
+          variant: 'destructive',
+        });
+      },
+      onSuccess: () => setDeletingId(null),
+    });
+  };
+
+  const handleDuplicate = (template: PromptTemplate) => {
+    create(
+      { name: `${template.name} (copy)`, text: template.text },
+      {
+        onError: (err) => {
+          toast({
+            title: 'Failed to duplicate template',
+            description: err.message,
+            variant: 'destructive',
+          });
+        },
+      }
+    );
+  };
+
+  const handleMove = (index: number, direction: 'up' | 'down') => {
+    if (templates.length < 2) return;
+    const newIndex = direction === 'up' ? index - 1 : index + 1;
+    if (newIndex < 0 || newIndex >= templates.length) return;
+    const reordered = [...templates];
+    const [moved] = reordered.splice(index, 1);
+    reordered.splice(newIndex, 0, moved);
+    reorder(reordered.map((t) => t.id));
+  };
+
+  const startAddingWithDraft = (name: string, text: string) => {
+    setDraftName(name);
+    setDraftText(text);
+    setIsAdding(true);
+  };
+
+  return (
+    <div className="space-y-4">
+      {templates.length === 0 && !isAdding && (
+        <EmptyState onAdd={() => setIsAdding(true)} onPickStarter={startAddingWithDraft} />
+      )}
+
+      <div className="space-y-3">
+        {templates.map((template, index) => (
+          <div key={template.id}>
+            {editingId === template.id ? (
+              <PromptTemplateEditor
+                template={template}
+                onSave={(name, text) => handleUpdate(template.id, name, text)}
+                onCancel={() => setEditingId(null)}
+                isSaving={isSaving}
+              />
+            ) : (
+              <div className="flex items-start gap-3 rounded-lg border border-border bg-background p-3">
+                <div className="flex flex-1 flex-col gap-1">
+                  <span className="text-sm font-medium">{template.name}</span>
+                  <span className="line-clamp-2 text-xs text-muted-foreground">
+                    {template.text}
+                  </span>
+                </div>
+                <div className="flex items-center gap-1">
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="h-7 w-7"
+                    disabled={index === 0 || isSaving}
+                    onClick={() => handleMove(index, 'up')}
+                    aria-label="Move template up"
+                  >
+                    <ArrowUp className="h-3.5 w-3.5" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="h-7 w-7"
+                    disabled={index === templates.length - 1 || isSaving}
+                    onClick={() => handleMove(index, 'down')}
+                    aria-label="Move template down"
+                  >
+                    <ArrowDown className="h-3.5 w-3.5" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="h-7 w-7"
+                    disabled={isSaving || isAtMaxTemplates}
+                    onClick={() => handleDuplicate(template)}
+                    title="Duplicate"
+                    aria-label="Duplicate template"
+                  >
+                    <Copy className="h-3.5 w-3.5" />
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="icon"
+                    className="h-7 w-7"
+                    disabled={isSaving}
+                    onClick={() => setEditingId(template.id)}
+                    aria-label="Edit template"
+                  >
+                    <Pencil className="h-3.5 w-3.5" />
+                  </Button>
+                  {deletingId === template.id ? (
+                    <>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-7 text-xs text-destructive hover:text-destructive"
+                        disabled={isSaving}
+                        onClick={() => handleDelete(template.id)}
+                      >
+                        Confirm
+                      </Button>
+                      <Button
+                        variant="ghost"
+                        size="sm"
+                        className="h-7 text-xs"
+                        disabled={isSaving}
+                        onClick={() => setDeletingId(null)}
+                      >
+                        Cancel
+                      </Button>
+                    </>
+                  ) : (
+                    <Button
+                      variant="ghost"
+                      size="icon"
+                      className="h-7 w-7 text-destructive hover:text-destructive"
+                      disabled={isSaving}
+                      onClick={() => setDeletingId(template.id)}
+                      title="Delete"
+                      aria-label="Delete template"
+                    >
+                      <Trash2 className="h-3.5 w-3.5" />
+                    </Button>
+                  )}
+                </div>
+              </div>
+            )}
+          </div>
+        ))}
+      </div>
+
+      {isAdding && (
+        <PromptTemplateEditor
+          template={
+            draftName || draftText
+              ? {
+                  id: '',
+                  name: draftName,
+                  text: draftText,
+                  sortOrder: 0,
+                  createdAt: '',
+                  updatedAt: '',
+                }
+              : undefined
+          }
+          onSave={handleCreate}
+          onCancel={() => {
+            setIsAdding(false);
+            setDraftName('');
+            setDraftText('');
+          }}
+          isSaving={isSaving}
+        />
+      )}
+
+      {templates.length > 0 && !isAdding && !isAtMaxTemplates && (
+        <Button variant="outline" size="sm" onClick={() => setIsAdding(true)}>
+          <Plus className="mr-1 h-3.5 w-3.5" />
+          Add template
+        </Button>
+      )}
+
+      {isAtMaxTemplates && (
+        <p className="text-xs text-muted-foreground">
+          Template limit reached ({MAX_PROMPT_TEMPLATES}). Delete one to add another.
+        </p>
+      )}
+    </div>
+  );
+}
diff --git a/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx b/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx
deleted file mode 100644
index a169957cc..000000000
--- a/src/renderer/features/settings/components/ReviewPromptSettingsCard.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { RotateCcw } from 'lucide-react';
-import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
-import { Button } from '@renderer/lib/ui/button';
-import { Textarea } from '@renderer/lib/ui/textarea';
-
-export function ReviewPromptResetButton() {
-  const { value, defaults, reset, isLoading, isSaving } = useAppSettingsKey('reviewPrompt');
-  const canReset = (value ?? '') !== (defaults ?? '');
-  const isVisible = !(isLoading || isSaving || !canReset);
-
-  return (
-    <Button
-      variant="ghost"
-      size="sm"
-      onClick={() => reset()}
-      disabled={!isVisible || isLoading || !canReset}
-    >
-      <RotateCcw />
-    </Button>
-  );
-}
-
-export function ReviewPromptSettingsCard() {
-  const { value, update, isLoading, isSaving } = useAppSettingsKey('reviewPrompt');
-  const reviewPrompt = value ?? '';
-
-  return (
-    <Textarea
-      key={reviewPrompt}
-      defaultValue={reviewPrompt}
-      onBlur={(e) => {
-        const next = e.target.value;
-        if (next !== reviewPrompt) {
-          update(next);
-        }
-      }}
-      className="min-h-36 px-3 py-2.5 text-[14px] leading-relaxed"
-      disabled={isLoading || isSaving}
-    />
-  );
-}
diff --git a/src/renderer/features/settings/components/SettingsPage.tsx b/src/renderer/features/settings/components/SettingsPage.tsx
index 38da5995a..4f6c852c1 100644
--- a/src/renderer/features/settings/components/SettingsPage.tsx
+++ b/src/renderer/features/settings/components/SettingsPage.tsx
@@ -10,8 +10,8 @@ import HiddenToolsSettingsCard from './HiddenToolsSettingsCard';
 import IntegrationsCard from './IntegrationsCard';
 import KeyboardSettingsCard from './KeyboardSettingsCard';
 import NotificationSettingsCard from './NotificationSettingsCard';
+import { PromptTemplatesSettingsCard } from './PromptTemplatesSettingsCard';
 import RepositorySettingsCard from './RepositorySettingsCard';
-import { ReviewPromptResetButton, ReviewPromptSettingsCard } from './ReviewPromptSettingsCard';
 import { AutoGenerateTaskNamesRow, AutoTrustWorktreesRow } from './TaskSettingsRows';
 import TelemetryCard from './TelemetryCard';
 import TerminalSettingsCard from './TerminalSettingsCard';
@@ -25,6 +25,7 @@ export type SettingsPageTab =
   | 'integrations'
   | 'repository'
   | 'interface'
+  | 'prompts'
   | 'docs';
 
 interface SectionConfig {
@@ -55,6 +56,7 @@ export function SettingsPage({
     { id: 'integrations', label: 'Integrations' },
     { id: 'repository', label: 'Repository' },
     { id: 'interface', label: 'Interface' },
+    { id: 'prompts', label: 'Prompts' },
     { id: 'docs', label: 'Docs', isExternal: true },
   ];
 
@@ -93,11 +95,6 @@ export function SettingsPage({
       description: 'Manage CLI agents and model configurations.',
       sections: [
         { component: <DefaultAgentSettingsCard /> },
-        {
-          title: 'Review Prompt',
-          action: <ReviewPromptResetButton />,
-          component: <ReviewPromptSettingsCard />,
-        },
         {
           title: 'CLI agents',
           component: (
@@ -131,6 +128,11 @@ export function SettingsPage({
         },
       ],
     },
+    prompts: {
+      title: 'Prompts',
+      description: 'Manage reusable prompts shown in the task Context Bar for one-click insertion.',
+      sections: [{ title: 'Prompt templates', component: <PromptTemplatesSettingsCard /> }],
+    },
   };
 
   const currentContent = tabContent[activeTab as keyof typeof tabContent];
diff --git a/src/renderer/features/settings/use-prompt-templates.ts b/src/renderer/features/settings/use-prompt-templates.ts
new file mode 100644
index 000000000..61810d8cc
--- /dev/null
+++ b/src/renderer/features/settings/use-prompt-templates.ts
@@ -0,0 +1,63 @@
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import type {
+  CreatePromptTemplateInput,
+  PromptTemplate,
+  UpdatePromptTemplateInput,
+} from '@shared/prompt-templates';
+import { rpc } from '@renderer/lib/ipc';
+
+export function usePromptTemplates() {
+  const queryClient = useQueryClient();
+
+  const { data: templates = [], isLoading } = useQuery<PromptTemplate[]>({
+    queryKey: ['promptTemplates'] as const,
+    queryFn: () => rpc.promptTemplates.list() as Promise<PromptTemplate[]>,
+    staleTime: 30_000,
+  });
+
+  const createMutation = useMutation<PromptTemplate, Error, CreatePromptTemplateInput>({
+    mutationFn: (input) => rpc.promptTemplates.create(input) as Promise<PromptTemplate>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promptTemplates'] });
+    },
+  });
+
+  const updateMutation = useMutation<
+    PromptTemplate,
+    Error,
+    { id: string; input: UpdatePromptTemplateInput }
+  >({
+    mutationFn: ({ id, input }) => rpc.promptTemplates.update(id, input) as Promise<PromptTemplate>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promptTemplates'] });
+    },
+  });
+
+  const deleteMutation = useMutation<void, Error, string>({
+    mutationFn: (id) => rpc.promptTemplates.delete(id) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promptTemplates'] });
+    },
+  });
+
+  const reorderMutation = useMutation<void, Error, string[]>({
+    mutationFn: (ids) => rpc.promptTemplates.reorder(ids) as Promise<void>,
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['promptTemplates'] });
+    },
+  });
+
+  return {
+    templates,
+    isLoading,
+    isSaving:
+      createMutation.isPending ||
+      updateMutation.isPending ||
+      deleteMutation.isPending ||
+      reorderMutation.isPending,
+    create: createMutation.mutate,
+    update: updateMutation.mutate,
+    delete: deleteMutation.mutate,
+    reorder: reorderMutation.mutate,
+  };
+}
diff --git a/src/renderer/features/tasks/conversations/context-actions.ts b/src/renderer/features/tasks/conversations/context-actions.ts
index ef7679832..d45eb4d65 100644
--- a/src/renderer/features/tasks/conversations/context-actions.ts
+++ b/src/renderer/features/tasks/conversations/context-actions.ts
@@ -1,9 +1,10 @@
+import type { PromptTemplate } from '@shared/prompt-templates';
 import type { Issue } from '@shared/tasks';
 import { ISSUE_PROVIDER_META } from '@renderer/features/integrations/issue-provider-meta';
 
 const MAX_LABEL_TITLE_LENGTH = 24;
 
-export type ContextActionKind = 'linked-issue' | 'draft-comments' | 'review-prompt';
+export type ContextActionKind = 'linked-issue' | 'draft-comments' | 'prompt-template';
 
 export interface ContextAction {
   id: string;
@@ -65,15 +66,13 @@ export function buildLinkedIssueContextAction(issue?: Issue): ContextAction | nu
   };
 }
 
-export function buildReviewPromptContextAction(reviewPrompt?: string): ContextAction | null {
-  const text = (reviewPrompt ?? '').trim();
-  if (!text) return null;
-  return {
-    id: 'review-prompt',
-    kind: 'review-prompt',
-    label: 'Review prompt',
-    text,
-  };
+export function buildPromptTemplateContextActions(templates: PromptTemplate[]): ContextAction[] {
+  return templates.map((template) => ({
+    id: `prompt-template:${template.id}`,
+    kind: 'prompt-template',
+    label: template.name,
+    text: template.text,
+  }));
 }
 
 export function buildDraftCommentsContextAction(args: {
@@ -93,15 +92,15 @@ export function buildDraftCommentsContextAction(args: {
 
 export function buildTaskContextActions(
   linkedIssue?: Issue,
-  reviewPrompt?: string,
+  templates: PromptTemplate[] = [],
   draftComments?: { count: number; formattedComments?: string }
 ): ContextAction[] {
   const linkedIssueAction = buildLinkedIssueContextAction(linkedIssue);
   const draftCommentsAction = draftComments ? buildDraftCommentsContextAction(draftComments) : null;
-  const reviewPromptAction = buildReviewPromptContextAction(reviewPrompt);
+  const templateActions = buildPromptTemplateContextActions(templates);
   const actions: ContextAction[] = [];
   if (linkedIssueAction) actions.push(linkedIssueAction);
   if (draftCommentsAction) actions.push(draftCommentsAction);
-  if (reviewPromptAction) actions.push(reviewPromptAction);
+  actions.push(...templateActions);
   return actions;
 }
diff --git a/src/renderer/features/tasks/conversations/context-bar.tsx b/src/renderer/features/tasks/conversations/context-bar.tsx
index 2aa951dd0..63959b939 100644
--- a/src/renderer/features/tasks/conversations/context-bar.tsx
+++ b/src/renderer/features/tasks/conversations/context-bar.tsx
@@ -1,7 +1,7 @@
 import { ArrowUp, FileSearch } from 'lucide-react';
 import { observer } from 'mobx-react-lite';
 import { useMemo } from 'react';
-import { useAppSettingsKey } from '@renderer/features/settings/use-app-settings-key';
+import { usePromptTemplates } from '@renderer/features/settings/use-prompt-templates';
 import { getRegisteredTaskData } from '@renderer/features/tasks/stores/task-selectors';
 import { useProvisionedTask, useTaskViewContext } from '@renderer/features/tasks/task-view-context';
 import { rpc } from '@renderer/lib/ipc';
@@ -16,7 +16,7 @@ export const ContextBar = observer(function ContextBar() {
   const { projectId, taskId } = useTaskViewContext();
   const provisioned = useProvisionedTask();
   const task = getRegisteredTaskData(projectId, taskId);
-  const { value: reviewPrompt, isSaving: isSavingReviewPrompt } = useAppSettingsKey('reviewPrompt');
+  const { templates, isLoading: isLoadingTemplates } = usePromptTemplates();
   const conversationTabs = provisioned.taskView.conversationTabs;
   const conversationStore = provisioned.conversations;
   const draftComments = provisioned.draftComments;
@@ -28,17 +28,18 @@ export const ContextBar = observer(function ContextBar() {
 
   const actions = useMemo(
     () =>
-      buildTaskContextActions(task?.linkedIssue, reviewPrompt, {
+      buildTaskContextActions(task?.linkedIssue, templates, {
         count: draftComments.count,
         formattedComments: formattedDraftComments,
       }),
-    [reviewPrompt, task?.linkedIssue, draftComments.count, formattedDraftComments]
+    [templates, task?.linkedIssue, draftComments.count, formattedDraftComments]
   );
   const issueAction = actions.find((action) => action.kind === 'linked-issue') ?? null;
-  const reviewAction = actions.find((action) => action.kind === 'review-prompt') ?? null;
   const draftCommentsAction = actions.find((action) => action.kind === 'draft-comments') ?? null;
+  const templateActions = actions.filter((action) => action.kind === 'prompt-template');
 
-  if (!hasConversation || (!issueAction && !draftCommentsAction && !reviewAction)) return null;
+  if (!hasConversation || (!issueAction && !draftCommentsAction && templateActions.length === 0))
+    return null;
 
   const applyContext = async (action: ContextAction) => {
     if (!activeSessionId) return;
@@ -55,29 +56,29 @@ export const ContextBar = observer(function ContextBar() {
 
   return (
     <TooltipProvider>
-      <div className="border-t border-border px-2 flex items-center gap-2 h-[41px]">
-        {reviewAction ? (
-          <Tooltip>
+      <div className="border-t border-border px-2 flex items-center gap-2 h-[41px] overflow-x-auto whitespace-nowrap">
+        {templateActions.map((action) => (
+          <Tooltip key={action.id}>
             <TooltipTrigger>
               <Button
                 variant="outline"
                 size="sm"
-                disabled={!canApplyContext || isSavingReviewPrompt}
-                onClick={() => void applyContext(reviewAction)}
-                className="h-7 max-w-full rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
+                disabled={!canApplyContext || isLoadingTemplates}
+                onClick={() => void applyContext(action)}
+                className="h-7 max-w-full shrink-0 rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
               >
                 <FileSearch className="size-3.5 shrink-0" />
-                <span className="max-w-72 truncate">{reviewAction.label}</span>
+                <span className="max-w-72 truncate">{action.label}</span>
                 <ArrowUp className="size-3 shrink-0" />
               </Button>
             </TooltipTrigger>
             <TooltipContent>
               {canApplyContext
-                ? 'Add review prompt to the chat input'
+                ? `Add '${action.label}' to the chat input`
                 : 'Create and select a conversation first'}
             </TooltipContent>
           </Tooltip>
-        ) : null}
+        ))}
         {issueAction ? (
           <Tooltip>
             <TooltipTrigger>
@@ -86,7 +87,7 @@ export const ContextBar = observer(function ContextBar() {
                 size="sm"
                 disabled={!canApplyContext}
                 onClick={() => void applyContext(issueAction)}
-                className="h-7 max-w-full rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
+                className="h-7 max-w-full shrink-0 rounded-md bg-background-1 px-2 text-xs font-normal hover:bg-background-1/80"
               >
                 {issueAction.provider ? (
                   <ProviderLogo provider={issueAction.provider} className="h-3.5 w-3.5" />
diff --git a/src/renderer/tests/context-actions.test.ts b/src/renderer/tests/context-actions.test.ts
index d28314f96..9702de27d 100644
--- a/src/renderer/tests/context-actions.test.ts
+++ b/src/renderer/tests/context-actions.test.ts
@@ -1,9 +1,10 @@
 import { describe, expect, it } from 'vitest';
+import type { PromptTemplate } from '@shared/prompt-templates';
 import type { Issue } from '@shared/tasks';
 import {
   buildDraftCommentsContextAction,
   buildLinkedIssueContextAction,
-  buildReviewPromptContextAction,
+  buildPromptTemplateContextActions,
   buildTaskContextActions,
 } from '@renderer/features/tasks/conversations/context-actions';
 
@@ -23,6 +24,18 @@ function makeIssue(overrides: Partial<Issue> = {}): Issue {
   };
 }
 
+function makeTemplate(overrides: Partial<PromptTemplate> = {}): PromptTemplate {
+  return {
+    id: 't1',
+    name: 'Review',
+    text: 'Review this worktree for issues.',
+    sortOrder: 0,
+    createdAt: '2026-04-15T11:27:38.662Z',
+    updatedAt: '2026-04-15T11:27:38.662Z',
+    ...overrides,
+  };
+}
+
 describe('buildLinkedIssueContextAction', () => {
   it('returns null when no issue is linked', () => {
     expect(buildLinkedIssueContextAction(undefined)).toBeNull();
@@ -64,21 +77,38 @@ describe('buildLinkedIssueContextAction', () => {
   });
 });
 
-describe('buildReviewPromptContextAction', () => {
-  it('returns null for empty review prompt', () => {
-    expect(buildReviewPromptContextAction('   ')).toBeNull();
+describe('buildPromptTemplateContextActions', () => {
+  it('returns empty array for no templates', () => {
+    expect(buildPromptTemplateContextActions([])).toEqual([]);
   });
 
-  it('builds review prompt action', () => {
-    const action = buildReviewPromptContextAction('Review this worktree for issues.');
-    expect(action).not.toBeNull();
-    expect(action).toMatchObject({
-      id: 'review-prompt',
-      kind: 'review-prompt',
-      label: 'Review prompt',
-      text: 'Review this worktree for issues.',
+  it('builds actions for each template', () => {
+    const templates = [
+      makeTemplate({ id: 't1', name: 'Review', text: 'Review this.' }),
+      makeTemplate({ id: 't2', name: 'Summarize', text: 'Summarize changes.' }),
+    ];
+    const actions = buildPromptTemplateContextActions(templates);
+
+    expect(actions).toHaveLength(2);
+    expect(actions[0]).toMatchObject({
+      id: 'prompt-template:t1',
+      kind: 'prompt-template',
+      label: 'Review',
+      text: 'Review this.',
+    });
+    expect(actions[1]).toMatchObject({
+      id: 'prompt-template:t2',
+      kind: 'prompt-template',
+      label: 'Summarize',
+      text: 'Summarize changes.',
     });
   });
+
+  it('keeps full template names for tooltips and accessibility', () => {
+    const templates = [makeTemplate({ name: 'A'.repeat(30), text: 'text' })];
+    const actions = buildPromptTemplateContextActions(templates);
+    expect(actions[0]!.label).toBe('A'.repeat(30));
+  });
 });
 
 describe('buildDraftCommentsContextAction', () => {
@@ -105,7 +135,6 @@ describe('buildDraftCommentsContextAction', () => {
       count: 2,
       formattedComments: '<user_comments>test</user_comments>',
     });
-
     expect(action).toEqual({
       id: 'draft-comments',
       kind: 'draft-comments',
@@ -116,14 +145,15 @@ describe('buildDraftCommentsContextAction', () => {
 });
 
 describe('buildTaskContextActions', () => {
-  it('includes linked issue context, then draft comments, then review prompt', () => {
-    const actions = buildTaskContextActions(makeIssue(), 'Review this worktree for issues.', {
+  it('includes linked issue, then draft comments, then prompt templates', () => {
+    const templates = [makeTemplate({ id: 't1', name: 'Review', text: 'Review this worktree.' })];
+    const actions = buildTaskContextActions(makeIssue(), templates, {
       count: 1,
       formattedComments: '<user_comments>test</user_comments>',
     });
     expect(actions).toHaveLength(3);
     expect(actions[0]?.id).toBe('linked-issue:github:EMD-123');
     expect(actions[1]?.id).toBe('draft-comments');
-    expect(actions[2]?.id).toBe('review-prompt');
+    expect(actions[2]?.id).toBe('prompt-template:t1');
   });
 });
diff --git a/src/shared/prompt-templates.ts b/src/shared/prompt-templates.ts
new file mode 100644
index 000000000..cbfcd8c88
--- /dev/null
+++ b/src/shared/prompt-templates.ts
@@ -0,0 +1,40 @@
+export interface PromptTemplate {
+  id: string;
+  name: string;
+  text: string;
+  sortOrder: number;
+  createdAt: string;
+  updatedAt: string;
+}
+
+export interface CreatePromptTemplateInput {
+  name: string;
+  text: string;
+}
+
+export interface UpdatePromptTemplateInput {
+  name?: string;
+  text?: string;
+  sortOrder?: number;
+}
+
+export const MAX_PROMPT_TEMPLATES = 20;
+
+export const STARTER_PROMPT_TEMPLATES: ReadonlyArray<CreatePromptTemplateInput> = [
+  {
+    name: 'Review',
+    text: 'Review all changes in this worktree. Focus on correctness, regressions, edge cases, and missing tests. List concrete issues first, then note residual risks.',
+  },
+  {
+    name: 'Summarize',
+    text: 'Summarize the changes made in this worktree. Explain what was changed, why it was changed, and any notable implementation details.',
+  },
+  {
+    name: 'Find bugs',
+    text: 'Look for bugs, edge cases, and regressions in this worktree. Be thorough and list every issue you find, no matter how small.',
+  },
+  {
+    name: 'Write tests',
+    text: 'Write unit tests for the changed files in this worktree. Cover happy paths, edge cases, and error handling.',
+  },
+];