diff --git a/packages/app/src/app/app.tsx b/packages/app/src/app/app.tsx
index 37b43511..eb760b23 100644
--- a/packages/app/src/app/app.tsx
+++ b/packages/app/src/app/app.tsx
@@ -723,12 +723,14 @@ export default function App() {
     setTemplateDraftPrompt,
     templateDraftScope,
     setTemplateDraftScope,
+    templateDraftAutoRun,
+    setTemplateDraftAutoRun,
     workspaceTemplates,
     globalTemplates,
     openTemplateModal,
     saveTemplate,
     deleteTemplate,
-    runTemplate,
+    applyTemplate,
     loadWorkspaceTemplates,
   } = templateState;
 
@@ -1474,8 +1476,15 @@ export default function App() {
       applyThemeMode(isDark ? "dark" : "light");
     });
 
+    // Listen for setPrompt events from template system (when autoRun is disabled)
+    const handleSetPrompt = (e: CustomEvent<string>) => {
+      setPrompt(e.detail);
+    };
+    window.addEventListener("openwork:setPrompt", handleSetPrompt as EventListener);
+
     onCleanup(() => {
       unsubscribeTheme();
+      window.removeEventListener("openwork:setPrompt", handleSetPrompt as EventListener);
     });
 
     createEffect(() => {
@@ -2090,7 +2099,7 @@ export default function App() {
       setTemplateDraftScope(scope);
     },
     openTemplateModal,
-    runTemplate,
+    applyTemplate,
     deleteTemplate,
     refreshSkills: (options?: { force?: boolean }) => refreshSkills(options).catch(() => undefined),
     refreshPlugins: (scopeOverride?: PluginScope) =>
@@ -2332,12 +2341,14 @@ export default function App() {
         description={templateDraftDescription()}
         prompt={templateDraftPrompt()}
         scope={templateDraftScope()}
+        autoRun={templateDraftAutoRun()}
         onClose={() => setTemplateModalOpen(false)}
         onSave={saveTemplate}
         onTitleChange={setTemplateDraftTitle}
         onDescriptionChange={setTemplateDraftDescription}
         onPromptChange={setTemplateDraftPrompt}
         onScopeChange={setTemplateDraftScope}
+        onAutoRunChange={setTemplateDraftAutoRun}
       />
 
       <ReloadWorkspaceToast
diff --git a/packages/app/src/app/components/template-modal.tsx b/packages/app/src/app/components/template-modal.tsx
index beaf0578..b9c0e577 100644
--- a/packages/app/src/app/components/template-modal.tsx
+++ b/packages/app/src/app/components/template-modal.tsx
@@ -12,12 +12,14 @@ export type TemplateModalProps = {
   description: string;
   prompt: string;
   scope: "workspace" | "global";
+  autoRun: boolean;
   onClose: () => void;
   onSave: () => void;
   onTitleChange: (value: string) => void;
   onDescriptionChange: (value: string) => void;
   onPromptChange: (value: string) => void;
   onScopeChange: (value: "workspace" | "global") => void;
+  onAutoRunChange: (value: boolean) => void;
 };
 
 export default function TemplateModal(props: TemplateModalProps) {
@@ -88,6 +90,25 @@ export default function TemplateModal(props: TemplateModalProps) {
                 />
                 <div class="mt-1 text-xs text-gray-10">{translate("templates.prompt_hint")}</div>
               </label>
+
+              {/* Auto-run Toggle */}
+              <div class="flex items-center justify-between bg-gray-1 p-3 rounded-xl border border-gray-6 gap-3">
+                <div class="min-w-0">
+                  <div class="text-sm text-gray-12">{translate("templates.auto_run_label")}</div>
+                  <div class="text-xs text-gray-7">{translate("templates.auto_run_hint")}</div>
+                </div>
+                <button
+                  type="button"
+                  class={`px-3 py-1 rounded-full text-xs font-medium border transition-colors shrink-0 ${
+                    props.autoRun
+                      ? "bg-gray-12/10 text-gray-12 border-gray-6/20"
+                      : "text-gray-10 border-gray-6 hover:text-gray-12"
+                  }`}
+                  onClick={() => props.onAutoRunChange(!props.autoRun)}
+                >
+                  {props.autoRun ? "On" : "Off"}
+                </button>
+              </div>
             </div>
 
             <div class="mt-6 flex justify-end gap-2">
diff --git a/packages/app/src/app/pages/dashboard.tsx b/packages/app/src/app/pages/dashboard.tsx
index a20d4c1a..69ae6593 100644
--- a/packages/app/src/app/pages/dashboard.tsx
+++ b/packages/app/src/app/pages/dashboard.tsx
@@ -78,7 +78,7 @@ export type DashboardViewProps = {
   setTemplateDraftScope: (value: "workspace" | "global") => void;
   openTemplateModal: () => void;
   resetTemplateDraft?: (scope?: "workspace" | "global") => void;
-  runTemplate: (template: WorkspaceTemplate) => void;
+  applyTemplate: (template: WorkspaceTemplate) => void;
   deleteTemplate: (templateId: string) => void;
   refreshSkills: (options?: { force?: boolean }) => void;
   refreshPlugins: (scopeOverride?: PluginScope) => void;
@@ -537,7 +537,7 @@ export default function DashboardView(props: DashboardViewProps) {
                     <For each={quickTemplates()}>
                       {(t) => (
                         <button
-                          onClick={() => props.runTemplate(t)}
+                          onClick={() => props.applyTemplate(t)}
                           class="group p-5 rounded-2xl bg-gray-2/30 border border-gray-6/50 hover:bg-gray-2 hover:border-gray-7 transition-all text-left"
                         >
                           <div class="w-10 h-10 rounded-full bg-gray-4 flex items-center justify-center mb-4 group-hover:scale-110 transition-transform">
@@ -545,7 +545,7 @@ export default function DashboardView(props: DashboardViewProps) {
                           </div>
                           <h4 class="font-medium text-gray-12 mb-1">{t.title}</h4>
                           <p class="text-sm text-gray-10">
-                            {t.description || "Run a saved workflow"}
+                            {t.description || "Apply a saved workflow"}
                           </p>
                         </button>
                       )}
@@ -698,7 +698,7 @@ export default function DashboardView(props: DashboardViewProps) {
                 setTemplateDraftScope={props.setTemplateDraftScope}
                 openTemplateModal={props.openTemplateModal}
                 resetTemplateDraft={props.resetTemplateDraft}
-                runTemplate={props.runTemplate}
+                applyTemplate={props.applyTemplate}
                 deleteTemplate={props.deleteTemplate}
               />
             </Match>
diff --git a/packages/app/src/app/pages/session.tsx b/packages/app/src/app/pages/session.tsx
index 048a5d00..e63f4988 100644
--- a/packages/app/src/app/pages/session.tsx
+++ b/packages/app/src/app/pages/session.tsx
@@ -429,7 +429,7 @@ export default function SessionView(props: SessionViewProps) {
     }
     setPrevArtifactCount(count);
   });
-  
+
   createEffect(() => {
      const files = props.workingFiles;
      const count = files.length;
@@ -824,7 +824,7 @@ export default function SessionView(props: SessionViewProps) {
                 }
               `}
             </style>
-            
+
             <Show when={props.messages.length === 0}>
               <div class="text-center py-20 space-y-4">
                 <div class="w-16 h-16 bg-gray-2 rounded-3xl mx-auto flex items-center justify-center border border-gray-6">
@@ -837,7 +837,7 @@ export default function SessionView(props: SessionViewProps) {
               </div>
             </Show>
 
-            <MessageList 
+            <MessageList
               messages={props.messages}
               artifacts={props.artifacts}
               developerMode={props.developerMode}
@@ -904,7 +904,7 @@ export default function SessionView(props: SessionViewProps) {
 
             <div ref={(el) => (messagesEndEl = el)} />
           </div>
-          
+
           <Minimap containerRef={() => chatContainerEl} messages={props.messages} />
 
           <Show when={artifactToast()}>
@@ -914,7 +914,7 @@ export default function SessionView(props: SessionViewProps) {
           </Show>
         </div>
 
-        <Composer 
+        <Composer
            prompt={props.prompt}
            setPrompt={props.setPrompt}
            busy={props.busy}
diff --git a/packages/app/src/app/pages/templates.tsx b/packages/app/src/app/pages/templates.tsx
index 08d8dd4f..321152c7 100644
--- a/packages/app/src/app/pages/templates.tsx
+++ b/packages/app/src/app/pages/templates.tsx
@@ -16,7 +16,7 @@ export type TemplatesViewProps = {
   setTemplateDraftScope: (value: "workspace" | "global") => void;
   openTemplateModal: () => void;
   resetTemplateDraft?: (scope?: "workspace" | "global") => void;
-  runTemplate: (template: WorkspaceTemplate) => void;
+  applyTemplate: (template: WorkspaceTemplate) => void;
   deleteTemplate: (templateId: string) => void;
 };
 
@@ -68,9 +68,9 @@ export default function TemplatesView(props: TemplatesViewProps) {
                       <div class="mt-2 text-xs text-gray-7 font-mono">{formatRelativeTime(t.createdAt)}</div>
                     </div>
                     <div class="shrink-0 flex gap-2">
-                      <Button variant="secondary" onClick={() => props.runTemplate(t)} disabled={props.busy}>
+                      <Button variant="secondary" onClick={() => props.applyTemplate(t)} disabled={props.busy}>
                         <Play size={16} />
-                        Run
+                        Apply
                       </Button>
                       <Button variant="danger" onClick={() => props.deleteTemplate(t.id)} disabled={props.busy}>
                         <Trash2 size={16} />
@@ -97,9 +97,9 @@ export default function TemplatesView(props: TemplatesViewProps) {
                       <div class="mt-2 text-xs text-gray-7 font-mono">{formatRelativeTime(t.createdAt)}</div>
                     </div>
                     <div class="shrink-0 flex gap-2">
-                      <Button variant="secondary" onClick={() => props.runTemplate(t)} disabled={props.busy}>
+                      <Button variant="secondary" onClick={() => props.applyTemplate(t)} disabled={props.busy}>
                         <Play size={16} />
-                        Run
+                        Apply
                       </Button>
                       <Button variant="danger" onClick={() => props.deleteTemplate(t.id)} disabled={props.busy}>
                         <Trash2 size={16} />
diff --git a/packages/app/src/app/template-state.ts b/packages/app/src/app/template-state.ts
index 24836d49..648ff4ac 100644
--- a/packages/app/src/app/template-state.ts
+++ b/packages/app/src/app/template-state.ts
@@ -34,6 +34,7 @@ export function createTemplateState(options: {
   const [templateDraftDescription, setTemplateDraftDescription] = createSignal("");
   const [templateDraftPrompt, setTemplateDraftPrompt] = createSignal("");
   const [templateDraftScope, setTemplateDraftScope] = createSignal<"workspace" | "global">("workspace");
+  const [templateDraftAutoRun, setTemplateDraftAutoRun] = createSignal(true);
 
   const workspaceTemplates = createMemo(() => templates().filter((t) => t.scope === "workspace"));
   const globalTemplates = createMemo(() => templates().filter((t) => t.scope === "global"));
@@ -41,7 +42,7 @@ export function createTemplateState(options: {
   function openTemplateModal() {
     const seedTitle = options.selectedSession()?.title ?? "";
     const seedPrompt = options.lastPromptSent() || options.prompt();
-    const nextDraft = buildTemplateDraft({ seedTitle, seedPrompt, scope: "workspace" });
+    const nextDraft = buildTemplateDraft({ seedTitle, seedPrompt, scope: "workspace", autoRun: true });
 
     resetTemplateDraft(
       {
@@ -49,6 +50,7 @@ export function createTemplateState(options: {
         setDescription: setTemplateDraftDescription,
         setPrompt: setTemplateDraftPrompt,
         setScope: setTemplateDraftScope,
+        setAutoRun: setTemplateDraftAutoRun,
       },
       nextDraft.scope,
     );
@@ -59,10 +61,11 @@ export function createTemplateState(options: {
   }
 
   async function saveTemplate() {
-    const draft = buildTemplateDraft({ scope: templateDraftScope() });
+    const draft = buildTemplateDraft({ scope: templateDraftScope(), autoRun: templateDraftAutoRun() });
     draft.title = templateDraftTitle().trim();
     draft.description = templateDraftDescription().trim();
     draft.prompt = templateDraftPrompt().trim();
+    draft.autoRun = templateDraftAutoRun();
 
     if (!draft.title || !draft.prompt) {
       options.setError(t("app.error.title_prompt_required", currentLocale()));
@@ -140,7 +143,8 @@ export function createTemplateState(options: {
     setGlobalTemplatesLoaded(true);
   }
 
-  async function runTemplate(template: WorkspaceTemplate) {
+  // Apply a template to create a new session
+  async function applyTemplate(template: WorkspaceTemplate) {
     if (options.isDemoMode()) {
       options.setView("session");
       return;
@@ -149,6 +153,12 @@ export function createTemplateState(options: {
     const c = options.client();
     if (!c) return;
 
+    // Check autoRun setting (default to true for backwards compatibility)
+    const shouldAutoRun = template.autoRun !== false;
+
+    // Trim the prompt before using
+    const trimmedPrompt = template.prompt.trim();
+
     options.setBusy(true);
     options.setError(null);
 
@@ -160,19 +170,24 @@ export function createTemplateState(options: {
       await options.selectSession(session.id);
       options.setView("session");
 
-      const model = options.defaultModel();
+      if (shouldAutoRun) {
+        const model = options.defaultModel();
 
-      await c.session.promptAsync({
-        sessionID: session.id,
-        model,
-        variant: options.modelVariant() ?? undefined,
-        parts: [{ type: "text", text: template.prompt }],
-      });
+        await c.session.promptAsync({
+          sessionID: session.id,
+          model,
+          variant: options.modelVariant() ?? undefined,
+          parts: [{ type: "text", text: trimmedPrompt }],
+        });
 
-      options.setSessionModelById((current) => ({
-        ...current,
-        [session.id]: model,
-      }));
+        options.setSessionModelById((current) => ({
+          ...current,
+          [session.id]: model,
+        }));
+      } else {
+        // Don't auto-run: populate the prompt input and let user send manually
+        window.dispatchEvent(new CustomEvent("openwork:setPrompt", { detail: trimmedPrompt }));
+      }
     } catch (e) {
       const message = e instanceof Error ? e.message : t("app.unknown_error", currentLocale());
       options.setError(addOpencodeCacheHint(message));
@@ -206,11 +221,25 @@ export function createTemplateState(options: {
         const parsedFrontmatter = parseTemplateFrontmatter(raw);
         if (parsedFrontmatter) {
           const meta = parsedFrontmatter.data;
+
           const title = typeof meta.title === "string" ? meta.title : t("common.untitled", currentLocale());
           const promptText = parsedFrontmatter.body ?? "";
           if (!promptText.trim()) return false;
 
           const createdAtValue = Number(meta.createdAt);
+
+          // Convert string "true"/"false" to actual booleans (frontmatter parser returns strings)
+          let autoRunValue: boolean;
+          if (typeof meta.autoRun === "boolean") {
+            autoRunValue = meta.autoRun;
+          } else if (meta.autoRun === "false") {
+            autoRunValue = false;
+          } else if (meta.autoRun === "true") {
+            autoRunValue = true;
+          } else {
+            autoRunValue = true; // default
+          }
+
           pushTemplate({
             id: typeof meta.id === "string" ? meta.id : fallbackId,
             title,
@@ -218,6 +247,7 @@ export function createTemplateState(options: {
             prompt: promptText,
             createdAt: Number.isFinite(createdAtValue) && createdAtValue > 0 ? createdAtValue : Date.now(),
             scope: "workspace",
+            autoRun: autoRunValue,
           });
           return true;
         }
@@ -229,6 +259,16 @@ export function createTemplateState(options: {
         const promptText = typeof parsed.prompt === "string" ? parsed.prompt : "";
         if (!promptText.trim()) return false;
 
+        // For JSON, autoRun should already be a boolean if properly serialized
+        let jsonAutoRunValue: boolean;
+        if (typeof parsed.autoRun === "boolean") {
+          jsonAutoRunValue = parsed.autoRun;
+        } else if (parsed.autoRun === "false" || parsed.autoRun === false) {
+          jsonAutoRunValue = false;
+        } else {
+          jsonAutoRunValue = true; // default
+        }
+
         pushTemplate({
           id: typeof parsed.id === "string" ? parsed.id : fallbackId,
           title,
@@ -236,6 +276,7 @@ export function createTemplateState(options: {
           prompt: promptText,
           createdAt: typeof parsed.createdAt === "number" ? parsed.createdAt : Date.now(),
           scope: "workspace",
+          autoRun: jsonAutoRunValue,
         });
 
         return true;
@@ -306,12 +347,14 @@ export function createTemplateState(options: {
     setTemplateDraftPrompt,
     templateDraftScope,
     setTemplateDraftScope,
+    templateDraftAutoRun,
+    setTemplateDraftAutoRun,
     workspaceTemplates,
     globalTemplates,
     openTemplateModal,
     saveTemplate,
     deleteTemplate,
-    runTemplate,
+    applyTemplate,
     loadWorkspaceTemplates,
   };
 }
diff --git a/packages/app/src/app/types.ts b/packages/app/src/app/types.ts
index 7b6a7663..7519342e 100644
--- a/packages/app/src/app/types.ts
+++ b/packages/app/src/app/types.ts
@@ -92,6 +92,7 @@ export type Template = {
   description: string;
   prompt: string;
   createdAt: number;
+  autoRun?: boolean;
 };
 
 export type SkillCard = {
diff --git a/packages/app/src/app/utils/templates.ts b/packages/app/src/app/utils/templates.ts
index 4ea3ba7c..378f0934 100644
--- a/packages/app/src/app/utils/templates.ts
+++ b/packages/app/src/app/utils/templates.ts
@@ -5,6 +5,7 @@ type TemplateDraft = {
   description: string;
   prompt: string;
   scope: "workspace" | "global";
+  autoRun: boolean;
 };
 
 type TemplateDraftSetters = {
@@ -12,6 +13,7 @@ type TemplateDraftSetters = {
   setDescription: (value: string) => void;
   setPrompt: (value: string) => void;
   setScope: (value: "workspace" | "global") => void;
+  setAutoRun: (value: boolean) => void;
 };
 
 export function resetTemplateDraft(setters: TemplateDraftSetters, scope: "workspace" | "global" = "workspace") {
@@ -19,18 +21,21 @@ export function resetTemplateDraft(setters: TemplateDraftSetters, scope: "worksp
   setters.setDescription("");
   setters.setPrompt("");
   setters.setScope(scope);
+  setters.setAutoRun(true);
 }
 
 export function buildTemplateDraft(params: {
   seedTitle?: string;
   seedPrompt?: string;
   scope?: "workspace" | "global";
+  autoRun?: boolean;
 }): TemplateDraft {
   return {
     title: params.seedTitle ?? "",
     description: "",
     prompt: params.seedPrompt ?? "",
     scope: params.scope ?? "workspace",
+    autoRun: params.autoRun ?? true,
   };
 }
 
@@ -42,5 +47,6 @@ export function createTemplateRecord(draft: TemplateDraft): WorkspaceTemplate {
     prompt: draft.prompt,
     createdAt: Date.now(),
     scope: draft.scope,
+    autoRun: draft.autoRun,
   };
 }
diff --git a/packages/app/src/i18n/locales/en.ts b/packages/app/src/i18n/locales/en.ts
index c60b9302..83077a1c 100644
--- a/packages/app/src/i18n/locales/en.ts
+++ b/packages/app/src/i18n/locales/en.ts
@@ -152,7 +152,7 @@ export default {
   "templates.empty_state": "Starter templates will appear here. Create one or save from a session.",
   "templates.workspace": "Workspace",
   "templates.global": "Global",
-  "templates.run": "Run",
+  "templates.apply": "Apply",
   "templates.modal_title": "Save Template",
   "templates.modal_description": "Reuse a workflow with one tap.",
   "templates.title_label": "Title",
@@ -162,6 +162,8 @@ export default {
   "templates.prompt_label": "Prompt",
   "templates.prompt_placeholder": "Write the instructions you want to reuse…",
   "templates.prompt_hint": "This becomes the first user message.",
+  "templates.auto_run_label": "Auto-run",
+  "templates.auto_run_hint": "Automatically start the session when this template is used.",
 
   // ==================== Skills ====================
   "skills.title": "Skills",
diff --git a/packages/app/src/i18n/locales/zh.ts b/packages/app/src/i18n/locales/zh.ts
index 90dfeb68..4bf3c10f 100644
--- a/packages/app/src/i18n/locales/zh.ts
+++ b/packages/app/src/i18n/locales/zh.ts
@@ -153,7 +153,7 @@ export default {
   "templates.empty_state": "初始模板将显示在这里。创建一个或从会话保存。",
   "templates.workspace": "工作区",
   "templates.global": "全局",
-  "templates.run": "运行",
+  "templates.apply": "应用",
   "templates.modal_title": "保存模板",
   "templates.modal_description": "一键重用工作流程。",
   "templates.title_label": "标题",
@@ -163,6 +163,8 @@ export default {
   "templates.prompt_label": "提示词",
   "templates.prompt_placeholder": "编写您想重用的指令…",
   "templates.prompt_hint": "这将成为第一条用户消息。",
+  "templates.auto_run_label": "自动运行",
+  "templates.auto_run_hint": "使用此模板时自动开始会话。",
 
   // ==================== Skills ====================
   "skills.title": "Skills",
diff --git a/packages/desktop/src-tauri/src/types.rs b/packages/desktop/src-tauri/src/types.rs
index 159f8165..17adb8ca 100644
--- a/packages/desktop/src-tauri/src/types.rs
+++ b/packages/desktop/src-tauri/src/types.rs
@@ -149,6 +149,12 @@ pub struct WorkspaceTemplate {
     pub prompt: String,
     #[serde(default)]
     pub created_at: u64,
+    #[serde(default = "default_auto_run")]
+    pub auto_run: Option<bool>,
+}
+
+fn default_auto_run() -> Option<bool> {
+    Some(true)
 }
 
 fn default_workspace_state_version() -> u8 {
diff --git a/packages/desktop/src-tauri/src/workspace/files.rs b/packages/desktop/src-tauri/src/workspace/files.rs
index 75f5cdd9..616403ec 100644
--- a/packages/desktop/src-tauri/src/workspace/files.rs
+++ b/packages/desktop/src-tauri/src/workspace/files.rs
@@ -114,6 +114,7 @@ fn seed_templates(templates_dir: &PathBuf) -> Result<(), String> {
       description: "Safe, practical file workflows".to_string(),
       prompt: "Show me how to interact with files in this workspace. Include safe examples for reading, summarizing, and editing.".to_string(),
       created_at: now_ms(),
+      auto_run: Some(true),
     },
     WorkspaceTemplate {
       id: "tmpl_learn_skills".to_string(),
@@ -121,6 +122,7 @@ fn seed_templates(templates_dir: &PathBuf) -> Result<(), String> {
       description: "How skills work and how to create your own".to_string(),
       prompt: "Explain what skills are, how to use them, and how to create a new skill for this workspace.".to_string(),
       created_at: now_ms(),
+      auto_run: Some(true),
     },
     WorkspaceTemplate {
       id: "tmpl_learn_plugins".to_string(),
@@ -128,6 +130,7 @@ fn seed_templates(templates_dir: &PathBuf) -> Result<(), String> {
       description: "What plugins are and how to install them".to_string(),
       prompt: "Explain what plugins are and how to install them in this workspace.".to_string(),
       created_at: now_ms(),
+      auto_run: Some(true),
     },
   ];
 
diff --git a/packages/desktop/src-tauri/src/workspace/templates.rs b/packages/desktop/src-tauri/src/workspace/templates.rs
index 53cf1f82..3bb1f58b 100644
--- a/packages/desktop/src-tauri/src/workspace/templates.rs
+++ b/packages/desktop/src-tauri/src/workspace/templates.rs
@@ -31,6 +31,7 @@ pub fn serialize_template_frontmatter(template: &WorkspaceTemplate) -> Result<St
   out.push_str(&escape_yaml_scalar(&template.description));
   out.push_str("\n");
   out.push_str(&format!("createdAt: {}\n", template.created_at));
+  out.push_str(&format!("autoRun: {}\n", template.auto_run.unwrap_or(true)));
   out.push_str("---\n\n");
   out.push_str(template.prompt.trim_end());
   out.push('\n');
@@ -55,6 +56,7 @@ pub fn write_template(workspace_path: &str, template: WorkspaceTemplate) -> Resu
     description: template.description,
     prompt: template.prompt,
     created_at: default_template_created_at(template.created_at),
+    auto_run: template.auto_run,
   };
 
   let template_dir = templates_dir.join(&template_id);