@ipul-labs/forge 1.16.8 → 1.17.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 +39 -21
- package/lib/bin/cli/analyze.d.ts +9 -0
- package/lib/bin/cli/analyze.d.ts.map +1 -0
- package/lib/bin/cli/analyze.js +491 -0
- package/lib/bin/cli/analyze.js.map +1 -0
- package/lib/bin/cli/apply.d.ts +2 -0
- package/lib/bin/cli/apply.d.ts.map +1 -0
- package/lib/bin/cli/apply.js +262 -0
- package/lib/bin/cli/apply.js.map +1 -0
- package/lib/bin/cli/cifix.d.ts +2 -0
- package/lib/bin/cli/cifix.d.ts.map +1 -0
- package/lib/bin/cli/cifix.js +310 -0
- package/lib/bin/cli/cifix.js.map +1 -0
- package/lib/bin/cli/close.d.ts +2 -0
- package/lib/bin/cli/close.d.ts.map +1 -0
- package/lib/bin/cli/close.js +113 -0
- package/lib/bin/cli/close.js.map +1 -0
- package/lib/bin/cli/createIssue.d.ts +2 -0
- package/lib/bin/cli/createIssue.d.ts.map +1 -0
- package/lib/bin/cli/createIssue.js +108 -0
- package/lib/bin/cli/createIssue.js.map +1 -0
- package/lib/bin/cli/doctor.d.ts +2 -0
- package/lib/bin/cli/doctor.d.ts.map +1 -0
- package/lib/bin/cli/doctor.js +145 -0
- package/lib/bin/cli/doctor.js.map +1 -0
- package/lib/bin/cli/init.d.ts +4 -0
- package/lib/bin/cli/init.d.ts.map +1 -0
- package/lib/bin/cli/init.js +288 -0
- package/lib/bin/cli/init.js.map +1 -0
- package/lib/bin/cli/ink.d.ts +23 -0
- package/lib/bin/cli/ink.d.ts.map +1 -0
- package/{bin → lib/bin}/cli/ink.js +18 -19
- package/lib/bin/cli/ink.js.map +1 -0
- package/lib/bin/cli/issue.d.ts +2 -0
- package/lib/bin/cli/issue.d.ts.map +1 -0
- package/lib/bin/cli/issue.js +114 -0
- package/lib/bin/cli/issue.js.map +1 -0
- package/lib/bin/cli/issues.d.ts +2 -0
- package/lib/bin/cli/issues.d.ts.map +1 -0
- package/lib/bin/cli/issues.js +149 -0
- package/lib/bin/cli/issues.js.map +1 -0
- package/lib/bin/cli/merge.d.ts +2 -0
- package/lib/bin/cli/merge.d.ts.map +1 -0
- package/lib/bin/cli/merge.js +162 -0
- package/lib/bin/cli/merge.js.map +1 -0
- package/lib/bin/cli/refine.d.ts +2 -0
- package/lib/bin/cli/refine.d.ts.map +1 -0
- package/lib/bin/cli/refine.js +249 -0
- package/lib/bin/cli/refine.js.map +1 -0
- package/lib/bin/cli/repl.d.ts +2 -0
- package/lib/bin/cli/repl.d.ts.map +1 -0
- package/lib/bin/cli/repl.js +309 -0
- package/lib/bin/cli/repl.js.map +1 -0
- package/lib/bin/cli/repos.d.ts +2 -0
- package/lib/bin/cli/repos.d.ts.map +1 -0
- package/lib/bin/cli/repos.js +86 -0
- package/lib/bin/cli/repos.js.map +1 -0
- package/lib/bin/cli/resolution.d.ts +2 -0
- package/lib/bin/cli/resolution.d.ts.map +1 -0
- package/lib/bin/cli/resolution.js +139 -0
- package/lib/bin/cli/resolution.js.map +1 -0
- package/lib/bin/cli/serverClient.d.ts +26 -0
- package/lib/bin/cli/serverClient.d.ts.map +1 -0
- package/lib/bin/cli/serverClient.js +111 -0
- package/lib/bin/cli/serverClient.js.map +1 -0
- package/lib/bin/cli/session.d.ts +8 -0
- package/lib/bin/cli/session.d.ts.map +1 -0
- package/lib/bin/cli/session.js +212 -0
- package/lib/bin/cli/session.js.map +1 -0
- package/lib/bin/cli/sessionStore.d.ts +69 -0
- package/lib/bin/cli/sessionStore.d.ts.map +1 -0
- package/lib/bin/cli/sessionStore.js +196 -0
- package/lib/bin/cli/sessionStore.js.map +1 -0
- package/lib/bin/cli/ship.d.ts +33 -0
- package/lib/bin/cli/ship.d.ts.map +1 -0
- package/lib/bin/cli/ship.js +737 -0
- package/lib/bin/cli/ship.js.map +1 -0
- package/lib/bin/cli/types.d.ts +59 -0
- package/lib/bin/cli/types.d.ts.map +1 -0
- package/lib/bin/cli/types.js +2 -0
- package/lib/bin/cli/types.js.map +1 -0
- package/lib/bin/cli/update.d.ts +2 -0
- package/lib/bin/cli/update.d.ts.map +1 -0
- package/lib/bin/cli/update.js +87 -0
- package/lib/bin/cli/update.js.map +1 -0
- package/lib/bin/cli/utils.d.ts +43 -0
- package/lib/bin/cli/utils.d.ts.map +1 -0
- package/lib/bin/cli/utils.js +171 -0
- package/lib/bin/cli/utils.js.map +1 -0
- package/lib/bin/cli/validate.d.ts +2 -0
- package/lib/bin/cli/validate.d.ts.map +1 -0
- package/lib/bin/cli/validate.js +283 -0
- package/lib/bin/cli/validate.js.map +1 -0
- package/lib/bin/cli/watch.d.ts +5 -0
- package/lib/bin/cli/watch.d.ts.map +1 -0
- package/lib/bin/cli/watch.js +263 -0
- package/lib/bin/cli/watch.js.map +1 -0
- package/lib/bin/forge-agent.d.ts +3 -0
- package/lib/bin/forge-agent.d.ts.map +1 -0
- package/{bin → lib/bin}/forge-agent.js +104 -105
- package/lib/bin/forge-agent.js.map +1 -0
- package/lib/server/forge/core/ForgeAgent.d.ts +260 -0
- package/lib/server/forge/core/ForgeAgent.d.ts.map +1 -0
- package/lib/server/forge/core/ForgeAgent.js +995 -0
- package/lib/server/forge/core/ForgeAgent.js.map +1 -0
- package/lib/server/forge/core/agentClient.d.ts +39 -0
- package/lib/server/forge/core/agentClient.d.ts.map +1 -0
- package/{server → lib/server}/forge/core/agentClient.js +7 -12
- package/lib/server/forge/core/agentClient.js.map +1 -0
- package/lib/server/forge/core/branchName.d.ts +20 -0
- package/lib/server/forge/core/branchName.d.ts.map +1 -0
- package/lib/server/forge/core/branchName.js +39 -0
- package/lib/server/forge/core/branchName.js.map +1 -0
- package/lib/server/forge/core/claudeClient.d.ts +60 -0
- package/lib/server/forge/core/claudeClient.d.ts.map +1 -0
- package/lib/server/forge/core/claudeClient.js +347 -0
- package/lib/server/forge/core/claudeClient.js.map +1 -0
- package/lib/server/forge/core/configStore.d.ts +76 -0
- package/lib/server/forge/core/configStore.d.ts.map +1 -0
- package/lib/server/forge/core/configStore.js +213 -0
- package/lib/server/forge/core/configStore.js.map +1 -0
- package/lib/server/forge/core/gitlabClient.d.ts +144 -0
- package/lib/server/forge/core/gitlabClient.d.ts.map +1 -0
- package/{server → lib/server}/forge/core/gitlabClient.js +98 -180
- package/lib/server/forge/core/gitlabClient.js.map +1 -0
- package/lib/server/forge/core/jobs.d.ts +67 -0
- package/lib/server/forge/core/jobs.d.ts.map +1 -0
- package/lib/server/forge/core/jobs.js +185 -0
- package/lib/server/forge/core/jobs.js.map +1 -0
- package/lib/server/forge/core/k8s.d.ts +18 -0
- package/lib/server/forge/core/k8s.d.ts.map +1 -0
- package/lib/server/forge/core/k8s.js +49 -0
- package/lib/server/forge/core/k8s.js.map +1 -0
- package/lib/server/forge/core/localRepo.d.ts +36 -0
- package/lib/server/forge/core/localRepo.d.ts.map +1 -0
- package/lib/server/forge/core/localRepo.js +165 -0
- package/lib/server/forge/core/localRepo.js.map +1 -0
- package/lib/server/forge/core/openclawClient.d.ts +61 -0
- package/lib/server/forge/core/openclawClient.d.ts.map +1 -0
- package/lib/server/forge/core/openclawClient.js +111 -0
- package/lib/server/forge/core/openclawClient.js.map +1 -0
- package/lib/server/forge/core/prompts.d.ts +96 -0
- package/lib/server/forge/core/prompts.d.ts.map +1 -0
- package/lib/server/forge/core/prompts.js +450 -0
- package/lib/server/forge/core/prompts.js.map +1 -0
- package/lib/server/forge/core/providers/azuredevops.d.ts +134 -0
- package/lib/server/forge/core/providers/azuredevops.d.ts.map +1 -0
- package/lib/server/forge/core/providers/azuredevops.js +360 -0
- package/lib/server/forge/core/providers/azuredevops.js.map +1 -0
- package/lib/server/forge/core/providers/base.d.ts +114 -0
- package/lib/server/forge/core/providers/base.d.ts.map +1 -0
- package/lib/server/forge/core/providers/base.js +98 -0
- package/lib/server/forge/core/providers/base.js.map +1 -0
- package/lib/server/forge/core/providers/github.d.ts +133 -0
- package/lib/server/forge/core/providers/github.d.ts.map +1 -0
- package/lib/server/forge/core/providers/github.js +307 -0
- package/lib/server/forge/core/providers/github.js.map +1 -0
- package/lib/server/forge/core/providers/gitlab.d.ts +144 -0
- package/lib/server/forge/core/providers/gitlab.d.ts.map +1 -0
- package/lib/server/forge/core/providers/gitlab.js +407 -0
- package/lib/server/forge/core/providers/gitlab.js.map +1 -0
- package/lib/server/forge/core/providers/index.d.ts +21 -0
- package/lib/server/forge/core/providers/index.d.ts.map +1 -0
- package/lib/server/forge/core/providers/index.js +43 -0
- package/lib/server/forge/core/providers/index.js.map +1 -0
- package/lib/server/forge/core/providers/types.d.ts +80 -0
- package/lib/server/forge/core/providers/types.d.ts.map +1 -0
- package/lib/server/forge/core/providers/types.js +2 -0
- package/lib/server/forge/core/providers/types.js.map +1 -0
- package/lib/server/forge/core/quotaClient.d.ts +48 -0
- package/lib/server/forge/core/quotaClient.d.ts.map +1 -0
- package/lib/server/forge/core/quotaClient.js +88 -0
- package/lib/server/forge/core/quotaClient.js.map +1 -0
- package/lib/server/forge/core/types.d.ts +160 -0
- package/lib/server/forge/core/types.d.ts.map +1 -0
- package/lib/server/forge/core/types.js +2 -0
- package/lib/server/forge/core/types.js.map +1 -0
- package/lib/server/forge/core/validator/attribute.d.ts +31 -0
- package/lib/server/forge/core/validator/attribute.d.ts.map +1 -0
- package/lib/server/forge/core/validator/attribute.js +82 -0
- package/lib/server/forge/core/validator/attribute.js.map +1 -0
- package/lib/server/forge/core/validator/clone.d.ts +14 -0
- package/lib/server/forge/core/validator/clone.d.ts.map +1 -0
- package/lib/server/forge/core/validator/clone.js +99 -0
- package/lib/server/forge/core/validator/clone.js.map +1 -0
- package/lib/server/forge/core/validator/cmd.d.ts +23 -0
- package/lib/server/forge/core/validator/cmd.d.ts.map +1 -0
- package/lib/server/forge/core/validator/cmd.js +87 -0
- package/lib/server/forge/core/validator/cmd.js.map +1 -0
- package/lib/server/forge/core/validator/fs.d.ts +5 -0
- package/lib/server/forge/core/validator/fs.d.ts.map +1 -0
- package/{server → lib/server}/forge/core/validator/fs.js +8 -3
- package/lib/server/forge/core/validator/fs.js.map +1 -0
- package/lib/server/forge/core/validator/overlay.d.ts +13 -0
- package/lib/server/forge/core/validator/overlay.d.ts.map +1 -0
- package/lib/server/forge/core/validator/overlay.js +53 -0
- package/lib/server/forge/core/validator/overlay.js.map +1 -0
- package/lib/server/forge/core/validator/projectType.d.ts +20 -0
- package/lib/server/forge/core/validator/projectType.d.ts.map +1 -0
- package/lib/server/forge/core/validator/projectType.js +94 -0
- package/lib/server/forge/core/validator/projectType.js.map +1 -0
- package/lib/server/forge/core/validator/runners/go.d.ts +21 -0
- package/lib/server/forge/core/validator/runners/go.d.ts.map +1 -0
- package/lib/server/forge/core/validator/runners/go.js +99 -0
- package/lib/server/forge/core/validator/runners/go.js.map +1 -0
- package/lib/server/forge/core/validator/runners/node.d.ts +12 -0
- package/lib/server/forge/core/validator/runners/node.d.ts.map +1 -0
- package/lib/server/forge/core/validator/runners/node.js +75 -0
- package/lib/server/forge/core/validator/runners/node.js.map +1 -0
- package/lib/server/forge/core/validator/tdd.d.ts +30 -0
- package/lib/server/forge/core/validator/tdd.d.ts.map +1 -0
- package/lib/server/forge/core/validator/tdd.js +96 -0
- package/lib/server/forge/core/validator/tdd.js.map +1 -0
- package/lib/server/forge/core/validator.d.ts +58 -0
- package/lib/server/forge/core/validator.d.ts.map +1 -0
- package/lib/server/forge/core/validator.js +150 -0
- package/lib/server/forge/core/validator.js.map +1 -0
- package/lib/server/forge/routes.d.ts +22 -0
- package/lib/server/forge/routes.d.ts.map +1 -0
- package/lib/server/forge/routes.js +984 -0
- package/lib/server/forge/routes.js.map +1 -0
- package/lib/server.d.ts +2 -0
- package/lib/server.d.ts.map +1 -0
- package/lib/server.js +52 -0
- package/lib/server.js.map +1 -0
- package/lib/shared/events.d.ts +12 -0
- package/lib/shared/events.d.ts.map +1 -0
- package/lib/shared/events.js +12 -0
- package/lib/shared/events.js.map +1 -0
- package/package.json +15 -13
- package/scripts/fix-shebang.cjs +10 -0
- package/bin/cli/analyze.js +0 -516
- package/bin/cli/apply.js +0 -264
- package/bin/cli/cifix.js +0 -300
- package/bin/cli/close.js +0 -125
- package/bin/cli/createIssue.js +0 -112
- package/bin/cli/doctor.js +0 -161
- package/bin/cli/init.js +0 -306
- package/bin/cli/issue.js +0 -116
- package/bin/cli/issues.js +0 -155
- package/bin/cli/merge.js +0 -175
- package/bin/cli/refine.js +0 -253
- package/bin/cli/repl.js +0 -301
- package/bin/cli/repos.js +0 -91
- package/bin/cli/resolution.js +0 -126
- package/bin/cli/session.js +0 -230
- package/bin/cli/sessionStore.js +0 -211
- package/bin/cli/ship.js +0 -762
- package/bin/cli/update.js +0 -95
- package/bin/cli/utils.js +0 -145
- package/bin/cli/validate.js +0 -280
- package/bin/cli/watch.js +0 -274
- package/server/forge/core/ForgeAgent.js +0 -1179
- package/server/forge/core/ForgeAgent.test.js +0 -179
- package/server/forge/core/branchName.js +0 -41
- package/server/forge/core/claudeClient.js +0 -378
- package/server/forge/core/configStore.js +0 -229
- package/server/forge/core/configStore.test.js +0 -89
- package/server/forge/core/jobs.js +0 -180
- package/server/forge/core/k8s.js +0 -54
- package/server/forge/core/localRepo.js +0 -163
- package/server/forge/core/openclawClient.js +0 -125
- package/server/forge/core/prompts.js +0 -483
- package/server/forge/core/prompts.test.js +0 -219
- package/server/forge/core/providers/azuredevops.js +0 -409
- package/server/forge/core/providers/base.js +0 -208
- package/server/forge/core/providers/github.js +0 -348
- package/server/forge/core/providers/gitlab.js +0 -529
- package/server/forge/core/providers/index.js +0 -47
- package/server/forge/core/quotaClient.js +0 -101
- package/server/forge/core/validator/attribute.js +0 -84
- package/server/forge/core/validator/clone.js +0 -116
- package/server/forge/core/validator/cmd.js +0 -98
- package/server/forge/core/validator/overlay.js +0 -52
- package/server/forge/core/validator/projectType.js +0 -87
- package/server/forge/core/validator/runners/go.js +0 -107
- package/server/forge/core/validator/runners/node.js +0 -84
- package/server/forge/core/validator/tdd.js +0 -105
- package/server/forge/core/validator.js +0 -167
- package/server/forge/routes.js +0 -1027
|
@@ -0,0 +1,149 @@
|
|
|
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, relativeAge, resolvePrimaryRepo } from "./utils.js";
|
|
14
|
+
function applyFilters(list, { label, mine, currentUser }) {
|
|
15
|
+
let out = list;
|
|
16
|
+
if (label) {
|
|
17
|
+
const want = label.toLowerCase();
|
|
18
|
+
out = out.filter((i) => (i.labels ?? []).some((l) => l.toLowerCase() === want));
|
|
19
|
+
}
|
|
20
|
+
if (mine && currentUser) {
|
|
21
|
+
const want = currentUser.toLowerCase();
|
|
22
|
+
out = out.filter((i) => (i.author?.name ?? "").toLowerCase() === want);
|
|
23
|
+
}
|
|
24
|
+
return out;
|
|
25
|
+
}
|
|
26
|
+
function IssuesView({ primary, limit, label, mine, onError }) {
|
|
27
|
+
const { exit } = useApp();
|
|
28
|
+
const [phase, setPhase] = useState("loading");
|
|
29
|
+
const [issues, setIssues] = useState([]);
|
|
30
|
+
const [error, setError] = useState(null);
|
|
31
|
+
useEffect(() => {
|
|
32
|
+
let cancelled = false;
|
|
33
|
+
(async () => {
|
|
34
|
+
try {
|
|
35
|
+
const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
|
|
36
|
+
const provider = createProvider(primary);
|
|
37
|
+
let list = await provider.listOpenIssues();
|
|
38
|
+
if (cancelled)
|
|
39
|
+
return;
|
|
40
|
+
list = applyFilters(list, {
|
|
41
|
+
label,
|
|
42
|
+
mine,
|
|
43
|
+
currentUser: process.env.FORGE_USER ?? process.env.USER ?? null,
|
|
44
|
+
});
|
|
45
|
+
if (Number.isInteger(limit) && limit > 0)
|
|
46
|
+
list = list.slice(0, limit);
|
|
47
|
+
setIssues(list);
|
|
48
|
+
setPhase("done");
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
if (cancelled)
|
|
52
|
+
return;
|
|
53
|
+
setError(err.message || String(err));
|
|
54
|
+
setPhase("error");
|
|
55
|
+
onError(err);
|
|
56
|
+
}
|
|
57
|
+
})();
|
|
58
|
+
return () => {
|
|
59
|
+
cancelled = true;
|
|
60
|
+
};
|
|
61
|
+
}, []);
|
|
62
|
+
useEffect(() => {
|
|
63
|
+
if (phase === "done" || phase === "error")
|
|
64
|
+
exit();
|
|
65
|
+
}, [phase]);
|
|
66
|
+
if (phase === "loading") {
|
|
67
|
+
return h `<${Box}>
|
|
68
|
+
<${Text} color="cyan"><${Spinner} type="dots"/></>
|
|
69
|
+
<${Text}> Fetching issues from </>
|
|
70
|
+
<${Text} dimColor>${primary}</>
|
|
71
|
+
</>`;
|
|
72
|
+
}
|
|
73
|
+
if (phase === "error") {
|
|
74
|
+
return h `<${Box}>
|
|
75
|
+
<${Text} color="red">✘</>
|
|
76
|
+
<${Text}> Failed to fetch issues: ${error}</>
|
|
77
|
+
</>`;
|
|
78
|
+
}
|
|
79
|
+
const count = issues.length;
|
|
80
|
+
const header = h `<${Box} marginBottom=${1}>
|
|
81
|
+
<${Text} color="green">✓</>
|
|
82
|
+
<${Text}> ${count} open issue${count === 1 ? "" : "s"} in </>
|
|
83
|
+
<${Text} dimColor>${primary}</>
|
|
84
|
+
</>`;
|
|
85
|
+
if (count === 0)
|
|
86
|
+
return header;
|
|
87
|
+
const rows = issues.map((i) => ({
|
|
88
|
+
age: relativeAge(i.created_at),
|
|
89
|
+
iid: `#${i.iid}`,
|
|
90
|
+
title: i.title.length > 60 ? `${i.title.slice(0, 57)}…` : i.title,
|
|
91
|
+
labels: (i.labels ?? []).slice(0, 3).join(","),
|
|
92
|
+
}));
|
|
93
|
+
const wAge = Math.max(3, ...rows.map((r) => r.age.length));
|
|
94
|
+
const wIid = Math.max(3, ...rows.map((r) => r.iid.length));
|
|
95
|
+
return h `<${Box} flexDirection="column">
|
|
96
|
+
${header}
|
|
97
|
+
${rows.map((r, i) => h `<${Box} key=${i}>
|
|
98
|
+
<${Box} width=${wAge + 2}><${Text} dimColor>${r.age}</></>
|
|
99
|
+
<${Box} width=${wIid + 2}><${Text} color="yellow">${r.iid}</></>
|
|
100
|
+
<${Box} flexGrow=${1}><${Text}>${r.title}</></>
|
|
101
|
+
<${Text} dimColor> ${r.labels}</>
|
|
102
|
+
</>`)}
|
|
103
|
+
<${Box} marginTop=${1}>
|
|
104
|
+
<${Text} dimColor>${"Analyze: forge analyze <iid>"}</>
|
|
105
|
+
</>
|
|
106
|
+
</>`;
|
|
107
|
+
}
|
|
108
|
+
export async function cmdIssues(argv) {
|
|
109
|
+
const primary = await resolvePrimaryRepo(argv);
|
|
110
|
+
if (!primary) {
|
|
111
|
+
console.error("No repo. Pass --repo <group/repo>, set FORGE_GITLAB_PROJECT, or run `forge init`.");
|
|
112
|
+
process.exit(1);
|
|
113
|
+
}
|
|
114
|
+
const json = argv.includes("--json");
|
|
115
|
+
const limitStr = getFlag(argv, "--limit");
|
|
116
|
+
const limit = limitStr ? parseInt(limitStr, 10) : null;
|
|
117
|
+
const label = getFlag(argv, "--label");
|
|
118
|
+
const mine = argv.includes("--mine");
|
|
119
|
+
if (json) {
|
|
120
|
+
const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
|
|
121
|
+
const provider = createProvider(primary);
|
|
122
|
+
try {
|
|
123
|
+
let issues = await provider.listOpenIssues();
|
|
124
|
+
issues = applyFilters(issues, {
|
|
125
|
+
label,
|
|
126
|
+
mine,
|
|
127
|
+
currentUser: process.env.FORGE_USER ?? process.env.USER ?? null,
|
|
128
|
+
});
|
|
129
|
+
if (Number.isInteger(limit) && limit > 0)
|
|
130
|
+
issues = issues.slice(0, limit);
|
|
131
|
+
process.stdout.write(`${JSON.stringify(issues, null, 2)}\n`);
|
|
132
|
+
}
|
|
133
|
+
catch (err) {
|
|
134
|
+
process.stdout.write(`${JSON.stringify({ error: err.message })}\n`);
|
|
135
|
+
process.exit(2);
|
|
136
|
+
}
|
|
137
|
+
return;
|
|
138
|
+
}
|
|
139
|
+
let failed = false;
|
|
140
|
+
await runApp(h `<${IssuesView}
|
|
141
|
+
primary=${primary}
|
|
142
|
+
limit=${limit}
|
|
143
|
+
label=${label}
|
|
144
|
+
mine=${mine}
|
|
145
|
+
onError=${() => (failed = true)} />`);
|
|
146
|
+
if (failed)
|
|
147
|
+
process.exit(2);
|
|
148
|
+
}
|
|
149
|
+
//# sourceMappingURL=issues.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"issues.js","sourceRoot":"","sources":["../../../bin/cli/issues.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":"AAsGA,wBAAsB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,iBAiF5C"}
|
|
@@ -0,0 +1,162 @@
|
|
|
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, Confirm } from "./ink.js";
|
|
13
|
+
import { getFlag, notifyServer, projectRoot } from "./utils.js";
|
|
14
|
+
import { PHASES, appendEvent, readState, resolveSessionTarget, updateState, } from "./sessionStore.js";
|
|
15
|
+
function MergeView({ repo, mrIid, autoMerge, bypassYes, onDone }) {
|
|
16
|
+
const { exit } = useApp();
|
|
17
|
+
const [phase, setPhase] = useState("review"); // review → merging → done | aborted | error
|
|
18
|
+
const [error, setError] = useState(null);
|
|
19
|
+
useEffect(() => {
|
|
20
|
+
if (phase === "done" || phase === "aborted" || phase === "error") {
|
|
21
|
+
onDone({ phase, error });
|
|
22
|
+
exit();
|
|
23
|
+
}
|
|
24
|
+
}, [phase]);
|
|
25
|
+
useEffect(() => {
|
|
26
|
+
if (phase !== "merging")
|
|
27
|
+
return;
|
|
28
|
+
let cancelled = false;
|
|
29
|
+
(async () => {
|
|
30
|
+
try {
|
|
31
|
+
const { createProvider } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/providers/index.ts")));
|
|
32
|
+
const provider = createProvider(repo);
|
|
33
|
+
if (autoMerge) {
|
|
34
|
+
if (typeof provider.setAutoMergeMR !== "function") {
|
|
35
|
+
throw new Error(`${provider.name ?? "provider"} does not support arming auto-merge.`);
|
|
36
|
+
}
|
|
37
|
+
await provider.setAutoMergeMR(mrIid);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
await provider.mergeMR(mrIid);
|
|
41
|
+
}
|
|
42
|
+
if (cancelled)
|
|
43
|
+
return;
|
|
44
|
+
setPhase("done");
|
|
45
|
+
}
|
|
46
|
+
catch (err) {
|
|
47
|
+
if (cancelled)
|
|
48
|
+
return;
|
|
49
|
+
setError(err instanceof Error ? err : new Error(String(err)));
|
|
50
|
+
setPhase("error");
|
|
51
|
+
}
|
|
52
|
+
})();
|
|
53
|
+
return () => {
|
|
54
|
+
cancelled = true;
|
|
55
|
+
};
|
|
56
|
+
}, [phase]);
|
|
57
|
+
const action = autoMerge
|
|
58
|
+
? "Arm auto-merge for this MR (will merge once CI is green)?"
|
|
59
|
+
: "Merge this MR now?";
|
|
60
|
+
if (phase === "review" || phase === "confirm") {
|
|
61
|
+
return h `<${Box} flexDirection="column">
|
|
62
|
+
<${Box}>
|
|
63
|
+
<${Text} color="yellow">MR </>
|
|
64
|
+
<${Text}>${repo} !${mrIid}</>
|
|
65
|
+
</>
|
|
66
|
+
<${Confirm}
|
|
67
|
+
message=${action}
|
|
68
|
+
bypassYes=${bypassYes}
|
|
69
|
+
onSelect=${(yes) => setPhase(yes ? "merging" : "aborted")} />
|
|
70
|
+
</>`;
|
|
71
|
+
}
|
|
72
|
+
if (phase === "merging") {
|
|
73
|
+
return h `<${Box}>
|
|
74
|
+
<${Text} color="cyan"><${Spinner} type="dots"/></>
|
|
75
|
+
<${Text}>${autoMerge ? " Arming auto-merge…" : " Merging…"}</>
|
|
76
|
+
</>`;
|
|
77
|
+
}
|
|
78
|
+
if (phase === "done") {
|
|
79
|
+
return h `<${Box}>
|
|
80
|
+
<${Text} color="green">${autoMerge ? "✓ Auto-merge armed." : "✓ Merged."}</>
|
|
81
|
+
</>`;
|
|
82
|
+
}
|
|
83
|
+
if (phase === "aborted") {
|
|
84
|
+
return h `<${Text} dimColor>Aborted — no merge.</>`;
|
|
85
|
+
}
|
|
86
|
+
return h `<${Box}>
|
|
87
|
+
<${Text} color="red">${`✘ ${error?.message ?? String(error)}`}</>
|
|
88
|
+
</>`;
|
|
89
|
+
}
|
|
90
|
+
export async function cmdMerge(argv) {
|
|
91
|
+
const explicitIid = Number(argv[1]);
|
|
92
|
+
const explicitRepo = getFlag(argv, "--repo");
|
|
93
|
+
const explicitMr = Number(getFlag(argv, "--mr"));
|
|
94
|
+
const autoMerge = argv.includes("--auto");
|
|
95
|
+
const bypassYes = argv.includes("--yes") || process.env.FORGE_YES === "1";
|
|
96
|
+
let repo;
|
|
97
|
+
let mrIid;
|
|
98
|
+
let sessionRef = null;
|
|
99
|
+
if (Number.isInteger(explicitMr) && explicitMr > 0) {
|
|
100
|
+
repo = explicitRepo;
|
|
101
|
+
mrIid = explicitMr;
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
const target = await resolveSessionTarget({
|
|
105
|
+
explicitIid: Number.isInteger(explicitIid) && explicitIid > 0 ? explicitIid : null,
|
|
106
|
+
explicitRepo,
|
|
107
|
+
});
|
|
108
|
+
if (!target?.repo || !target?.iid) {
|
|
109
|
+
console.error("No session target. Pass --mr <iid> --repo <repo>, or run analyze + apply first.");
|
|
110
|
+
process.exit(1);
|
|
111
|
+
}
|
|
112
|
+
const state = await readState(target.repo, target.iid);
|
|
113
|
+
if (!state?.mrIid) {
|
|
114
|
+
console.error(`Session ${target.repo}#${target.iid} has no MR. Run: forge apply ${target.iid}`);
|
|
115
|
+
process.exit(1);
|
|
116
|
+
}
|
|
117
|
+
repo = state.primary ?? target.repo;
|
|
118
|
+
mrIid = state.mrIid;
|
|
119
|
+
sessionRef = target;
|
|
120
|
+
}
|
|
121
|
+
if (!repo) {
|
|
122
|
+
console.error("Repo is required: pass --repo <id>");
|
|
123
|
+
process.exit(1);
|
|
124
|
+
}
|
|
125
|
+
let outcome = { phase: "pending" };
|
|
126
|
+
await runApp(h `<${MergeView}
|
|
127
|
+
repo=${repo}
|
|
128
|
+
mrIid=${mrIid}
|
|
129
|
+
autoMerge=${autoMerge}
|
|
130
|
+
bypassYes=${bypassYes}
|
|
131
|
+
onDone=${(o) => (outcome = o)} />`);
|
|
132
|
+
if (sessionRef) {
|
|
133
|
+
if (outcome.phase === "done") {
|
|
134
|
+
await updateState(sessionRef.repo, sessionRef.iid, {
|
|
135
|
+
phase: PHASES.MERGED,
|
|
136
|
+
mergedAt: new Date().toISOString(),
|
|
137
|
+
autoMergeArmed: !!autoMerge,
|
|
138
|
+
lastError: null,
|
|
139
|
+
}).catch(() => { });
|
|
140
|
+
await appendEvent(sessionRef.repo, sessionRef.iid, {
|
|
141
|
+
type: "session:merge-done",
|
|
142
|
+
autoMerge: !!autoMerge,
|
|
143
|
+
}).catch(() => { });
|
|
144
|
+
const { FORGE_EVENTS } = await import("../../shared/events.js");
|
|
145
|
+
await notifyServer({ type: FORGE_EVENTS.MR_MERGED, mrIid });
|
|
146
|
+
}
|
|
147
|
+
else if (outcome.phase === "error") {
|
|
148
|
+
await updateState(sessionRef.repo, sessionRef.iid, {
|
|
149
|
+
lastError: outcome.error?.message ?? null,
|
|
150
|
+
}).catch(() => { });
|
|
151
|
+
await appendEvent(sessionRef.repo, sessionRef.iid, {
|
|
152
|
+
type: "session:merge-failed",
|
|
153
|
+
error: outcome.error?.message,
|
|
154
|
+
}).catch(() => { });
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
if (outcome.phase === "error")
|
|
158
|
+
process.exit(2);
|
|
159
|
+
if (outcome.phase === "aborted")
|
|
160
|
+
process.exit(0);
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=merge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../bin/cli/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"refine.d.ts","sourceRoot":"","sources":["../../../bin/cli/refine.ts"],"names":[],"mappings":"AA4OA,wBAAsB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,iBAyE7C"}
|
|
@@ -0,0 +1,249 @@
|
|
|
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 TextInput from "ink-text-input";
|
|
13
|
+
import { h, Box, Text, useApp, runApp } from "./ink.js";
|
|
14
|
+
import { isServerAvailable, streamJob, SERVER_MODE, LOCAL_MODE, } from "./serverClient.js";
|
|
15
|
+
import { getFlag, projectRoot } from "./utils.js";
|
|
16
|
+
import { PHASES, appendEvent, readAnalysis, readState, resolveSessionTarget, updateState, writeAnalysis, } from "./sessionStore.js";
|
|
17
|
+
function StepRow({ step, message, status }) {
|
|
18
|
+
let glyph;
|
|
19
|
+
if (status === "running")
|
|
20
|
+
glyph = h `<${Text} color="cyan"><${Spinner} type="dots"/></>`;
|
|
21
|
+
else if (status === "done")
|
|
22
|
+
glyph = h `<${Text} color="green">✓</>`;
|
|
23
|
+
else
|
|
24
|
+
glyph = h `<${Text} color="red">✘</>`;
|
|
25
|
+
return h `<${Box}>
|
|
26
|
+
${glyph}
|
|
27
|
+
<${Text} dimColor> [${step}]</>
|
|
28
|
+
<${Text}> ${message}</>
|
|
29
|
+
</>`;
|
|
30
|
+
}
|
|
31
|
+
function FeedbackPrompt({ onSubmit }) {
|
|
32
|
+
const { exit } = useApp();
|
|
33
|
+
const [input, setInput] = useState("");
|
|
34
|
+
return h `<${Box} flexDirection="column">
|
|
35
|
+
<${Box}>
|
|
36
|
+
<${Text} color="cyan">? </>
|
|
37
|
+
<${Text}>What feedback should the model address?</>
|
|
38
|
+
</>
|
|
39
|
+
<${Box} marginLeft=${2}>
|
|
40
|
+
<${TextInput}
|
|
41
|
+
value=${input}
|
|
42
|
+
onChange=${setInput}
|
|
43
|
+
onSubmit=${(v) => {
|
|
44
|
+
const trimmed = v.trim();
|
|
45
|
+
if (!trimmed)
|
|
46
|
+
return; // require non-empty
|
|
47
|
+
onSubmit(trimmed);
|
|
48
|
+
exit();
|
|
49
|
+
}} />
|
|
50
|
+
</>
|
|
51
|
+
</>`;
|
|
52
|
+
}
|
|
53
|
+
function RefineView({ analysis, primary, secondaries, feedback, model, eventSink, onDone }) {
|
|
54
|
+
const { exit } = useApp();
|
|
55
|
+
const [items, setItems] = useState([]);
|
|
56
|
+
const [mode, setMode] = useState(null);
|
|
57
|
+
const [result, setResult] = useState(null);
|
|
58
|
+
const [finished, setFinished] = useState(null);
|
|
59
|
+
useEffect(() => {
|
|
60
|
+
if (!finished)
|
|
61
|
+
return;
|
|
62
|
+
onDone(finished);
|
|
63
|
+
exit();
|
|
64
|
+
}, [finished]);
|
|
65
|
+
const handleEvent = (evt, cancelRef) => {
|
|
66
|
+
if (cancelRef?.current)
|
|
67
|
+
return null;
|
|
68
|
+
eventSink?.(evt);
|
|
69
|
+
if (evt.type === "result")
|
|
70
|
+
return evt.data ?? null;
|
|
71
|
+
setItems((prev) => {
|
|
72
|
+
const closeRunning = (list) => list.map((it) => it.kind === "step" && it.status === "running"
|
|
73
|
+
? { ...it, status: "done" }
|
|
74
|
+
: it);
|
|
75
|
+
switch (evt.type) {
|
|
76
|
+
case "progress":
|
|
77
|
+
return [
|
|
78
|
+
...closeRunning(prev),
|
|
79
|
+
{
|
|
80
|
+
kind: "step",
|
|
81
|
+
step: evt.step,
|
|
82
|
+
message: evt.message,
|
|
83
|
+
status: "running",
|
|
84
|
+
},
|
|
85
|
+
];
|
|
86
|
+
case "log":
|
|
87
|
+
return [...prev, { kind: "log", text: evt.message }];
|
|
88
|
+
case "error":
|
|
89
|
+
return [
|
|
90
|
+
...prev.map((it) => it.kind === "step" && it.status === "running"
|
|
91
|
+
? { ...it, status: "failed" }
|
|
92
|
+
: it),
|
|
93
|
+
{ kind: "error", message: evt.message },
|
|
94
|
+
];
|
|
95
|
+
default:
|
|
96
|
+
return prev;
|
|
97
|
+
}
|
|
98
|
+
});
|
|
99
|
+
return null;
|
|
100
|
+
};
|
|
101
|
+
useEffect(() => {
|
|
102
|
+
const cancelRef = { current: false };
|
|
103
|
+
(async () => {
|
|
104
|
+
try {
|
|
105
|
+
const serverUp = await isServerAvailable();
|
|
106
|
+
setMode(serverUp ? SERVER_MODE : LOCAL_MODE);
|
|
107
|
+
let final = null;
|
|
108
|
+
if (serverUp) {
|
|
109
|
+
const { events } = streamJob(`/issues/${analysis.issue.iid}/refine`, {
|
|
110
|
+
feedback,
|
|
111
|
+
previousChanges: analysis.changes,
|
|
112
|
+
repo: primary,
|
|
113
|
+
secondaryRepos: secondaries,
|
|
114
|
+
model,
|
|
115
|
+
});
|
|
116
|
+
for await (const evt of events) {
|
|
117
|
+
if (cancelRef.current)
|
|
118
|
+
return;
|
|
119
|
+
const data = handleEvent(evt, cancelRef);
|
|
120
|
+
if (data)
|
|
121
|
+
final = data;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
const { ForgeAgent } = await import(__rewriteRelativeImportExtension(path.join(projectRoot, "server/forge/core/ForgeAgent.ts")));
|
|
126
|
+
const agent = new ForgeAgent({
|
|
127
|
+
project: primary,
|
|
128
|
+
secondaryProjects: secondaries,
|
|
129
|
+
});
|
|
130
|
+
const onEvent = (evt) => {
|
|
131
|
+
const data = handleEvent(evt, cancelRef);
|
|
132
|
+
if (data)
|
|
133
|
+
final = data;
|
|
134
|
+
};
|
|
135
|
+
await agent.refineIssue(analysis.issue.iid, analysis.changes, feedback, onEvent, model, undefined, // ciContext
|
|
136
|
+
undefined, // validationState
|
|
137
|
+
undefined);
|
|
138
|
+
}
|
|
139
|
+
if (cancelRef.current)
|
|
140
|
+
return;
|
|
141
|
+
setItems((prev) => prev.map((it) => it.kind === "step" && it.status === "running"
|
|
142
|
+
? { ...it, status: "done" }
|
|
143
|
+
: it));
|
|
144
|
+
if (final)
|
|
145
|
+
setResult(final);
|
|
146
|
+
setFinished({ ok: true, result: final });
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
if (cancelRef.current)
|
|
150
|
+
return;
|
|
151
|
+
setItems((prev) => [
|
|
152
|
+
...prev.map((it) => it.kind === "step" && it.status === "running"
|
|
153
|
+
? { ...it, status: "failed" }
|
|
154
|
+
: it),
|
|
155
|
+
{ kind: "error", message: err.message ?? String(err) },
|
|
156
|
+
]);
|
|
157
|
+
setFinished({ ok: false, result: null, error: err });
|
|
158
|
+
}
|
|
159
|
+
})();
|
|
160
|
+
return () => { cancelRef.current = true; };
|
|
161
|
+
}, []);
|
|
162
|
+
return h `<${Box} flexDirection="column">
|
|
163
|
+
${mode ? h `<${Box} marginLeft=${2} marginBottom=${1}><${Text}>${mode}</></>` : null}
|
|
164
|
+
<${Box}>
|
|
165
|
+
<${Text} dimColor>Feedback: </>
|
|
166
|
+
<${Text}>${feedback}</>
|
|
167
|
+
</>
|
|
168
|
+
${items.map((it, i) => {
|
|
169
|
+
if (it.kind === "step")
|
|
170
|
+
return h `<${StepRow} key=${i} step=${it.step} message=${it.message} status=${it.status} />`;
|
|
171
|
+
if (it.kind === "log")
|
|
172
|
+
return h `<${Box} key=${i}><${Text} dimColor> ${it.text}</></>`;
|
|
173
|
+
return h `<${Box} key=${i}>
|
|
174
|
+
<${Text} color="red">ERROR</>
|
|
175
|
+
<${Text}>: ${it.message}</>
|
|
176
|
+
</>`;
|
|
177
|
+
})}
|
|
178
|
+
${result
|
|
179
|
+
? h `<${Box} marginTop=${1}>
|
|
180
|
+
<${Text} color="green">${`✓ Refined ${result.changes?.length ?? 0} change(s) — view with: forge show`}</>
|
|
181
|
+
</>`
|
|
182
|
+
: null}
|
|
183
|
+
</>`;
|
|
184
|
+
}
|
|
185
|
+
export async function cmdRefine(argv) {
|
|
186
|
+
const explicitIid = Number(argv[1]);
|
|
187
|
+
const explicitRepo = getFlag(argv, "--repo");
|
|
188
|
+
const target = await resolveSessionTarget({
|
|
189
|
+
explicitIid: Number.isInteger(explicitIid) && explicitIid > 0 ? explicitIid : null,
|
|
190
|
+
explicitRepo,
|
|
191
|
+
});
|
|
192
|
+
if (!target?.repo || !target?.iid) {
|
|
193
|
+
console.error("No session target. Pass an <iid>, set --repo, or run analyze first.");
|
|
194
|
+
process.exit(1);
|
|
195
|
+
}
|
|
196
|
+
const analysis = await readAnalysis(target.repo, target.iid);
|
|
197
|
+
if (!analysis) {
|
|
198
|
+
console.error(`No cached analysis at ${target.repo}#${target.iid}. Run: forge analyze ${target.iid}`);
|
|
199
|
+
process.exit(1);
|
|
200
|
+
}
|
|
201
|
+
const state = await readState(target.repo, target.iid);
|
|
202
|
+
const primary = state?.primary ?? target.repo;
|
|
203
|
+
const secondaries = state?.secondaries ?? [];
|
|
204
|
+
const model = getFlag(argv, "--model") || undefined;
|
|
205
|
+
let feedback = getFlag(argv, "--feedback");
|
|
206
|
+
if (!feedback) {
|
|
207
|
+
// Interactive prompt
|
|
208
|
+
await runApp(h `<${FeedbackPrompt} onSubmit=${(v) => (feedback = v)} />`);
|
|
209
|
+
if (!feedback) {
|
|
210
|
+
console.error("Feedback is required. Use --feedback \"...\" or enter it interactively.");
|
|
211
|
+
process.exit(1);
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
let outcome = { ok: false, result: null };
|
|
215
|
+
const events = [];
|
|
216
|
+
await runApp(h `<${RefineView}
|
|
217
|
+
analysis=${analysis}
|
|
218
|
+
primary=${primary}
|
|
219
|
+
secondaries=${secondaries}
|
|
220
|
+
feedback=${feedback}
|
|
221
|
+
model=${model}
|
|
222
|
+
eventSink=${(e) => events.push(e)}
|
|
223
|
+
onDone=${(o) => (outcome = o)} />`);
|
|
224
|
+
if (outcome.ok && outcome.result) {
|
|
225
|
+
await writeAnalysis(target.repo, target.iid, outcome.result);
|
|
226
|
+
await updateState(target.repo, target.iid, {
|
|
227
|
+
phase: PHASES.REFINED,
|
|
228
|
+
lastError: null,
|
|
229
|
+
lastFeedback: feedback,
|
|
230
|
+
});
|
|
231
|
+
await appendEvent(target.repo, target.iid, {
|
|
232
|
+
type: "session:refine-done",
|
|
233
|
+
feedback,
|
|
234
|
+
});
|
|
235
|
+
}
|
|
236
|
+
else {
|
|
237
|
+
await updateState(target.repo, target.iid, {
|
|
238
|
+
phase: "refine-failed",
|
|
239
|
+
lastError: outcome.error?.message ?? null,
|
|
240
|
+
});
|
|
241
|
+
await appendEvent(target.repo, target.iid, {
|
|
242
|
+
type: "session:refine-failed",
|
|
243
|
+
feedback,
|
|
244
|
+
error: outcome.error?.message,
|
|
245
|
+
});
|
|
246
|
+
process.exit(2);
|
|
247
|
+
}
|
|
248
|
+
}
|
|
249
|
+
//# sourceMappingURL=refine.js.map
|
|
@@ -0,0 +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;AAU3B,SAAS,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAgB;IACvD,IAAI,KAAK,CAAC;IACV,IAAI,MAAM,KAAK,SAAS;QACvB,KAAK,GAAG,CAAC,CAAA,IAAI,IAAI,kBAAkB,OAAO,mBAAmB,CAAC;SAC1D,IAAI,MAAM,KAAK,MAAM;QAAE,KAAK,GAAG,CAAC,CAAA,IAAI,IAAI,qBAAqB,CAAC;;QAC9D,KAAK,GAAG,CAAC,CAAA,IAAI,IAAI,mBAAmB,CAAC;IAC1C,OAAO,CAAC,CAAA,IAAI,GAAG;IACZ,KAAK;KACJ,IAAI,eAAe,IAAI;KACvB,IAAI,KAAK,OAAO;KAChB,CAAC;AACN,CAAC;AAMD,SAAS,cAAc,CAAC,EAAE,QAAQ,EAAuB;IACxD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,OAAO,CAAC,CAAA,IAAI,GAAG;KACX,GAAG;MACF,IAAI;MACJ,IAAI;;KAEL,GAAG,eAAe,CAAC;MAClB,SAAS;YACH,KAAK;eACF,QAAQ;eACR,CAAC,CAAS,EAAE,EAAE;QACxB,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACzB,IAAI,CAAC,OAAO;YAAE,OAAO,CAAC,oBAAoB;QAC1C,QAAQ,CAAC,OAAO,CAAC,CAAC;QAClB,IAAI,EAAE,CAAC;IACR,CAAC;;KAEA,CAAC;AACN,CAAC;AAkBD,SAAS,UAAU,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAmB;IAC1G,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC;IAC1B,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAiB,EAAE,CAAC,CAAC;IACvD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IACtD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAwB,IAAI,CAAC,CAAC;IAClE,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAuB,IAAI,CAAC,CAAC;IAErE,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjB,IAAI,EAAE,CAAC;IACR,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,WAAW,GAAG,CAAC,GAAe,EAAE,SAA+B,EAAyB,EAAE;QAC/F,IAAI,SAAS,EAAE,OAAO;YAAE,OAAO,IAAI,CAAC;QACpC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC;QACjB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAQ,GAAG,CAAC,IAAuB,IAAI,IAAI,CAAC;QACvE,QAAQ,CAAC,CAAC,IAAoB,EAAE,EAAE;YACjC,MAAM,YAAY,GAAG,CAAC,IAAoB,EAAkB,EAAE,CAC7D,IAAI,CAAC,GAAG,CAAC,CAAC,EAAgB,EAAE,EAAE,CAC7B,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS;gBAC5C,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;gBAC3B,CAAC,CAAC,EAAE,CACL,CAAC;YACH,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBAClB,KAAK,UAAU;oBACd,OAAO;wBACN,GAAG,YAAY,CAAC,IAAI,CAAC;wBACrB;4BACC,IAAI,EAAE,MAAM;4BACZ,IAAI,EAAE,GAAG,CAAC,IAAI;4BACd,OAAO,EAAE,GAAG,CAAC,OAAO;4BACpB,MAAM,EAAE,SAAS;yBACjB;qBACD,CAAC;gBACH,KAAK,KAAK;oBACT,OAAO,CAAC,GAAG,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBACtD,KAAK,OAAO;oBACX,OAAO;wBACN,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS;4BAC5C,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;4BAC7B,CAAC,CAAC,EAAE,CACL;wBACD,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,OAAO,EAAE;qBACvC,CAAC;gBACH;oBACC,OAAO,IAAI,CAAC;YACd,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACd,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACrC,CAAC,KAAK,IAAI,EAAE;YACX,IAAI,CAAC;gBACJ,MAAM,QAAQ,GAAG,MAAM,iBAAiB,EAAE,CAAC;gBAC3C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;gBAE7C,IAAI,KAAK,GAAG,IAAI,CAAC;gBAEjB,IAAI,QAAQ,EAAE,CAAC;oBACd,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,WAAW,QAAQ,CAAC,KAAK,CAAC,GAAG,SAAS,EAAE;wBACpE,QAAQ;wBACR,eAAe,EAAE,QAAQ,CAAC,OAAO;wBACjC,IAAI,EAAE,OAAO;wBACb,cAAc,EAAE,WAAW;wBAC3B,KAAK;qBACL,CAAC,CAAC;oBACH,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;wBAChC,IAAI,SAAS,CAAC,OAAO;4BAAE,OAAO;wBAC9B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;wBACzC,IAAI,IAAI;4BAAE,KAAK,GAAG,IAAI,CAAC;oBACxB,CAAC;gBACF,CAAC;qBAAM,CAAC;oBACP,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,kCAClC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,iCAAiC,CAAC,EACzD,CAAC;oBACF,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC;wBAC5B,OAAO,EAAE,OAAO;wBAChB,iBAAiB,EAAE,WAAW;qBAC9B,CAAC,CAAC;oBAEH,MAAM,OAAO,GAAG,CAAC,GAAe,EAAQ,EAAE;wBACzC,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;wBACzC,IAAI,IAAI;4BAAE,KAAK,GAAG,IAAI,CAAC;oBACxB,CAAC,CAAC;oBAEF,MAAM,KAAK,CAAC,WAAW,CACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,EAClB,QAAQ,CAAC,OAAO,EAChB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,SAAS,EAAE,YAAY;oBACvB,SAAS,EAAE,kBAAkB;oBAC7B,SAAS,CACT,CAAC;gBACH,CAAC;gBAED,IAAI,SAAS,CAAC,OAAO;oBAAE,OAAO;gBAC9B,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CACjB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACf,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS;oBAC5C,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE;oBAC3B,CAAC,CAAC,EAAE,CACL,CACD,CAAC;gBACF,IAAI,KAAK;oBAAE,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC5B,WAAW,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACd,IAAI,SAAS,CAAC,OAAO;oBAAE,OAAO;gBAC9B,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC;oBAClB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAClB,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,EAAE,CAAC,MAAM,KAAK,SAAS;wBAC5C,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;wBAC7B,CAAC,CAAC,EAAE,CACL;oBACD,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAG,GAAa,CAAC,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;iBACjE,CAAC,CAAC;gBACH,WAAW,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAY,EAAE,CAAC,CAAC;YAC/D,CAAC;QACF,CAAC,CAAC,EAAE,CAAC;QACL,OAAO,GAAG,EAAE,GAAG,SAAS,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CAAC,CAAA,IAAI,GAAG;IACZ,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA,IAAI,GAAG,eAAe,CAAC,iBAAiB,CAAC,KAAK,IAAI,IAAI,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI;KAChF,GAAG;MACF,IAAI;MACJ,IAAI,IAAI,QAAQ;;IAElB,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;QACrB,IAAI,EAAE,CAAC,IAAI,KAAK,MAAM;YACrB,OAAO,CAAC,CAAA,IAAI,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC,IAAI,YAAY,EAAE,CAAC,OAAO,WAAW,EAAE,CAAC,MAAM,KAAK,CAAC;QAC7F,IAAI,EAAE,CAAC,IAAI,KAAK,KAAK;YACpB,OAAO,CAAC,CAAA,IAAI,GAAG,QAAQ,CAAC,KAAK,IAAI,eAAe,EAAE,CAAC,IAAI,QAAQ,CAAC;QACjE,OAAO,CAAC,CAAA,IAAI,GAAG,QAAQ,CAAC;OACpB,IAAI;OACJ,IAAI,MAAM,EAAE,CAAC,OAAO;OACpB,CAAC;IACN,CAAC,CAAC;IACA,MAAM;QACP,CAAC,CAAC,CAAC,CAAA,IAAI,GAAG,cAAc,CAAC;OACrB,IAAI,kBAAkB,aAAa,MAAM,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,oCAAoC;OAClG;QACJ,CAAC,CAAC,IAAI;KACJ,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAAC,IAAc;IAC7C,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;QACzC,WAAW,EAAE,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,IAAI,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI;QAClF,YAAY;KACZ,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CACZ,qEAAqE,CACrE,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IAC7D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CACZ,yBAAyB,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,GAAG,wBAAwB,MAAM,CAAC,GAAG,EAAE,CACtF,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,KAAK,EAAE,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC;IAC9C,MAAM,WAAW,GAAG,KAAK,EAAE,WAAW,IAAI,EAAE,CAAC;IAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,SAAS,CAAC;IAEpD,IAAI,QAAQ,GAAG,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC3C,IAAI,CAAC,QAAQ,EAAE,CAAC;QACf,qBAAqB;QACrB,MAAM,MAAM,CACX,CAAC,CAAA,IAAI,cAAc,aAAa,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,KAAK,CAClE,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;YACzF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC;IAED,IAAI,OAAO,GAAkB,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IACzD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,MAAM,CACX,CAAC,CAAA,IAAI,UAAU;cACH,QAAQ;aACT,OAAO;iBACH,WAAW;cACd,QAAQ;WACX,KAAK;eACD,CAAC,CAAa,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,CAAC,CAAgB,EAAE,EAAE,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,KAAK,CAClD,CAAC;IAEF,IAAI,OAAO,CAAC,EAAE,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAClC,MAAM,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7D,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE;YAC1C,KAAK,EAAE,MAAM,CAAC,OAAO;YACrB,SAAS,EAAE,IAAI;YACf,YAAY,EAAE,QAAQ;SACtB,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE;YAC1C,IAAI,EAAE,qBAAqB;YAC3B,QAAQ;SACR,CAAC,CAAC;IACJ,CAAC;SAAM,CAAC;QACP,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE;YAC1C,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,IAAI,IAAI;SACzC,CAAC,CAAC;QACH,MAAM,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,EAAE;YAC1C,IAAI,EAAE,uBAAuB;YAC7B,QAAQ;YACR,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO;SAC7B,CAAC,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACjB,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../../../bin/cli/repl.ts"],"names":[],"mappings":"AAqPA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,iBAgB1E"}
|