@zhijiewang/openharness 0.11.1 → 0.12.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +199 -23
- package/dist/DeferredTool.d.ts +34 -0
- package/dist/DeferredTool.d.ts.map +1 -0
- package/dist/DeferredTool.js +62 -0
- package/dist/DeferredTool.js.map +1 -0
- package/dist/DeferredTool.test.d.ts +2 -0
- package/dist/DeferredTool.test.d.ts.map +1 -0
- package/dist/DeferredTool.test.js +79 -0
- package/dist/DeferredTool.test.js.map +1 -0
- package/dist/agents/roles.d.ts.map +1 -1
- package/dist/agents/roles.js +20 -6
- package/dist/agents/roles.js.map +1 -1
- package/dist/agents/roles.test.js +26 -2
- package/dist/agents/roles.test.js.map +1 -1
- package/dist/harness/config.d.ts +15 -0
- package/dist/harness/config.d.ts.map +1 -1
- package/dist/harness/config.js +45 -23
- package/dist/harness/config.js.map +1 -1
- package/dist/harness/memory-consolidation.test.d.ts +2 -0
- package/dist/harness/memory-consolidation.test.d.ts.map +1 -0
- package/dist/harness/memory-consolidation.test.js +152 -0
- package/dist/harness/memory-consolidation.test.js.map +1 -0
- package/dist/harness/memory.d.ts +12 -0
- package/dist/harness/memory.d.ts.map +1 -1
- package/dist/harness/memory.js +53 -2
- package/dist/harness/memory.js.map +1 -1
- package/dist/harness/memory.test.js +43 -1
- package/dist/harness/memory.test.js.map +1 -1
- package/dist/harness/session.test.js +36 -0
- package/dist/harness/session.test.js.map +1 -1
- package/dist/harness/verification.d.ts +41 -0
- package/dist/harness/verification.d.ts.map +1 -0
- package/dist/harness/verification.js +197 -0
- package/dist/harness/verification.js.map +1 -0
- package/dist/harness/verification.test.d.ts +2 -0
- package/dist/harness/verification.test.d.ts.map +1 -0
- package/dist/harness/verification.test.js +181 -0
- package/dist/harness/verification.test.js.map +1 -0
- package/dist/query/index.d.ts.map +1 -1
- package/dist/query/index.js +9 -1
- package/dist/query/index.js.map +1 -1
- package/dist/query/tools.d.ts.map +1 -1
- package/dist/query/tools.js +30 -4
- package/dist/query/tools.js.map +1 -1
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +21 -0
- package/dist/repl.js.map +1 -1
- package/dist/services/AgentDispatcher.d.ts +1 -0
- package/dist/services/AgentDispatcher.d.ts.map +1 -1
- package/dist/services/AgentDispatcher.js +10 -1
- package/dist/services/AgentDispatcher.js.map +1 -1
- package/dist/services/CronExecutor.d.ts +38 -0
- package/dist/services/CronExecutor.d.ts.map +1 -0
- package/dist/services/CronExecutor.js +130 -0
- package/dist/services/CronExecutor.js.map +1 -0
- package/dist/services/CronExecutor.test.d.ts +2 -0
- package/dist/services/CronExecutor.test.d.ts.map +1 -0
- package/dist/services/CronExecutor.test.js +128 -0
- package/dist/services/CronExecutor.test.js.map +1 -0
- package/dist/services/StreamingToolExecutor.d.ts.map +1 -1
- package/dist/services/StreamingToolExecutor.js +28 -0
- package/dist/services/StreamingToolExecutor.js.map +1 -1
- package/dist/services/cron.d.ts +4 -0
- package/dist/services/cron.d.ts.map +1 -1
- package/dist/services/cron.js +27 -0
- package/dist/services/cron.js.map +1 -1
- package/dist/tools/AgentTool/index.d.ts +3 -0
- package/dist/tools/AgentTool/index.d.ts.map +1 -1
- package/dist/tools/AgentTool/index.js +17 -4
- package/dist/tools/AgentTool/index.js.map +1 -1
- package/dist/tools/MemoryTool/index.d.ts +2 -2
- package/dist/tools/ToolSearchTool/index.d.ts.map +1 -1
- package/dist/tools/ToolSearchTool/index.js +7 -0
- package/dist/tools/ToolSearchTool/index.js.map +1 -1
- package/dist/tools.d.ts +8 -0
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +40 -41
- package/dist/tools.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verification loops — auto-run lint/typecheck after file edits.
|
|
3
|
+
*
|
|
4
|
+
* After file-modifying tools (Edit, Write, MultiEdit) execute,
|
|
5
|
+
* runs language-appropriate verification commands and returns
|
|
6
|
+
* concise results to feed back into the agent loop.
|
|
7
|
+
*
|
|
8
|
+
* This is the single highest-impact harness engineering pattern —
|
|
9
|
+
* research shows 2-3x quality improvement from automated feedback.
|
|
10
|
+
*/
|
|
11
|
+
export type VerificationRule = {
|
|
12
|
+
extensions: string[];
|
|
13
|
+
lint?: string;
|
|
14
|
+
timeout?: number;
|
|
15
|
+
};
|
|
16
|
+
export type VerificationConfig = {
|
|
17
|
+
enabled: boolean;
|
|
18
|
+
mode: 'warn' | 'block';
|
|
19
|
+
rules: VerificationRule[];
|
|
20
|
+
};
|
|
21
|
+
export type VerificationResult = {
|
|
22
|
+
ran: boolean;
|
|
23
|
+
passed: boolean;
|
|
24
|
+
summary: string;
|
|
25
|
+
};
|
|
26
|
+
/** Detect verification rules from project files */
|
|
27
|
+
export declare function autoDetectRules(projectRoot?: string): VerificationRule[];
|
|
28
|
+
/** Get verification config from .oh/config.yaml or auto-detect */
|
|
29
|
+
export declare function getVerificationConfig(): VerificationConfig | null;
|
|
30
|
+
/** Clear cached config (for testing or after config changes) */
|
|
31
|
+
export declare function invalidateVerificationCache(): void;
|
|
32
|
+
/** Extract file paths from tool input that were modified */
|
|
33
|
+
export declare function extractFilePaths(toolName: string, toolInput: Record<string, unknown>): string[];
|
|
34
|
+
/**
|
|
35
|
+
* Run verification for multiple files. Aggregates results.
|
|
36
|
+
* Returns a single result summarizing all files checked.
|
|
37
|
+
*/
|
|
38
|
+
export declare function runVerificationForFiles(filePaths: string[], config: VerificationConfig): Promise<VerificationResult>;
|
|
39
|
+
/** Run verification for a single file. Returns result with concise summary. */
|
|
40
|
+
export declare function runVerification(filePath: string, config: VerificationConfig): Promise<VerificationResult>;
|
|
41
|
+
//# sourceMappingURL=verification.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verification.d.ts","sourceRoot":"","sources":["../../src/harness/verification.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AASH,MAAM,MAAM,gBAAgB,GAAG;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,OAAO,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAOF,mDAAmD;AACnD,wBAAgB,eAAe,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAmDxE;AAMD,kEAAkE;AAClE,wBAAgB,qBAAqB,IAAI,kBAAkB,GAAG,IAAI,CA6BjE;AAED,gEAAgE;AAChE,wBAAgB,2BAA2B,IAAI,IAAI,CAElD;AAID,4DAA4D;AAC5D,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAoB/F;AAwBD;;;GAGG;AACH,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,MAAM,EAAE,EACnB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CAoB7B;AAED,+EAA+E;AAC/E,wBAAsB,eAAe,CACnC,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAAC,kBAAkB,CAAC,CA+B7B"}
|
|
@@ -0,0 +1,197 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Verification loops — auto-run lint/typecheck after file edits.
|
|
3
|
+
*
|
|
4
|
+
* After file-modifying tools (Edit, Write, MultiEdit) execute,
|
|
5
|
+
* runs language-appropriate verification commands and returns
|
|
6
|
+
* concise results to feed back into the agent loop.
|
|
7
|
+
*
|
|
8
|
+
* This is the single highest-impact harness engineering pattern —
|
|
9
|
+
* research shows 2-3x quality improvement from automated feedback.
|
|
10
|
+
*/
|
|
11
|
+
import { execSync } from 'node:child_process';
|
|
12
|
+
import { existsSync } from 'node:fs';
|
|
13
|
+
import { extname, join } from 'node:path';
|
|
14
|
+
import { readOhConfig } from './config.js';
|
|
15
|
+
const MAX_SUMMARY_CHARS = 500;
|
|
16
|
+
const DEFAULT_TIMEOUT_MS = 10_000;
|
|
17
|
+
// ── Auto-detection ──
|
|
18
|
+
/** Detect verification rules from project files */
|
|
19
|
+
export function autoDetectRules(projectRoot) {
|
|
20
|
+
const root = projectRoot ?? process.cwd();
|
|
21
|
+
const rules = [];
|
|
22
|
+
// TypeScript
|
|
23
|
+
if (existsSync(join(root, 'tsconfig.json'))) {
|
|
24
|
+
rules.push({
|
|
25
|
+
extensions: ['.ts', '.tsx'],
|
|
26
|
+
lint: 'npx tsc --noEmit 2>&1 | head -20',
|
|
27
|
+
timeout: 15_000,
|
|
28
|
+
});
|
|
29
|
+
}
|
|
30
|
+
// ESLint (JS/TS)
|
|
31
|
+
const eslintConfigs = ['.eslintrc', '.eslintrc.js', '.eslintrc.json', '.eslintrc.yml', 'eslint.config.js', 'eslint.config.mjs'];
|
|
32
|
+
if (eslintConfigs.some(f => existsSync(join(root, f)))) {
|
|
33
|
+
rules.push({
|
|
34
|
+
extensions: ['.js', '.jsx', '.ts', '.tsx'],
|
|
35
|
+
lint: 'npx eslint {file} --no-color 2>&1 | head -15',
|
|
36
|
+
timeout: 10_000,
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
// Python — ruff (fast) or pylint
|
|
40
|
+
if (existsSync(join(root, 'pyproject.toml')) || existsSync(join(root, 'setup.py'))) {
|
|
41
|
+
rules.push({
|
|
42
|
+
extensions: ['.py'],
|
|
43
|
+
lint: 'ruff check {file} 2>&1 | head -10',
|
|
44
|
+
timeout: 10_000,
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
// Go
|
|
48
|
+
if (existsSync(join(root, 'go.mod'))) {
|
|
49
|
+
rules.push({
|
|
50
|
+
extensions: ['.go'],
|
|
51
|
+
lint: 'go vet ./... 2>&1 | head -10',
|
|
52
|
+
timeout: 15_000,
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
// Rust
|
|
56
|
+
if (existsSync(join(root, 'Cargo.toml'))) {
|
|
57
|
+
rules.push({
|
|
58
|
+
extensions: ['.rs'],
|
|
59
|
+
lint: 'cargo check 2>&1 | tail -10',
|
|
60
|
+
timeout: 30_000,
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
return rules;
|
|
64
|
+
}
|
|
65
|
+
// ── Config ──
|
|
66
|
+
let _cachedConfig;
|
|
67
|
+
/** Get verification config from .oh/config.yaml or auto-detect */
|
|
68
|
+
export function getVerificationConfig() {
|
|
69
|
+
if (_cachedConfig !== undefined)
|
|
70
|
+
return _cachedConfig;
|
|
71
|
+
const ohConfig = readOhConfig();
|
|
72
|
+
if (ohConfig?.verification) {
|
|
73
|
+
const v = ohConfig.verification;
|
|
74
|
+
// Explicitly disabled
|
|
75
|
+
if (v.enabled === false) {
|
|
76
|
+
_cachedConfig = null;
|
|
77
|
+
return null;
|
|
78
|
+
}
|
|
79
|
+
_cachedConfig = {
|
|
80
|
+
enabled: true,
|
|
81
|
+
mode: v.mode ?? 'warn',
|
|
82
|
+
rules: v.rules ?? autoDetectRules(),
|
|
83
|
+
};
|
|
84
|
+
return _cachedConfig;
|
|
85
|
+
}
|
|
86
|
+
// Auto-detect if no config
|
|
87
|
+
const autoRules = autoDetectRules();
|
|
88
|
+
if (autoRules.length === 0) {
|
|
89
|
+
_cachedConfig = null;
|
|
90
|
+
return null;
|
|
91
|
+
}
|
|
92
|
+
_cachedConfig = { enabled: true, mode: 'warn', rules: autoRules };
|
|
93
|
+
return _cachedConfig;
|
|
94
|
+
}
|
|
95
|
+
/** Clear cached config (for testing or after config changes) */
|
|
96
|
+
export function invalidateVerificationCache() {
|
|
97
|
+
_cachedConfig = undefined;
|
|
98
|
+
}
|
|
99
|
+
// ── File path extraction ──
|
|
100
|
+
/** Extract file paths from tool input that were modified */
|
|
101
|
+
export function extractFilePaths(toolName, toolInput) {
|
|
102
|
+
switch (toolName) {
|
|
103
|
+
case 'Write':
|
|
104
|
+
case 'Edit':
|
|
105
|
+
return toolInput.file_path ? [String(toolInput.file_path)] : [];
|
|
106
|
+
case 'MultiEdit':
|
|
107
|
+
// MultiEdit has an array of edits, each with file_path
|
|
108
|
+
if (Array.isArray(toolInput.edits)) {
|
|
109
|
+
const paths = new Set();
|
|
110
|
+
for (const edit of toolInput.edits) {
|
|
111
|
+
if (edit && typeof edit === 'object' && 'file_path' in edit) {
|
|
112
|
+
paths.add(String(edit.file_path));
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
return [...paths];
|
|
116
|
+
}
|
|
117
|
+
return toolInput.file_path ? [String(toolInput.file_path)] : [];
|
|
118
|
+
default:
|
|
119
|
+
return [];
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
// ── Verification execution ──
|
|
123
|
+
/** Find the matching rule for a file extension */
|
|
124
|
+
function findRule(filePath, rules) {
|
|
125
|
+
const ext = extname(filePath).toLowerCase();
|
|
126
|
+
return rules.find(r => r.extensions.includes(ext)) ?? null;
|
|
127
|
+
}
|
|
128
|
+
/**
|
|
129
|
+
* Shell-escape a file path to prevent command injection.
|
|
130
|
+
* Wraps in single quotes and escapes any embedded single quotes.
|
|
131
|
+
*/
|
|
132
|
+
function shellEscape(s) {
|
|
133
|
+
// On Windows, use double quotes; on POSIX, use single quotes
|
|
134
|
+
if (process.platform === 'win32') {
|
|
135
|
+
// Double-quote and escape internal double quotes and special chars
|
|
136
|
+
return `"${s.replace(/"/g, '\\"')}"`;
|
|
137
|
+
}
|
|
138
|
+
// POSIX: single-quote and escape embedded single quotes
|
|
139
|
+
return `'${s.replace(/'/g, "'\\''")}'`;
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Run verification for multiple files. Aggregates results.
|
|
143
|
+
* Returns a single result summarizing all files checked.
|
|
144
|
+
*/
|
|
145
|
+
export async function runVerificationForFiles(filePaths, config) {
|
|
146
|
+
if (filePaths.length === 0)
|
|
147
|
+
return { ran: false, passed: true, summary: '' };
|
|
148
|
+
if (filePaths.length === 1)
|
|
149
|
+
return runVerification(filePaths[0], config);
|
|
150
|
+
const results = [];
|
|
151
|
+
for (const fp of filePaths) {
|
|
152
|
+
results.push(await runVerification(fp, config));
|
|
153
|
+
}
|
|
154
|
+
const ran = results.some(r => r.ran);
|
|
155
|
+
const passed = results.every(r => r.passed);
|
|
156
|
+
const failures = results.filter(r => r.ran && !r.passed);
|
|
157
|
+
if (!ran)
|
|
158
|
+
return { ran: false, passed: true, summary: '' };
|
|
159
|
+
if (passed)
|
|
160
|
+
return { ran: true, passed: true, summary: '' };
|
|
161
|
+
// Aggregate failure summaries (cap total to MAX_SUMMARY_CHARS)
|
|
162
|
+
const summaryParts = failures.map(r => r.summary).filter(Boolean);
|
|
163
|
+
const summary = summaryParts.join('\n---\n').slice(0, MAX_SUMMARY_CHARS);
|
|
164
|
+
return { ran: true, passed: false, summary };
|
|
165
|
+
}
|
|
166
|
+
/** Run verification for a single file. Returns result with concise summary. */
|
|
167
|
+
export async function runVerification(filePath, config) {
|
|
168
|
+
const rule = findRule(filePath, config.rules);
|
|
169
|
+
if (!rule || !rule.lint) {
|
|
170
|
+
return { ran: false, passed: true, summary: '' };
|
|
171
|
+
}
|
|
172
|
+
const command = rule.lint.replace(/\{file\}/g, shellEscape(filePath));
|
|
173
|
+
const timeout = rule.timeout ?? DEFAULT_TIMEOUT_MS;
|
|
174
|
+
try {
|
|
175
|
+
execSync(command, {
|
|
176
|
+
timeout,
|
|
177
|
+
cwd: process.cwd(),
|
|
178
|
+
encoding: 'utf-8',
|
|
179
|
+
stdio: ['pipe', 'pipe', 'pipe'],
|
|
180
|
+
windowsHide: true,
|
|
181
|
+
});
|
|
182
|
+
// Exit code 0 = passed
|
|
183
|
+
return { ran: true, passed: true, summary: '' };
|
|
184
|
+
}
|
|
185
|
+
catch (err) {
|
|
186
|
+
// Timeout detection — check killed flag, signal, or error code
|
|
187
|
+
const isTimeout = err.killed || err.signal === 'SIGTERM' || err.code === 'ETIMEDOUT'
|
|
188
|
+
|| (err.status === null && err.signal);
|
|
189
|
+
if (isTimeout) {
|
|
190
|
+
return { ran: true, passed: false, summary: `Verification timed out after ${timeout / 1000}s` };
|
|
191
|
+
}
|
|
192
|
+
const output = String(err.stdout ?? err.stderr ?? err.message ?? 'Unknown error');
|
|
193
|
+
const summary = output.slice(0, MAX_SUMMARY_CHARS).trim();
|
|
194
|
+
return { ran: true, passed: false, summary };
|
|
195
|
+
}
|
|
196
|
+
}
|
|
197
|
+
//# sourceMappingURL=verification.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verification.js","sourceRoot":"","sources":["../../src/harness/verification.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verification.test.d.ts","sourceRoot":"","sources":["../../src/harness/verification.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { describe, it, beforeEach } from 'node:test';
|
|
2
|
+
import assert from 'node:assert/strict';
|
|
3
|
+
import { makeTmpDir, writeFile } from '../test-helpers.js';
|
|
4
|
+
import { autoDetectRules, extractFilePaths, runVerification, runVerificationForFiles, getVerificationConfig, invalidateVerificationCache, } from './verification.js';
|
|
5
|
+
describe('verification loops', () => {
|
|
6
|
+
let tmp;
|
|
7
|
+
beforeEach(() => {
|
|
8
|
+
tmp = makeTmpDir();
|
|
9
|
+
invalidateVerificationCache();
|
|
10
|
+
});
|
|
11
|
+
describe('autoDetectRules', () => {
|
|
12
|
+
it('detects TypeScript rules when tsconfig.json exists', () => {
|
|
13
|
+
writeFile(tmp, 'tsconfig.json', '{}');
|
|
14
|
+
const rules = autoDetectRules(tmp);
|
|
15
|
+
assert.ok(rules.length > 0);
|
|
16
|
+
const tsRule = rules.find(r => r.extensions.includes('.ts'));
|
|
17
|
+
assert.ok(tsRule, 'should find a TypeScript rule');
|
|
18
|
+
assert.ok(tsRule.lint, 'TypeScript rule should have a lint command');
|
|
19
|
+
});
|
|
20
|
+
it('detects Python rules when pyproject.toml exists', () => {
|
|
21
|
+
writeFile(tmp, 'pyproject.toml', '[project]\nname = "test"');
|
|
22
|
+
const rules = autoDetectRules(tmp);
|
|
23
|
+
const pyRule = rules.find(r => r.extensions.includes('.py'));
|
|
24
|
+
assert.ok(pyRule, 'should find a Python rule');
|
|
25
|
+
});
|
|
26
|
+
it('detects Go rules when go.mod exists', () => {
|
|
27
|
+
writeFile(tmp, 'go.mod', 'module test');
|
|
28
|
+
const rules = autoDetectRules(tmp);
|
|
29
|
+
const goRule = rules.find(r => r.extensions.includes('.go'));
|
|
30
|
+
assert.ok(goRule, 'should find a Go rule');
|
|
31
|
+
});
|
|
32
|
+
it('returns empty array for bare directory', () => {
|
|
33
|
+
const rules = autoDetectRules(tmp);
|
|
34
|
+
assert.deepStrictEqual(rules, []);
|
|
35
|
+
});
|
|
36
|
+
});
|
|
37
|
+
describe('extractFilePaths', () => {
|
|
38
|
+
it('extracts path from Edit tool input', () => {
|
|
39
|
+
const paths = extractFilePaths('Edit', { file_path: '/tmp/foo.ts', old_string: 'a', new_string: 'b' });
|
|
40
|
+
assert.deepStrictEqual(paths, ['/tmp/foo.ts']);
|
|
41
|
+
});
|
|
42
|
+
it('extracts path from Write tool input', () => {
|
|
43
|
+
const paths = extractFilePaths('Write', { file_path: '/tmp/bar.ts', content: 'hello' });
|
|
44
|
+
assert.deepStrictEqual(paths, ['/tmp/bar.ts']);
|
|
45
|
+
});
|
|
46
|
+
it('extracts multiple paths from MultiEdit input', () => {
|
|
47
|
+
const paths = extractFilePaths('MultiEdit', {
|
|
48
|
+
edits: [
|
|
49
|
+
{ file_path: '/tmp/a.ts', old_string: 'x', new_string: 'y' },
|
|
50
|
+
{ file_path: '/tmp/b.ts', old_string: 'x', new_string: 'y' },
|
|
51
|
+
{ file_path: '/tmp/a.ts', old_string: 'z', new_string: 'w' }, // duplicate
|
|
52
|
+
],
|
|
53
|
+
});
|
|
54
|
+
assert.deepStrictEqual(paths, ['/tmp/a.ts', '/tmp/b.ts']);
|
|
55
|
+
});
|
|
56
|
+
it('returns empty for unknown tool', () => {
|
|
57
|
+
assert.deepStrictEqual(extractFilePaths('Bash', { command: 'echo hi' }), []);
|
|
58
|
+
});
|
|
59
|
+
it('returns empty when file_path missing', () => {
|
|
60
|
+
assert.deepStrictEqual(extractFilePaths('Edit', {}), []);
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
describe('runVerification', () => {
|
|
64
|
+
it('returns passed for exit 0 command', async () => {
|
|
65
|
+
const config = {
|
|
66
|
+
enabled: true,
|
|
67
|
+
mode: 'warn',
|
|
68
|
+
rules: [{ extensions: ['.ts'], lint: 'exit 0' }],
|
|
69
|
+
};
|
|
70
|
+
const result = await runVerification('/tmp/test.ts', config);
|
|
71
|
+
assert.equal(result.ran, true);
|
|
72
|
+
assert.equal(result.passed, true);
|
|
73
|
+
});
|
|
74
|
+
it('returns failed for exit 1 command', async () => {
|
|
75
|
+
const config = {
|
|
76
|
+
enabled: true,
|
|
77
|
+
mode: 'warn',
|
|
78
|
+
rules: [{ extensions: ['.ts'], lint: 'echo "Type error" && exit 1' }],
|
|
79
|
+
};
|
|
80
|
+
const result = await runVerification('/tmp/test.ts', config);
|
|
81
|
+
assert.equal(result.ran, true);
|
|
82
|
+
assert.equal(result.passed, false);
|
|
83
|
+
assert.ok(result.summary.includes('Type error'));
|
|
84
|
+
});
|
|
85
|
+
it('returns not-ran for unknown extension', async () => {
|
|
86
|
+
const config = {
|
|
87
|
+
enabled: true,
|
|
88
|
+
mode: 'warn',
|
|
89
|
+
rules: [{ extensions: ['.ts'], lint: 'exit 0' }],
|
|
90
|
+
};
|
|
91
|
+
const result = await runVerification('/tmp/test.xyz', config);
|
|
92
|
+
assert.equal(result.ran, false);
|
|
93
|
+
});
|
|
94
|
+
it('returns not-ran when rule has no lint command', async () => {
|
|
95
|
+
const config = {
|
|
96
|
+
enabled: true,
|
|
97
|
+
mode: 'warn',
|
|
98
|
+
rules: [{ extensions: ['.ts'] }],
|
|
99
|
+
};
|
|
100
|
+
const result = await runVerification('/tmp/test.ts', config);
|
|
101
|
+
assert.equal(result.ran, false);
|
|
102
|
+
});
|
|
103
|
+
it('handles timeout gracefully', async () => {
|
|
104
|
+
// Use node -e for cross-platform long-running command
|
|
105
|
+
const config = {
|
|
106
|
+
enabled: true,
|
|
107
|
+
mode: 'warn',
|
|
108
|
+
rules: [{ extensions: ['.ts'], lint: 'node -e "setTimeout(()=>{},30000)"', timeout: 100 }],
|
|
109
|
+
};
|
|
110
|
+
const result = await runVerification('/tmp/test.ts', config);
|
|
111
|
+
assert.equal(result.ran, true);
|
|
112
|
+
assert.equal(result.passed, false);
|
|
113
|
+
assert.ok(result.summary.includes('timed out'));
|
|
114
|
+
});
|
|
115
|
+
it('caps summary to 500 chars', async () => {
|
|
116
|
+
const longOutput = 'x'.repeat(1000);
|
|
117
|
+
const config = {
|
|
118
|
+
enabled: true,
|
|
119
|
+
mode: 'warn',
|
|
120
|
+
rules: [{ extensions: ['.ts'], lint: `echo "${longOutput}" && exit 1` }],
|
|
121
|
+
};
|
|
122
|
+
const result = await runVerification('/tmp/test.ts', config);
|
|
123
|
+
assert.ok(result.summary.length <= 500);
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
describe('runVerificationForFiles', () => {
|
|
127
|
+
it('returns not-ran for empty file list', async () => {
|
|
128
|
+
const config = { enabled: true, mode: 'warn', rules: [] };
|
|
129
|
+
const result = await runVerificationForFiles([], config);
|
|
130
|
+
assert.equal(result.ran, false);
|
|
131
|
+
});
|
|
132
|
+
it('delegates to single-file verification for one file', async () => {
|
|
133
|
+
const config = {
|
|
134
|
+
enabled: true,
|
|
135
|
+
mode: 'warn',
|
|
136
|
+
rules: [{ extensions: ['.ts'], lint: 'exit 0' }],
|
|
137
|
+
};
|
|
138
|
+
const result = await runVerificationForFiles(['/tmp/test.ts'], config);
|
|
139
|
+
assert.equal(result.ran, true);
|
|
140
|
+
assert.equal(result.passed, true);
|
|
141
|
+
});
|
|
142
|
+
it('aggregates failures from multiple files', async () => {
|
|
143
|
+
const config = {
|
|
144
|
+
enabled: true,
|
|
145
|
+
mode: 'warn',
|
|
146
|
+
rules: [
|
|
147
|
+
{ extensions: ['.ts'], lint: 'echo "ts error" && exit 1' },
|
|
148
|
+
{ extensions: ['.py'], lint: 'echo "py error" && exit 1' },
|
|
149
|
+
],
|
|
150
|
+
};
|
|
151
|
+
const result = await runVerificationForFiles(['/tmp/a.ts', '/tmp/b.py'], config);
|
|
152
|
+
assert.equal(result.ran, true);
|
|
153
|
+
assert.equal(result.passed, false);
|
|
154
|
+
assert.ok(result.summary.includes('ts error'));
|
|
155
|
+
assert.ok(result.summary.includes('py error'));
|
|
156
|
+
});
|
|
157
|
+
it('passes when all files pass', async () => {
|
|
158
|
+
const config = {
|
|
159
|
+
enabled: true,
|
|
160
|
+
mode: 'warn',
|
|
161
|
+
rules: [{ extensions: ['.ts'], lint: 'exit 0' }],
|
|
162
|
+
};
|
|
163
|
+
const result = await runVerificationForFiles(['/tmp/a.ts', '/tmp/b.ts'], config);
|
|
164
|
+
assert.equal(result.passed, true);
|
|
165
|
+
});
|
|
166
|
+
});
|
|
167
|
+
describe('getVerificationConfig', () => {
|
|
168
|
+
it('returns null for bare directory with no config', () => {
|
|
169
|
+
// When no project files exist and no .oh/config.yaml
|
|
170
|
+
invalidateVerificationCache();
|
|
171
|
+
// Config depends on cwd; in test env it may auto-detect from project root
|
|
172
|
+
const config = getVerificationConfig();
|
|
173
|
+
// Just verify it returns something or null without crashing
|
|
174
|
+
if (config) {
|
|
175
|
+
assert.equal(config.enabled, true);
|
|
176
|
+
assert.ok(Array.isArray(config.rules));
|
|
177
|
+
}
|
|
178
|
+
});
|
|
179
|
+
});
|
|
180
|
+
});
|
|
181
|
+
//# sourceMappingURL=verification.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"verification.test.js","sourceRoot":"","sources":["../../src/harness/verification.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAGxC,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EACL,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,uBAAuB,EACvB,qBAAqB,EACrB,2BAA2B,GAC5B,MAAM,mBAAmB,CAAC;AAE3B,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,IAAI,GAAW,CAAC;IAEhB,UAAU,CAAC,GAAG,EAAE;QACd,GAAG,GAAG,UAAU,EAAE,CAAC;QACnB,2BAA2B,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;YAC5D,SAAS,CAAC,GAAG,EAAE,eAAe,EAAE,IAAI,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,+BAA+B,CAAC,CAAC;YACnD,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,4CAA4C,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;YACzD,SAAS,CAAC,GAAG,EAAE,gBAAgB,EAAE,0BAA0B,CAAC,CAAC;YAC7D,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;YACxC,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,MAAM,KAAK,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAChC,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACvG,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,GAAG,EAAE;YAC7C,MAAM,KAAK,GAAG,gBAAgB,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;YACxF,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,KAAK,GAAG,gBAAgB,CAAC,WAAW,EAAE;gBAC1C,KAAK,EAAE;oBACL,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE;oBAC5D,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE;oBAC5D,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,EAAE,YAAY;iBAC3E;aACF,CAAC,CAAC;YACH,MAAM,CAAC,eAAe,CAAC,KAAK,EAAE,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;YACxC,MAAM,CAAC,eAAe,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;YAC9C,MAAM,CAAC,eAAe,CAAC,gBAAgB,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;aACjD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,6BAA6B,EAAE,CAAC;aACtE,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;aACjD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;YAC9D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;YAC7D,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;aACjC,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,sDAAsD;YACtD,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,oCAAoC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;aAC3F,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;YACzC,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,SAAS,UAAU,aAAa,EAAE,CAAC;aACzE,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YAC7D,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,MAAM,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAe,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACnE,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YACzD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;aACjD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;YACvD,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE;oBACL,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE;oBAC1D,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,2BAA2B,EAAE;iBAC3D;aACF,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;YACjF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC/B,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;YACnC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/C,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;YAC1C,MAAM,MAAM,GAAG;gBACb,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;aACjD,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE,MAAM,CAAC,CAAC;YACjF,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;YACxD,qDAAqD;YACrD,2BAA2B,EAAE,CAAC;YAC9B,0EAA0E;YAC1E,MAAM,MAAM,GAAG,qBAAqB,EAAE,CAAC;YACvC,4DAA4D;YAC5D,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBACnC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACzC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAKH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAOtD,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,YAAY,CAAC;AAM9D,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIjD,wBAAuB,KAAK,CAC1B,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,WAAW,EACnB,gBAAgB,GAAE,OAAO,qBAAqB,EAAE,OAAO,EAAO,GAC7D,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CA0NnC"}
|
package/dist/query/index.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* - types.ts — shared types
|
|
9
9
|
*/
|
|
10
10
|
import { toolToAPIFormat } from "../Tool.js";
|
|
11
|
+
import { DeferredTool } from "../DeferredTool.js";
|
|
11
12
|
import { createAssistantMessage, createUserMessage } from "../types/message.js";
|
|
12
13
|
import { StreamingToolExecutor } from "../services/StreamingToolExecutor.js";
|
|
13
14
|
import { getContextWindow } from "../harness/cost.js";
|
|
@@ -34,9 +35,16 @@ export async function* query(userMessage, config, existingMessages = []) {
|
|
|
34
35
|
const modelInfo = config.provider.getModelInfo?.(config.model ?? '');
|
|
35
36
|
const toolsSupported = !modelInfo || modelInfo.supportsTools;
|
|
36
37
|
const apiTools = toolsSupported ? config.tools.map(toolToAPIFormat) : undefined;
|
|
37
|
-
|
|
38
|
+
let toolPrompts = toolsSupported
|
|
38
39
|
? config.tools.map((t) => t.prompt()).join("\n\n")
|
|
39
40
|
: "";
|
|
41
|
+
// Hint about deferred tools available via ToolSearch
|
|
42
|
+
if (toolsSupported) {
|
|
43
|
+
const deferredCount = config.tools.filter(t => t instanceof DeferredTool && !t.activated).length;
|
|
44
|
+
if (deferredCount > 0) {
|
|
45
|
+
toolPrompts += `\n\n[${deferredCount} additional tools available — use ToolSearch to discover them]`;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
40
48
|
const fullSystemPrompt = toolPrompts
|
|
41
49
|
? config.systemPrompt + "\n\n# Available Tools\n\n" + toolPrompts
|
|
42
50
|
: config.systemPrompt;
|
package/dist/query/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/query/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAQ,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAIzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAKjD,KAAK,KAAK,GAAG;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAC;AAExD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE,CAqB/E;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,GAClB,OAAO,CAAC,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAQ,WAAW,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEvE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAIzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAKjD,KAAK,KAAK,GAAG;IAAE,UAAU,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,QAAQ,EAAE,CAAA;CAAE,CAAC;AAExD,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,GAAG,KAAK,EAAE,CAqB/E;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,GAClB,OAAO,CAAC,UAAU,CAAC,CAgGrB;AAED,wBAAuB,gBAAgB,CACrC,SAAS,EAAE,QAAQ,EAAE,EACrB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,WAAW,EACpB,cAAc,EAAE,cAAc,EAC9B,OAAO,CAAC,EAAE,SAAS,EACnB,KAAK,CAAC,EAAE,cAAc,GACrB,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,CA4BnC"}
|
package/dist/query/tools.js
CHANGED
|
@@ -73,7 +73,7 @@ export async function executeSingleTool(toolCall, tools, context, permissionMode
|
|
|
73
73
|
try {
|
|
74
74
|
const toolAbort = AbortSignal.timeout(TOOL_TIMEOUT_MS);
|
|
75
75
|
const contextWithTimeout = { ...context, abortSignal: context.abortSignal ?? toolAbort };
|
|
76
|
-
|
|
76
|
+
let result = await Promise.race([
|
|
77
77
|
tool.call(parsed.data, contextWithTimeout),
|
|
78
78
|
new Promise((_, reject) => {
|
|
79
79
|
toolAbort.addEventListener("abort", () => reject(new Error(`Tool '${tool.name}' timed out after ${TOOL_TIMEOUT_MS / 1000}s`)));
|
|
@@ -85,11 +85,37 @@ export async function executeSingleTool(toolCall, tools, context, permissionMode
|
|
|
85
85
|
toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
|
|
86
86
|
toolOutput: result.output.slice(0, 1000),
|
|
87
87
|
});
|
|
88
|
-
//
|
|
89
|
-
let
|
|
88
|
+
// Verification loop: auto-run lint/typecheck after file-modifying tools
|
|
89
|
+
let verificationSuffix = '';
|
|
90
|
+
if (!result.isError && ['Edit', 'Write', 'MultiEdit'].includes(tool.name)) {
|
|
91
|
+
try {
|
|
92
|
+
const { runVerificationForFiles, getVerificationConfig, extractFilePaths } = await import('../harness/verification.js');
|
|
93
|
+
const vConfig = getVerificationConfig();
|
|
94
|
+
if (vConfig?.enabled) {
|
|
95
|
+
const filePaths = extractFilePaths(tool.name, parsed.data);
|
|
96
|
+
if (filePaths.length > 0) {
|
|
97
|
+
const vResult = await runVerificationForFiles(filePaths, vConfig);
|
|
98
|
+
if (vResult.ran) {
|
|
99
|
+
if (!vResult.passed) {
|
|
100
|
+
verificationSuffix = `\n\n[Verification FAILED]\n${vResult.summary}`;
|
|
101
|
+
if (vConfig.mode === 'block') {
|
|
102
|
+
result = { output: result.output, isError: true };
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
verificationSuffix = '\n\n[Verification passed]';
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
catch { /* verification should never break tool execution */ }
|
|
113
|
+
}
|
|
114
|
+
// Strip ANSI and cap output, then append verification suffix
|
|
115
|
+
let output = result.output.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "") + verificationSuffix;
|
|
90
116
|
if (output.length > MAX_TOOL_RESULT_CHARS) {
|
|
91
117
|
output = output.slice(0, MAX_TOOL_RESULT_CHARS)
|
|
92
|
-
+ `\n\n[TRUNCATED: output was ${
|
|
118
|
+
+ `\n\n[TRUNCATED: output was ${output.length.toLocaleString()} chars, showing first ${MAX_TOOL_RESULT_CHARS.toLocaleString()}]`;
|
|
93
119
|
}
|
|
94
120
|
return { output, isError: result.isError };
|
|
95
121
|
}
|
package/dist/query/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../src/query/tools.ts"],"names":[],"mappings":"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"}
|