@hy-sde-org/dsh-internal-urls 0.2.1-alpha.4 → 0.2.1-rc.5
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.
- package/dist/conflict.d.ts +69 -2
- package/dist/conflict.d.ts.map +1 -1
- package/dist/conflict.js +299 -27
- package/dist/conflict.js.map +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +31 -1
- package/dist/index.js.map +1 -1
- package/package.json +14 -14
package/dist/conflict.d.ts
CHANGED
|
@@ -14,6 +14,25 @@
|
|
|
14
14
|
* @module @hy-sde-org/dsh-internal-urls/conflict
|
|
15
15
|
*/
|
|
16
16
|
import type { InternalResource, ParsedInternalUrl, ProtocolHandler, ResolveContext, WriteContext } from './types.ts';
|
|
17
|
+
/**
|
|
18
|
+
* Byte cap for whole-file conflict scans — the `<path>:conflicts` summary read
|
|
19
|
+
* and the capped reconciliation reads. Matches the read pipeline's stream
|
|
20
|
+
* threshold: past the cap, blocks are not counted or registered, and
|
|
21
|
+
* reconciliation leaves already-registered ones alone.
|
|
22
|
+
*/
|
|
23
|
+
export declare const CONFLICT_SCAN_MAX_BYTES: number;
|
|
24
|
+
/**
|
|
25
|
+
* Binary-sample window for capped conflict reads, matching fs-local's
|
|
26
|
+
* readText binary sniff (fsio.ts BINARY_SAMPLE_BYTES = 8192).
|
|
27
|
+
*/
|
|
28
|
+
export declare const CONFLICT_BINARY_SAMPLE_BYTES = 8192;
|
|
29
|
+
/**
|
|
30
|
+
* Trim a byte prefix back to the last complete UTF-8 codepoint boundary: a
|
|
31
|
+
* byte-capped read can cut a multi-byte sequence mid-way, and the strict
|
|
32
|
+
* decoder (fatal: true) would reject the incomplete tail as invalid UTF-8
|
|
33
|
+
* even though the underlying file is valid.
|
|
34
|
+
*/
|
|
35
|
+
export declare function trimToCodepointBoundary(bytes: Uint8Array): Uint8Array;
|
|
17
36
|
/** One completed conflict block with its marker line numbers and side bodies. */
|
|
18
37
|
export interface ConflictBlock {
|
|
19
38
|
/** 1-indexed line of the `<<<<<<<` marker. */
|
|
@@ -53,7 +72,9 @@ export interface ConflictEntry extends ConflictBlock {
|
|
|
53
72
|
* Per-session log of conflict regions surfaced by `read`/`:conflicts`. The
|
|
54
73
|
* history is append-only by content identity: re-reading a still-present block
|
|
55
74
|
* reuses its id, so retries never depend on re-reading even after other blocks
|
|
56
|
-
* in the file resolve.
|
|
75
|
+
* in the file resolve. {@link ConflictHistory.reconcilePath} re-checks ids
|
|
76
|
+
* against the live file: unchanged blocks follow line shifts, changed or
|
|
77
|
+
* vanished ones are retired.
|
|
57
78
|
*/
|
|
58
79
|
export declare class ConflictHistory {
|
|
59
80
|
#private;
|
|
@@ -66,6 +87,14 @@ export declare class ConflictHistory {
|
|
|
66
87
|
invalidate(id: number): void;
|
|
67
88
|
/** Drop every entry referencing `absolutePath`. */
|
|
68
89
|
invalidatePath(absolutePath: string): void;
|
|
90
|
+
/**
|
|
91
|
+
* Re-check this path's entries against a fresh scan of the file: unchanged
|
|
92
|
+
* blocks follow line shifts (keeping their ids), changed or vanished ones
|
|
93
|
+
* are retired, and a different block at a recorded position gets a fresh id
|
|
94
|
+
* on the next `register`. Blocks at or past a capped scan's
|
|
95
|
+
* `truncatedAtLine` are left untouched — the scan cannot disprove them.
|
|
96
|
+
*/
|
|
97
|
+
reconcilePath(absolutePath: string, scan: ConflictFileScan): void;
|
|
69
98
|
}
|
|
70
99
|
/** A side of a conflict block addressable as `conflict://N/<scope>`. */
|
|
71
100
|
export type ConflictScope = 'ours' | 'theirs' | 'base';
|
|
@@ -107,18 +136,31 @@ export declare function spliceConflict(originalText: string, entry: ConflictEntr
|
|
|
107
136
|
trimmedLeading: number;
|
|
108
137
|
trimmedTrailing: number;
|
|
109
138
|
};
|
|
139
|
+
/** Result of scanning a file for conflict blocks, with the scan cap when hit. */
|
|
140
|
+
export interface ConflictFileScan {
|
|
141
|
+
blocks: ConflictBlock[];
|
|
142
|
+
/**
|
|
143
|
+
* 1-indexed line at which a byte-capped scan stopped; blocks at or past
|
|
144
|
+
* this line are neither confirmed nor retired by reconciliation.
|
|
145
|
+
*/
|
|
146
|
+
truncatedAtLine?: number;
|
|
147
|
+
}
|
|
148
|
+
/** Region equality: identical recorded marker blocks (labels and side bodies). */
|
|
149
|
+
export declare function conflictRegionsEqual(a: ConflictBlock, b: ConflictBlock): boolean;
|
|
110
150
|
/**
|
|
111
151
|
* Build a compact diff-style footer describing the conflicts registered during
|
|
112
152
|
* a read. Appended to the read output so the agent learns the `conflict://<N>`
|
|
113
153
|
* ids and the resolution protocol.
|
|
114
154
|
*/
|
|
115
155
|
export declare function formatConflictWarning(entries: readonly ConflictEntry[]): string;
|
|
156
|
+
/** Note appended when the conflict scan stopped at its byte cap at `line`. */
|
|
157
|
+
export declare function formatScanCapNote(displayPath: string, line: number): string;
|
|
116
158
|
/**
|
|
117
159
|
* Render a one-line-per-block index of every registered conflict. Used by the
|
|
118
160
|
* `<path>:conflicts` read selector to give the agent a cheap overview of a
|
|
119
161
|
* heavily-conflicted file without dumping every body.
|
|
120
162
|
*/
|
|
121
|
-
export declare function formatConflictSummary(entries: readonly ConflictEntry[], displayPath: string): string;
|
|
163
|
+
export declare function formatConflictSummary(entries: readonly ConflictEntry[], displayPath: string, truncatedAtLine?: number): string;
|
|
122
164
|
/**
|
|
123
165
|
* File access the conflict handler performs resolution through — provided by
|
|
124
166
|
* the service plugin against `ctx.fs` so splice/rewrite keep every seam
|
|
@@ -127,9 +169,27 @@ export declare function formatConflictSummary(entries: readonly ConflictEntry[],
|
|
|
127
169
|
export interface ConflictFileBridge {
|
|
128
170
|
/** Read the whole current file text at `absolutePath`. */
|
|
129
171
|
readFile(absolutePath: string, signal?: AbortSignal): Promise<string>;
|
|
172
|
+
/**
|
|
173
|
+
* Read at most `maxLength` bytes of `absolutePath`, stopping at the last
|
|
174
|
+
* complete codepoint boundary. `truncatedAtLine` is the 1-indexed line the
|
|
175
|
+
* prefix ends on (the line count of the decoded text), so reconciliation can
|
|
176
|
+
* preserve blocks it could not see. When absent, reconciliation falls back
|
|
177
|
+
* to a whole-file `readFile`.
|
|
178
|
+
*/
|
|
179
|
+
readFileCapped?(absolutePath: string, maxLength: number, signal?: AbortSignal): Promise<{
|
|
180
|
+
text: string;
|
|
181
|
+
truncatedAtLine?: number;
|
|
182
|
+
}>;
|
|
130
183
|
/** Replace `absolutePath` with `content` (unconditional atomic write). */
|
|
131
184
|
writeFile(absolutePath: string, content: string, signal?: AbortSignal, sandboxPolicy?: unknown): Promise<void>;
|
|
132
185
|
}
|
|
186
|
+
/**
|
|
187
|
+
* Re-check registered ids against the live files — all of them, or only
|
|
188
|
+
* `absolutePath` when given: unchanged blocks keep their ids across line
|
|
189
|
+
* shifts, changed or vanished blocks are retired, and a missing file retires
|
|
190
|
+
* every id it registered.
|
|
191
|
+
*/
|
|
192
|
+
export declare function reconcileRegisteredConflicts(history: ConflictHistory, bridge: ConflictFileBridge, absolutePath?: string, signal?: AbortSignal): Promise<void>;
|
|
133
193
|
/**
|
|
134
194
|
* The `conflict://` protocol handler.
|
|
135
195
|
*
|
|
@@ -153,6 +213,13 @@ export declare class ConflictProtocolHandler implements ProtocolHandler {
|
|
|
153
213
|
bridge: ConflictFileBridge;
|
|
154
214
|
});
|
|
155
215
|
resolve(url: ParsedInternalUrl, context?: ResolveContext): Promise<InternalResource>;
|
|
216
|
+
/**
|
|
217
|
+
* Look up a registered id after re-checking its file: unchanged blocks keep
|
|
218
|
+
* their ids across line shifts, while resolved, stale, or never-shown ids
|
|
219
|
+
* error. Only the addressed block's file is re-checked — other files keep
|
|
220
|
+
* their ids until they are addressed in turn.
|
|
221
|
+
*/
|
|
222
|
+
private requireEntry;
|
|
156
223
|
write(url: ParsedInternalUrl, content: string, context?: WriteContext): Promise<void>;
|
|
157
224
|
/** Apply the same (token-expanded) content to every registered block. */
|
|
158
225
|
private writeBulk;
|
package/dist/conflict.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict.d.ts","sourceRoot":"","sources":["../src/conflict.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;
|
|
1
|
+
{"version":3,"file":"conflict.d.ts","sourceRoot":"","sources":["../src/conflict.ts"],"names":[],"mappings":"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"}
|
package/dist/conflict.js
CHANGED
|
@@ -13,10 +13,58 @@
|
|
|
13
13
|
* MIT, adapted to the DeepSeek Harness file-services seam.
|
|
14
14
|
* @module @hy-sde-org/dsh-internal-urls/conflict
|
|
15
15
|
*/
|
|
16
|
+
import { FsError } from '@deepseek-ai/dsh-fs';
|
|
16
17
|
const OURS_PREFIX = '<<<<<<<';
|
|
17
18
|
const BASE_PREFIX = '|||||||';
|
|
18
19
|
const SEPARATOR = '=======';
|
|
19
20
|
const THEIRS_PREFIX = '>>>>>>>';
|
|
21
|
+
/**
|
|
22
|
+
* Byte cap for whole-file conflict scans — the `<path>:conflicts` summary read
|
|
23
|
+
* and the capped reconciliation reads. Matches the read pipeline's stream
|
|
24
|
+
* threshold: past the cap, blocks are not counted or registered, and
|
|
25
|
+
* reconciliation leaves already-registered ones alone.
|
|
26
|
+
*/
|
|
27
|
+
export const CONFLICT_SCAN_MAX_BYTES = 10 * 1024 * 1024;
|
|
28
|
+
/**
|
|
29
|
+
* Binary-sample window for capped conflict reads, matching fs-local's
|
|
30
|
+
* readText binary sniff (fsio.ts BINARY_SAMPLE_BYTES = 8192).
|
|
31
|
+
*/
|
|
32
|
+
export const CONFLICT_BINARY_SAMPLE_BYTES = 8192;
|
|
33
|
+
/**
|
|
34
|
+
* Trim a byte prefix back to the last complete UTF-8 codepoint boundary: a
|
|
35
|
+
* byte-capped read can cut a multi-byte sequence mid-way, and the strict
|
|
36
|
+
* decoder (fatal: true) would reject the incomplete tail as invalid UTF-8
|
|
37
|
+
* even though the underlying file is valid.
|
|
38
|
+
*/
|
|
39
|
+
export function trimToCodepointBoundary(bytes) {
|
|
40
|
+
let end = bytes.length;
|
|
41
|
+
let back = 0;
|
|
42
|
+
// Walk back over up to 3 continuation bytes (10xxxxxx) to the last lead byte.
|
|
43
|
+
while (back < 4 && end > 0 && ((bytes[end - 1] ?? 0) & 0xc0) === 0x80) {
|
|
44
|
+
end -= 1;
|
|
45
|
+
back += 1;
|
|
46
|
+
}
|
|
47
|
+
if (back === 0) {
|
|
48
|
+
// The cap can also land immediately after a lead byte with no
|
|
49
|
+
// continuation bytes in the prefix ('616263E4' from 'abc中'): the
|
|
50
|
+
// incomplete sequence must be dropped too. Bytes outside the valid
|
|
51
|
+
// lead range stay so the fatal decoder reports them.
|
|
52
|
+
const lead = bytes[end - 1] ?? 0;
|
|
53
|
+
if (lead >= 0xc2 && lead <= 0xf4)
|
|
54
|
+
return bytes.subarray(0, end - 1);
|
|
55
|
+
return bytes;
|
|
56
|
+
}
|
|
57
|
+
const lead = bytes[end - 1] ?? 0;
|
|
58
|
+
// Expected sequence length from the lead byte; a continuation byte here
|
|
59
|
+
// (4+ continuations, already invalid) decodes expected 1 and stays put so
|
|
60
|
+
// the fatal decoder reports it.
|
|
61
|
+
const expected = lead >= 0xf0 ? 4 : lead >= 0xe0 ? 3 : lead >= 0xc0 ? 2 : 1;
|
|
62
|
+
// Complete when the walked-back continuations fill the sequence (back
|
|
63
|
+
// counts continuation bytes; the lead adds one), over-trim otherwise.
|
|
64
|
+
if (back + 1 < expected)
|
|
65
|
+
return bytes.subarray(0, end - 1);
|
|
66
|
+
return bytes;
|
|
67
|
+
}
|
|
20
68
|
/**
|
|
21
69
|
* Scan already-collected file lines for completed conflict blocks.
|
|
22
70
|
* `firstLineNumber` is the 1-indexed line number of `lines[0]` (so a windowed
|
|
@@ -114,7 +162,9 @@ export function scanConflictsInContent(content) {
|
|
|
114
162
|
* Per-session log of conflict regions surfaced by `read`/`:conflicts`. The
|
|
115
163
|
* history is append-only by content identity: re-reading a still-present block
|
|
116
164
|
* reuses its id, so retries never depend on re-reading even after other blocks
|
|
117
|
-
* in the file resolve.
|
|
165
|
+
* in the file resolve. {@link ConflictHistory.reconcilePath} re-checks ids
|
|
166
|
+
* against the live file: unchanged blocks follow line shifts, changed or
|
|
167
|
+
* vanished ones are retired.
|
|
118
168
|
*/
|
|
119
169
|
export class ConflictHistory {
|
|
120
170
|
nextId = 1;
|
|
@@ -122,6 +172,13 @@ export class ConflictHistory {
|
|
|
122
172
|
register(input) {
|
|
123
173
|
for (const existing of this.#entries.values()) {
|
|
124
174
|
if (existing.absolutePath === input.absolutePath && existing.startLine === input.startLine) {
|
|
175
|
+
// An id is reused only for the same block at the same position: a
|
|
176
|
+
// changed block must never inherit the old id, or a write aimed at
|
|
177
|
+
// stale content would splice the wrong region.
|
|
178
|
+
if (!conflictRegionsEqual(existing, input)) {
|
|
179
|
+
this.#entries.delete(existing.id);
|
|
180
|
+
continue;
|
|
181
|
+
}
|
|
125
182
|
const merged = { ...input, id: existing.id };
|
|
126
183
|
this.#entries.set(existing.id, merged);
|
|
127
184
|
return merged;
|
|
@@ -150,7 +207,73 @@ export class ConflictHistory {
|
|
|
150
207
|
this.#entries.delete(id);
|
|
151
208
|
}
|
|
152
209
|
}
|
|
210
|
+
/**
|
|
211
|
+
* Re-check this path's entries against a fresh scan of the file: unchanged
|
|
212
|
+
* blocks follow line shifts (keeping their ids), changed or vanished ones
|
|
213
|
+
* are retired, and a different block at a recorded position gets a fresh id
|
|
214
|
+
* on the next `register`. Blocks at or past a capped scan's
|
|
215
|
+
* `truncatedAtLine` are left untouched — the scan cannot disprove them.
|
|
216
|
+
*/
|
|
217
|
+
reconcilePath(absolutePath, scan) {
|
|
218
|
+
const entries = this.entries().filter(entry => entry.absolutePath === absolutePath);
|
|
219
|
+
const available = new Set(scan.blocks);
|
|
220
|
+
const matched = new Map();
|
|
221
|
+
// Unchanged blocks at their recorded position keep their ids.
|
|
222
|
+
for (const entry of entries) {
|
|
223
|
+
for (const block of available) {
|
|
224
|
+
if (block.startLine !== entry.startLine || !conflictRegionsEqual(entry, block))
|
|
225
|
+
continue;
|
|
226
|
+
matched.set(entry, block);
|
|
227
|
+
available.delete(block);
|
|
228
|
+
break;
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
// Unchanged blocks that shifted follow the nearest equal block.
|
|
232
|
+
for (const entry of entries) {
|
|
233
|
+
if (matched.has(entry))
|
|
234
|
+
continue;
|
|
235
|
+
let best;
|
|
236
|
+
let bestDistance = Number.POSITIVE_INFINITY;
|
|
237
|
+
for (const block of available) {
|
|
238
|
+
if (!conflictRegionsEqual(entry, block))
|
|
239
|
+
continue;
|
|
240
|
+
const distance = Math.abs(block.startLine - entry.startLine);
|
|
241
|
+
if (distance >= bestDistance)
|
|
242
|
+
continue;
|
|
243
|
+
best = block;
|
|
244
|
+
bestDistance = distance;
|
|
245
|
+
}
|
|
246
|
+
if (best !== undefined) {
|
|
247
|
+
matched.set(entry, best);
|
|
248
|
+
available.delete(best);
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
for (const entry of entries) {
|
|
252
|
+
const block = matched.get(entry);
|
|
253
|
+
if (block === undefined) {
|
|
254
|
+
if (scan.truncatedAtLine !== undefined && entry.endLine >= scan.truncatedAtLine)
|
|
255
|
+
continue;
|
|
256
|
+
// A windowed read records wide lines cut to the read pipeline's
|
|
257
|
+
// column cap with a truncation suffix; such a recorded region can
|
|
258
|
+
// never equal the live text (findRegisteredBlocks drops over-length
|
|
259
|
+
// lines), so retiring it would make a still-live wide-line conflict
|
|
260
|
+
// unaddressable — every re-read would register and then retire it.
|
|
261
|
+
// Leave it registered: the scan cannot disprove a cut region.
|
|
262
|
+
if (buildRecordedRegion(entry).some(line => WIDE_LINE_CUT_RE.test(line)))
|
|
263
|
+
continue;
|
|
264
|
+
this.#entries.delete(entry.id);
|
|
265
|
+
continue;
|
|
266
|
+
}
|
|
267
|
+
this.#entries.set(entry.id, { ...entry, ...block });
|
|
268
|
+
}
|
|
269
|
+
}
|
|
153
270
|
}
|
|
271
|
+
/**
|
|
272
|
+
* A read-pipeline column-cut line suffix (tool-fs read-render.ts truncateLine):
|
|
273
|
+
* windowed reads record wide conflict lines cut to the column cap plus this
|
|
274
|
+
* marker, and such a recorded region can never match the live text.
|
|
275
|
+
*/
|
|
276
|
+
const WIDE_LINE_CUT_RE = /\.\.\. \(line truncated to \d+ chars\)$/;
|
|
154
277
|
const CONFLICT_SCOPES = new Set(['ours', 'theirs', 'base']);
|
|
155
278
|
// Accept an optional `<prefix>:` before the scheme so paths like
|
|
156
279
|
// `path/to/file.ts:conflict://3` still resolve; the last `:conflict://` wins.
|
|
@@ -294,6 +417,83 @@ function buildRecordedRegion(entry) {
|
|
|
294
417
|
out.push(`${THEIRS_PREFIX}${entry.theirsLabel ? ` ${entry.theirsLabel}` : ''}`);
|
|
295
418
|
return out;
|
|
296
419
|
}
|
|
420
|
+
/** Region equality: identical recorded marker blocks (labels and side bodies). */
|
|
421
|
+
export function conflictRegionsEqual(a, b) {
|
|
422
|
+
const regionA = buildRecordedRegion(a);
|
|
423
|
+
const regionB = buildRecordedRegion(b);
|
|
424
|
+
if (regionA.length !== regionB.length)
|
|
425
|
+
return false;
|
|
426
|
+
return regionA.every((line, index) => line === regionB[index]);
|
|
427
|
+
}
|
|
428
|
+
/**
|
|
429
|
+
* Find the registered blocks in a file's text, bounded by the widest
|
|
430
|
+
* registered block: a line longer than any recorded line (plus a trailing
|
|
431
|
+
* `\r`) cannot belong to one, and the walk stops once every entry is
|
|
432
|
+
* confirmed at its recorded start line. Upstream streams the file; the fork
|
|
433
|
+
* reads the whole text through the bridge, and these bounds keep a
|
|
434
|
+
* pathological file to one linear pass.
|
|
435
|
+
*/
|
|
436
|
+
function findRegisteredBlocks(text, entries) {
|
|
437
|
+
const regions = new Set();
|
|
438
|
+
const unconfirmed = new Map();
|
|
439
|
+
let maxLines = 0;
|
|
440
|
+
let maxLineLength = 0;
|
|
441
|
+
for (const entry of entries) {
|
|
442
|
+
const region = buildRecordedRegion(entry);
|
|
443
|
+
const key = region.join('\n');
|
|
444
|
+
regions.add(key);
|
|
445
|
+
unconfirmed.set(entry.startLine, key);
|
|
446
|
+
maxLines = Math.max(maxLines, region.length);
|
|
447
|
+
for (const line of region)
|
|
448
|
+
maxLineLength = Math.max(maxLineLength, line.length);
|
|
449
|
+
}
|
|
450
|
+
// Recorded lines are LF-normalized; file lines may carry a trailing `\r`.
|
|
451
|
+
maxLineLength += 1;
|
|
452
|
+
const found = [];
|
|
453
|
+
let candidate = [];
|
|
454
|
+
let candidateStart = 0;
|
|
455
|
+
/** One line (`null` when over the length bound); true once all are confirmed. */
|
|
456
|
+
const feed = (raw, lineNumber) => {
|
|
457
|
+
const line = raw === null ? null : stripTrailingCr(raw);
|
|
458
|
+
if (line !== null && matchMarker(line, OURS_PREFIX) !== null) {
|
|
459
|
+
candidate = [line];
|
|
460
|
+
candidateStart = lineNumber;
|
|
461
|
+
return false;
|
|
462
|
+
}
|
|
463
|
+
if (candidate.length === 0)
|
|
464
|
+
return false;
|
|
465
|
+
if (line === null || candidate.length === maxLines) {
|
|
466
|
+
candidate = [];
|
|
467
|
+
return false;
|
|
468
|
+
}
|
|
469
|
+
candidate.push(line);
|
|
470
|
+
if (matchMarker(line, THEIRS_PREFIX) === null)
|
|
471
|
+
return false;
|
|
472
|
+
const block = scanConflictLines(candidate, candidateStart)[0];
|
|
473
|
+
candidate = [];
|
|
474
|
+
if (block === undefined)
|
|
475
|
+
return false;
|
|
476
|
+
const key = buildRecordedRegion(block).join('\n');
|
|
477
|
+
if (!regions.has(key))
|
|
478
|
+
return false;
|
|
479
|
+
found.push(block);
|
|
480
|
+
if (unconfirmed.get(block.startLine) === key)
|
|
481
|
+
unconfirmed.delete(block.startLine);
|
|
482
|
+
return unconfirmed.size === 0;
|
|
483
|
+
};
|
|
484
|
+
// Match discovery's decoder: a leading BOM never reaches the marker scan.
|
|
485
|
+
const body = text.startsWith('\uFEFF') ? text.slice(1) : text;
|
|
486
|
+
const lines = body.split('\n');
|
|
487
|
+
for (let index = 0; index < lines.length; index++) {
|
|
488
|
+
// A trailing newline leaves a phantom empty element the stream never yields.
|
|
489
|
+
if (index === lines.length - 1 && lines[index] === '')
|
|
490
|
+
break;
|
|
491
|
+
const line = lines[index] ?? '';
|
|
492
|
+
if (feed(line.length > maxLineLength ? null : line, index + 1))
|
|
493
|
+
break;
|
|
494
|
+
}
|
|
495
|
+
return found;
|
|
496
|
+
}
|
|
297
497
|
function locateRegion(lines, expected, preferredIdx) {
|
|
298
498
|
if (expected.length === 0 || expected.length > lines.length)
|
|
299
499
|
return null;
|
|
@@ -463,15 +663,21 @@ export function formatConflictWarning(entries) {
|
|
|
463
663
|
}
|
|
464
664
|
return out.join('\n');
|
|
465
665
|
}
|
|
666
|
+
/** Note appended when the conflict scan stopped at its byte cap at `line`. */
|
|
667
|
+
export function formatScanCapNote(displayPath, line) {
|
|
668
|
+
return `- note: the conflict scan stopped at the byte cap at line ${line}; blocks from there on are not counted or registered here — read \`${displayPath}\` again with offset ${line} to show and register them.`;
|
|
669
|
+
}
|
|
466
670
|
/**
|
|
467
671
|
* Render a one-line-per-block index of every registered conflict. Used by the
|
|
468
672
|
* `<path>:conflicts` read selector to give the agent a cheap overview of a
|
|
469
673
|
* heavily-conflicted file without dumping every body.
|
|
470
674
|
*/
|
|
471
|
-
export function formatConflictSummary(entries, displayPath) {
|
|
675
|
+
export function formatConflictSummary(entries, displayPath, truncatedAtLine) {
|
|
472
676
|
const lines = [];
|
|
473
677
|
const total = entries.length;
|
|
474
678
|
lines.push(`⚠ ${total} unresolved ${total === 1 ? 'conflict' : 'conflicts'} in ${displayPath || '<file>'}`);
|
|
679
|
+
if (truncatedAtLine !== undefined)
|
|
680
|
+
lines.push(formatScanCapNote(displayPath, truncatedAtLine));
|
|
475
681
|
const oursLabel = pickLabel(entries, e => e.oursLabel);
|
|
476
682
|
const theirsLabel = pickLabel(entries, e => e.theirsLabel);
|
|
477
683
|
const baseLabel = pickLabel(entries, e => (e.baseLines !== undefined ? e.baseLabel : undefined));
|
|
@@ -493,6 +699,46 @@ export function formatConflictSummary(entries, displayPath) {
|
|
|
493
699
|
}
|
|
494
700
|
return lines.join('\n');
|
|
495
701
|
}
|
|
702
|
+
/**
|
|
703
|
+
* Re-check registered ids against the live files — all of them, or only
|
|
704
|
+
* `absolutePath` when given: unchanged blocks keep their ids across line
|
|
705
|
+
* shifts, changed or vanished blocks are retired, and a missing file retires
|
|
706
|
+
* every id it registered.
|
|
707
|
+
*/
|
|
708
|
+
export async function reconcileRegisteredConflicts(history, bridge, absolutePath, signal) {
|
|
709
|
+
const byPath = new Map();
|
|
710
|
+
for (const entry of history.entries()) {
|
|
711
|
+
if (absolutePath !== undefined && entry.absolutePath !== absolutePath)
|
|
712
|
+
continue;
|
|
713
|
+
const group = byPath.get(entry.absolutePath);
|
|
714
|
+
if (group === undefined)
|
|
715
|
+
byPath.set(entry.absolutePath, [entry]);
|
|
716
|
+
else
|
|
717
|
+
group.push(entry);
|
|
718
|
+
}
|
|
719
|
+
for (const [file, entries] of byPath) {
|
|
720
|
+
try {
|
|
721
|
+
// Prefer the capped read: conflict:// accesses re-check on every use,
|
|
722
|
+
// and a whole-file read of a large registered file would pay full
|
|
723
|
+
// bytes+decode each time. Past-cap blocks are preserved by
|
|
724
|
+
// reconcilePath via truncatedAtLine.
|
|
725
|
+
const scan = bridge.readFileCapped === undefined
|
|
726
|
+
? { text: await bridge.readFile(file, signal) }
|
|
727
|
+
: await bridge.readFileCapped(file, CONFLICT_SCAN_MAX_BYTES, signal);
|
|
728
|
+
const blocks = findRegisteredBlocks(scan.text, entries);
|
|
729
|
+
history.reconcilePath(file, scan.truncatedAtLine === undefined ? { blocks } : { blocks, truncatedAtLine: scan.truncatedAtLine });
|
|
730
|
+
}
|
|
731
|
+
catch (error) {
|
|
732
|
+
if (!isMissingFileError(error))
|
|
733
|
+
throw error;
|
|
734
|
+
history.invalidatePath(file);
|
|
735
|
+
}
|
|
736
|
+
}
|
|
737
|
+
}
|
|
738
|
+
/** Missing-file classification for reconciliation: the ENOENT/ENOTDIR analogs. */
|
|
739
|
+
function isMissingFileError(error) {
|
|
740
|
+
return error instanceof FsError && (error.code === 'FS_NOT_FOUND' || error.code === 'FS_NOT_DIRECTORY');
|
|
741
|
+
}
|
|
496
742
|
/**
|
|
497
743
|
* The `conflict://` protocol handler.
|
|
498
744
|
*
|
|
@@ -514,7 +760,7 @@ export class ConflictProtocolHandler {
|
|
|
514
760
|
constructor(deps) {
|
|
515
761
|
this.deps = deps;
|
|
516
762
|
}
|
|
517
|
-
resolve(url, context) {
|
|
763
|
+
async resolve(url, context) {
|
|
518
764
|
const raw = url.rawHref;
|
|
519
765
|
const parsed = parseConflictUri(raw);
|
|
520
766
|
if (parsed === null) {
|
|
@@ -522,38 +768,54 @@ export class ConflictProtocolHandler {
|
|
|
522
768
|
}
|
|
523
769
|
const history = this.deps.historyFor(context?.sessionKey);
|
|
524
770
|
if (parsed.id === '*') {
|
|
771
|
+
// The wildcard summary claims live state: retire stale ids first.
|
|
772
|
+
await reconcileRegisteredConflicts(history, this.deps.bridge, undefined, context?.signal);
|
|
525
773
|
const entries = history.entries();
|
|
526
774
|
const content = entries.length === 0
|
|
527
775
|
? 'No conflicts registered in this session yet. Read the conflicted file first to register its conflicts.'
|
|
528
776
|
: formatConflictSummary(entries, 'all files');
|
|
529
|
-
return
|
|
777
|
+
return {
|
|
530
778
|
url: url.href,
|
|
531
779
|
content,
|
|
532
780
|
contentType: 'text/plain',
|
|
533
781
|
size: Buffer.byteLength(content, 'utf-8'),
|
|
534
782
|
notes: entries.length === 0 ? [] : [`${entries.length} registered conflict${entries.length === 1 ? '' : 's'}`],
|
|
535
|
-
}
|
|
536
|
-
}
|
|
537
|
-
const entry = history.get(parsed.id);
|
|
538
|
-
if (entry === undefined) {
|
|
539
|
-
const available = history.entries();
|
|
540
|
-
const hint = available.length > 0
|
|
541
|
-
? ` Registered ids: ${available.map(e => e.id).join(', ')}.`
|
|
542
|
-
: ' No conflicts are registered in this session yet — read the conflicted file first.';
|
|
543
|
-
throw new Error(`Conflict #${parsed.id} is not registered in this session.${hint}`);
|
|
783
|
+
};
|
|
544
784
|
}
|
|
785
|
+
const entry = await this.requireEntry(history, parsed.id, context?.signal);
|
|
545
786
|
const { lines } = renderConflictRegion(entry, parsed.scope);
|
|
546
787
|
const content = lines.join('\n');
|
|
547
788
|
const scopeNote = parsed.scope !== undefined
|
|
548
789
|
? `Showing ${parsed.scope} side of conflict #${parsed.id} in ${entry.displayPath}`
|
|
549
790
|
: `Conflict #${parsed.id} in ${entry.displayPath} (file lines ${entry.startLine}-${entry.endLine})`;
|
|
550
|
-
return
|
|
791
|
+
return {
|
|
551
792
|
url: url.href,
|
|
552
793
|
content,
|
|
553
794
|
contentType: 'text/plain',
|
|
554
795
|
size: Buffer.byteLength(content, 'utf-8'),
|
|
555
796
|
notes: [scopeNote, 'Resolve with `write({ path: "conflict://' + String(parsed.id) + '", content })`. Writes replace ONLY the marker block.'],
|
|
556
|
-
}
|
|
797
|
+
};
|
|
798
|
+
}
|
|
799
|
+
/**
|
|
800
|
+
* Look up a registered id after re-checking its file: unchanged blocks keep
|
|
801
|
+
* their ids across line shifts, while resolved, stale, or never-shown ids
|
|
802
|
+
* error. Only the addressed block's file is re-checked — other files keep
|
|
803
|
+
* their ids until they are addressed in turn.
|
|
804
|
+
*/
|
|
805
|
+
async requireEntry(history, id, signal) {
|
|
806
|
+
const registered = history.get(id);
|
|
807
|
+
if (registered !== undefined) {
|
|
808
|
+
await reconcileRegisteredConflicts(history, this.deps.bridge, registered.absolutePath, signal);
|
|
809
|
+
}
|
|
810
|
+
const entry = history.get(id);
|
|
811
|
+
if (entry === undefined) {
|
|
812
|
+
const available = history.entries();
|
|
813
|
+
const hint = available.length > 0
|
|
814
|
+
? ` Registered ids: ${available.map(e => e.id).join(', ')}.`
|
|
815
|
+
: ' No conflicts are registered in this session yet — read the conflicted file first.';
|
|
816
|
+
throw new Error(`Conflict #${id} is not registered in this session — it may have been resolved, become stale, or no \`read\` has shown its block yet.${hint}`);
|
|
817
|
+
}
|
|
818
|
+
return entry;
|
|
557
819
|
}
|
|
558
820
|
async write(url, content, context) {
|
|
559
821
|
const parsed = parseConflictUri(url.rawHref);
|
|
@@ -573,18 +835,14 @@ export class ConflictProtocolHandler {
|
|
|
573
835
|
await this.writeBulk(history, content, cw);
|
|
574
836
|
return;
|
|
575
837
|
}
|
|
576
|
-
const entry =
|
|
577
|
-
if (entry === undefined) {
|
|
578
|
-
const available = history.entries();
|
|
579
|
-
const hint = available.length > 0
|
|
580
|
-
? ` Registered ids: ${available.map(e => e.id).join(', ')}.`
|
|
581
|
-
: ' No conflicts are registered in this session yet — read the conflicted file first.';
|
|
582
|
-
throw new Error(`Conflict #${parsed.id} is not registered in this session.${hint}`);
|
|
583
|
-
}
|
|
838
|
+
const entry = await this.requireEntry(history, parsed.id, cw.signal);
|
|
584
839
|
await this.resolveEntry(entry, expandContentTokens(content, entry), cw);
|
|
585
840
|
}
|
|
586
841
|
/** Apply the same (token-expanded) content to every registered block. */
|
|
587
842
|
async writeBulk(history, content, cw) {
|
|
843
|
+
// Re-check every registered file first: stale ids are retired before the
|
|
844
|
+
// bulk body is parsed, and shifted blocks keep their ids.
|
|
845
|
+
await reconcileRegisteredConflicts(history, this.deps.bridge, undefined, cw.signal);
|
|
588
846
|
const entries = history.entries();
|
|
589
847
|
if (entries.length === 0) {
|
|
590
848
|
throw new Error('conflict://* has nothing to resolve: no conflicts are registered in this session yet. Read the conflicted file first.');
|
|
@@ -605,7 +863,11 @@ export class ConflictProtocolHandler {
|
|
|
605
863
|
perId.set(id, match[2] ?? '');
|
|
606
864
|
}
|
|
607
865
|
const shared = sharedLines.join('\n');
|
|
608
|
-
for (const
|
|
866
|
+
for (const original of entries) {
|
|
867
|
+
// Earlier splices re-check the file and may refresh later entries.
|
|
868
|
+
const entry = history.get(original.id);
|
|
869
|
+
if (entry === undefined)
|
|
870
|
+
continue;
|
|
609
871
|
if (perId.has(entry.id)) {
|
|
610
872
|
await this.resolveEntry(entry, expandContentTokens(perId.get(entry.id) ?? '', entry), cw);
|
|
611
873
|
}
|
|
@@ -617,9 +879,19 @@ export class ConflictProtocolHandler {
|
|
|
617
879
|
async resolveEntry(entry, replacementBody, cw) {
|
|
618
880
|
const signal = cw.signal;
|
|
619
881
|
const original = await this.deps.bridge.readFile(entry.absolutePath, signal);
|
|
620
|
-
|
|
621
|
-
|
|
622
|
-
|
|
882
|
+
// Match BOM-blind like the recorded entry and the reconcile scan, but
|
|
883
|
+
// write the byte back: the :conflicts summary strips the BOM before
|
|
884
|
+
// scanning, so a line-1 block of a BOM-prefixed file registers without
|
|
885
|
+
// it — spliceConflict over the raw text would never match and every
|
|
886
|
+
// resolve would loop on "re-read it to re-register conflicts".
|
|
887
|
+
const hadBom = original.startsWith('\uFEFF');
|
|
888
|
+
const splat = spliceConflict(hadBom ? original.slice(1) : original, entry, replacementBody);
|
|
889
|
+
await this.deps.bridge.writeFile(entry.absolutePath, hadBom ? `\uFEFF${splat.text}` : splat.text, signal, cw.sandboxPolicy);
|
|
890
|
+
const history = this.deps.historyFor(cw.sessionKey);
|
|
891
|
+
history.invalidate(entry.id);
|
|
892
|
+
// Re-align the remaining ids with the spliced text: blocks below the
|
|
893
|
+
// resolved one shift up and keep their ids.
|
|
894
|
+
history.reconcilePath(entry.absolutePath, { blocks: scanConflictsInContent(splat.text) });
|
|
623
895
|
}
|
|
624
896
|
}
|
|
625
897
|
//# sourceMappingURL=conflict.js.map
|
package/dist/conflict.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict.js","sourceRoot":"","sources":["../src/conflict.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"conflict.js","sourceRoot":"","sources":["../src/conflict.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEtE,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEtE,OAAO,EAAgC,eAAe,EAAoD,MAAM,eAAe,CAAA;AAO/H,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,cAAc,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEhH,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AAExC,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,yEAAyE;QACzE,YAAY,EAAE,mBAAmB,CAAA;KAClC;CACF;AAED;;;GAGG;AACH,qBAAa,mBAAoB,SAAQ,OAAO;IAC9C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;IACjD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqC;gBAEnD,GAAG,EAAE,OAAO;IAIxB,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,MAAM,IAAI;IAI9C,uEAAuE;IACvE,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAInC,+BAA+B;IAC/B,OAAO,IAAI,MAAM,EAAE;IAInB,mFAAmF;IACnF,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO;IAIjC,8DAA8D;IAC9D,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAI3E,4DAA4D;IAC5D,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,gFAAgF;IAChF,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC;IAIlG;;;OAGG;IACH,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,eAAe;CAS3D;AAED,qDAAqD;AACrD,eAAO,MAAM,IAAI,kBAAkB,CAAA;AAEnC,kFAAkF;AAClF,eAAO,MAAM,MAAM,UAAS,CAAA;AAE5B,YAAY,EAAE,sBAAsB,EAAE,CAAA;AAgDtC;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CA4BxC;AAED,eAAe,KAAK,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -9,7 +9,8 @@
|
|
|
9
9
|
* @module @hy-sde-org/dsh-internal-urls
|
|
10
10
|
*/
|
|
11
11
|
import { Service } from '@deepseek-ai/cordis';
|
|
12
|
-
import {
|
|
12
|
+
import { FsError } from '@deepseek-ai/dsh-fs';
|
|
13
|
+
import { CONFLICT_BINARY_SAMPLE_BYTES, ConflictHistory, ConflictProtocolHandler, trimToCodepointBoundary } from "./conflict.js";
|
|
13
14
|
import { defaultRepoFromCwd } from "./gh.js";
|
|
14
15
|
import { IssueProtocolHandler, PrProtocolHandler, gitHubCliOf } from "./issue-pr.js";
|
|
15
16
|
import { AgentProtocolHandler } from "./agent-protocol.js";
|
|
@@ -86,6 +87,35 @@ function conflictFileBridgeOf(ctx) {
|
|
|
86
87
|
const target = await ctx.fs.resolve(absolutePath, signal !== undefined ? { signal } : undefined);
|
|
87
88
|
return ctx.fs.readText(target, signal);
|
|
88
89
|
},
|
|
90
|
+
async readFileCapped(absolutePath, maxLength, signal) {
|
|
91
|
+
const target = await ctx.fs.resolve(absolutePath, signal !== undefined ? { signal } : undefined);
|
|
92
|
+
const info = await ctx.fs.stat(target, signal);
|
|
93
|
+
if (info === undefined)
|
|
94
|
+
throw new FsError(`cannot read "${absolutePath}": not found`, 'FS_NOT_FOUND');
|
|
95
|
+
if (info.type !== 'file')
|
|
96
|
+
throw new FsError(`cannot read "${absolutePath}": not a regular file`, 'FS_NOT_REGULAR_FILE');
|
|
97
|
+
if (info.size === undefined || info.size <= maxLength) {
|
|
98
|
+
// Under the cap readText keeps fs-local parity: binary and invalid
|
|
99
|
+
// UTF-8 fail FS_NOT_TEXT exactly like a plain read.
|
|
100
|
+
return { text: await ctx.fs.readText(target, signal) };
|
|
101
|
+
}
|
|
102
|
+
// Mirror the capped :conflicts scan: byte range, binary sniff, strict
|
|
103
|
+
// decode over the last complete codepoint boundary. Errors match the
|
|
104
|
+
// plain-read codes so reconciliation's missing-file check and the
|
|
105
|
+
// tool result surface behave identically.
|
|
106
|
+
const bytes = await ctx.fs.readByteRange(target, { offset: 0, length: maxLength }, signal);
|
|
107
|
+
if (bytes.subarray(0, CONFLICT_BINARY_SAMPLE_BYTES).includes(0)) {
|
|
108
|
+
throw new FsError(`cannot read "${absolutePath}": binary file`, 'FS_NOT_TEXT');
|
|
109
|
+
}
|
|
110
|
+
let text;
|
|
111
|
+
try {
|
|
112
|
+
text = new TextDecoder('utf-8', { fatal: true }).decode(trimToCodepointBoundary(bytes));
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
throw new FsError(`cannot read "${absolutePath}": invalid UTF-8 text`, 'FS_NOT_TEXT');
|
|
116
|
+
}
|
|
117
|
+
return { text, truncatedAtLine: text.split('\n').length };
|
|
118
|
+
},
|
|
89
119
|
async writeFile(absolutePath, content, signal, sandboxPolicy) {
|
|
90
120
|
const target = await ctx.fs.resolve(absolutePath, signal !== undefined ? { signal } : undefined);
|
|
91
121
|
// Forward the write tool's resolved policy so a `conflict://` mutation
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAW,OAAO,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAW,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,4BAA4B,EAAE,eAAe,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAE/H,OAAO,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAC5C,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAA;AAC1D,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAG/C,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,eAAe,CAAA;AAC7B,cAAc,SAAS,CAAA;AACvB,cAAc,eAAe,CAAA;AAC7B,cAAc,qBAAqB,CAAA;AACnC,cAAc,0BAA0B,CAAA;AASxC;;;GAGG;AACH,MAAM,OAAO,mBAAoB,SAAQ,OAAO;IAC7B,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAA;IAChC,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;IAE/D,YAAY,GAAY;QACtB,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC,CAAA;IAC5B,CAAC;IAED,4EAA4E;IAC5E,QAAQ,CAAC,OAAwB;QAC/B,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;IACtC,CAAC;IAED,uEAAuE;IACvE,UAAU,CAAC,MAAc;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAA;IACvC,CAAC;IAED,+BAA+B;IAC/B,OAAO;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAA;IAC9B,CAAC;IAED,mFAAmF;IACnF,SAAS,CAAC,KAAa;QACrB,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;IACrC,CAAC;IAED,8DAA8D;IAC9D,OAAO,CAAC,KAAa,EAAE,OAAwB;QAC7C,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;IAC5C,CAAC;IAED,4DAA4D;IAC5D,KAAK,CAAC,KAAa,EAAE,OAAe,EAAE,OAAsB;QAC1D,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC;IAED,gFAAgF;IAChF,QAAQ,CAAC,MAAc,EAAE,KAAa,EAAE,OAAwB;QAC9D,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;IAED;;;OAGG;IACH,SAAS,CAAC,UAA8B;QACtC,MAAM,GAAG,GAAG,UAAU,IAAI,cAAc,CAAA;QACxC,IAAI,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACrC,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,GAAG,IAAI,eAAe,EAAE,CAAA;YAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;CACF;AAED,qDAAqD;AACrD,MAAM,CAAC,MAAM,IAAI,GAAG,eAAe,CAAA;AAEnC,kFAAkF;AAClF,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,CAAA;AAI5B,0EAA0E;AAC1E,SAAS,oBAAoB,CAAC,GAAY;IACxC,OAAO;QACL,KAAK,CAAC,QAAQ,CAAC,YAAoB,EAAE,MAAoB;YACvD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAChG,OAAO,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACxC,CAAC;QACD,KAAK,CAAC,cAAc,CAClB,YAAoB,EACpB,SAAiB,EACjB,MAAoB;YAEpB,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAChG,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;YAC9C,IAAI,IAAI,KAAK,SAAS;gBAAE,MAAM,IAAI,OAAO,CAAC,gBAAgB,YAAY,cAAc,EAAE,cAAc,CAAC,CAAA;YACrG,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM;gBAAE,MAAM,IAAI,OAAO,CAAC,gBAAgB,YAAY,uBAAuB,EAAE,qBAAqB,CAAC,CAAA;YACvH,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;gBACtD,mEAAmE;gBACnE,oDAAoD;gBACpD,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAA;YACxD,CAAC;YACD,sEAAsE;YACtE,qEAAqE;YACrE,kEAAkE;YAClE,0CAA0C;YAC1C,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,MAAM,CAAC,CAAA;YAC1F,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,4BAA4B,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAChE,MAAM,IAAI,OAAO,CAAC,gBAAgB,YAAY,gBAAgB,EAAE,aAAa,CAAC,CAAA;YAChF,CAAC;YACD,IAAI,IAAY,CAAA;YAChB,IAAI,CAAC;gBACH,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAA;YACzF,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,OAAO,CAAC,gBAAgB,YAAY,uBAAuB,EAAE,aAAa,CAAC,CAAA;YACvF,CAAC;YACD,OAAO,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAA;QAC3D,CAAC;QACD,KAAK,CAAC,SAAS,CAAC,YAAoB,EAAE,OAAe,EAAE,MAAoB,EAAE,aAAuB;YAClG,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAChG,uEAAuE;YACvE,qEAAqE;YACrE,MAAM,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,aAAmD,CAAC,CAAA;QACjH,CAAC;KACF,CAAA;AACH,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,KAAK,CAAC,GAAY;IAChC,MAAM,SAAS,GAAsB,EAAE,CAAA;IACvC,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC,GAAG,CAAC,CAAA;IAC5C,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE;QACd,OAAO,GAAG,EAAE;YACV,KAAK,MAAM,OAAO,IAAI,SAAS;gBAAE,OAAO,EAAE,CAAA;QAC5C,CAAC,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,uBAAuB,CAAC;QAC1D,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC;QACvD,MAAM,EAAE,oBAAoB,CAAC,GAAG,CAAC;KAClC,CAAC,CAAC,CAAC,CAAA;IAEJ,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,CAAA;IAC5B,MAAM,MAAM,GAAG;QACb,GAAG;QACH,WAAW,EAAE,CAAC,GAAW,EAAE,MAA+B,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC;KACpG,CAAA;IACD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAClE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IAC/D,2EAA2E;IAC3E,6EAA6E;IAC7E,wEAAwE;IACxE,2EAA2E;IAC3E,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,oBAAoB,CAAC;QACvD,WAAW,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;KACpE,CAAC,CAAC,CAAC,CAAA;AACN,CAAC;AAED,eAAe,KAAK,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hy-sde-org/dsh-internal-urls",
|
|
3
|
-
"version": "0.2.1-
|
|
3
|
+
"version": "0.2.1-rc.5",
|
|
4
4
|
"description": "FS-shaped internal URL schemes (conflict://, pr://, issue://, …) resolved through one registry behind the read/grep/write tools — a standalone service plugin for DeepSeek Harness with no upstream harness changes required.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -66,10 +66,10 @@
|
|
|
66
66
|
"url": "https://github.com/hy-sde/dsh-internal-urls/issues"
|
|
67
67
|
},
|
|
68
68
|
"peerDependencies": {
|
|
69
|
-
"@deepseek-ai/cordis": "~4.0.5
|
|
70
|
-
"@deepseek-ai/dsh-sandbox": "^0.2.1-
|
|
71
|
-
"@deepseek-ai/dsh-session-query": "^0.2.1-
|
|
72
|
-
"@deepseek-ai/dsh-subprocess": "^0.2.1-
|
|
69
|
+
"@deepseek-ai/cordis": "~4.0.5",
|
|
70
|
+
"@deepseek-ai/dsh-sandbox": "^0.2.1-rc.5",
|
|
71
|
+
"@deepseek-ai/dsh-session-query": "^0.2.1-rc.5",
|
|
72
|
+
"@deepseek-ai/dsh-subprocess": "^0.2.1-rc.5"
|
|
73
73
|
},
|
|
74
74
|
"peerDependenciesMeta": {
|
|
75
75
|
"@deepseek-ai/dsh-session-query": {
|
|
@@ -77,14 +77,14 @@
|
|
|
77
77
|
}
|
|
78
78
|
},
|
|
79
79
|
"devDependencies": {
|
|
80
|
-
"@deepseek-ai/cordis": "~4.0.5
|
|
81
|
-
"@deepseek-ai/dsh-fs": "^0.2.1-
|
|
82
|
-
"@deepseek-ai/dsh-llm": "^0.2.1-
|
|
83
|
-
"@deepseek-ai/dsh-sandbox": "^0.2.1-
|
|
84
|
-
"@deepseek-ai/dsh-subprocess": "^0.2.1-
|
|
85
|
-
"@deepseek-ai/dsh-system-prompt": "^0.2.1-
|
|
86
|
-
"@deepseek-ai/dsh-tools": "^0.2.1-
|
|
87
|
-
"@hy-sde-org/dsh-tool-fs-internal-urls": "^0.2.1-
|
|
80
|
+
"@deepseek-ai/cordis": "~4.0.5",
|
|
81
|
+
"@deepseek-ai/dsh-fs": "^0.2.1-rc.5",
|
|
82
|
+
"@deepseek-ai/dsh-llm": "^0.2.1-rc.5",
|
|
83
|
+
"@deepseek-ai/dsh-sandbox": "^0.2.1-rc.5",
|
|
84
|
+
"@deepseek-ai/dsh-subprocess": "^0.2.1-rc.5",
|
|
85
|
+
"@deepseek-ai/dsh-system-prompt": "^0.2.1-rc.5",
|
|
86
|
+
"@deepseek-ai/dsh-tools": "^0.2.1-rc.5",
|
|
87
|
+
"@hy-sde-org/dsh-tool-fs-internal-urls": "^0.2.1-rc.5",
|
|
88
88
|
"@types/node": "^24.0.0",
|
|
89
89
|
"typescript": "^5.9.3",
|
|
90
90
|
"vitest": "^3.2.7"
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
],
|
|
103
103
|
"homepage": "https://github.com/hy-sde/dsh-internal-urls#readme",
|
|
104
104
|
"dependencies": {
|
|
105
|
-
"@deepseek-ai/dsh-fs": "^0.2.1-
|
|
105
|
+
"@deepseek-ai/dsh-fs": "^0.2.1-rc.5"
|
|
106
106
|
},
|
|
107
107
|
"scripts": {
|
|
108
108
|
"clean": "rm -rf dist",
|