aura-basetools-dsh 0.13.3 → 0.14.0

package/README.md

@@ -1,4 +1,4 @@
-# aura-basetools-dsh 0.13.3
+# aura-basetools-dsh 0.14.0
 
 DeepSeek Harness adapter for `aura-basetools`. The core package is DSH-free; this package adds the `aura_basetools_*` tools and the hook executor.
 
@@ -11,9 +11,9 @@ DeepSeek Harness adapter for `aura-basetools`. The core package is DSH-free; thi
 ### Install
 
 ```bash
-npm i aura-basetools-dsh@0.13.3
+npm i aura-basetools-dsh@0.14.0
 # or:
-dsh plugin --profile web add aura-basetools-dsh@0.13.3
+dsh plugin --profile web add aura-basetools-dsh@0.14.0
 ```
 
 Requires a DSH host that provides `@deepseek-ai/dsh-tools`, `@deepseek-ai/dsh-shell`, and `@deepseek-ai/schemastery`. These peers are declared optional so a plain npm install does not try to fetch private packages; a missing peer fails loudly when the module is imported.
@@ -48,9 +48,9 @@ This package is only the DSH adapter. Core behavior, CLI, MCP, byte-fidelity gua
 ### 安装
 
 ```bash
-npm i aura-basetools-dsh@0.13.3
+npm i aura-basetools-dsh@0.14.0
 # 或：
-dsh plugin --profile web add aura-basetools-dsh@0.13.3
+dsh plugin --profile web add aura-basetools-dsh@0.14.0
 ```
 
 需要 DSH 宿主提供 `@deepseek-ai/dsh-tools`、`@deepseek-ai/dsh-shell`、`@deepseek-ai/schemastery`。这些 peer 标为 optional，避免普通 npm 安装去解析私有包；缺 peer 时在 import 阶段明确失败。

package/aura-edit/index.js

@@ -104,18 +104,6 @@ const HUNK_PROPERTIES = {
     description:
       'Symbol to replace, e.g. `toTodoList`, `function:apply`, `Outer/Inner`, `name#2`. Skips all text matching, so it is immune to misremembered content.',
   },
-  /**
-   * 意图地址（T16）：调用方给一段**模糊**的意图串，引擎确定性地落到一个精确区间。
-   *
-   * 这是比 `target` 更弱、比 `anchor` 更自由的一层：它先当符号名解析（含 `name#n` 等写法），
-   * 再按符号名子串匹配，最后落到文本匹配。落不下来就报歧义并给候选，**不猜**。
-   * 它与其余地址字段互斥（`PATCH_INTENT_CONFLICT`）：同时给两个地址时谁说了算没有正确答案。
-   */
-  intent: {
-    type: 'string',
-    description:
-      'Fuzzy intent address: a symbol-name fragment, a phrase, or approximate text (e.g. `parseConfig`, `config loader`, `// retry the upload`). Resolved deterministically to one exact region; an ambiguous intent is refused with candidates. Use it alone (not with target/lines/line_cue/anchor/old/context/handle); `near` and `expect` are allowed.',
-  },
   // 与 aura_basetools_read 同一套宽容声明：模型把区间写成 `4, 6` 时那不是合法 JSON（宿主在参数层就拒），
   // 写成 `"4,6"` / `4` 则是合法 JSON 但形状不对——声明宽一点，能容的都容下来。
   lines: {
@@ -174,7 +162,7 @@ const HUNK_PROPERTIES = {
   replace_all: {
     type: 'boolean',
     description:
-      'With `old`: replace every non-overlapping occurrence, not just a unique one. Left-to-right; cannot be combined with target/intent/lines/line_cue/anchor/context/handle/near (those narrow to one place). If the occurrence count changed since your last read, the whole patch is refused.',
+      'With `old`: replace every non-overlapping occurrence, not just a unique one. Left-to-right; cannot be combined with target/lines/line_cue/anchor/context/handle/near (those narrow to one place). If the occurrence count changed since your last read, the whole patch is refused.',
   },
   eol: {
     type: 'string',
@@ -306,7 +294,7 @@ function hunkListOf(args) {
  * 名单在这里是为了"被忽略的一方"能被逐字点名——不是第二份寻址判据：
  * 谁真的生效由引擎决定（`write-path.mjs`），这里只报告"调用方还给了这些"。
  */
-const ADDRESS_KEYS_BESIDE_HANDLE = ['old', 'context', 'lines', 'start_line', 'end_line', 'line_cue', 'anchor', 'target', 'intent']
+const ADDRESS_KEYS_BESIDE_HANDLE = ['old', 'context', 'lines', 'start_line', 'end_line', 'line_cue', 'anchor', 'target']
 
 /** 这个键这次**真的给了**吗（判据与 `flatHunk` 一致：跳过 undefined / null / 空串 / 空数组）。 */
 function gaveKey(source, key) {
@@ -571,9 +559,6 @@ const OUTCOME_BY_CODE = new Map([
   ['PATCH_AMBIGUOUS', 'needs_choice'],
   ['LOCATOR_AMBIGUOUS', 'needs_choice'],
   ['LOCATOR_CUE_AMBIGUOUS', 'needs_choice'],
-  // 意图地址（T16）：落不下来时**拒绝并给候选**（不猜），没命中时给可执行的替代地址。
-  ['LOCATOR_INTENT_AMBIGUOUS', 'needs_choice'],
-  ['LOCATOR_INTENT_NOT_FOUND', 'not_found'],
   /**
    * 句柄路的四种**如实拒绝**（契约 §5 解析次序 / §9 的 D6）：句柄过期、身份标签不符、
    * 段内行号越界、`{handle, old}` 而引文不在该区间内。
@@ -1849,20 +1834,35 @@ function registerTools(ctx, sandbox) {
             exec.signal,
             policy,
           )
-          ctx.emit('fs/observed', target, { kind: 'present', version: created.version }, exec)
+          /**
+           * 创建前的 resolve 拿不到 realpath（文件还不存在），targetKey 只能是调用方写法；
+           * 文件落盘后必须**重新 resolve** 一次，拿盘上的真名记观测。macOS 的
+           * `/var/folders/...` 是 `/private/var/...` 的符号链接：不重算，创建记在 `/var`、
+           * 紧接着编辑拿 `/private/var` 查账，就会误报 unverified_region（stale-gate 段I）。
+           */
+          let settled = target
+          try {
+            settled = await ctx.fs.resolve(args.file_path, {
+              ...(cwd === undefined ? {} : { cwd }),
+              signal: exec.signal,
+            })
+          } catch {
+            // 重算失败不改变已落盘的事实；退回创建前的 target，至少行为与旧版一致。
+          }
+          ctx.emit('fs/observed', settled, { kind: 'present', version: created.version }, exec)
           // 建文件也是一次“写成功” ⇒ 同样回读校验（create 被偷偷改写的后果与编辑一样真）。
-          const createdVerification = await verifyWriteBack(ctx.fs, target, createContent, target.displayPath, exec.signal)
+          const createdVerification = await verifyWriteBack(ctx.fs, settled, createContent, settled.displayPath ?? target.displayPath, exec.signal)
           // 新建的内容也是“自己刚写过的内容” ⇒ 记成最新观测，随后编辑它不必带 unverified_region。
           // 记账同样取**提供方视角**：内容自带前导 U+FEFF 时，下一次 readText 会剥掉一个，
           // 存原样就会让随后的未断言编辑第 1 行被误拒（F1 就是这条）。
           const createdView = providerView(createContent)
           const createdByteOrderMark = createContent.startsWith(BYTE_ORDER_MARK)
           rememberRead(
-            target.displayPath,
+            settled.displayPath ?? target.displayPath,
             contentToken(createdView, createdByteOrderMark),
             createdView,
             createdByteOrderMark,
-            target.targetKey,
+            settled.targetKey ?? target.targetKey,
           )
           return {
             path: target.displayPath,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "aura-basetools-dsh",
-  "version": "0.13.3",
+  "version": "0.14.0",
   "description": "DeepSeek Harness adapter for aura-basetools: aura_basetools_* tools and hook executor. Depends on the DSH-free core package. / aura-basetools 的 DSH 适配器。",
   "license": "MIT",
   "type": "module",
   "dependencies": {
-    "aura-basetools": "0.13.3"
+    "aura-basetools": "0.14.0"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-tools": "*",