flower-trellis 0.6.13-beta.16 → 0.6.13-beta.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,5 +1,5 @@
1
1
  {
2
- "syncedAt": "2026-11-16T10:37:00.548Z",
2
+ "syncedAt": "2026-11-17T08:58:44.124Z",
3
3
  "syncedFrom": "vendor/skill-garden",
4
4
  "sourceCommit": "d12d725d69473f990ffc6854ad0d08958ea32c46",
5
5
  "common": {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "flower-trellis",
3
- "version": "0.6.13-beta.16",
3
+ "version": "0.6.13-beta.17",
4
4
  "description": "一键安装/升级 Trellis 并自动融合 skill-garden 强化包(默认 Claude + agents)",
5
5
  "type": "module",
6
6
  "bin": {
@@ -73,9 +73,9 @@
73
73
  "commit-and-tag-version": "^12.7.3"
74
74
  },
75
75
  "flowerReleaseNotes": {
76
- "version": "0.6.13-beta.16",
76
+ "version": "0.6.13-beta.17",
77
77
  "source": "CHANGELOG.md",
78
- "body": "### 🐛 修复 Bug Fixes\n\n* **update:** 升级快照排除运行时资料并前置范围判定 ([2cdc2de](https://github.com/SilentFlower/flower-trellis/commit/2cdc2de7233ed17aff3b84af9f5e85a720fccfec))",
78
+ "body": "### 🐛 修复 Bug Fixes\n\n* **confirmation:** 减少重复观察的锁竞争与写盘 ([e7acd12](https://github.com/SilentFlower/flower-trellis/commit/e7acd129500baf297476ee9276a0b394d59c94a2))",
79
79
  "truncated": false
80
80
  },
81
81
  "optionalDependencies": {
@@ -98,8 +98,11 @@ def _observe(store, request_id, snapshot, *, observed=None):
98
98
  def is_new(identifier, request, state):
99
99
  return identifier and identifier not in (state.get("lastHumanMessageId"), request["baselineMessageId"])
100
100
 
101
- # 等待轮询只用已读状态跳过无变化的观察;新消息必须按锁内最新状态重新判断。
102
- if observed is not None and not any(is_new(identifier, observed["request"], observed) for identifier in identifiers):
101
+ # 各入口均先只读跳过重复观察;候选新消息仍按锁内最新请求重新判断。
102
+ if observed is None:
103
+ observed = store.read()
104
+ if (observed is not None and (observed.get("request") or {}).get("id") == request_id
105
+ and not any(is_new(identifier, observed["request"], observed) for identifier in identifiers)):
103
106
  return observed
104
107
 
105
108
  def apply(request, state):
@@ -207,7 +207,7 @@ def _retry_windows_permission(operation):
207
207
  time.sleep(0.01)
208
208
 
209
209
 
210
- def _write_json(file, value, limit=MAX_BYTES):
210
+ def _write_json(file, value, limit=MAX_BYTES, *, durable=True):
211
211
  raw = json.dumps(value, ensure_ascii=False, separators=(",", ":"), allow_nan=False).encode("utf-8")
212
212
  if len(raw) > limit:
213
213
  raise ValueError("确认状态超出大小限制")
@@ -218,7 +218,8 @@ def _write_json(file, value, limit=MAX_BYTES):
218
218
  with os.fdopen(fd, "wb") as stream:
219
219
  stream.write(raw)
220
220
  stream.flush()
221
- os.fsync(stream.fileno())
221
+ if durable:
222
+ os.fsync(stream.fileno())
222
223
  _retry_windows_permission(lambda: os.replace(str(temporary), str(file)))
223
224
  finally:
224
225
  try:
@@ -326,7 +327,8 @@ class ConfirmationStore:
326
327
  time.sleep(0.01)
327
328
  continue
328
329
  try:
329
- _write_json(lock / "owner.json", {"pid": os.getpid(), "token": token})
330
+ # 锁归属只需跨进程可见;省去临时元数据落盘,缩短持锁时间。
331
+ _write_json(lock / "owner.json", {"pid": os.getpid(), "token": token}, durable=False)
330
332
  except BaseException:
331
333
  lock.rmdir()
332
334
  raise