opencastle 0.27.0 → 0.27.2
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/bin/cli.mjs +6 -0
- package/dist/cli/agents.d.ts +3 -0
- package/dist/cli/agents.d.ts.map +1 -0
- package/dist/cli/agents.js +161 -0
- package/dist/cli/agents.js.map +1 -0
- package/dist/cli/baselines.d.ts +3 -0
- package/dist/cli/baselines.d.ts.map +1 -0
- package/dist/cli/baselines.js +128 -0
- package/dist/cli/baselines.js.map +1 -0
- package/dist/cli/convoy/dashboard-types.d.ts +146 -0
- package/dist/cli/convoy/dashboard-types.d.ts.map +1 -0
- package/dist/cli/convoy/dashboard-types.js +2 -0
- package/dist/cli/convoy/dashboard-types.js.map +1 -0
- package/dist/cli/convoy/engine.d.ts +67 -2
- package/dist/cli/convoy/engine.d.ts.map +1 -1
- package/dist/cli/convoy/engine.js +2036 -28
- package/dist/cli/convoy/engine.js.map +1 -1
- package/dist/cli/convoy/engine.test.js +1659 -70
- package/dist/cli/convoy/engine.test.js.map +1 -1
- package/dist/cli/convoy/event-schemas.d.ts +9 -0
- package/dist/cli/convoy/event-schemas.d.ts.map +1 -0
- package/dist/cli/convoy/event-schemas.js +185 -0
- package/dist/cli/convoy/event-schemas.js.map +1 -0
- package/dist/cli/convoy/events.d.ts +12 -1
- package/dist/cli/convoy/events.d.ts.map +1 -1
- package/dist/cli/convoy/events.js +186 -13
- package/dist/cli/convoy/events.js.map +1 -1
- package/dist/cli/convoy/events.test.js +325 -28
- package/dist/cli/convoy/events.test.js.map +1 -1
- package/dist/cli/convoy/expertise.d.ts +16 -0
- package/dist/cli/convoy/expertise.d.ts.map +1 -0
- package/dist/cli/convoy/expertise.js +121 -0
- package/dist/cli/convoy/expertise.js.map +1 -0
- package/dist/cli/convoy/expertise.test.d.ts +2 -0
- package/dist/cli/convoy/expertise.test.d.ts.map +1 -0
- package/dist/cli/convoy/expertise.test.js +96 -0
- package/dist/cli/convoy/expertise.test.js.map +1 -0
- package/dist/cli/convoy/export.test.js +1 -0
- package/dist/cli/convoy/export.test.js.map +1 -1
- package/dist/cli/convoy/formula.d.ts +19 -0
- package/dist/cli/convoy/formula.d.ts.map +1 -0
- package/dist/cli/convoy/formula.js +142 -0
- package/dist/cli/convoy/formula.js.map +1 -0
- package/dist/cli/convoy/formula.test.d.ts +2 -0
- package/dist/cli/convoy/formula.test.d.ts.map +1 -0
- package/dist/cli/convoy/formula.test.js +342 -0
- package/dist/cli/convoy/formula.test.js.map +1 -0
- package/dist/cli/convoy/gates.d.ts +128 -0
- package/dist/cli/convoy/gates.d.ts.map +1 -0
- package/dist/cli/convoy/gates.js +606 -0
- package/dist/cli/convoy/gates.js.map +1 -0
- package/dist/cli/convoy/gates.test.d.ts +2 -0
- package/dist/cli/convoy/gates.test.d.ts.map +1 -0
- package/dist/cli/convoy/gates.test.js +976 -0
- package/dist/cli/convoy/gates.test.js.map +1 -0
- package/dist/cli/convoy/health.d.ts +11 -0
- package/dist/cli/convoy/health.d.ts.map +1 -1
- package/dist/cli/convoy/health.js +54 -0
- package/dist/cli/convoy/health.js.map +1 -1
- package/dist/cli/convoy/health.test.js +56 -1
- package/dist/cli/convoy/health.test.js.map +1 -1
- package/dist/cli/convoy/issues.d.ts +8 -0
- package/dist/cli/convoy/issues.d.ts.map +1 -0
- package/dist/cli/convoy/issues.js +98 -0
- package/dist/cli/convoy/issues.js.map +1 -0
- package/dist/cli/convoy/issues.test.d.ts +2 -0
- package/dist/cli/convoy/issues.test.d.ts.map +1 -0
- package/dist/cli/convoy/issues.test.js +107 -0
- package/dist/cli/convoy/issues.test.js.map +1 -0
- package/dist/cli/convoy/knowledge.d.ts +5 -0
- package/dist/cli/convoy/knowledge.d.ts.map +1 -0
- package/dist/cli/convoy/knowledge.js +116 -0
- package/dist/cli/convoy/knowledge.js.map +1 -0
- package/dist/cli/convoy/knowledge.test.d.ts +2 -0
- package/dist/cli/convoy/knowledge.test.d.ts.map +1 -0
- package/dist/cli/convoy/knowledge.test.js +87 -0
- package/dist/cli/convoy/knowledge.test.js.map +1 -0
- package/dist/cli/convoy/lessons.d.ts +17 -0
- package/dist/cli/convoy/lessons.d.ts.map +1 -0
- package/dist/cli/convoy/lessons.js +149 -0
- package/dist/cli/convoy/lessons.js.map +1 -0
- package/dist/cli/convoy/lessons.test.d.ts +2 -0
- package/dist/cli/convoy/lessons.test.d.ts.map +1 -0
- package/dist/cli/convoy/lessons.test.js +135 -0
- package/dist/cli/convoy/lessons.test.js.map +1 -0
- package/dist/cli/convoy/lock.d.ts +13 -0
- package/dist/cli/convoy/lock.d.ts.map +1 -0
- package/dist/cli/convoy/lock.js +88 -0
- package/dist/cli/convoy/lock.js.map +1 -0
- package/dist/cli/convoy/lock.test.d.ts +2 -0
- package/dist/cli/convoy/lock.test.d.ts.map +1 -0
- package/dist/cli/convoy/lock.test.js +136 -0
- package/dist/cli/convoy/lock.test.js.map +1 -0
- package/dist/cli/convoy/log-merge.test.d.ts +2 -0
- package/dist/cli/convoy/log-merge.test.d.ts.map +1 -0
- package/dist/cli/convoy/log-merge.test.js +147 -0
- package/dist/cli/convoy/log-merge.test.js.map +1 -0
- package/dist/cli/convoy/merge.d.ts +4 -0
- package/dist/cli/convoy/merge.d.ts.map +1 -1
- package/dist/cli/convoy/merge.js +18 -1
- package/dist/cli/convoy/merge.js.map +1 -1
- package/dist/cli/convoy/merge.test.js +6 -7
- package/dist/cli/convoy/merge.test.js.map +1 -1
- package/dist/cli/convoy/partition.d.ts +51 -0
- package/dist/cli/convoy/partition.d.ts.map +1 -0
- package/dist/cli/convoy/partition.js +186 -0
- package/dist/cli/convoy/partition.js.map +1 -0
- package/dist/cli/convoy/partition.test.d.ts +2 -0
- package/dist/cli/convoy/partition.test.d.ts.map +1 -0
- package/dist/cli/convoy/partition.test.js +315 -0
- package/dist/cli/convoy/partition.test.js.map +1 -0
- package/dist/cli/convoy/pipeline.test.js +6 -0
- package/dist/cli/convoy/pipeline.test.js.map +1 -1
- package/dist/cli/convoy/store.d.ts +99 -7
- package/dist/cli/convoy/store.d.ts.map +1 -1
- package/dist/cli/convoy/store.js +764 -31
- package/dist/cli/convoy/store.js.map +1 -1
- package/dist/cli/convoy/store.test.js +1810 -18
- package/dist/cli/convoy/store.test.js.map +1 -1
- package/dist/cli/convoy/types.d.ts +427 -5
- package/dist/cli/convoy/types.d.ts.map +1 -1
- package/dist/cli/convoy/types.js +42 -1
- package/dist/cli/convoy/types.js.map +1 -1
- package/dist/cli/log.d.ts +11 -0
- package/dist/cli/log.d.ts.map +1 -1
- package/dist/cli/log.js +114 -2
- package/dist/cli/log.js.map +1 -1
- package/dist/cli/run/adapters/claude.d.ts +2 -0
- package/dist/cli/run/adapters/claude.d.ts.map +1 -1
- package/dist/cli/run/adapters/claude.js +89 -49
- package/dist/cli/run/adapters/claude.js.map +1 -1
- package/dist/cli/run/adapters/claude.test.d.ts +2 -0
- package/dist/cli/run/adapters/claude.test.d.ts.map +1 -0
- package/dist/cli/run/adapters/claude.test.js +205 -0
- package/dist/cli/run/adapters/claude.test.js.map +1 -0
- package/dist/cli/run/adapters/copilot.d.ts +1 -0
- package/dist/cli/run/adapters/copilot.d.ts.map +1 -1
- package/dist/cli/run/adapters/copilot.js +84 -46
- package/dist/cli/run/adapters/copilot.js.map +1 -1
- package/dist/cli/run/adapters/copilot.test.d.ts +2 -0
- package/dist/cli/run/adapters/copilot.test.d.ts.map +1 -0
- package/dist/cli/run/adapters/copilot.test.js +195 -0
- package/dist/cli/run/adapters/copilot.test.js.map +1 -0
- package/dist/cli/run/adapters/cursor.d.ts +1 -0
- package/dist/cli/run/adapters/cursor.d.ts.map +1 -1
- package/dist/cli/run/adapters/cursor.js +83 -47
- package/dist/cli/run/adapters/cursor.js.map +1 -1
- package/dist/cli/run/adapters/cursor.test.d.ts +2 -0
- package/dist/cli/run/adapters/cursor.test.d.ts.map +1 -0
- package/dist/cli/run/adapters/cursor.test.js +129 -0
- package/dist/cli/run/adapters/cursor.test.js.map +1 -0
- package/dist/cli/run/adapters/opencode.d.ts +1 -0
- package/dist/cli/run/adapters/opencode.d.ts.map +1 -1
- package/dist/cli/run/adapters/opencode.js +81 -47
- package/dist/cli/run/adapters/opencode.js.map +1 -1
- package/dist/cli/run/adapters/opencode.test.d.ts +2 -0
- package/dist/cli/run/adapters/opencode.test.d.ts.map +1 -0
- package/dist/cli/run/adapters/opencode.test.js +119 -0
- package/dist/cli/run/adapters/opencode.test.js.map +1 -0
- package/dist/cli/run/executor.js +1 -1
- package/dist/cli/run/executor.js.map +1 -1
- package/dist/cli/run/schema.d.ts.map +1 -1
- package/dist/cli/run/schema.js +245 -4
- package/dist/cli/run/schema.js.map +1 -1
- package/dist/cli/run/schema.test.js +669 -0
- package/dist/cli/run/schema.test.js.map +1 -1
- package/dist/cli/run.d.ts.map +1 -1
- package/dist/cli/run.js +362 -22
- package/dist/cli/run.js.map +1 -1
- package/dist/cli/types.d.ts +85 -2
- package/dist/cli/types.d.ts.map +1 -1
- package/dist/cli/types.js.map +1 -1
- package/dist/cli/watch.d.ts +15 -0
- package/dist/cli/watch.d.ts.map +1 -0
- package/dist/cli/watch.js +279 -0
- package/dist/cli/watch.js.map +1 -0
- package/package.json +5 -1
- package/src/cli/agents.ts +177 -0
- package/src/cli/baselines.ts +143 -0
- package/src/cli/convoy/TELEMETRY.md +203 -0
- package/src/cli/convoy/dashboard-types.ts +141 -0
- package/src/cli/convoy/engine.test.ts +1937 -70
- package/src/cli/convoy/engine.ts +2350 -40
- package/src/cli/convoy/event-schemas.ts +195 -0
- package/src/cli/convoy/events.test.ts +384 -39
- package/src/cli/convoy/events.ts +202 -16
- package/src/cli/convoy/expertise.test.ts +128 -0
- package/src/cli/convoy/expertise.ts +163 -0
- package/src/cli/convoy/export.test.ts +1 -0
- package/src/cli/convoy/formula.test.ts +405 -0
- package/src/cli/convoy/formula.ts +174 -0
- package/src/cli/convoy/gates.test.ts +1169 -0
- package/src/cli/convoy/gates.ts +774 -0
- package/src/cli/convoy/health.test.ts +64 -2
- package/src/cli/convoy/health.ts +80 -2
- package/src/cli/convoy/issues.test.ts +143 -0
- package/src/cli/convoy/issues.ts +136 -0
- package/src/cli/convoy/knowledge.test.ts +101 -0
- package/src/cli/convoy/knowledge.ts +132 -0
- package/src/cli/convoy/lessons.test.ts +188 -0
- package/src/cli/convoy/lessons.ts +164 -0
- package/src/cli/convoy/lock.test.ts +181 -0
- package/src/cli/convoy/lock.ts +103 -0
- package/src/cli/convoy/log-merge.test.ts +179 -0
- package/src/cli/convoy/merge.test.ts +6 -7
- package/src/cli/convoy/merge.ts +19 -1
- package/src/cli/convoy/partition.test.ts +423 -0
- package/src/cli/convoy/partition.ts +232 -0
- package/src/cli/convoy/pipeline.test.ts +6 -0
- package/src/cli/convoy/store.test.ts +2041 -20
- package/src/cli/convoy/store.ts +945 -46
- package/src/cli/convoy/types.ts +278 -4
- package/src/cli/log.ts +120 -2
- package/src/cli/run/adapters/claude.test.ts +234 -0
- package/src/cli/run/adapters/claude.ts +45 -5
- package/src/cli/run/adapters/copilot.test.ts +224 -0
- package/src/cli/run/adapters/copilot.ts +34 -4
- package/src/cli/run/adapters/cursor.test.ts +144 -0
- package/src/cli/run/adapters/cursor.ts +33 -2
- package/src/cli/run/adapters/opencode.test.ts +135 -0
- package/src/cli/run/adapters/opencode.ts +30 -2
- package/src/cli/run/executor.ts +1 -1
- package/src/cli/run/schema.test.ts +758 -0
- package/src/cli/run/schema.ts +300 -25
- package/src/cli/run.ts +341 -21
- package/src/cli/types.ts +86 -1
- package/src/cli/watch.ts +298 -0
- package/src/dashboard/dist/_astro/{index.DtnyD8a5.css → index.6L3_HsPT.css} +1 -1
- package/src/dashboard/dist/data/.gitkeep +0 -0
- package/src/dashboard/dist/data/convoy-list.json +1 -0
- package/src/dashboard/dist/data/overall-stats.json +24 -0
- package/src/dashboard/dist/index.html +701 -3
- package/src/dashboard/node_modules/.vite/deps/_metadata.json +6 -6
- package/src/dashboard/public/data/.gitkeep +0 -0
- package/src/dashboard/public/data/convoy-list.json +1 -0
- package/src/dashboard/public/data/overall-stats.json +24 -0
- package/src/dashboard/scripts/etl.test.ts +210 -0
- package/src/dashboard/scripts/etl.ts +108 -0
- package/src/dashboard/scripts/integration-test.ts +504 -0
- package/src/dashboard/src/pages/index.astro +854 -15
- package/src/dashboard/src/styles/dashboard.css +557 -1
- package/src/orchestrator/prompts/generate-convoy.prompt.md +212 -13
package/dist/cli/log.js
CHANGED
|
@@ -1,16 +1,27 @@
|
|
|
1
1
|
import { mkdir, appendFile, stat } from 'node:fs/promises';
|
|
2
|
+
import { readdirSync, readFileSync, writeFileSync, mkdirSync } from 'node:fs';
|
|
2
3
|
import { join, dirname } from 'node:path';
|
|
3
4
|
const HELP = `
|
|
4
5
|
opencastle log [options]
|
|
6
|
+
opencastle log merge [--since <ISO-date>] [--until <ISO-date>] [--output <path>]
|
|
5
7
|
|
|
6
|
-
Append a structured event to the observability log (events.ndjson)
|
|
8
|
+
Append a structured event to the observability log (events.ndjson),
|
|
9
|
+
or merge per-convoy NDJSON files into a single file.
|
|
7
10
|
|
|
8
|
-
|
|
11
|
+
Subcommands:
|
|
12
|
+
merge Merge all .opencastle/logs/convoys/*.ndjson into convoy-events.ndjson
|
|
13
|
+
|
|
14
|
+
Options (log append):
|
|
9
15
|
--type <type> Event type (required): session|delegation|review|panel|dispute
|
|
10
16
|
--<field> <value> Any field from the event schema (see documentation)
|
|
11
17
|
--logs-dir <path> Override the logs directory path
|
|
12
18
|
--help, -h Show this help
|
|
13
19
|
|
|
20
|
+
Options (merge):
|
|
21
|
+
--since <ISO-date> Only include records at or after this date
|
|
22
|
+
--until <ISO-date> Only include records at or before this date
|
|
23
|
+
--output <path> Output path (default: .opencastle/logs/convoy-events.ndjson)
|
|
24
|
+
|
|
14
25
|
Array fields (comma-separated): file_partition, lessons_added, discoveries, reviewing_agents
|
|
15
26
|
Boolean fields: escalated, weighted
|
|
16
27
|
Numeric fields: auto-detected from value
|
|
@@ -19,6 +30,8 @@ const HELP = `
|
|
|
19
30
|
opencastle log --type session --agent Developer --model claude-sonnet-4-6 --task "Fix bug" --outcome success
|
|
20
31
|
opencastle log --type delegation --session_id feat/prj-1 --agent Developer --tier fast --mechanism sub-agent --outcome success
|
|
21
32
|
opencastle log --type panel --panel_key auth-review --verdict pass --pass_count 3 --block_count 0
|
|
33
|
+
opencastle log merge --since 2026-01-01 --output /tmp/merged.ndjson
|
|
34
|
+
opencastle log merge
|
|
22
35
|
`;
|
|
23
36
|
const VALID_TYPES = ['session', 'delegation', 'review', 'panel', 'dispute'];
|
|
24
37
|
const ARRAY_FIELDS = new Set([
|
|
@@ -58,6 +71,80 @@ export async function resolveLogsDir(override) {
|
|
|
58
71
|
}
|
|
59
72
|
return join(process.cwd(), '.opencastle', 'logs');
|
|
60
73
|
}
|
|
74
|
+
/** Merge per-convoy NDJSON files into a single deduplicated, sorted file. */
|
|
75
|
+
export async function mergeConvoyLogs(options) {
|
|
76
|
+
const base = options.basePath ?? process.cwd();
|
|
77
|
+
const convoysDir = join(base, '.opencastle', 'logs', 'convoys');
|
|
78
|
+
let files = [];
|
|
79
|
+
try {
|
|
80
|
+
files = readdirSync(convoysDir)
|
|
81
|
+
.filter(f => f.endsWith('.ndjson'))
|
|
82
|
+
.map(f => join(convoysDir, f));
|
|
83
|
+
}
|
|
84
|
+
catch {
|
|
85
|
+
return { merged: 0, deduplicated: 0, written: 0 };
|
|
86
|
+
}
|
|
87
|
+
if (files.length === 0) {
|
|
88
|
+
return { merged: 0, deduplicated: 0, written: 0 };
|
|
89
|
+
}
|
|
90
|
+
const allRecords = [];
|
|
91
|
+
let totalRead = 0;
|
|
92
|
+
for (const file of files) {
|
|
93
|
+
const content = readFileSync(file, 'utf8');
|
|
94
|
+
const lines = content.split('\n').filter(l => l.trim());
|
|
95
|
+
for (const line of lines) {
|
|
96
|
+
try {
|
|
97
|
+
allRecords.push(JSON.parse(line));
|
|
98
|
+
totalRead++;
|
|
99
|
+
}
|
|
100
|
+
catch {
|
|
101
|
+
// skip malformed lines
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
// Deduplicate by _event_id — keep first occurrence
|
|
106
|
+
const seen = new Set();
|
|
107
|
+
const unique = [];
|
|
108
|
+
for (const record of allRecords) {
|
|
109
|
+
const id = record['_event_id'];
|
|
110
|
+
if (id !== undefined) {
|
|
111
|
+
if (seen.has(id))
|
|
112
|
+
continue;
|
|
113
|
+
seen.add(id);
|
|
114
|
+
}
|
|
115
|
+
unique.push(record);
|
|
116
|
+
}
|
|
117
|
+
const deduplicatedCount = totalRead - unique.length;
|
|
118
|
+
// Filter by since/until
|
|
119
|
+
let filtered = unique;
|
|
120
|
+
if (options.since) {
|
|
121
|
+
const since = options.since;
|
|
122
|
+
filtered = filtered.filter(r => {
|
|
123
|
+
const ts = r['timestamp'];
|
|
124
|
+
return ts !== undefined && ts >= since;
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
if (options.until) {
|
|
128
|
+
const until = options.until;
|
|
129
|
+
filtered = filtered.filter(r => {
|
|
130
|
+
const ts = r['timestamp'];
|
|
131
|
+
return ts !== undefined && ts <= until;
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
// Sort by timestamp ascending
|
|
135
|
+
filtered.sort((a, b) => {
|
|
136
|
+
const ta = a['timestamp'] ?? '';
|
|
137
|
+
const tb = b['timestamp'] ?? '';
|
|
138
|
+
return ta < tb ? -1 : ta > tb ? 1 : 0;
|
|
139
|
+
});
|
|
140
|
+
if (filtered.length === 0) {
|
|
141
|
+
return { merged: totalRead, deduplicated: deduplicatedCount, written: 0 };
|
|
142
|
+
}
|
|
143
|
+
const outputPath = options.output ?? join(base, '.opencastle', 'logs', 'convoy-events.ndjson');
|
|
144
|
+
mkdirSync(dirname(outputPath), { recursive: true });
|
|
145
|
+
writeFileSync(outputPath, filtered.map(r => JSON.stringify(r)).join('\n') + '\n', 'utf8');
|
|
146
|
+
return { merged: totalRead, deduplicated: deduplicatedCount, written: filtered.length };
|
|
147
|
+
}
|
|
61
148
|
/** Append a structured event record to events.ndjson. */
|
|
62
149
|
export async function appendEvent(record, logsDir) {
|
|
63
150
|
const resolvedDir = await resolveLogsDir(logsDir ?? null);
|
|
@@ -71,6 +158,31 @@ export default async function log({ args }) {
|
|
|
71
158
|
console.log(HELP);
|
|
72
159
|
return;
|
|
73
160
|
}
|
|
161
|
+
// merge subcommand
|
|
162
|
+
if (args[0] === 'merge') {
|
|
163
|
+
const mergeArgs = args.slice(1);
|
|
164
|
+
let since;
|
|
165
|
+
let until;
|
|
166
|
+
let output;
|
|
167
|
+
for (let i = 0; i < mergeArgs.length; i++) {
|
|
168
|
+
const a = mergeArgs[i];
|
|
169
|
+
if (a === '--since' && i + 1 < mergeArgs.length) {
|
|
170
|
+
since = mergeArgs[++i];
|
|
171
|
+
continue;
|
|
172
|
+
}
|
|
173
|
+
if (a === '--until' && i + 1 < mergeArgs.length) {
|
|
174
|
+
until = mergeArgs[++i];
|
|
175
|
+
continue;
|
|
176
|
+
}
|
|
177
|
+
if (a === '--output' && i + 1 < mergeArgs.length) {
|
|
178
|
+
output = mergeArgs[++i];
|
|
179
|
+
continue;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
const result = await mergeConvoyLogs({ since, until, output });
|
|
183
|
+
console.log(` Merged: ${result.merged} records, Deduplicated: ${result.deduplicated}, Written: ${result.written}`);
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
74
186
|
let type = null;
|
|
75
187
|
let logsDir = null;
|
|
76
188
|
const fields = {};
|
package/dist/cli/log.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/cli/log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGzC,MAAM,IAAI,GAAG
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/cli/log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import type { Task, ExecuteOptions, ExecuteResult } from '../../types.js';
|
|
2
2
|
export declare const name = "claude";
|
|
3
|
+
export declare function supportsSessionContinuity(): boolean;
|
|
3
4
|
export declare function isAvailable(): Promise<boolean>;
|
|
5
|
+
export declare function executeViaCli(task: Task, options?: ExecuteOptions): Promise<ExecuteResult>;
|
|
4
6
|
export declare function execute(task: Task, options?: ExecuteOptions): Promise<ExecuteResult>;
|
|
5
7
|
export declare function kill(task: Task): void;
|
|
6
8
|
//# sourceMappingURL=claude.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../../src/cli/run/adapters/claude.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../../../src/cli/run/adapters/claude.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAc,MAAM,gBAAgB,CAAA;AAGrF,eAAO,MAAM,IAAI,WAAW,CAAA;AAE5B,wBAAgB,yBAAyB,IAAI,OAAO,CAAiB;AAuBrE,wBAAsB,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC,CAUpD;AA4HD,wBAAsB,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAwFpG;AAcD,wBAAsB,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,GAAE,cAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAI9F;AAED,wBAAgB,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,CAGrC"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
import { spawn } from 'node:child_process';
|
|
2
|
+
import { writeFileSync, unlinkSync } from 'node:fs';
|
|
3
|
+
import { join } from 'node:path';
|
|
2
4
|
import { parseTimeout } from '../schema.js';
|
|
3
5
|
// Adapter name
|
|
4
6
|
export const name = 'claude';
|
|
7
|
+
export function supportsSessionContinuity() { return false; }
|
|
5
8
|
// Module-level state for mode selection
|
|
6
9
|
let mode = null;
|
|
7
10
|
// SDK dynamic import check
|
|
@@ -70,6 +73,8 @@ async function executeViaSdk(task, options = {}) {
|
|
|
70
73
|
},
|
|
71
74
|
infiniteSessions: { enabled: false },
|
|
72
75
|
...(options.verbose ? { streaming: true } : {}),
|
|
76
|
+
// mcpServers is forward-compatible: field will be recognised by future SDK versions
|
|
77
|
+
...(options.mcpServers?.length ? { mcpServers: options.mcpServers } : {}),
|
|
73
78
|
});
|
|
74
79
|
activeSessions.set(task.id, session);
|
|
75
80
|
if (options.verbose) {
|
|
@@ -81,9 +86,10 @@ async function executeViaSdk(task, options = {}) {
|
|
|
81
86
|
try {
|
|
82
87
|
const timeoutMs = parseTimeout(task.timeout);
|
|
83
88
|
const response = await session.sendAndWait({ prompt }, timeoutMs);
|
|
84
|
-
const
|
|
89
|
+
const typed = response;
|
|
90
|
+
const data = typed?.data;
|
|
85
91
|
const output = data?.content ?? '';
|
|
86
|
-
const rawUsage = data?.usage ??
|
|
92
|
+
const rawUsage = data?.usage ?? typed?.usage;
|
|
87
93
|
const u = rawUsage;
|
|
88
94
|
const usageResult = u
|
|
89
95
|
? {
|
|
@@ -120,7 +126,7 @@ function killSdk(task) {
|
|
|
120
126
|
}
|
|
121
127
|
}
|
|
122
128
|
// --- CLI implementation (from claude-code.ts) ---
|
|
123
|
-
async function executeViaCli(task, options = {}) {
|
|
129
|
+
export async function executeViaCli(task, options = {}) {
|
|
124
130
|
let prompt = `You are a ${task.agent}. ${task.prompt}`;
|
|
125
131
|
if (task.files && task.files.length > 0) {
|
|
126
132
|
prompt += `\n\nOnly modify files under: ${task.files.join(', ')}`;
|
|
@@ -133,56 +139,90 @@ async function executeViaCli(task, options = {}) {
|
|
|
133
139
|
'--max-turns',
|
|
134
140
|
'50',
|
|
135
141
|
];
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
142
|
+
const cwd = options?.cwd ?? process.cwd();
|
|
143
|
+
const mcpJsonPath = join(cwd, 'mcp.json');
|
|
144
|
+
let wroteJson = false;
|
|
145
|
+
if (options.mcpServers?.length) {
|
|
146
|
+
const mcpJson = {};
|
|
147
|
+
for (const server of options.mcpServers) {
|
|
148
|
+
const entry = {};
|
|
149
|
+
if (server.command)
|
|
150
|
+
entry.command = server.command;
|
|
151
|
+
if (server.args)
|
|
152
|
+
entry.args = server.args;
|
|
153
|
+
if (server.url)
|
|
154
|
+
entry.url = server.url;
|
|
155
|
+
if (server.config)
|
|
156
|
+
Object.assign(entry, server.config);
|
|
157
|
+
mcpJson[server.name] = entry;
|
|
158
|
+
}
|
|
159
|
+
writeFileSync(mcpJsonPath, JSON.stringify({ mcpServers: mcpJson }, null, 2), 'utf8');
|
|
160
|
+
args.push('--mcp-config', mcpJsonPath);
|
|
161
|
+
wroteJson = true;
|
|
162
|
+
}
|
|
163
|
+
if (options.mcp_approve_all) {
|
|
164
|
+
args.push('--approve-mcps');
|
|
165
|
+
}
|
|
166
|
+
try {
|
|
167
|
+
return await new Promise((resolve) => {
|
|
168
|
+
const proc = spawn('claude', args, {
|
|
169
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
170
|
+
env: { ...process.env },
|
|
171
|
+
cwd,
|
|
172
|
+
});
|
|
173
|
+
let stdout = '';
|
|
174
|
+
let stderr = '';
|
|
175
|
+
proc.stdout.on('data', (chunk) => {
|
|
176
|
+
stdout += chunk.toString();
|
|
177
|
+
if (options.verbose) {
|
|
178
|
+
process.stdout.write(chunk);
|
|
167
179
|
}
|
|
168
|
-
}
|
|
169
|
-
catch { /* not JSON or no usage — graceful degradation */ }
|
|
170
|
-
resolve({
|
|
171
|
-
success: code === 0,
|
|
172
|
-
output: output.slice(0, 10000),
|
|
173
|
-
exitCode: code ?? -1,
|
|
174
|
-
usage,
|
|
175
180
|
});
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
181
|
+
proc.stderr.on('data', (chunk) => {
|
|
182
|
+
stderr += chunk.toString();
|
|
183
|
+
if (options.verbose) {
|
|
184
|
+
process.stderr.write(chunk);
|
|
185
|
+
}
|
|
186
|
+
});
|
|
187
|
+
proc.on('close', (code) => {
|
|
188
|
+
const output = [stdout, stderr].filter(Boolean).join('\n');
|
|
189
|
+
let usage;
|
|
190
|
+
try {
|
|
191
|
+
const parsedJson = JSON.parse(stdout);
|
|
192
|
+
const u = parsedJson?.usage;
|
|
193
|
+
if (u) {
|
|
194
|
+
const promptTokens = (u.input_tokens ?? u.prompt_tokens);
|
|
195
|
+
const completionTokens = (u.output_tokens ?? u.completion_tokens);
|
|
196
|
+
const total = ((promptTokens ?? 0) + (completionTokens ?? 0)) || undefined;
|
|
197
|
+
usage = { prompt_tokens: promptTokens, completion_tokens: completionTokens, total_tokens: total };
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
catch { /* not JSON or no usage — graceful degradation */ }
|
|
201
|
+
resolve({
|
|
202
|
+
success: code === 0,
|
|
203
|
+
output: output.slice(0, 10000),
|
|
204
|
+
exitCode: code ?? -1,
|
|
205
|
+
usage,
|
|
206
|
+
});
|
|
207
|
+
});
|
|
208
|
+
proc.on('error', (err) => {
|
|
209
|
+
resolve({
|
|
210
|
+
success: false,
|
|
211
|
+
output: `Failed to spawn claude: ${err.message}`,
|
|
212
|
+
exitCode: -1,
|
|
213
|
+
});
|
|
182
214
|
});
|
|
215
|
+
task._process = proc;
|
|
183
216
|
});
|
|
184
|
-
|
|
185
|
-
|
|
217
|
+
}
|
|
218
|
+
finally {
|
|
219
|
+
if (wroteJson) {
|
|
220
|
+
try {
|
|
221
|
+
unlinkSync(mcpJsonPath);
|
|
222
|
+
}
|
|
223
|
+
catch { /* ignore */ }
|
|
224
|
+
}
|
|
225
|
+
}
|
|
186
226
|
}
|
|
187
227
|
function killCli(task) {
|
|
188
228
|
if (task._process && !task._process.killed) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/claude.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"claude.js","sourceRoot":"","sources":["../../../../src/cli/run/adapters/claude.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"claude.test.d.ts","sourceRoot":"","sources":["../../../../src/cli/run/adapters/claude.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,205 @@
|
|
|
1
|
+
import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
|
|
2
|
+
import { mkdtempSync, rmSync, existsSync, readFileSync, realpathSync } from 'node:fs';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { EventEmitter } from 'node:events';
|
|
6
|
+
// ── Helpers ───────────────────────────────────────────────────────────────────
|
|
7
|
+
function makeTask() {
|
|
8
|
+
return {
|
|
9
|
+
id: 'test-task',
|
|
10
|
+
agent: 'developer',
|
|
11
|
+
prompt: 'Do something',
|
|
12
|
+
files: [],
|
|
13
|
+
timeout: '5m',
|
|
14
|
+
depends_on: [],
|
|
15
|
+
description: 'test task',
|
|
16
|
+
max_retries: 0,
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
function makeMockProc(exitCode = 0, stdoutData = '{"result":"ok"}') {
|
|
20
|
+
const proc = new EventEmitter();
|
|
21
|
+
proc.stdout = new EventEmitter();
|
|
22
|
+
proc.stderr = new EventEmitter();
|
|
23
|
+
proc.killed = false;
|
|
24
|
+
proc.kill = vi.fn();
|
|
25
|
+
process.nextTick(() => {
|
|
26
|
+
if (stdoutData)
|
|
27
|
+
proc.stdout.emit('data', Buffer.from(stdoutData));
|
|
28
|
+
proc.emit('close', exitCode);
|
|
29
|
+
});
|
|
30
|
+
return proc;
|
|
31
|
+
}
|
|
32
|
+
// ── SDK mode ──────────────────────────────────────────────────────────────────
|
|
33
|
+
describe('claude adapter — SDK mode', () => {
|
|
34
|
+
let mockCreateSession;
|
|
35
|
+
let mockSession;
|
|
36
|
+
beforeEach(() => {
|
|
37
|
+
vi.resetModules();
|
|
38
|
+
mockSession = {
|
|
39
|
+
sendAndWait: vi.fn().mockResolvedValue({ data: { content: 'I did the task' } }),
|
|
40
|
+
on: vi.fn(),
|
|
41
|
+
destroy: vi.fn().mockResolvedValue(undefined),
|
|
42
|
+
abort: vi.fn().mockResolvedValue(undefined),
|
|
43
|
+
};
|
|
44
|
+
mockCreateSession = vi.fn().mockResolvedValue(mockSession);
|
|
45
|
+
vi.doMock('@anthropic-ai/agent-sdk', () => {
|
|
46
|
+
// Must use a regular function (not arrow) so `new AgentClient()` works
|
|
47
|
+
function MockAgentClient() {
|
|
48
|
+
this.start = vi.fn().mockResolvedValue(undefined);
|
|
49
|
+
this.createSession = mockCreateSession;
|
|
50
|
+
}
|
|
51
|
+
return {
|
|
52
|
+
AgentClient: MockAgentClient,
|
|
53
|
+
approveAll: vi.fn(),
|
|
54
|
+
};
|
|
55
|
+
});
|
|
56
|
+
});
|
|
57
|
+
afterEach(() => {
|
|
58
|
+
vi.restoreAllMocks();
|
|
59
|
+
});
|
|
60
|
+
it('passes mcpServers to createSession when provided', async () => {
|
|
61
|
+
const { execute } = await import('./claude.js');
|
|
62
|
+
const mcpServers = [{ name: 'my-mcp', type: 'local', command: 'node', args: ['server.js'] }];
|
|
63
|
+
await execute(makeTask(), { mcpServers });
|
|
64
|
+
expect(mockCreateSession).toHaveBeenCalledWith(expect.objectContaining({ mcpServers }));
|
|
65
|
+
});
|
|
66
|
+
it('does NOT include mcpServers in createSession when not provided', async () => {
|
|
67
|
+
const { execute } = await import('./claude.js');
|
|
68
|
+
await execute(makeTask(), {});
|
|
69
|
+
const callArg = mockCreateSession.mock.calls[0]?.[0];
|
|
70
|
+
expect(callArg).not.toHaveProperty('mcpServers');
|
|
71
|
+
});
|
|
72
|
+
it('does NOT include mcpServers when mcpServers is empty array', async () => {
|
|
73
|
+
const { execute } = await import('./claude.js');
|
|
74
|
+
await execute(makeTask(), { mcpServers: [] });
|
|
75
|
+
const callArg = mockCreateSession.mock.calls[0]?.[0];
|
|
76
|
+
expect(callArg).not.toHaveProperty('mcpServers');
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
// ── CLI mode ──────────────────────────────────────────────────────────────────
|
|
80
|
+
describe('claude adapter — CLI mode', () => {
|
|
81
|
+
let tmpDir;
|
|
82
|
+
let mockSpawn;
|
|
83
|
+
beforeEach(() => {
|
|
84
|
+
vi.resetModules();
|
|
85
|
+
tmpDir = realpathSync(mkdtempSync(join(tmpdir(), 'claude-test-')));
|
|
86
|
+
mockSpawn = vi.fn().mockImplementation((cmd) => {
|
|
87
|
+
if (cmd === 'which')
|
|
88
|
+
return makeMockProc(0, '');
|
|
89
|
+
return makeMockProc(0, '{"result":"ok"}');
|
|
90
|
+
});
|
|
91
|
+
vi.doMock('node:child_process', () => ({ spawn: mockSpawn }));
|
|
92
|
+
});
|
|
93
|
+
afterEach(() => {
|
|
94
|
+
rmSync(tmpDir, { recursive: true, force: true });
|
|
95
|
+
vi.restoreAllMocks();
|
|
96
|
+
});
|
|
97
|
+
it('writes mcp.json to cwd with correct format when mcpServers provided', async () => {
|
|
98
|
+
let capturedContent = null;
|
|
99
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
100
|
+
if (cmd === 'which')
|
|
101
|
+
return makeMockProc(0, '');
|
|
102
|
+
const mcpPath = join(tmpDir, 'mcp.json');
|
|
103
|
+
if (existsSync(mcpPath)) {
|
|
104
|
+
capturedContent = readFileSync(mcpPath, 'utf8');
|
|
105
|
+
}
|
|
106
|
+
return makeMockProc(0, '{}');
|
|
107
|
+
});
|
|
108
|
+
const { executeViaCli } = await import('./claude.js');
|
|
109
|
+
const mcpServers = [{ name: 'my-mcp', type: 'local', command: 'node', args: ['server.js'] }];
|
|
110
|
+
await executeViaCli(makeTask(), { mcpServers, cwd: tmpDir });
|
|
111
|
+
expect(capturedContent).not.toBeNull();
|
|
112
|
+
expect(JSON.parse(capturedContent)).toEqual({
|
|
113
|
+
mcpServers: { 'my-mcp': { command: 'node', args: ['server.js'] } },
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
it('passes --mcp-config flag pointing to mcp.json path', async () => {
|
|
117
|
+
const capturedArgs = [];
|
|
118
|
+
mockSpawn.mockImplementation((cmd, args) => {
|
|
119
|
+
if (cmd === 'which')
|
|
120
|
+
return makeMockProc(0, '');
|
|
121
|
+
capturedArgs.push(...args);
|
|
122
|
+
return makeMockProc(0, '{}');
|
|
123
|
+
});
|
|
124
|
+
const { executeViaCli } = await import('./claude.js');
|
|
125
|
+
const mcpServers = [{ name: 'my-mcp', type: 'local', command: 'node', args: ['server.js'] }];
|
|
126
|
+
await executeViaCli(makeTask(), { mcpServers, cwd: tmpDir });
|
|
127
|
+
const idx = capturedArgs.indexOf('--mcp-config');
|
|
128
|
+
expect(idx).toBeGreaterThanOrEqual(0);
|
|
129
|
+
expect(capturedArgs[idx + 1]).toBe(join(tmpDir, 'mcp.json'));
|
|
130
|
+
});
|
|
131
|
+
it('cleans up mcp.json after successful execution', async () => {
|
|
132
|
+
const { executeViaCli } = await import('./claude.js');
|
|
133
|
+
const mcpServers = [{ name: 'my-mcp', type: 'local', command: 'node', args: ['server.js'] }];
|
|
134
|
+
await executeViaCli(makeTask(), { mcpServers, cwd: tmpDir });
|
|
135
|
+
expect(existsSync(join(tmpDir, 'mcp.json'))).toBe(false);
|
|
136
|
+
});
|
|
137
|
+
it('cleans up mcp.json after failed execution (non-zero exit)', async () => {
|
|
138
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
139
|
+
if (cmd === 'which')
|
|
140
|
+
return makeMockProc(0, '');
|
|
141
|
+
return makeMockProc(1, '');
|
|
142
|
+
});
|
|
143
|
+
const { executeViaCli } = await import('./claude.js');
|
|
144
|
+
const mcpServers = [{ name: 'err-mcp', type: 'local', command: 'node', args: [] }];
|
|
145
|
+
await executeViaCli(makeTask(), { mcpServers, cwd: tmpDir });
|
|
146
|
+
expect(existsSync(join(tmpDir, 'mcp.json'))).toBe(false);
|
|
147
|
+
});
|
|
148
|
+
it('includes --approve-mcps flag when mcp_approve_all is true', async () => {
|
|
149
|
+
const capturedArgs = [];
|
|
150
|
+
mockSpawn.mockImplementation((cmd, args) => {
|
|
151
|
+
if (cmd === 'which')
|
|
152
|
+
return makeMockProc(0, '');
|
|
153
|
+
capturedArgs.push(...args);
|
|
154
|
+
return makeMockProc(0, '{}');
|
|
155
|
+
});
|
|
156
|
+
const { executeViaCli } = await import('./claude.js');
|
|
157
|
+
await executeViaCli(makeTask(), { mcp_approve_all: true, cwd: tmpDir });
|
|
158
|
+
expect(capturedArgs).toContain('--approve-mcps');
|
|
159
|
+
});
|
|
160
|
+
it('does NOT write mcp.json when mcpServers not configured', async () => {
|
|
161
|
+
const { executeViaCli } = await import('./claude.js');
|
|
162
|
+
await executeViaCli(makeTask(), { cwd: tmpDir });
|
|
163
|
+
expect(existsSync(join(tmpDir, 'mcp.json'))).toBe(false);
|
|
164
|
+
});
|
|
165
|
+
it('does NOT add --approve-mcps when mcp_approve_all is not set', async () => {
|
|
166
|
+
const capturedArgs = [];
|
|
167
|
+
mockSpawn.mockImplementation((cmd, args) => {
|
|
168
|
+
if (cmd === 'which')
|
|
169
|
+
return makeMockProc(0, '');
|
|
170
|
+
capturedArgs.push(...args);
|
|
171
|
+
return makeMockProc(0, '{}');
|
|
172
|
+
});
|
|
173
|
+
const { executeViaCli } = await import('./claude.js');
|
|
174
|
+
await executeViaCli(makeTask(), { cwd: tmpDir });
|
|
175
|
+
expect(capturedArgs).not.toContain('--approve-mcps');
|
|
176
|
+
});
|
|
177
|
+
it('maps mcpServers with url and config into mcp.json', async () => {
|
|
178
|
+
let capturedContent = null;
|
|
179
|
+
mockSpawn.mockImplementation((cmd) => {
|
|
180
|
+
if (cmd === 'which')
|
|
181
|
+
return makeMockProc(0, '');
|
|
182
|
+
const mcpPath = join(tmpDir, 'mcp.json');
|
|
183
|
+
if (existsSync(mcpPath))
|
|
184
|
+
capturedContent = readFileSync(mcpPath, 'utf8');
|
|
185
|
+
return makeMockProc(0, '{}');
|
|
186
|
+
});
|
|
187
|
+
const { executeViaCli } = await import('./claude.js');
|
|
188
|
+
const mcpServers = [
|
|
189
|
+
{
|
|
190
|
+
name: 'remote-mcp',
|
|
191
|
+
type: 'remote',
|
|
192
|
+
url: 'http://localhost:9000',
|
|
193
|
+
config: { token: 'abc' },
|
|
194
|
+
},
|
|
195
|
+
];
|
|
196
|
+
await executeViaCli(makeTask(), { mcpServers, cwd: tmpDir });
|
|
197
|
+
expect(capturedContent).not.toBeNull();
|
|
198
|
+
const parsed = JSON.parse(capturedContent);
|
|
199
|
+
expect(parsed.mcpServers['remote-mcp']).toMatchObject({
|
|
200
|
+
url: 'http://localhost:9000',
|
|
201
|
+
token: 'abc',
|
|
202
|
+
});
|
|
203
|
+
});
|
|
204
|
+
});
|
|
205
|
+
//# sourceMappingURL=claude.test.js.map
|