@gaunt-sloth/core 2.0.0-beta.2 → 2.0.0-beta.3
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/config/shell-policy.d.ts +2 -2
- package/dist/config/shell-policy.js +3 -3
- package/dist/config/tool-descriptions.d.ts +5 -5
- package/dist/config/tool-descriptions.js +3 -3
- package/dist/core/GthAbstractAgent.d.ts +1 -1
- package/dist/core/GthAbstractAgent.js +63 -3
- package/dist/core/GthAbstractAgent.js.map +1 -1
- package/dist/core/GthAgentRunner.d.ts +9 -9
- package/dist/core/GthAgentRunner.js +62 -13
- package/dist/core/GthAgentRunner.js.map +1 -1
- package/dist/core/GthLangChainAgent.js +1 -1
- package/dist/core/GthLangChainAgent.js.map +1 -1
- package/dist/core/reasoningBlocks.d.ts +4 -6
- package/dist/core/reasoningBlocks.js +4 -6
- package/dist/core/reasoningBlocks.js.map +1 -1
- package/dist/core/shell/ShellCommandFailedError.d.ts +4 -4
- package/dist/core/shell/ShellCommandFailedError.js +4 -4
- package/dist/core/shell/openWorld.d.ts +4 -3
- package/dist/core/shell/openWorld.js +4 -3
- package/dist/core/shell/openWorld.js.map +1 -1
- package/dist/core/toolDisplay.d.ts +49 -2
- package/dist/core/toolDisplay.js +137 -19
- package/dist/core/toolDisplay.js.map +1 -1
- package/dist/core/types.d.ts +6 -6
- package/dist/providers/geminiSchemaSanitizer.d.ts +2 -2
- package/dist/providers/geminiSchemaSanitizer.js +2 -2
- package/dist/providers/geminiThinking.d.ts +10 -5
- package/dist/providers/geminiThinking.js +10 -5
- package/dist/providers/geminiThinking.js.map +1 -1
- package/dist/runtime/askStructured.d.ts +22 -0
- package/dist/runtime/askStructured.js +53 -0
- package/dist/runtime/askStructured.js.map +1 -1
- package/dist/utils/aiignoreUtils.d.ts +6 -0
- package/dist/utils/aiignoreUtils.js +69 -1
- package/dist/utils/aiignoreUtils.js.map +1 -1
- package/dist/utils/displayWidth.d.ts +10 -5
- package/dist/utils/displayWidth.js +148 -54
- package/dist/utils/displayWidth.js.map +1 -1
- package/dist/utils/llmUtils.d.ts +1 -1
- package/dist/utils/llmUtils.js +1 -1
- package/dist/utils/systemPromptNotes.d.ts +3 -3
- package/dist/utils/systemPromptNotes.js +3 -3
- package/dist/utils/vertexaiUtils.js +100 -1
- package/dist/utils/vertexaiUtils.js.map +1 -1
- package/package.json +4 -3
|
@@ -65,6 +65,28 @@ export type StructuredFailureKind = 'timeout' | 'unparseable' | 'call-failed';
|
|
|
65
65
|
* carries it, so a different value here reports a genuine timeout as `call-failed`.
|
|
66
66
|
*/
|
|
67
67
|
export declare function classifyStructuredFailure(error: string, timeoutMs: number): StructuredFailureKind;
|
|
68
|
+
/**
|
|
69
|
+
* Say WHICH of {@link askStructured}'s three failures happened, in one sentence a reader can act on.
|
|
70
|
+
*
|
|
71
|
+
* The two a reader has to tell apart first are a provider that never answered and a provider that
|
|
72
|
+
* refused the request: they want opposite responses — re-run the one, investigate the other — and
|
|
73
|
+
* from the outside they arrive as the same red. Naming the class is what stops a real rejection
|
|
74
|
+
* being shrugged off as flakiness, which is how a guard stops guarding with nobody deciding to
|
|
75
|
+
* remove it.
|
|
76
|
+
*
|
|
77
|
+
* There is no `default` arm and no fallback sentence, deliberately. The module-internal
|
|
78
|
+
* `STRUCTURED_FAILURE_SENTENCES` map, declared above, is typed by the union, so an unhandled kind
|
|
79
|
+
* cannot reach here — the compiler rejects the map instead. A defensive arm would only catch a case
|
|
80
|
+
* the build already refuses, at the price of hiding the compile error that is the real signal.
|
|
81
|
+
* It is named here rather than linked because it is not exported, and a `{@link}` to an
|
|
82
|
+
* undocumented symbol renders as dead text in the API reference.
|
|
83
|
+
*
|
|
84
|
+
* @param error The `error` from a `{ ok: false }` {@link AskStructuredResult}.
|
|
85
|
+
* @param timeoutMs The budget passed to that same {@link askStructured} call — as for
|
|
86
|
+
* {@link classifyStructuredFailure}, a different value here reports a genuine timeout as
|
|
87
|
+
* `call-failed`.
|
|
88
|
+
*/
|
|
89
|
+
export declare function describeStructuredFailure(error: string, timeoutMs: number): string;
|
|
68
90
|
/** Inputs to {@link askStructured}. The caller supplies the model (via config), the two message
|
|
69
91
|
* texts, and an optional timeout — the Zod schema is a separate positional argument so `<T>` can
|
|
70
92
|
* be inferred from it. */
|
|
@@ -64,6 +64,59 @@ export function classifyStructuredFailure(error, timeoutMs) {
|
|
|
64
64
|
return 'unparseable';
|
|
65
65
|
return 'call-failed';
|
|
66
66
|
}
|
|
67
|
+
/**
|
|
68
|
+
* The sentence each {@link StructuredFailureKind} is reported as — the wording a reader of a red run
|
|
69
|
+
* actually sees, and the half of {@link describeStructuredFailure} that can be wrong without any
|
|
70
|
+
* mechanism being wrong.
|
|
71
|
+
*
|
|
72
|
+
* It lives here, beside the classifier it is keyed on, for two reasons that are really one. The
|
|
73
|
+
* `Record` is annotated with the union, so the compiler checks the map is **total at its definition
|
|
74
|
+
* site**: adding a kind to {@link StructuredFailureKind} without giving it a sentence is a build
|
|
75
|
+
* error rather than a message that reads `undefined` at the moment someone needs it. And a sentence
|
|
76
|
+
* that sits beside the classifier is reachable by the unit suite, so each one is pinned to the class
|
|
77
|
+
* it names — a map the tests cannot see can have its bodies exchanged, and the failure that results
|
|
78
|
+
* is a stall announcing itself as a rejection, which is the exact confusion these sentences exist to
|
|
79
|
+
* end.
|
|
80
|
+
*
|
|
81
|
+
* Each entry receives the raw `error` and the budget the call was made with, so the sentence can
|
|
82
|
+
* quote both rather than describe them.
|
|
83
|
+
*/
|
|
84
|
+
const STRUCTURED_FAILURE_SENTENCES = {
|
|
85
|
+
timeout: (error, timeoutMs) => `STALLED: the provider returned no response within the ${timeoutMs}ms call budget. ` +
|
|
86
|
+
'Nothing was rejected and nothing was parsed, so this is NOT the schema guard firing — it ' +
|
|
87
|
+
'is the provider failing to answer. ' +
|
|
88
|
+
`askStructured said: ${error}`,
|
|
89
|
+
unparseable: (error) => "REJECTED BY OUR OWN SCHEMA: the provider answered, and the answer failed this case's " +
|
|
90
|
+
'schema. This IS the guard firing — the null-vs-absent half. ' +
|
|
91
|
+
`askStructured said: ${error}`,
|
|
92
|
+
'call-failed': (error) => 'REJECTED BEFORE ANY ANSWER: the call failed outright. A 400 naming `required` IS the ' +
|
|
93
|
+
'guard firing — the strict-schema half; anything else is auth, transport or configuration. ' +
|
|
94
|
+
`askStructured said: ${error}`,
|
|
95
|
+
};
|
|
96
|
+
/**
|
|
97
|
+
* Say WHICH of {@link askStructured}'s three failures happened, in one sentence a reader can act on.
|
|
98
|
+
*
|
|
99
|
+
* The two a reader has to tell apart first are a provider that never answered and a provider that
|
|
100
|
+
* refused the request: they want opposite responses — re-run the one, investigate the other — and
|
|
101
|
+
* from the outside they arrive as the same red. Naming the class is what stops a real rejection
|
|
102
|
+
* being shrugged off as flakiness, which is how a guard stops guarding with nobody deciding to
|
|
103
|
+
* remove it.
|
|
104
|
+
*
|
|
105
|
+
* There is no `default` arm and no fallback sentence, deliberately. The module-internal
|
|
106
|
+
* `STRUCTURED_FAILURE_SENTENCES` map, declared above, is typed by the union, so an unhandled kind
|
|
107
|
+
* cannot reach here — the compiler rejects the map instead. A defensive arm would only catch a case
|
|
108
|
+
* the build already refuses, at the price of hiding the compile error that is the real signal.
|
|
109
|
+
* It is named here rather than linked because it is not exported, and a `{@link}` to an
|
|
110
|
+
* undocumented symbol renders as dead text in the API reference.
|
|
111
|
+
*
|
|
112
|
+
* @param error The `error` from a `{ ok: false }` {@link AskStructuredResult}.
|
|
113
|
+
* @param timeoutMs The budget passed to that same {@link askStructured} call — as for
|
|
114
|
+
* {@link classifyStructuredFailure}, a different value here reports a genuine timeout as
|
|
115
|
+
* `call-failed`.
|
|
116
|
+
*/
|
|
117
|
+
export function describeStructuredFailure(error, timeoutMs) {
|
|
118
|
+
return STRUCTURED_FAILURE_SENTENCES[classifyStructuredFailure(error, timeoutMs)](error, timeoutMs);
|
|
119
|
+
}
|
|
67
120
|
/**
|
|
68
121
|
* Ask the configured model for a single schema-validated object — a non-agentic structured-output
|
|
69
122
|
* call that mirrors their mechanism (see the module doc) and never throws.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"askStructured.js","sourceRoot":"","sources":["../../src/runtime/askStructured.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"askStructured.js","sourceRoot":"","sources":["../../src/runtime/askStructured.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,12 @@
|
|
|
11
11
|
export declare function loadAiignorePatterns(rootDir: string): string[];
|
|
12
12
|
/**
|
|
13
13
|
* Check if a file path should be ignored based on aiignore patterns
|
|
14
|
+
*
|
|
15
|
+
* Matching follows `.gitignore` rules — a bare pattern applies at every depth, a pattern with a
|
|
16
|
+
* separator is anchored to `rootDir`, and either kind hides the subtree beneath whatever it
|
|
17
|
+
* matches. The module-private `expandPattern` above implements that mapping and documents the two
|
|
18
|
+
* deliberate departures from `.gitignore`.
|
|
19
|
+
*
|
|
14
20
|
* @param filePath - The file path to check
|
|
15
21
|
* @param rootDir - The root directory for relative pattern matching
|
|
16
22
|
* @param customPatterns - Optional custom patterns to use instead of loading from file
|
|
@@ -32,8 +32,72 @@ export function loadAiignorePatterns(rootDir) {
|
|
|
32
32
|
return [];
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* Expand one `.aiignore` line into the glob patterns that implement it.
|
|
37
|
+
*
|
|
38
|
+
* `.aiignore` is documented as using `.gitignore` rules, and that is the contract this function
|
|
39
|
+
* keeps. `path.matchesGlob` on its own does not: its `*` never crosses `/`, so a bare pattern is
|
|
40
|
+
* silently root-only, and a trailing slash matches nothing at all. Both failures are silent and
|
|
41
|
+
* both point the wrong way for a privacy boundary — the user writes a line, sees no error, and
|
|
42
|
+
* believes a file is hidden from the agent when it is not.
|
|
43
|
+
*
|
|
44
|
+
* The three rules, each mapping to one arm below:
|
|
45
|
+
*
|
|
46
|
+
* - **A pattern with no separator applies at every depth.** `*.log` hides `app.log` and
|
|
47
|
+
* `sub/app.log` alike, so it gains a globstar prefix. That prefixed form also matches at the
|
|
48
|
+
* root, so the one arm covers both depths.
|
|
49
|
+
* - **A pattern containing a separator is anchored to the root.** `build/out` hides
|
|
50
|
+
* `build/out`, never `src/build/out`. A leading `/` is an explicit spelling of the same thing and
|
|
51
|
+
* is stripped, since relative paths never carry one.
|
|
52
|
+
* - **Whatever a pattern hides, it hides the subtree beneath it.** This is the `/**` arm, and it is
|
|
53
|
+
* what makes a single line hide a directory's name *and* its contents. Without it the name is
|
|
54
|
+
* withheld from a listing while every file below it stays readable — the shape of the leak this
|
|
55
|
+
* boundary exists to prevent.
|
|
56
|
+
*
|
|
57
|
+
* DELIBERATE DEVIATION: a trailing slash is treated as an ordinary pattern rather than as
|
|
58
|
+
* "directories only", so `dist/` also hides a plain *file* named `dist`. Honouring the
|
|
59
|
+
* directory-only half needs the entry's type, which a path string does not carry and which the
|
|
60
|
+
* callers do not supply. Erring toward hiding costs a rare false positive the user can see and
|
|
61
|
+
* rename around; erring the other way silently exposes what someone asked to be hidden.
|
|
62
|
+
*
|
|
63
|
+
* NOT SUPPORTED: re-inclusion (`!pattern`). A leading `!` is matched literally, so such a line
|
|
64
|
+
* hides a file whose name really does start with `!` and un-hides nothing. That is the safe
|
|
65
|
+
* direction, and it is stated in the user documentation rather than left to be discovered.
|
|
66
|
+
*
|
|
67
|
+
* @param pattern - One non-empty, non-comment line from `.aiignore` or `aiignore.patterns`
|
|
68
|
+
* @returns Glob patterns to test the relative path against; empty when the line carries no pattern
|
|
69
|
+
*/
|
|
70
|
+
function expandPattern(pattern) {
|
|
71
|
+
// A trailing slash is gitignore's directory marker; strip it (see DELIBERATE DEVIATION above).
|
|
72
|
+
let body = pattern.replace(/\/+$/, '');
|
|
73
|
+
// A leading slash anchors to the root. Relative paths never carry one, so it must come off or
|
|
74
|
+
// the pattern matches nothing.
|
|
75
|
+
let anchored = false;
|
|
76
|
+
if (body.startsWith('/')) {
|
|
77
|
+
body = body.replace(/^\/+/, '');
|
|
78
|
+
anchored = true;
|
|
79
|
+
}
|
|
80
|
+
// A line that was nothing but slashes carries no pattern. Returning no arms is what keeps it
|
|
81
|
+
// from collapsing into `**`, which would hide the entire tree.
|
|
82
|
+
if (body.length === 0) {
|
|
83
|
+
return [];
|
|
84
|
+
}
|
|
85
|
+
// An interior separator anchors the pattern; its absence lets it apply at any depth.
|
|
86
|
+
if (body.includes('/')) {
|
|
87
|
+
anchored = true;
|
|
88
|
+
}
|
|
89
|
+
const base = anchored ? body : `**/${body}`;
|
|
90
|
+
// The entry itself, then everything beneath it.
|
|
91
|
+
return [base, `${base}/**`];
|
|
92
|
+
}
|
|
35
93
|
/**
|
|
36
94
|
* Check if a file path should be ignored based on aiignore patterns
|
|
95
|
+
*
|
|
96
|
+
* Matching follows `.gitignore` rules — a bare pattern applies at every depth, a pattern with a
|
|
97
|
+
* separator is anchored to `rootDir`, and either kind hides the subtree beneath whatever it
|
|
98
|
+
* matches. The module-private `expandPattern` above implements that mapping and documents the two
|
|
99
|
+
* deliberate departures from `.gitignore`.
|
|
100
|
+
*
|
|
37
101
|
* @param filePath - The file path to check
|
|
38
102
|
* @param rootDir - The root directory for relative pattern matching
|
|
39
103
|
* @param customPatterns - Optional custom patterns to use instead of loading from file
|
|
@@ -54,7 +118,11 @@ export function shouldIgnoreFile(filePath, rootDir, customPatterns = undefined,
|
|
|
54
118
|
// Check if any pattern matches
|
|
55
119
|
for (const pattern of patterns) {
|
|
56
120
|
try {
|
|
57
|
-
|
|
121
|
+
// Globs are built with `/` separators regardless of platform: win32's matchesGlob resolves a
|
|
122
|
+
// backslash-separated path against them, so the relative path is passed through untouched
|
|
123
|
+
// rather than rewritten (a rewrite would split a POSIX filename that legitimately contains a
|
|
124
|
+
// backslash into two segments).
|
|
125
|
+
if (expandPattern(pattern).some((glob) => path.matchesGlob(relativePath, glob))) {
|
|
58
126
|
debugLog(`File ignored by pattern '${pattern}': ${relativePath}`);
|
|
59
127
|
return true;
|
|
60
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"aiignoreUtils.js","sourceRoot":"","sources":["../../src/utils/aiignoreUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAEpD;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAEvD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QAC9B,QAAQ,CAAC,MAAM,aAAa,kBAAkB,YAAY,EAAE,CAAC,CAAC;QAC9D,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAY,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,OAAO;aACrB,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9D,QAAQ,CAAC,UAAU,QAAQ,CAAC,MAAM,kBAAkB,aAAa,EAAE,CAAC,CAAC;QACrE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,QAAQ,CACN,iBAAiB,aAAa,KAAK,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC5F,CAAC;QACF,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"aiignoreUtils.js","sourceRoot":"","sources":["../../src/utils/aiignoreUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Terminal columns `text` occupies. Zero-width clusters (combining marks, default-ignorables)
|
|
3
3
|
* count 0, wide clusters (CJK, emoji, fullwidth forms) count 2, everything else 1. ANSI escape
|
|
4
|
-
* sequences are not counted, so a pre-coloured string measures as what the user sees —
|
|
5
|
-
* slices below
|
|
4
|
+
* sequences are not counted, so a pre-coloured string measures as what the user sees — and the
|
|
5
|
+
* slices below share that awareness, so a coloured string may be handed to either of them.
|
|
6
6
|
*/
|
|
7
7
|
export declare function displayWidth(text: string): number;
|
|
8
8
|
/**
|
|
@@ -46,8 +46,13 @@ export declare function sliceToMaxWidth(text: string, maxWidth: number): string;
|
|
|
46
46
|
* the tail, lose the head. The mirror of {@link sliceToWidth}, for values whose end is the
|
|
47
47
|
* informative part (a path's leaf directory).
|
|
48
48
|
*
|
|
49
|
-
* This one materialises the
|
|
50
|
-
* derivable from the front. Its callers pass a path or a model id, so the input is a line
|
|
51
|
-
* than a file.
|
|
49
|
+
* This one materialises the pieces: it walks backwards, and both cluster and sequence boundaries
|
|
50
|
+
* are only derivable from the front. Its callers pass a path or a model id, so the input is a line
|
|
51
|
+
* rather than a file.
|
|
52
|
+
*
|
|
53
|
+
* Keeping the END means the escapes that OPENED a style sit in the discarded head and go with it,
|
|
54
|
+
* so a tail comes back in the terminal's default styling. Only the sequences inside the kept span
|
|
55
|
+
* are carried, which leaves the tail ending in whatever state the whole string ended in — the cut
|
|
56
|
+
* introduces no bleed of its own.
|
|
52
57
|
*/
|
|
53
58
|
export declare function sliceEndToWidth(text: string, maxWidth: number): string;
|
|
@@ -23,24 +23,38 @@
|
|
|
23
23
|
* rules below are defined over, so the two agree by construction and a sliced string's width is
|
|
24
24
|
* exactly the sum of the widths of the clusters kept.
|
|
25
25
|
*
|
|
26
|
-
* ## What the slices
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
42
|
-
*
|
|
43
|
-
*
|
|
26
|
+
* ## What the slices cut: text, with its escapes carried along
|
|
27
|
+
*
|
|
28
|
+
* The slices are ANSI-aware, and they agree with {@link displayWidth} by construction. An escape
|
|
29
|
+
* sequence is not one cluster — the terminal swallows it whole, but `ESC`, `[`, `3`, `5`, `m`
|
|
30
|
+
* segment as five, four of them printable. A walk that spent budget on those printable bytes
|
|
31
|
+
* would answer a different question from the ruler it is paired with, since `string-width` strips
|
|
32
|
+
* escapes before measuring; and at a budget narrower than the content it would cut INSIDE a
|
|
33
|
+
* sequence, handing the terminal a mutilated escape.
|
|
34
|
+
*
|
|
35
|
+
* So a sequence is an indivisible token costing zero columns. It is kept whole, and it is carried
|
|
36
|
+
* along with the text it introduces, so a truncated coloured string still renders coloured. A
|
|
37
|
+
* sequence whose text is entirely cut away is dropped with that text rather than left dangling at
|
|
38
|
+
* the end of the result, where it would style nothing and leak its colour into whatever the caller
|
|
39
|
+
* appends next — an ellipsis, the next parameter, the status tag.
|
|
40
|
+
*
|
|
41
|
+
* **The result stays a genuine prefix (or suffix) of the input: no reset is appended.** Terminal
|
|
42
|
+
* state belongs to the surface that owns the line, and both render surfaces already open and close
|
|
43
|
+
* their own styling around each line they draw; an `ESC[0m` injected at the cut would close that
|
|
44
|
+
* wrapper early and un-style everything after it.
|
|
45
|
+
*
|
|
46
|
+
* Because escapes cost no budget, the clusters kept sum to the width of the string as
|
|
47
|
+
* {@link displayWidth} measures it, so the cluster walk decides "does the whole string fit?" on
|
|
48
|
+
* its own — incrementally, stopping at the budget, WITHOUT a pre-measurement of the input. That is
|
|
49
|
+
* what keeps a megabyte-long preview line from being measured end to end before it is cut at
|
|
50
|
+
* column 200, and it is why the escape-bearing case needs no separate ruler.
|
|
51
|
+
*
|
|
52
|
+
* The one input the two do not agree on is an escape sequence placed INSIDE a grapheme cluster,
|
|
53
|
+
* between a base character and its combining mark. The measurement strips the sequence and joins
|
|
54
|
+
* what is left into one cluster; the walk cannot, because the sequence has already broken the
|
|
55
|
+
* cluster in two. The walk then counts such a string WIDER than it renders, which spends budget
|
|
56
|
+
* that is not needed and can leave a slice short — never over its budget, which is the direction
|
|
57
|
+
* that matters.
|
|
44
58
|
*
|
|
45
59
|
* ## Why ambiguous-width characters stay NARROW — and the one place they must not
|
|
46
60
|
*
|
|
@@ -75,8 +89,8 @@ const GRAPHEME_SEGMENTER = new Intl.Segmenter(undefined, { granularity: 'graphem
|
|
|
75
89
|
/**
|
|
76
90
|
* Terminal columns `text` occupies. Zero-width clusters (combining marks, default-ignorables)
|
|
77
91
|
* count 0, wide clusters (CJK, emoji, fullwidth forms) count 2, everything else 1. ANSI escape
|
|
78
|
-
* sequences are not counted, so a pre-coloured string measures as what the user sees —
|
|
79
|
-
* slices below
|
|
92
|
+
* sequences are not counted, so a pre-coloured string measures as what the user sees — and the
|
|
93
|
+
* slices below share that awareness, so a coloured string may be handed to either of them.
|
|
80
94
|
*/
|
|
81
95
|
export function displayWidth(text) {
|
|
82
96
|
return stringWidth(text);
|
|
@@ -104,22 +118,78 @@ export function firstCluster(text) {
|
|
|
104
118
|
return segment;
|
|
105
119
|
return '';
|
|
106
120
|
}
|
|
107
|
-
/** The clusters of `text`, in order — the only unit either slice is allowed to cut between. */
|
|
108
|
-
function clusters(text) {
|
|
109
|
-
const out = [];
|
|
110
|
-
for (const { segment } of GRAPHEME_SEGMENTER.segment(text))
|
|
111
|
-
out.push(segment);
|
|
112
|
-
return out;
|
|
113
|
-
}
|
|
114
121
|
/**
|
|
115
|
-
*
|
|
116
|
-
* `
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
122
|
+
* The code points a sequence can begin with: `ESC` (U+001B) and the one-byte `CSI` (U+009B) — the
|
|
123
|
+
* same two characters `string-width` itself tests for before it strips.
|
|
124
|
+
*/
|
|
125
|
+
const ESCAPE_INTRODUCER_CODES = new Set([0x00_1b, 0x00_9b]);
|
|
126
|
+
/**
|
|
127
|
+
* One ANSI escape sequence — an OSC string, or a CSI/two-character sequence — as a source pattern.
|
|
128
|
+
*
|
|
129
|
+
* This is the grammar of `ansi-regex`, which is what `strip-ansi` matches with and therefore what
|
|
130
|
+
* `string-width` removes before it measures. It is reproduced here rather than imported so the walk
|
|
131
|
+
* can never end up on a DIFFERENT copy of that package from the one `string-width` resolves: two
|
|
132
|
+
* versions in one tree would let the ruler and the walk disagree about where a sequence ends, which
|
|
133
|
+
* is the exact defect this module's ANSI-awareness exists to prevent. The spec cross-checks this
|
|
134
|
+
* pattern against `strip-ansi` itself, so a divergence fails loudly rather than silently.
|
|
135
|
+
*
|
|
136
|
+
* The OSC payload stops at the first terminator character instead of scanning ahead for one, so an
|
|
137
|
+
* unterminated OSC introducer cannot rescan the rest of the input — which is what keeps the walk
|
|
138
|
+
* linear on a long line full of half-written escapes rather than quadratic.
|
|
139
|
+
*/
|
|
140
|
+
const ANSI_SEQUENCE_SOURCE = [
|
|
141
|
+
'(?:\\u001B\\][^\\u0007\\u001B\\u009C]*(?:\\u0007|\\u001B\\u005C|\\u009C))',
|
|
142
|
+
'[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]',
|
|
143
|
+
].join('|');
|
|
144
|
+
/**
|
|
145
|
+
* The same grammar anchored with the sticky flag, so it answers "does a sequence START here?" in
|
|
146
|
+
* one step at a known index rather than searching forward for the next one anywhere in the string.
|
|
147
|
+
*
|
|
148
|
+
* Module-level, because compiling it per slice would tax the common case that never uses it. Its
|
|
149
|
+
* `lastIndex` is written immediately before every `exec`, with nothing in between, so a second walk
|
|
150
|
+
* that begins while the first is suspended cannot observe a stale position.
|
|
120
151
|
*/
|
|
121
|
-
|
|
122
|
-
|
|
152
|
+
const ANSI_SEQUENCE_AT_INDEX = new RegExp(ANSI_SEQUENCE_SOURCE, 'y');
|
|
153
|
+
/**
|
|
154
|
+
* The pieces of `text` in order — whole escape sequences and whole grapheme clusters, the only
|
|
155
|
+
* units either slice is allowed to cut between.
|
|
156
|
+
*
|
|
157
|
+
* Lazy, and that is the point: the head slice stops pulling at its budget, so a megabyte-long line
|
|
158
|
+
* costs the length of the RESULT rather than the length of the input.
|
|
159
|
+
*
|
|
160
|
+
* An escape introducer is always its own cluster, because the segmentation rules break on both
|
|
161
|
+
* sides of a control character — so a sequence can only ever begin where a cluster begins, and one
|
|
162
|
+
* anchored match there settles how far it runs. The clusters it spans are then skipped. A cluster
|
|
163
|
+
* that STRADDLES the end of a sequence (a combining mark binding to the sequence's final byte)
|
|
164
|
+
* yields only the part beyond it, so the pieces always reassemble into the input exactly.
|
|
165
|
+
*/
|
|
166
|
+
function* widthTokens(text) {
|
|
167
|
+
let index = 0;
|
|
168
|
+
for (const { segment, index: at } of GRAPHEME_SEGMENTER.segment(text)) {
|
|
169
|
+
const end = at + segment.length;
|
|
170
|
+
if (end <= index)
|
|
171
|
+
continue; // wholly inside a sequence already yielded
|
|
172
|
+
if (at < index) {
|
|
173
|
+
// Straddles the end of that sequence: only what lies beyond it is still unyielded.
|
|
174
|
+
const rest = text.slice(index, end);
|
|
175
|
+
index = end;
|
|
176
|
+
yield { text: rest, escape: false };
|
|
177
|
+
continue;
|
|
178
|
+
}
|
|
179
|
+
if (segment.length === 1 && ESCAPE_INTRODUCER_CODES.has(segment.charCodeAt(0))) {
|
|
180
|
+
ANSI_SEQUENCE_AT_INDEX.lastIndex = at;
|
|
181
|
+
const match = ANSI_SEQUENCE_AT_INDEX.exec(text);
|
|
182
|
+
if (match !== null) {
|
|
183
|
+
index = at + match[0].length;
|
|
184
|
+
yield { text: match[0], escape: true };
|
|
185
|
+
continue;
|
|
186
|
+
}
|
|
187
|
+
// An introducer that begins no sequence falls through as an ordinary cluster. It is a
|
|
188
|
+
// control character, so it measures zero and costs no budget either way.
|
|
189
|
+
}
|
|
190
|
+
index = end;
|
|
191
|
+
yield { text: segment, escape: false };
|
|
192
|
+
}
|
|
123
193
|
}
|
|
124
194
|
/**
|
|
125
195
|
* The longest LEADING run of whole clusters whose total width is at most `maxWidth` — i.e. keep
|
|
@@ -146,50 +216,74 @@ export function sliceToMaxWidth(text, maxWidth) {
|
|
|
146
216
|
}
|
|
147
217
|
/**
|
|
148
218
|
* The head-slice both public cuts are made of, given the ruler to measure with. The ruler is passed
|
|
149
|
-
* rather than chosen here so
|
|
150
|
-
*
|
|
151
|
-
*
|
|
219
|
+
* rather than chosen here so a caller cannot end up measured by one and cut by the other — reading
|
|
220
|
+
* the budget narrow and spending it wide would hand back a string that overruns the very budget the
|
|
221
|
+
* caller asked to be held to.
|
|
222
|
+
*
|
|
223
|
+
* The input is measured ONCE, incrementally, by the walk itself: escapes cost nothing, so the
|
|
224
|
+
* clusters kept sum to what {@link displayWidth} would report for them, and "does the whole string
|
|
225
|
+
* fit?" is answered by reaching the end rather than by a separate pass over the input first.
|
|
226
|
+
*
|
|
227
|
+
* Escapes are held back until a cluster is actually kept, so a sequence whose text all falls
|
|
228
|
+
* outside the budget is dropped with it instead of trailing the result and colouring whatever the
|
|
229
|
+
* caller appends next.
|
|
152
230
|
*/
|
|
153
231
|
function sliceHeadToWidth(text, maxWidth, measure) {
|
|
154
232
|
if (maxWidth <= 0)
|
|
155
233
|
return '';
|
|
156
|
-
if (needsWholeStringMeasure(text) && measure(text) <= maxWidth)
|
|
157
|
-
return text;
|
|
158
234
|
let width = 0;
|
|
159
235
|
let kept = '';
|
|
160
|
-
|
|
161
|
-
|
|
236
|
+
let pendingEscapes = '';
|
|
237
|
+
for (const token of widthTokens(text)) {
|
|
238
|
+
if (token.escape) {
|
|
239
|
+
pendingEscapes += token.text;
|
|
240
|
+
continue;
|
|
241
|
+
}
|
|
242
|
+
const clusterWidth = measure(token.text);
|
|
162
243
|
if (width + clusterWidth > maxWidth)
|
|
163
|
-
|
|
244
|
+
return kept;
|
|
164
245
|
width += clusterWidth;
|
|
165
|
-
kept +=
|
|
246
|
+
kept += pendingEscapes + token.text;
|
|
247
|
+
pendingEscapes = '';
|
|
166
248
|
}
|
|
167
|
-
|
|
249
|
+
// Every token fitted, so the answer is the input itself — returned rather than reassembled, so
|
|
250
|
+
// a caller comparing the result with what it passed in gets the identity it is testing for.
|
|
251
|
+
return text;
|
|
168
252
|
}
|
|
169
253
|
/**
|
|
170
254
|
* The longest TRAILING run of whole clusters whose total width is at most `maxWidth` — i.e. keep
|
|
171
255
|
* the tail, lose the head. The mirror of {@link sliceToWidth}, for values whose end is the
|
|
172
256
|
* informative part (a path's leaf directory).
|
|
173
257
|
*
|
|
174
|
-
* This one materialises the
|
|
175
|
-
* derivable from the front. Its callers pass a path or a model id, so the input is a line
|
|
176
|
-
* than a file.
|
|
258
|
+
* This one materialises the pieces: it walks backwards, and both cluster and sequence boundaries
|
|
259
|
+
* are only derivable from the front. Its callers pass a path or a model id, so the input is a line
|
|
260
|
+
* rather than a file.
|
|
261
|
+
*
|
|
262
|
+
* Keeping the END means the escapes that OPENED a style sit in the discarded head and go with it,
|
|
263
|
+
* so a tail comes back in the terminal's default styling. Only the sequences inside the kept span
|
|
264
|
+
* are carried, which leaves the tail ending in whatever state the whole string ended in — the cut
|
|
265
|
+
* introduces no bleed of its own.
|
|
177
266
|
*/
|
|
178
267
|
export function sliceEndToWidth(text, maxWidth) {
|
|
179
268
|
if (maxWidth <= 0)
|
|
180
269
|
return '';
|
|
181
|
-
|
|
182
|
-
return text;
|
|
183
|
-
const all = clusters(text);
|
|
270
|
+
const all = [...widthTokens(text)];
|
|
184
271
|
let width = 0;
|
|
185
272
|
let kept = '';
|
|
273
|
+
let pendingEscapes = '';
|
|
186
274
|
for (let index = all.length - 1; index >= 0; index--) {
|
|
187
|
-
const
|
|
275
|
+
const token = all[index];
|
|
276
|
+
if (token.escape) {
|
|
277
|
+
pendingEscapes = token.text + pendingEscapes;
|
|
278
|
+
continue;
|
|
279
|
+
}
|
|
280
|
+
const clusterWidth = displayWidth(token.text);
|
|
188
281
|
if (width + clusterWidth > maxWidth)
|
|
189
|
-
|
|
282
|
+
return kept;
|
|
190
283
|
width += clusterWidth;
|
|
191
|
-
kept =
|
|
284
|
+
kept = token.text + pendingEscapes + kept;
|
|
285
|
+
pendingEscapes = '';
|
|
192
286
|
}
|
|
193
|
-
return
|
|
287
|
+
return text;
|
|
194
288
|
}
|
|
195
289
|
//# sourceMappingURL=displayWidth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"displayWidth.js","sourceRoot":"","sources":["../../src/utils/displayWidth.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"displayWidth.js","sourceRoot":"","sources":["../../src/utils/displayWidth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiFG;AACH,OAAO,WAAW,MAAM,cAAc,CAAC;AAEvC;;;GAGG;AACH,MAAM,kBAAkB,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,CAAC;AAEtF;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,OAAO,WAAW,CAAC,IAAI,CAAC,CAAC;AAC3B,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,WAAW,CAAC,IAAI,EAAE,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAAC,CAAC;AACzD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY;IACvC,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC;QAAE,OAAO,OAAO,CAAC;IAC3E,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,oBAAoB,GAAG;IAC3B,2EAA2E;IAC3E,oFAAoF;CACrF,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAEZ;;;;;;;GAOG;AACH,MAAM,sBAAsB,GAAG,IAAI,MAAM,CAAC,oBAAoB,EAAE,GAAG,CAAC,CAAC;AASrE;;;;;;;;;;;;GAYG;AACH,QAAQ,CAAC,CAAC,WAAW,CAAC,IAAY;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,KAAK,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACtE,MAAM,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAChC,IAAI,GAAG,IAAI,KAAK;YAAE,SAAS,CAAC,2CAA2C;QACvE,IAAI,EAAE,GAAG,KAAK,EAAE,CAAC;YACf,mFAAmF;YACnF,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;YACpC,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,uBAAuB,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/E,sBAAsB,CAAC,SAAS,GAAG,EAAE,CAAC;YACtC,MAAM,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,KAAK,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;gBAC7B,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;YACD,sFAAsF;YACtF,yEAAyE;QAC3E,CAAC;QACD,KAAK,GAAG,GAAG,CAAC;QACZ,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACzC,CAAC;AACH,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,QAAgB;IACzD,OAAO,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;AACxD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,QAAgB;IAC5D,OAAO,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,SAAS,gBAAgB,CACvB,IAAY,EACZ,QAAgB,EAChB,OAAiC;IAEjC,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,KAAK,MAAM,KAAK,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,IAAI,KAAK,CAAC,IAAI,CAAC;YAC7B,SAAS;QACX,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,KAAK,GAAG,YAAY,GAAG,QAAQ;YAAE,OAAO,IAAI,CAAC;QACjD,KAAK,IAAI,YAAY,CAAC;QACtB,IAAI,IAAI,cAAc,GAAG,KAAK,CAAC,IAAI,CAAC;QACpC,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,+FAA+F;IAC/F,4FAA4F;IAC5F,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,QAAgB;IAC5D,IAAI,QAAQ,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IAC7B,MAAM,GAAG,GAAG,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACnC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,cAAc,GAAG,EAAE,CAAC;IACxB,KAAK,IAAI,KAAK,GAAG,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACrD,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;QACzB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,GAAG,KAAK,CAAC,IAAI,GAAG,cAAc,CAAC;YAC7C,SAAS;QACX,CAAC;QACD,MAAM,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,KAAK,GAAG,YAAY,GAAG,QAAQ;YAAE,OAAO,IAAI,CAAC;QACjD,KAAK,IAAI,YAAY,CAAC;QACtB,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,cAAc,GAAG,IAAI,CAAC;QAC1C,cAAc,GAAG,EAAE,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
package/dist/utils/llmUtils.d.ts
CHANGED
|
@@ -32,7 +32,7 @@ export declare function readCodePrompt(config: PromptReadConfig): string;
|
|
|
32
32
|
export declare function readExecPrompt(config: PromptReadConfig): string;
|
|
33
33
|
/**
|
|
34
34
|
* GS2-79 — the SINGLE place a command's mode prompt is chosen, for every site that composes a
|
|
35
|
-
* system prompt via {@link buildSystemMessages}:
|
|
35
|
+
* system prompt via {@link buildSystemMessages}: the agent and the subagent profiles.
|
|
36
36
|
*
|
|
37
37
|
* It exists because the selection used to be an inline three-branch ternary copied to each of
|
|
38
38
|
* those sites, and a command missing from one copy is silently served the CHAT prompt — the
|
package/dist/utils/llmUtils.js
CHANGED
|
@@ -117,7 +117,7 @@ export function readExecPrompt(config) {
|
|
|
117
117
|
}
|
|
118
118
|
/**
|
|
119
119
|
* GS2-79 — the SINGLE place a command's mode prompt is chosen, for every site that composes a
|
|
120
|
-
* system prompt via {@link buildSystemMessages}:
|
|
120
|
+
* system prompt via {@link buildSystemMessages}: the agent and the subagent profiles.
|
|
121
121
|
*
|
|
122
122
|
* It exists because the selection used to be an inline three-branch ternary copied to each of
|
|
123
123
|
* those sites, and a command missing from one copy is silently served the CHAT prompt — the
|
|
@@ -93,9 +93,9 @@ export interface CommitCoAuthor {
|
|
|
93
93
|
* it literally (the overwhelmingly common case, and a literal name is what makes the instruction
|
|
94
94
|
* actionable); when it is not, the note names no tool, keeps both prohibitions and the file form,
|
|
95
95
|
* and supplies the compliant path that remains: do not commit, and hand the message back to the
|
|
96
|
-
* user. That branch states no availability claim of its own —
|
|
97
|
-
*
|
|
98
|
-
* file-writing tool" could be flatly false
|
|
96
|
+
* user. That branch states no availability claim of its own — registering filesystem tools is the
|
|
97
|
+
* agent's decision, made from the same `filesystem` value, so a note asserting "you have no
|
|
98
|
+
* file-writing tool" could be flatly false.
|
|
99
99
|
*
|
|
100
100
|
* The note's prose carries **no backtick and no other markup** — including no angle-bracket
|
|
101
101
|
* placeholder: it is the one piece of guidance whose subject is how to write a commit message, so
|
|
@@ -117,9 +117,9 @@ export function appendCwdNote(systemPrompt, cwd) {
|
|
|
117
117
|
* it literally (the overwhelmingly common case, and a literal name is what makes the instruction
|
|
118
118
|
* actionable); when it is not, the note names no tool, keeps both prohibitions and the file form,
|
|
119
119
|
* and supplies the compliant path that remains: do not commit, and hand the message back to the
|
|
120
|
-
* user. That branch states no availability claim of its own —
|
|
121
|
-
*
|
|
122
|
-
* file-writing tool" could be flatly false
|
|
120
|
+
* user. That branch states no availability claim of its own — registering filesystem tools is the
|
|
121
|
+
* agent's decision, made from the same `filesystem` value, so a note asserting "you have no
|
|
122
|
+
* file-writing tool" could be flatly false.
|
|
123
123
|
*
|
|
124
124
|
* The note's prose carries **no backtick and no other markup** — including no angle-bracket
|
|
125
125
|
* placeholder: it is the one piece of guidance whose subject is how to write a commit message, so
|