@feng0531/dsh-code-review 0.60.0 → 0.61.0

package/CHANGELOG.md

@@ -2,9 +2,17 @@
 
 本文件介绍对使用者有意义的变化。安装与参数见 [README](README.md)，本次发布正文见 [发布说明](RELEASE-NOTES.md)。历史提交和安装包保留在 [GitHub Releases](https://github.com/f-e-n-g-0531/dsh-code-review/releases)；本文不把开发日志当作功能介绍。
 
+## 0.61.0 — SVN 目录复制后代覆盖
+
+显式展开默认 status 隐藏的复制目录后代，冻结继承 copyfrom 来源；copied 的 normal/modified 后代按空目标旧侧新增审查，不把来源 BASE 误作目标旧侧。目录及后代分别覆盖，未全选、凭据或阻断子项使父目录覆盖不足。离线且共享原数量/字节预算，不新增来源正文读取或联网；复制替换仍阻断。
+
+## 0.60.1 — SVN 阻断状态的准确诊断
+
+对替换/复制替换、缺失、阻塞、不完整、文本/属性/树冲突、switched 与 external 分别给出稳定 blockCode 和解释，预览及结构化报告保留原因码。普通替换实测 local BASE 无 pristine，复制替换可能返回来源 BASE，因此继续明确阻断，不合成旧侧、不冒充新增。诊断改进不表示真实双侧替换审查已支持。463 项串行回归、宿主、隔离安装和四矩阵 CI 通过；原产物/npm/Release 119,462 字节逐字节一致，双哈希、清单与冻结发布说明通过。
+
 ## 0.60.0 — SVN 普通目录新增与删除后代覆盖
 
-离线展开默认 status 隐藏的删除目录后代，纳入原文件数与共享元数据预算并在采集末尾复核。普通新增和删除目录只在后代显式选择且可审查时开放目录节点，后代仍逐项覆盖；凭据或阻断子项不会被目录成功掩盖。不扩展到目录复制、替换或历史模式。
+离线展开默认 status 隐藏的删除目录后代，纳入原文件数与共享元数据预算并在采集末尾复核。普通新增和删除目录只在后代显式选择且可审查时开放目录节点，后代仍逐项覆盖；凭据或阻断子项不会被目录成功掩盖。不扩展到目录复制、替换或历史模式。461 项串行回归、宿主、隔离安装与四矩阵 CI 通过；原产物/npm/Release 118,284 字节逐字节一致，双哈希、清单与冻结发布说明通过。
 
 ## 0.59.0 — SVN 复制新增文件与移动两侧覆盖
 

package/CORE-ALIGNMENT-TASKS.md

@@ -32,7 +32,9 @@
 
 ## 当前验证结论
 
-- 最近完整回归：459 项通过。
+- 最近完整回归：463 项通过。
+- v0.60.1 已交付 SVN 阻断状态稳定诊断及预览/报告原因码；普通与复制替换仍明确拒绝，不冒充真实双侧支持。463 项串行回归、宿主、隔离安装和四矩阵 CI 通过；原产物/npm/Release 119,462 字节逐字节一致，双哈希、清单与冻结发布说明通过。全面 SVN 目标继续。
+- v0.60.0 已交付 SVN 普通目录新增/删除的后代逐项覆盖，离线补齐默认 status 隐藏的删除后代；显式选择、凭据排除与原预算仍生效。461 项串行回归、宿主、隔离安装和四矩阵 CI 通过；原产物/npm/Release 118,284 字节逐字节一致，双哈希、清单与冻结发布说明通过。目录复制、替换及历史等仍在后续矩阵中。
 - v0.59.0 已交付 SVN 同仓库复制新增文件和文件移动的新增/删除独立覆盖。459 项串行回归、实际宿主、隔离安装和四组 CI 通过；原产物/npm/Release 117,098 字节逐字节一致，SHA-256、SHA-512、清单与冻结发布说明通过。复制替换、目录后代和历史审查等仍未闭环。
 - v0.58.1 已交付 SVN 根目录 mergeinfo 属性预览修复及全面支持矩阵。456 项串行回归、实际宿主、隔离安装与四组 CI 通过；npm、Release 与原包 116,254 字节逐字节一致，SHA-256、SHA-512、清单与冻结发布说明核验通过。SVN 全面扩展目标仍在进行，历史与特殊状态尚未全部支持。
 - v0.58.0 已正式交付实验性本地评测入口及可靠性整理。454 项串行回归、实际宿主、隔离安装与四组 CI 通过；npm、Release 与原包 113,697 字节逐字节一致，SHA-256、SHA-512、清单与冻结发布说明核验通过。正常 DSH 审查行为与预算不变；尚无真实模型基准评分。

package/README.md

@@ -89,7 +89,7 @@ commit 与 baseRevision/targetRevision 不能同时使用。oldContextPaths 只
 - 不执行项目代码、构建脚本或模型生成的 shell 命令。模型只能在批准的快照中查找、搜索和读取。
 - 常见凭据路径会被排除，但普通源码也可能含秘密。路径过滤不能代替人工检查。
 - 二进制、不能解码的文件、链接和超限内容会被阻断，不会自动截断后假装完成。
-- SVN 同仓库复制新增文件以空目标旧侧审查，copyfrom URL/revision/UUID 在预览中披露，仅作来源信息，不自动读取来源正文，也不认定为已验证重命名。文件移动的新增/删除两侧分别覆盖。普通目录新增/删除会逐项列出后代；选择目录不会自动批准后代，未全选或子项阻断会标明覆盖不足。复制目录、替换、切换目录、外部工作副本、冲突及部分属性状态仍未支持；含 svn:keywords 的文件仍阻断。全面扩展进度见 [SVN 支持矩阵](SVN-SUPPORT-MATRIX.md)。
+- SVN 同仓库复制新增文件以空目标旧侧审查，copyfrom URL/revision/UUID 在预览中披露，仅作来源信息，不自动读取来源正文，也不认定为已验证重命名。文件移动的新增/删除两侧分别覆盖。普通目录新增/删除会逐项列出后代；选择目录不会自动批准后代，未全选或子项阻断会标明覆盖不足。同仓库目录复制会显式展开后代，将继承 copied 的正常/修改节点作为空目标旧侧的新增审查，来源身份逐项披露。替换、切换目录、外部工作副本、冲突及部分属性状态仍未支持；含 svn:keywords 的文件仍阻断。全面扩展进度见 [SVN 支持矩阵](SVN-SUPPORT-MATRIX.md)。
 
 ## 默认规模限制
 

package/RELEASE-NOTES.md

@@ -1,16 +1,16 @@
-# v0.60.0 发布说明
+# v0.61.0 发布说明
 
-## SVN 普通目录新增与删除后代覆盖
+## SVN 目录复制后代覆盖
 
-SVN 默认 status 可能只显示删除目录父节点，隐藏其后代。本版本在离线、原文件数上限和共享元数据预算内展开这些后代，并在采集末尾复核清单。
+支持同仓库目录复制的显式后代采集。默认 SVN status 可能只列复制根，本版在原数量与共享元数据预算内递归列出目标后代，并在采集末尾复核。
 
-- 普通新增和删除目录的属性、子目录、子文件分别列入快照覆盖。
-- 指定父目录不会自动批准后代；未全选后代时明确覆盖不足。
-- 凭据子文件继续排除，阻断或排除后代不会被父目录的成功状态掩盖。
-- 独立测试验证仓库离线、删除子文件 BASE 正文、稳定快照、预览零发送和文件数超限。
+- copied 的 normal/modified 后代属于目标新增：旧侧为空，不能用来源 BASE 替代目标旧侧。
+- 继承 copyfrom URL/revision/UUID 按目标相对路径明确记录，预览披露并核验节点身份。
+- 目录与后代分别覆盖；未全选、凭据或阻断子项不被目录成功状态掩盖。
+- 离线测试覆盖复制后修改、稳定快照、预览零发送、显式选择与超限。无新增联网或来源正文读取。
 
 ## 当前限制
 
-本版不支持目录复制或替换，未跟踪目录也不能自动读取其子文件。关键字、固定 revision 历史审查等继续按 [SVN 支持矩阵](SVN-SUPPORT-MATRIX.md) 推进；全面 SVN 目标尚未完成。
+复制替换、关键字映射、固定 revision 历史等仍在 [SVN 支持矩阵](SVN-SUPPORT-MATRIX.md) 中，全面目标尚未完成。本版不推定语义重命名或来源正文已被审查。
 
 日常使用见 [README](README.md)。

package/SVN-SUPPORT-MATRIX.md

@@ -17,10 +17,10 @@
 | 常规文件修改、普通新增、删除 | 已有 BASE/工作字节与属性捕获测试 | 维持并扩充组合验收 |
 | 子目录属性变更 | 已有独立属性审查测试 | 第一批 |
 | 根目录属性/mergeinfo | v0.58.1 已发布；独立复现后修复，指定三文件和默认预览均通过、0 模型发送、状态不变；456 项串行回归、宿主、隔离安装和四矩阵 CI 通过，原产物/npm/Release 116,254 字节逐字节一致及双哈希/清单/发布说明通过 | 第一批先发布此修复 |
-| 复制/移动、copyfrom 及目录结构变更 | v0.59.0 已发布同仓库复制新增文件及文件移动的新增/删除独立覆盖：新增目标旧侧为空，copyfrom 只作来源信息，预览披露并冻结身份；离线与凭据来源拒绝测试通过。459 项串行回归、宿主、隔离安装、四矩阵 CI 通过；原产物/npm/Release 117,098 字节逐字节一致，双哈希/清单/冻结发布说明通过。复制目录及后代覆盖仍未实现 | 第二批：明确旧侧来源和后代覆盖 |
-| 普通新增/删除目录及后代 | 本地开发补齐默认 status 隐藏的删除后代，离线递归枚举与末尾清单复核；普通结构目录只在后代全选且可审查时开放，凭据/阻断子项导致目录覆盖不足。尚待本批发布核验 | 第二批普通目录子批 |
-| 替换、删除再新增、文件/目录类型变化 | 当前 replaced 被拒绝 | 第二批：区分 BASE 旧节点与目标节点 |
-| 缺失、文本/属性/树冲突、阻塞 | 当前多数仅统一 blocked | 第三批：明确状态诊断；不能合成不存在的工作侧或声称审核通过 |
+| 复制/移动、copyfrom 及目录结构变更 | v0.59.0 已发布同仓库复制新增文件及文件移动的新增/删除独立覆盖：新增目标旧侧为空，copyfrom 只作来源信息，预览披露并冻结身份；离线与凭据来源拒绝测试通过。459 项串行回归、宿主、隔离安装、四矩阵 CI 通过；原产物/npm/Release 117,098 字节逐字节一致，双哈希/清单/冻结发布说明通过。本地新增同仓库目录复制后代展开与继承来源身份；目标旧侧为空，预览披露；离线、改后代、凭据排除、显式选择和超限已测试，待 v0.61.0 发布核验。复制替换仍未支持 | 第二批：明确旧侧来源和后代覆盖 |
+| 普通新增/删除目录及后代 | v0.60.0 已发布：补齐默认 status 隐藏的删除后代，离线递归枚举与末尾清单复核；普通结构目录只在后代全选且可审查时开放，凭据/阻断子项导致目录覆盖不足。461 项串行回归、宿主、隔离安装与四矩阵 CI 通过；原产物/npm/Release 118,284 字节逐字节一致，双哈希/清单/冻结发布说明通过 | 第二批普通目录子批 |
+| 替换、删除再新增、文件/目录类型变化 | 普通与复制替换分别用 SVN_REPLACEMENT/SVN_COPIED_REPLACEMENT 诊断；离线探测确认前者 BASE 无 pristine，后者可能返回复制来源，禁止伪造旧侧。真实双侧替换仍未支持 | 第二批：区分 BASE 旧节点与目标节点 |
+| 缺失、文本/属性/树冲突、阻塞 | v0.60.1 已发布稳定状态诊断：SVN_MISSING_NODE/OBSTRUCTED_NODE/INCOMPLETE_NODE/TEXT_CONFLICT/PROPERTY_CONFLICT/TREE_CONFLICT 等，预览与报告透传 blockCode。463 项串行回归、宿主、隔离安装、四矩阵 CI 与原包/npm/Release 119,462 字节、双哈希/清单/发布说明通过。诊断不算真实双侧支持，仍需后续实现 | 第三批：明确状态诊断；不能合成不存在的工作侧或声称审核通过 |
 | svn:keywords、svn:eol-style | keywords 当前阻断；换行保留原文但无规范化映射 | 第三批：双侧可验证映射，保留原字节和定位 |
 | svn:special/链接 | 当前阻断，不跟随链接取正文 | 第三批：如支持只审链接目标数据；不沿链接读取文件 |
 | switched、externals、稀疏/混合 revision | 多数拒绝；调用方/依赖链要求祖先 normal | 第四批：明确仓库边界与独立来源，禁止隐式跨仓读取 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@feng0531/dsh-code-review",
-  "version": "0.60.0",
+  "version": "0.61.0",
   "private": false,
   "license": "SEE LICENSE IN LICENSE",
   "publishConfig": { "access": "public", "registry": "https://registry.npmjs.org/" },

package/src/review.mjs

@@ -111,7 +111,7 @@ export async function reviewSnapshot(snapshot, model, options = {}) {
   const interactionPlans = scope && report.grouping ? report.grouping.groups.filter(g => g.fileIds.length > 1).map(group => ({ group, prepared: prepareInteractionInput(input, group, payload => initialInputBudget({ instructions: REVIEW_INSTRUCTIONS, input: payload }, scope, maxInputBytes)) })) : [];
   for (const plan of interactionPlans.filter(p => p.prepared.status !== 'not-applicable')) report.interactions.push({ groupId: plan.group.id, fileIds: plan.prepared.fileIds, status: plan.prepared.status === 'ready' ? 'pending' : 'blocked', reason: plan.prepared.reason, lifecycle: 'shares-last-primary-timeout' });
   for (const file of input.files) {
-    const state = { fileId: file.id, path: file.path, status: file.eligibility === 'reviewable' ? 'pending' : file.eligibility, reason: file.reason };
+    const state = { fileId: file.id, path: file.path, status: file.eligibility === 'reviewable' ? 'pending' : file.eligibility, reason: file.reason, ...(file.blockCode ? {blockCode:file.blockCode} : {}) };
     report.files.push(state);
     if (state.status !== 'pending') continue;
     if (signal?.aborted) { state.status = 'cancelled'; state.reason = '用户取消'; continue; }

package/src/service.mjs

@@ -49,7 +49,7 @@ export function createReviewService(llm, { capture = captureSnapshot, now = Date
         while (previews.size >= maxPreviews) previews.delete(previews.keys().next().value);
         const previewId = randomUUID();
         previews.set(previewId, { ...current, target, options, rounds, snapshotId: snapshot.id, expires: now() + ttlMs });
-        return { ...(options.businessRequirement!==undefined?{businessRequirement:{text:options.businessRequirement,hash:hash(options.businessRequirement),bytes:Buffer.byteLength(options.businessRequirement)}}:{}), previewId, plan, snapshotId: snapshot.id, repositoryRoot: snapshot.root, vcs: snapshot.vcs, ...(snapshot.history ? { history: snapshot.history } : {}), model: current.route, modelSendingEnabled: allowModelSending, files: snapshot.files.map(f => ({ path: f.path, eligibility: f.eligibility, reason: f.reason, ...(f.copySource ? {copySource:f.copySource,copyNotice:f.copyNotice} : {}) })), contextPaths: snapshot.context.map(c => c.path), ...(options.oldContextPaths !== undefined ? {oldContextPaths:options.oldContextPaths,oldContextSources:snapshot.context.filter(c=>c.oldOnly).map(c=>({path:c.path,side:'context-old',revision:c.oldRevision,blobOid:c.oldBlobOid,hash:c.oldHash}))} : {}), ...(snapshot.callerDiscovery ? {callerDiscovery:snapshot.callerDiscovery} : {}), ...(snapshot.autoContext ? { autoContext: snapshot.autoContext } : {}), rules: (snapshot.rules ?? []).map(({ path, hash }) => ({ path, hash })), notice: (options.oldContextPaths !== undefined ? 'oldContextPaths仅为baseline旧侧正文，无目标侧替代；选中变更复用原old身份，旧侧不能证明新侧行为。' : '') + (snapshot.callerDiscovery ? 'callerScopePaths已授权预览读取限定目录内tracked候选正文，包括不匹配文件；非匹配正文不发送模型，匹配捕获上下文会发送。仅字面引用导航，不是函数调用或完整调用覆盖。' : '') + (enableRiskPlanning ? '执行按plan阈值决定风险假设规划，小变更可跳过独立规划但仍主审并复核；计划不是证据，所有阶段共享原预算。' : '') + '执行会向上述模型提供方发送可审查文件两侧内容、预览列出的显式/自动上下文、所选项目规则全文及预览业务需求文本。模型可在该快照范围内多轮只读检索，不读取范围外文件；候选生成后会进行证据与反证复核，两阶段各最多3轮检索，共享每文件120秒和总模型调用100次预算；复核不能证明缺陷成立。plan.reviewRounds为独立审查工作量，非模型reasoning effort；后续轮不带首轮风险计划，所有轮共享原超时与预算。plan仅预检初始输入，ready不代表已审查；minimumCalls不含后续检索/复核/动态业务综合；多文件可先进行业务分组，分组失败保留原组并记录限制，动态综合数执行前未知，实际预算可能不足。请先向用户展示范围，获得确认后执行。' };
+        return { ...(options.businessRequirement!==undefined?{businessRequirement:{text:options.businessRequirement,hash:hash(options.businessRequirement),bytes:Buffer.byteLength(options.businessRequirement)}}:{}), previewId, plan, snapshotId: snapshot.id, repositoryRoot: snapshot.root, vcs: snapshot.vcs, ...(snapshot.history ? { history: snapshot.history } : {}), model: current.route, modelSendingEnabled: allowModelSending, files: snapshot.files.map(f => ({ path: f.path, eligibility: f.eligibility, reason: f.reason, ...(f.blockCode ? {blockCode:f.blockCode} : {}), ...(f.copySource ? {copySource:f.copySource,copyNotice:f.copyNotice} : {}) })), contextPaths: snapshot.context.map(c => c.path), ...(options.oldContextPaths !== undefined ? {oldContextPaths:options.oldContextPaths,oldContextSources:snapshot.context.filter(c=>c.oldOnly).map(c=>({path:c.path,side:'context-old',revision:c.oldRevision,blobOid:c.oldBlobOid,hash:c.oldHash}))} : {}), ...(snapshot.callerDiscovery ? {callerDiscovery:snapshot.callerDiscovery} : {}), ...(snapshot.autoContext ? { autoContext: snapshot.autoContext } : {}), rules: (snapshot.rules ?? []).map(({ path, hash }) => ({ path, hash })), notice: (options.oldContextPaths !== undefined ? 'oldContextPaths仅为baseline旧侧正文，无目标侧替代；选中变更复用原old身份，旧侧不能证明新侧行为。' : '') + (snapshot.callerDiscovery ? 'callerScopePaths已授权预览读取限定目录内tracked候选正文，包括不匹配文件；非匹配正文不发送模型，匹配捕获上下文会发送。仅字面引用导航，不是函数调用或完整调用覆盖。' : '') + (enableRiskPlanning ? '执行按plan阈值决定风险假设规划，小变更可跳过独立规划但仍主审并复核；计划不是证据，所有阶段共享原预算。' : '') + '执行会向上述模型提供方发送可审查文件两侧内容、预览列出的显式/自动上下文、所选项目规则全文及预览业务需求文本。模型可在该快照范围内多轮只读检索，不读取范围外文件；候选生成后会进行证据与反证复核，两阶段各最多3轮检索，共享每文件120秒和总模型调用100次预算；复核不能证明缺陷成立。plan.reviewRounds为独立审查工作量，非模型reasoning effort；后续轮不带首轮风险计划，所有轮共享原超时与预算。plan仅预检初始输入，ready不代表已审查；minimumCalls不含后续检索/复核/动态业务综合；多文件可先进行业务分组，分组失败保留原组并记录限制，动态综合数执行前未知，实际预算可能不足。请先向用户展示范围，获得确认后执行。' };
       } finally { busy = false; }
     },
     async execute(args, exec) {

package/src/svn-state.mjs

@@ -0,0 +1,17 @@
+// Stable offline diagnoses, not permission to resolve or mutate working nodes.
+export function svnStateIssue(state) {
+  if (!state || typeof state['@_item'] !== 'string') return {code:'SVN_INVALID_STATE',reason:'SVN status entry is incomplete'};
+  const item=state['@_item'];
+  if (state['@_tree-conflicted']==='true') return {code:'SVN_TREE_CONFLICT',reason:'Tree conflict requires explicit user resolution; no coherent target inferred'};
+  if (item==='conflicted') return {code:'SVN_TEXT_CONFLICT',reason:'Text conflict is unresolved; conflict markers are not a resolved target'};
+  if (state['@_props']==='conflicted') return {code:'SVN_PROPERTY_CONFLICT',reason:'Property conflict is unresolved; property values are not a resolved target'};
+  if (item==='missing') return {code:'SVN_MISSING_NODE',reason:'Tracked node is missing without scheduled deletion; no deletion inferred'};
+  if (item==='obstructed') return {code:'SVN_OBSTRUCTED_NODE',reason:'Working node obstructs the tracked node; no replacement inferred'};
+  if (item==='incomplete') return {code:'SVN_INCOMPLETE_NODE',reason:'Working-copy node is incomplete; source coverage is unavailable'};
+  if (item==='replaced') return {code:state['@_copied']==='true'?'SVN_COPIED_REPLACEMENT':'SVN_REPLACEMENT',reason:'Replacement requires verified target old node; local BASE may be unavailable or describe the copy source'};
+  if (state['@_switched']==='true') return {code:'SVN_SWITCHED_NODE',reason:'Switched node requires separately frozen repository URL identity'};
+  if (state['@_file-external']==='true' || item==='external') return {code:'SVN_EXTERNAL_NODE',reason:'External node requires a separate explicitly selected repository scope'};
+  if (state['@_copied']==='true' && item!=='added') return {code:'SVN_COPIED_NODE',reason:'Copied non-addition requires verified target baseline'};
+  if (!['modified','added','deleted','normal','unversioned'].includes(item)) return {code:'SVN_UNSUPPORTED_STATE',reason:'Unsupported SVN node state: '+item};
+  return null;
+}

package/src/svn.mjs

@@ -1,4 +1,5 @@
 import { isSecretPath } from './secret-path.mjs';
+import { svnStateIssue } from './svn-state.mjs';
 import { realpath, lstat } from 'node:fs/promises';
 import path from 'node:path';
 import { isDeepStrictEqual } from 'node:util';
@@ -22,11 +23,11 @@ async function properties(root, name, baseline, options) {
   }
   return Object.fromEntries(Object.entries(result).sort(([a], [b]) => a.localeCompare(b)));
 }
-// Default status hides deleted directory descendants. Expand only explicit deleted
-// versioned roots, sharing one metadata cap and the original change-count limit.
-async function deletedEntries(root, entries, options, limit) {
+// Default status hides deleted and copied directory descendants. Expand only
+// explicit structural roots under the shared metadata and change-count caps.
+async function structuralEntries(root, entries, options, limit) {
   const byPath = new Map(entries.map(entry => [entry['@_path'].replaceAll('\\', '/'), entry]));
-  const roots = entries.filter(entry => entry['wc-status']?.['@_item'] === 'deleted').map(entry => entry['@_path'].replaceAll('\\', '/')).sort();
+  const roots = entries.filter(entry => entry['wc-status']?.['@_item'] === 'deleted' || (entry['wc-status']?.['@_item'] === 'added' && entry['wc-status']?.['@_copied'] === 'true')).map(entry => entry['@_path'].replaceAll('\\', '/')).sort();
   const visited = [];
   let bytes = 0;
   for (const name of roots) {
@@ -40,8 +41,11 @@ async function deletedEntries(root, entries, options, limit) {
       const child = entry['@_path'].replaceAll('\\', '/');
       relativePath(child);
       if (child !== name && !child.startsWith(name + '/')) throw new Error('SVN deleted descendant escaped scope');
-      if (entry['wc-status']?.['@_item'] !== 'deleted') throw new Error('Unexpected SVN deleted descendant state');
-      if (!byPath.has(child)) byPath.set(child, entry);
+      const parentState = byPath.get(name)['wc-status'];
+      if (parentState['@_item'] === 'deleted' && entry['wc-status']?.['@_item'] !== 'deleted') throw new Error('Unexpected SVN deleted descendant state');
+      const item = structuredClone(entry);
+      if (parentState['@_item'] === 'added' && child !== name && item['wc-status']?.['@_copied'] === 'true') item.copyRoot = name;
+      if (!byPath.has(child) || item.copyRoot) byPath.set(child, item);
       if (byPath.size > limit) throw new Error('Change count limit exceeded');
     }
   }
@@ -56,7 +60,7 @@ export async function captureSvn(cwd, options = {}) {
   const before = await svn(root, statusArgs, options);
   const originalEntries = xml(before).status.target.flatMap(t => t.entry ?? []);
   if (originalEntries.length > maxFiles) throw new Error('Change count limit exceeded');
-  const entries = await deletedEntries(root, originalEntries, options, maxFiles);
+  const entries = await structuralEntries(root, originalEntries, options, maxFiles);
   const known = new Set(entries.map(e => e['@_path'].replaceAll('\\', '/')));
   if (selectedPaths?.some(p => !known.has(p))) throw new Error('Selected path is not a current change');
   const files = [];
@@ -72,25 +76,33 @@ export async function captureSvn(cwd, options = {}) {
     }
     try {
       if (name !== '.') relativePath(name);
-      if (!['modified', 'added', 'deleted', 'normal', 'unversioned'].includes(status) || state['@_props'] === 'conflicted' || state['@_tree-conflicted'] === 'true') throw new Error('Unsupported or conflicted SVN state: ' + status);
-      if (state['@_switched'] === 'true' || state['@_file-external'] === 'true') throw new Error('Switched or external node requires explicit historical support');
-      if (state['@_copied'] === 'true' && status !== 'added') throw new Error('Copied replacement requires verified target baseline');
-      const hasBase = !['added', 'unversioned'].includes(status);
+      const copiedDescendant = !!entry.copyRoot && ['normal', 'modified', 'added'].includes(status) && state['@_copied'] === 'true';
+      const issue = svnStateIssue(copiedDescendant ? {...state, '@_item':'added'} : state);
+      if (issue) { item.blockCode = issue.code; throw new Error(issue.reason); }
+      const hasBase = !copiedDescendant && !['added', 'unversioned'].includes(status);
       let kind;
       if (status === 'unversioned') kind = (await lstat(path.join(root, name))).isDirectory() ? 'dir' : 'file';
       else {
         const node = xml(await svn(root, ['info', '--xml', '--', target(name)], options)).info.entry[0];
         kind = node['@_kind'];
         if (state['@_copied'] === 'true' || node['wc-info']?.['copy-from-url']) {
-          const source = node['wc-info']?.['copy-from-url'], revision = node['wc-info']?.['copy-from-rev'];
-          if (status !== 'added' || kind !== 'file' || typeof source !== 'string' || !source || !/^[0-9]+$/.test(String(revision)) || node.repository?.uuid !== info.repository.uuid || node.repository?.root !== info.repository.root) throw new Error('Copied node requires a same-repository added file with fixed copy source');
+          let source = node['wc-info']?.['copy-from-url'], revision = node['wc-info']?.['copy-from-rev'];
+          if (!source && copiedDescendant) {
+            const parent = files.find(file => file.path === entry.copyRoot);
+            if (!parent?.copySource || parent.eligibility !== 'reviewable') throw new Error('Copied ancestor identity unavailable');
+            source = parent.copySource.url.replace(/\/$/,'') + '/' + name.slice(entry.copyRoot.length+1).split('/').map(encodeURIComponent).join('/');
+            revision = parent.copySource.revision;
+            item.copyAncestor = entry.copyRoot;
+          }
+          if ((!copiedDescendant && status !== 'added') || !['file','dir'].includes(kind) || typeof source !== 'string' || !source || !/^[0-9]+$/.test(String(revision)) || node.repository?.uuid !== info.repository.uuid || node.repository?.root !== info.repository.root) throw new Error('Copied node requires a same-repository added target with fixed copy source');
           if (isSecretPath(decodeURIComponent(new URL(source).pathname))) throw new Error('Credential copy source excluded');
           item.copySource = { url: source, revision: String(revision), repositoryUuid: node.repository.uuid };
           item.copyNotice = 'Target addition is reviewed against an empty target baseline; copy source is provenance only, not an approved source body or verified rename.';
-          item.copyNodeIdentity = hash(JSON.stringify([node.url, node['@_kind'], node['@_revision'], node['wc-info']?.schedule, node['wc-info']?.['wcroot-abspath'], source, String(revision), node.repository]));
+          item.copyNodeIdentity = hash(JSON.stringify([node.url, node['@_kind'], node['@_revision'], node['wc-info']?.schedule, node['wc-info']?.['wcroot-abspath'], node['wc-info']?.['copy-from-url'] ?? null, node['wc-info']?.['copy-from-rev'] ?? null, node.repository]));
         }
       }
       item.kind = kind;
+      if (copiedDescendant) item.targetAddition = true;
       item.rightExists = status !== 'deleted';
       const leftProps = hasBase ? await properties(root, name, true, options) : {};
       const rightProps = status === 'deleted' || status === 'unversioned' ? {} : await properties(root, name, false, options);
@@ -103,7 +115,7 @@ export async function captureSvn(cwd, options = {}) {
       item.propertyIdentity = hash(JSON.stringify([leftProps, rightProps]));
       if (kind === 'dir') {
         if (status === 'unversioned') throw new Error('Unversioned directory requires explicit descendant tracking');
-        if (status === 'deleted' || status === 'added') {
+        if (status === 'deleted' || status === 'added' || copiedDescendant) {
           const descendants = entries.filter(entry => entry['@_path'].replaceAll('\\', '/').startsWith(name + '/')).map(entry => entry['@_path'].replaceAll('\\', '/'));
           if (selectedPaths && descendants.some(child => !selectedPaths.includes(child))) throw new Error('Directory descendants are not all explicitly selected');
           item.structuralDescendants = descendants;
@@ -121,7 +133,7 @@ export async function captureSvn(cwd, options = {}) {
   }
   const after = await svn(root, statusArgs, options);
   if (!isDeepStrictEqual(xml(after), xml(before))) throw new Error('Working copy changed during capture');
-  if (!isDeepStrictEqual(await deletedEntries(root, xml(after).status.target.flatMap(t => t.entry ?? []), options, maxFiles), entries)) throw new Error('Deleted descendants changed during capture');
+  if (!isDeepStrictEqual(await structuralEntries(root, xml(after).status.target.flatMap(t => t.entry ?? []), options, maxFiles), entries)) throw new Error('Deleted descendants changed during capture');
   // A directory must not look complete when any descendant was blocked/excluded.
   for (const item of files.filter(f => f.structuralDescendants).sort((a,b) => b.path.length - a.path.length)) {
     if (item.structuralDescendants.some(name => files.find(f => f.path === name)?.eligibility !== 'reviewable')) {
@@ -132,11 +144,11 @@ export async function captureSvn(cwd, options = {}) {
   for (const item of files.filter(f => f.eligibility === 'reviewable')) {
     if (item.copySource) {
       const node = xml(await svn(root, ['info', '--xml', '--', target(item.path)], options)).info.entry[0];
-      const identity = hash(JSON.stringify([node.url, node['@_kind'], node['@_revision'], node['wc-info']?.schedule, node['wc-info']?.['wcroot-abspath'], node['wc-info']?.['copy-from-url'], String(node['wc-info']?.['copy-from-rev']), node.repository]));
+      const identity = hash(JSON.stringify([node.url, node['@_kind'], node['@_revision'], node['wc-info']?.schedule, node['wc-info']?.['wcroot-abspath'], node['wc-info']?.['copy-from-url'] ?? null, node['wc-info']?.['copy-from-rev'] ?? null, node.repository]));
       if (identity !== item.copyNodeIdentity) throw new Error('Copy source identity changed during capture');
     }
     if (item.kind === 'file' && item.rawStatus !== 'deleted' && (await readLocal(root, item.path, options)).hash !== item.right.hash) throw new Error('Content changed during capture');
-    const left = !['added', 'unversioned'].includes(item.rawStatus) ? await properties(root, item.path, true, options) : {};
+    const left = !item.targetAddition && !['added', 'unversioned'].includes(item.rawStatus) ? await properties(root, item.path, true, options) : {};
     const right = ['deleted', 'unversioned'].includes(item.rawStatus) ? {} : await properties(root, item.path, false, options);
     if (hash(JSON.stringify([left, right])) !== item.propertyIdentity) throw new Error('Properties changed during capture');
   }