dsh-better-edit 0.6.3 → 0.8.0

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.
Files changed (57) hide show
  1. package/CHANGELOG.md +59 -15
  2. package/README.md +78 -71
  3. package/README.zh.md +83 -83
  4. package/lib/canonical-path.js +4 -1
  5. package/lib/constants.js +5 -1
  6. package/lib/contract.js +127 -33
  7. package/lib/edit-diff.js +1 -5
  8. package/lib/edit-response.js +5 -10
  9. package/lib/encoding.js +23 -6
  10. package/lib/file-encoding-state.js +54 -15
  11. package/lib/file-view.js +42 -53
  12. package/lib/fs-bridge.js +27 -16
  13. package/lib/fs-write.js +1 -1
  14. package/lib/guidance/materialize.js +1 -6
  15. package/lib/guidance/resolve.js +1 -1
  16. package/lib/hash-store.js +133 -43
  17. package/lib/hashline/anchor-pipeline.js +124 -93
  18. package/lib/hashline/hash-assign.js +65 -23
  19. package/lib/hashline/hash.js +6 -6
  20. package/lib/index.js +6 -0
  21. package/lib/mutation/engine.js +89 -31
  22. package/lib/mutation.js +14 -13
  23. package/lib/prompts.js +12 -11
  24. package/lib/read-and-serve.js +105 -19
  25. package/lib/render-text-warning.js +21 -0
  26. package/lib/sandbox.js +2 -5
  27. package/lib/self-heal.js +30 -27
  28. package/lib/session-view.js +161 -24
  29. package/lib/store-config.js +7 -2
  30. package/lib/store-lifecycle.js +7 -2
  31. package/lib/tool-edit.js +10 -6
  32. package/lib/tool-read.js +6 -9
  33. package/lib/tool-str-replace-editor.js +274 -0
  34. package/lib/tool-undo.js +8 -9
  35. package/lib/types/constants.d.ts +2 -0
  36. package/lib/types/contract.d.ts +106 -18
  37. package/lib/types/edit-response.d.ts +4 -0
  38. package/lib/types/encoding.d.ts +1 -1
  39. package/lib/types/file-encoding-state.d.ts +4 -1
  40. package/lib/types/file-view.d.ts +16 -1
  41. package/lib/types/hash-store.d.ts +12 -1
  42. package/lib/types/hashline/anchor-pipeline.d.ts +16 -6
  43. package/lib/types/hashline/hash-assign.d.ts +10 -2
  44. package/lib/types/hashline/index.d.ts +1 -1
  45. package/lib/types/mutation/engine.d.ts +2 -1
  46. package/lib/types/render-text-warning.d.ts +22 -0
  47. package/lib/types/self-heal.d.ts +2 -0
  48. package/lib/types/session-view.d.ts +13 -4
  49. package/lib/types/tool-str-replace-editor.d.ts +27 -0
  50. package/lib/types/undo-edit.d.ts +1 -1
  51. package/lib/types/utils.d.ts +7 -0
  52. package/lib/types/write-hook.d.ts +2 -2
  53. package/lib/undo-edit.js +6 -8
  54. package/lib/utils.js +23 -3
  55. package/lib/workspace-context.js +1 -1
  56. package/lib/write-hook.js +20 -23
  57. package/package.json +63 -57
@@ -9,12 +9,7 @@ import { errCode } from "../utils.js";
9
9
  import { isBlankOverride } from "./parse.js";
10
10
  import { GUIDANCE_SECTIONS } from "./resolve.js";
11
11
  /** The presets shipped by the harness, each seeded with editable guidance. */
12
- export const DEFAULT_PRESETS = [
13
- "standard",
14
- "code",
15
- "minimal",
16
- "cordis",
17
- ];
12
+ export const DEFAULT_PRESETS = ["standard", "code", "minimal", "cordis"];
18
13
  /**
19
14
  * The root README: the per-preset customization convention users see in the
20
15
  * plugin home.
@@ -7,7 +7,7 @@
7
7
  */
8
8
  import { readFile } from "node:fs/promises";
9
9
  import { join } from "node:path";
10
- import { EDIT_GUIDANCE, READ_GUIDANCE, UNDO_GUIDANCE, } from "../prompts.js";
10
+ import { EDIT_GUIDANCE, READ_GUIDANCE, UNDO_GUIDANCE } from "../prompts.js";
11
11
  import { errCode } from "../utils.js";
12
12
  import { isBlankOverride, parseSectionFile } from "./parse.js";
13
13
  /**
package/lib/hash-store.js CHANGED
@@ -21,8 +21,8 @@ import { hashStorePath } from "./store-tenancy.js";
21
21
  import { onStoreOpen, setStoresGetter } from "./store-lifecycle.js";
22
22
  import { workspaceCwd } from "./workspace-context.js";
23
23
  import { errCode, splitLines } from "./utils.js";
24
- import { initHasher, contentChecksum, HASH_RE, CANON_VERSION, } from "./hashline/hash-assign.js";
25
- import { HASH_STORE_VERSION, HASH_STORE_BUSY_TIMEOUT, SERVED_TTL_MS, } from "./constants.js";
24
+ import { initHasher, contentChecksum, HASH_RE, CANON_VERSION } from "./hashline/hash-assign.js";
25
+ import { HASH_STORE_VERSION, HASH_STORE_BUSY_TIMEOUT, SERVED_TTL_MS } from "./constants.js";
26
26
  export function isValidHashList(value) {
27
27
  if (!Array.isArray(value))
28
28
  return false;
@@ -66,6 +66,60 @@ export function isValidServedList(value) {
66
66
  function cacheKey(checksum) {
67
67
  return `${CANON_VERSION}:${checksum}`;
68
68
  }
69
+ export function isValidRetiredEntry(value) {
70
+ if (typeof value !== "object" || value === null)
71
+ return false;
72
+ const v = value;
73
+ return (typeof v.hash === "string" &&
74
+ (v.deathPos === null || typeof v.deathPos === "number") &&
75
+ HASH_RE.test(v.hash));
76
+ }
77
+ export function isValidRetiredEntries(value) {
78
+ if (!Array.isArray(value))
79
+ return false;
80
+ for (const e of value)
81
+ if (!isValidRetiredEntry(e))
82
+ return false;
83
+ return true;
84
+ }
85
+ function coerceRetiredEntry(e) {
86
+ if (typeof e === "string" && HASH_RE.test(e))
87
+ return { hash: e, deathPos: null };
88
+ if (typeof e !== "object" || e === null || !("hash" in e))
89
+ return null;
90
+ const ee = e;
91
+ if (typeof ee.hash !== "string" || !HASH_RE.test(ee.hash))
92
+ return null;
93
+ const rawPos = ee.deathPos;
94
+ const deathPos = typeof rawPos === "number" && rawPos !== -1 ? rawPos : null;
95
+ return { hash: ee.hash, deathPos };
96
+ }
97
+ function parseRetiredJson(raw) {
98
+ if (raw === null || raw === undefined || raw === "")
99
+ return [];
100
+ try {
101
+ const parsed = JSON.parse(raw);
102
+ if (!Array.isArray(parsed) || parsed.length === 0)
103
+ return [];
104
+ if (isValidRetiredEntries(parsed)) {
105
+ return parsed.map((e) => e.deathPos === -1 ? { hash: e.hash, deathPos: null } : e);
106
+ }
107
+ const out = [];
108
+ for (const e of parsed) {
109
+ const coerced = coerceRetiredEntry(e);
110
+ if (coerced)
111
+ out.push(coerced);
112
+ }
113
+ if (out.length > 0)
114
+ return out;
115
+ if (isValidHashList(parsed))
116
+ return parsed.map((h) => ({ hash: h, deathPos: null }));
117
+ return [];
118
+ }
119
+ catch {
120
+ return [];
121
+ }
122
+ }
69
123
  /** Load the store as served persistence — internal, for SessionView only. */
70
124
  // SAFETY: loadHashStore returns InternalHashStore (HashStore & ServedPersistence) — cast narrows to served view, validated via ServedPersistence interface; safe because InternalHashStore extends both.
71
125
  export function loadServedStore(cwd) {
@@ -148,10 +202,7 @@ function buildStore(db) {
148
202
  "hashes TEXT NOT NULL, " +
149
203
  "updated_at INTEGER NOT NULL" +
150
204
  ")");
151
- db.exec("CREATE TABLE IF NOT EXISTS meta (" +
152
- "key TEXT PRIMARY KEY, " +
153
- "value TEXT NOT NULL" +
154
- ")");
205
+ db.exec("CREATE TABLE IF NOT EXISTS meta (" + "key TEXT PRIMARY KEY, " + "value TEXT NOT NULL" + ")");
155
206
  db.exec("CREATE TABLE IF NOT EXISTS undo (" +
156
207
  "path TEXT PRIMARY KEY, " +
157
208
  "content TEXT NOT NULL, " +
@@ -161,17 +212,14 @@ function buildStore(db) {
161
212
  "result_content TEXT NOT NULL, " +
162
213
  "updated_at INTEGER NOT NULL" +
163
214
  ")");
164
- const versionRow = db
165
- .prepare("SELECT value FROM meta WHERE key = 'version'")
166
- .get();
215
+ const versionRow = db.prepare("SELECT value FROM meta WHERE key = 'version'").get();
167
216
  const versionChanged = versionRow !== undefined && versionRow.value !== String(HASH_STORE_VERSION);
168
217
  if (versionChanged) {
169
218
  db.exec("DELETE FROM snapshots");
170
219
  db.exec("DELETE FROM undo");
171
220
  }
172
221
  const servedColumns = db.prepare("PRAGMA table_info(served)").all();
173
- if (versionChanged ||
174
- !servedColumns.some((column) => column.name === "session_id")) {
222
+ if (versionChanged || !servedColumns.some((column) => column.name === "session_id")) {
175
223
  db.exec("DROP TABLE IF EXISTS served");
176
224
  }
177
225
  db.exec("CREATE TABLE IF NOT EXISTS served (" +
@@ -182,6 +230,7 @@ function buildStore(db) {
182
230
  "retired TEXT, " +
183
231
  "canons TEXT, " +
184
232
  "snapshotId TEXT, " +
233
+ "cards TEXT, " +
185
234
  "updated_at INTEGER NOT NULL, " +
186
235
  "PRIMARY KEY (session_id, path)" +
187
236
  ")");
@@ -191,9 +240,7 @@ function buildStore(db) {
191
240
  try {
192
241
  db.exec("BEGIN IMMEDIATE");
193
242
  migrationOpen = true;
194
- const migrationColumns = db
195
- .prepare("PRAGMA table_info(served)")
196
- .all();
243
+ const migrationColumns = db.prepare("PRAGMA table_info(served)").all();
197
244
  if (!migrationColumns.some((column) => column.name === "retired")) {
198
245
  db.exec("ALTER TABLE served ADD COLUMN retired TEXT");
199
246
  // Pre-fix snapshots and undo entries may already bind a remembered
@@ -225,10 +272,12 @@ function buildStore(db) {
225
272
  if (!snapshotColumns.some((column) => column.name === "snapshotId")) {
226
273
  db.exec("ALTER TABLE served ADD COLUMN snapshotId TEXT");
227
274
  }
228
- db
229
- .prepare("INSERT INTO meta (key, value) VALUES ('version', ?) " +
230
- "ON CONFLICT(key) DO UPDATE SET value = excluded.value")
231
- .run(String(HASH_STORE_VERSION));
275
+ const cardsColumns = db.prepare("PRAGMA table_info(served)").all();
276
+ if (!cardsColumns.some((column) => column.name === "cards")) {
277
+ db.exec("ALTER TABLE served ADD COLUMN cards TEXT");
278
+ }
279
+ db.prepare("INSERT INTO meta (key, value) VALUES ('version', ?) " +
280
+ "ON CONFLICT(key) DO UPDATE SET value = excluded.value").run(String(HASH_STORE_VERSION));
232
281
  const getStmt = db.prepare("SELECT hashes FROM snapshots WHERE path = ? AND checksum = ? AND line_count = ?");
233
282
  const allStmt = db.prepare("SELECT path FROM snapshots UNION SELECT path FROM undo UNION SELECT path FROM served");
234
283
  const allHashesStmt = db.prepare("SELECT path, hashes FROM snapshots");
@@ -240,7 +289,7 @@ function buildStore(db) {
240
289
  const undoGetStmt = db.prepare("SELECT content, bom, ending, hashes, result_content FROM undo WHERE path = ?");
241
290
  const undoDelStmt = db.prepare("DELETE FROM undo WHERE path = ?");
242
291
  const undoPruneOlderThanStmt = db.prepare("DELETE FROM undo WHERE updated_at < ?");
243
- const servedGetStmt = db.prepare("SELECT hashes, reported, retired, canons, snapshotId FROM served WHERE session_id = ? AND path = ?");
292
+ const servedGetStmt = db.prepare("SELECT hashes, reported, retired, canons, snapshotId, cards FROM served WHERE session_id = ? AND path = ?");
244
293
  const servedAllForPathStmt = db.prepare("SELECT session_id, hashes, retired FROM served WHERE path = ?");
245
294
  const servedUpsertStmt = db.prepare("INSERT INTO served (session_id, path, hashes, updated_at) VALUES (?, ?, ?, ?) " +
246
295
  "ON CONFLICT(session_id, path) DO UPDATE SET hashes = excluded.hashes, updated_at = excluded.updated_at");
@@ -256,6 +305,9 @@ function buildStore(db) {
256
305
  const servedSnapshotUpsertStmt = db.prepare("INSERT INTO served (session_id, path, hashes, snapshotId, updated_at) VALUES (?, ?, '[]', ?, ?) " +
257
306
  "ON CONFLICT(session_id, path) DO UPDATE SET snapshotId = excluded.snapshotId, updated_at = excluded.updated_at");
258
307
  const servedSnapshotClearStmt = db.prepare("UPDATE served SET snapshotId = NULL, updated_at = ? WHERE session_id = ? AND path = ?");
308
+ const servedCardsUpsertStmt = db.prepare("INSERT INTO served (session_id, path, hashes, cards, updated_at) VALUES (?, ?, '[]', ?, ?) " +
309
+ "ON CONFLICT(session_id, path) DO UPDATE SET cards = excluded.cards, updated_at = excluded.updated_at");
310
+ const servedCardsClearStmt = db.prepare("UPDATE served SET cards = NULL, updated_at = ? WHERE session_id = ? AND path = ?");
259
311
  const servedDeleteStmt = db.prepare("DELETE FROM served WHERE session_id = ? AND path = ?");
260
312
  const servedDeletePathStmt = db.prepare("DELETE FROM served WHERE path = ?");
261
313
  const servedWipeStmt = db.prepare("DELETE FROM served WHERE session_id = ?");
@@ -337,6 +389,16 @@ function buildStore(db) {
337
389
  servedSnapshotClearStmt.run(params[1], params[0], params[2]);
338
390
  });
339
391
  },
392
+ servedCardsUpsert: (...params) => {
393
+ withBusyRetry(() => {
394
+ servedCardsUpsertStmt.run(...params);
395
+ });
396
+ },
397
+ servedCardsClear: (...params) => {
398
+ withBusyRetry(() => {
399
+ servedCardsClearStmt.run(params[1], params[0], params[2]);
400
+ });
401
+ },
340
402
  servedDelete: (...params) => {
341
403
  withBusyRetry(() => {
342
404
  servedDeleteStmt.run(...params);
@@ -475,31 +537,30 @@ function makeDomainStore(stmts) {
475
537
  return new Set();
476
538
  }
477
539
  },
478
- getAnchorReservations(path) {
540
+ getAnchorReservations(sessionKey, path) {
479
541
  const reservedHashes = new Set();
480
542
  const retiredHashes = new Set();
481
- for (const row of stmts.servedAllForPath(path)) {
482
- try {
483
- const served = JSON.parse(row.hashes);
484
- const retired = row.retired === null || row.retired === undefined
485
- ? []
486
- : JSON.parse(row.retired);
487
- if (!isValidServedList(served) || !isValidHashList(retired)) {
488
- throw new TypeError("invalid stored anchor reservations");
489
- }
490
- for (const hash of served) {
491
- if (hash !== null)
492
- reservedHashes.add(hash);
493
- }
494
- for (const hash of retired) {
543
+ const row = stmts.servedGet(sessionKey, path);
544
+ if (!row)
545
+ return { reservedHashes, retiredHashes };
546
+ try {
547
+ const served = JSON.parse(row.hashes);
548
+ if (!isValidServedList(served)) {
549
+ throw new TypeError("invalid stored anchor reservations");
550
+ }
551
+ for (const hash of served) {
552
+ if (hash !== null)
495
553
  reservedHashes.add(hash);
496
- retiredHashes.add(hash);
497
- }
498
554
  }
499
- catch (error) {
500
- stmts.servedDelete(row.session_id, path);
555
+ const retiredEntries = parseRetiredJson(row.retired);
556
+ for (const e of retiredEntries) {
557
+ reservedHashes.add(e.hash);
558
+ retiredHashes.add(e.hash);
501
559
  }
502
560
  }
561
+ catch (error) {
562
+ stmts.servedDelete(sessionKey, path);
563
+ }
503
564
  return { reservedHashes, retiredHashes };
504
565
  },
505
566
  getRetiredAnchors(sessionKey, path) {
@@ -508,17 +569,26 @@ function makeDomainStore(stmts) {
508
569
  return new Set();
509
570
  }
510
571
  try {
511
- const parsed = JSON.parse(row.retired);
512
- if (!isValidHashList(parsed)) {
513
- throw new TypeError("invalid retired anchors");
514
- }
515
- return new Set(parsed);
572
+ const entries = parseRetiredJson(row.retired);
573
+ return new Set(entries.map((e) => e.hash));
516
574
  }
517
575
  catch (error) {
518
576
  stmts.servedDelete(sessionKey, path);
519
577
  return new Set();
520
578
  }
521
579
  },
580
+ getRetiredEntries(sessionKey, path) {
581
+ const row = stmts.servedGet(sessionKey, path);
582
+ if (!row || row.retired === null || row.retired === undefined)
583
+ return [];
584
+ try {
585
+ return parseRetiredJson(row.retired);
586
+ }
587
+ catch {
588
+ stmts.servedDelete(sessionKey, path);
589
+ return [];
590
+ }
591
+ },
522
592
  upsertServed(sessionKey, path, hashesJson) {
523
593
  stmts.servedUpsert(sessionKey, path, hashesJson, Date.now());
524
594
  },
@@ -567,6 +637,26 @@ function makeDomainStore(stmts) {
567
637
  clearEpochSnapshotId(sessionKey, path) {
568
638
  stmts.servedSnapshotClear(sessionKey, Date.now(), path);
569
639
  },
640
+ getCards(sessionKey, path) {
641
+ const row = stmts.servedGet(sessionKey, path);
642
+ if (!row || row.cards === null || row.cards === undefined)
643
+ return new Set();
644
+ try {
645
+ const parsed = JSON.parse(row.cards);
646
+ if (!Array.isArray(parsed))
647
+ return new Set();
648
+ return new Set(parsed.filter((v) => typeof v === "number" && Number.isInteger(v) && v >= 0));
649
+ }
650
+ catch {
651
+ return new Set();
652
+ }
653
+ },
654
+ upsertCards(sessionKey, path, cardsJson) {
655
+ stmts.servedCardsUpsert(sessionKey, path, cardsJson, Date.now());
656
+ },
657
+ clearCards(sessionKey, path) {
658
+ stmts.servedCardsClear(sessionKey, Date.now(), path);
659
+ },
570
660
  deleteServed(sessionKey, path) {
571
661
  stmts.servedDelete(sessionKey, path);
572
662
  },