@zhixuan92/multi-model-agent-mcp 2.6.0 → 2.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +70 -258
- package/dist/cli.js.map +1 -1
- package/dist/tools/audit-document.d.ts.map +1 -1
- package/dist/tools/audit-document.js +18 -5
- package/dist/tools/audit-document.js.map +1 -1
- package/dist/tools/batch-response.d.ts +1 -8
- package/dist/tools/batch-response.d.ts.map +1 -1
- package/dist/tools/batch-response.js +0 -41
- package/dist/tools/batch-response.js.map +1 -1
- package/dist/tools/confirm-clarifications.d.ts.map +1 -1
- package/dist/tools/confirm-clarifications.js +17 -11
- package/dist/tools/confirm-clarifications.js.map +1 -1
- package/dist/tools/debug-task.d.ts.map +1 -1
- package/dist/tools/debug-task.js +10 -3
- package/dist/tools/debug-task.js.map +1 -1
- package/dist/tools/execute-plan.d.ts.map +1 -1
- package/dist/tools/execute-plan.js +18 -4
- package/dist/tools/execute-plan.js.map +1 -1
- package/dist/tools/review-code.d.ts.map +1 -1
- package/dist/tools/review-code.js +18 -5
- package/dist/tools/review-code.js.map +1 -1
- package/dist/tools/shared.d.ts +38 -5
- package/dist/tools/shared.d.ts.map +1 -1
- package/dist/tools/shared.js +28 -35
- package/dist/tools/shared.js.map +1 -1
- package/dist/tools/truncation.d.ts +18 -0
- package/dist/tools/truncation.d.ts.map +1 -0
- package/dist/tools/truncation.js +62 -0
- package/dist/tools/truncation.js.map +1 -0
- package/dist/tools/verify-work.d.ts.map +1 -1
- package/dist/tools/verify-work.js +18 -5
- package/dist/tools/verify-work.js.map +1 -1
- package/package.json +2 -2
- package/dist/clarification-response.d.ts +0 -21
- package/dist/clarification-response.d.ts.map +0 -1
- package/dist/clarification-response.js +0 -26
- package/dist/clarification-response.js.map +0 -1
- package/dist/tools/shared-intake.d.ts +0 -9
- package/dist/tools/shared-intake.d.ts.map +0 -1
- package/dist/tools/shared-intake.js +0 -19
- package/dist/tools/shared-intake.js.map +0 -1
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { composeHeadline } from '../headline.js';
|
|
2
1
|
/**
|
|
3
2
|
* Compute per-batch timing metrics.
|
|
4
3
|
*/
|
|
@@ -40,44 +39,4 @@ export function computeAggregateCost(results) {
|
|
|
40
39
|
totalSavedCostUSD,
|
|
41
40
|
};
|
|
42
41
|
}
|
|
43
|
-
/**
|
|
44
|
-
* Build a fan-out response for specialized tools. No batchId (not cache-backed).
|
|
45
|
-
*/
|
|
46
|
-
export function buildFanOutResponse(results, tasks, wallClockMs, parentModel, contextBlockId) {
|
|
47
|
-
const timings = computeTimings(wallClockMs, results);
|
|
48
|
-
const batchProgress = computeBatchProgress(results);
|
|
49
|
-
const aggregateCost = computeAggregateCost(results);
|
|
50
|
-
const headline = composeHeadline({ timings, batchProgress, aggregateCost, parentModel });
|
|
51
|
-
return {
|
|
52
|
-
type: 'text',
|
|
53
|
-
text: JSON.stringify({
|
|
54
|
-
schemaVersion: '1.0.0',
|
|
55
|
-
mode: 'fan_out',
|
|
56
|
-
headline,
|
|
57
|
-
...(contextBlockId && { contextBlockId }),
|
|
58
|
-
timings,
|
|
59
|
-
batchProgress,
|
|
60
|
-
aggregateCost,
|
|
61
|
-
results: results.map((r, i) => ({
|
|
62
|
-
agentType: tasks[i]?.agentType ?? '(auto)',
|
|
63
|
-
status: r.status,
|
|
64
|
-
output: r.output,
|
|
65
|
-
turns: r.turns,
|
|
66
|
-
durationMs: r.durationMs,
|
|
67
|
-
filesRead: r.filesRead,
|
|
68
|
-
filesWritten: r.filesWritten,
|
|
69
|
-
directoriesListed: r.directoriesListed,
|
|
70
|
-
toolCalls: r.toolCalls,
|
|
71
|
-
escalationLog: r.escalationLog,
|
|
72
|
-
usage: r.usage,
|
|
73
|
-
terminationReason: r.terminationReason,
|
|
74
|
-
specReviewStatus: r.specReviewStatus,
|
|
75
|
-
qualityReviewStatus: r.qualityReviewStatus,
|
|
76
|
-
agents: r.agents,
|
|
77
|
-
models: r.models,
|
|
78
|
-
...(r.error && { error: r.error }),
|
|
79
|
-
})),
|
|
80
|
-
}, null, 2),
|
|
81
|
-
};
|
|
82
|
-
}
|
|
83
42
|
//# sourceMappingURL=batch-response.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"batch-response.js","sourceRoot":"","sources":["../../src/tools/batch-response.ts"],"names":[],"mappings":"AAOA
|
|
1
|
+
{"version":3,"file":"batch-response.js","sourceRoot":"","sources":["../../src/tools/batch-response.ts"],"names":[],"mappings":"AAOA;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,WAAmB,EAAE,OAAoB;IACtE,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7E,MAAM,0BAA0B,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,WAAW,GAAG,WAAW,CAAC,CAAC;IAC1E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,0BAA0B,EAAE,CAAC;AAClE,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,MAAM,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC;IAClC,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,MAAM,CAAC;IACvE,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,YAAY,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,CAC3D,CAAC,MAAM,CAAC;IACT,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAChC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,MAAM,KAAK,OAAO;QACpB,CAAC,CAAC,MAAM,KAAK,aAAa;QAC1B,CAAC,CAAC,MAAM,KAAK,WAAW;QACxB,CAAC,CAAC,MAAM,KAAK,eAAe,CAC/B,CAAC,MAAM,CAAC;IACT,MAAM,cAAc,GAClB,UAAU,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,cAAc,GAAG,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC/E,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;AACtF,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAoB;IACvD,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,IAAI,iBAAiB,GAAG,CAAC,CAAC;IAE1B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC9D,kBAAkB,IAAI,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;QACxC,CAAC;QACD,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACxE,iBAAiB,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;QAC5C,CAAC;IACH,CAAC;IAED,OAAO;QACL,kBAAkB;QAClB,iBAAiB;KAClB,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-clarifications.d.ts","sourceRoot":"","sources":["../../src/tools/confirm-clarifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"confirm-clarifications.d.ts","sourceRoot":"","sources":["../../src/tools/confirm-clarifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAC/F,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,8DAA8D,CAAC;AAQvG,eAAO,MAAM,2BAA2B;;;;;;;iBAUtC,CAAC;AAEH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,SAAS,EACjB,MAAM,EAAE,gBAAgB,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,eAAe,KAAK,OAAO,CAAC,SAAS,EAAE,CAAC,EAC9G,aAAa,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,MAAM,GAC3C,IAAI,CAsHN"}
|
|
@@ -2,7 +2,8 @@ import { z } from 'zod';
|
|
|
2
2
|
import { processConfirmations } from '@zhixuan92/multi-model-agent-core/intake/confirm';
|
|
3
3
|
import { runIntakePipeline } from '@zhixuan92/multi-model-agent-core/intake/pipeline';
|
|
4
4
|
import { getMaxRoundsPerDraft } from '@zhixuan92/multi-model-agent-core/intake/feature-flag';
|
|
5
|
-
import {
|
|
5
|
+
import { buildUnifiedResponse } from './shared.js';
|
|
6
|
+
import { truncateResults } from './truncation.js';
|
|
6
7
|
export const confirmClarificationsSchema = z.object({
|
|
7
8
|
clarificationId: z.string().describe('ID of the clarification set to resume'),
|
|
8
9
|
confirmations: z.record(z.string(), z.object({
|
|
@@ -65,24 +66,29 @@ export function registerConfirmClarifications(server, config, clarificationStore
|
|
|
65
66
|
}
|
|
66
67
|
clarificationStore.touchForConfirm(params.clarificationId);
|
|
67
68
|
intakeResult.intakeProgress.executedDrafts = intakeResult.ready.length;
|
|
69
|
+
// Track start time for wall clock measurement
|
|
70
|
+
const startMs = Date.now();
|
|
68
71
|
clarificationStore.cleanupIfResolved(params.clarificationId);
|
|
69
|
-
|
|
72
|
+
// Apply same auto-escape truncation as delegate_tasks
|
|
73
|
+
const threshold = config.defaults.largeResponseThresholdChars ?? 65_000;
|
|
74
|
+
const truncatedResults = truncateResults(results.map(r => ({ status: r.status, output: r.output, filesWritten: r.filesWritten, error: r.error })), newBatchId, threshold);
|
|
75
|
+
// Build unified response — only includes remaining clarifications if any
|
|
76
|
+
const remainingClarifications = intakeResult.clarifications.length > 0 ? intakeResult.clarifications : undefined;
|
|
77
|
+
const remainingClarificationId = intakeResult.clarifications.length > 0 ? params.clarificationId : undefined;
|
|
78
|
+
const response = buildUnifiedResponse({
|
|
70
79
|
batchId: newBatchId,
|
|
71
|
-
results,
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
clarificationId:
|
|
75
|
-
|
|
80
|
+
results: results.map((r, i) => ({ ...r, output: truncatedResults[i].output })),
|
|
81
|
+
tasks: intakeResult.ready.map(r => r.task),
|
|
82
|
+
wallClockMs: Date.now() - startMs,
|
|
83
|
+
clarificationId: remainingClarificationId,
|
|
84
|
+
clarifications: remainingClarifications,
|
|
76
85
|
});
|
|
77
86
|
const responseObj = {
|
|
78
87
|
...response,
|
|
79
88
|
...(confirmResult.errors.length > 0 ? { confirmationErrors: confirmResult.errors } : {}),
|
|
80
89
|
};
|
|
81
90
|
return {
|
|
82
|
-
content: [{
|
|
83
|
-
type: 'text',
|
|
84
|
-
text: JSON.stringify(responseObj, null, 2),
|
|
85
|
-
}],
|
|
91
|
+
content: [{ type: 'text', text: JSON.stringify(responseObj, null, 2) }],
|
|
86
92
|
};
|
|
87
93
|
});
|
|
88
94
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirm-clarifications.js","sourceRoot":"","sources":["../../src/tools/confirm-clarifications.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAMxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,kDAAkD,CAAC;AACxF,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,OAAO,EAAE,oBAAoB,EAAE,MAAM,uDAAuD,CAAC;AAC7F,OAAO,EAAE
|
|
1
|
+
{"version":3,"file":"confirm-clarifications.js","sourceRoot":"","sources":["../../src/tools/confirm-clarifications.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-task.d.ts","sourceRoot":"","sources":["../../src/tools/debug-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-task.d.ts","sourceRoot":"","sources":["../../src/tools/debug-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAY,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAWvG,eAAO,MAAM,eAAe;;;;;;iBAS1B,CAAC;AAEH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,eAAe,CAAC,CAAC;AAE9D,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,QAmDnH"}
|
package/dist/tools/debug-task.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { runTasks } from '@zhixuan92/multi-model-agent-core/run-tasks';
|
|
3
|
-
import { commonToolFields,
|
|
4
|
+
import { commonToolFields, buildUnifiedResponse, buildFilePathsPrompt, buildRunTasksOptions, resolveParentModel, autoRegisterContextBlock, } from './shared.js';
|
|
4
5
|
export const debugTaskSchema = z.object({
|
|
5
6
|
problem: z.string().describe('What is broken'),
|
|
6
7
|
context: z.string().optional().describe('Background'),
|
|
@@ -40,9 +41,15 @@ export function registerDebugTask(server, config, contextBlockStore) {
|
|
|
40
41
|
const parentModel = taskSpec.parentModel;
|
|
41
42
|
try {
|
|
42
43
|
const results = await runTasks([{ ...taskSpec, prompt }], config, { ...runOptions, runtime });
|
|
43
|
-
const result = results[0];
|
|
44
44
|
const ctxId = autoRegisterContextBlock(results, contextBlockStore);
|
|
45
|
-
return {
|
|
45
|
+
return buildUnifiedResponse({
|
|
46
|
+
batchId: randomUUID(),
|
|
47
|
+
results,
|
|
48
|
+
tasks: [{ ...taskSpec, prompt }],
|
|
49
|
+
wallClockMs: 0,
|
|
50
|
+
parentModel,
|
|
51
|
+
contextBlockId: ctxId,
|
|
52
|
+
});
|
|
46
53
|
}
|
|
47
54
|
catch (err) {
|
|
48
55
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-task.js","sourceRoot":"","sources":["../../src/tools/debug-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-task.js","sourceRoot":"","sources":["../../src/tools/debug-task.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-plan.d.ts","sourceRoot":"","sources":["../../src/tools/execute-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"execute-plan.d.ts","sourceRoot":"","sources":["../../src/tools/execute-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAY,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAUvG,eAAO,MAAM,iBAAiB;;;;;iBAY5B,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC;AA2BlE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,QAqGrH"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { readFile } from 'node:fs/promises';
|
|
3
4
|
import { runTasks, extractPlanSection } from '@zhixuan92/multi-model-agent-core/run-tasks';
|
|
4
|
-
import { commonToolFields,
|
|
5
|
-
import { buildFanOutResponse } from './batch-response.js';
|
|
5
|
+
import { commonToolFields, buildUnifiedResponse, buildRunTasksOptions, resolveParentModel, autoRegisterContextBlock, } from './shared.js';
|
|
6
6
|
export const executePlanSchema = z.object({
|
|
7
7
|
tasks: z.array(z.string().trim().min(1, 'Task descriptor must be non-empty')).min(1, 'At least one task required')
|
|
8
8
|
.refine((tasks) => new Set(tasks).size === tasks.length, { message: 'Duplicate task descriptors are not allowed' })
|
|
@@ -89,13 +89,27 @@ export function registerExecutePlan(server, config, contextBlockStore) {
|
|
|
89
89
|
return { content: [{ type: 'text', text: 'Error: task produced no result' }], isError: true };
|
|
90
90
|
}
|
|
91
91
|
const ctxId = autoRegisterContextBlock(results, contextBlockStore);
|
|
92
|
-
return {
|
|
92
|
+
return buildUnifiedResponse({
|
|
93
|
+
batchId: randomUUID(),
|
|
94
|
+
results,
|
|
95
|
+
tasks,
|
|
96
|
+
wallClockMs: 0,
|
|
97
|
+
parentModel,
|
|
98
|
+
contextBlockId: ctxId,
|
|
99
|
+
});
|
|
93
100
|
}
|
|
94
101
|
// Multiple tasks = fan out (parallel)
|
|
95
102
|
const startMs = Date.now();
|
|
96
103
|
const results = await runTasks(tasks, config, { ...runOptions, runtime });
|
|
97
104
|
const ctxId = autoRegisterContextBlock(results, contextBlockStore);
|
|
98
|
-
return {
|
|
105
|
+
return buildUnifiedResponse({
|
|
106
|
+
batchId: randomUUID(),
|
|
107
|
+
results,
|
|
108
|
+
tasks,
|
|
109
|
+
wallClockMs: Date.now() - startMs,
|
|
110
|
+
parentModel,
|
|
111
|
+
contextBlockId: ctxId,
|
|
112
|
+
});
|
|
99
113
|
}
|
|
100
114
|
catch (err) {
|
|
101
115
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute-plan.js","sourceRoot":"","sources":["../../src/tools/execute-plan.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAG5C,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AAC3F,OAAO,EACL,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"execute-plan.js","sourceRoot":"","sources":["../../src/tools/execute-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-code.d.ts","sourceRoot":"","sources":["../../src/tools/review-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"review-code.d.ts","sourceRoot":"","sources":["../../src/tools/review-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,KAAK,EAAE,gBAAgB,EAAY,iBAAiB,EAAE,MAAM,mCAAmC,CAAC;AAcvG,eAAO,MAAM,gBAAgB;;;;;;;;;;iBAI3B,CAAC;AAEH,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAC;AA+ChE,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,QAyEpH"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
+
import { randomUUID } from 'node:crypto';
|
|
2
3
|
import { runTasks } from '@zhixuan92/multi-model-agent-core/run-tasks';
|
|
3
|
-
import { commonToolFields, validateInput, resolveDispatchMode,
|
|
4
|
-
import { buildFanOutResponse } from './batch-response.js';
|
|
4
|
+
import { commonToolFields, validateInput, resolveDispatchMode, buildUnifiedResponse, buildFilePathsPrompt, buildPerFilePrompt, buildRunTasksOptions, resolveParentModel, autoRegisterContextBlock, } from './shared.js';
|
|
5
5
|
export const reviewCodeSchema = z.object({
|
|
6
6
|
code: z.string().optional().describe('Inline code to review'),
|
|
7
7
|
focus: z.array(z.enum(['security', 'performance', 'correctness', 'style'])).optional(),
|
|
@@ -76,13 +76,26 @@ export function registerReviewCode(server, config, contextBlockStore) {
|
|
|
76
76
|
const startMs = Date.now();
|
|
77
77
|
const results = await runTasks(tasks, config, { ...runOptions, runtime });
|
|
78
78
|
const ctxId = autoRegisterContextBlock(results, contextBlockStore);
|
|
79
|
-
return {
|
|
79
|
+
return buildUnifiedResponse({
|
|
80
|
+
batchId: randomUUID(),
|
|
81
|
+
results,
|
|
82
|
+
tasks,
|
|
83
|
+
wallClockMs: Date.now() - startMs,
|
|
84
|
+
parentModel,
|
|
85
|
+
contextBlockId: ctxId,
|
|
86
|
+
});
|
|
80
87
|
}
|
|
81
88
|
const prompt = buildReviewPrompt(params.code, params.filePaths, params.focus, hasContextBlocks);
|
|
82
89
|
const results = await runTasks([{ ...baseTaskSpec, prompt }], config, { ...runOptions, runtime });
|
|
83
|
-
const result = results[0];
|
|
84
90
|
const ctxId = autoRegisterContextBlock(results, contextBlockStore);
|
|
85
|
-
return {
|
|
91
|
+
return buildUnifiedResponse({
|
|
92
|
+
batchId: randomUUID(),
|
|
93
|
+
results,
|
|
94
|
+
tasks: [{ ...baseTaskSpec, prompt }],
|
|
95
|
+
wallClockMs: 0,
|
|
96
|
+
parentModel,
|
|
97
|
+
contextBlockId: ctxId,
|
|
98
|
+
});
|
|
86
99
|
}
|
|
87
100
|
catch (err) {
|
|
88
101
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"review-code.js","sourceRoot":"","sources":["../../src/tools/review-code.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"review-code.js","sourceRoot":"","sources":["../../src/tools/review-code.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shared.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
import type { RunResult, MultiModelConfig, ContextBlockStore } from '@zhixuan92/multi-model-agent-core';
|
|
2
|
+
import type { RunResult, MultiModelConfig, ContextBlockStore, TaskSpec } from '@zhixuan92/multi-model-agent-core';
|
|
3
|
+
import type { ClarificationEntry } from '@zhixuan92/multi-model-agent-core/intake/types';
|
|
3
4
|
import type { RunTasksOptions } from '@zhixuan92/multi-model-agent-core/run-tasks';
|
|
4
5
|
export declare const commonToolFields: {
|
|
5
6
|
filePaths: z.ZodOptional<z.ZodArray<z.ZodString>>;
|
|
@@ -18,10 +19,6 @@ export declare function resolveDispatchMode(inlineContent: string | undefined, f
|
|
|
18
19
|
* calling register_context_block. Diagnostic outputs are excluded.
|
|
19
20
|
*/
|
|
20
21
|
export declare function autoRegisterContextBlock(results: RunResult[], store: ContextBlockStore | undefined): string | undefined;
|
|
21
|
-
export declare function buildMetadataBlock(result: RunResult, parentModel?: string, contextBlockId?: string): {
|
|
22
|
-
type: 'text';
|
|
23
|
-
text: string;
|
|
24
|
-
};
|
|
25
22
|
export declare function resolveParentModel(config: MultiModelConfig): string | undefined;
|
|
26
23
|
export declare function buildFilePathsPrompt(filePaths?: string[]): string;
|
|
27
24
|
export declare function buildPerFilePrompt(filePath: string, promptTemplate: string): string;
|
|
@@ -29,4 +26,40 @@ export declare function buildRunTasksOptions(extra?: {
|
|
|
29
26
|
_meta?: Record<string, unknown>;
|
|
30
27
|
sendNotification: (...args: any[]) => Promise<void>;
|
|
31
28
|
}): RunTasksOptions;
|
|
29
|
+
/**
|
|
30
|
+
* Input interface for buildUnifiedResponse.
|
|
31
|
+
*/
|
|
32
|
+
export interface BuildUnifiedResponseInput {
|
|
33
|
+
batchId: string;
|
|
34
|
+
results: RunResult[];
|
|
35
|
+
tasks: TaskSpec[];
|
|
36
|
+
wallClockMs: number;
|
|
37
|
+
parentModel?: string;
|
|
38
|
+
contextBlockId?: string;
|
|
39
|
+
clarificationId?: string;
|
|
40
|
+
clarifications?: ClarificationEntry[];
|
|
41
|
+
}
|
|
42
|
+
export interface UnifiedResponse {
|
|
43
|
+
headline: string;
|
|
44
|
+
batchId: string;
|
|
45
|
+
contextBlockId?: string;
|
|
46
|
+
clarificationId?: string;
|
|
47
|
+
clarifications?: ClarificationEntry[];
|
|
48
|
+
results: {
|
|
49
|
+
status: RunResult['status'];
|
|
50
|
+
output: string;
|
|
51
|
+
filesWritten: string[];
|
|
52
|
+
error?: string;
|
|
53
|
+
}[];
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Build a unified MCP response envelope for delegate_tasks / clarification flows.
|
|
57
|
+
* Strips noisy internal fields (escalationLog, usage, turns, agents, models).
|
|
58
|
+
*/
|
|
59
|
+
export declare function buildUnifiedResponse(input: BuildUnifiedResponseInput): {
|
|
60
|
+
content: {
|
|
61
|
+
type: 'text';
|
|
62
|
+
text: string;
|
|
63
|
+
}[];
|
|
64
|
+
};
|
|
32
65
|
//# sourceMappingURL=shared.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACT,MAAM,mCAAmC,CAAC;AAC3C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAInF,eAAO,MAAM,gBAAgB;;;CAK5B,CAAC;AAUF,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,GAC9B;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAKrD;AAED,wBAAgB,mBAAmB,CACjC,aAAa,EAAE,MAAM,GAAG,SAAS,EACjC,SAAS,EAAE,MAAM,EAAE,GAAG,SAAS,GAC9B,QAAQ,GAAG,SAAS,CAKtB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,SAAS,EAAE,EACpB,KAAK,EAAE,iBAAiB,GAAG,SAAS,GACnC,MAAM,GAAG,SAAS,CAOpB;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAE/E;AAED,wBAAgB,oBAAoB,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAGjE;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAEnF;AAGD,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAAC,gBAAgB,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,GAAG,eAAe,CAwBtJ;AAED;;GAEG;AACH,MAAM,WAAW,yBAAyB;IACxC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAC;CACvC;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACtC,OAAO,EAAE;QACP,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC;QAC5B,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,EAAE,CAAC;CACL;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,yBAAyB,GAC/B;IAAE,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CAAE,CAkC/C"}
|
package/dist/tools/shared.js
CHANGED
|
@@ -42,40 +42,6 @@ export function autoRegisterContextBlock(results, store) {
|
|
|
42
42
|
const { id } = store.register(combined);
|
|
43
43
|
return id;
|
|
44
44
|
}
|
|
45
|
-
export function buildMetadataBlock(result, parentModel, contextBlockId) {
|
|
46
|
-
const timings = computeTimings(result.durationMs ?? 0, [result]);
|
|
47
|
-
const batchProgress = computeBatchProgress([result]);
|
|
48
|
-
const aggregateCost = computeAggregateCost([result]);
|
|
49
|
-
const headline = composeHeadline({ timings, batchProgress, aggregateCost, parentModel });
|
|
50
|
-
return {
|
|
51
|
-
type: 'text',
|
|
52
|
-
text: JSON.stringify({
|
|
53
|
-
headline,
|
|
54
|
-
...(contextBlockId && { contextBlockId }),
|
|
55
|
-
status: result.status,
|
|
56
|
-
terminationReason: result.terminationReason,
|
|
57
|
-
specReviewStatus: result.specReviewStatus,
|
|
58
|
-
qualityReviewStatus: result.qualityReviewStatus,
|
|
59
|
-
specReviewReason: result.specReviewReason,
|
|
60
|
-
qualityReviewReason: result.qualityReviewReason,
|
|
61
|
-
usage: {
|
|
62
|
-
inputTokens: result.usage.inputTokens,
|
|
63
|
-
outputTokens: result.usage.outputTokens,
|
|
64
|
-
costUSD: result.usage.costUSD,
|
|
65
|
-
savedCostUSD: result.usage.savedCostUSD,
|
|
66
|
-
},
|
|
67
|
-
turns: result.turns,
|
|
68
|
-
durationMs: result.durationMs,
|
|
69
|
-
filesRead: result.filesRead,
|
|
70
|
-
filesWritten: result.filesWritten,
|
|
71
|
-
directoriesListed: result.directoriesListed ?? [],
|
|
72
|
-
toolCalls: result.toolCalls,
|
|
73
|
-
escalationLog: result.escalationLog,
|
|
74
|
-
agents: result.agents,
|
|
75
|
-
models: result.models,
|
|
76
|
-
}, null, 2),
|
|
77
|
-
};
|
|
78
|
-
}
|
|
79
45
|
export function resolveParentModel(config) {
|
|
80
46
|
return process.env.PARENT_MODEL_NAME || config.defaults?.parentModel || undefined;
|
|
81
47
|
}
|
|
@@ -106,10 +72,37 @@ export function buildRunTasksOptions(extra) {
|
|
|
106
72
|
params: {
|
|
107
73
|
progressToken,
|
|
108
74
|
progress: progressCounter,
|
|
109
|
-
message:
|
|
75
|
+
message: `[task ${_taskIndex}] ${event.headline}`,
|
|
110
76
|
},
|
|
111
77
|
}).catch(() => { });
|
|
112
78
|
},
|
|
113
79
|
};
|
|
114
80
|
}
|
|
81
|
+
/**
|
|
82
|
+
* Build a unified MCP response envelope for delegate_tasks / clarification flows.
|
|
83
|
+
* Strips noisy internal fields (escalationLog, usage, turns, agents, models).
|
|
84
|
+
*/
|
|
85
|
+
export function buildUnifiedResponse(input) {
|
|
86
|
+
const { batchId, results, tasks, wallClockMs, parentModel, contextBlockId, clarificationId, clarifications, } = input;
|
|
87
|
+
const timings = computeTimings(wallClockMs, results);
|
|
88
|
+
const batchProgress = computeBatchProgress(results);
|
|
89
|
+
const aggregateCost = computeAggregateCost(results);
|
|
90
|
+
const headline = composeHeadline({ timings, batchProgress, aggregateCost, parentModel });
|
|
91
|
+
const response = {
|
|
92
|
+
headline,
|
|
93
|
+
batchId,
|
|
94
|
+
...(contextBlockId && { contextBlockId }),
|
|
95
|
+
...(clarificationId && { clarificationId }),
|
|
96
|
+
...(clarifications && clarifications.length > 0 && { clarifications }),
|
|
97
|
+
results: results.map((r) => ({
|
|
98
|
+
status: r.status,
|
|
99
|
+
output: r.output,
|
|
100
|
+
filesWritten: r.filesWritten,
|
|
101
|
+
...(r.status === 'error' && r.error !== undefined && { error: r.error }),
|
|
102
|
+
})),
|
|
103
|
+
};
|
|
104
|
+
return {
|
|
105
|
+
content: [{ type: 'text', text: JSON.stringify(response, null, 2) }],
|
|
106
|
+
};
|
|
107
|
+
}
|
|
115
108
|
//# sourceMappingURL=shared.js.map
|
package/dist/tools/shared.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../src/tools/shared.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
interface TruncatableResult {
|
|
2
|
+
status: string;
|
|
3
|
+
output: string;
|
|
4
|
+
filesWritten: string[];
|
|
5
|
+
error?: string;
|
|
6
|
+
}
|
|
7
|
+
/**
|
|
8
|
+
* Truncate result outputs to stay within a combined character budget.
|
|
9
|
+
*
|
|
10
|
+
* When combined output exceeds the threshold, the budget is allocated equally
|
|
11
|
+
* across all tasks. Short tasks are left intact and their surplus is
|
|
12
|
+
* redistributed proportionally to oversized ones. Oversized outputs are
|
|
13
|
+
* truncated at valid Unicode codepoint boundaries and annotated with a
|
|
14
|
+
* get_batch_slice suffix.
|
|
15
|
+
*/
|
|
16
|
+
export declare function truncateResults<T extends TruncatableResult>(results: T[], batchId: string, threshold: number): T[];
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=truncation.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"truncation.d.ts","sourceRoot":"","sources":["../../src/tools/truncation.ts"],"names":[],"mappings":"AAAA,UAAU,iBAAiB;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAMD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,CAAC,SAAS,iBAAiB,EACzD,OAAO,EAAE,CAAC,EAAE,EACZ,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,MAAM,GAChB,CAAC,EAAE,CAuDL"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
function buildSuffix(batchId, taskIndex, originalLength, truncatedLength) {
|
|
2
|
+
return `\n\n[Output truncated at ${truncatedLength}/${originalLength} chars. Use get_batch_slice({ batchId: "${batchId}", taskIndex: ${taskIndex} }) to fetch full output.]`;
|
|
3
|
+
}
|
|
4
|
+
/**
|
|
5
|
+
* Truncate result outputs to stay within a combined character budget.
|
|
6
|
+
*
|
|
7
|
+
* When combined output exceeds the threshold, the budget is allocated equally
|
|
8
|
+
* across all tasks. Short tasks are left intact and their surplus is
|
|
9
|
+
* redistributed proportionally to oversized ones. Oversized outputs are
|
|
10
|
+
* truncated at valid Unicode codepoint boundaries and annotated with a
|
|
11
|
+
* get_batch_slice suffix.
|
|
12
|
+
*/
|
|
13
|
+
export function truncateResults(results, batchId, threshold) {
|
|
14
|
+
const totalChars = results.reduce((sum, r) => sum + r.output.length, 0);
|
|
15
|
+
if (totalChars <= threshold)
|
|
16
|
+
return results;
|
|
17
|
+
// Compute actual suffix lengths per result (not a fixed estimate)
|
|
18
|
+
const suffixLengths = results.map((_, i) => buildSuffix(batchId, i, 999999, 999999).length);
|
|
19
|
+
const suffixReserve = suffixLengths.reduce((sum, l) => sum + l, 0);
|
|
20
|
+
// Content budget is threshold minus suffix overhead, clamped to [0, threshold]
|
|
21
|
+
const contentBudget = Math.max(0, threshold - suffixReserve);
|
|
22
|
+
const perTaskShare = Math.floor(contentBudget / results.length);
|
|
23
|
+
// First pass: identify short (fits in share) vs oversized
|
|
24
|
+
const shortIndices = [];
|
|
25
|
+
const oversizedIndices = [];
|
|
26
|
+
let surplusBudget = 0;
|
|
27
|
+
for (let i = 0; i < results.length; i++) {
|
|
28
|
+
if (results[i].output.length <= perTaskShare) {
|
|
29
|
+
shortIndices.push(i);
|
|
30
|
+
surplusBudget += perTaskShare - results[i].output.length;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
oversizedIndices.push(i);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
// Redistribute surplus proportionally to oversized outputs
|
|
37
|
+
const totalOversized = oversizedIndices.reduce((sum, i) => sum + results[i].output.length, 0);
|
|
38
|
+
return results.map((r, i) => {
|
|
39
|
+
if (shortIndices.includes(i))
|
|
40
|
+
return r; // fits, no truncation
|
|
41
|
+
let budget = perTaskShare;
|
|
42
|
+
if (totalOversized > 0 && surplusBudget > 0) {
|
|
43
|
+
budget += Math.floor(surplusBudget * (r.output.length / totalOversized));
|
|
44
|
+
}
|
|
45
|
+
// Truncate at valid Unicode boundary (avoid splitting surrogate pairs)
|
|
46
|
+
let truncPoint = Math.min(budget, r.output.length);
|
|
47
|
+
if (truncPoint > 0 && truncPoint < r.output.length) {
|
|
48
|
+
const code = r.output.charCodeAt(truncPoint - 1);
|
|
49
|
+
// Don't split after a high surrogate (would orphan it)
|
|
50
|
+
if (code >= 0xD800 && code <= 0xDBFF)
|
|
51
|
+
truncPoint--;
|
|
52
|
+
// Don't split on a low surrogate (would orphan the preceding high)
|
|
53
|
+
const codeAt = r.output.charCodeAt(truncPoint);
|
|
54
|
+
if (codeAt >= 0xDC00 && codeAt <= 0xDFFF && truncPoint > 0)
|
|
55
|
+
truncPoint--;
|
|
56
|
+
}
|
|
57
|
+
const truncatedOutput = r.output.slice(0, truncPoint) +
|
|
58
|
+
buildSuffix(batchId, i, r.output.length, truncPoint);
|
|
59
|
+
return { ...r, output: truncatedOutput };
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=truncation.js.map
|