@ipul-labs/forge 1.17.1 → 1.19.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 +24 -0
- package/lib/bin/cli/analyze.d.ts.map +1 -1
- package/lib/bin/cli/analyze.js +41 -0
- package/lib/bin/cli/analyze.js.map +1 -1
- package/lib/bin/cli/apply.d.ts.map +1 -1
- package/lib/bin/cli/apply.js +13 -0
- package/lib/bin/cli/apply.js.map +1 -1
- package/lib/bin/cli/cifix.d.ts.map +1 -1
- package/lib/bin/cli/cifix.js +20 -0
- package/lib/bin/cli/cifix.js.map +1 -1
- package/lib/bin/cli/close.d.ts.map +1 -1
- package/lib/bin/cli/close.js +8 -1
- package/lib/bin/cli/close.js.map +1 -1
- package/lib/bin/cli/improve.d.ts +2 -0
- package/lib/bin/cli/improve.d.ts.map +1 -0
- package/lib/bin/cli/improve.js +153 -0
- package/lib/bin/cli/improve.js.map +1 -0
- package/lib/bin/cli/merge.d.ts.map +1 -1
- package/lib/bin/cli/merge.js +14 -0
- package/lib/bin/cli/merge.js.map +1 -1
- package/lib/bin/cli/refine.d.ts.map +1 -1
- package/lib/bin/cli/refine.js +20 -0
- package/lib/bin/cli/refine.js.map +1 -1
- package/lib/bin/cli/resolution.d.ts.map +1 -1
- package/lib/bin/cli/resolution.js +12 -4
- package/lib/bin/cli/resolution.js.map +1 -1
- package/lib/bin/cli/stats.d.ts +2 -0
- package/lib/bin/cli/stats.d.ts.map +1 -0
- package/lib/bin/cli/stats.js +78 -0
- package/lib/bin/cli/stats.js.map +1 -0
- package/lib/bin/cli/validate.d.ts.map +1 -1
- package/lib/bin/cli/validate.js +17 -2
- package/lib/bin/cli/validate.js.map +1 -1
- package/lib/bin/forge-agent.js +8 -0
- package/lib/bin/forge-agent.js.map +1 -1
- package/lib/server/forge/core/configStore.d.ts +1 -0
- package/lib/server/forge/core/configStore.d.ts.map +1 -1
- package/lib/server/forge/core/selfImprove.d.ts +42 -0
- package/lib/server/forge/core/selfImprove.d.ts.map +1 -0
- package/lib/server/forge/core/selfImprove.js +360 -0
- package/lib/server/forge/core/selfImprove.js.map +1 -0
- package/lib/server/forge/core/telemetry.d.ts +87 -0
- package/lib/server/forge/core/telemetry.d.ts.map +1 -0
- package/lib/server/forge/core/telemetry.js +188 -0
- package/lib/server/forge/core/telemetry.js.map +1 -0
- package/lib/server/forge/core/types.d.ts +1 -0
- package/lib/server/forge/core/types.d.ts.map +1 -1
- package/lib/server/forge/routes.d.ts.map +1 -1
- package/lib/server/forge/routes.js +15 -0
- package/lib/server/forge/routes.js.map +1 -1
- package/package.json +2 -2
- package/scripts/inject-readme.cjs +10 -0
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
2
|
+
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
3
|
+
return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
|
|
4
|
+
return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
|
|
5
|
+
});
|
|
6
|
+
}
|
|
7
|
+
return path;
|
|
8
|
+
};
|
|
9
|
+
import path from "node:path";
|
|
10
|
+
import { useEffect, useState } from "react";
|
|
11
|
+
import Spinner from "ink-spinner";
|
|
12
|
+
import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
13
|
+
import { projectRoot, getFlag } from "./utils.js";
|
|
14
|
+
async function resolveSelfRepo(argv) {
|
|
15
|
+
const explicit = getFlag(argv, "--repo");
|
|
16
|
+
if (explicit)
|
|
17
|
+
return explicit;
|
|
18
|
+
if (process.env.FORGE_SELF_REPO)
|
|
19
|
+
return process.env.FORGE_SELF_REPO;
|
|
20
|
+
try {
|
|
21
|
+
const { get } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/configStore.ts")));
|
|
22
|
+
const repos = get()?.repos ?? [];
|
|
23
|
+
const forgeRepo = repos.find((r) => r.id.toLowerCase().includes("forge"));
|
|
24
|
+
if (forgeRepo)
|
|
25
|
+
return forgeRepo.id;
|
|
26
|
+
}
|
|
27
|
+
catch { }
|
|
28
|
+
return null;
|
|
29
|
+
}
|
|
30
|
+
function ImproveView({ createIssues, repo, onDone }) {
|
|
31
|
+
const { exit } = useApp();
|
|
32
|
+
const [phase, setPhase] = useState("evaluating");
|
|
33
|
+
const [result, setResult] = useState(null);
|
|
34
|
+
const [created, setCreated] = useState(0);
|
|
35
|
+
const [error, setError] = useState(null);
|
|
36
|
+
useEffect(() => {
|
|
37
|
+
if (phase === "done" || phase === "error") {
|
|
38
|
+
onDone(result, created);
|
|
39
|
+
exit();
|
|
40
|
+
}
|
|
41
|
+
}, [phase]);
|
|
42
|
+
useEffect(() => {
|
|
43
|
+
(async () => {
|
|
44
|
+
try {
|
|
45
|
+
const { evaluate, formatIssueBody } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/selfImprove.ts")));
|
|
46
|
+
const evalResult = await evaluate();
|
|
47
|
+
setResult(evalResult);
|
|
48
|
+
if (!createIssues || evalResult.diagnoses.length === 0 || !repo) {
|
|
49
|
+
setPhase("done");
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
setPhase("creating");
|
|
53
|
+
const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
|
|
54
|
+
const provider = createProvider(repo);
|
|
55
|
+
let count = 0;
|
|
56
|
+
for (const diagnosis of evalResult.diagnoses.slice(0, 3)) {
|
|
57
|
+
const body = formatIssueBody(diagnosis);
|
|
58
|
+
const labels = `forge-self-improve,${diagnosis.category},${diagnosis.severity}`;
|
|
59
|
+
const title = `[self-improve] ${diagnosis.title}`;
|
|
60
|
+
await provider.createIssue(title, `${body}\n\nLabels: ${labels}`);
|
|
61
|
+
count++;
|
|
62
|
+
}
|
|
63
|
+
setCreated(count);
|
|
64
|
+
setPhase("done");
|
|
65
|
+
}
|
|
66
|
+
catch (err) {
|
|
67
|
+
setError(err.message);
|
|
68
|
+
setPhase("error");
|
|
69
|
+
}
|
|
70
|
+
})();
|
|
71
|
+
}, []);
|
|
72
|
+
if (phase === "evaluating") {
|
|
73
|
+
return h `<${Box}>
|
|
74
|
+
<${Text} color="cyan"><${Spinner} type="dots"/></>
|
|
75
|
+
<${Text}> Evaluating telemetry patterns...</>
|
|
76
|
+
</>`;
|
|
77
|
+
}
|
|
78
|
+
if (phase === "creating") {
|
|
79
|
+
return h `<${Box}>
|
|
80
|
+
<${Text} color="cyan"><${Spinner} type="dots"/></>
|
|
81
|
+
<${Text}> Creating improvement issues...</>
|
|
82
|
+
</>`;
|
|
83
|
+
}
|
|
84
|
+
if (phase === "error") {
|
|
85
|
+
return h `<${Text} color="red">Error: ${error}</>`;
|
|
86
|
+
}
|
|
87
|
+
if (!result)
|
|
88
|
+
return null;
|
|
89
|
+
const { diagnoses, summary } = result;
|
|
90
|
+
return h `<${Box} flexDirection="column" paddingLeft=${1}>
|
|
91
|
+
<${Text} bold>Self-improvement evaluation</>
|
|
92
|
+
<${Text} dimColor>${summary.totalEvents} telemetry events, ${result.patterns.length} failure patterns</>
|
|
93
|
+
|
|
94
|
+
${diagnoses.length === 0
|
|
95
|
+
? h `<${Box} marginTop=${1}><${Text} color="green">No actionable patterns found. Forge is operating normally.</></>`
|
|
96
|
+
: h `<${Box} flexDirection="column" marginTop=${1}>
|
|
97
|
+
<${Text} bold>${diagnoses.length} improvement${diagnoses.length === 1 ? "" : "s"} identified:</>
|
|
98
|
+
${diagnoses.map((d, i) => h `<${Box} key=${i} marginLeft=${1} marginTop=${1} flexDirection="column">
|
|
99
|
+
<${Box}>
|
|
100
|
+
<${Text} color=${d.severity === "high" ? "red" : d.severity === "medium" ? "yellow" : "white"}>
|
|
101
|
+
${d.severity === "high" ? "▲" : d.severity === "medium" ? "●" : "○"}
|
|
102
|
+
</>
|
|
103
|
+
<${Text} bold>${d.title}</>
|
|
104
|
+
</>
|
|
105
|
+
<${Text} dimColor> ${d.category} — ${d.evidence.length} evidence items</>
|
|
106
|
+
</>`)}
|
|
107
|
+
</>`}
|
|
108
|
+
|
|
109
|
+
${created > 0
|
|
110
|
+
? h `<${Box} marginTop=${1}>
|
|
111
|
+
<${Text} color="green">✓ Created ${created} issue${created === 1 ? "" : "s"} in ${repo}</>
|
|
112
|
+
</>`
|
|
113
|
+
: null}
|
|
114
|
+
</>`;
|
|
115
|
+
}
|
|
116
|
+
async function isAuthorized() {
|
|
117
|
+
try {
|
|
118
|
+
const { get } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/configStore.ts")));
|
|
119
|
+
const config = get();
|
|
120
|
+
return config?.defaults?.selfImproveEnabled === true;
|
|
121
|
+
}
|
|
122
|
+
catch {
|
|
123
|
+
return false;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
export async function cmdImprove(argv) {
|
|
127
|
+
if (!(await isAuthorized()) && !argv.includes("--force")) {
|
|
128
|
+
console.error("forge improve is disabled. Enable in Settings → Defaults → Self-improve.");
|
|
129
|
+
process.exit(1);
|
|
130
|
+
}
|
|
131
|
+
const createIssues = argv.includes("--create");
|
|
132
|
+
const json = argv.includes("--json");
|
|
133
|
+
const repo = await resolveSelfRepo(argv);
|
|
134
|
+
if (json) {
|
|
135
|
+
const { evaluate } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/selfImprove.ts")));
|
|
136
|
+
const result = await evaluate();
|
|
137
|
+
process.stdout.write(JSON.stringify(result, null, 2) + "\n");
|
|
138
|
+
return;
|
|
139
|
+
}
|
|
140
|
+
let evalResult = null;
|
|
141
|
+
let issuesCreated = 0;
|
|
142
|
+
await runApp(h `<${ImproveView}
|
|
143
|
+
createIssues=${createIssues}
|
|
144
|
+
repo=${repo}
|
|
145
|
+
onDone=${(r, c) => { evalResult = r; issuesCreated = c; }} />`);
|
|
146
|
+
if (createIssues && issuesCreated === 0 && evalResult?.diagnoses.length) {
|
|
147
|
+
if (!repo) {
|
|
148
|
+
console.error("No repo configured. Pass --repo or run `forge init` first.");
|
|
149
|
+
process.exit(1);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
//# sourceMappingURL=improve.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"improve.js","sourceRoot":"","sources":["../../../bin/cli/improve.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":"AAuGA,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,iBA8F5C"}
|
package/lib/bin/cli/merge.js
CHANGED
|
@@ -12,6 +12,7 @@ import Spinner from "ink-spinner";
|
|
|
12
12
|
import { h, Box, Text, useApp, runApp, Confirm } from "./ink.js";
|
|
13
13
|
import { getFlag, notifyServer, projectRoot } from "./utils.js";
|
|
14
14
|
import { PHASES, appendEvent, readState, resolveSessionTarget, updateState, } from "./sessionStore.js";
|
|
15
|
+
import { record, buildEvent } from "../../server/forge/core/telemetry.js";
|
|
15
16
|
function MergeView({ repo, mrIid, autoMerge, bypassYes, onDone }) {
|
|
16
17
|
const { exit } = useApp();
|
|
17
18
|
const [phase, setPhase] = useState("review"); // review → merging → done | aborted | error
|
|
@@ -123,12 +124,25 @@ export async function cmdMerge(argv) {
|
|
|
123
124
|
process.exit(1);
|
|
124
125
|
}
|
|
125
126
|
let outcome = { phase: "pending" };
|
|
127
|
+
const startTime = Date.now();
|
|
128
|
+
const telemetryIid = sessionRef?.iid ?? mrIid;
|
|
129
|
+
const telemetryRepo = repo;
|
|
126
130
|
await runApp(h `<${MergeView}
|
|
127
131
|
repo=${repo}
|
|
128
132
|
mrIid=${mrIid}
|
|
129
133
|
autoMerge=${autoMerge}
|
|
130
134
|
bypassYes=${bypassYes}
|
|
131
135
|
onDone=${(o) => (outcome = o)} />`);
|
|
136
|
+
if (outcome.phase === "done") {
|
|
137
|
+
await record(buildEvent("merge", telemetryRepo, telemetryIid, true, startTime, {
|
|
138
|
+
meta: { autoMerge },
|
|
139
|
+
})).catch(() => { });
|
|
140
|
+
}
|
|
141
|
+
else if (outcome.phase === "error") {
|
|
142
|
+
await record(buildEvent("merge", telemetryRepo, telemetryIid, false, startTime, {
|
|
143
|
+
error: outcome.error?.message ?? "merge failed",
|
|
144
|
+
})).catch(() => { });
|
|
145
|
+
}
|
|
132
146
|
if (sessionRef) {
|
|
133
147
|
if (outcome.phase === "done") {
|
|
134
148
|
await updateState(sessionRef.repo, sessionRef.iid, {
|
package/lib/bin/cli/merge.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAChE,OAAO,EACN,MAAM,EACN,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,WAAW,GACX,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../bin/cli/refine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../bin/cli/refine.ts"],"names":[],"mappings":"AA6OA,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,iBA4F7C"}
|
package/lib/bin/cli/refine.js
CHANGED
|
@@ -14,6 +14,7 @@ import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
|
14
14
|
import { isServerAvailable, streamJob, SERVER_MODE, LOCAL_MODE, } from "./serverClient.js";
|
|
15
15
|
import { getFlag, projectRoot } from "./utils.js";
|
|
16
16
|
import { PHASES, appendEvent, readAnalysis, readState, resolveSessionTarget, updateState, writeAnalysis, } from "./sessionStore.js";
|
|
17
|
+
import { record, buildEvent } from "../../server/forge/core/telemetry.js";
|
|
17
18
|
function StepRow({ step, message, status }) {
|
|
18
19
|
let glyph;
|
|
19
20
|
if (status === "running")
|
|
@@ -213,6 +214,7 @@ export async function cmdRefine(argv) {
|
|
|
213
214
|
}
|
|
214
215
|
let outcome = { ok: false, result: null };
|
|
215
216
|
const events = [];
|
|
217
|
+
const startTime = Date.now();
|
|
216
218
|
await runApp(h `<${RefineView}
|
|
217
219
|
analysis=${analysis}
|
|
218
220
|
primary=${primary}
|
|
@@ -221,6 +223,24 @@ export async function cmdRefine(argv) {
|
|
|
221
223
|
model=${model}
|
|
222
224
|
eventSink=${(e) => events.push(e)}
|
|
223
225
|
onDone=${(o) => (outcome = o)} />`);
|
|
226
|
+
const usageEvt = events.filter((e) => e.type === "usage").pop();
|
|
227
|
+
if (outcome.ok && outcome.result) {
|
|
228
|
+
await record(buildEvent("refine", primary, target.iid, true, startTime, {
|
|
229
|
+
model,
|
|
230
|
+
tokens: usageEvt?.inputTokens != null ? {
|
|
231
|
+
input: usageEvt.inputTokens ?? 0,
|
|
232
|
+
output: usageEvt.outputTokens ?? 0,
|
|
233
|
+
cacheCreation: usageEvt.cacheCreationTokens ?? 0,
|
|
234
|
+
cacheRead: usageEvt.cacheReadTokens ?? 0,
|
|
235
|
+
} : undefined,
|
|
236
|
+
cost: usageEvt?.cost,
|
|
237
|
+
})).catch(() => { });
|
|
238
|
+
}
|
|
239
|
+
else {
|
|
240
|
+
await record(buildEvent("refine", primary, target.iid, false, startTime, {
|
|
241
|
+
error: outcome.error?.message ?? "refine failed", model,
|
|
242
|
+
})).catch(() => { });
|
|
243
|
+
}
|
|
224
244
|
if (outcome.ok && outcome.result) {
|
|
225
245
|
await writeAnalysis(target.repo, target.iid, outcome.result);
|
|
226
246
|
await updateState(target.repo, target.iid, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../../bin/cli/refine.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM,UAAU,CAAC;AAClE,OAAO,EACN,iBAAiB,EACjB,SAAS,EACT,WAAW,EACX,UAAU,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACN,MAAM,EACN,WAAW,EACX,YAAY,EACZ,SAAS,EACT,oBAAoB,EACpB,WAAW,EACX,aAAa,GACb,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"refine.js","sourceRoot":"","sources":["../../../bin/cli/refine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolution.d.ts","sourceRoot":"","sources":["../../../bin/cli/resolution.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolution.d.ts","sourceRoot":"","sources":["../../../bin/cli/resolution.ts"],"names":[],"mappings":"AAwHA,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,iBAsDtD"}
|
|
@@ -13,6 +13,7 @@ import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
|
13
13
|
import { isServerAvailable, postJson, SERVER_MODE, LOCAL_MODE, } from "./serverClient.js";
|
|
14
14
|
import { getFlag, projectRoot } from "./utils.js";
|
|
15
15
|
import { PHASES, appendEvent, readState, resolveSessionTarget, updateState, } from "./sessionStore.js";
|
|
16
|
+
import { record, buildEvent } from "../../server/forge/core/telemetry.js";
|
|
16
17
|
function ResolutionView({ repo, secondaries, iid, mrIid, onDone }) {
|
|
17
18
|
const { exit } = useApp();
|
|
18
19
|
const [phase, setPhase] = useState("checking"); // checking → done | error
|
|
@@ -114,6 +115,7 @@ export async function cmdResolutionCheck(argv) {
|
|
|
114
115
|
const repo = state.primary ?? target.repo;
|
|
115
116
|
const secondaries = state.secondaries ?? [];
|
|
116
117
|
let outcome = { phase: "pending", verdict: null, error: null };
|
|
118
|
+
const startTime = Date.now();
|
|
117
119
|
await runApp(h `<${ResolutionView}
|
|
118
120
|
repo=${repo}
|
|
119
121
|
secondaries=${secondaries}
|
|
@@ -121,19 +123,25 @@ export async function cmdResolutionCheck(argv) {
|
|
|
121
123
|
mrIid=${state.mrIid}
|
|
122
124
|
onDone=${(o) => (outcome = o)} />`);
|
|
123
125
|
if (outcome.phase === "done") {
|
|
124
|
-
const
|
|
126
|
+
const resolved = outcome.verdict?.resolved === true || outcome.verdict?.ok === true;
|
|
127
|
+
await record(buildEvent("resolution-check", repo, target.iid, resolved, startTime, {
|
|
128
|
+
...(!resolved ? { error: "resolution check: not resolved" } : {}),
|
|
129
|
+
})).catch(() => { });
|
|
125
130
|
await updateState(target.repo, target.iid, {
|
|
126
|
-
phase:
|
|
131
|
+
phase: resolved ? PHASES.RESOLVED : "resolution-rejected",
|
|
127
132
|
resolution: outcome.verdict ?? null,
|
|
128
133
|
}).catch(() => { });
|
|
129
134
|
await appendEvent(target.repo, target.iid, {
|
|
130
135
|
type: "session:resolution-check",
|
|
131
|
-
resolved
|
|
136
|
+
resolved,
|
|
132
137
|
}).catch(() => { });
|
|
133
|
-
if (!
|
|
138
|
+
if (!resolved)
|
|
134
139
|
process.exit(2);
|
|
135
140
|
return;
|
|
136
141
|
}
|
|
142
|
+
await record(buildEvent("resolution-check", repo, target.iid, false, startTime, {
|
|
143
|
+
error: outcome.error?.message ?? "resolution check failed",
|
|
144
|
+
})).catch(() => { });
|
|
137
145
|
process.exit(2);
|
|
138
146
|
}
|
|
139
147
|
//# sourceMappingURL=resolution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../../bin/cli/resolution.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAc,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,OAAO,MAAM,aAAa,CAAC;AAClC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EACN,iBAAiB,EACjB,QAAQ,EACR,WAAW,EACX,UAAU,GACV,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EACN,MAAM,EACN,WAAW,EACX,SAAS,EACT,oBAAoB,EACpB,WAAW,GACX,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolution.js","sourceRoot":"","sources":["../../../bin/cli/resolution.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stats.d.ts","sourceRoot":"","sources":["../../../bin/cli/stats.ts"],"names":[],"mappings":"AA6EA,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAG5D"}
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
|
|
2
|
+
if (typeof path === "string" && /^\.\.?\//.test(path)) {
|
|
3
|
+
return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
|
|
4
|
+
return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
|
|
5
|
+
});
|
|
6
|
+
}
|
|
7
|
+
return path;
|
|
8
|
+
};
|
|
9
|
+
import path from "node:path";
|
|
10
|
+
import { useEffect, useState } from "react";
|
|
11
|
+
import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
12
|
+
import { projectRoot } from "./utils.js";
|
|
13
|
+
function StatsView({ json }) {
|
|
14
|
+
const { exit } = useApp();
|
|
15
|
+
const [summary, setSummary] = useState(null);
|
|
16
|
+
const [patterns, setPatterns] = useState([]);
|
|
17
|
+
const [error, setError] = useState(null);
|
|
18
|
+
useEffect(() => {
|
|
19
|
+
(async () => {
|
|
20
|
+
try {
|
|
21
|
+
const { getSummary, getFailurePatterns } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/telemetry.ts")));
|
|
22
|
+
const [s, p] = await Promise.all([getSummary(), getFailurePatterns()]);
|
|
23
|
+
setSummary(s);
|
|
24
|
+
setPatterns(p);
|
|
25
|
+
}
|
|
26
|
+
catch (err) {
|
|
27
|
+
setError(err.message);
|
|
28
|
+
}
|
|
29
|
+
})();
|
|
30
|
+
}, []);
|
|
31
|
+
useEffect(() => {
|
|
32
|
+
if (summary || error)
|
|
33
|
+
exit();
|
|
34
|
+
}, [summary, error]);
|
|
35
|
+
if (error) {
|
|
36
|
+
return h `<${Box}><${Text} color="red">Failed to load telemetry: ${error}</></>`;
|
|
37
|
+
}
|
|
38
|
+
if (!summary)
|
|
39
|
+
return null;
|
|
40
|
+
if (json) {
|
|
41
|
+
process.stdout.write(JSON.stringify({ summary, patterns }, null, 2) + "\n");
|
|
42
|
+
return null;
|
|
43
|
+
}
|
|
44
|
+
const ops = Object.entries(summary.byOperation);
|
|
45
|
+
return h `<${Box} flexDirection="column" paddingLeft=${1}>
|
|
46
|
+
<${Box} marginBottom=${1}>
|
|
47
|
+
<${Text} bold>Forge Telemetry</>
|
|
48
|
+
<${Text} dimColor> ${summary.totalEvents} events recorded</>
|
|
49
|
+
</>
|
|
50
|
+
|
|
51
|
+
${ops.length === 0
|
|
52
|
+
? h `<${Text} dimColor>No telemetry data yet. Run some commands first.</>`
|
|
53
|
+
: ops.map(([op, stats]) => h `<${Box} key=${op} flexDirection="column" marginBottom=${1}>
|
|
54
|
+
<${Box}>
|
|
55
|
+
<${Text} bold color="cyan">${op}</>
|
|
56
|
+
<${Text}> ${stats.total} total </>
|
|
57
|
+
<${Text} color="green">${stats.successes} ok</>
|
|
58
|
+
<${Text}> </>
|
|
59
|
+
<${Text} color=${stats.failures > 0 ? "red" : "green"}>${stats.failures} failed</>
|
|
60
|
+
<${Text} dimColor> avg ${(stats.avgDurationMs / 1000).toFixed(1)}s</>
|
|
61
|
+
${stats.totalCost > 0 ? h `<${Text} dimColor> $${stats.totalCost.toFixed(4)}</>` : null}
|
|
62
|
+
</>
|
|
63
|
+
</>`)}
|
|
64
|
+
|
|
65
|
+
${patterns.length > 0 ? h `<${Box} flexDirection="column" marginTop=${1}>
|
|
66
|
+
<${Text} bold color="yellow">Recurring failure patterns</>
|
|
67
|
+
${patterns.map((p, i) => h `<${Box} key=${i} marginLeft=${1}>
|
|
68
|
+
<${Text} color="red">${p.count}x</>
|
|
69
|
+
<${Text}> ${p.operation}: ${p.errorPattern}</>
|
|
70
|
+
</>`)}
|
|
71
|
+
</>` : null}
|
|
72
|
+
</>`;
|
|
73
|
+
}
|
|
74
|
+
export async function cmdStats(argv) {
|
|
75
|
+
const json = argv.includes("--json");
|
|
76
|
+
await runApp(h `<${StatsView} json=${json} />`);
|
|
77
|
+
}
|
|
78
|
+
//# sourceMappingURL=stats.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../bin/cli/stats.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../bin/cli/validate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../../bin/cli/validate.ts"],"names":[],"mappings":"AAsRA,wBAAsB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iBA2E/C"}
|
package/lib/bin/cli/validate.js
CHANGED
|
@@ -13,6 +13,7 @@ import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
|
13
13
|
import { isServerAvailable, streamJob, SERVER_MODE, LOCAL_MODE, } from "./serverClient.js";
|
|
14
14
|
import { getFlag, projectRoot } from "./utils.js";
|
|
15
15
|
import { PHASES, appendEvent, readAnalysis, resolveSessionTarget, updateState, } from "./sessionStore.js";
|
|
16
|
+
import { record, buildEvent } from "../../server/forge/core/telemetry.js";
|
|
16
17
|
function StepRow({ step, status }) {
|
|
17
18
|
let glyph;
|
|
18
19
|
let color;
|
|
@@ -229,29 +230,43 @@ export async function cmdValidate(argv) {
|
|
|
229
230
|
if (json) {
|
|
230
231
|
const { validate } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/validator.ts")));
|
|
231
232
|
const events = [];
|
|
233
|
+
const startTime = Date.now();
|
|
232
234
|
const onEvent = (evt) => {
|
|
233
235
|
events.push(evt);
|
|
234
236
|
process.stdout.write(`${JSON.stringify(evt)}\n`);
|
|
235
237
|
};
|
|
236
238
|
try {
|
|
237
239
|
const result = await validate(analysis, onEvent);
|
|
240
|
+
await record(buildEvent("validate", target.repo, target.iid, result.allPassed, startTime, {
|
|
241
|
+
mode: "local",
|
|
242
|
+
...(!result.allPassed ? { error: "validation checks failed" } : {}),
|
|
243
|
+
})).catch(() => { });
|
|
238
244
|
await persistValidateOutcome(target.repo, target.iid, events, result.allPassed, null);
|
|
239
245
|
if (!result.allPassed)
|
|
240
246
|
process.exit(2);
|
|
241
247
|
}
|
|
242
248
|
catch (err) {
|
|
243
|
-
|
|
244
|
-
await
|
|
249
|
+
const errObj = err instanceof Error ? err : new Error(String(err));
|
|
250
|
+
await record(buildEvent("validate", target.repo, target.iid, false, startTime, {
|
|
251
|
+
error: errObj.message, mode: "local",
|
|
252
|
+
})).catch(() => { });
|
|
253
|
+
process.stdout.write(`${JSON.stringify({ type: "error", message: errObj.message })}\n`);
|
|
254
|
+
await persistValidateOutcome(target.repo, target.iid, events, false, errObj);
|
|
245
255
|
process.exit(2);
|
|
246
256
|
}
|
|
247
257
|
return;
|
|
248
258
|
}
|
|
249
259
|
let outcome = { ok: false };
|
|
250
260
|
const events = [];
|
|
261
|
+
const startTime = Date.now();
|
|
251
262
|
await runApp(h `<${ValidateView}
|
|
252
263
|
analysis=${analysis}
|
|
253
264
|
eventSink=${(e) => events.push(e)}
|
|
254
265
|
onDone=${(o) => (outcome = o)} />`);
|
|
266
|
+
const passed = !!(outcome.ok && outcome.allPassed);
|
|
267
|
+
await record(buildEvent("validate", target.repo, target.iid, passed, startTime, {
|
|
268
|
+
...(!passed ? { error: outcome.error?.message ?? "validation checks failed" } : {}),
|
|
269
|
+
})).catch(() => { });
|
|
255
270
|
await persistValidateOutcome(target.repo, target.iid, events, outcome.ok && outcome.allPassed, outcome.error);
|
|
256
271
|
if (!outcome.ok || !outcome.allPassed)
|
|
257
272
|
process.exit(2);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../bin/cli/validate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../../bin/cli/validate.ts"],"names":[],"mappings":"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"}
|