nomoreide 0.1.52 → 0.1.53
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/git-actions.d.ts +8 -0
- package/dist/core/git-actions.js +23 -0
- package/dist/core/git-actions.js.map +1 -1
- package/dist/core/workflows.d.ts +12 -10
- package/dist/core/workflows.js +10 -2
- package/dist/core/workflows.js.map +1 -1
- package/dist/web/client/assets/{code-editor-_ve7fiz7.js → code-editor-CFwgiwCM.js} +1 -1
- package/dist/web/client/assets/index-D2WEod6o.css +1 -0
- package/dist/web/client/assets/{index-CLEWYNCX.js → index-DixOCrTR.js} +98 -98
- package/dist/web/client/index.html +2 -2
- package/dist/web/routes/git-routes.js +10 -0
- package/dist/web/routes/git-routes.js.map +1 -1
- package/package.json +1 -1
- package/dist/web/client/assets/index-7b_XjCVh.css +0 -1
|
@@ -6,6 +6,10 @@ export interface PushResult {
|
|
|
6
6
|
/** True when an upstream had to be set (first push of a new branch). */
|
|
7
7
|
setUpstream: boolean;
|
|
8
8
|
}
|
|
9
|
+
export interface CheckoutDefaultAndPullResult {
|
|
10
|
+
output: string;
|
|
11
|
+
branch: string;
|
|
12
|
+
}
|
|
9
13
|
/**
|
|
10
14
|
* Write-capable Git operations, kept deliberately separate from the read-safe
|
|
11
15
|
* {@link GitManager}. These reach outward (push) or move refs, so they live in
|
|
@@ -26,5 +30,9 @@ export declare class GitActions {
|
|
|
26
30
|
push(options?: {
|
|
27
31
|
remote?: string;
|
|
28
32
|
}): Promise<PushResult>;
|
|
33
|
+
checkoutDefaultAndPull(options?: {
|
|
34
|
+
remote?: string;
|
|
35
|
+
}): Promise<CheckoutDefaultAndPullResult>;
|
|
36
|
+
private defaultBranch;
|
|
29
37
|
private git;
|
|
30
38
|
}
|
package/dist/core/git-actions.js
CHANGED
|
@@ -38,6 +38,29 @@ export class GitActions {
|
|
|
38
38
|
: ["push"];
|
|
39
39
|
return { output: await this.git(args), branch, setUpstream };
|
|
40
40
|
}
|
|
41
|
+
async checkoutDefaultAndPull(options = {}) {
|
|
42
|
+
const remote = options.remote ?? "origin";
|
|
43
|
+
const branch = await this.defaultBranch(remote);
|
|
44
|
+
const switchOutput = await this.git(["switch", branch]);
|
|
45
|
+
const pullOutput = await this.git(["pull", "--ff-only"]);
|
|
46
|
+
return {
|
|
47
|
+
branch,
|
|
48
|
+
output: [`Switched to ${branch}.`, switchOutput, pullOutput].filter(Boolean).join("\n").trim(),
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
async defaultBranch(remote) {
|
|
52
|
+
const remoteHead = (await this.git(["symbolic-ref", "--short", `refs/remotes/${remote}/HEAD`]).catch(() => "")).trim();
|
|
53
|
+
const fromRemoteHead = remoteHead.startsWith(`${remote}/`) ? remoteHead.slice(remote.length + 1) : remoteHead;
|
|
54
|
+
if (fromRemoteHead)
|
|
55
|
+
return fromRemoteHead;
|
|
56
|
+
const branches = await this.git(["branch", "--format=%(refname:short)"]);
|
|
57
|
+
const names = branches.split("\n").map((line) => line.trim()).filter(Boolean);
|
|
58
|
+
if (names.includes("main"))
|
|
59
|
+
return "main";
|
|
60
|
+
if (names.includes("master"))
|
|
61
|
+
return "master";
|
|
62
|
+
throw new Error(`Could not determine default branch for ${remote}.`);
|
|
63
|
+
}
|
|
41
64
|
async git(args) {
|
|
42
65
|
try {
|
|
43
66
|
const { stdout, stderr } = await execFileAsync("git", args, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git-actions.js","sourceRoot":"","sources":["../../src/core/git-actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"git-actions.js","sourceRoot":"","sources":["../../src/core/git-actions.ts"],"names":[],"mappings":"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"}
|
package/dist/core/workflows.d.ts
CHANGED
|
@@ -25,19 +25,20 @@ export declare const workflowStepSchema: z.ZodDiscriminatedUnion<"kind", [z.ZodO
|
|
|
25
25
|
* zero agent tokens. `assert-pr-branch` blocks on default branches before PR
|
|
26
26
|
* workflows can commit; `commit` stages everything and commits with a
|
|
27
27
|
* generated message (no diff reading, no quality analysis); `push` pushes
|
|
28
|
-
* the branch
|
|
28
|
+
* the branch; `checkout-default-and-pull` returns to the default branch after
|
|
29
|
+
* a PR workflow and fast-forward pulls it.
|
|
29
30
|
*/
|
|
30
|
-
op: z.ZodEnum<["push", "commit", "assert-pr-branch"]>;
|
|
31
|
+
op: z.ZodEnum<["push", "commit", "assert-pr-branch", "checkout-default-and-pull"]>;
|
|
31
32
|
}, "strip", z.ZodTypeAny, {
|
|
32
33
|
kind: "action";
|
|
33
34
|
id: string;
|
|
34
35
|
title: string;
|
|
35
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
36
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
36
37
|
}, {
|
|
37
38
|
kind: "action";
|
|
38
39
|
id: string;
|
|
39
40
|
title: string;
|
|
40
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
41
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
41
42
|
}>, z.ZodObject<{
|
|
42
43
|
kind: z.ZodLiteral<"agent">;
|
|
43
44
|
id: z.ZodString;
|
|
@@ -123,19 +124,20 @@ export declare const workflowSchema: z.ZodObject<{
|
|
|
123
124
|
* zero agent tokens. `assert-pr-branch` blocks on default branches before PR
|
|
124
125
|
* workflows can commit; `commit` stages everything and commits with a
|
|
125
126
|
* generated message (no diff reading, no quality analysis); `push` pushes
|
|
126
|
-
* the branch
|
|
127
|
+
* the branch; `checkout-default-and-pull` returns to the default branch after
|
|
128
|
+
* a PR workflow and fast-forward pulls it.
|
|
127
129
|
*/
|
|
128
|
-
op: z.ZodEnum<["push", "commit", "assert-pr-branch"]>;
|
|
130
|
+
op: z.ZodEnum<["push", "commit", "assert-pr-branch", "checkout-default-and-pull"]>;
|
|
129
131
|
}, "strip", z.ZodTypeAny, {
|
|
130
132
|
kind: "action";
|
|
131
133
|
id: string;
|
|
132
134
|
title: string;
|
|
133
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
135
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
134
136
|
}, {
|
|
135
137
|
kind: "action";
|
|
136
138
|
id: string;
|
|
137
139
|
title: string;
|
|
138
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
140
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
139
141
|
}>, z.ZodObject<{
|
|
140
142
|
kind: z.ZodLiteral<"agent">;
|
|
141
143
|
id: z.ZodString;
|
|
@@ -213,7 +215,7 @@ export declare const workflowSchema: z.ZodObject<{
|
|
|
213
215
|
kind: "action";
|
|
214
216
|
id: string;
|
|
215
217
|
title: string;
|
|
216
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
218
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
217
219
|
} | {
|
|
218
220
|
kind: "agent";
|
|
219
221
|
id: string;
|
|
@@ -241,7 +243,7 @@ export declare const workflowSchema: z.ZodObject<{
|
|
|
241
243
|
kind: "action";
|
|
242
244
|
id: string;
|
|
243
245
|
title: string;
|
|
244
|
-
op: "push" | "commit" | "assert-pr-branch";
|
|
246
|
+
op: "push" | "commit" | "assert-pr-branch" | "checkout-default-and-pull";
|
|
245
247
|
} | {
|
|
246
248
|
kind: "agent";
|
|
247
249
|
id: string;
|
package/dist/core/workflows.js
CHANGED
|
@@ -32,9 +32,10 @@ export const workflowStepSchema = z.discriminatedUnion("kind", [
|
|
|
32
32
|
* zero agent tokens. `assert-pr-branch` blocks on default branches before PR
|
|
33
33
|
* workflows can commit; `commit` stages everything and commits with a
|
|
34
34
|
* generated message (no diff reading, no quality analysis); `push` pushes
|
|
35
|
-
* the branch
|
|
35
|
+
* the branch; `checkout-default-and-pull` returns to the default branch after
|
|
36
|
+
* a PR workflow and fast-forward pulls it.
|
|
36
37
|
*/
|
|
37
|
-
op: z.enum(["push", "commit", "assert-pr-branch"]),
|
|
38
|
+
op: z.enum(["push", "commit", "assert-pr-branch", "checkout-default-and-pull"]),
|
|
38
39
|
}),
|
|
39
40
|
z.object({
|
|
40
41
|
kind: z.literal("agent"),
|
|
@@ -95,6 +96,12 @@ const ASSERT_PR_BRANCH_STEP = {
|
|
|
95
96
|
title: "Check PR branch",
|
|
96
97
|
op: "assert-pr-branch",
|
|
97
98
|
};
|
|
99
|
+
const CHECKOUT_DEFAULT_AND_PULL_STEP = {
|
|
100
|
+
kind: "action",
|
|
101
|
+
id: "checkout-default-and-pull",
|
|
102
|
+
title: "Return to default branch",
|
|
103
|
+
op: "checkout-default-and-pull",
|
|
104
|
+
};
|
|
98
105
|
/**
|
|
99
106
|
* The Phase-1 starter set. These are plain data (not hardcoded UI), so the same
|
|
100
107
|
* structure a user authors later can be forked from one of these.
|
|
@@ -138,6 +145,7 @@ export const BUILTIN_WORKFLOWS = [
|
|
|
138
145
|
title: "Squash-merge",
|
|
139
146
|
prompt: "Squash-merge the PR you just opened with the `nomoreide_github_merge_pr` tool. Don't analyze anything — just merge. Reply with one line.",
|
|
140
147
|
},
|
|
148
|
+
CHECKOUT_DEFAULT_AND_PULL_STEP,
|
|
141
149
|
],
|
|
142
150
|
},
|
|
143
151
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/core/workflows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,0BAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7C,UAAU,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACjD,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC9C,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CAC7C,CAAC,CAAC;AAEH;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE;IAC7D,CAAC,CAAC,MAAM,CAAC;QACP,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;QACzB,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACrB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QACxB
|
|
1
|
+
{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/core/workflows.ts"],"names":[],"mappings":"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"}
|