diff --git a/.agents/skills/verify-deepseekbot/features/approval-templates.md b/.agents/skills/verify-deepseekbot/features/approval-templates.md
index 02861784b..f64035624 100644
--- a/.agents/skills/verify-deepseekbot/features/approval-templates.md
+++ b/.agents/skills/verify-deepseekbot/features/approval-templates.md
@@ -5,6 +5,7 @@ A Bot inherits the optional global default, selects one complete shared template
 ## Sub-features
 
 - `library`: Bot settings → Auto approval → Global default template (DSH Select), existing template library and Reviewer model. No global default means inherited review is off. Read failures remain errors.
+- `editor`: New template requires Blank or one selected source; edit independent Always ask/Always allow rows in the same grouped card list as External identities/connectors (outer top/bottom corners, straight middle joins), plus free text; save alone or apply to a named Bot. Copy a custom or built-in template independently; shared-original editing lists actual users including global inheritors. Read back full content and selection through CLI.
 - `cli`: `approval-template list --bot <bot>`, `approval-template-global-set <name|off>`, `approval-template-set <bot> <inherit|name|off>`; library create/edit commands retain existing Markdown contents.
 - `select`: Channel settings → Auto approval, or composer Workspace Grants panel → Auto approval, uses the same DSH Select. Inheritance shows its effective global source. Specific selection replaces global; Off retains deterministic rules.
 - `mobile`: Bot profile → Settings → Permissions → Workspace grants → Auto approval template, inside the existing iOS sheet / Android `ModalBottomSheet`. Inherit global shows the resolved global template (or Off); selecting Off then Inherit global writes null then @global through the same Host owner. Legacy Hosts without a global-selection field retain their supported choices.
@@ -33,7 +34,7 @@ Use the shared device QA lane and T3 device tools. The same synthetic Bot and is
 ## Gotchas
 
 - `/tmp` may already be writable; an ordinary file write there need not reach an approval gate.
-- Three-part editing, card-rule table and confirmed bulk deletion fallback are separate issues; this journey does not qualify them.
+- Card-rule table and confirmed bulk deletion fallback remain separate issues. For the editor, verify legacy Markdown survives conversion and an edit during a Review changes only the next captured version.
 - Browser screenshots establish Web behavior only. Preserve failed drives and observe before retrying.
 
 ## Human result retention (#4211)
diff --git a/changes/4244-template-guidance-editor.md b/changes/4244-template-guidance-editor.md
new file mode 100644
index 000000000..d3c9bce20
--- /dev/null
+++ b/changes/4244-template-guidance-editor.md
@@ -0,0 +1,11 @@
+---
+section: Changed
+---
+
+## en
+
+- Added explicit blank or selected-source template creation, independent copies, three-part Reviewer guidance, and separate save/apply choices; shared-original edits disclose the Bots using them, and Always ask/Always allow use the same grouped card list as external identities and connectors ([#4244](https://github.com/BotHarness/DeepSeekBot/issues/4244)).
+
+## zh
+
+- 新增明确选择空白或来源模板创建独立副本、三部分 Reviewer 指导及仅保存／保存并应用选项；编辑共享原件时显示使用它的 Bot；Always ask／Always allow 使用与外部身份及连接器一致的分组卡片列表（[#4244](https://github.com/BotHarness/DeepSeekBot/issues/4244)）。
diff --git a/docs/adr/0342-bot-approval-selects-one-template-and-keeps-deterministic-authorization-separate.md b/docs/adr/0342-bot-approval-selects-one-template-and-keeps-deterministic-authorization-separate.md
index af51461ff..02b637b66 100644
--- a/docs/adr/0342-bot-approval-selects-one-template-and-keeps-deterministic-authorization-separate.md
+++ b/docs/adr/0342-bot-approval-selects-one-template-and-keeps-deterministic-authorization-separate.md
@@ -29,3 +29,7 @@ The existing application-defined approval owner remains responsible for decision
 This amends ADR-0207's template selection, Markdown-only policy shape, three Reviewer outcomes and rejection circuit breaker as target design, not retroactive runtime fact. ADR-0249 continues to govern explicit management authorization. The existing issue bodies are not rewritten by this record.
 
 Rejected alternatives were global-plus-Bot layering (ambiguous effective policy), applying new defaults to old disabled Bots (implicit opt-in), autonomous model rejection (removes the Human's decision on unapproved requests), hidden copies/application (unclear scope), and refusing deletion until every reference is removed (unnecessary repeated work). The selected design makes defaults dynamic and deletion easier, at the cost of a carefully disclosed bulk change and immutable policy snapshots for already-started Reviews.
+
+## File compatibility for #4244
+
+Three-part editing keeps the existing template-file owner and 32 KiB bounded reader. A saved structured template uses the exact marker `<!-- botharness:approval-guidance:v1 -->`, a newline, then JSON containing `alwaysAsk` and `alwaysAllow` string arrays and `freeText`. This is a versioned content representation inside the existing file, not a SQLite migration. Legacy Markdown without that marker maps in full to free text with empty row arrays; headings are not parsed into rules or rewritten. Invalid marked content is unavailable, so a Review falls back to the Human. The Review content hash covers the complete saved representation; decoding for Reviewer assembly uses only that captured text. Copies contain content only. Global defaults and built-ins are unchanged.
diff --git a/docs/architecture/bot-approval-policy.md b/docs/architecture/bot-approval-policy.md
index bfb2a575f..c55a80068 100644
--- a/docs/architecture/bot-approval-policy.md
+++ b/docs/architecture/bot-approval-policy.md
@@ -110,6 +110,8 @@ Future delivery must demonstrate inherited versus specific/Off behavior, Reviewe
 
 Performance assessment: this change edits documentation only, introduces no dependency and changes no runtime hot path, so no runtime benchmark is warranted. Future E2/E3 work must separately budget added admission work and model calls, prove deterministic hits make no Reviewer call, and verify the affected real journey under the repository's performance policy.
 
+The #4244 editor retains the template-file owner and 32 KiB bounded reads. ADR-0342 records the v1 content representation; legacy Markdown maps intact to free text. Copies contain only content. Save and apply are separate choices, shared-original editing shows global inheritors among actual users, and content edits affect future Reviews.
+
 ## Human approval result presentation
 
 A Reviewer handoff appends an explicit `ask-human` result to the canonical Channel before the Human request, with its captured template identity/version, sanitized input and reason. Record failure still routes to Human; cancellation and owner changes cannot grant authorization. Historical autonomous rejection records remain readable; the historical rejection override cannot accept an `ask-human` record.
diff --git a/docs/architecture/bot-approval-policy.zh.md b/docs/architecture/bot-approval-policy.zh.md
index fe3a4b290..988f44fde 100644
--- a/docs/architecture/bot-approval-policy.zh.md
+++ b/docs/architecture/bot-approval-policy.zh.md
@@ -112,6 +112,8 @@ Human 在 Q1–Q18 分轮访谈后确认了完整汇总；原设计树无未决
 
 性能评估：本次只有文档变更，无新依赖、无运行热路径变化，因此免运行性能基准。未来 E2／E3 须分别预算新增准入工作及模型调用，证明确定性命中不调用 Reviewer，并依仓库性能规则验证实际旅程。
 
+#4244 的三部分编辑沿用模板文件 owner 与 32 KiB 有界读取；使用 ADR-0342 记录的 v1 内容表示，旧 Markdown 完整映射为补充说明。复制只复制内容；保存与应用分开，编辑共享原件显示全局继承者在内的使用者。编辑仅影响后续 Review。
+
 ## Human 审批结果展示
 
 Reviewer 转交时，先向同一 canonical Channel 写入显式 `ask-human` 结果，再创建 Human 请求，保留 Review 起始模板身份、版本、已脱敏输入和原因。记录失败仍转 Human；取消或 owner 改变不能授权。历史自动拒绝记录继续可读，旧拒绝覆盖入口不能接受新的 `ask-human` 记录。
diff --git a/docs/bot-cli.md b/docs/bot-cli.md
index ade4b5cc3..2e9b9219a 100644
--- a/docs/bot-cli.md
+++ b/docs/bot-cli.md
@@ -2107,3 +2107,21 @@ deepseekbot models allowed [--as <username>]
 ```
 
 Tool effect declarations (E1) preserve the existing tool commands and approval outcomes. Full Access, saved rules, Secrets, device targets and Workspace Grants retain their existing checks; no new route or CLI authority is introduced.
+
+### Three-part approval guidance
+
+Create an empty draft explicitly with `deepseekbot approval-template create my-draft --blank`, or an independent copy with `deepseekbot approval-template create my-copy --from cautious`. No source is selected implicitly; copies retain no origin link. Existing `--file` / `--text-stdin` Markdown input remains supported.
+
+For three-part editing, write a UTF-8 JSON file:
+
+```json
+{
+  "alwaysAsk": ["Send messages or spend money"],
+  "alwaysAllow": ["Read local project files"],
+  "freeText": "Ask me when unsure."
+}
+```
+
+Run `deepseekbot approval-template edit my-draft --parts-file guidance.json`. Read it back with `deepseekbot approval-template show my-draft`; `text` contains the versioned representation. Add `--apply-to <bot-id>` to create/edit to save and then select it for that Bot. Without that flag, saving changes no selection. Applying uses the existing Bot selection authorization; if applying fails, the saved draft remains and can be selected separately.
+
+Editing a shared original affects future Reviews for every Bot in its `usedBy` list, including global inheritors. Copy first to work independently. Always ask has priority over Always allow, then free text supplements both. These are fallible natural-language instructions, never deterministic Tool Approval Rules. Conflicts, missing coverage or uncertainty ask the Human. Legacy Markdown remains intact as free text when converted; already-started Reviews retain their captured content/version.
diff --git a/docs/bot-cli.zh.md b/docs/bot-cli.zh.md
index d4b2f10fe..18e01c11d 100644
--- a/docs/bot-cli.zh.md
+++ b/docs/bot-cli.zh.md
@@ -2048,3 +2048,21 @@ Web 手动检查请求最多等待 25 秒，关闭自检卡片会取消请求。
 公网阶段仅对 DNS、网络、超时及 HTTP 429/5xx 短暂失败重试：最多四次，间隔 1/3/6 秒，仍受同一个 20 秒总时限约束。证书或身份失败不重试。每次自检完成后，界面刷新一次账号电脑列表。
 
 工具效果声明（E1）保持既有工具命令与审批结果。Full Access、保存规则、Secrets、设备目标和 Workspace Grant 仍使用原检查；不新增 route 或 CLI 权限。
+
+### 三部分审批指导
+
+使用 `deepseekbot approval-template create my-draft --blank` 明确创建空白草稿，或使用 `deepseekbot approval-template create my-copy --from cautious` 创建独立副本。不会自动选取来源，副本不保留来源关联。仍支持 `--file`／`--text-stdin` Markdown 输入。
+
+三部分编辑使用 UTF-8 JSON 文件：
+
+```json
+{
+  "alwaysAsk": ["发送消息或花钱"],
+  "alwaysAllow": ["读取本地项目文件"],
+  "freeText": "不确定时问我。"
+}
+```
+
+运行 `deepseekbot approval-template edit my-draft --parts-file guidance.json`，再用 `deepseekbot approval-template show my-draft` 读回；`text` 包含带格式版本的内容。创建／编辑时添加 `--apply-to <bot-id>` 才会在保存后为该 Bot 选用模板。不加时不改变选择。应用仍通过现有 Bot 选择授权；应用失败时已保存的草稿保留，可单独选用。
+
+编辑共享原件影响 `usedBy` 中所有 Bot 的后续 Review，包括全局继承者。需要独立修改时先复制。总是询问优先于总是允许，补充说明不能取消前者。这些是可能被模型误解的自然语言指导，不是确定性 Tool Approval Rules；冲突、未覆盖或不确定均交给 Human。转换时旧 Markdown 完整保留为补充说明，已经开始的 Review 保留捕获的内容和版本。
diff --git a/packages/client/src/client/approval-template-library.tsx b/packages/client/src/client/approval-template-library.tsx
index 7719b524e..ae3466c02 100644
--- a/packages/client/src/client/approval-template-library.tsx
+++ b/packages/client/src/client/approval-template-library.tsx
@@ -1,6 +1,11 @@
-import { useClientFields } from './use-client-store.js';
+import {
+  decodeApprovalTemplateGuidance,
+  encodeApprovalTemplateGuidance,
+  type ApprovalTemplateGuidance,
+} from '../../../core/src/workspaces/approval-template-guidance.js';
+import { useClientFields, useStoreSlice } from './use-client-store.js';
 import { useState, type ReactElement } from 'react';
-import { Button, Tag } from '@deepseek-ai/dsh-client-ui-primitives';
+import { Button, Input, Tag } from '@deepseek-ai/dsh-client-ui-primitives';
 import * as stylex from '@stylexjs/stylex';
 
 import { templateDescription, templateTitle } from './approval-template-entry.js';
@@ -10,21 +15,32 @@ import {
   errorMessage,
   loadApprovalTemplates,
   setGlobalApprovalTemplate,
+  setBotApprovalTemplate,
   updateApprovalTemplate,
   type ApprovalTemplateView,
   type BridgeCall,
 } from './bridge.js';
 import { Callout } from './ds/callout.js';
-import { FieldStack, TextAreaField, TextField } from './ds/field.js';
+import { Field, FieldStack, TextAreaField, TextField } from './ds/field.js';
 import { ConfirmDialog, DangerTextButton, FormDialog } from './ds/form-dialog.js';
 import { Note } from './ds/note.js';
 import { Select } from './ds/select.js';
 import { SettingsRow, SettingsSection } from './ds/settings-row.js';
-import { space } from './ds/tokens.stylex.js';
+import { border, color, space, text } from './ds/tokens.stylex.js';
+import { ChannelSidebarIcon } from './channel-sidebar-icon.js';
+import { SidebarCardList, SidebarCardRow } from './sidebar-card.js';
 import type { BotHarnessTranslate } from './locale.js';
 import { LoadingSkeleton } from './loading-skeleton.js';
 import { useMountedResource } from './mounted-resource.js';
-import type { ClientStore } from './store.js';
+import type { ClientState, ClientStore } from './store.js';
+
+function currentTemplateBot(state: ClientState): string | undefined {
+  const selection = state.selection;
+  if (selection?.kind === 'bot') return selection.slug;
+  if (selection?.kind === 'channel')
+    return state.channels.find((channel) => channel.id === selection.channelId)?.botSlug;
+  return undefined;
+}
 
 const TEMPLATE_LIBRARY_FIELDS = ['bots'] as const;
 
@@ -32,9 +48,23 @@ const NAME = /^[a-z0-9](?:[a-z0-9-]{0,62}[a-z0-9])?$/u;
 
 const styles = stylex.create({
   meta: { display: 'flex', flexWrap: 'wrap', alignItems: 'center', gap: space.x2 },
+  ruleInput: {
+    boxSizing: 'border-box',
+    width: '100%',
+    minWidth: 0,
+    borderWidth: 0,
+    borderRadius: 0,
+    backgroundColor: 'transparent',
+    fontWeight: text.regular,
+    outlineStyle: 'solid',
+    outlineWidth: border.focus,
+    outlineColor: { default: 'transparent', ':focus-within': color.fg },
+    outlineOffset: -2,
+  },
 });
 
 type Editor =
+  | { mode: 'source' }
   | { mode: 'create'; name: string; text: string }
   | { mode: 'view'; template: ApprovalTemplateView }
   | { mode: 'edit'; template: ApprovalTemplateView; text: string };
@@ -52,9 +82,89 @@ function copyName(name: string, taken: readonly ApprovalTemplateView[]): string
   return candidate;
 }
 
-function copyText(text: string, suffix: string): string {
-  return text.replace(/^(#[ \t]+)(.+)$/mu, (_match, mark: string, title: string) =>
-    title.trimEnd().endsWith(suffix) ? mark + title : mark + title.trimEnd() + ' ' + suffix,
+function GuidanceFields({
+  text,
+  onChange,
+  t,
+}: {
+  text: string;
+  onChange(text: string): void;
+  t: BotHarnessTranslate;
+}): ReactElement {
+  const parts = decodeApprovalTemplateGuidance(text);
+  const update = (next: ApprovalTemplateGuidance): void =>
+    onChange(encodeApprovalTemplateGuidance(next));
+  return (
+    <FieldStack>
+      <Note>{t('autoApproval.library.guidanceHint')}</Note>
+      {(['alwaysAsk', 'alwaysAllow'] as const).map((key) => {
+        const label = t(
+          key === 'alwaysAsk'
+            ? 'autoApproval.library.alwaysAsk'
+            : 'autoApproval.library.alwaysAllow',
+        );
+        return (
+          <Field key={key} label={label} group>
+            {() => (
+              <SidebarCardList label={label}>
+                {parts[key].map((row, index) => {
+                  const rowLabel = label + ' ' + String(index + 1);
+                  return (
+                    <SidebarCardRow
+                      key={index}
+                      leading={<span aria-hidden>{index + 1}</span>}
+                      title={
+                        <Input
+                          aria-label={rowLabel}
+                          className={stylex.props(styles.ruleInput).className ?? ''}
+                          value={row}
+                          onChange={(event) =>
+                            update({
+                              ...parts,
+                              [key]: parts[key].map((item, position) =>
+                                position === index ? event.currentTarget.value : item,
+                              ),
+                            })
+                          }
+                        />
+                      }
+                      trailing={
+                        <Button
+                          type="button"
+                          variant="ghost"
+                          size="sm"
+                          aria-label={t('autoApproval.library.removeRow') + ' · ' + rowLabel}
+                          onClick={() =>
+                            update({
+                              ...parts,
+                              [key]: parts[key].filter((_, position) => position !== index),
+                            })
+                          }
+                        >
+                          <ChannelSidebarIcon name="x" size={16} />
+                        </Button>
+                      }
+                    />
+                  );
+                })}
+                <SidebarCardRow
+                  icon="plus"
+                  title={t('autoApproval.library.addRow', { section: label })}
+                  onClick={() => update({ ...parts, [key]: [...parts[key], ''] })}
+                />
+              </SidebarCardList>
+            )}
+          </Field>
+        );
+      })}
+      <TextAreaField
+        label={t('autoApproval.library.freeText')}
+        hint={t('autoApproval.library.freeTextHint')}
+        value={parts.freeText}
+        rows={8}
+        onChange={(freeText) => update({ ...parts, freeText })}
+      />
+    </FieldStack>
   );
 }
 
@@ -73,9 +183,12 @@ export function ApprovalTemplateLibrarySettings({
   const [loadError, setLoadError] = useState<string>();
   const [editor, setEditor] = useState<Editor>();
   const [deleting, setDeleting] = useState<ApprovalTemplateView>();
+  const [applyTo, setApplyTo] = useState('');
   const [busy, setBusy] = useState(false);
   const [error, setError] = useState<string>();
-  useClientFields(TEMPLATE_LIBRARY_FIELDS, store);
+  const { bots } = useClientFields(TEMPLATE_LIBRARY_FIELDS, store);
+  const currentBotSlug = useStoreSlice(store, currentTemplateBot);
+  const currentBot = bots.find((bot) => bot.slug === currentBotSlug);
 
   const reload = async (): Promise<void> => {
     const next = await loadApprovalTemplates(call);
@@ -121,9 +234,15 @@ export function ApprovalTemplateLibrarySettings({
 
   const close = (): void => {
     setEditor(undefined);
+    setApplyTo('');
     setDeleting(undefined);
     setError(undefined);
   };
+  const createDraft = (draft: Extract<Editor, { mode: 'create' }>): void => {
+    setApplyTo('');
+    setError(undefined);
+    setEditor(draft);
+  };
   const run = (operation: () => Promise<unknown>): void => {
     if (busy) return;
     setBusy(true);
@@ -165,6 +284,63 @@ export function ApprovalTemplateLibrarySettings({
       );
     }
     if (editor === undefined) return null;
+    if (editor.mode === 'source')
+      return (
+        <FormDialog
+          title={t('autoApproval.library.createTitle')}
+          labels={labels}
+          submitLabel=""
+          onCancel={close}
+        >
+          <Select
+            label={t('autoApproval.library.source')}
+            value="@choose"
+            options={[
+              { value: '@choose', label: t('autoApproval.library.chooseSource') },
+              { value: '@blank', label: t('autoApproval.library.blank') },
+              ...list.map((template) => ({
+                value: template.name,
+                label: template.builtIn
+                  ? templateTitle(t, template.name, template.title)
+                  : templateTitle(t, template.name, template.title) + ' · ' + template.name,
+              })),
+            ]}
+            onChange={(source) => {
+              if (source === '@choose') return;
+              const template = list.find((item) => item.name === source);
+              createDraft({
+                mode: 'create',
+                name: template === undefined ? '' : copyName(template.name, list),
+                text:
+                  template?.text ??
+                  encodeApprovalTemplateGuidance({ alwaysAsk: [], alwaysAllow: [], freeText: '' }),
+              });
+            }}
+          />
+        </FormDialog>
+      );
+    const saveChoice = (
+      <Select
+        label={t('autoApproval.library.saveChoice')}
+        value={applyTo}
+        disabled={busy}
+        options={[
+          { value: '', label: t('autoApproval.library.saveOnly') },
+          ...(currentBot === undefined
+            ? []
+            : [
+                {
+                  value: currentBot.slug,
+                  label: t('autoApproval.library.saveApply', { name: currentBot.displayName }),
+                },
+              ]),
+        ]}
+        onChange={setApplyTo}
+      />
+    );
+    const apply = async (name: string): Promise<void> => {
+      if (applyTo !== '') await setBotApprovalTemplate(call, applyTo, name);
+    };
     if (editor.mode === 'create') {
       const nameProblem =
         editor.name !== '' && !NAME.test(editor.name)
@@ -183,7 +359,13 @@ export function ApprovalTemplateLibrarySettings({
           error={error}
           onCancel={close}
           onSubmit={() =>
-            run(() => createApprovalTemplate(call, editor.name, { text: editor.text }))
+            run(async () => {
+              const template = await createApprovalTemplate(call, editor.name, {
+                text: editor.text,
+              });
+              setEditor({ mode: 'edit', template, text: editor.text });
+              await apply(editor.name);
+            })
           }
         >
           <FieldStack>
@@ -198,13 +380,12 @@ export function ApprovalTemplateLibrarySettings({
               autoComplete="off"
               onChange={(name) => setEditor({ ...editor, name: name.trim() })}
             />
-            <TextAreaField
-              label={t('autoApproval.library.text')}
-              hint={t('autoApproval.library.newHint')}
-              value={editor.text}
-              rows={16}
+            <GuidanceFields
+              text={editor.text}
               onChange={(text) => setEditor({ ...editor, text })}
+              t={t}
             />
+            {saveChoice}
           </FieldStack>
         </FormDialog>
       );
@@ -222,10 +403,10 @@ export function ApprovalTemplateLibrarySettings({
           submitData={{ 'data-approval-template-submit': 'copy' }}
           onCancel={close}
           onSubmit={() =>
-            setEditor({
+            createDraft({
               mode: 'create',
               name: copyName(template.name, list),
-              text: copyText(template.text ?? '', t('autoApproval.library.copySuffix')),
+              text: template.text ?? '',
             })
           }
         >
@@ -248,34 +429,56 @@ export function ApprovalTemplateLibrarySettings({
         labels={labels}
         submitLabel={t('autoApproval.library.save')}
         submitData={{ 'data-approval-template-submit': 'save' }}
-        submitDisabled={editor.text.trim() === '' || editor.text === template.text}
+        submitDisabled={
+          editor.text.trim() === '' || (editor.text === template.text && applyTo === '')
+        }
         busy={busy}
         error={error}
         onCancel={close}
-        onSubmit={() => run(() => updateApprovalTemplate(call, template.name, editor.text))}
+        onSubmit={() =>
+          run(async () => {
+            if (editor.text !== template.text)
+              await updateApprovalTemplate(call, template.name, editor.text);
+            await apply(template.name);
+          })
+        }
         secondary={
-          <DangerTextButton
-            disabled={busy}
-            onClick={() => {
-              setError(undefined);
-              setDeleting(template);
-            }}
-          >
-            {t('autoApproval.library.delete')}
-          </DangerTextButton>
+          <>
+            <Button
+              type="button"
+              variant="outline"
+              disabled={busy}
+              onClick={() =>
+                createDraft({
+                  mode: 'create',
+                  name: copyName(template.name, list),
+                  text: editor.text,
+                })
+              }
+            >
+              {t('autoApproval.library.copy')}
+            </Button>
+            <DangerTextButton
+              disabled={busy}
+              onClick={() => {
+                setError(undefined);
+                setDeleting(template);
+              }}
+            >
+              {t('autoApproval.library.delete')}
+            </DangerTextButton>
+          </>
         }
       >
         {names === undefined ? null : (
           <Callout tone="muted">{t('autoApproval.library.inUse', { names })}</Callout>
         )}
-        <TextAreaField
-          label={t('autoApproval.library.text')}
-          hint={t('autoApproval.library.fileHint', { name: template.name })}
-          value={editor.text}
-          rows={16}
-          initialFocus
+        <GuidanceFields
+          text={editor.text}
           onChange={(text) => setEditor({ ...editor, text })}
+          t={t}
         />
+        {saveChoice}
       </FormDialog>
     );
   })();
@@ -348,7 +551,7 @@ export function ApprovalTemplateLibrarySettings({
               variant="outline"
               size="sm"
               disabled={templates === undefined}
-              onClick={() => setEditor({ mode: 'create', name: '', text: '' })}
+              onClick={() => setEditor({ mode: 'source' })}
             >
               {t('autoApproval.library.create')}
             </Button>
@@ -391,6 +594,15 @@ export function ApprovalTemplateLibrarySettings({
                   <Button
                     variant="outline"
                     size="sm"
+                    aria-label={
+                      template.builtIn
+                        ? t('autoApproval.library.view') +
+                          ' · ' +
+                          templateTitle(t, template.name, template.title)
+                        : t('autoApproval.library.editTitle', {
+                            title: templateTitle(t, template.name, template.title),
+                          })
+                    }
                     onClick={() => {
                       setError(undefined);
                       setEditor(
diff --git a/packages/client/src/client/locale.ts b/packages/client/src/client/locale.ts
index f49612335..1480b9317 100644
--- a/packages/client/src/client/locale.ts
+++ b/packages/client/src/client/locale.ts
@@ -4435,6 +4435,20 @@ export const zh = {
   'autoApproval.template.cautiousHint': '允许读取和规划；凡是会离开这台电脑的操作都交给你。',
   'autoApproval.template.getWorkDone': '把活干完',
   'autoApproval.template.getWorkDoneHint': '让工作继续；只拦下破坏性或不可撤回的操作。',
+  'autoApproval.library.source': '创建来源',
+  'autoApproval.library.chooseSource': '请选择来源',
+  'autoApproval.library.blank': '空白模板',
+  'autoApproval.library.alwaysAsk': '总是询问',
+  'autoApproval.library.alwaysAllow': '总是允许',
+  'autoApproval.library.freeText': '补充说明',
+  'autoApproval.library.freeTextHint': '旧版 Markdown 完整保留在这里。',
+  'autoApproval.library.guidanceHint':
+    '这些是 Reviewer 的自然语言指导，不保证模型判断。总是询问优先；冲突、未覆盖或不确定时交给你。修改仅影响后续审批。',
+  'autoApproval.library.removeRow': '移除此行',
+  'autoApproval.library.addRow': '添加{section}项',
+  'autoApproval.library.saveChoice': '保存方式',
+  'autoApproval.library.saveOnly': '仅保存',
+  'autoApproval.library.saveApply': '保存并用于 {name}',
   'autoApproval.library.title': '审批模板',
   'autoApproval.library.description': 'Bot 可继承全局默认，或选择一份共享模板。',
   'autoApproval.library.new': '新建模板',
@@ -4442,7 +4456,7 @@ export const zh = {
   'autoApproval.library.create': '新建',
   'autoApproval.library.createSubmit': '创建',
   'autoApproval.library.createTitle': '新建审批模板',
-  'autoApproval.library.editTitle': '编辑“{title}”',
+  'autoApproval.library.editTitle': '编辑共享原件“{title}”',
   'autoApproval.library.builtIn': '内置',
   'autoApproval.library.usedBy': '{names} 正在使用',
   'autoApproval.library.unused': '没有 Bot 使用',
@@ -4457,8 +4471,7 @@ export const zh = {
   'autoApproval.library.text': '模板内容（Markdown）',
   'autoApproval.library.fileHint': '保存在 Profile 的 approval-templates/{name}.md。',
   'autoApproval.library.readOnly': '内置模板只读。复制一份后可以随意修改。',
-  'autoApproval.library.inUse':
-    '{names} 正在使用这个模板，保存后立刻按新内容审批。Bot 若想从 Shell 修改或删除它，会先发审批卡片给你。',
+  'autoApproval.library.inUse': '{names} 正在使用这个共享模板。保存仅影响后续审批。',
   'autoApproval.library.deleteTitle': '删除“{title}”？',
   'autoApproval.library.deleteBody': '会删除 approval-templates/{name}.md。',
   'autoApproval.library.deleteInUse':
@@ -10426,6 +10439,20 @@ My relationship with you, established lore and topics to avoid: [fill in].
   'autoApproval.template.getWorkDone': 'Get the work done',
   'autoApproval.template.getWorkDoneHint':
     'Lets the work continue; stops only destructive or irreversible calls.',
+  'autoApproval.library.source': 'Creation source',
+  'autoApproval.library.chooseSource': 'Choose a source',
+  'autoApproval.library.blank': 'Blank template',
+  'autoApproval.library.alwaysAsk': 'Always ask',
+  'autoApproval.library.alwaysAllow': 'Always allow',
+  'autoApproval.library.freeText': 'Free text',
+  'autoApproval.library.freeTextHint': 'Legacy Markdown is preserved here in full.',
+  'autoApproval.library.guidanceHint':
+    'Natural-language Reviewer guidance cannot guarantee model decisions. Always ask takes priority; conflicts, missing coverage and uncertainty go to you. Edits affect future Reviews.',
+  'autoApproval.library.removeRow': 'Remove row',
+  'autoApproval.library.addRow': 'Add {section} row',
+  'autoApproval.library.saveChoice': 'Save behavior',
+  'autoApproval.library.saveOnly': 'Save only',
+  'autoApproval.library.saveApply': 'Save and apply to {name}',
   'autoApproval.library.title': 'Approval Templates',
   'autoApproval.library.description': 'Bots can inherit the default or select a shared template.',
   'autoApproval.library.new': 'New template',
@@ -10433,7 +10460,7 @@ My relationship with you, established lore and topics to avoid: [fill in].
   'autoApproval.library.create': 'New',
   'autoApproval.library.createSubmit': 'Create',
   'autoApproval.library.createTitle': 'New Approval Template',
-  'autoApproval.library.editTitle': 'Edit “{title}”',
+  'autoApproval.library.editTitle': 'Edit shared original “{title}”',
   'autoApproval.library.builtIn': 'Built-in',
   'autoApproval.library.usedBy': 'Used by {names}',
   'autoApproval.library.unused': 'No Bot uses it',
@@ -10448,8 +10475,7 @@ My relationship with you, established lore and topics to avoid: [fill in].
   'autoApproval.library.text': 'Template (Markdown)',
   'autoApproval.library.fileHint': 'Saved in the Profile as approval-templates/{name}.md.',
   'autoApproval.library.readOnly': 'Built-in templates are read-only. Copy one to change it.',
-  'autoApproval.library.inUse':
-    'Used by {names}; your edits apply to them right away. A Bot that tries to edit or delete it from its Shell asks you with an approval card first.',
+  'autoApproval.library.inUse': 'Used by {names}. Saves affect their future Reviews.',
   'autoApproval.library.deleteTitle': 'Delete “{title}”?',
   'autoApproval.library.deleteBody': 'This removes approval-templates/{name}.md.',
   'autoApproval.library.deleteInUse':
diff --git a/packages/client/test/approval-template-library.test.ts b/packages/client/test/approval-template-library.test.ts
index 46eba53ec..1a9cf150e 100644
--- a/packages/client/test/approval-template-library.test.ts
+++ b/packages/client/test/approval-template-library.test.ts
@@ -3,6 +3,10 @@ import { act, createElement, type ReactNode } from 'react';
 import { createRoot, type Root } from 'react-dom/client';
 import { afterEach, beforeEach, expect, it, vi } from 'vitest';
 import { ApprovalTemplateLibrarySettings } from '../src/client/approval-template-library.js';
+import {
+  decodeApprovalTemplateGuidance,
+  encodeApprovalTemplateGuidance,
+} from '../../core/src/workspaces/approval-template-guidance.js';
 import type { BridgeCall } from '../src/client/bridge.js';
 import { zhTranslate as t } from '../src/client/locale.js';
 import { createStore } from '../src/client/store.js';
@@ -64,9 +68,9 @@ function trigger(): HTMLButtonElement {
   if (!found) throw new Error('Missing global selection');
   return found;
 }
-async function render(call: BridgeCall): Promise<void> {
+async function render(call: BridgeCall, store = createStore()): Promise<void> {
   await act(async () =>
-    root.render(createElement(ApprovalTemplateLibrarySettings, { call, store: createStore(), t })),
+    root.render(createElement(ApprovalTemplateLibrarySettings, { call, store, t })),
   );
 }
 
@@ -126,3 +130,192 @@ it('keeps a missing global template recognizable without silently clearing its n
   expect(trigger().textContent).toContain('night-shift');
   expect(trigger().textContent).toContain('不可用');
 });
+
+async function clickText(label: string): Promise<void> {
+  const button = [...document.querySelectorAll<HTMLButtonElement>('button')].find(
+    (item) => item.textContent === label,
+  );
+  if (!button) throw new Error('Missing button: ' + label);
+  await act(async () => button.click());
+}
+
+it('requires an explicit source before showing the blank three-part editor and does not apply on opening', async () => {
+  const calls: string[] = [];
+  const call: BridgeCall = async (endpoint) => {
+    calls.push(endpoint);
+    return { ok: true, value: { templates, globalDefault: null } };
+  };
+  await render(call);
+  await clickText(t('autoApproval.library.create'));
+  expect(document.querySelector('textarea')).toBeNull();
+  await clickText(t('autoApproval.library.chooseSource'));
+  await clickText(t('autoApproval.library.blank'));
+  expect(document.body.textContent).toContain(t('autoApproval.library.freeText'));
+  expect(document.body.textContent).toContain(t('autoApproval.library.saveOnly'));
+  expect(document.querySelector('textarea')?.value).toBe('');
+  await clickText(
+    t('autoApproval.library.addRow', { section: t('autoApproval.library.alwaysAsk') }),
+  );
+  expect(
+    document.querySelector('input[aria-label="' + t('autoApproval.library.alwaysAsk') + ' 1"]'),
+  ).not.toBeNull();
+  expect(calls).toEqual(['approvalTemplates']);
+});
+
+it('starts an independent copy with save-only even after choosing apply for the shared original', async () => {
+  const store = createStore();
+  store.setRoster(
+    [
+      {
+        slug: 'qa',
+        displayName: 'QA',
+        roles: [],
+        aggregateState: 'idle',
+        workspaces: [],
+        createdAt: '2026-11-16',
+      },
+    ],
+    [],
+  );
+  store.select({ kind: 'bot', slug: 'qa' });
+  const calls: string[] = [];
+  const call: BridgeCall = async (endpoint) => {
+    calls.push(endpoint);
+    return {
+      ok: true,
+      value: {
+        templates: [
+          {
+            name: 'legacy',
+            title: 'Legacy',
+            description: '',
+            builtIn: false,
+            usedBy: ['qa'],
+            text: '# Legacy\r\nKeep this.',
+          },
+        ],
+        globalDefault: null,
+      },
+    };
+  };
+  await render(call, store);
+  const button = host.querySelector<HTMLButtonElement>('[data-approval-template="legacy"] button');
+  if (!button) throw new Error('Missing shared original');
+  await act(async () => button.click());
+  const choice = () =>
+    document.querySelector<HTMLButtonElement>(
+      'button[aria-label="' + t('autoApproval.library.saveChoice') + '"]',
+    );
+  await act(async () => choice()?.click());
+  await clickText(t('autoApproval.library.saveApply', { name: 'QA' }));
+  expect(choice()?.textContent).toContain('QA');
+  await clickText(t('autoApproval.library.copy'));
+  expect(choice()?.textContent).toContain(t('autoApproval.library.saveOnly'));
+  expect(document.querySelector('textarea')?.value).toBe(
+    '# Legacy\r\nKeep this.'.replaceAll('\r\n', '\n'),
+  );
+  expect(calls).toEqual(['approvalTemplates']);
+});
+
+it('identifies the selected source when independent templates have the same heading', async () => {
+  const call: BridgeCall = async () => ({
+    ok: true,
+    value: {
+      globalDefault: null,
+      templates: ['alpha', 'beta'].map((name) => ({
+        name,
+        title: 'Shared heading',
+        description: '',
+        builtIn: false,
+        usedBy: [],
+        text: '# ' + name,
+      })),
+    },
+  });
+  await render(call);
+  await clickText(t('autoApproval.library.create'));
+  await clickText(t('autoApproval.library.chooseSource'));
+  await clickText('Shared heading · beta');
+  expect(document.querySelector('textarea')?.value).toBe('# beta');
+});
+
+it('keeps the visible View action in accessible template names', async () => {
+  await render(async () => ({ ok: true, value: { templates, globalDefault: null } }));
+  const buttons = [...host.querySelectorAll<HTMLButtonElement>('[data-approval-template] button')];
+  expect(buttons).toHaveLength(2);
+  for (const button of buttons) {
+    expect(button.textContent).toBe(t('autoApproval.library.view'));
+    expect(button.getAttribute('aria-label')).toContain(button.textContent);
+  }
+});
+
+it('edits and removes independent guidance cards without changing neighbouring rules or applying', async () => {
+  let template = {
+    name: 'qa-rules',
+    title: 'QA rules',
+    description: '',
+    builtIn: false,
+    usedBy: [],
+    text: encodeApprovalTemplateGuidance({
+      alwaysAsk: ['Ask A', 'Ask B', 'Ask C'],
+      alwaysAllow: ['Allow A', 'Allow B'],
+      freeText: 'Keep free text unchanged.',
+    }),
+  };
+  const calls: string[] = [];
+  const call: BridgeCall = async (endpoint, payload) => {
+    calls.push(endpoint);
+    if (endpoint === 'approvalTemplates')
+      return { ok: true, value: { templates: [template], globalDefault: null } };
+    if (endpoint === 'approvalTemplateUpdate') {
+      if (typeof payload.text !== 'string') throw new Error('Missing saved guidance');
+      template = { ...template, text: payload.text };
+      return { ok: true, value: { template } };
+    }
+    throw new Error('Unexpected endpoint ' + endpoint);
+  };
+  const ask = t('autoApproval.library.alwaysAsk');
+  const allow = t('autoApproval.library.alwaysAllow');
+  const input = (label: string): HTMLInputElement => {
+    const found = document.querySelector<HTMLInputElement>('input[aria-label="' + label + '"]');
+    if (!found) throw new Error('Missing rule ' + label);
+    return found;
+  };
+  const fill = async (label: string, value: string): Promise<void> => {
+    await act(async () => {
+      Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')!.set!.call(
+        input(label),
+        value,
+      );
+      input(label).dispatchEvent(new Event('input', { bubbles: true }));
+    });
+  };
+  const remove = async (label: string): Promise<void> => {
+    const found = document.querySelector<HTMLButtonElement>(
+      'button[aria-label="' + t('autoApproval.library.removeRow') + ' · ' + label + '"]',
+    );
+    if (!found) throw new Error('Missing remove action ' + label);
+    await act(async () => found.click());
+  };
+  await render(call);
+  const edit = host.querySelector<HTMLButtonElement>('[data-approval-template="qa-rules"] button');
+  if (!edit) throw new Error('Missing template');
+  await act(async () => edit.click());
+  await fill(ask + ' 2', 'Ask B edited');
+  await remove(ask + ' 1');
+  expect(input(ask + ' 1').value).toBe('Ask B edited');
+  expect(input(ask + ' 2').value).toBe('Ask C');
+  expect(input(allow + ' 1').value).toBe('Allow A');
+  await clickText(t('autoApproval.library.addRow', { section: ask }));
+  await fill(ask + ' 3', 'Ask D');
+  await remove(ask + ' 2');
+  await fill(allow + ' 2', 'Allow B edited');
+  expect(document.querySelector('textarea')?.value).toBe('Keep free text unchanged.');
+  await clickText(t('autoApproval.library.save'));
+  expect(decodeApprovalTemplateGuidance(template.text)).toEqual({
+    alwaysAsk: ['Ask B edited', 'Ask D'],
+    alwaysAllow: ['Allow A', 'Allow B edited'],
+    freeText: 'Keep free text unchanged.',
+  });
+  expect(calls).toEqual(['approvalTemplates', 'approvalTemplateUpdate', 'approvalTemplates']);
+});
diff --git a/packages/core/src/bots/cli-approval-templates.ts b/packages/core/src/bots/cli-approval-templates.ts
index 6fb731bb6..f84406c82 100644
--- a/packages/core/src/bots/cli-approval-templates.ts
+++ b/packages/core/src/bots/cli-approval-templates.ts
@@ -1,4 +1,8 @@
-import { readFileSync } from 'node:fs';
+import {
+  encodeApprovalTemplateGuidance,
+  parseApprovalTemplateGuidance,
+} from '../workspaces/approval-template-guidance.js';
+import { readApprovalTemplateFile } from '../workspaces/approval-templates.js';
 
 import type { BotCreateCliIo } from './bot-create-cli.js';
 import { CliLiveError } from './cli-live-error.js';
@@ -7,6 +11,9 @@ type Rpc = (method: string, payload: Record<string, unknown>) => Promise<unknown
 
 export const APPROVAL_TEMPLATE_OPTIONS = {
   from: { type: 'string' },
+  blank: { type: 'boolean' },
+  'parts-file': { type: 'string' },
+  'apply-to': { type: 'string' },
   'text-stdin': { type: 'boolean' },
 } as const;
 
@@ -14,6 +21,9 @@ export interface ApprovalTemplateValues {
   bot?: string;
   file?: string;
   from?: string;
+  blank?: boolean;
+  'parts-file'?: string;
+  'apply-to'?: string;
   'text-stdin'?: boolean;
 }
 
@@ -68,11 +78,25 @@ async function templateText(
   values: ApprovalTemplateValues,
   io: Pick<BotCreateCliIo, 'readStdin'>,
 ): Promise<string> {
+  if (values['parts-file'] !== undefined) {
+    if (values.file !== undefined || values['text-stdin'] === true || values.blank === true)
+      usage('Use only one content input.');
+    let value: unknown;
+    try {
+      value = JSON.parse(readApprovalTemplateFile(values['parts-file']));
+    } catch {
+      return usage('Cannot read guidance JSON.');
+    }
+    const parts = parseApprovalTemplateGuidance(value);
+    if (parts === undefined)
+      return usage('Guidance needs alwaysAsk/alwaysAllow string arrays and freeText.');
+    return encodeApprovalTemplateGuidance(parts);
+  }
   if (values.file !== undefined && values['text-stdin'] === true)
     usage('Give the template text with --file or --text-stdin, not both.');
   if (values.file !== undefined) {
     try {
-      return readFileSync(values.file, 'utf8');
+      return readApprovalTemplateFile(values.file);
     } catch {
       throw new CliLiveError('invalid-input', `Cannot read ${values.file}.`);
     }
@@ -121,22 +145,48 @@ export async function runApprovalTemplateCommand(
         : `approval-template ${subcommand} needs exactly one template name.`,
     );
   const name = args[0]?.trim() ?? '';
+  if (subcommand !== 'create' && (values.from !== undefined || values.blank === true))
+    usage('--blank and --from require create.');
+  if (values['apply-to'] !== undefined && values['apply-to'].trim() === '')
+    usage('--apply-to needs a Bot id.');
+  if (values['apply-to'] !== undefined && subcommand !== 'create' && subcommand !== 'edit')
+    usage('--apply-to requires create or edit.');
+  const apply = async (rpc: Rpc, result: unknown): Promise<unknown> => {
+    if (values['apply-to'] === undefined) return result;
+    await rpc('botApprovalTemplateSet', { slug: values['apply-to'], template: name });
+    return result;
+  };
   if (subcommand === 'create') {
     const from = values.from?.trim();
-    if (from !== undefined && (values.file !== undefined || values['text-stdin'] === true))
-      usage('approval-template create takes --from, or the text with --file or --text-stdin.');
-    const text = from === undefined ? await templateText(values, io) : undefined;
+    const inputs = [
+      values.from !== undefined,
+      values.blank === true,
+      values['parts-file'] !== undefined,
+      values.file !== undefined,
+      values['text-stdin'] === true,
+    ];
+    if (inputs.filter(Boolean).length !== 1 || from === '')
+      usage('Choose one source: --from, --blank, --parts-file, --file or --text-stdin.');
+    const text =
+      from !== undefined
+        ? undefined
+        : values.blank === true
+          ? encodeApprovalTemplateGuidance({ alwaysAsk: [], alwaysAllow: [], freeText: '' })
+          : await templateText(values, io);
     const rpc = await connect();
-    return rpc('approvalTemplateCreate', {
-      name,
-      ...(text === undefined ? {} : { text }),
-      ...(from === undefined ? {} : { from }),
-    });
+    return apply(
+      rpc,
+      await rpc('approvalTemplateCreate', {
+        name,
+        ...(text === undefined ? {} : { text }),
+        ...(from === undefined ? {} : { from }),
+      }),
+    );
   }
   if (subcommand === 'edit') {
     const text = await templateText(values, io);
     const rpc = await connect();
-    return rpc('approvalTemplateUpdate', { name, text });
+    return apply(rpc, await rpc('approvalTemplateUpdate', { name, text }));
   }
   if (subcommand === 'delete') {
     const rpc = await connect();
diff --git a/packages/core/src/workspaces/approval-reviewer.ts b/packages/core/src/workspaces/approval-reviewer.ts
index 73931cd67..ae284f1ba 100644
--- a/packages/core/src/workspaces/approval-reviewer.ts
+++ b/packages/core/src/workspaces/approval-reviewer.ts
@@ -1,3 +1,4 @@
+import { approvalTemplateReviewerText } from './approval-template-guidance.js';
 import type { Context } from '@deepseek-ai/cordis';
 import { installNativeTools } from '../runtime/native-agent-compat.js';
 import type { Agent, AgentHandle, CreateAgentOptions } from '@deepseek-ai/dsh-agent';
@@ -196,7 +197,7 @@ export function reviewerUserPrompt(request: Omit<ApprovalReviewRequest, 'signal'
   const excerpt = request.excerpt;
   return [
     `<approval-template name="${request.template.name}" version="${request.template.version ?? 'unversioned'}">`,
-    request.template.text.trim(),
+    approvalTemplateReviewerText(request.template.text),
     '</approval-template>',
     '',
     '<pending-call>',
diff --git a/packages/core/src/workspaces/approval-template-guidance.ts b/packages/core/src/workspaces/approval-template-guidance.ts
new file mode 100644
index 000000000..ae73c0e52
--- /dev/null
+++ b/packages/core/src/workspaces/approval-template-guidance.ts
@@ -0,0 +1,52 @@
+export interface ApprovalTemplateGuidance {
+  alwaysAsk: string[];
+  alwaysAllow: string[];
+  freeText: string;
+}
+
+const MARKER = '<!-- botharness:approval-guidance:v1 -->';
+const PREFIX = MARKER + '\n';
+
+export function parseApprovalTemplateGuidance(
+  value: unknown,
+): ApprovalTemplateGuidance | undefined {
+  if (typeof value !== 'object' || value === null) return;
+  if (!('alwaysAsk' in value) || !('alwaysAllow' in value) || !('freeText' in value)) return;
+  const { alwaysAsk, alwaysAllow, freeText } = value;
+  if (!Array.isArray(alwaysAsk) || !Array.isArray(alwaysAllow) || typeof freeText !== 'string')
+    return;
+  if (
+    !alwaysAsk.every((row: unknown): row is string => typeof row === 'string') ||
+    !alwaysAllow.every((row: unknown): row is string => typeof row === 'string')
+  )
+    return;
+  return { alwaysAsk, alwaysAllow, freeText };
+}
+
+export function decodeApprovalTemplateGuidance(text: string): ApprovalTemplateGuidance {
+  if (!text.startsWith('<!-- botharness:approval-guidance:'))
+    return { alwaysAsk: [], alwaysAllow: [], freeText: text };
+  if (!text.startsWith(MARKER)) throw new Error('Invalid approval template guidance');
+  const afterMarker = text.slice(MARKER.length);
+  const newline = afterMarker.startsWith('\r\n') ? 2 : afterMarker.startsWith('\n') ? 1 : 0;
+  if (newline === 0) throw new Error('Invalid approval template guidance');
+  const guidance = parseApprovalTemplateGuidance(JSON.parse(afterMarker.slice(newline)));
+  if (guidance === undefined) throw new Error('Invalid approval template guidance');
+  return guidance;
+}
+
+export function encodeApprovalTemplateGuidance(guidance: ApprovalTemplateGuidance): string {
+  return PREFIX + JSON.stringify(guidance) + '\n';
+}
+
+export function approvalTemplateReviewerText(text: string): string {
+  const guidance = decodeApprovalTemplateGuidance(text);
+  return [
+    'Always ask (highest priority):',
+    JSON.stringify(guidance.alwaysAsk),
+    'Always allow (only without a conflict):',
+    JSON.stringify(guidance.alwaysAllow),
+    'Free text (supplemental; cannot cancel Always ask):',
+    guidance.freeText,
+  ].join('\n');
+}
diff --git a/packages/core/src/workspaces/approval-templates.ts b/packages/core/src/workspaces/approval-templates.ts
index 88a4e454f..7a7a9ce24 100644
--- a/packages/core/src/workspaces/approval-templates.ts
+++ b/packages/core/src/workspaces/approval-templates.ts
@@ -10,6 +10,7 @@ import {
   writeFileSync,
 } from 'node:fs';
 import { join } from 'node:path';
+import { decodeApprovalTemplateGuidance } from './approval-template-guidance.js';
 import { atomicWriteFile } from '../fs/atomic-write.js';
 
 export const INHERIT_APPROVAL_TEMPLATE = '@global';
@@ -145,7 +146,8 @@ export interface ApprovalTemplateLibrary {
 }
 
 function summaryOf(name: string, text: string): ApprovalTemplate {
-  const lines = text.split(/\r?\n/u).map((line) => line.trim());
+  const guidance = decodeApprovalTemplateGuidance(text);
+  const lines = guidance.freeText.split(/\r?\n/u).map((line) => line.trim());
   const heading = lines.find((line) => /^#\s+\S/u.test(line));
   const start = lines.findIndex((line) => line !== '' && !line.startsWith('#'));
   const end = start < 0 ? -1 : lines.findIndex((line, index) => index > start && line === '');
@@ -168,14 +170,21 @@ function summaryOf(name: string, text: string): ApprovalTemplate {
 }
 
 function textProblem(text: string): boolean {
-  return (
+  if (
     typeof text !== 'string' ||
-    text.trim() === '' ||
-    Buffer.byteLength(text, 'utf8') > APPROVAL_TEMPLATE_TEXT_LIMIT
-  );
+    Buffer.byteLength(text, 'utf8') > APPROVAL_TEMPLATE_TEXT_LIMIT ||
+    text.trim() === ''
+  )
+    return true;
+  try {
+    decodeApprovalTemplateGuidance(text);
+  } catch {
+    return true;
+  }
+  return false;
 }
 
-function readTemplateFile(path: string): string {
+export function readApprovalTemplateFile(path: string): string {
   const descriptor = openSync(path, 'r');
   try {
     const buffer = Buffer.alloc(APPROVAL_TEMPLATE_TEXT_LIMIT + 1);
@@ -198,12 +207,13 @@ export function createApprovalTemplateLibrary(dir?: string): ApprovalTemplateLib
   const readCustom = (name: string): ApprovalTemplate | undefined => {
     if (dir === undefined || !isApprovalTemplateName(name) || approvalTemplate(name)) return;
     try {
-      return summaryOf(name, readTemplateFile(file(name)));
+      return summaryOf(name, readApprovalTemplateFile(file(name)));
     } catch {
       return undefined;
     }
   };
   const write = (name: string, text: string): ApprovalTemplate => {
+    decodeApprovalTemplateGuidance(text);
     mkdirSync(dir!, { recursive: true });
     const temporary = file(name) + '.' + process.pid + '.tmp';
     writeFileSync(temporary, text, { encoding: 'utf8', mode: 0o600 });
@@ -223,7 +233,7 @@ export function createApprovalTemplateLibrary(dir?: string): ApprovalTemplateLib
       if (dir === undefined) return { kind: 'off' };
       let value: unknown;
       try {
-        value = JSON.parse(readTemplateFile(join(dir, '.selection.json')));
+        value = JSON.parse(readApprovalTemplateFile(join(dir, '.selection.json')));
       } catch (error) {
         return error instanceof Error && 'code' in error && error.code === 'ENOENT'
           ? { kind: 'off' }
@@ -288,6 +298,7 @@ export function createApprovalTemplateLibrary(dir?: string): ApprovalTemplateLib
 }
 
 const POLICY_CHANGE_PATTERNS: readonly RegExp[] = [
+  /--apply-to\b/iu,
   /approval-template-(?:global-)?set\b/iu,
   /grant-request-approve\b|grantRequestApprove\b|grant-write-set\b/iu,
   /approval-reviewer[\s\S]*\b(set|edit|delete|rm|remove)\b/iu,
diff --git a/packages/core/test/approval-reviewer.test.ts b/packages/core/test/approval-reviewer.test.ts
index ef73ffcdc..5786ecaf7 100644
--- a/packages/core/test/approval-reviewer.test.ts
+++ b/packages/core/test/approval-reviewer.test.ts
@@ -1,3 +1,8 @@
+import { mkdtempSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { createApprovalTemplateLibrary } from '../src/workspaces/approval-templates.js';
+import { encodeApprovalTemplateGuidance } from '../src/workspaces/approval-template-guidance.js';
 import { OWNER_HUMAN_CONTEXT } from '../src/humans/context.js';
 import { describe, expect, it, vi } from 'vitest';
 
@@ -224,6 +229,28 @@ describe('Approval Templates', () => {
 });
 
 describe('Approval Reviewer input', () => {
+  it('assembles ask, allow and supplemental guidance in priority order without compiling rules', () => {
+    const prompt = reviewerUserPrompt({
+      botSlug,
+      template: {
+        name: 'three-parts',
+        version: 'captured',
+        text: encodeApprovalTemplateGuidance({
+          alwaysAsk: ['Never send without asking'],
+          alwaysAllow: ['Read local files'],
+          freeText: '# Legacy\nKeep all markup.',
+        }),
+      },
+      call: { toolName: 'read_file', input: '{}', cwd: '/', role: 'orchestrator', channelId },
+      excerpt: { humanMessages: [], toolCalls: [] },
+    });
+    expect(prompt.indexOf('Never send without asking')).toBeLessThan(
+      prompt.indexOf('Read local files'),
+    );
+    expect(prompt.indexOf('Read local files')).toBeLessThan(prompt.indexOf('# Legacy'));
+    expect(prompt).toContain('version="captured"');
+    expect(REVIEWER_SYSTEM_PROMPT).toContain('Never reject a call or save a rule');
+  });
   it('keeps the Human messages and earlier tool calls, and leaves out results and Bot prose', () => {
     const excerpt = approvalSessionExcerpt(events, 'call-1');
     expect(excerpt.humanMessages).toEqual(['Plan the release, but do not send anything yet.']);
@@ -452,6 +479,48 @@ describe('Approval Reviewer input', () => {
 });
 
 describe('Approval Reviewer in the tool approval gate', () => {
+  it('uses saved three-part content for a captured Review and leaves later file edits for the next Review', async () => {
+    const dir = mkdtempSync(join(tmpdir(), 'saved-guidance-review-'));
+    try {
+      const library = createApprovalTemplateLibrary(dir);
+      const original = encodeApprovalTemplateGuidance({
+        alwaysAsk: ['Send messages'],
+        alwaysAllow: ['Keep a plan'],
+        freeText: '# Legacy\nAsk if unsure.',
+      });
+      library.create('saved', original);
+      let finish!: (review: ApprovalReview) => void;
+      const state = fixture({
+        lookup: () => library.get('saved'),
+        review: async (request) => {
+          expect(reviewerUserPrompt(request)).toContain('Keep a plan');
+          return new Promise((resolve) => {
+            finish = resolve;
+          });
+        },
+      });
+      state.broker.track(state.execution());
+      const answer = state.ask();
+      await vi.waitFor(() => expect(state.review).toHaveBeenCalledTimes(1));
+      library.update(
+        'saved',
+        encodeApprovalTemplateGuidance({
+          alwaysAsk: ['Everything'],
+          alwaysAllow: [],
+          freeText: '',
+        }),
+      );
+      expect(state.review.mock.calls[0]?.[0].template.text).toBe(original);
+      finish({ outcome: 'allow', reason: 'Planning is covered.' });
+      expect(await answer).toBe('allowed-once');
+      expect(state.messages[0]?.toolAutoApproval?.templateVersion).toBe(
+        state.review.mock.calls[0]?.[0].template.version,
+      );
+      expect(library.get('saved')?.text).not.toBe(original);
+    } finally {
+      rmSync(dir, { recursive: true, force: true });
+    }
+  });
   it('posts a Human card even when selected-template lookup and diagnostics both fail', async () => {
     const state = fixture({
       lookup: () => {
diff --git a/packages/core/test/approval-template-library.test.ts b/packages/core/test/approval-template-library.test.ts
index 71e36c708..5b6b870ba 100644
--- a/packages/core/test/approval-template-library.test.ts
+++ b/packages/core/test/approval-template-library.test.ts
@@ -1,3 +1,7 @@
+import {
+  decodeApprovalTemplateGuidance,
+  encodeApprovalTemplateGuidance,
+} from '../src/workspaces/approval-template-guidance.js';
 import { OWNER_HUMAN_CONTEXT } from '../src/humans/context.js';
 import { existsSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { createServer } from 'node:http';
@@ -61,6 +65,70 @@ function fakeRegistry(records: Partial<PersonaBotRecord>[]) {
 }
 
 describe('Approval Template library', () => {
+  it('accepts structured guidance with Windows line endings', () => {
+    const parts = { alwaysAsk: ['Ask'], alwaysAllow: ['Read'], freeText: 'Supplement' };
+    expect(
+      decodeApprovalTemplateGuidance(
+        encodeApprovalTemplateGuidance(parts).replaceAll('\n', '\r\n'),
+      ),
+    ).toEqual(parts);
+  });
+  it.each([
+    '<!-- botharness:approval-guidance:v1 -->',
+    '<!-- botharness:approval-guidance:v1 -->\r\n{}',
+    '<!-- botharness:approval-guidance:v1 -->\r\n{broken',
+    '<!-- botharness:approval-guidance:v2 -->\n{}',
+  ])('refuses malformed marked guidance rather than legacy fallback: %j', (input) => {
+    expect(() => decodeApprovalTemplateGuidance(input)).toThrow();
+    const dir = tempDir();
+    const library = createApprovalTemplateLibrary(dir);
+    expect(library.create('invalid', input)).toEqual({ ok: false, reason: 'invalid-text' });
+    writeFileSync(join(dir, 'external.md'), input);
+    expect(library.get('external')).toBeUndefined();
+  });
+
+  it('round-trips three-part guidance and preserves every byte of legacy Markdown on conversion', () => {
+    const legacy = '# Legacy\r\n\r\n## Allow\r\n- Read.\r\n<!-- custom -->\r\n';
+    const parts = decodeApprovalTemplateGuidance(legacy);
+    expect(parts).toEqual({ alwaysAsk: [], alwaysAllow: [], freeText: legacy });
+    const library = createApprovalTemplateLibrary(tempDir());
+    const text = encodeApprovalTemplateGuidance({
+      ...parts,
+      alwaysAsk: ['发送消息'],
+      alwaysAllow: ['Read files'],
+    });
+    expect(library.create('structured', text)).toMatchObject({ ok: true });
+    expect(decodeApprovalTemplateGuidance(library.get('structured')!.text)).toEqual({
+      ...parts,
+      alwaysAsk: ['发送消息'],
+      alwaysAllow: ['Read files'],
+    });
+    expect(
+      library.create(
+        'too-large',
+        encodeApprovalTemplateGuidance({ ...parts, freeText: '界'.repeat(11000) }),
+      ),
+    ).toEqual({ ok: false, reason: 'invalid-text' });
+    expect(library.create('broken', '<!-- botharness:approval-guidance:v1 -->\n{}')).toEqual({
+      ok: false,
+      reason: 'invalid-text',
+    });
+  });
+  it('refuses oversized structured input before spending work on JSON decoding', () => {
+    const library = createApprovalTemplateLibrary(tempDir());
+    const input =
+      '<!-- botharness:approval-guidance:v1 -->\n' +
+      ' '.repeat(APPROVAL_TEMPLATE_TEXT_LIMIT) +
+      '{}';
+    const parse = vi.spyOn(JSON, 'parse');
+    try {
+      expect(library.create('oversized', input)).toEqual({ ok: false, reason: 'invalid-text' });
+      expect(parse).not.toHaveBeenCalled();
+    } finally {
+      parse.mockRestore();
+    }
+  });
+
   it('keeps each Human template as one Markdown file next to the read-only built-ins', () => {
     const dir = join(tempDir(), 'approval-templates');
     const library = createApprovalTemplateLibrary(dir);
@@ -334,6 +402,19 @@ describe('Approval Template bridge methods', () => {
     expect(registry.get('bob')?.approvalTemplate).toBeUndefined();
   });
 
+  it('keeps copies independent and saving alone leaves Bot/global selections intact', () => {
+    const { bridge, library, registry } = methods();
+    library.setGlobal('cautious');
+    registry.setApprovalTemplate('bob', '@global');
+    bridge.approvalTemplateCreate({ name: 'original', text: MINE });
+    bridge.approvalTemplateCreate({ name: 'copy', from: 'original' });
+    bridge.approvalTemplateUpdate({ name: 'original', text: '# Changed' });
+    expect(library.get('copy')?.text).toBe(MINE);
+    expect(library.get('copy')).not.toHaveProperty('from');
+    expect(registry.get('bob')?.approvalTemplate).toBe('@global');
+    expect(library.global()).toEqual({ kind: 'selected', name: 'cautious' });
+  });
+
   it('creates, copies, edits and lists templates with the Bots that use them', () => {
     const { bridge } = methods();
     expect(bridge.approvalTemplateCreate({ name: 'night-shift', text: MINE })).toMatchObject({
@@ -484,6 +565,51 @@ describe('deepseekbot approval-template', () => {
     ]);
   });
 
+  it('creates a blank draft explicitly and applies only with the explicit target flag', async () => {
+    const live = await host();
+    await invoke(['approval-template', 'create', 'blank', '--blank'], live.url);
+    expect(live.calls).toHaveLength(1);
+    expect(live.calls[0]).toMatchObject({ method: 'approvalTemplateCreate' });
+    const partsFile = join(tempDir(), 'parts.json');
+    const parts = {
+      alwaysAsk: ['Send messages'],
+      alwaysAllow: ['Read files'],
+      freeText: 'Ask when unsure.',
+    };
+    writeFileSync(partsFile, JSON.stringify(parts));
+    await invoke(
+      ['approval-template', 'edit', 'blank', '--parts-file', partsFile, '--apply-to', 'ada'],
+      live.url,
+    );
+    expect(live.calls.slice(1)).toEqual([
+      {
+        method: 'approvalTemplateUpdate',
+        args: { name: 'blank', text: encodeApprovalTemplateGuidance(parts) },
+      },
+      { method: 'botApprovalTemplateSet', args: { slug: 'ada', template: 'blank' } },
+    ]);
+    expect(
+      changesApprovalPolicy(
+        'deepseekbot approval-template create blank --blank --apply-to ada',
+        () => false,
+      ),
+    ).toBe(true);
+  });
+
+  it.each([
+    ['--from', 'cautious', '--blank'],
+    ['--from', 'cautious', '--parts-file', 'missing-guidance.json'],
+    ['--from', 'cautious', '--blank', '--apply-to', 'ada'],
+    ['--from', 'cautious', '--parts-file', 'missing-guidance.json', '--apply-to', 'ada'],
+    ['--from', '   ', '--apply-to', 'ada'],
+  ])('refuses ambiguous or empty creation sources before save/apply: %j', async (...options) => {
+    const live = await host();
+    const result = await invoke(['approval-template', 'create', 'copy', ...options], live.url);
+    expect(result).toMatchObject({ json: { error: { code: 'usage' } } });
+    expect(result.code).not.toBe(0);
+    expect(live.calls).toEqual([]);
+  });
+
   it('refuses bad usage before calling the Host', async () => {
     const live = await host();
     for (const argv of [