@vincemakes/kiso-code 0.1.48 → 1.0.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.
- package/dist/chat.js +31 -5
- package/dist/diff.d.ts +32 -0
- package/dist/diff.js +122 -0
- package/dist/index.js +9 -0
- package/package.json +14 -14
package/dist/chat.js
CHANGED
|
@@ -443,6 +443,23 @@ submitTurn) {
|
|
|
443
443
|
export async function chat(session, faux, input, autoCompact) {
|
|
444
444
|
let currentRun = null;
|
|
445
445
|
let cancelled = false;
|
|
446
|
+
// E group (the graceful-exit gate ③, R-G 0.1.48): the terminal can
|
|
447
|
+
// close MID-run — the stream 'end' fires while currentRun is set, so
|
|
448
|
+
// the EOT callback defers. eotSeen remembers it; each run's end
|
|
449
|
+
// re-evaluates the exit condition (the safe point), so the release
|
|
450
|
+
// always runs.
|
|
451
|
+
let eotSeen = false;
|
|
452
|
+
/** The exit condition, shared by the EOT callback and the deferred
|
|
453
|
+
* re-check: no pending ask, an empty line. currentRun is checked by
|
|
454
|
+
* the callers (the callback when 'end' fires; the run-end re-checks
|
|
455
|
+
* run only after currentRun was nulled). */
|
|
456
|
+
const exitAtEmptyPrompt = () => {
|
|
457
|
+
if (pendingAsk !== null || input.line() !== "")
|
|
458
|
+
return;
|
|
459
|
+
cancelled = true;
|
|
460
|
+
console.log("\n[exit requested]");
|
|
461
|
+
input.close();
|
|
462
|
+
};
|
|
446
463
|
const turn = (text) => new Promise((resolve, reject) => {
|
|
447
464
|
queued = Math.max(0, queued - 1); // a queued turn starts
|
|
448
465
|
const run = session.run(text);
|
|
@@ -471,6 +488,11 @@ export async function chat(session, faux, input, autoCompact) {
|
|
|
471
488
|
// chat to main's finally/catch, never an orphaned
|
|
472
489
|
// unhandled rejection from the IIFE.
|
|
473
490
|
failOnFauxExhaustion(last, faux, input);
|
|
491
|
+
// E group (the graceful-exit gate ③): the fd may have closed
|
|
492
|
+
// mid-run — the run's end is the safe point for the deferred
|
|
493
|
+
// exit, so the release always runs.
|
|
494
|
+
if (eotSeen)
|
|
495
|
+
exitAtEmptyPrompt();
|
|
474
496
|
// round 8: after EVERY turn the prompt is re-armed — the human
|
|
475
497
|
// never types blind after the first turn.
|
|
476
498
|
input.prompt();
|
|
@@ -517,11 +539,11 @@ export async function chat(session, faux, input, autoCompact) {
|
|
|
517
539
|
}
|
|
518
540
|
});
|
|
519
541
|
input.onEot(() => {
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
542
|
+
// E group (the graceful-exit gate ③): the 'end' may fire MID-run —
|
|
543
|
+
// the exit defers to the run's end (the re-checks below).
|
|
544
|
+
eotSeen = true;
|
|
545
|
+
if (!currentRun)
|
|
546
|
+
exitAtEmptyPrompt();
|
|
525
547
|
});
|
|
526
548
|
input.onEscape(() => {
|
|
527
549
|
if (currentRun) {
|
|
@@ -662,6 +684,10 @@ export async function chat(session, faux, input, autoCompact) {
|
|
|
662
684
|
const last = await consumeRun(session, recoveryRun, input, turnNo, faux, statusCb, submitTurn);
|
|
663
685
|
currentRun = null;
|
|
664
686
|
failOnFauxExhaustion(last, faux, input);
|
|
687
|
+
// E group (the graceful-exit gate ③): the same deferred re-check
|
|
688
|
+
// as the turn path — the recovery run's end is also a safe point.
|
|
689
|
+
if (eotSeen)
|
|
690
|
+
exitAtEmptyPrompt();
|
|
665
691
|
maybeAutoCompact(); // the ergonomics batch C8: the recovery run ended too — same check (awaited by the exit re-await)
|
|
666
692
|
}
|
|
667
693
|
if (cancelled) {
|
package/dist/diff.d.ts
ADDED
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* v2e — the diff renderer: edit/write changes as inline ± lines, zero
|
|
3
|
+
* dependencies, no syntax highlighting (the spec's scope line). Shown at
|
|
4
|
+
* the approval moment ONLY — the frozen summary stays one line (v2d's
|
|
5
|
+
* anti-leak principle), /last has the full data.
|
|
6
|
+
*
|
|
7
|
+
* edit_file diffs IN PLACE (the search→replace windows are known — no
|
|
8
|
+
* general engine needed); write_file does a row-level LCS over the old
|
|
9
|
+
* file (small files are the target). Context: 2 rows each side. The
|
|
10
|
+
* RENDERER truncates (18 head + 18 tail + "… N lines"); the stats come
|
|
11
|
+
* from the full diff.
|
|
12
|
+
*/
|
|
13
|
+
/** The diff block's per-row kind. */
|
|
14
|
+
export type DiffLine = {
|
|
15
|
+
kind: "-" | "+" | " ";
|
|
16
|
+
text: string;
|
|
17
|
+
};
|
|
18
|
+
export interface DiffResult {
|
|
19
|
+
/** The FULL diff (with context, not truncated) — the display truncates. */
|
|
20
|
+
lines: DiffLine[];
|
|
21
|
+
added: number;
|
|
22
|
+
removed: number;
|
|
23
|
+
}
|
|
24
|
+
/** The RENDERER's truncation: head + "… N lines (/last for full)" + tail. */
|
|
25
|
+
export declare function truncateDiff(diff: DiffLine[]): DiffLine[];
|
|
26
|
+
/** edit_file: the search→replace windows replace in place — the changed
|
|
27
|
+
* region is KNOWN, so the diff is the old window vs the new window,
|
|
28
|
+
* context from the surrounding file. */
|
|
29
|
+
export declare function editFileDiff(oldContent: string, search: string, replace: string): DiffResult;
|
|
30
|
+
/** write_file: a new file is all +; an existing file diffs row-level
|
|
31
|
+
* against its old content. */
|
|
32
|
+
export declare function writeFileDiff(oldContent: string | null, newContent: string): DiffResult;
|
package/dist/diff.js
ADDED
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* v2e — the diff renderer: edit/write changes as inline ± lines, zero
|
|
3
|
+
* dependencies, no syntax highlighting (the spec's scope line). Shown at
|
|
4
|
+
* the approval moment ONLY — the frozen summary stays one line (v2d's
|
|
5
|
+
* anti-leak principle), /last has the full data.
|
|
6
|
+
*
|
|
7
|
+
* edit_file diffs IN PLACE (the search→replace windows are known — no
|
|
8
|
+
* general engine needed); write_file does a row-level LCS over the old
|
|
9
|
+
* file (small files are the target). Context: 2 rows each side. The
|
|
10
|
+
* RENDERER truncates (18 head + 18 tail + "… N lines"); the stats come
|
|
11
|
+
* from the full diff.
|
|
12
|
+
*/
|
|
13
|
+
/** A line-level LCS diff — the classic two-row DP, ~small inputs. */
|
|
14
|
+
function lcsDiff(oldLines, newLines) {
|
|
15
|
+
const n = oldLines.length;
|
|
16
|
+
const m = newLines.length;
|
|
17
|
+
const dp = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
|
|
18
|
+
for (let i = n - 1; i >= 0; i -= 1) {
|
|
19
|
+
for (let j = m - 1; j >= 0; j -= 1) {
|
|
20
|
+
dp[i][j] = oldLines[i] === newLines[j] ? dp[i + 1][j + 1] + 1 : Math.max(dp[i + 1][j], dp[i][j + 1]);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
const out = [];
|
|
24
|
+
let i = 0;
|
|
25
|
+
let j = 0;
|
|
26
|
+
while (i < n && j < m) {
|
|
27
|
+
if (oldLines[i] === newLines[j]) {
|
|
28
|
+
out.push({ kind: " ", text: oldLines[i] });
|
|
29
|
+
i += 1;
|
|
30
|
+
j += 1;
|
|
31
|
+
}
|
|
32
|
+
else if (dp[i + 1][j] >= dp[i][j + 1]) {
|
|
33
|
+
out.push({ kind: "-", text: oldLines[i] });
|
|
34
|
+
i += 1;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
out.push({ kind: "+", text: newLines[j] });
|
|
38
|
+
j += 1;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
while (i < n) {
|
|
42
|
+
out.push({ kind: "-", text: oldLines[i] });
|
|
43
|
+
i += 1;
|
|
44
|
+
}
|
|
45
|
+
while (j < m) {
|
|
46
|
+
out.push({ kind: "+", text: newLines[j] });
|
|
47
|
+
j += 1;
|
|
48
|
+
}
|
|
49
|
+
return out;
|
|
50
|
+
}
|
|
51
|
+
/** Keep 2 context rows around each change — the unified-style window. */
|
|
52
|
+
function withContext(diff) {
|
|
53
|
+
const out = [];
|
|
54
|
+
let lastAdded = -10;
|
|
55
|
+
for (let k = 0; k < diff.length; k += 1) {
|
|
56
|
+
if (diff[k].kind === " ")
|
|
57
|
+
continue;
|
|
58
|
+
const from = Math.max(0, k - 2);
|
|
59
|
+
const to = Math.min(diff.length - 1, k + 2);
|
|
60
|
+
for (let c = from; c <= to; c += 1) {
|
|
61
|
+
if (c > lastAdded) {
|
|
62
|
+
out.push(diff[c]);
|
|
63
|
+
lastAdded = c;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
lastAdded = to;
|
|
67
|
+
}
|
|
68
|
+
return out;
|
|
69
|
+
}
|
|
70
|
+
const MAX_DIFF_LINES = 40; // the RENDERED cap
|
|
71
|
+
const TRUNCATE_KEEP = 18;
|
|
72
|
+
/** The RENDERER's truncation: head + "… N lines (/last for full)" + tail. */
|
|
73
|
+
export function truncateDiff(diff) {
|
|
74
|
+
if (diff.length <= MAX_DIFF_LINES)
|
|
75
|
+
return diff;
|
|
76
|
+
const omitted = diff.length - 2 * TRUNCATE_KEEP;
|
|
77
|
+
return [
|
|
78
|
+
...diff.slice(0, TRUNCATE_KEEP),
|
|
79
|
+
{ kind: " ", text: `… ${omitted} lines (/last for full)` },
|
|
80
|
+
...diff.slice(diff.length - TRUNCATE_KEEP),
|
|
81
|
+
];
|
|
82
|
+
}
|
|
83
|
+
function stats(diff) {
|
|
84
|
+
let added = 0;
|
|
85
|
+
let removed = 0;
|
|
86
|
+
for (const d of diff) {
|
|
87
|
+
if (d.kind === "+")
|
|
88
|
+
added += 1;
|
|
89
|
+
else if (d.kind === "-")
|
|
90
|
+
removed += 1;
|
|
91
|
+
}
|
|
92
|
+
return { added, removed };
|
|
93
|
+
}
|
|
94
|
+
/** edit_file: the search→replace windows replace in place — the changed
|
|
95
|
+
* region is KNOWN, so the diff is the old window vs the new window,
|
|
96
|
+
* context from the surrounding file. */
|
|
97
|
+
export function editFileDiff(oldContent, search, replace) {
|
|
98
|
+
const oldLines = oldContent.split("\n");
|
|
99
|
+
const searchLines = search.split("\n");
|
|
100
|
+
const replaceLines = replace.split("\n");
|
|
101
|
+
// Locate the search window (the first occurrence — the edit tool's own
|
|
102
|
+
// semantics); no occurrence → the whole file is the old side.
|
|
103
|
+
let at = -1;
|
|
104
|
+
for (let i = 0; i + searchLines.length <= oldLines.length; i += 1) {
|
|
105
|
+
if (oldLines.slice(i, i + searchLines.length).join("\n") === search) {
|
|
106
|
+
at = i;
|
|
107
|
+
break;
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
const lines = at < 0 ? withContext(lcsDiff(oldLines, replaceLines)) : withContext(lcsDiff(oldLines, [...oldLines.slice(0, at), ...replaceLines, ...oldLines.slice(at + searchLines.length)]));
|
|
111
|
+
return { lines, ...stats(lines) };
|
|
112
|
+
}
|
|
113
|
+
/** write_file: a new file is all +; an existing file diffs row-level
|
|
114
|
+
* against its old content. */
|
|
115
|
+
export function writeFileDiff(oldContent, newContent) {
|
|
116
|
+
if (oldContent === null) {
|
|
117
|
+
const lines = newContent.split("\n").map((text) => ({ kind: "+", text }));
|
|
118
|
+
return { lines, added: lines.length, removed: 0 };
|
|
119
|
+
}
|
|
120
|
+
const lines = withContext(lcsDiff(oldContent.split("\n"), newContent.split("\n")));
|
|
121
|
+
return { lines, ...stats(lines) };
|
|
122
|
+
}
|
package/dist/index.js
CHANGED
|
@@ -395,6 +395,15 @@ async function makeAgent(sessionId, input, modelFlag) {
|
|
|
395
395
|
return createAgent(definition);
|
|
396
396
|
}
|
|
397
397
|
async function main() {
|
|
398
|
+
// E group (the graceful-exit gate ③, R-G 0.1.48): a terminal closing
|
|
399
|
+
// turns the in-flight stdout/stderr writes into EIO, and node's
|
|
400
|
+
// unhandled 'error' event on the WriteStream kills the process —
|
|
401
|
+
// mid-exit the release never runs (the 60-byte residue the gate
|
|
402
|
+
// caught). The bytes are undeliverable anyway (the terminal is
|
|
403
|
+
// gone): the error must never abort the exit sequence. The listener
|
|
404
|
+
// swallows it — the standard "the stream may die under me" idiom.
|
|
405
|
+
process.stdout.on("error", () => { });
|
|
406
|
+
process.stderr.on("error", () => { });
|
|
398
407
|
// Modes: --mode <name> wins over KISO_MODE — both applied before the
|
|
399
408
|
// first makeAgent (the tier extensions read `current` live). The flag
|
|
400
409
|
// is stripped from the positional args, so it works in any position.
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vincemakes/kiso-code",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"description": "kiso CLI
|
|
3
|
+
"version": "1.0.0",
|
|
4
|
+
"description": "kiso CLI \u2014 the coding-agent reference product: kiso chat / kiso resume / kiso sessions.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
7
7
|
"bin": {
|
|
@@ -18,18 +18,18 @@
|
|
|
18
18
|
"test": "vitest run"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@vincemakes/kiso-core": "0.
|
|
22
|
-
"@vincemakes/kiso-evals": "0.
|
|
23
|
-
"@vincemakes/kiso-mcp-ext": "0.
|
|
24
|
-
"@vincemakes/kiso-provider-anthropic": "0.
|
|
25
|
-
"@vincemakes/kiso-provider-openai": "0.
|
|
26
|
-
"@vincemakes/kiso-runtime": "0.
|
|
27
|
-
"@vincemakes/kiso-skills-ext": "0.
|
|
28
|
-
"@vincemakes/kiso-subagent-ext": "0.
|
|
29
|
-
"@vincemakes/kiso-task-ext": "0.
|
|
30
|
-
"@vincemakes/kiso-tools-node": "0.
|
|
31
|
-
"@vincemakes/kiso-tui": "0.
|
|
32
|
-
"@vincemakes/kiso-tui-cells": "0.
|
|
21
|
+
"@vincemakes/kiso-core": "1.0.0",
|
|
22
|
+
"@vincemakes/kiso-evals": "1.0.0",
|
|
23
|
+
"@vincemakes/kiso-mcp-ext": "1.0.0",
|
|
24
|
+
"@vincemakes/kiso-provider-anthropic": "1.0.0",
|
|
25
|
+
"@vincemakes/kiso-provider-openai": "1.0.0",
|
|
26
|
+
"@vincemakes/kiso-runtime": "1.0.0",
|
|
27
|
+
"@vincemakes/kiso-skills-ext": "1.0.0",
|
|
28
|
+
"@vincemakes/kiso-subagent-ext": "1.0.0",
|
|
29
|
+
"@vincemakes/kiso-task-ext": "1.0.0",
|
|
30
|
+
"@vincemakes/kiso-tools-node": "1.0.0",
|
|
31
|
+
"@vincemakes/kiso-tui": "1.0.0",
|
|
32
|
+
"@vincemakes/kiso-tui-cells": "1.0.0"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/node": "^26.1.2",
|