@mrpan12345/verx 2.0.0-rc.2 → 2.0.0-rc.3

package/README.md

@@ -4,6 +4,10 @@
 
 TTY 工作时间线保留工具、审批、验证结果及过程说明，最终回复不会擦除执行证据；推理临时面板仍在正文出现时收起。运行状态显示步骤、工具成功/失败数和当前上下文估算（不是累计计费用量），最终用量以会话汇总为准。工具参数流式碎片不触发状态栏重绘。`exec` 即使连接 TTY 也不询问首次遥测偏好。
 
+P1-08 工作过程呈现：状态动画每 120ms 原地换帧，显示当前模型请求/工具执行耗时；审批、预算和计划对话框、正文输出时让出终端，结束或取消订阅后释放定时器。窗口宽度变化时重新量宽，非 TTY/`TERM=dumb` 不启动动画。动画只表示活动中，不虚构完成百分比。
+
+TTY 收到 `file.changed` 后通过 core 的只读文件历史接口展示**本次**前后快照，而非重复累计差异：绿色 `+` 表示新增，红色 `-` 表示删除，未改动内容作为上下文。禁用颜色时仍保留符号。单次预览最多显示 18 行内容和一行折叠提示；大文件或复杂对比提示使用 `verx diff`，不会无限刷屏。快照先脱敏再分行，预览失败仅显示安全提示、不改变已完成写操作的结果。NDJSON 保持既定事件，不附加差异正文。
+
 Verx is a local-first, model-agnostic terminal coding agent.
 
 ```bash
@@ -11,15 +15,16 @@ npm install --global @mrpan12345/verx@next --registry=https://registry.npmjs.org
 verx --version
 ```
 
-The `next` channel distributes `2.0.0-rc.2`, a release candidate, not a GA release. Gate 4 remains NO-GO. The current
+The `next` channel distributes `2.0.0-rc.3`, a release candidate, not a GA release. Gate 4 remains NO-GO. The current
 known limitation is that MiniMax-M3 can still select a non-approved verification command in
 non-interactive mode; the permission engine rejects that command without executing it. This
 candidate has release-install validation only on macOS arm64. Cross-platform execution, the
 14-day Beta, and independent signoffs remain unverified under the Owner-approved RC waiver.
 
-The npm channel requires Node.js 22.23 or newer. The package bundles the audited `tree-sitter@0.25.0`
-source with the upstream Node 22+ C++ standard fix, so Node 24 does not fall back to the published
-C++17 build. npm-managed installations are upgraded with
+The npm channel requires Node.js 22.23 or newer. The package bundles `tree-sitter@0.25.1` and its
+prebuilt native runtimes for macOS, Debian 12-compatible glibc Linux, and Windows x64/ARM64. These supported
+targets do not need a local compiler for tree-sitter; Windows prebuilds avoid Visual Studio C++
+Build Tools. Linux musl/Alpine is not covered by these prebuilds. npm-managed installations are upgraded with
 `npm install --global @mrpan12345/verx@next --registry=https://registry.npmjs.org`; `verx upgrade` is reserved for the signed
 standalone binary.
 
@@ -35,6 +40,7 @@ atomically renamed into place.
 Repository build commands:
 
 ```bash
+pnpm build:linux-prebuilds # Docker required; rebuild after native dependency upgrades
 pnpm package:npm
 pnpm package:sea
 ```
@@ -65,7 +71,7 @@ TTY 启动时展示紧凑横幅：状态点 + 版本，随后是模型、服务
 上下文。NDJSON 仍按协议原样输出 `model.streamed` 事件，供程序化消费者
 处理。TTY 会把标题、强调、行内代码、列表和代码围栏渲染为紧凑终端样式，不直接暴露 Markdown
 标记，并压缩连续空行。同一轮的前导文字、工具、审批、计划与验证时间线在执行期间实时可见；
-下一段正文开始时会统一收起该临时区域，只保留正文和终态摘要。没有正文的失败或取消保留过程，便于诊断。
+下一段正文开始时仅收起推理临时面板，工具、审批、文件差异与验证时间线继续保留，便于审查和诊断。
 
 时间线按层级组织：一次工具调用只占一行 `● tool(args)`，其结果、审批结论与文件变更作为从属行
 挂在其下（`⎿` gutter），交互式下不再重复打印工具名。文件变更的增删数、验证失败与错误码按语义

package/node_modules/tree-sitter/binding.gyp

@@ -61,13 +61,21 @@
         "vendor/tree-sitter/lib/src",
         "vendor/tree-sitter/lib/include",
       ],
-      "cflags": [
-        "-std=c11"
-      ],
       "defines": [
         "_POSIX_C_SOURCE=200112L",
         "_DEFAULT_SOURCE",
-      ]
+      ],
+      "conditions": [
+        ["OS!='win'", {
+          "cflags_c": [
+            "-std=c11",
+          ],
+        }, { # OS == "win"
+          "cflags_c": [
+            "/std:c11",
+          ],
+        }],
+      ],
     }
   ],
   "variables": {

package/node_modules/tree-sitter/index.js

@@ -18,10 +18,10 @@ Object.defineProperty(Tree.prototype, 'rootNode', {
       Due to a race condition arising from Jest's worker pool, "this"
       has no knowledge of the native extension if the extension has not
       yet loaded when multiple Jest tests are being run simultaneously.
-      If the extension has correctly loaded, "this" should be an instance 
+      If the extension has correctly loaded, "this" should be an instance
       of the class whose prototype we are acting on (in this case, Tree).
-      Furthermore, the race condition sometimes results in the function in 
-      question being undefined even when the context is correct, so we also 
+      Furthermore, the race condition sometimes results in the function in
+      question being undefined even when the context is correct, so we also
       perform a null function check.
     */
     if (this instanceof Tree && rootNode) {
@@ -61,7 +61,10 @@ Tree.prototype.walk = function() {
 
 class SyntaxNode {
   constructor(tree) {
-    this.tree = tree;
+    Object.defineProperty(this, 'tree', {
+      value: tree,
+      enumerable: true
+    });
   }
 
   [util.inspect.custom]() {
@@ -239,6 +242,15 @@ class SyntaxNode {
     return NodeMethods.toString(this.tree);
   }
 
+  toJSON() {
+    return {
+      type: this.type,
+      startPosition: this.startPosition,
+      endPosition: this.endPosition,
+      childCount: this.childCount,
+    }
+  }
+
   child(index) {
     marshalNode(this);
     return unmarshalNode(NodeMethods.child(this.tree, index), this.tree);
@@ -361,7 +373,7 @@ Parser.prototype.getLanguage = function(_language) {
   return this[languageSymbol] || null;
 };
 
-Parser.prototype.parse = function(input, oldTree, {bufferSize, includedRanges}={}) {
+Parser.prototype.parse = function(input, oldTree, {bufferSize, includedRanges, progressCallback}={}) {
   let getText, treeInput = input
   if (typeof input === 'string') {
     const inputString = input;
@@ -377,6 +389,7 @@ Parser.prototype.parse = function(input, oldTree, {bufferSize, includedRanges}={
       oldTree,
       bufferSize,
       includedRanges,
+      progressCallback,
     )
     : undefined;
 
@@ -684,13 +697,13 @@ Query.prototype.captures = function(
     matchLimit = 0xFFFFFFFF,
     maxStartDepth = 0xFFFFFFFF,
     timeoutMicros = 0,
+    progressCallback = undefined,
   } = {}
 ) {
   marshalNode(node);
   const [returnedMatches, returnedNodes] = _captures.call(this, node.tree,
-    startPosition.row, startPosition.column,
-    endPosition.row, endPosition.column,
-    startIndex, endIndex, matchLimit, maxStartDepth, timeoutMicros
+    startPosition.row, startPosition.column, endPosition.row, endPosition.column,
+    startIndex, endIndex, matchLimit, maxStartDepth, timeoutMicros, progressCallback
   );
   const nodes = unmarshalNodes(returnedNodes, node.tree);
   const results = [];
@@ -855,7 +868,8 @@ function initializeLanguageNodeClasses(language) {
   const nodeTypeInfo = language.nodeTypeInfo || [];
 
   const nodeSubclasses = [];
-  for (let id = 0, n = nodeTypeNamesById.length; id < n; id++) {
+
+  for (let id = 0, n = nodeTypeNamesById.length; id < n; ++id) {
     nodeSubclasses[id] = SyntaxNode;
 
     const typeName = nodeTypeNamesById[id];
@@ -865,7 +879,8 @@ function initializeLanguageNodeClasses(language) {
     if (!typeInfo) continue;
 
     const fieldNames = [];
-    let classBody = '\n';
+    const fieldGetters = {};
+
     if (typeInfo.fields) {
       for (const fieldName in typeInfo.fields) {
         const fieldId = nodeFieldNamesById.indexOf(fieldName);
@@ -873,35 +888,54 @@ function initializeLanguageNodeClasses(language) {
         if (typeInfo.fields[fieldName].multiple) {
           const getterName = camelCase(fieldName) + 'Nodes';
           fieldNames.push(getterName);
-          classBody += `
-            get ${getterName}() {
+          fieldGetters[getterName] = {
+            get: function () {
               marshalNode(this);
-              return unmarshalNodes(NodeMethods.childNodesForFieldId(this.tree, ${fieldId}), this.tree);
-            }
-          `.replace(/\s+/g, ' ') + '\n';
+              return unmarshalNodes(
+                NodeMethods.childNodesForFieldId(this.tree, fieldId),
+                this.tree
+              );
+            },
+            enumerable: true
+          };
         } else {
           const getterName = camelCase(fieldName, false) + 'Node';
           fieldNames.push(getterName);
-          classBody += `
-            get ${getterName}() {
+          fieldGetters[getterName] = {
+            get: function () {
               marshalNode(this);
-              return unmarshalNode(NodeMethods.childNodeForFieldId(this.tree, ${fieldId}), this.tree);
-            }
-          `.replace(/\s+/g, ' ') + '\n';
+              return unmarshalNode(
+                NodeMethods.childNodeForFieldId(this.tree, fieldId),
+                this.tree
+              );
+            },
+            enumerable: true
+          };
         }
       }
     }
 
-    const className = camelCase(typeName, true) + 'Node';
-    const nodeSubclass = eval(`class ${className} extends SyntaxNode {${classBody}}; ${className}`);
-    nodeSubclass.prototype.type = typeName;
-    nodeSubclass.prototype.fields = Object.freeze(fieldNames.sort())
-    nodeSubclasses[id] = nodeSubclass;
+    nodeSubclasses[id] = new Function('SyntaxNode', `
+      return class ${camelCase(typeName, true)}Node extends SyntaxNode {}
+    `)(SyntaxNode);
+
+    Object.defineProperties(nodeSubclasses[id].prototype, {
+      type: {
+        value: typeName,
+        enumerable: true
+      },
+      fields: {
+        value: Object.freeze(fieldNames.sort()),
+        enumerable: true
+      },
+      ...fieldGetters
+    });
   }
 
-  language.nodeSubclasses = nodeSubclasses
+  language.nodeSubclasses = nodeSubclasses;
 }
 
+
 function camelCase(name, upperCase) {
   name = name.replace(/_(\w)/g, (_match, letter) => letter.toUpperCase());
   if (upperCase) name = name[0].toUpperCase() + name.slice(1);

package/node_modules/tree-sitter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "description": "Node.js bindings to the Tree-sitter parsing library",
   "repository": "http://github.com/tree-sitter/node-tree-sitter",
   "publishConfig": {
@@ -43,28 +43,28 @@
     "vendor/tree-sitter/lib/src/*"
   ],
   "dependencies": {
-    "node-addon-api": "^8.3.0",
+    "node-addon-api": "^8.5.0",
     "node-gyp-build": "^4.8.4"
   },
   "devDependencies": {
-    "@types/node": "^22.10.2",
+    "@types/node": "^25.0.3",
     "@types/tmp": "^0.2.6",
-    "glob": "^11.0.0",
-    "node-gyp": "^11.0.0",
+    "glob": "^13.0.0",
+    "node-gyp": "^12.1.0",
     "prebuildify": "^6.0.1",
-    "tmp": "^0.2.3",
-    "tree-sitter-c": "^0.23.4",
-    "tree-sitter-embedded-template": "^0.23.2",
+    "tmp": "^0.2.5",
+    "tree-sitter-c": "^0.24.1",
+    "tree-sitter-embedded-template": "^0.25.0",
     "tree-sitter-html": "^0.23.2",
     "tree-sitter-java": "^0.23.5",
-    "tree-sitter-javascript": "^0.23.1",
+    "tree-sitter-javascript": "^0.25.0",
     "tree-sitter-json": "^0.24.8",
-    "tree-sitter-python": "^0.23.6",
+    "tree-sitter-python": "^0.25.0",
     "tree-sitter-ruby": "^0.23.1",
-    "tree-sitter-rust": "^0.23.2",
-    "typedoc": "^0.27.6",
-    "typedoc-plugin-rename-defaults": "^0.7.2",
-    "typescript": "^5.7.2"
+    "tree-sitter-rust": "^0.24.0",
+    "typedoc": "^0.28.15",
+    "typedoc-plugin-rename-defaults": "^0.7.3",
+    "typescript": "^5.9.3"
   },
   "scripts": {
     "docs": "typedoc --out docs/api tree-sitter.d.ts --readme README.md",

package/node_modules/tree-sitter/src/language.cc

@@ -30,7 +30,7 @@ const TSLanguage *UnwrapLanguage(Napi::Value value) {
   if (arg.IsExternal() && arg.CheckTypeTag(&LANGUAGE_TYPE_TAG)) {
     const TSLanguage *language = arg.Data();
     if (language != nullptr) {
-      uint16_t version = ts_language_version(language);
+      uint16_t version = ts_language_abi_version(language);
       if (
         version < TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION ||
         version > TREE_SITTER_LANGUAGE_VERSION
@@ -39,9 +39,8 @@ const TSLanguage *UnwrapLanguage(Napi::Value value) {
           "Incompatible language version. Compatible range: " +
           std::to_string(TREE_SITTER_MIN_COMPATIBLE_LANGUAGE_VERSION) + " - " +
           std::to_string(TREE_SITTER_LANGUAGE_VERSION) + ". Got: " +
-          std::to_string(ts_language_version(language));
-        RangeError::New(env, message.c_str());
-        return nullptr;
+          std::to_string(ts_language_abi_version(language));
+        throw RangeError::New(env, message.c_str());
       }
       return language;
     }

package/node_modules/tree-sitter/src/node.cc

@@ -793,7 +793,7 @@ Napi::Value ChildWithDescendant(const Napi::CallbackInfo &info) {
   const Tree *child_tree = Tree::UnwrapTree(info[1]);
   TSNode child_node = UnmarshalNode(env, child_tree, 1);
   if (self.id != nullptr && child_node.id != nullptr) {
-	return MarshalNode(info, tree, ts_node_child_with_descendant(self, child_node));
+    return MarshalNode(info, tree, ts_node_child_with_descendant(self, child_node));
   }
   return MarshalNullNode(env);
 }

package/node_modules/tree-sitter/src/parser.cc

@@ -109,6 +109,29 @@ class CallbackInput final {
   ObjectReference partial_string;
 };
 
+class CallbackProgress final {
+ public:
+  static TSParseOptions Make(const Napi::Function &func) {
+    TSParseOptions options;
+    auto *callback = new CallbackProgress();
+    callback->func = Napi::Persistent(func);
+    options.payload = static_cast<void *>(callback);
+    options.progress_callback = Cancel;
+    return options;
+  }
+
+  private:
+  Napi::FunctionReference func;
+
+  static bool Cancel(TSParseState *state) {
+    auto *callback = static_cast<CallbackProgress *>(state->payload);
+    Env env = callback->func.Env();
+    Number index = Number::New(env, state->current_byte_offset);
+    Boolean has_error = Boolean::New(env, state->has_error);
+    return callback->func({ index, has_error }).As<Boolean>();
+  }
+};
+
 void Parser::Init(Napi::Env env, Napi::Object exports) {
   auto *data = env.GetInstanceData<AddonData>();
 
@@ -203,19 +226,22 @@ Napi::Value Parser::Parse(const CallbackInfo &info) {
     old_tree = tree->tree_;
   }
 
-  Napi::Value buffer_size = env.Null();
-  if (info.Length() > 2) {
-    buffer_size = info[2];
-  }
+  CallbackInput callback_input(callback, info.Length() > 2 ? info[2] : env.Null());
 
-  if (!handle_included_ranges(env, parser_, info[3])) {
-    return env.Undefined();
+  if (info.Length() > 3) {
+    if (!handle_included_ranges(env, parser_, info[3])) {
+      return env.Undefined();
+    }
   }
 
-  CallbackInput callback_input(callback, buffer_size);
-  TSTree *tree = ts_parser_parse(parser_, old_tree, callback_input.Input());
-  Napi::Value result = Tree::NewInstance(env, tree);
-  return result;
+  TSTree *tree;
+  if (info.Length() > 4 && info[4].IsFunction()) {
+    TSParseOptions options = CallbackProgress::Make(info[4].As<Function>());
+    tree = ts_parser_parse_with_options(parser_, old_tree, callback_input.Input(), options);
+  } else {
+    tree = ts_parser_parse(parser_, old_tree, callback_input.Input());
+  }
+  return Tree::NewInstance(env, tree);
 }
 
 Napi::Value Parser::IncludedRanges(const Napi::CallbackInfo &info) {

package/node_modules/tree-sitter/src/query.cc

@@ -31,6 +31,29 @@ const char *query_error_names[] = {
   "TSQueryErrorStructure",
 };
 
+class CallbackProgress final {
+ public:
+  static TSQueryCursorOptions Make(const Napi::Function &func) {
+    TSQueryCursorOptions options;
+    auto *callback = new CallbackProgress();
+    callback->func = Napi::Persistent(func);
+    options.payload = static_cast<void *>(callback);
+    options.progress_callback = Cancel;
+    return options;
+  }
+
+  private:
+  Napi::FunctionReference func;
+
+  static bool Cancel(TSQueryCursorState *state) {
+    auto *callback = static_cast<CallbackProgress *>(state->payload);
+    Env env = callback->func.Env();
+    Number index = Number::New(env, state->current_byte_offset);
+    return callback->func({ index }).As<Boolean>();
+  }
+};
+
+
 void Query::Init(Napi::Env env, Napi::Object exports) {
   auto *data = env.GetInstanceData<AddonData>();
   data->ts_query_cursor = ts_query_cursor_new();
@@ -219,7 +242,12 @@ Napi::Value Query::Matches(const Napi::CallbackInfo &info) {
   ts_query_cursor_set_match_limit(data->ts_query_cursor, match_limit);
   ts_query_cursor_set_max_start_depth(data->ts_query_cursor, max_start_depth);
   ts_query_cursor_set_timeout_micros(data->ts_query_cursor, timeout_micros);
-  ts_query_cursor_exec(data->ts_query_cursor, ts_query, root_node);
+  if (info.Length() > 10 && info[10].IsFunction()) {
+    TSQueryCursorOptions options = CallbackProgress::Make(info[10].As<Function>());
+    ts_query_cursor_exec_with_options(data->ts_query_cursor, ts_query, root_node, &options);
+  } else {
+    ts_query_cursor_exec(data->ts_query_cursor, ts_query, root_node);
+  }
 
   Array js_matches = Array::New(env);
   unsigned index = 0;