dsh-config-manager 0.1.4 → 0.1.6

package/src/adapters/workspaces.test.ts

@@ -77,3 +77,30 @@ test('workspaces: applyItem 写入映射后数据（PathMapper 先行）', async
   const items2 = await adapter.analyzeImport(mappedData, makeImportContext(dst, sections));
   assert.equal(items2.find((i) => i.id === 'workspace:ws-ops')?.kind, 'Skip');
 });
+
+test('workspaces: applyItem 写入失败（路径 realpath ENOENT）→ warning 非致命，不抛错', async () => {
+  const src = makeContext('win32', 'C:\\Users\\alice');
+  src.workspace.records.set('ws-ops', {
+    id: 'ws-ops', path: 'C:\\Users\\alice\\projects\\ops', title: 'OpsFlow', sessionIds: [],
+  });
+  const adapter = new WorkspacesAdapter();
+  const exported = await adapter.export(src, { includeSecrets: false });
+  const sections = new Map([['workspaces', exported.data]]);
+  const dst = makeContext('linux', '/home/bob');
+  // 模拟目标端工作区服务对不存在路径 realpath 失败（dsh-workspace 真实行为）
+  const original = dst.workspace.writeRecord.bind(dst.workspace);
+  dst.workspace.writeRecord = async () => {
+    throw new Error("ENOENT: no such file or directory, realpath '/home/bob/projects/ops'");
+  };
+  try {
+    const items = await adapter.analyzeImport(exported.data, makeImportContext(dst, sections));
+    const create = items.find((i) => i.id === 'workspace:ws-ops') as PlanItem;
+    const r = await adapter.applyItem(create, makeImportContext(dst, sections));
+    assert.equal(r.ok, false, '写入失败');
+    assert.equal(r.warning, true, '应为非致命警告（§34.17：不拖垮整体导入）');
+    assert.match(r.message ?? '', /未能写入|realpath/);
+  } finally {
+    dst.workspace.writeRecord = original;
+  }
+});
+

package/src/adapters/workspaces.ts

@@ -69,8 +69,19 @@ export class WorkspacesAdapter implements ConfigAdapter<WorkspacesSection> {
     const data = ctx.sections.get('workspaces') as WorkspacesSection | undefined;
     const rec = data?.workspaces.find((r) => r.id === ref);
     if (!rec) return { ok: false, message: `导入数据缺少工作区 ${ref}` };
-    await ctx.target.workspace.writeRecord(rec);
-    return { ok: true };
+    try {
+      await ctx.target.workspace.writeRecord(rec);
+      return { ok: true };
+    } catch (err) {
+      // 目标端无法写入（如路径 realpath 失败/目录不存在）→ 非致命警告（§34.17），
+      // 不触发整体回滚——否则一个失效路径会拖垮已成功导入的其余配置。
+      const msg = err instanceof Error ? err.message : String(err);
+      return {
+        ok: false,
+        warning: true,
+        message: `工作区 ${ref} 未能写入：${msg}（需映射路径或先在目标创建目录）`,
+      };
+    }
   }
 
   async validate(data: WorkspacesSection): Promise<ValidationResult> {

package/src/client/import/ImportWizardView.tsx

@@ -312,7 +312,10 @@ export function ImportWizardView({ api, t }: ImportWizardViewProps) {
     )
   }
 
-  if (phase === 'conflicts') {
+  // 流程阶段页只在 wizard.step === 'preview' 时渲染：execute 开始后 step 变
+  // importing/result，若 phase 仍是 confirm，必须让位给导入中/结果页（否则点「导入」
+  // 无反应——confirm 页一直挡着，要回退一步才露出结果）。
+  if (phase === 'conflicts' && step === 'preview') {
     if (conflictCollector === null || snapshot.plan === null) return null
     return (
       <div className={css.viewBody}>
@@ -328,7 +331,7 @@ export function ImportWizardView({ api, t }: ImportWizardViewProps) {
     )
   }
 
-  if (phase === 'path-mapping') {
+  if (phase === 'path-mapping' && step === 'preview') {
     const issues = snapshot.analysis?.pathIssues ?? []
     return (
       <div className={css.viewBody}>
@@ -342,7 +345,7 @@ export function ImportWizardView({ api, t }: ImportWizardViewProps) {
     )
   }
 
-  if (phase === 'secrets') {
+  if (phase === 'secrets' && step === 'preview') {
     const missing = snapshot.plan?.missingSecrets ?? []
     return (
       <div className={css.viewBody}>
@@ -356,7 +359,7 @@ export function ImportWizardView({ api, t }: ImportWizardViewProps) {
     )
   }
 
-  if (phase === 'confirm') {
+  if (phase === 'confirm' && step === 'preview') {
     return (
       <div className={css.viewBody}>
         <Card className={css.optionsCard}>

package/src/core/analyzer.ts

@@ -412,6 +412,7 @@ export class Analyzer {
       for (const item of byAdapter.get(adapterId) ?? []) {
         const outcome = await this.applyOne(adapter, item, importCtx);
         executed.push(outcome.executed);
+        // 仅硬失败计入 anyFailed（warning 属非致命：目标不可达等，不触发回滚，§34.17）
         if (outcome.executed.status === 'failed') anyFailed = true;
         if (outcome.needsRestart) needsRestart = true;
         if (outcome.warning) warnings.push(outcome.warning);
@@ -477,7 +478,13 @@ export class Analyzer {
     item: PlanItem,
     ctx: ImportContext,
   ): Promise<{ executed: ExecutedItem; needsRestart: boolean; warning?: string }> {
-    if (item.kind === 'Skip' || (item.kind === 'Conflict' && item.conflict?.resolution !== 'useImported')) {
+    if (
+      item.kind === 'Skip' ||
+      item.kind === 'Warning' ||
+      item.kind === 'MissingDependency' ||
+      (item.kind === 'Conflict' && item.conflict?.resolution !== 'useImported')
+    ) {
+      // Warning / MissingDependency 是信息项（依赖缺失、需人工注意），不调用 applyItem。
       return { executed: { itemId: item.id, status: 'skipped' }, needsRestart: false };
     }
     if (item.kind === 'Error') {
@@ -493,9 +500,11 @@ export class Analyzer {
     }
     try {
       const result: ApplyResult = await adapter.applyItem(item, ctx);
+      const status = result.ok ? 'ok' : (result.warning === true ? 'warning' : 'failed');
       return {
-        executed: { itemId: item.id, status: result.ok ? 'ok' : 'failed', message: result.message },
+        executed: { itemId: item.id, status, message: result.message },
         needsRestart: result.needsRestart === true,
+        warning: result.warning === true ? `${item.id}: ${result.message ?? item.description}` : undefined,
       };
     } catch (err) {
       this.ctx.log.error(`应用计划项失败 ${item.id}: ${err instanceof Error ? err.message : String(err)}`);

package/src/core/rollback.ts

@@ -67,8 +67,10 @@ async function compensateOne(
     }
     case 'patchLine': {
       try {
-        const file = entry.ref.split('\u0000')[0] ?? 'cordis.patch.yml';
-        const lineId = entry.ref.includes('\u0000') ? entry.ref.split('\u0000')[1]! : entry.ref;
+        // 引擎只管理 profile 的 cordis.patch.yml（backup.ts 的 patchLine 快照只记 lineId 作 ref，
+        // 不含文件编码）——回滚固定写回该文件；切勿把 lineId 当文件名（否则 patchPath 抛「仅支持管理」）。
+        const file = 'cordis.patch.yml';
+        const lineId = entry.ref;
         await ctx.patchFile.applyPatchChanges(file, [
           { lineId, raw: entry.before, action: entry.before === null ? 'remove' : 'update' },
         ]);

package/src/core/types.ts

@@ -154,7 +154,9 @@ export interface PlanItem {
   target?: SnapshotTarget;    // 该项将修改的目标（快照登记用）
 }
 
-export interface ApplyResult { ok: boolean; message?: string; needsRestart?: boolean; }
+/** applyItem 结果。warning=true 表示“未应用但属非致命”（如目标路径不可达/需人工映射），
+ * 引擎记为警告、不触发失败回滚（§34.17 单项失败不拖垮整体）。 */
+export interface ApplyResult { ok: boolean; message?: string; needsRestart?: boolean; warning?: boolean; }
 
 /* ---------------- 三段式输入输出 ---------------- */
 
@@ -187,7 +189,8 @@ export interface ImportPlan {
 
 export interface ExecutedItem {
   itemId: string;
-  status: 'ok' | 'skipped' | 'failed';
+  /** warning = 未应用但非致命（目标不可达等），不计入失败、不触发回滚 */
+  status: 'ok' | 'skipped' | 'warning' | 'failed';
   message?: string;
 }
 

package/src/profiles/profile-manager.test.ts

@@ -134,6 +134,7 @@ test('analyzeSwitch Preview + executeSwitch（confirm 安全阀 + Create 应用
     await srcMgr.saveCurrent('work');
 
     const dst = makeContext('linux', '/home/bob');
+    for (const n of NS) dst.settings.registered.add(n); // 目标已装同插件（注册但为空 → Create 初始化）
     const dstMgr = new ProfileManager({ dataDir, ctx: dst, adapters, snapshotStore: new MemSnapshotStore() });
 
     // 未确认 → 拒绝且零写入
@@ -250,6 +251,7 @@ test('exportProfile / importProfile 往返（完整验证）', async () => {
 
     // 导入后的 profile 可切换到空目标
     const dst = makeContext('linux', '/home/bob');
+    for (const n of NS) dst.settings.registered.add(n); // 目标已装同插件
     const dstMgr = new ProfileManager({ dataDir, ctx: dst, adapters, snapshotStore: new MemSnapshotStore() });
     const r = await dstMgr.executeSwitch('work-copy', { confirm: true });
     assert.equal(r.ok, true);

package/src/profiles/profile-manager.ts

@@ -510,9 +510,11 @@ export class ProfileManager {
     }
     try {
       const result: ApplyResult = await adapter.applyItem(item, ctx);
+      const status = result.ok ? 'ok' : (result.warning === true ? 'warning' : 'failed');
       return {
-        executed: { itemId: item.id, status: result.ok ? 'ok' : 'failed', message: result.message },
+        executed: { itemId: item.id, status, message: result.message },
         needsRestart: result.needsRestart === true,
+        warning: result.warning === true ? `${item.id}: ${result.message ?? item.description}` : undefined,
       };
     } catch (err) {
       this.ctx.log.error(`切换 Profile 应用计划项失败 ${item.id}: ${err instanceof Error ? err.message : String(err)}`);

package/src/ui/report.ts

@@ -64,11 +64,12 @@ export function importSectionStats(executed: readonly ExecutedItem[]): ImportSec
     const section = sectionFromItemId(e.itemId);
     let stat = bySection.get(section);
     if (!stat) {
-      stat = { section: section as SectionId, ok: 0, skipped: 0, failed: 0, items: [] };
+      stat = { section: section as SectionId, ok: 0, skipped: 0, warned: 0, failed: 0, items: [] };
       bySection.set(section, stat);
     }
     if (e.status === 'ok') stat.ok += 1;
     else if (e.status === 'skipped') stat.skipped += 1;
+    else if (e.status === 'warning') stat.warned += 1;
     else stat.failed += 1;
     stat.items.push(e);
   }
@@ -83,12 +84,13 @@ export function renderImportReport(result: ImportResult): string {
     const parts: string[] = [];
     if (s.ok > 0) parts.push(`✓ ${s.ok} imported/restored`);
     if (s.skipped > 0) parts.push(`- ${s.skipped} skipped`);
+    if (s.warned > 0) parts.push(`⚠ ${s.warned} need attention`);
     if (s.failed > 0) parts.push(`✗ ${s.failed} failed`);
     lines.push(`${s.section}: ${parts.join(' ') || 'no changes'}`);
-    // 失败项给出可操作原因（§23）
+    // 失败/警告项给出可操作原因（§23）
     for (const it of s.items) {
-      if (it.status === 'failed') {
-        lines.push(`  Reason: ${it.message ?? '未知原因'}`);
+      if (it.status === 'failed' || it.status === 'warning') {
+        lines.push(`  ${it.status === 'failed' ? 'Reason' : 'Note'}: ${it.message ?? '未知原因'}`);
       }
     }
   }

package/src/ui/types.ts

@@ -156,8 +156,9 @@ export interface ImportSectionStat {
   section: SectionId;
   ok: number;
   skipped: number;
+  warned: number;
   failed: number;
-  items: { itemId: string; status: 'ok' | 'skipped' | 'failed'; message?: string }[];
+  items: { itemId: string; status: 'ok' | 'skipped' | 'warning' | 'failed'; message?: string }[];
 }
 
 export type ImportResultAction = 'fixIssues' | 'viewDetails' | 'done';