@logictan/dsh-config-manager 0.1.60

package/src/adapters/pnpm-workspace.test.ts

@@ -0,0 +1,87 @@
+/**
+ * issue #35 回归：patchedDependencies 的解析与「目标机没有 patch 文件」条目的剔除。
+ * 目标：绝不把「声明存在、文件不存在」的组合写到目标机（否则 pnpm 拒绝一切 add）。
+ */
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { parsePnpmPatchedDependencies, sanitizePnpmWorkspacePatches } from './pnpm-workspace.ts';
+
+const SOURCE = [
+  'packages:',
+  "  - 'plugins/*'",
+  'allowBuilds:',
+  '  ssh2: true',
+  'patchedDependencies:',
+  '  dsh-approval-gate: patches/dsh-approval-gate.patch',
+  '  dsh-whale-galgame: patches/dsh-whale-galgame.patch',
+  'minimumReleaseAgeExclude:',
+  '  - dsh-config-manager',
+  '',
+].join('\n');
+
+test('parse：读出全部声明（含引号/行尾注释）', () => {
+  const r = parsePnpmPatchedDependencies(SOURCE);
+  assert.equal(r.unsupported, null);
+  assert.deepEqual(r.declared, [
+    { name: 'dsh-approval-gate', path: 'patches/dsh-approval-gate.patch' },
+    { name: 'dsh-whale-galgame', path: 'patches/dsh-whale-galgame.patch' },
+  ]);
+  const quoted = parsePnpmPatchedDependencies("patchedDependencies:\n  a: 'p/a.patch' # 说明\n");
+  assert.deepEqual(quoted.declared, [{ name: 'a', path: 'p/a.patch' }]);
+});
+
+test('sanitize：patch 文件都在 → 逐字节不变（保留注释与格式）', () => {
+  const r = sanitizePnpmWorkspacePatches(SOURCE, () => true);
+  assert.equal(r.text, SOURCE, '无需修改时必须原样返回');
+  assert.deepEqual(r.dropped, []);
+});
+
+test('sanitize：目标机缺文件 → 只删那一条（issue #35 的复现路径）', () => {
+  const r = sanitizePnpmWorkspacePatches(SOURCE, (rel) => rel === 'patches/dsh-approval-gate.patch');
+  assert.deepEqual(r.dropped.map((d) => d.name), ['dsh-whale-galgame']);
+  assert.ok(r.text.includes('dsh-approval-gate: patches/dsh-approval-gate.patch'), '可用的条目必须保留');
+  assert.ok(!r.text.includes('dsh-whale-galgame'), '缺文件的条目必须整行消失');
+  // 其余配置一字不动
+  assert.ok(r.text.includes('allowBuilds:\n  ssh2: true'));
+  assert.ok(r.text.includes('minimumReleaseAgeExclude:\n  - dsh-config-manager'));
+});
+
+test('sanitize：全部条目都缺 → 连 patchedDependencies 键一起删（不留空键）', () => {
+  const r = sanitizePnpmWorkspacePatches(SOURCE, () => false);
+  assert.equal(r.dropped.length, 2);
+  assert.ok(!r.text.includes('patchedDependencies'), '空键也必须删掉');
+  assert.ok(r.text.includes('packages:'), '其它键不受影响');
+  assert.ok(r.text.includes('minimumReleaseAgeExclude:'), '键之后的块不得被误删');
+});
+
+test('sanitize：越界/绝对路径的声明同样移除（目标机不可读，pnpm 亦拒绝）', () => {
+  const text = "patchedDependencies:\n  a: ../outside/a.patch\n  b: C:/abs/b.patch\n  c: p/c.patch\n";
+  const r = sanitizePnpmWorkspacePatches(text, () => true);
+  assert.deepEqual(r.dropped.map((d) => d.name).sort(), ['a', 'b']);
+  assert.ok(r.text.includes('c: p/c.patch'));
+});
+
+test('sanitize：单行 flow 形态不猜着改，返回 unsupported 供上层告警', () => {
+  const text = 'patchedDependencies: {a: p/a.patch}\nallowBuilds:\n  ssh2: true\n';
+  const r = sanitizePnpmWorkspacePatches(text, () => false);
+  assert.equal(r.text, text, '不支持的形态必须原样返回，绝不半改');
+  assert.ok(r.unsupported !== null);
+});
+
+test('sanitize：CRLF 文本保留 CRLF；块内注释随被删条目一起消失', () => {
+  const text = 'patchedDependencies:\r\n  # 旧补丁\r\n  a: p/a.patch\r\n  b: p/b.patch\r\nother: 1\r\n';
+  const r = sanitizePnpmWorkspacePatches(text, (rel) => rel === 'p/b.patch');
+  assert.equal(r.text.includes('\r\n'), true, 'CRLF 不得被改成 LF');
+  assert.ok(!r.text.includes('a: p/a.patch'));
+  assert.ok(!r.text.includes('旧补丁'), '被删条目的注释一并移除');
+  assert.ok(r.text.includes('b: p/b.patch'));
+  assert.ok(r.text.includes('other: 1'));
+});
+
+test('sanitize：没有 patchedDependencies 时不产生任何改动', () => {
+  const text = 'allowBuilds:\n  ssh2: true\n';
+  const r = sanitizePnpmWorkspacePatches(text, () => false);
+  assert.equal(r.text, text);
+  assert.deepEqual(r.declared, []);
+  assert.equal(r.unsupported, null);
+});

package/src/adapters/pnpm-workspace.ts

@@ -0,0 +1,150 @@
+/**
+ * pnpm-workspace.yaml 的 `patchedDependencies` 处理（issue #35）。
+ *
+ * 背景：plugins 分区会**整段搬运** pnpm-workspace.yaml，但 `patchedDependencies` 引用的
+ * `patches/*.patch` 文件不在任何被同步的分区里。目标机因此拿到「声明存在、文件不存在」的
+ * 组合，此后**任何** `pnpm add`（含 dsh plugin add）都失败于
+ * `Failed to read patch file ... (os error 2)` —— 用户实测 13/13 插件安装全灭。
+ *
+ * 本模块做两件事，且**不做整文件重写**（保留用户注释与格式）：
+ *  1. `parsePnpmPatchedDependencies`：按行解析声明（供导出侧收集 patch 文件）；
+ *  2. `sanitizePnpmWorkspacePatches`：把「目标机没有对应文件」的条目整行删掉
+ *     （含其上方注释），全部被删时连键一起删 —— 宁可少迁移一条 patch 声明，
+ *     也不让目标机的 pnpm 从此拒绝一切安装。
+ */
+import { isPathSafe, normalizePath } from '../utils/paths.ts';
+
+export interface PatchedDependency {
+  /** 依赖名（patchedDependencies 的键） */
+  name: string;
+  /** 声明的 patch 路径（相对 profile 目录，已去引号；原始写法保留） */
+  path: string;
+}
+
+export interface ParsePatchedResult {
+  declared: PatchedDependency[];
+  /** 无法安全改写的形态（如单行 flow 映射）→ 调用方据此告警，绝不猜着改 */
+  unsupported: string | null;
+}
+
+const KEY_RE = /^patchedDependencies\s*:(.*)$/;
+const ENTRY_RE = /^([ \t]+)([^\s#][^:]*?)\s*:\s*(.*)$/;
+
+/** 去引号 + 去行尾注释（保守：只在引号外找 ` #`） */
+function cleanScalar(raw: string): string {
+  let v = raw.trim();
+  if (v.startsWith("'") || v.startsWith('"')) {
+    const quote = v[0] as string;
+    const end = v.indexOf(quote, 1);
+    if (end > 0) return v.slice(1, end);
+  }
+  const hash = v.indexOf(' #');
+  if (hash >= 0) v = v.slice(0, hash);
+  return v.trim();
+}
+
+/** 解析 patchedDependencies 的声明（纯函数；不校验文件是否存在）。 */
+export function parsePnpmPatchedDependencies(text: string): ParsePatchedResult {
+  const declared: PatchedDependency[] = [];
+  if (text === '') return { declared, unsupported: null };
+  const lines = text.split(/\r?\n/);
+  for (let i = 0; i < lines.length; i++) {
+    const m = KEY_RE.exec(lines[i] ?? '');
+    if (m === null) continue;
+    const inline = (m[1] ?? '').trim();
+    // 单行 flow 形态（patchedDependencies: {a: b}）无法按行安全删条目 → 不改写，交给调用方告警
+    if (inline !== '' && !inline.startsWith('#')) {
+      return { declared, unsupported: lines[i] ?? '' };
+    }
+    for (let j = i + 1; j < lines.length; j++) {
+      const line = lines[j] ?? '';
+      if (line.trim() === '' || /^[ \t]*#/.test(line)) continue;
+      const e = ENTRY_RE.exec(line);
+      if (e === null) break; // 缩进块结束（回到顶层键）
+      declared.push({ name: (e[2] ?? '').trim(), path: cleanScalar(e[3] ?? '') });
+    }
+    break; // patchedDependencies 只处理第一处（YAML 重复键本就非法）
+  }
+  return { declared, unsupported: null };
+}
+
+export interface SanitizeResult {
+  /** 清理后的文本（无需修改时与入参逐字节相同） */
+  text: string;
+  declared: PatchedDependency[];
+  /** 被移除的条目（目标机没有对应 patch 文件） */
+  dropped: PatchedDependency[];
+  unsupported: string | null;
+}
+
+/**
+ * 删除 patchedDependencies 中「目标机不存在对应 patch 文件」的条目。
+ * @param available 判断某相对路径（相对 profile 目录）在**导入后**是否存在
+ */
+export function sanitizePnpmWorkspacePatches(
+  text: string,
+  available: (relPath: string) => boolean,
+): SanitizeResult {
+  const parsed = parsePnpmPatchedDependencies(text);
+  if (parsed.unsupported !== null) {
+    return { text, declared: parsed.declared, dropped: [], unsupported: parsed.unsupported };
+  }
+  if (parsed.declared.length === 0) return { text, declared: [], dropped: [], unsupported: null };
+
+  const droppedNames = new Set<string>();
+  for (const d of parsed.declared) {
+    const rel = normalizePath(d.path);
+    // 越界/绝对路径的声明在目标机同样不可读（pnpm 也会拒绝）→ 一并移除
+    if (rel === '' || !isPathSafe(rel) || !available(rel)) droppedNames.add(d.name);
+  }
+  if (droppedNames.size === 0) return { text, declared: parsed.declared, dropped: [], unsupported: null };
+
+  const eol = text.includes('\r\n') ? '\r\n' : '\n';
+  const lines = text.split(/\r?\n/);
+  const out: string[] = [];
+  let removed = 0;
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i] ?? '';
+    const m = KEY_RE.exec(line);
+    if (m === null) { out.push(line); continue; }
+    const inline = (m[1] ?? '').trim();
+    if (inline !== '' && !inline.startsWith('#')) { out.push(line); continue; }
+    // 收集整块（键 + 缩进条目 + 其上的注释）
+    const block: string[] = [];
+    let j = i + 1;
+    for (; j < lines.length; j++) {
+      const l = lines[j] ?? '';
+      if (l.trim() === '' || /^[ \t]*#/.test(l)) { block.push(l); continue; }
+      if (ENTRY_RE.exec(l) === null) break;
+      block.push(l);
+    }
+    // 逐条判定：保留/删除（注释与空行随其**下一条**条目一起处置；尾部孤立注释一律保留）
+    const kept: string[] = [];
+    let pending: string[] = [];
+    let keptEntries = 0;
+    for (const bl of block) {
+      const e = ENTRY_RE.exec(bl);
+      if (e === null) { pending.push(bl); continue; }
+      const name = (e[2] ?? '').trim();
+      if (droppedNames.has(name)) { removed += 1; pending = []; continue; }
+      kept.push(...pending, bl);
+      pending = [];
+      keptEntries += 1;
+    }
+    kept.push(...pending);
+    if (keptEntries > 0) {
+      out.push(line);           // 键保留
+      out.push(...kept);
+    } else {
+      removed += 1;             // 键本身也删（没有任何条目留下）
+    }
+    i = j - 1;
+  }
+  // 全部条目都没了 → 键与块一起消失；否则写回（保留原 EOL）
+  return {
+    text: out.join(eol),
+    declared: parsed.declared,
+    dropped: parsed.declared.filter((d) => droppedNames.has(d.name)),
+    unsupported: null,
+  };
+}

package/src/adapters/prompts.test.ts

@@ -0,0 +1,110 @@
+/**
+ * prompts adapter 测试：patch config 提取（systemPrompt persona / planMode sections）、
+ * 同行 Skip/Conflict、目标无来源行 → Warning（诚实降级）、applyItem 合并写回。
+ */
+import test from 'node:test';
+import assert from 'node:assert/strict';
+import { PromptsAdapter, extractPrompts, mergePromptIntoLine } from './prompts.ts';
+import { makeContext, makeImportContext } from './test-helpers.ts';
+import type { PromptsExportSection } from './prompts.ts';
+import type { PlanItem } from '../core/types.ts';
+
+const LINES = [
+  {
+    lineId: 'persona-line',
+    raw: { id: 'persona-line', name: '@deepseek-ai/dsh-web', config: { systemPrompt: { persona: 'You are a helpful coding assistant.' } } },
+  },
+  {
+    lineId: 'plan-line',
+    raw: { id: 'plan-line', name: 'plan-mode', config: { planMode: { sections: [{ name: 'plan', order: 1, text: 'Plan first, then code.' }] } } },
+  },
+];
+
+test('prompts: extractPrompts 提取 persona 与 planMode sections', () => {
+  const prompts = extractPrompts(LINES);
+  assert.equal(prompts.length, 2);
+  const persona = prompts.find((p) => p.kind === 'systemPrompt');
+  assert.equal(persona?.name, 'persona-line:persona');
+  assert.equal(persona?.text, 'You are a helpful coding assistant.');
+  assert.equal(persona?.sourceLineId, 'persona-line');
+  const plan = prompts.find((p) => p.kind === 'planMode');
+  assert.equal(plan?.name, 'plan');
+  assert.equal(plan?.text, 'Plan first, then code.');
+});
+
+test('prompts: mergePromptIntoLine 合并 persona / planMode 文本', () => {
+  // persona 更新（原为对象形态）
+  const merged = mergePromptIntoLine(LINES[0]!.raw, {
+    id: 'prompt:persona-line:persona', name: 'persona-line:persona', kind: 'systemPrompt',
+    text: 'New persona.', sourceLineId: 'persona-line',
+  });
+  const config = (merged as Record<string, unknown>)['config'] as Record<string, unknown>;
+  assert.equal((config['systemPrompt'] as Record<string, unknown>)['persona'], 'New persona.');
+
+  // planMode 新增 section
+  const planMerged = mergePromptIntoLine(LINES[1]!.raw, {
+    id: 'prompt:plan-line:step2', name: 'step2', kind: 'planMode',
+    text: 'Step two text.', sourceLineId: 'plan-line',
+  });
+  const planConfig = (planMerged as Record<string, unknown>)['config'] as Record<string, unknown>;
+  const sections = (planConfig['planMode'] as Record<string, unknown>)['sections'] as Record<string, unknown>[];
+  assert.equal(sections.length, 2);
+  assert.equal(sections[1]?.['text'], 'Step two text.');
+});
+
+test('prompts: 同行同内容 Skip / 不同 Conflict(update) / 目标无 → Warning', async () => {
+  const src = makeContext('win32', 'C:\\Users\\alice');
+  for (const l of LINES) src.patchFile.lines.set(l.lineId, { lineId: l.lineId, raw: l.raw });
+  const adapter = new PromptsAdapter();
+  const exported = await adapter.export(src, { includeSecrets: false });
+  assert.equal(exported.data.prompts.length, 2);
+  const sections = new Map([['prompts', exported.data]]);
+
+  const dst = makeContext('linux', '/home/bob');
+  for (const l of LINES) dst.patchFile.lines.set(l.lineId, { lineId: l.lineId, raw: l.raw });
+  let items = await adapter.analyzeImport(exported.data, makeImportContext(dst, sections));
+  assert.ok(items.every((i) => i.kind === 'Skip'), '目标一致 → 全部 Skip');
+
+  // 目标 persona 不同 → Conflict（target.ref = 来源行）
+  dst.patchFile.lines.set('persona-line', {
+    lineId: 'persona-line',
+    raw: { id: 'persona-line', name: '@deepseek-ai/dsh-web', config: { systemPrompt: { persona: 'Old persona.' } } },
+  });
+  items = await adapter.analyzeImport(exported.data, makeImportContext(dst, sections));
+  const conflict = items.find((i) => i.id === 'prompt:persona-line:persona');
+  assert.equal(conflict?.kind, 'Conflict');
+  assert.equal(conflict?.target?.ref, 'persona-line');
+  const useItem: PlanItem = { ...conflict!, kind: 'Update' };
+  const r = await adapter.applyItem(useItem, makeImportContext(dst, sections));
+  assert.equal(r.ok, true);
+  assert.equal(r.needsRestart, true);
+  const raw = dst.patchFile.lines.get('persona-line')?.raw as Record<string, unknown>;
+  const sp = (raw['config'] as Record<string, unknown>)['systemPrompt'] as Record<string, unknown>;
+  assert.equal(sp['persona'], 'You are a helpful coding assistant.', 'Conflict useImported 应合并更新 persona');
+
+  // 目标无来源行但有行名 → Create（重建行）
+  const dst2 = makeContext('darwin', '/Users/bob');
+  items = await adapter.analyzeImport(exported.data, makeImportContext(dst2, sections));
+  assert.ok(items.every((i) => i.kind === 'Create'), '目标无来源行但有行名 → Create 重建');
+  for (const item of items) {
+    const rc = await adapter.applyItem(item, makeImportContext(dst2, sections));
+    assert.equal(rc.ok, true);
+  }
+  const created = dst2.patchFile.lines.get('persona-line')?.raw as Record<string, unknown>;
+  assert.equal(((created['config'] as Record<string, unknown>)['systemPrompt'] as Record<string, unknown>)['persona'], 'You are a helpful coding assistant.');
+
+  // 无行名的 prompt（来源信息缺失）→ Warning，不编造自动创建
+  const orphan: PromptsExportSection = { version: 1, prompts: [{ id: 'p1', name: 'orphan', kind: 'systemPrompt', text: 'x' }] };
+  const itemsNoName = await adapter.analyzeImport(orphan, makeImportContext(dst2, new Map([['prompts', orphan]])));
+  assert.ok(itemsNoName.every((i) => i.kind === 'Warning'), '来源行名缺失 → Warning 提示手动配置');
+  const w = await adapter.applyItem(itemsNoName[0]!, makeImportContext(dst2, sections));
+  assert.equal(w.ok, true, 'Warning 项 applyItem 无副作用');
+});
+
+test('prompts: validate', async () => {
+  const adapter = new PromptsAdapter();
+  const ok = await adapter.validate({ version: 1, prompts: [{ id: 'a', name: 'n', kind: 'systemPrompt', text: 't' }] });
+  assert.equal(ok.valid, true);
+  const bad = await adapter.validate({ version: 1, prompts: [{ id: 'a', name: 1 as never, kind: 'systemPrompt', text: 't' }] });
+  assert.equal(bad.valid, false);
+});

package/src/adapters/prompts.ts

@@ -0,0 +1,230 @@
+/**
+ * prompts 分区 adapter（设计 §3.3/§1.2）：
+ * 数据源 = 组合 patch config 中的 systemPrompt persona / plan-mode section（研究报告 §2.2：
+ * DSH 无独立 prompt/rules 文件，persona 与 plan-mode 均经 patch config 注入）。
+ *
+ * v1 策略（诚实降级）：
+ *  - 目标存在同 lineId 行 → 同内容 Skip / 不同 Conflict（更新该行 config）；
+ *  - 目标无该行但存在同名 prompt → Conflict（更新其所在行）；
+ *  - 均不存在 → Warning（不编造行名自动创建，提示手动配置）。
+ * rules/commands 无独立存储（研究报告 §2.2），不实现。
+ */
+import { isDeepStrictEqual } from 'node:util';
+import { msgOf, zhMsg } from '../core/messages.ts';
+import type { MsgFunc } from '../core/messages.ts';
+import type { PromptEntry, PromptsSection } from '../schema/types.ts';
+import type {
+  ApplyResult, ConfigAdapter, ExportOptions, ExportSection, HostContext,
+  ImportContext, PlanItem, ValidationResult,
+} from '../core/types.ts';
+import { USER_PATCH_FILE } from './plugins.ts';
+
+/** 导出记录：PromptEntry 之外记录来源行名（导入需要重建行时使用） */
+export interface PromptExportEntry extends PromptEntry {
+  sourceLineName?: string;
+}
+
+export interface PromptsExportSection { version: 1; prompts: PromptExportEntry[]; }
+
+/** 从 patch 行 config 中提取 prompt 条目（systemPrompt.persona / planMode.sections[].text） */
+export function extractPrompts(lines: { lineId: string; raw: unknown }[]): PromptExportEntry[] {
+  const prompts: PromptExportEntry[] = [];
+  for (const line of lines) {
+    for (const entry of entriesOf(line.raw)) {
+      const config = entry.config;
+      if (config === null || typeof config !== 'object') continue;
+      const c = config as Record<string, unknown>;
+      const sourceLineName = typeof entry.name === 'string' ? entry.name : undefined;
+
+      const sp = c['systemPrompt'];
+      if (typeof sp === 'string' && sp.trim() !== '') {
+        prompts.push({ id: `prompt:${line.lineId}:persona`, name: `${line.lineId}:persona`, kind: 'systemPrompt', text: sp, sourceLineId: line.lineId, sourceLineName });
+      } else if (sp !== null && typeof sp === 'object' && typeof (sp as Record<string, unknown>)['persona'] === 'string') {
+        const persona = (sp as Record<string, unknown>)['persona'] as string;
+        if (persona.trim() !== '') {
+          prompts.push({ id: `prompt:${line.lineId}:persona`, name: `${line.lineId}:persona`, kind: 'systemPrompt', text: persona, sourceLineId: line.lineId, sourceLineName });
+        }
+      }
+
+      const pm = c['planMode'];
+      if (pm !== null && typeof pm === 'object' && Array.isArray((pm as Record<string, unknown>)['sections'])) {
+        const sections = (pm as Record<string, unknown>)['sections'] as Record<string, unknown>[];
+        for (const [i, s] of sections.entries()) {
+          if (s === null || typeof s !== 'object' || typeof s['text'] !== 'string' || (s['text'] as string).trim() === '') continue;
+          const name = typeof s['name'] === 'string' && s['name'] !== '' ? s['name'] : `${line.lineId}:section${i}`;
+          prompts.push({ id: `prompt:${line.lineId}:${name}`, name, kind: 'planMode', text: s['text'] as string, sourceLineId: line.lineId, sourceLineName });
+        }
+      }
+    }
+  }
+  return prompts;
+}
+
+/** patch 行 → 可枚举 entry（兼容单行与 insert 块；与 mcp.ts 共用形态） */
+function entriesOf(raw: unknown): { id?: unknown; name?: unknown; config?: unknown }[] {
+  if (raw === null || typeof raw !== 'object') return [];
+  const obj = raw as Record<string, unknown>;
+  if (Array.isArray(obj['insert'])) {
+    return obj['insert']
+      .filter((e): e is Record<string, unknown> => e !== null && typeof e === 'object')
+      .map((e) => e as { id?: unknown; name?: unknown; config?: unknown });
+  }
+  if (obj['id'] !== undefined || obj['name'] !== undefined) {
+    return [obj as { id?: unknown; name?: unknown; config?: unknown }];
+  }
+  return [];
+}
+
+/** 把 prompt 文本合并进目标行 config（systemPrompt.persona 或 planMode.sections） */
+export function mergePromptIntoLine(raw: unknown, prompt: PromptExportEntry): Record<string, unknown> {
+  const cloned = structuredClone(raw) as Record<string, unknown>;
+  if (cloned['config'] === null || typeof cloned['config'] !== 'object') cloned['config'] = {};
+  const config = cloned['config'] as Record<string, unknown>;
+  if (prompt.kind === 'systemPrompt') {
+    const sp = config['systemPrompt'];
+    if (typeof sp === 'string') config['systemPrompt'] = { persona: sp };
+    else if (sp === null || typeof sp !== 'object') config['systemPrompt'] = { persona: prompt.text };
+    else (config['systemPrompt'] as Record<string, unknown>)['persona'] = prompt.text;
+  } else {
+    if (config['planMode'] === null || typeof config['planMode'] !== 'object') config['planMode'] = {};
+    const pm = config['planMode'] as Record<string, unknown>;
+    if (!Array.isArray(pm['sections'])) pm['sections'] = [];
+    const sections = pm['sections'] as Record<string, unknown>[];
+    const sec = sections.find((s) => s !== null && typeof s === 'object' && s['name'] === prompt.name);
+    if (sec) sec['text'] = prompt.text;
+    else sections.push({ name: prompt.name, text: prompt.text });
+  }
+  return cloned;
+}
+
+/** 由导出条目构造「重建行」raw（Create 导入用；行名取自来源行，缺失时用占位名） */
+export function buildPromptLine(lineId: string, prompt: PromptExportEntry): Record<string, unknown> {
+  const name = prompt.sourceLineName ?? 'dsh-config-manager';
+  if (prompt.kind === 'planMode') {
+    return { id: lineId, name, config: { planMode: { sections: [{ name: prompt.name, text: prompt.text }] } } };
+  }
+  return { id: lineId, name, config: { systemPrompt: { persona: prompt.text } } };
+}
+
+export class PromptsAdapter implements ConfigAdapter<PromptsExportSection> {
+  readonly id = 'prompts' as const;
+  readonly displayName = 'Prompts';
+  readonly defaultIncluded = true;
+  readonly portability = 'portable' as const;
+
+  async export(ctx: HostContext, _options: ExportOptions): Promise<ExportSection<PromptsExportSection>> {
+    const warnings: string[] = [];
+    let lines: { lineId: string; raw: unknown }[] = [];
+    try {
+      lines = await ctx.patchFile.readPatchLines(USER_PATCH_FILE);
+    } catch (err) {
+      warnings.push(msgOf(ctx)('adapter.patchReadFailedPrompts', { reason: err instanceof Error ? err.message : String(err) }));
+    }
+    const prompts = extractPrompts(lines);
+    return {
+      sectionId: 'prompts',
+      data: { version: 1, prompts },
+      counts: { prompts: prompts.length },
+      warnings,
+    };
+  }
+
+  async analyzeImport(data: PromptsExportSection, ctx: ImportContext): Promise<PlanItem[]> {
+    const msg = ctx.msg;
+    const items: PlanItem[] = [];
+    const targetLines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+    const targetPrompts = extractPrompts(targetLines);
+    for (const p of data.prompts) {
+      const id = p.id;
+      const sameName = targetPrompts.find((t) => t.name === p.name);
+      const targetLine = targetLines.find((l) => l.lineId === p.sourceLineId);
+      if (targetLine && sameName && sameName.sourceLineId === p.sourceLineId) {
+        if (sameName.text === p.text && sameName.kind === p.kind) {
+          items.push({ id, kind: 'Skip', adapter: 'prompts', description: msg('adapter.promptSame', { name: p.name }), severity: 'info' });
+        } else {
+          items.push({
+            id, kind: 'Conflict', adapter: 'prompts',
+            description: msg('adapter.promptDiff', { name: p.name }),
+            detail: `行 ${p.sourceLineId} current=${JSON.stringify(sameName.text).slice(0, 80)} imported=${JSON.stringify(p.text).slice(0, 80)}`,
+            severity: 'warning',
+            target: { adapter: 'prompts', ref: p.sourceLineId ?? '' },
+          });
+        }
+      } else if (sameName) {
+        // 目标存在同名 prompt（不同来源行）→ 更新其所在行
+        if (sameName.text === p.text && sameName.kind === p.kind) {
+          items.push({ id, kind: 'Skip', adapter: 'prompts', description: msg('adapter.promptSame', { name: p.name }), severity: 'info' });
+        } else {
+          items.push({
+            id, kind: 'Conflict', adapter: 'prompts',
+            description: msg('adapter.promptDiffWithLine', { name: p.name, line: sameName.sourceLineId ?? '' }),
+            severity: 'warning',
+            target: { adapter: 'prompts', ref: sameName.sourceLineId ?? '' },
+          });
+        }
+      } else if (p.sourceLineName) {
+        // 目标无来源行但记录到行名 → 重建行（Create）；幂等键 = 行 id
+        const lineId = p.sourceLineId ?? `prompt-${p.name}`;
+        items.push({
+          id, kind: 'Create', adapter: 'prompts',
+          description: msg('adapter.promptCreate', { name: p.name, line: lineId }), severity: 'info',
+          target: { adapter: 'prompts', ref: lineId },
+        });
+      } else {
+        items.push({
+          id, kind: 'Warning', adapter: 'prompts',
+          description: msg('adapter.promptManual', { name: p.name }),
+          severity: 'info',
+        });
+      }
+    }
+    return items;
+  }
+
+  async applyItem(item: PlanItem, ctx: ImportContext): Promise<ApplyResult> {
+    const msg = ctx.msg;
+    if (item.kind === 'Warning') return { ok: true, message: msg('adapter.promptWarningNoWrite') };
+    const ref = item.target?.ref;
+    if (!ref) return { ok: false, message: msg('adapter.missingTargetRef') };
+    const data = ctx.sections.get('prompts') as PromptsExportSection | undefined;
+    const prompt = data?.prompts.find((p) => p.id === item.id);
+    if (!prompt) return { ok: false, message: msg('adapter.promptMissing', { id: item.id }) };
+    // Create：目标无来源行 → 用记录的行名重建 patch 行（insert）
+    if (item.kind === 'Create') {
+      const raw = buildPromptLine(ref, prompt);
+      await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
+        { lineId: ref, raw, action: 'insert' },
+      ]);
+      return { ok: true, needsRestart: true, message: msg('adapter.promptCreated', { name: prompt.name, ref }) };
+    }
+    // Update / Conflict(useImported)：合并进目标行 config
+    const lines = await ctx.target.patchFile.readPatchLines(USER_PATCH_FILE);
+    const line = lines.find((l) => l.lineId === ref);
+    if (!line) return { ok: false, message: msg('adapter.patchLineMissing', { ref }) };
+    const newRaw = mergePromptIntoLine(line.raw, prompt);
+    await ctx.target.patchFile.applyPatchChanges(USER_PATCH_FILE, [
+      { lineId: ref, raw: newRaw, action: 'update' },
+    ]);
+    return { ok: true, needsRestart: true, message: msg('adapter.promptWritten', { name: prompt.name, ref }) };
+  }
+
+  async validate(data: PromptsExportSection, msg: MsgFunc = zhMsg): Promise<ValidationResult> {
+    const issues: ValidationResult['issues'] = [];
+    if (data === null || typeof data !== 'object') {
+      return { valid: false, issues: [{ path: '$', message: msg('adapter.validate.object', { subject: 'prompts' }), severity: 'error' }] };
+    }
+    if (data.version !== 1) {
+      issues.push({ path: 'version', message: msg('adapter.validate.version', { value: String(data.version) }), severity: 'error' });
+    }
+    if (!Array.isArray(data.prompts)) {
+      issues.push({ path: 'prompts', message: msg('adapter.validate.array', { subject: 'prompts' }), severity: 'error' });
+    } else {
+      for (const p of data.prompts) {
+        if (p === null || typeof p !== 'object' || typeof p.name !== 'string' || typeof p.text !== 'string') {
+          issues.push({ path: 'prompts[]', message: msg('adapter.validate.promptIdentity'), severity: 'error' });
+        }
+      }
+    }
+    return { valid: issues.filter((i) => i.severity === 'error').length === 0, issues };
+  }
+}