@code-yeongyu/senpi 2026.8.5 → 2026.8.6
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/CHANGELOG.md +59 -0
- package/dist/core/agent-abort-provenance.d.ts +20 -0
- package/dist/core/agent-abort-provenance.d.ts.map +1 -0
- package/dist/core/agent-abort-provenance.js +83 -0
- package/dist/core/agent-abort-provenance.js.map +1 -0
- package/dist/core/agent-session.d.ts +5 -1
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +77 -42
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/agent-settled-delivery.d.ts +9 -0
- package/dist/core/agent-settled-delivery.d.ts.map +1 -0
- package/dist/core/agent-settled-delivery.js +25 -0
- package/dist/core/agent-settled-delivery.js.map +1 -0
- package/dist/core/extensions/builtin/compaction/index.js +3 -3
- package/dist/core/extensions/builtin/compaction/index.js.map +1 -1
- package/dist/core/extensions/builtin/compaction/per-turn-cap.d.ts +8 -8
- package/dist/core/extensions/builtin/compaction/per-turn-cap.d.ts.map +1 -1
- package/dist/core/extensions/builtin/compaction/per-turn-cap.js +9 -16
- package/dist/core/extensions/builtin/compaction/per-turn-cap.js.map +1 -1
- package/dist/core/extensions/builtin/goal/agent-end-continuation.d.ts +11 -0
- package/dist/core/extensions/builtin/goal/agent-end-continuation.d.ts.map +1 -0
- package/dist/core/extensions/builtin/goal/agent-end-continuation.js +13 -0
- package/dist/core/extensions/builtin/goal/agent-end-continuation.js.map +1 -0
- package/dist/core/extensions/builtin/goal/cache-warm.d.ts +0 -2
- package/dist/core/extensions/builtin/goal/cache-warm.d.ts.map +1 -1
- package/dist/core/extensions/builtin/goal/cache-warm.js +0 -34
- package/dist/core/extensions/builtin/goal/cache-warm.js.map +1 -1
- package/dist/core/extensions/builtin/goal/continuation.d.ts +1 -1
- package/dist/core/extensions/builtin/goal/continuation.d.ts.map +1 -1
- package/dist/core/extensions/builtin/goal/continuation.js +2 -0
- package/dist/core/extensions/builtin/goal/continuation.js.map +1 -1
- package/dist/core/extensions/builtin/goal/index.d.ts.map +1 -1
- package/dist/core/extensions/builtin/goal/index.js +17 -19
- package/dist/core/extensions/builtin/goal/index.js.map +1 -1
- package/dist/core/extensions/builtin/goal/last-assistant-message.d.ts +5 -0
- package/dist/core/extensions/builtin/goal/last-assistant-message.d.ts.map +1 -0
- package/dist/core/extensions/builtin/goal/last-assistant-message.js +9 -0
- package/dist/core/extensions/builtin/goal/last-assistant-message.js.map +1 -0
- package/dist/core/extensions/builtin/goal/monitor-continuation-types.d.ts +23 -0
- package/dist/core/extensions/builtin/goal/monitor-continuation-types.d.ts.map +1 -0
- package/dist/core/extensions/builtin/goal/monitor-continuation-types.js +2 -0
- package/dist/core/extensions/builtin/goal/monitor-continuation-types.js.map +1 -0
- package/dist/core/extensions/builtin/goal/monitor-continuation.d.ts +4 -10
- package/dist/core/extensions/builtin/goal/monitor-continuation.d.ts.map +1 -1
- package/dist/core/extensions/builtin/goal/monitor-continuation.js +31 -21
- package/dist/core/extensions/builtin/goal/monitor-continuation.js.map +1 -1
- package/dist/core/extensions/builtin/goal/terminal-provider-error.d.ts +3 -0
- package/dist/core/extensions/builtin/goal/terminal-provider-error.d.ts.map +1 -0
- package/dist/core/extensions/builtin/goal/terminal-provider-error.js +10 -0
- package/dist/core/extensions/builtin/goal/terminal-provider-error.js.map +1 -0
- package/dist/core/extensions/builtin/gpt-apply-patch/apply.d.ts.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/apply.js +55 -11
- package/dist/core/extensions/builtin/gpt-apply-patch/apply.js.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.d.ts.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.js +8 -5
- package/dist/core/extensions/builtin/gpt-apply-patch/preview-format.js.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/preview.d.ts +2 -0
- package/dist/core/extensions/builtin/gpt-apply-patch/preview.d.ts.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/preview.js +39 -7
- package/dist/core/extensions/builtin/gpt-apply-patch/preview.js.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/types.d.ts +1 -0
- package/dist/core/extensions/builtin/gpt-apply-patch/types.d.ts.map +1 -1
- package/dist/core/extensions/builtin/gpt-apply-patch/types.js.map +1 -1
- package/dist/core/extensions/builtin/ttsr/index.d.ts.map +1 -1
- package/dist/core/extensions/builtin/ttsr/index.js +35 -34
- package/dist/core/extensions/builtin/ttsr/index.js.map +1 -1
- package/dist/core/extensions/runner.d.ts.map +1 -1
- package/dist/core/extensions/runner.js +2 -2
- package/dist/core/extensions/runner.js.map +1 -1
- package/dist/core/extensions/types.d.ts +2 -2
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/modes/interactive/components/assistant-message.d.ts +0 -1
- package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
- package/dist/modes/interactive/components/assistant-message.js +8 -128
- package/dist/modes/interactive/components/assistant-message.js.map +1 -1
- package/dist/modes/interactive/components/assistant-render-descriptors.d.ts +17 -0
- package/dist/modes/interactive/components/assistant-render-descriptors.d.ts.map +1 -0
- package/dist/modes/interactive/components/assistant-render-descriptors.js +133 -0
- package/dist/modes/interactive/components/assistant-render-descriptors.js.map +1 -0
- package/node_modules/@code-yeongyu/senpi-codemode/CHANGELOG.md +24 -0
- package/node_modules/@code-yeongyu/senpi-codemode/package.json +4 -4
- package/node_modules/@earendil-works/pi-agent-core/package.json +2 -2
- package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.d.ts +30 -0
- package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.d.ts.map +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.js +30 -0
- package/node_modules/@earendil-works/pi-ai/dist/image-models.generated.js.map +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/providers/data/.manifest.json +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/providers/data/anthropic.json +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/providers/data/opencode.json +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/providers/data/openrouter.json +1 -1
- package/node_modules/@earendil-works/pi-ai/dist/providers/data/vercel-ai-gateway.json +1 -1
- package/node_modules/@earendil-works/pi-ai/package.json +1 -1
- package/node_modules/@earendil-works/pi-pty/package.json +1 -1
- package/node_modules/@earendil-works/pi-tui/dist/terminal.d.ts.map +1 -1
- package/node_modules/@earendil-works/pi-tui/dist/terminal.js +14 -1
- package/node_modules/@earendil-works/pi-tui/dist/terminal.js.map +1 -1
- package/node_modules/@earendil-works/pi-tui/package.json +1 -1
- package/package.json +7 -7
|
@@ -7,7 +7,18 @@ import { formatPatchPreview, formatPendingPatchPaths } from "./preview-format.js
|
|
|
7
7
|
import { resolvePatchPath } from "./workspace.js";
|
|
8
8
|
export async function readPatchFileSnapshot(absolutePath) {
|
|
9
9
|
try {
|
|
10
|
-
|
|
10
|
+
const bytes = await readFile(absolutePath);
|
|
11
|
+
if (bytes.includes(0))
|
|
12
|
+
return { exists: true, content: "", binary: true, bytes };
|
|
13
|
+
try {
|
|
14
|
+
return {
|
|
15
|
+
exists: true,
|
|
16
|
+
content: new TextDecoder("utf-8", { fatal: true }).decode(bytes),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return { exists: true, content: "", binary: true, bytes };
|
|
21
|
+
}
|
|
11
22
|
}
|
|
12
23
|
catch (error) {
|
|
13
24
|
if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
|
|
@@ -31,6 +42,17 @@ function createMovePatch(input) {
|
|
|
31
42
|
}
|
|
32
43
|
export function buildPatchPreviewFile(input) {
|
|
33
44
|
const { hunk, source, newContent, moveDestination } = input;
|
|
45
|
+
if (source.binary || moveDestination?.binary) {
|
|
46
|
+
return {
|
|
47
|
+
filePath: hunk.filePath,
|
|
48
|
+
...(hunk.type === "update" && hunk.movePath ? { movePath: hunk.movePath } : {}),
|
|
49
|
+
operation: hunk.type === "add" && source.exists ? "update" : hunk.type,
|
|
50
|
+
binary: true,
|
|
51
|
+
diff: "",
|
|
52
|
+
added: 0,
|
|
53
|
+
removed: 0,
|
|
54
|
+
};
|
|
55
|
+
}
|
|
34
56
|
switch (hunk.type) {
|
|
35
57
|
case "add": {
|
|
36
58
|
const operation = source.exists ? "update" : "add";
|
|
@@ -70,22 +92,32 @@ async function createPatchPreviewFile(cwd, hunk) {
|
|
|
70
92
|
return buildPatchPreviewFile({ hunk, source, newContent: hunk.content });
|
|
71
93
|
}
|
|
72
94
|
case "delete": {
|
|
73
|
-
const
|
|
95
|
+
const source = await readPatchFileSnapshot(absolutePath);
|
|
74
96
|
return buildPatchPreviewFile({
|
|
75
97
|
hunk,
|
|
76
|
-
source
|
|
98
|
+
source,
|
|
77
99
|
newContent: "",
|
|
78
100
|
});
|
|
79
101
|
}
|
|
80
102
|
case "update": {
|
|
81
|
-
const
|
|
82
|
-
const newContent = hunk.chunks.length === 0 ? oldContent : replaceChunks(oldContent, hunk.filePath, hunk.chunks).content;
|
|
103
|
+
const source = await readPatchFileSnapshot(absolutePath);
|
|
83
104
|
const moveDestination = hunk.movePath && hunk.movePath !== hunk.filePath
|
|
84
105
|
? await readPatchFileSnapshot(resolvePatchPath(cwd, hunk.movePath))
|
|
85
106
|
: undefined;
|
|
107
|
+
if (source.binary || moveDestination?.binary) {
|
|
108
|
+
return buildPatchPreviewFile({
|
|
109
|
+
hunk,
|
|
110
|
+
source,
|
|
111
|
+
newContent: "",
|
|
112
|
+
...(moveDestination ? { moveDestination } : {}),
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
const newContent = hunk.chunks.length === 0
|
|
116
|
+
? source.content
|
|
117
|
+
: replaceChunks(source.content, hunk.filePath, hunk.chunks).content;
|
|
86
118
|
return buildPatchPreviewFile({
|
|
87
119
|
hunk,
|
|
88
|
-
source
|
|
120
|
+
source,
|
|
89
121
|
newContent,
|
|
90
122
|
...(moveDestination ? { moveDestination } : {}),
|
|
91
123
|
});
|
|
@@ -97,7 +129,7 @@ async function createPatchPreviewFile(cwd, hunk) {
|
|
|
97
129
|
}
|
|
98
130
|
}
|
|
99
131
|
function hasPreviewChange(file) {
|
|
100
|
-
return file.operation !== "update" || file.movePath !== undefined || file.diff.trim().length > 0;
|
|
132
|
+
return (file.binary === true || file.operation !== "update" || file.movePath !== undefined || file.diff.trim().length > 0);
|
|
101
133
|
}
|
|
102
134
|
export async function createPatchPreview(cwd, hunks) {
|
|
103
135
|
const files = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { createUnifiedPatch } from \"../../../tools/unified-diff.ts\";\nimport { parsePatch } from \"./parser.ts\";\nimport { createPatchDiff } from \"./patch-diff.ts\";\nimport { replaceChunks } from \"./patch-replace.ts\";\nimport { formatPatchPreview, formatPendingPatchPaths } from \"./preview-format.ts\";\nimport type {\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchProgress,\n\tApplyPatchToolDetails,\n\tParsedPatch,\n} from \"./types.ts\";\nimport { resolvePatchPath } from \"./workspace.ts\";\n\nexport type PatchFileSnapshot = {\n\treadonly exists: boolean;\n\treadonly content: string;\n};\n\nexport async function readPatchFileSnapshot(absolutePath: string): Promise<PatchFileSnapshot> {\n\ttry {\n\t\treturn { exists: true, content: await readFile(absolutePath, \"utf-8\") };\n\t} catch (error) {\n\t\tif (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") {\n\t\t\treturn { exists: false, content: \"\" };\n\t\t}\n\t\tthrow error;\n\t}\n}\n\ntype MovePatchInput = {\n\treadonly hunk: Extract<ParsedPatch, { type: \"update\" }>;\n\treadonly oldContent: string;\n\treadonly newContent: string;\n\treadonly moveDestination: PatchFileSnapshot | undefined;\n};\n\nfunction createMovePatch(input: MovePatchInput): string {\n\tconst { hunk, oldContent, newContent, moveDestination } = input;\n\tif (!hunk.movePath || hunk.movePath === hunk.filePath) {\n\t\treturn createUnifiedPatch(hunk.filePath, hunk.movePath ?? hunk.filePath, oldContent, newContent);\n\t}\n\tconst sourcePatch = createUnifiedPatch(`a/${hunk.filePath}`, \"/dev/null\", oldContent, \"\");\n\tconst destinationPatch = moveDestination?.exists\n\t\t? moveDestination.content === newContent\n\t\t\t? \"\"\n\t\t\t: createUnifiedPatch(`a/${hunk.movePath}`, `b/${hunk.movePath}`, moveDestination.content, newContent)\n\t\t: createUnifiedPatch(\"/dev/null\", `b/${hunk.movePath}`, \"\", newContent);\n\treturn `${sourcePatch}${destinationPatch}`;\n}\n\nexport function buildPatchPreviewFile(input: {\n\treadonly hunk: ParsedPatch;\n\treadonly source: PatchFileSnapshot;\n\treadonly newContent: string;\n\treadonly moveDestination?: PatchFileSnapshot;\n}): ApplyPatchPreviewFile {\n\tconst { hunk, source, newContent, moveDestination } = input;\n\tswitch (hunk.type) {\n\t\tcase \"add\": {\n\t\t\tconst operation = source.exists ? \"update\" : \"add\";\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\toperation,\n\t\t\t\tpatch: createUnifiedPatch(\n\t\t\t\t\toperation === \"add\" ? \"/dev/null\" : hunk.filePath,\n\t\t\t\t\thunk.filePath,\n\t\t\t\t\tsource.content,\n\t\t\t\t\tnewContent,\n\t\t\t\t),\n\t\t\t\t...createPatchDiff(source.content, newContent),\n\t\t\t};\n\t\t}\n\t\tcase \"delete\":\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\toperation: \"delete\",\n\t\t\t\tpatch: createUnifiedPatch(hunk.filePath, \"/dev/null\", source.content, \"\"),\n\t\t\t\t...createPatchDiff(source.content, \"\"),\n\t\t\t};\n\t\tcase \"update\":\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\tmovePath: hunk.movePath,\n\t\t\t\toperation: \"update\",\n\t\t\t\tpatch: createMovePatch({ hunk, oldContent: source.content, newContent, moveDestination }),\n\t\t\t\t...createPatchDiff(source.content, newContent),\n\t\t\t};\n\t\tdefault: {\n\t\t\tconst exhaustive: never = hunk;\n\t\t\treturn exhaustive;\n\t\t}\n\t}\n}\n\nasync function createPatchPreviewFile(cwd: string, hunk: ParsedPatch): Promise<ApplyPatchPreviewFile> {\n\tconst absolutePath = resolvePatchPath(cwd, hunk.filePath);\n\tswitch (hunk.type) {\n\t\tcase \"add\": {\n\t\t\tconst source = await readPatchFileSnapshot(absolutePath);\n\t\t\treturn buildPatchPreviewFile({ hunk, source, newContent: hunk.content });\n\t\t}\n\t\tcase \"delete\": {\n\t\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\t\treturn buildPatchPreviewFile({\n\t\t\t\thunk,\n\t\t\t\tsource: { exists: true, content: oldContent },\n\t\t\t\tnewContent: \"\",\n\t\t\t});\n\t\t}\n\t\tcase \"update\": {\n\t\t\tconst oldContent = await readFile(absolutePath, \"utf-8\");\n\t\t\tconst newContent =\n\t\t\t\thunk.chunks.length === 0 ? oldContent : replaceChunks(oldContent, hunk.filePath, hunk.chunks).content;\n\t\t\tconst moveDestination =\n\t\t\t\thunk.movePath && hunk.movePath !== hunk.filePath\n\t\t\t\t\t? await readPatchFileSnapshot(resolvePatchPath(cwd, hunk.movePath))\n\t\t\t\t\t: undefined;\n\t\t\treturn buildPatchPreviewFile({\n\t\t\t\thunk,\n\t\t\t\tsource: { exists: true, content: oldContent },\n\t\t\t\tnewContent,\n\t\t\t\t...(moveDestination ? { moveDestination } : {}),\n\t\t\t});\n\t\t}\n\t\tdefault: {\n\t\t\tconst exhaustive: never = hunk;\n\t\t\treturn exhaustive;\n\t\t}\n\t}\n}\n\nfunction hasPreviewChange(file: ApplyPatchPreviewFile): boolean {\n\treturn file.operation !== \"update\" || file.movePath !== undefined || file.diff.trim().length > 0;\n}\n\nexport async function createPatchPreview(cwd: string, hunks: ParsedPatch[]): Promise<ApplyPatchPreview> {\n\tconst files: ApplyPatchPreviewFile[] = [];\n\tfor (const hunk of hunks) {\n\t\ttry {\n\t\t\tfiles.push(await createPatchPreviewFile(cwd, hunk));\n\t\t} catch (error) {\n\t\t\tif (error instanceof Error) continue;\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\treturn {\n\t\tfiles,\n\t\tadded: files.reduce((sum, file) => sum + file.added, 0),\n\t\tremoved: files.reduce((sum, file) => sum + file.removed, 0),\n\t};\n}\n\nexport async function createPendingPatchUpdate(\n\tcwd: string,\n\tpatchText: string,\n\tprogress?: ApplyPatchProgress,\n\tpreviewOverride?: ApplyPatchPreview,\n): Promise<{ text: string; details: ApplyPatchToolDetails | undefined }> {\n\tconst title = progress\n\t\t? `Applying patch (${progress.applied + progress.failed}/${progress.total})...`\n\t\t: \"Applying patch...\";\n\tif (previewOverride) {\n\t\treturn {\n\t\t\ttext: `${title}\\n${formatPatchPreview(previewOverride)}`,\n\t\t\tdetails: { preview: previewOverride, progress },\n\t\t};\n\t}\n\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length === 0) return { text: title, details: progress ? { progress } : undefined };\n\t\tconst preview = await createPatchPreview(cwd, hunks);\n\t\tif (preview.files.some(hasPreviewChange)) {\n\t\t\treturn { text: `${title}\\n${formatPatchPreview(preview)}`, details: { preview, progress } };\n\t\t}\n\t} catch {\n\t\treturn {\n\t\t\ttext: progress ? title : formatPendingPatchPaths(patchText),\n\t\t\tdetails: progress ? { progress } : undefined,\n\t\t};\n\t}\n\treturn { text: progress ? title : formatPendingPatchPaths(patchText), details: progress ? { progress } : undefined };\n}\n"]}
|
|
1
|
+
{"version":3,"file":"preview.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/preview.ts"],"names":[],"mappings":"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","sourcesContent":["import { readFile } from \"node:fs/promises\";\nimport { createUnifiedPatch } from \"../../../tools/unified-diff.ts\";\nimport { parsePatch } from \"./parser.ts\";\nimport { createPatchDiff } from \"./patch-diff.ts\";\nimport { replaceChunks } from \"./patch-replace.ts\";\nimport { formatPatchPreview, formatPendingPatchPaths } from \"./preview-format.ts\";\nimport type {\n\tApplyPatchPreview,\n\tApplyPatchPreviewFile,\n\tApplyPatchProgress,\n\tApplyPatchToolDetails,\n\tParsedPatch,\n} from \"./types.ts\";\nimport { resolvePatchPath } from \"./workspace.ts\";\n\nexport type PatchFileSnapshot = {\n\treadonly exists: boolean;\n\treadonly content: string;\n\treadonly binary?: true;\n\treadonly bytes?: Uint8Array;\n};\n\nexport async function readPatchFileSnapshot(absolutePath: string): Promise<PatchFileSnapshot> {\n\ttry {\n\t\tconst bytes = await readFile(absolutePath);\n\t\tif (bytes.includes(0)) return { exists: true, content: \"\", binary: true, bytes };\n\t\ttry {\n\t\t\treturn {\n\t\t\t\texists: true,\n\t\t\t\tcontent: new TextDecoder(\"utf-8\", { fatal: true }).decode(bytes),\n\t\t\t};\n\t\t} catch {\n\t\t\treturn { exists: true, content: \"\", binary: true, bytes };\n\t\t}\n\t} catch (error) {\n\t\tif (error && typeof error === \"object\" && \"code\" in error && error.code === \"ENOENT\") {\n\t\t\treturn { exists: false, content: \"\" };\n\t\t}\n\t\tthrow error;\n\t}\n}\n\ntype MovePatchInput = {\n\treadonly hunk: Extract<ParsedPatch, { type: \"update\" }>;\n\treadonly oldContent: string;\n\treadonly newContent: string;\n\treadonly moveDestination: PatchFileSnapshot | undefined;\n};\n\nfunction createMovePatch(input: MovePatchInput): string {\n\tconst { hunk, oldContent, newContent, moveDestination } = input;\n\tif (!hunk.movePath || hunk.movePath === hunk.filePath) {\n\t\treturn createUnifiedPatch(hunk.filePath, hunk.movePath ?? hunk.filePath, oldContent, newContent);\n\t}\n\tconst sourcePatch = createUnifiedPatch(`a/${hunk.filePath}`, \"/dev/null\", oldContent, \"\");\n\tconst destinationPatch = moveDestination?.exists\n\t\t? moveDestination.content === newContent\n\t\t\t? \"\"\n\t\t\t: createUnifiedPatch(`a/${hunk.movePath}`, `b/${hunk.movePath}`, moveDestination.content, newContent)\n\t\t: createUnifiedPatch(\"/dev/null\", `b/${hunk.movePath}`, \"\", newContent);\n\treturn `${sourcePatch}${destinationPatch}`;\n}\n\nexport function buildPatchPreviewFile(input: {\n\treadonly hunk: ParsedPatch;\n\treadonly source: PatchFileSnapshot;\n\treadonly newContent: string;\n\treadonly moveDestination?: PatchFileSnapshot;\n}): ApplyPatchPreviewFile {\n\tconst { hunk, source, newContent, moveDestination } = input;\n\tif (source.binary || moveDestination?.binary) {\n\t\treturn {\n\t\t\tfilePath: hunk.filePath,\n\t\t\t...(hunk.type === \"update\" && hunk.movePath ? { movePath: hunk.movePath } : {}),\n\t\t\toperation: hunk.type === \"add\" && source.exists ? \"update\" : hunk.type,\n\t\t\tbinary: true,\n\t\t\tdiff: \"\",\n\t\t\tadded: 0,\n\t\t\tremoved: 0,\n\t\t};\n\t}\n\tswitch (hunk.type) {\n\t\tcase \"add\": {\n\t\t\tconst operation = source.exists ? \"update\" : \"add\";\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\toperation,\n\t\t\t\tpatch: createUnifiedPatch(\n\t\t\t\t\toperation === \"add\" ? \"/dev/null\" : hunk.filePath,\n\t\t\t\t\thunk.filePath,\n\t\t\t\t\tsource.content,\n\t\t\t\t\tnewContent,\n\t\t\t\t),\n\t\t\t\t...createPatchDiff(source.content, newContent),\n\t\t\t};\n\t\t}\n\t\tcase \"delete\":\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\toperation: \"delete\",\n\t\t\t\tpatch: createUnifiedPatch(hunk.filePath, \"/dev/null\", source.content, \"\"),\n\t\t\t\t...createPatchDiff(source.content, \"\"),\n\t\t\t};\n\t\tcase \"update\":\n\t\t\treturn {\n\t\t\t\tfilePath: hunk.filePath,\n\t\t\t\tmovePath: hunk.movePath,\n\t\t\t\toperation: \"update\",\n\t\t\t\tpatch: createMovePatch({ hunk, oldContent: source.content, newContent, moveDestination }),\n\t\t\t\t...createPatchDiff(source.content, newContent),\n\t\t\t};\n\t\tdefault: {\n\t\t\tconst exhaustive: never = hunk;\n\t\t\treturn exhaustive;\n\t\t}\n\t}\n}\n\nasync function createPatchPreviewFile(cwd: string, hunk: ParsedPatch): Promise<ApplyPatchPreviewFile> {\n\tconst absolutePath = resolvePatchPath(cwd, hunk.filePath);\n\tswitch (hunk.type) {\n\t\tcase \"add\": {\n\t\t\tconst source = await readPatchFileSnapshot(absolutePath);\n\t\t\treturn buildPatchPreviewFile({ hunk, source, newContent: hunk.content });\n\t\t}\n\t\tcase \"delete\": {\n\t\t\tconst source = await readPatchFileSnapshot(absolutePath);\n\t\t\treturn buildPatchPreviewFile({\n\t\t\t\thunk,\n\t\t\t\tsource,\n\t\t\t\tnewContent: \"\",\n\t\t\t});\n\t\t}\n\t\tcase \"update\": {\n\t\t\tconst source = await readPatchFileSnapshot(absolutePath);\n\t\t\tconst moveDestination =\n\t\t\t\thunk.movePath && hunk.movePath !== hunk.filePath\n\t\t\t\t\t? await readPatchFileSnapshot(resolvePatchPath(cwd, hunk.movePath))\n\t\t\t\t\t: undefined;\n\t\t\tif (source.binary || moveDestination?.binary) {\n\t\t\t\treturn buildPatchPreviewFile({\n\t\t\t\t\thunk,\n\t\t\t\t\tsource,\n\t\t\t\t\tnewContent: \"\",\n\t\t\t\t\t...(moveDestination ? { moveDestination } : {}),\n\t\t\t\t});\n\t\t\t}\n\t\t\tconst newContent =\n\t\t\t\thunk.chunks.length === 0\n\t\t\t\t\t? source.content\n\t\t\t\t\t: replaceChunks(source.content, hunk.filePath, hunk.chunks).content;\n\t\t\treturn buildPatchPreviewFile({\n\t\t\t\thunk,\n\t\t\t\tsource,\n\t\t\t\tnewContent,\n\t\t\t\t...(moveDestination ? { moveDestination } : {}),\n\t\t\t});\n\t\t}\n\t\tdefault: {\n\t\t\tconst exhaustive: never = hunk;\n\t\t\treturn exhaustive;\n\t\t}\n\t}\n}\n\nfunction hasPreviewChange(file: ApplyPatchPreviewFile): boolean {\n\treturn (\n\t\tfile.binary === true || file.operation !== \"update\" || file.movePath !== undefined || file.diff.trim().length > 0\n\t);\n}\n\nexport async function createPatchPreview(cwd: string, hunks: ParsedPatch[]): Promise<ApplyPatchPreview> {\n\tconst files: ApplyPatchPreviewFile[] = [];\n\tfor (const hunk of hunks) {\n\t\ttry {\n\t\t\tfiles.push(await createPatchPreviewFile(cwd, hunk));\n\t\t} catch (error) {\n\t\t\tif (error instanceof Error) continue;\n\t\t\tthrow error;\n\t\t}\n\t}\n\n\treturn {\n\t\tfiles,\n\t\tadded: files.reduce((sum, file) => sum + file.added, 0),\n\t\tremoved: files.reduce((sum, file) => sum + file.removed, 0),\n\t};\n}\n\nexport async function createPendingPatchUpdate(\n\tcwd: string,\n\tpatchText: string,\n\tprogress?: ApplyPatchProgress,\n\tpreviewOverride?: ApplyPatchPreview,\n): Promise<{ text: string; details: ApplyPatchToolDetails | undefined }> {\n\tconst title = progress\n\t\t? `Applying patch (${progress.applied + progress.failed}/${progress.total})...`\n\t\t: \"Applying patch...\";\n\tif (previewOverride) {\n\t\treturn {\n\t\t\ttext: `${title}\\n${formatPatchPreview(previewOverride)}`,\n\t\t\tdetails: { preview: previewOverride, progress },\n\t\t};\n\t}\n\n\ttry {\n\t\tconst hunks = parsePatch(patchText);\n\t\tif (hunks.length === 0) return { text: title, details: progress ? { progress } : undefined };\n\t\tconst preview = await createPatchPreview(cwd, hunks);\n\t\tif (preview.files.some(hasPreviewChange)) {\n\t\t\treturn { text: `${title}\\n${formatPatchPreview(preview)}`, details: { preview, progress } };\n\t\t}\n\t} catch {\n\t\treturn {\n\t\t\ttext: progress ? title : formatPendingPatchPaths(patchText),\n\t\t\tdetails: progress ? { progress } : undefined,\n\t\t};\n\t}\n\treturn { text: progress ? title : formatPendingPatchPaths(patchText), details: progress ? { progress } : undefined };\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/types.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ExtensionAPI, ToolDefinition } from \"../../types.ts\";\nimport type { APPLY_PATCH_PARAMS } from \"./constants.ts\";\n\nexport type ParsedPatch =\n\t| { type: \"add\"; filePath: string; content: string }\n\t| { type: \"delete\"; filePath: string }\n\t| { type: \"update\"; filePath: string; movePath?: string; chunks: PatchChunk[] };\n\nexport type PatchChunk = {\n\tchangeContexts: string[];\n\toldLines: string[];\n\tnewLines: string[];\n\tisEndOfFile: boolean;\n};\n\nexport type ApplyPatchWireMode = \"freeform\" | \"json\" | \"none\";\n\nexport type ApplyPatchToolVariant = Exclude<ApplyPatchWireMode, \"none\">;\n\nexport type ApplyPatchToolsetState = {\n\t/** Exactly the edit-family tools this extension removed at the last non-GPT to GPT transition. */\n\tremovedEditToolNames: string[];\n};\n\nexport type FreeformToolFormat = {\n\ttype: \"grammar\";\n\tsyntax: \"lark\";\n\tdefinition: string;\n};\n\nexport type ApplyPatchParams = {\n\tinput: string;\n};\n\nexport type ApplyPatchOperation = \"add\" | \"delete\" | \"update\";\n\nexport type ApplyPatchPreviewFile = {\n\tfilePath: string;\n\tmovePath?: string;\n\toperation: ApplyPatchOperation;\n\tdiff: string;\n\tpatch?: string;\n\tadded: number;\n\tremoved: number;\n};\n\nexport type ApplyPatchPreview = {\n\tfiles: ApplyPatchPreviewFile[];\n\tadded: number;\n\tremoved: number;\n};\n\nexport type ApplyPatchToolDetails = {\n\tpreview?: ApplyPatchPreview;\n\tprogress?: ApplyPatchProgress;\n\tresult?: ApplyPatchResult;\n};\n\nexport type ApplyPatchProgress = {\n\tapplied: number;\n\tfailed: number;\n\ttotal: number;\n};\n\nexport type ApplyPatchProgressCallback = (progress: ApplyPatchProgress) => Promise<void> | void;\n\nexport type ApplyPatchFailure = {\n\toperationIndex: number;\n\tfilePath: string;\n\toperation: ApplyPatchOperation;\n\tmessage: string;\n\tcode?: string | undefined;\n};\n\nexport type AppliedPatchOperation = {\n\toperationIndex: number;\n\tpreview: ApplyPatchPreviewFile;\n};\n\nexport type ApplyPatchRecoveryInstructions = {\n\tmustReadFiles: string[];\n\tmustNotReadFiles: string[];\n\tfailedFiles: string[];\n};\n\nexport type ApplyPatchResult = {\n\tsummaries: string[];\n\tappliedFiles: string[];\n\tfailures: ApplyPatchFailure[];\n\thasPartialSuccess: boolean;\n\trecoveryInstructions: ApplyPatchRecoveryInstructions;\n\tdetails: {\n\t\tfuzz: number;\n\t\tappliedOperations: AppliedPatchOperation[];\n\t};\n};\n\nexport type AtomicWriteOperations = {\n\twriteFile: (filePath: string, content: string, encoding: \"utf-8\") => Promise<void>;\n\trename: (fromPath: string, toPath: string) => Promise<void>;\n\tunlink: (filePath: string) => Promise<void>;\n};\n\nexport type ApplyPatchThemeColor =\n\t| \"accent\"\n\t| \"error\"\n\t| \"muted\"\n\t| \"toolDiffAdded\"\n\t| \"toolDiffContext\"\n\t| \"toolDiffRemoved\"\n\t| \"toolOutput\"\n\t| \"toolTitle\";\n\nexport type ApplyPatchThemeBg = \"toolErrorBg\" | \"toolPendingBg\" | \"toolSuccessBg\";\n\nexport type ApplyPatchTheme = {\n\tfg: (name: ApplyPatchThemeColor, text: string) => string;\n\tbg: (name: ApplyPatchThemeBg, text: string) => string;\n\tbold: (text: string) => string;\n\tinverse: (text: string) => string;\n};\n\nexport type ApplyPatchRenderState = {\n\tcwd?: string;\n\tpatchText?: string;\n\tcallText?: string;\n\tcollapsed?: string;\n\texpanded?: string;\n\tstreamingInput?: string;\n\tstreamingParser?: { pushDelta: (delta: string) => ParsedPatch[] };\n\tstreamingHunks?: ParsedPatch[];\n\tstreamingError?: string;\n};\n\nexport type ApplyPatchToolDefinition = ToolDefinition<\n\ttypeof APPLY_PATCH_PARAMS,\n\tApplyPatchToolDetails | undefined,\n\tApplyPatchRenderState\n>;\n\nexport type ApplyPatchExtensionAPI = Pick<ExtensionAPI, \"on\" | \"getActiveTools\" | \"getAllTools\" | \"setActiveTools\"> & {\n\tregisterTool: (tool: ApplyPatchToolDefinition) => void;\n\tregisterLazyToolActivator?: ExtensionAPI[\"registerLazyToolActivator\"];\n};\n"]}
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/gpt-apply-patch/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { ExtensionAPI, ToolDefinition } from \"../../types.ts\";\nimport type { APPLY_PATCH_PARAMS } from \"./constants.ts\";\n\nexport type ParsedPatch =\n\t| { type: \"add\"; filePath: string; content: string }\n\t| { type: \"delete\"; filePath: string }\n\t| { type: \"update\"; filePath: string; movePath?: string; chunks: PatchChunk[] };\n\nexport type PatchChunk = {\n\tchangeContexts: string[];\n\toldLines: string[];\n\tnewLines: string[];\n\tisEndOfFile: boolean;\n};\n\nexport type ApplyPatchWireMode = \"freeform\" | \"json\" | \"none\";\n\nexport type ApplyPatchToolVariant = Exclude<ApplyPatchWireMode, \"none\">;\n\nexport type ApplyPatchToolsetState = {\n\t/** Exactly the edit-family tools this extension removed at the last non-GPT to GPT transition. */\n\tremovedEditToolNames: string[];\n};\n\nexport type FreeformToolFormat = {\n\ttype: \"grammar\";\n\tsyntax: \"lark\";\n\tdefinition: string;\n};\n\nexport type ApplyPatchParams = {\n\tinput: string;\n};\n\nexport type ApplyPatchOperation = \"add\" | \"delete\" | \"update\";\n\nexport type ApplyPatchPreviewFile = {\n\tfilePath: string;\n\tmovePath?: string;\n\toperation: ApplyPatchOperation;\n\tbinary?: true;\n\tdiff: string;\n\tpatch?: string;\n\tadded: number;\n\tremoved: number;\n};\n\nexport type ApplyPatchPreview = {\n\tfiles: ApplyPatchPreviewFile[];\n\tadded: number;\n\tremoved: number;\n};\n\nexport type ApplyPatchToolDetails = {\n\tpreview?: ApplyPatchPreview;\n\tprogress?: ApplyPatchProgress;\n\tresult?: ApplyPatchResult;\n};\n\nexport type ApplyPatchProgress = {\n\tapplied: number;\n\tfailed: number;\n\ttotal: number;\n};\n\nexport type ApplyPatchProgressCallback = (progress: ApplyPatchProgress) => Promise<void> | void;\n\nexport type ApplyPatchFailure = {\n\toperationIndex: number;\n\tfilePath: string;\n\toperation: ApplyPatchOperation;\n\tmessage: string;\n\tcode?: string | undefined;\n};\n\nexport type AppliedPatchOperation = {\n\toperationIndex: number;\n\tpreview: ApplyPatchPreviewFile;\n};\n\nexport type ApplyPatchRecoveryInstructions = {\n\tmustReadFiles: string[];\n\tmustNotReadFiles: string[];\n\tfailedFiles: string[];\n};\n\nexport type ApplyPatchResult = {\n\tsummaries: string[];\n\tappliedFiles: string[];\n\tfailures: ApplyPatchFailure[];\n\thasPartialSuccess: boolean;\n\trecoveryInstructions: ApplyPatchRecoveryInstructions;\n\tdetails: {\n\t\tfuzz: number;\n\t\tappliedOperations: AppliedPatchOperation[];\n\t};\n};\n\nexport type AtomicWriteOperations = {\n\twriteFile: (filePath: string, content: string, encoding: \"utf-8\") => Promise<void>;\n\trename: (fromPath: string, toPath: string) => Promise<void>;\n\tunlink: (filePath: string) => Promise<void>;\n};\n\nexport type ApplyPatchThemeColor =\n\t| \"accent\"\n\t| \"error\"\n\t| \"muted\"\n\t| \"toolDiffAdded\"\n\t| \"toolDiffContext\"\n\t| \"toolDiffRemoved\"\n\t| \"toolOutput\"\n\t| \"toolTitle\";\n\nexport type ApplyPatchThemeBg = \"toolErrorBg\" | \"toolPendingBg\" | \"toolSuccessBg\";\n\nexport type ApplyPatchTheme = {\n\tfg: (name: ApplyPatchThemeColor, text: string) => string;\n\tbg: (name: ApplyPatchThemeBg, text: string) => string;\n\tbold: (text: string) => string;\n\tinverse: (text: string) => string;\n};\n\nexport type ApplyPatchRenderState = {\n\tcwd?: string;\n\tpatchText?: string;\n\tcallText?: string;\n\tcollapsed?: string;\n\texpanded?: string;\n\tstreamingInput?: string;\n\tstreamingParser?: { pushDelta: (delta: string) => ParsedPatch[] };\n\tstreamingHunks?: ParsedPatch[];\n\tstreamingError?: string;\n};\n\nexport type ApplyPatchToolDefinition = ToolDefinition<\n\ttypeof APPLY_PATCH_PARAMS,\n\tApplyPatchToolDetails | undefined,\n\tApplyPatchRenderState\n>;\n\nexport type ApplyPatchExtensionAPI = Pick<ExtensionAPI, \"on\" | \"getActiveTools\" | \"getAllTools\" | \"setActiveTools\"> & {\n\tregisterTool: (tool: ApplyPatchToolDefinition) => void;\n\tregisterLazyToolActivator?: ExtensionAPI[\"registerLazyToolActivator\"];\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAiB,YAAY,EAAwC,MAAM,gBAAgB,CAAC;AAmDxG,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAE,EAAE,YAAY,GAAG,IAAI,CA2N5D"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { getKeybindings } from "@earendil-works/pi-tui";
|
|
2
2
|
import { appendRuleActivation, registerRuleActivationRenderer } from "../rule-activation/index.js";
|
|
3
|
+
import { parseRuleActivationDetails, RULE_ACTIVATION_ENTRY_TYPE } from "../rule-activation/types.js";
|
|
3
4
|
import { BUILTIN_TTSR_RULES } from "./builtin-rules.js";
|
|
4
5
|
import { registerTtsrCommands } from "./commands.js";
|
|
5
6
|
import { claimAbort, createGenerationState, markUserCancelled } from "./coordinator.js";
|
|
@@ -49,6 +50,7 @@ export default function ttsrExtension(pi) {
|
|
|
49
50
|
let pendingRemediation = null;
|
|
50
51
|
let pendingRuleNudge = null;
|
|
51
52
|
let pendingNudge = null;
|
|
53
|
+
let settlingAgentEnd = null;
|
|
52
54
|
let disabled = false;
|
|
53
55
|
const repetitiveTurns = new RepetitiveTurnsLane();
|
|
54
56
|
function cancelRemediation() {
|
|
@@ -60,13 +62,15 @@ export default function ttsrExtension(pi) {
|
|
|
60
62
|
repetitiveTurns.disarm();
|
|
61
63
|
}
|
|
62
64
|
}
|
|
65
|
+
function resetGenerationState() {
|
|
66
|
+
generation += 1;
|
|
67
|
+
genState = createGenerationState();
|
|
68
|
+
pendingRemediation = null;
|
|
69
|
+
pendingRuleNudge = null;
|
|
70
|
+
repetitiveTurns.resetTurn();
|
|
71
|
+
watcher?.reset();
|
|
72
|
+
}
|
|
63
73
|
function recordInjection(owner, observed, retryMode) {
|
|
64
|
-
pi.appendEntry(TTSR_INJECTION_CUSTOM_TYPE, {
|
|
65
|
-
rules: observed,
|
|
66
|
-
owner,
|
|
67
|
-
remediation: retryMode,
|
|
68
|
-
at: Date.now(),
|
|
69
|
-
});
|
|
70
74
|
appendRuleActivation(pi, {
|
|
71
75
|
kind: "ttsr",
|
|
72
76
|
owner,
|
|
@@ -74,16 +78,6 @@ export default function ttsrExtension(pi) {
|
|
|
74
78
|
remediation: retryMode,
|
|
75
79
|
});
|
|
76
80
|
}
|
|
77
|
-
function notify(ctx, owner) {
|
|
78
|
-
if (ctx.mode !== "tui")
|
|
79
|
-
return;
|
|
80
|
-
try {
|
|
81
|
-
ctx.ui.notify(`Stream rule triggered: ${owner}`, "warning");
|
|
82
|
-
}
|
|
83
|
-
catch {
|
|
84
|
-
return;
|
|
85
|
-
}
|
|
86
|
-
}
|
|
87
81
|
function ensureInitialized(ctx) {
|
|
88
82
|
if (manager !== null)
|
|
89
83
|
return;
|
|
@@ -92,11 +86,16 @@ export default function ttsrExtension(pi) {
|
|
|
92
86
|
repetitiveTurns.configure(new Set(disabledRules));
|
|
93
87
|
const settings = { ...DEFAULT_TTSR_SETTINGS, enabled: !disabled, disabledRules };
|
|
94
88
|
manager = new TtsrManager(settings, (pattern) => compileRuleCondition(pattern).regex);
|
|
95
|
-
const injectedNames = ctx.sessionManager
|
|
96
|
-
.
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
89
|
+
const injectedNames = ctx.sessionManager.getEntries().flatMap((entry) => {
|
|
90
|
+
if (entry.type !== "custom")
|
|
91
|
+
return [];
|
|
92
|
+
if (entry.customType === RULE_ACTIVATION_ENTRY_TYPE) {
|
|
93
|
+
const details = parseRuleActivationDetails(entry.data);
|
|
94
|
+
return details?.kind === "ttsr" ? [...details.rules] : [];
|
|
95
|
+
}
|
|
96
|
+
if (entry.customType !== TTSR_INJECTION_CUSTOM_TYPE)
|
|
97
|
+
return [];
|
|
98
|
+
const data = entry.data;
|
|
100
99
|
if (typeof data !== "object" || data === null || !("rules" in data))
|
|
101
100
|
return [];
|
|
102
101
|
const rules = data.rules;
|
|
@@ -141,14 +140,18 @@ export default function ttsrExtension(pi) {
|
|
|
141
140
|
pi.on("input", () => {
|
|
142
141
|
cancelRemediation();
|
|
143
142
|
});
|
|
143
|
+
pi.on("agent_end", (event) => {
|
|
144
|
+
settlingAgentEnd = event;
|
|
145
|
+
if (event.abortSource === "user") {
|
|
146
|
+
cancelRemediation();
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
if (event.willRetry === true)
|
|
150
|
+
resetGenerationState();
|
|
151
|
+
});
|
|
144
152
|
pi.on("turn_start", (_event, ctx) => {
|
|
145
153
|
ensureInitialized(ctx);
|
|
146
|
-
|
|
147
|
-
genState = createGenerationState();
|
|
148
|
-
pendingRemediation = null;
|
|
149
|
-
pendingRuleNudge = null;
|
|
150
|
-
repetitiveTurns.resetTurn();
|
|
151
|
-
watcher?.reset();
|
|
154
|
+
resetGenerationState();
|
|
152
155
|
});
|
|
153
156
|
pi.on("turn_end", () => {
|
|
154
157
|
manager?.incrementMessageCount();
|
|
@@ -165,8 +168,7 @@ export default function ttsrExtension(pi) {
|
|
|
165
168
|
const outcome = watcher.handleDelta(source, streamKey, deltaEvent.delta, generation);
|
|
166
169
|
if (outcome.resolution !== null && claimAbort(genState, outcome.resolution)) {
|
|
167
170
|
pendingRemediation = { resolution: outcome.resolution, streamKind: source };
|
|
168
|
-
|
|
169
|
-
ctx.abort();
|
|
171
|
+
ctx.abort("system");
|
|
170
172
|
return;
|
|
171
173
|
}
|
|
172
174
|
if (source === "text") {
|
|
@@ -175,8 +177,7 @@ export default function ttsrExtension(pi) {
|
|
|
175
177
|
genState.abortClaimed = true;
|
|
176
178
|
genState.abortOwner = "collapse-repetition";
|
|
177
179
|
genState.selfAbortAt = Date.now();
|
|
178
|
-
|
|
179
|
-
ctx.abort();
|
|
180
|
+
ctx.abort("system");
|
|
180
181
|
return;
|
|
181
182
|
}
|
|
182
183
|
}
|
|
@@ -187,8 +188,7 @@ export default function ttsrExtension(pi) {
|
|
|
187
188
|
genState.abortOwner = "collapse-repetition";
|
|
188
189
|
genState.selfAbortAt = Date.now();
|
|
189
190
|
pendingRuleNudge = { rule };
|
|
190
|
-
|
|
191
|
-
ctx.abort();
|
|
191
|
+
ctx.abort("system");
|
|
192
192
|
}
|
|
193
193
|
});
|
|
194
194
|
pi.on("message_end", (event) => {
|
|
@@ -239,8 +239,9 @@ export default function ttsrExtension(pi) {
|
|
|
239
239
|
return undefined;
|
|
240
240
|
});
|
|
241
241
|
pi.on("agent_settled", () => {
|
|
242
|
-
if (pendingNudge === null || genState.userCancelled) {
|
|
242
|
+
if (pendingNudge === null || genState.userCancelled || settlingAgentEnd?.abortSource === "user") {
|
|
243
243
|
pendingNudge = null;
|
|
244
|
+
settlingAgentEnd = null;
|
|
244
245
|
return;
|
|
245
246
|
}
|
|
246
247
|
const nudge = pendingNudge;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAGxD,OAAO,EAAE,oBAAoB,EAAE,8BAA8B,EAAE,MAAM,6BAA6B,CAAC;AACnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAwB,MAAM,eAAe,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACxF,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAyB,MAAM,kBAAkB,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,2BAA2B,EAAE,MAAM,4BAA4B,CAAC;AACpH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACN,qBAAqB,EAGrB,0BAA0B,GAE1B,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAW3C,MAAM,oBAAoB,GAAG,eAAe,CAAC;AAE7C,SAAS,cAAc,CAAC,IAAY;IACnC,IAAI,CAAC;QACJ,OAAO,cAAc,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;IAC7D,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC;AAED,SAAS,kBAAkB,CAAC,GAAiC;IAC5D,OAAO,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC;QAC/C,CAAC,CAAC,GAAG;aACF,KAAK,CAAC,GAAG,CAAC;aACV,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,CAAC;QACpC,CAAC,CAAC,EAAE,CAAC;AACP,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,EAAgB;IACrD,8BAA8B,CAAC,EAAE,CAAC,CAAC;IACnC,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE;QAChC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,qCAAqC;KAClD,CAAC,CAAC;IACH,EAAE,CAAC,YAAY,CAAC,qBAAqB,EAAE;QACtC,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,WAAW,EAAE,6CAA6C;KAC1D,CAAC,CAAC;IAEH,IAAI,OAAO,GAAuB,IAAI,CAAC;IACvC,IAAI,OAAO,GAAyB,IAAI,CAAC;IACzC,IAAI,QAAQ,GAA6B,qBAAqB,EAAE,CAAC;IACjE,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,kBAAkB,GAA8B,IAAI,CAAC;IACzD,IAAI,gBAAgB,GAA4B,IAAI,CAAC;IACrD,IAAI,YAAY,GAA4B,IAAI,CAAC;IACjD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,MAAM,eAAe,GAAG,IAAI,mBAAmB,EAAE,CAAC;IAElD,SAAS,iBAAiB;QACzB,IAAI,kBAAkB,KAAK,IAAI,IAAI,YAAY,KAAK,IAAI,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YACvF,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YAC5B,kBAAkB,GAAG,IAAI,CAAC;YAC1B,gBAAgB,GAAG,IAAI,CAAC;YACxB,YAAY,GAAG,IAAI,CAAC;YACpB,eAAe,CAAC,MAAM,EAAE,CAAC;QAC1B,CAAC;IACF,CAAC;IAED,SAAS,eAAe,CAAC,KAAa,EAAE,QAA2B,EAAE,SAAqC;QACzG,EAAE,CAAC,WAAW,CAAC,0BAA0B,EAAE;YAC1C,KAAK,EAAE,QAAQ;YACf,KAAK;YACL,WAAW,EAAE,SAAS;YACtB,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;SACd,CAAC,CAAC;QACH,oBAAoB,CAAC,EAAE,EAAE;YACxB,IAAI,EAAE,MAAM;YACZ,KAAK;YACL,KAAK,EAAE,QAAQ;YACf,WAAW,EAAE,SAAS;SACtB,CAAC,CAAC;IACJ,CAAC;IAED,SAAS,MAAM,CAAC,GAAqB,EAAE,KAAa;QACnD,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK;YAAE,OAAO;QAC/B,IAAI,CAAC;YACJ,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,0BAA0B,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;QAC7D,CAAC;QAAC,MAAM,CAAC;YACR,OAAO;QACR,CAAC;IACF,CAAC;IAED,SAAS,iBAAiB,CAAC,GAAqB;QAC/C,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO;QAC7B,QAAQ,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;QAChD,MAAM,aAAa,GAAG,kBAAkB,CAAC,EAAE,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC;QAC5E,eAAe,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;QAClD,MAAM,QAAQ,GAAG,EAAE,GAAG,qBAAqB,EAAE,OAAO,EAAE,CAAC,QAAQ,EAAE,aAAa,EAAE,CAAC;QACjF,OAAO,GAAG,IAAI,WAAW,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC;QACtF,MAAM,aAAa,GAAG,GAAG,CAAC,cAAc;aACtC,UAAU,EAAE;aACZ,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,KAAK,CAAC,UAAU,KAAK,0BAA0B,CAAC;aAC7F,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAClB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,CAAC,CAAC,OAAO,IAAI,IAAI,CAAC;gBAAE,OAAO,EAAE,CAAC;YAC/E,MAAM,KAAK,GAAI,IAA4B,CAAC,KAAK,CAAC;YAClD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrG,CAAC,CAAC,CAAC;QACJ,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;QACvC,KAAK,MAAM,IAAI,IAAI,kBAAkB,EAAE,CAAC;YACvC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClD,KAAK,MAAM,IAAI,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;YACrC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QACD,OAAO,GAAG,IAAI,aAAa,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QACpD,eAAe,CAAC,kBAAkB,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QACrE,IAAI,GAAG,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC;gBACJ,GAAG,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE;oBAC/B,IAAI,cAAc,CAAC,IAAI,CAAC;wBAAE,iBAAiB,EAAE,CAAC;gBAC/C,CAAC,CAAC,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACR,OAAO;YACR,CAAC;QACF,CAAC;IACF,CAAC;IAED,SAAS,WAAW;QACnB,OAAO;YACN,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;YAChC,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,EAAE,IAAI,EAAE;YACxD,QAAQ;SACR,CAAC;IACH,CAAC;IAED,oBAAoB,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;IAEtC,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACtC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACxB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,iBAAiB,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;QACnB,iBAAiB,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACnC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACvB,UAAU,IAAI,CAAC,CAAC;QAChB,QAAQ,GAAG,qBAAqB,EAAE,CAAC;QACnC,kBAAkB,GAAG,IAAI,CAAC;QAC1B,gBAAgB,GAAG,IAAI,CAAC;QACxB,eAAe,CAAC,SAAS,EAAE,CAAC;QAC5B,OAAO,EAAE,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE;QACtB,OAAO,EAAE,qBAAqB,EAAE,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,KAAyB,EAAE,GAAG,EAAE,EAAE;QAC1D,iBAAiB,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,QAAQ,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,IAAI;YAAE,OAAO;QAC7D,MAAM,UAAU,GAAG,KAAK,CAAC,qBAAqB,CAAC;QAC/C,IAAI,UAAU,CAAC,IAAI,KAAK,YAAY,IAAI,UAAU,CAAC,IAAI,KAAK,gBAAgB;YAAE,OAAO;QACrF,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC;QACtE,MAAM,SAAS,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACjE,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,EAAE,UAAU,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QACrF,IAAI,OAAO,CAAC,UAAU,KAAK,IAAI,IAAI,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YAC7E,kBAAkB,GAAG,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;YAC5E,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;YACtC,GAAG,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO;QACR,CAAC;QACD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACvB,MAAM,MAAM,GAAG,gBAAgB,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;YACnE,IAAI,eAAe,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;gBAC1F,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;gBAC7B,QAAQ,CAAC,UAAU,GAAG,qBAAqB,CAAC;gBAC5C,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClC,MAAM,CAAC,GAAG,EAAE,0BAA0B,CAAC,CAAC;gBACxC,GAAG,CAAC,KAAK,EAAE,CAAC;gBACZ,OAAO;YACR,CAAC;QACF,CAAC;QACD,MAAM,YAAY,GAAG,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,KAAK,QAAQ,CAAC,CAAC;QAC3F,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,IAAI,KAAK,SAAS,IAAI,gBAAgB,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;YAC/E,QAAQ,CAAC,YAAY,GAAG,IAAI,CAAC;YAC7B,QAAQ,CAAC,UAAU,GAAG,qBAAqB,CAAC;YAC5C,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAClC,gBAAgB,GAAG,EAAE,IAAI,EAAE,CAAC;YAC5B,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACvB,GAAG,CAAC,KAAK,EAAE,CAAC;QACb,CAAC;IACF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;QAC9B,IAAI,QAAQ,CAAC,aAAa;YAAE,OAAO,SAAS,CAAC;QAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,KAAK,WAAW;YAAE,OAAO,SAAS,CAAC;QACzD,MAAM,QAAQ,GAAG,oBAAoB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACrD,IAAI,eAAe,CAAC,KAAK,EAAE,CAAC;YAC3B,eAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;YAC1C,OAAO,EAAE,mBAAmB,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC;YAC3D,eAAe,CAAC,0BAA0B,EAAE,CAAC,0BAA0B,CAAC,EAAE,OAAO,CAAC,CAAC;YACnF,YAAY,GAAG,iBAAiB,CAAC,0BAA0B,EAAE,6BAA6B,CAAC,CAAC;YAC5F,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC/B,MAAM,OAAO,GAAG,gBAAgB,CAAC;YACjC,gBAAgB,GAAG,IAAI,CAAC;YACxB,OAAO,EAAE,mBAAmB,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;YAClD,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;YACjE,YAAY,GAAG,iBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC1E,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,kBAAkB,KAAK,IAAI,EAAE,CAAC;YACjC,IAAI,QAAQ,KAAK,IAAI;gBAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACrE,MAAM,OAAO,GAAG,kBAAkB,CAAC;YACnC,kBAAkB,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC;gBACJ,MAAM,OAAO,GAAG,sBAAsB,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;gBAC/D,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;gBACzE,IAAI,OAAO,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;oBAC5B,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC;gBAC9B,CAAC;gBACD,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;gBAC5D,OAAO,EAAE,OAAO,EAAE,MAAyC,EAAE,CAAC;YAC/D,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAChB,EAAE,CAAC,WAAW,CAAC,wBAAwB,EAAE;oBACxC,OAAO,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;oBAC/D,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE;iBACd,CAAC,CAAC;gBACH,OAAO,SAAS,CAAC;YAClB,CAAC;QACF,CAAC;QACD,IAAI,QAAQ,KAAK,IAAI;YAAE,eAAe,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACrE,OAAO,SAAS,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,EAAE;QAC3B,IAAI,YAAY,KAAK,IAAI,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;YACrD,YAAY,GAAG,IAAI,CAAC;YACpB,OAAO;QACR,CAAC;QACD,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,YAAY,GAAG,IAAI,CAAC;QACpB,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACJ,CAAC","sourcesContent":["import { getKeybindings } from \"@earendil-works/pi-tui\";\n\nimport type { ExtensionAPI, ExtensionContext, MessageUpdateEvent } from \"../../types.ts\";\nimport { appendRuleActivation, registerRuleActivationRenderer } from \"../rule-activation/index.ts\";\nimport { BUILTIN_TTSR_RULES } from \"./builtin-rules.ts\";\nimport { registerTtsrCommands, type TtsrPublicState } from \"./commands.ts\";\nimport { claimAbort, createGenerationState, markUserCancelled } from \"./coordinator.ts\";\nimport { REPETITIVE_TURNS_RULE_NAME } from \"./detectors/repetitive-turns.ts\";\nimport { discoverTtsrRulesSync } from \"./discovery.ts\";\nimport { TtsrManager } from \"./manager.ts\";\nimport { REPETITIVE_TURNS_RULE_CONTENT } from \"./prompts.ts\";\nimport { buildNudgeMessage, type TtsrNudgeMessage } from \"./remediation.ts\";\nimport { collectAssistantText, RepetitiveTurnsLane, readPersistedAssistantTexts } from \"./repetitive-turns-lane.ts\";\nimport { compileRuleCondition } from \"./rule-condition.ts\";\nimport { buildStreamRemediation } from \"./stream-remediation.ts\";\nimport {\n\tDEFAULT_TTSR_SETTINGS,\n\ttype DetectionResolution,\n\ttype GenerationDetectionState,\n\tTTSR_INJECTION_CUSTOM_TYPE,\n\ttype TtsrRule,\n} from \"./types.ts\";\nimport { StreamWatcher } from \"./watch.ts\";\n\ninterface PendingRemediation {\n\treadonly resolution: DetectionResolution;\n\treadonly streamKind: \"text\" | \"thinking\";\n}\n\ninterface PendingRuleNudge {\n\treadonly rule: TtsrRule;\n}\n\nconst INTERRUPT_KEYBINDING = \"app.interrupt\";\n\nfunction isInterruptKey(data: string): boolean {\n\ttry {\n\t\treturn getKeybindings().matches(data, INTERRUPT_KEYBINDING);\n\t} catch {\n\t\treturn false;\n\t}\n}\n\nfunction parseDisabledRules(raw: boolean | string | undefined): string[] {\n\treturn typeof raw === \"string\" && raw.length > 0\n\t\t? raw\n\t\t\t\t.split(\",\")\n\t\t\t\t.map((name) => name.trim())\n\t\t\t\t.filter((name) => name.length > 0)\n\t\t: [];\n}\n\nexport default function ttsrExtension(pi: ExtensionAPI): void {\n\tregisterRuleActivationRenderer(pi);\n\tpi.registerFlag(\"ttsr-disabled\", {\n\t\ttype: \"boolean\",\n\t\tdefault: false,\n\t\tdescription: \"Disable TTSR stream-rule detection.\",\n\t});\n\tpi.registerFlag(\"ttsr-rules-disabled\", {\n\t\ttype: \"string\",\n\t\tdefault: \"\",\n\t\tdescription: \"Comma-separated TTSR rule names to disable.\",\n\t});\n\n\tlet manager: TtsrManager | null = null;\n\tlet watcher: StreamWatcher | null = null;\n\tlet genState: GenerationDetectionState = createGenerationState();\n\tlet generation = 0;\n\tlet pendingRemediation: PendingRemediation | null = null;\n\tlet pendingRuleNudge: PendingRuleNudge | null = null;\n\tlet pendingNudge: TtsrNudgeMessage | null = null;\n\tlet disabled = false;\n\tconst repetitiveTurns = new RepetitiveTurnsLane();\n\n\tfunction cancelRemediation(): void {\n\t\tif (pendingRemediation !== null || pendingNudge !== null || pendingRuleNudge !== null) {\n\t\t\tmarkUserCancelled(genState);\n\t\t\tpendingRemediation = null;\n\t\t\tpendingRuleNudge = null;\n\t\t\tpendingNudge = null;\n\t\t\trepetitiveTurns.disarm();\n\t\t}\n\t}\n\n\tfunction recordInjection(owner: string, observed: readonly string[], retryMode: \"nudge\" | \"provider-error\"): void {\n\t\tpi.appendEntry(TTSR_INJECTION_CUSTOM_TYPE, {\n\t\t\trules: observed,\n\t\t\towner,\n\t\t\tremediation: retryMode,\n\t\t\tat: Date.now(),\n\t\t});\n\t\tappendRuleActivation(pi, {\n\t\t\tkind: \"ttsr\",\n\t\t\towner,\n\t\t\trules: observed,\n\t\t\tremediation: retryMode,\n\t\t});\n\t}\n\n\tfunction notify(ctx: ExtensionContext, owner: string): void {\n\t\tif (ctx.mode !== \"tui\") return;\n\t\ttry {\n\t\t\tctx.ui.notify(`Stream rule triggered: ${owner}`, \"warning\");\n\t\t} catch {\n\t\t\treturn;\n\t\t}\n\t}\n\n\tfunction ensureInitialized(ctx: ExtensionContext): void {\n\t\tif (manager !== null) return;\n\t\tdisabled = pi.getFlag(\"ttsr-disabled\") === true;\n\t\tconst disabledRules = parseDisabledRules(pi.getFlag(\"ttsr-rules-disabled\"));\n\t\trepetitiveTurns.configure(new Set(disabledRules));\n\t\tconst settings = { ...DEFAULT_TTSR_SETTINGS, enabled: !disabled, disabledRules };\n\t\tmanager = new TtsrManager(settings, (pattern) => compileRuleCondition(pattern).regex);\n\t\tconst injectedNames = ctx.sessionManager\n\t\t\t.getEntries()\n\t\t\t.filter((entry) => entry.type === \"custom\" && entry.customType === TTSR_INJECTION_CUSTOM_TYPE)\n\t\t\t.flatMap((entry) => {\n\t\t\t\tconst data = entry.type === \"custom\" ? entry.data : undefined;\n\t\t\t\tif (typeof data !== \"object\" || data === null || !(\"rules\" in data)) return [];\n\t\t\t\tconst rules = (data as { rules?: unknown }).rules;\n\t\t\t\treturn Array.isArray(rules) ? rules.filter((rule): rule is string => typeof rule === \"string\") : [];\n\t\t\t});\n\t\tmanager.restoreInjected(injectedNames);\n\t\tfor (const rule of BUILTIN_TTSR_RULES) {\n\t\t\tmanager.addRule(rule);\n\t\t}\n\t\tconst discovered = discoverTtsrRulesSync(ctx.cwd);\n\t\tfor (const rule of discovered.rules) {\n\t\t\tmanager.addRule(rule);\n\t\t}\n\t\twatcher = new StreamWatcher(manager, disabledRules);\n\t\trepetitiveTurns.restoreFromHistory(readPersistedAssistantTexts(ctx));\n\t\tif (ctx.mode === \"tui\") {\n\t\t\ttry {\n\t\t\t\tctx.ui.onTerminalInput((data) => {\n\t\t\t\t\tif (isInterruptKey(data)) cancelRemediation();\n\t\t\t\t});\n\t\t\t} catch {\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t}\n\n\tfunction publicState(): TtsrPublicState {\n\t\treturn {\n\t\t\trules: manager?.getRules() ?? [],\n\t\t\tinjectedRuleNames: manager?.getInjectedRuleNames() ?? [],\n\t\t\tdisabled,\n\t\t};\n\t}\n\n\tregisterTtsrCommands(pi, publicState);\n\n\tpi.on(\"session_start\", (_event, ctx) => {\n\t\tensureInitialized(ctx);\n\t});\n\n\tpi.on(\"session_abort\", () => {\n\t\tcancelRemediation();\n\t});\n\n\tpi.on(\"input\", () => {\n\t\tcancelRemediation();\n\t});\n\n\tpi.on(\"turn_start\", (_event, ctx) => {\n\t\tensureInitialized(ctx);\n\t\tgeneration += 1;\n\t\tgenState = createGenerationState();\n\t\tpendingRemediation = null;\n\t\tpendingRuleNudge = null;\n\t\trepetitiveTurns.resetTurn();\n\t\twatcher?.reset();\n\t});\n\n\tpi.on(\"turn_end\", () => {\n\t\tmanager?.incrementMessageCount();\n\t});\n\n\tpi.on(\"message_update\", (event: MessageUpdateEvent, ctx) => {\n\t\tensureInitialized(ctx);\n\t\tif (disabled || manager === null || watcher === null) return;\n\t\tconst deltaEvent = event.assistantMessageEvent;\n\t\tif (deltaEvent.type !== \"text_delta\" && deltaEvent.type !== \"thinking_delta\") return;\n\t\tconst source = deltaEvent.type === \"text_delta\" ? \"text\" : \"thinking\";\n\t\tconst streamKey = `${source}:${String(deltaEvent.contentIndex)}`;\n\t\tconst outcome = watcher.handleDelta(source, streamKey, deltaEvent.delta, generation);\n\t\tif (outcome.resolution !== null && claimAbort(genState, outcome.resolution)) {\n\t\t\tpendingRemediation = { resolution: outcome.resolution, streamKind: source };\n\t\t\tnotify(ctx, outcome.resolution.owner);\n\t\t\tctx.abort();\n\t\t\treturn;\n\t\t}\n\t\tif (source === \"text\") {\n\t\t\tconst canArm = pendingRuleNudge === null && !genState.abortClaimed;\n\t\t\tif (repetitiveTurns.observeTextDelta(deltaEvent.delta, canArm) && !genState.abortClaimed) {\n\t\t\t\tgenState.abortClaimed = true;\n\t\t\t\tgenState.abortOwner = \"collapse-repetition\";\n\t\t\t\tgenState.selfAbortAt = Date.now();\n\t\t\t\tnotify(ctx, REPETITIVE_TURNS_RULE_NAME);\n\t\t\t\tctx.abort();\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\tconst interrupting = outcome.ruleMatches.filter((rule) => rule.interruptMode === \"always\");\n\t\tconst rule = interrupting[0];\n\t\tif (rule !== undefined && pendingRuleNudge === null && !genState.abortClaimed) {\n\t\t\tgenState.abortClaimed = true;\n\t\t\tgenState.abortOwner = \"collapse-repetition\";\n\t\t\tgenState.selfAbortAt = Date.now();\n\t\t\tpendingRuleNudge = { rule };\n\t\t\tnotify(ctx, rule.name);\n\t\t\tctx.abort();\n\t\t}\n\t});\n\n\tpi.on(\"message_end\", (event) => {\n\t\tif (genState.userCancelled) return undefined;\n\t\tif (event.message.role !== \"assistant\") return undefined;\n\t\tconst turnText = collectAssistantText(event.message);\n\t\tif (repetitiveTurns.armed) {\n\t\t\trepetitiveTurns.commitArmedTurn(turnText);\n\t\t\tmanager?.markInjectedByNames([REPETITIVE_TURNS_RULE_NAME]);\n\t\t\trecordInjection(REPETITIVE_TURNS_RULE_NAME, [REPETITIVE_TURNS_RULE_NAME], \"nudge\");\n\t\t\tpendingNudge = buildNudgeMessage(REPETITIVE_TURNS_RULE_NAME, REPETITIVE_TURNS_RULE_CONTENT);\n\t\t\treturn undefined;\n\t\t}\n\t\tif (pendingRuleNudge !== null) {\n\t\t\tconst pending = pendingRuleNudge;\n\t\t\tpendingRuleNudge = null;\n\t\t\tmanager?.markInjectedByNames([pending.rule.name]);\n\t\t\trecordInjection(pending.rule.name, [pending.rule.name], \"nudge\");\n\t\t\tpendingNudge = buildNudgeMessage(pending.rule.name, pending.rule.content);\n\t\t\treturn undefined;\n\t\t}\n\t\tif (pendingRemediation !== null) {\n\t\t\tif (turnText !== null) repetitiveTurns.recordCompletedTurn(turnText);\n\t\t\tconst pending = pendingRemediation;\n\t\t\tpendingRemediation = null;\n\t\t\ttry {\n\t\t\t\tconst outcome = buildStreamRemediation(pending, event.message);\n\t\t\t\trecordInjection(outcome.owner, outcome.observedRules, outcome.retryMode);\n\t\t\t\tif (outcome.nudge !== null) {\n\t\t\t\t\tpendingNudge = outcome.nudge;\n\t\t\t\t}\n\t\t\t\tconst merged = { ...event.message, ...outcome.replacement };\n\t\t\t\treturn { message: merged as unknown as typeof event.message };\n\t\t\t} catch (error) {\n\t\t\t\tpi.appendEntry(\"ttsr-remediation-error\", {\n\t\t\t\t\tmessage: error instanceof Error ? error.message : String(error),\n\t\t\t\t\tat: Date.now(),\n\t\t\t\t});\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t}\n\t\tif (turnText !== null) repetitiveTurns.recordCompletedTurn(turnText);\n\t\treturn undefined;\n\t});\n\n\tpi.on(\"agent_settled\", () => {\n\t\tif (pendingNudge === null || genState.userCancelled) {\n\t\t\tpendingNudge = null;\n\t\t\treturn;\n\t\t}\n\t\tconst nudge = pendingNudge;\n\t\tpendingNudge = null;\n\t\tpi.sendMessage(nudge, { triggerTurn: true });\n\t});\n}\n"]}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/core/extensions/builtin/ttsr/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { getKeybindings } from \"@earendil-works/pi-tui\";\n\nimport type { AgentEndEvent, ExtensionAPI, ExtensionContext, MessageUpdateEvent } from \"../../types.ts\";\nimport { appendRuleActivation, registerRuleActivationRenderer } from \"../rule-activation/index.ts\";\nimport { parseRuleActivationDetails, RULE_ACTIVATION_ENTRY_TYPE } from \"../rule-activation/types.ts\";\nimport { BUILTIN_TTSR_RULES } from \"./builtin-rules.ts\";\nimport { registerTtsrCommands, type TtsrPublicState } from \"./commands.ts\";\nimport { claimAbort, createGenerationState, markUserCancelled } from \"./coordinator.ts\";\nimport { REPETITIVE_TURNS_RULE_NAME } from \"./detectors/repetitive-turns.ts\";\nimport { discoverTtsrRulesSync } from \"./discovery.ts\";\nimport { TtsrManager } from \"./manager.ts\";\nimport { REPETITIVE_TURNS_RULE_CONTENT } from \"./prompts.ts\";\nimport { buildNudgeMessage, type TtsrNudgeMessage } from \"./remediation.ts\";\nimport { collectAssistantText, RepetitiveTurnsLane, readPersistedAssistantTexts } from \"./repetitive-turns-lane.ts\";\nimport { compileRuleCondition } from \"./rule-condition.ts\";\nimport { buildStreamRemediation } from \"./stream-remediation.ts\";\nimport {\n\tDEFAULT_TTSR_SETTINGS,\n\ttype DetectionResolution,\n\ttype GenerationDetectionState,\n\tTTSR_INJECTION_CUSTOM_TYPE,\n\ttype TtsrRule,\n} from \"./types.ts\";\nimport { StreamWatcher } from \"./watch.ts\";\n\ninterface PendingRemediation {\n\treadonly resolution: DetectionResolution;\n\treadonly streamKind: \"text\" | \"thinking\";\n}\n\ninterface PendingRuleNudge {\n\treadonly rule: TtsrRule;\n}\n\nconst INTERRUPT_KEYBINDING = \"app.interrupt\";\n\nfunction isInterruptKey(data: string): boolean {\n\ttry {\n\t\treturn getKeybindings().matches(data, INTERRUPT_KEYBINDING);\n\t} catch {\n\t\treturn false;\n\t}\n}\n\nfunction parseDisabledRules(raw: boolean | string | undefined): string[] {\n\treturn typeof raw === \"string\" && raw.length > 0\n\t\t? raw\n\t\t\t\t.split(\",\")\n\t\t\t\t.map((name) => name.trim())\n\t\t\t\t.filter((name) => name.length > 0)\n\t\t: [];\n}\n\nexport default function ttsrExtension(pi: ExtensionAPI): void {\n\tregisterRuleActivationRenderer(pi);\n\tpi.registerFlag(\"ttsr-disabled\", {\n\t\ttype: \"boolean\",\n\t\tdefault: false,\n\t\tdescription: \"Disable TTSR stream-rule detection.\",\n\t});\n\tpi.registerFlag(\"ttsr-rules-disabled\", {\n\t\ttype: \"string\",\n\t\tdefault: \"\",\n\t\tdescription: \"Comma-separated TTSR rule names to disable.\",\n\t});\n\n\tlet manager: TtsrManager | null = null;\n\tlet watcher: StreamWatcher | null = null;\n\tlet genState: GenerationDetectionState = createGenerationState();\n\tlet generation = 0;\n\tlet pendingRemediation: PendingRemediation | null = null;\n\tlet pendingRuleNudge: PendingRuleNudge | null = null;\n\tlet pendingNudge: TtsrNudgeMessage | null = null;\n\tlet settlingAgentEnd: AgentEndEvent | null = null;\n\tlet disabled = false;\n\tconst repetitiveTurns = new RepetitiveTurnsLane();\n\n\tfunction cancelRemediation(): void {\n\t\tif (pendingRemediation !== null || pendingNudge !== null || pendingRuleNudge !== null) {\n\t\t\tmarkUserCancelled(genState);\n\t\t\tpendingRemediation = null;\n\t\t\tpendingRuleNudge = null;\n\t\t\tpendingNudge = null;\n\t\t\trepetitiveTurns.disarm();\n\t\t}\n\t}\n\n\tfunction resetGenerationState(): void {\n\t\tgeneration += 1;\n\t\tgenState = createGenerationState();\n\t\tpendingRemediation = null;\n\t\tpendingRuleNudge = null;\n\t\trepetitiveTurns.resetTurn();\n\t\twatcher?.reset();\n\t}\n\n\tfunction recordInjection(owner: string, observed: readonly string[], retryMode: \"nudge\" | \"provider-error\"): void {\n\t\tappendRuleActivation(pi, {\n\t\t\tkind: \"ttsr\",\n\t\t\towner,\n\t\t\trules: observed,\n\t\t\tremediation: retryMode,\n\t\t});\n\t}\n\n\tfunction ensureInitialized(ctx: ExtensionContext): void {\n\t\tif (manager !== null) return;\n\t\tdisabled = pi.getFlag(\"ttsr-disabled\") === true;\n\t\tconst disabledRules = parseDisabledRules(pi.getFlag(\"ttsr-rules-disabled\"));\n\t\trepetitiveTurns.configure(new Set(disabledRules));\n\t\tconst settings = { ...DEFAULT_TTSR_SETTINGS, enabled: !disabled, disabledRules };\n\t\tmanager = new TtsrManager(settings, (pattern) => compileRuleCondition(pattern).regex);\n\t\tconst injectedNames = ctx.sessionManager.getEntries().flatMap((entry) => {\n\t\t\tif (entry.type !== \"custom\") return [];\n\t\t\tif (entry.customType === RULE_ACTIVATION_ENTRY_TYPE) {\n\t\t\t\tconst details = parseRuleActivationDetails(entry.data);\n\t\t\t\treturn details?.kind === \"ttsr\" ? [...details.rules] : [];\n\t\t\t}\n\t\t\tif (entry.customType !== TTSR_INJECTION_CUSTOM_TYPE) return [];\n\t\t\tconst data = entry.data;\n\t\t\tif (typeof data !== \"object\" || data === null || !(\"rules\" in data)) return [];\n\t\t\tconst rules = (data as { rules?: unknown }).rules;\n\t\t\treturn Array.isArray(rules) ? rules.filter((rule): rule is string => typeof rule === \"string\") : [];\n\t\t});\n\t\tmanager.restoreInjected(injectedNames);\n\t\tfor (const rule of BUILTIN_TTSR_RULES) {\n\t\t\tmanager.addRule(rule);\n\t\t}\n\t\tconst discovered = discoverTtsrRulesSync(ctx.cwd);\n\t\tfor (const rule of discovered.rules) {\n\t\t\tmanager.addRule(rule);\n\t\t}\n\t\twatcher = new StreamWatcher(manager, disabledRules);\n\t\trepetitiveTurns.restoreFromHistory(readPersistedAssistantTexts(ctx));\n\t\tif (ctx.mode === \"tui\") {\n\t\t\ttry {\n\t\t\t\tctx.ui.onTerminalInput((data) => {\n\t\t\t\t\tif (isInterruptKey(data)) cancelRemediation();\n\t\t\t\t});\n\t\t\t} catch {\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t}\n\n\tfunction publicState(): TtsrPublicState {\n\t\treturn {\n\t\t\trules: manager?.getRules() ?? [],\n\t\t\tinjectedRuleNames: manager?.getInjectedRuleNames() ?? [],\n\t\t\tdisabled,\n\t\t};\n\t}\n\n\tregisterTtsrCommands(pi, publicState);\n\n\tpi.on(\"session_start\", (_event, ctx) => {\n\t\tensureInitialized(ctx);\n\t});\n\n\tpi.on(\"session_abort\", () => {\n\t\tcancelRemediation();\n\t});\n\n\tpi.on(\"input\", () => {\n\t\tcancelRemediation();\n\t});\n\n\tpi.on(\"agent_end\", (event) => {\n\t\tsettlingAgentEnd = event;\n\t\tif (event.abortSource === \"user\") {\n\t\t\tcancelRemediation();\n\t\t\treturn;\n\t\t}\n\t\tif (event.willRetry === true) resetGenerationState();\n\t});\n\n\tpi.on(\"turn_start\", (_event, ctx) => {\n\t\tensureInitialized(ctx);\n\t\tresetGenerationState();\n\t});\n\n\tpi.on(\"turn_end\", () => {\n\t\tmanager?.incrementMessageCount();\n\t});\n\n\tpi.on(\"message_update\", (event: MessageUpdateEvent, ctx) => {\n\t\tensureInitialized(ctx);\n\t\tif (disabled || manager === null || watcher === null) return;\n\t\tconst deltaEvent = event.assistantMessageEvent;\n\t\tif (deltaEvent.type !== \"text_delta\" && deltaEvent.type !== \"thinking_delta\") return;\n\t\tconst source = deltaEvent.type === \"text_delta\" ? \"text\" : \"thinking\";\n\t\tconst streamKey = `${source}:${String(deltaEvent.contentIndex)}`;\n\t\tconst outcome = watcher.handleDelta(source, streamKey, deltaEvent.delta, generation);\n\t\tif (outcome.resolution !== null && claimAbort(genState, outcome.resolution)) {\n\t\t\tpendingRemediation = { resolution: outcome.resolution, streamKind: source };\n\t\t\tctx.abort(\"system\");\n\t\t\treturn;\n\t\t}\n\t\tif (source === \"text\") {\n\t\t\tconst canArm = pendingRuleNudge === null && !genState.abortClaimed;\n\t\t\tif (repetitiveTurns.observeTextDelta(deltaEvent.delta, canArm) && !genState.abortClaimed) {\n\t\t\t\tgenState.abortClaimed = true;\n\t\t\t\tgenState.abortOwner = \"collapse-repetition\";\n\t\t\t\tgenState.selfAbortAt = Date.now();\n\t\t\t\tctx.abort(\"system\");\n\t\t\t\treturn;\n\t\t\t}\n\t\t}\n\t\tconst interrupting = outcome.ruleMatches.filter((rule) => rule.interruptMode === \"always\");\n\t\tconst rule = interrupting[0];\n\t\tif (rule !== undefined && pendingRuleNudge === null && !genState.abortClaimed) {\n\t\t\tgenState.abortClaimed = true;\n\t\t\tgenState.abortOwner = \"collapse-repetition\";\n\t\t\tgenState.selfAbortAt = Date.now();\n\t\t\tpendingRuleNudge = { rule };\n\t\t\tctx.abort(\"system\");\n\t\t}\n\t});\n\n\tpi.on(\"message_end\", (event) => {\n\t\tif (genState.userCancelled) return undefined;\n\t\tif (event.message.role !== \"assistant\") return undefined;\n\t\tconst turnText = collectAssistantText(event.message);\n\t\tif (repetitiveTurns.armed) {\n\t\t\trepetitiveTurns.commitArmedTurn(turnText);\n\t\t\tmanager?.markInjectedByNames([REPETITIVE_TURNS_RULE_NAME]);\n\t\t\trecordInjection(REPETITIVE_TURNS_RULE_NAME, [REPETITIVE_TURNS_RULE_NAME], \"nudge\");\n\t\t\tpendingNudge = buildNudgeMessage(REPETITIVE_TURNS_RULE_NAME, REPETITIVE_TURNS_RULE_CONTENT);\n\t\t\treturn undefined;\n\t\t}\n\t\tif (pendingRuleNudge !== null) {\n\t\t\tconst pending = pendingRuleNudge;\n\t\t\tpendingRuleNudge = null;\n\t\t\tmanager?.markInjectedByNames([pending.rule.name]);\n\t\t\trecordInjection(pending.rule.name, [pending.rule.name], \"nudge\");\n\t\t\tpendingNudge = buildNudgeMessage(pending.rule.name, pending.rule.content);\n\t\t\treturn undefined;\n\t\t}\n\t\tif (pendingRemediation !== null) {\n\t\t\tif (turnText !== null) repetitiveTurns.recordCompletedTurn(turnText);\n\t\t\tconst pending = pendingRemediation;\n\t\t\tpendingRemediation = null;\n\t\t\ttry {\n\t\t\t\tconst outcome = buildStreamRemediation(pending, event.message);\n\t\t\t\trecordInjection(outcome.owner, outcome.observedRules, outcome.retryMode);\n\t\t\t\tif (outcome.nudge !== null) {\n\t\t\t\t\tpendingNudge = outcome.nudge;\n\t\t\t\t}\n\t\t\t\tconst merged = { ...event.message, ...outcome.replacement };\n\t\t\t\treturn { message: merged as unknown as typeof event.message };\n\t\t\t} catch (error) {\n\t\t\t\tpi.appendEntry(\"ttsr-remediation-error\", {\n\t\t\t\t\tmessage: error instanceof Error ? error.message : String(error),\n\t\t\t\t\tat: Date.now(),\n\t\t\t\t});\n\t\t\t\treturn undefined;\n\t\t\t}\n\t\t}\n\t\tif (turnText !== null) repetitiveTurns.recordCompletedTurn(turnText);\n\t\treturn undefined;\n\t});\n\n\tpi.on(\"agent_settled\", () => {\n\t\tif (pendingNudge === null || genState.userCancelled || settlingAgentEnd?.abortSource === \"user\") {\n\t\t\tpendingNudge = null;\n\t\t\tsettlingAgentEnd = null;\n\t\t\treturn;\n\t\t}\n\t\tconst nudge = pendingNudge;\n\t\tpendingNudge = null;\n\t\tpi.sendMessage(nudge, { triggerTurn: true });\n\t});\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/runner.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../../src/core/extensions/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -719,9 +719,9 @@ export class ExtensionRunner {
|
|
|
719
719
|
runner.assertActive();
|
|
720
720
|
return runner.getSignalFn();
|
|
721
721
|
},
|
|
722
|
-
abort: () => {
|
|
722
|
+
abort: (source) => {
|
|
723
723
|
runner.assertActive();
|
|
724
|
-
runner.abortFn();
|
|
724
|
+
runner.abortFn(source);
|
|
725
725
|
},
|
|
726
726
|
hasPendingMessages: () => {
|
|
727
727
|
runner.assertActive();
|