Compare commits
2 Commits
v0.2.0
..
e106d08bed
| Author | SHA1 | Date | |
|---|---|---|---|
| e106d08bed | |||
| ba9e0c0787 |
+8
-14
@@ -2,8 +2,13 @@ name: Bot agents
|
|||||||
description: Run a coding agent for approved Gitea issue/PR automation
|
description: Run a coding agent for approved Gitea issue/PR automation
|
||||||
|
|
||||||
inputs:
|
inputs:
|
||||||
bot-type:
|
profiles:
|
||||||
description: Which bot to run, either `codex` or `claude`
|
description: >-
|
||||||
|
Ordered YAML sequence of bot profiles. Each profile has `type` (`claude`
|
||||||
|
or `codex`), an optional `model`, and a `token` containing a Claude setup
|
||||||
|
token or Codex API key. Codex may omit `token` to use its persisted
|
||||||
|
device login. A profile is tried only after the previous one exhausts
|
||||||
|
its usage allowance.
|
||||||
required: true
|
required: true
|
||||||
author-token:
|
author-token:
|
||||||
description: >-
|
description: >-
|
||||||
@@ -17,15 +22,6 @@ inputs:
|
|||||||
reviews, with the `write:issue` and `write:repository` scopes. Never
|
reviews, with the `write:issue` and `write:repository` scopes. Never
|
||||||
exposed to the agent, so it must differ from the author.
|
exposed to the agent, so it must differ from the author.
|
||||||
required: true
|
required: true
|
||||||
bot-token:
|
|
||||||
description: API key or token for the selected bot
|
|
||||||
required: false
|
|
||||||
model:
|
|
||||||
description: >-
|
|
||||||
Model for the selected bot. Defaults to `claude-sonnet-5` or
|
|
||||||
`gpt-5.6-terra`, the mid tiers, which cover reviews and fixes.
|
|
||||||
required: false
|
|
||||||
|
|
||||||
runs:
|
runs:
|
||||||
using: composite
|
using: composite
|
||||||
steps:
|
steps:
|
||||||
@@ -43,9 +39,7 @@ runs:
|
|||||||
run: deno run -A "${ACTION_PATH}/run.ts"
|
run: deno run -A "${ACTION_PATH}/run.ts"
|
||||||
env:
|
env:
|
||||||
ACTION_PATH: ${{ gitea.action_path }}
|
ACTION_PATH: ${{ gitea.action_path }}
|
||||||
BOT_TYPE: ${{ inputs.bot-type }}
|
PROFILES: ${{ inputs.profiles }}
|
||||||
BOT_TOKEN: ${{ inputs.bot-token }}
|
|
||||||
MODEL: ${{ inputs.model }}
|
|
||||||
GITEA_API_URL: ${{ gitea.api_url }}
|
GITEA_API_URL: ${{ gitea.api_url }}
|
||||||
GITEA_REPOSITORY: ${{ gitea.repository }}
|
GITEA_REPOSITORY: ${{ gitea.repository }}
|
||||||
GITEA_TOKEN: ${{ inputs.author-token }}
|
GITEA_TOKEN: ${{ inputs.author-token }}
|
||||||
|
|||||||
+100
@@ -0,0 +1,100 @@
|
|||||||
|
import { parse } from "jsr:@std/yaml@1";
|
||||||
|
|
||||||
|
export type BotProfile = {
|
||||||
|
type: "claude" | "codex";
|
||||||
|
model: string;
|
||||||
|
token?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const DEFAULT_MODELS: Record<BotProfile["type"], string> = {
|
||||||
|
claude: "claude-sonnet-5",
|
||||||
|
codex: "gpt-5.6-terra",
|
||||||
|
};
|
||||||
|
|
||||||
|
export function parseProfiles(text: string): BotProfile[] {
|
||||||
|
const value: unknown = parse(text);
|
||||||
|
if (!Array.isArray(value) || value.length === 0) {
|
||||||
|
throw new Error("profiles must contain at least one profile");
|
||||||
|
}
|
||||||
|
return value.map((entry: unknown, index) => {
|
||||||
|
const at = `profiles[${index}]`;
|
||||||
|
if (typeof entry !== "object" || entry === null) {
|
||||||
|
throw new Error(`${at}: expected a mapping`);
|
||||||
|
}
|
||||||
|
const { type, model, token } = entry as Record<string, unknown>;
|
||||||
|
if (type !== "claude" && type !== "codex") {
|
||||||
|
throw new Error(`${at}.type: expected "claude" or "codex"`);
|
||||||
|
}
|
||||||
|
if (model !== undefined && (typeof model !== "string" || model === "")) {
|
||||||
|
throw new Error(`${at}.model: expected a model name`);
|
||||||
|
}
|
||||||
|
if (token !== undefined && (typeof token !== "string" || token === "")) {
|
||||||
|
throw new Error(`${at}.token: expected a token`);
|
||||||
|
}
|
||||||
|
if (type === "claude" && token === undefined) {
|
||||||
|
throw new Error(`${at}.token: required for Claude`);
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
type,
|
||||||
|
model: model ?? DEFAULT_MODELS[type],
|
||||||
|
...(token && { token }),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function isUsageExhausted(error: unknown): boolean {
|
||||||
|
return /(?:usage|rate) limit|hit your limit|insufficient_quota|exceeded your current quota|too many requests|(?:api error|http error|http|status(?: code)?)[ :]+4(?:02|29)\b/i
|
||||||
|
.test(String(error));
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function runProfiles<T>(
|
||||||
|
profiles: BotProfile[],
|
||||||
|
attempt: (profile: BotProfile) => Promise<T>,
|
||||||
|
): Promise<T> {
|
||||||
|
for (const [index, profile] of profiles.entries()) {
|
||||||
|
try {
|
||||||
|
return await attempt(profile);
|
||||||
|
} catch (error) {
|
||||||
|
if (!isUsageExhausted(error) || index === profiles.length - 1) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
console.error(`${profile.type} usage exhausted; trying next profile`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error("profiles must contain at least one profile");
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sanitizedEnvironment(
|
||||||
|
environment: Record<string, string>,
|
||||||
|
): Record<string, string> {
|
||||||
|
const result = { ...environment };
|
||||||
|
for (
|
||||||
|
const name of [
|
||||||
|
"PROFILES",
|
||||||
|
"REVIEWER_TOKEN",
|
||||||
|
"BOT_TOKEN",
|
||||||
|
"CLAUDE_CODE_OAUTH_TOKEN",
|
||||||
|
"ANTHROPIC_API_KEY",
|
||||||
|
"ANTHROPIC_AUTH_TOKEN",
|
||||||
|
"OPENAI_API_KEY",
|
||||||
|
"CODEX_API_KEY",
|
||||||
|
"CODEX_ACCESS_TOKEN",
|
||||||
|
]
|
||||||
|
) {
|
||||||
|
delete result[name];
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function agentEnvironment(
|
||||||
|
environment: Record<string, string>,
|
||||||
|
profile: BotProfile,
|
||||||
|
): Record<string, string> {
|
||||||
|
const result = sanitizedEnvironment(environment);
|
||||||
|
if (profile.token) {
|
||||||
|
result[
|
||||||
|
profile.type === "claude" ? "CLAUDE_CODE_OAUTH_TOKEN" : "OPENAI_API_KEY"
|
||||||
|
] = profile.token;
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
import { assertEquals, assertRejects, assertThrows } from "jsr:@std/assert@1";
|
||||||
|
import {
|
||||||
|
agentEnvironment,
|
||||||
|
parseProfiles,
|
||||||
|
runProfiles,
|
||||||
|
sanitizedEnvironment,
|
||||||
|
} from "./profiles.ts";
|
||||||
|
|
||||||
|
Deno.test("parses profiles in fallback order with model defaults", () => {
|
||||||
|
assertEquals(
|
||||||
|
parseProfiles(`
|
||||||
|
- type: claude
|
||||||
|
token: claude-token
|
||||||
|
- type: codex
|
||||||
|
model: gpt-custom
|
||||||
|
`),
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "claude-token" },
|
||||||
|
{ type: "codex", model: "gpt-custom" },
|
||||||
|
],
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("rejects an empty profile list", () => {
|
||||||
|
assertThrows(() => parseProfiles("[]"), Error, "at least one profile");
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("rejects a Claude profile without its setup token", () => {
|
||||||
|
assertThrows(
|
||||||
|
() => parseProfiles("- type: claude"),
|
||||||
|
Error,
|
||||||
|
"profiles[0].token",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("falls through only after usage exhaustion", async () => {
|
||||||
|
const visited: string[] = [];
|
||||||
|
const result = await runProfiles(
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
||||||
|
{ type: "codex", model: "gpt-5.6-terra" },
|
||||||
|
],
|
||||||
|
(profile) => {
|
||||||
|
visited.push(profile.type);
|
||||||
|
if (profile.type === "claude") {
|
||||||
|
throw new Error("You've hit your usage limit");
|
||||||
|
}
|
||||||
|
return Promise.resolve("done");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(result, "done");
|
||||||
|
assertEquals(visited, ["claude", "codex"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("recognizes Claude's weekly limit message", async () => {
|
||||||
|
const result = await runProfiles(
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
||||||
|
{ type: "codex", model: "gpt-5.6-terra" },
|
||||||
|
],
|
||||||
|
(profile) => {
|
||||||
|
if (profile.type === "claude") {
|
||||||
|
throw new Error("You've hit your limit · resets Monday");
|
||||||
|
}
|
||||||
|
return Promise.resolve("fallback");
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(result, "fallback");
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("recognizes provider API exhaustion status", async () => {
|
||||||
|
const results = await Promise.all(
|
||||||
|
["API Error: 402 Insufficient funds", "HTTP error: 429"]
|
||||||
|
.map((message) =>
|
||||||
|
runProfiles(
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
||||||
|
{ type: "codex", model: "gpt-5.6-terra" },
|
||||||
|
],
|
||||||
|
(profile) => {
|
||||||
|
if (profile.type === "claude") throw new Error(message);
|
||||||
|
return Promise.resolve("fallback");
|
||||||
|
},
|
||||||
|
)
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(results, ["fallback", "fallback"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("preserves an ordinary agent failure", async () => {
|
||||||
|
const visited: string[] = [];
|
||||||
|
await assertRejects(
|
||||||
|
() =>
|
||||||
|
runProfiles(
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
||||||
|
{ type: "codex", model: "gpt-5.6-terra" },
|
||||||
|
],
|
||||||
|
(profile) => {
|
||||||
|
visited.push(profile.type);
|
||||||
|
throw new Error("tests failed");
|
||||||
|
},
|
||||||
|
),
|
||||||
|
Error,
|
||||||
|
"tests failed",
|
||||||
|
);
|
||||||
|
assertEquals(visited, ["claude"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("does not mistake incidental quota text for exhaustion", async () => {
|
||||||
|
const visited: string[] = [];
|
||||||
|
await assertRejects(
|
||||||
|
() =>
|
||||||
|
runProfiles(
|
||||||
|
[
|
||||||
|
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
||||||
|
{ type: "codex", model: "gpt-5.6-terra" },
|
||||||
|
],
|
||||||
|
(profile) => {
|
||||||
|
visited.push(profile.type);
|
||||||
|
throw new Error("quota parser test failed at line 429");
|
||||||
|
},
|
||||||
|
),
|
||||||
|
Error,
|
||||||
|
"quota parser test failed",
|
||||||
|
);
|
||||||
|
assertEquals(visited, ["claude"]);
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("exposes only the selected profile credential to the agent", () => {
|
||||||
|
const base = {
|
||||||
|
HOME: "/home/bot",
|
||||||
|
PROFILES: "contains every secret",
|
||||||
|
REVIEWER_TOKEN: "reviewer",
|
||||||
|
BOT_TOKEN: "legacy",
|
||||||
|
CLAUDE_CODE_OAUTH_TOKEN: "old-claude",
|
||||||
|
ANTHROPIC_API_KEY: "old-anthropic-key",
|
||||||
|
ANTHROPIC_AUTH_TOKEN: "old-anthropic-token",
|
||||||
|
OPENAI_API_KEY: "old-openai",
|
||||||
|
CODEX_API_KEY: "old-codex-key",
|
||||||
|
CODEX_ACCESS_TOKEN: "old-codex-token",
|
||||||
|
};
|
||||||
|
|
||||||
|
assertEquals(
|
||||||
|
agentEnvironment(base, {
|
||||||
|
type: "claude",
|
||||||
|
model: "claude-sonnet-5",
|
||||||
|
token: "selected",
|
||||||
|
}),
|
||||||
|
{ HOME: "/home/bot", CLAUDE_CODE_OAUTH_TOKEN: "selected" },
|
||||||
|
);
|
||||||
|
assertEquals(sanitizedEnvironment(base), { HOME: "/home/bot" });
|
||||||
|
});
|
||||||
@@ -19,31 +19,41 @@ author's push credentials. Read the code there, run its checks and tests when
|
|||||||
they bear on the task, and push from there.
|
they bear on the task, and push from there.
|
||||||
|
|
||||||
For a `pull_request` event, and for a comment on a pull request that asks you to
|
For a `pull_request` event, and for a comment on a pull request that asks you to
|
||||||
review it, invoke the installed `superpowers:requesting-code-review` skill
|
review it, use the installed `superpowers:requesting-code-review` skill before
|
||||||
before inspecting the PR. You are the reviewer that has already been dispatched,
|
inspecting the PR. Its exact installed instructions and reviewer template are
|
||||||
so run the skill's code reviewer template yourself instead of dispatching
|
included below, so this run fails before reaching you if they could not be
|
||||||
another reviewer. Use the pull request and triggering instruction as its
|
loaded. You are the reviewer that has already been dispatched, so run the
|
||||||
description and requirements, and review the exact base and head SHAs without
|
skill's code reviewer template yourself instead of dispatching another reviewer.
|
||||||
changing code. Run the project's required checks on the head and treat a real
|
Use the pull request and triggering instruction as its description and
|
||||||
failure as at least Important. The bot automation workflow itself is not a
|
requirements, and review the exact base and head SHAs without changing code. Run
|
||||||
project check: ignore its skipped or canceled duplicate/automatic runs, and
|
the project's required checks on the head and treat a real failure as at least
|
||||||
never reject a PR because the current review run is unfinished. Only a failed
|
Important. The bot automation workflow itself is not a project check: ignore its
|
||||||
required check for the reviewed head blocks approval. Check the whole repository
|
skipped or canceled duplicate/automatic runs, and never reject a PR because the
|
||||||
against the code rules at the end of this prompt, not only the diff; a violation
|
current review run is unfinished. Only a failed required check for the reviewed
|
||||||
is at least Important even when the diff did not cause it. Write the complete
|
head blocks approval. Check the whole repository against the code rules at the
|
||||||
review, and nothing else, to the file `${REVIEW_PATH}`: it is posted verbatim as
|
end of this prompt, not only the diff; a violation is at least Important even
|
||||||
a pull request review from the bot account, and your final response is not
|
when the diff did not cause it. Write the complete review, and nothing else, to
|
||||||
posted at all. The file's first line must be exactly the verdict and nothing
|
the file `${REVIEW_PATH}`: it is posted verbatim as a pull request review from
|
||||||
else: `Approved` when the head is ready to merge, `Changes requested` otherwise.
|
the bot account, and your final response is not posted at all. The file's first
|
||||||
The mark in front of it is added when posting, so write the words alone; any
|
line must be exactly the verdict and nothing else: `Approved` when the head is
|
||||||
other first line is posted as a plain comment, which wastes the run. Minor
|
ready to merge, `Changes requested` otherwise. The mark in front of it is added
|
||||||
issues alone never block, and neither does a finding the author has answered in
|
when posting, so write the words alone; any other first line is posted as a
|
||||||
the comment history below as intended or a false alarm, once the code or docs
|
plain comment, which wastes the run. Minor issues alone never block, and neither
|
||||||
make that clear. When the verdict is `Changes requested`, the second line names
|
does a finding the author has answered in the comment history below as intended
|
||||||
what must change in one line, addressed to the author; the author's own agent
|
or a false alarm, once the code or docs make that clear. When the verdict is
|
||||||
picks the fixes up, so never ask `@bot` to make them. For UI changes, check that
|
`Changes requested`, the second line names what must change in one line,
|
||||||
the result is aligned, clean, and pixel-perfect, and that included screenshots
|
addressed to the author; the author's own agent picks the fixes up, so never ask
|
||||||
prove the intended result was achieved.
|
`@bot` to make them. For UI changes, check that the result is aligned, clean,
|
||||||
|
and pixel-perfect, and that included screenshots prove the intended result was
|
||||||
|
achieved.
|
||||||
|
|
||||||
|
# Installed Superpowers review skill
|
||||||
|
|
||||||
|
${SUPERPOWERS_REVIEW_SKILL}
|
||||||
|
|
||||||
|
# Installed Superpowers reviewer template
|
||||||
|
|
||||||
|
${SUPERPOWERS_REVIEW_TEMPLATE}
|
||||||
|
|
||||||
Every finding that belongs to one line of the diff goes on that line instead of
|
Every finding that belongs to one line of the diff goes on that line instead of
|
||||||
into the body. Write those to `${ANCHORS_PATH}` as a JSON array, each entry
|
into the body. Write those to `${ANCHORS_PATH}` as a JSON array, each entry
|
||||||
|
|||||||
@@ -4,10 +4,19 @@
|
|||||||
// so it appears as the bot account.
|
// so it appears as the bot account.
|
||||||
import { TextLineStream } from "jsr:@std/streams@1/text-line-stream";
|
import { TextLineStream } from "jsr:@std/streams@1/text-line-stream";
|
||||||
import { retryInvalidToken } from "./auth.ts";
|
import { retryInvalidToken } from "./auth.ts";
|
||||||
|
import {
|
||||||
|
agentEnvironment,
|
||||||
|
type BotProfile,
|
||||||
|
parseProfiles,
|
||||||
|
runProfiles,
|
||||||
|
sanitizedEnvironment,
|
||||||
|
} from "./profiles.ts";
|
||||||
import {
|
import {
|
||||||
type BotType,
|
type BotType,
|
||||||
|
loadSuperpowersReviewGuide,
|
||||||
parseBotType,
|
parseBotType,
|
||||||
superpowersInstallCommands,
|
superpowersInstallCommands,
|
||||||
|
type SuperpowersReviewGuide,
|
||||||
} from "./superpowers.ts";
|
} from "./superpowers.ts";
|
||||||
|
|
||||||
type GiteaUser = { login: string; email: string };
|
type GiteaUser = { login: string; email: string };
|
||||||
@@ -23,20 +32,11 @@ const API = env("GITEA_API_URL");
|
|||||||
const REPO = env("GITEA_REPOSITORY");
|
const REPO = env("GITEA_REPOSITORY");
|
||||||
const INDEX = env("ISSUE_INDEX");
|
const INDEX = env("ISSUE_INDEX");
|
||||||
const EVENT = env("EVENT_NAME");
|
const EVENT = env("EVENT_NAME");
|
||||||
const BOT = parseBotType(env("BOT_TYPE"));
|
const PROFILES = parseProfiles(env("PROFILES"));
|
||||||
const AUTHOR_TOKEN = env("GITEA_TOKEN");
|
const AUTHOR_TOKEN = env("GITEA_TOKEN");
|
||||||
const REVIEWER_TOKEN = env("REVIEWER_TOKEN");
|
const REVIEWER_TOKEN = env("REVIEWER_TOKEN");
|
||||||
const RULES_PATH = "repos/commons/code-rules/raw/README.md";
|
const RULES_PATH = "repos/commons/code-rules/raw/README.md";
|
||||||
// The mid tiers: a run follows a fixed template and the project's checks.
|
const HELPER_ENV = sanitizedEnvironment(Deno.env.toObject());
|
||||||
const DEFAULT_MODELS: Record<string, string> = {
|
|
||||||
claude: "claude-sonnet-5",
|
|
||||||
codex: "gpt-5.6-terra",
|
|
||||||
};
|
|
||||||
const model = (bot: string): string =>
|
|
||||||
Deno.env.get("MODEL") || DEFAULT_MODELS[bot];
|
|
||||||
|
|
||||||
// The reviewer token is withheld so the agent cannot approve as the bot.
|
|
||||||
const { REVIEWER_TOKEN: _, ...agentEnv } = Deno.env.toObject();
|
|
||||||
|
|
||||||
async function gitea(
|
async function gitea(
|
||||||
token: string,
|
token: string,
|
||||||
@@ -148,7 +148,11 @@ async function postResult(body: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function run(command: string, args: string[]): Promise<void> {
|
async function run(command: string, args: string[]): Promise<void> {
|
||||||
const { success, code } = await new Deno.Command(command, { args }).output();
|
const { success, code } = await new Deno.Command(command, {
|
||||||
|
args,
|
||||||
|
env: HELPER_ENV,
|
||||||
|
clearEnv: true,
|
||||||
|
}).output();
|
||||||
if (!success) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
if (!success) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -160,6 +164,20 @@ async function installSuperpowers(bot: BotType): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function prepareSuperpowers(
|
||||||
|
bot: BotType,
|
||||||
|
): Promise<SuperpowersReviewGuide> {
|
||||||
|
await installSuperpowers(bot);
|
||||||
|
const guide = await loadSuperpowersReviewGuide(bot, env("HOME"));
|
||||||
|
console.log(
|
||||||
|
`Loaded Superpowers requesting-code-review ${guide.version} from ${guide.skillPath}`,
|
||||||
|
);
|
||||||
|
console.log(
|
||||||
|
`Loaded Superpowers reviewer template from ${guide.templatePath}`,
|
||||||
|
);
|
||||||
|
return guide;
|
||||||
|
}
|
||||||
|
|
||||||
// Commits belong to the same account as the pull request they end up in.
|
// Commits belong to the same account as the pull request they end up in.
|
||||||
async function configureGitAuthor(): Promise<void> {
|
async function configureGitAuthor(): Promise<void> {
|
||||||
const user: GiteaUser = await (await gitea(AUTHOR_TOKEN, "user")).json();
|
const user: GiteaUser = await (await gitea(AUTHOR_TOKEN, "user")).json();
|
||||||
@@ -168,7 +186,7 @@ async function configureGitAuthor(): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function renderPrompt(): Promise<string> {
|
async function renderPrompt(guide: SuperpowersReviewGuide): Promise<string> {
|
||||||
const comments: GiteaComment[] = await (await gitea(
|
const comments: GiteaComment[] = await (await gitea(
|
||||||
REVIEWER_TOKEN,
|
REVIEWER_TOKEN,
|
||||||
`repos/${REPO}/issues/${INDEX}/comments?limit=100`,
|
`repos/${REPO}/issues/${INDEX}/comments?limit=100`,
|
||||||
@@ -185,6 +203,8 @@ async function renderPrompt(): Promise<string> {
|
|||||||
ISSUE_INDEX: INDEX,
|
ISSUE_INDEX: INDEX,
|
||||||
REVIEW_PATH,
|
REVIEW_PATH,
|
||||||
ANCHORS_PATH,
|
ANCHORS_PATH,
|
||||||
|
SUPERPOWERS_REVIEW_SKILL: guide.skill,
|
||||||
|
SUPERPOWERS_REVIEW_TEMPLATE: guide.template,
|
||||||
};
|
};
|
||||||
const template = await Deno.readTextFile(
|
const template = await Deno.readTextFile(
|
||||||
new URL("prompt.md", import.meta.url),
|
new URL("prompt.md", import.meta.url),
|
||||||
@@ -195,31 +215,40 @@ async function renderPrompt(): Promise<string> {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function runClaude(prompt: string): Promise<string> {
|
async function runClaude(profile: BotProfile): Promise<string> {
|
||||||
const token = Deno.env.get("BOT_TOKEN");
|
const prompt = await renderPrompt(await prepareSuperpowers("claude"));
|
||||||
if (!token) {
|
|
||||||
throw new Error(
|
|
||||||
"Run `claude setup-token` locally and set the `bot-token` action input.",
|
|
||||||
);
|
|
||||||
}
|
|
||||||
await installSuperpowers("claude");
|
|
||||||
const claude = new Deno.Command("claude", {
|
const claude = new Deno.Command("claude", {
|
||||||
args: [
|
args: [
|
||||||
"--print",
|
"--print",
|
||||||
"--dangerously-skip-permissions",
|
"--dangerously-skip-permissions",
|
||||||
"--model",
|
"--model",
|
||||||
model("claude"),
|
profile.model,
|
||||||
"--output-format",
|
"--output-format",
|
||||||
"stream-json",
|
"stream-json",
|
||||||
"--verbose",
|
"--verbose",
|
||||||
prompt,
|
prompt,
|
||||||
],
|
],
|
||||||
// Claude refuses --dangerously-skip-permissions as root outside a sandbox.
|
// Claude refuses --dangerously-skip-permissions as root outside a sandbox.
|
||||||
env: { ...agentEnv, CLAUDE_CODE_OAUTH_TOKEN: token, IS_SANDBOX: "1" },
|
env: {
|
||||||
|
...agentEnvironment(Deno.env.toObject(), profile),
|
||||||
|
IS_SANDBOX: "1",
|
||||||
|
},
|
||||||
clearEnv: true,
|
clearEnv: true,
|
||||||
stdout: "piped",
|
stdout: "piped",
|
||||||
|
stderr: "piped",
|
||||||
}).spawn();
|
}).spawn();
|
||||||
let result: { result?: string; subtype: string } | undefined;
|
let result:
|
||||||
|
| { is_error?: boolean; result?: string; subtype: string }
|
||||||
|
| undefined;
|
||||||
|
let error = "";
|
||||||
|
const copyError = claude.stderr.pipeThrough(new TextDecoderStream()).pipeTo(
|
||||||
|
new WritableStream({
|
||||||
|
write(chunk) {
|
||||||
|
error += chunk;
|
||||||
|
console.error(chunk);
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
// Print events as they stream so the runner does not kill the job as a zombie.
|
// Print events as they stream so the runner does not kill the job as a zombie.
|
||||||
const lines = claude.stdout
|
const lines = claude.stdout
|
||||||
.pipeThrough(new TextDecoderStream())
|
.pipeThrough(new TextDecoderStream())
|
||||||
@@ -233,9 +262,17 @@ async function runClaude(prompt: string): Promise<string> {
|
|||||||
}
|
}
|
||||||
if (event.type === "result") result = event;
|
if (event.type === "result") result = event;
|
||||||
}
|
}
|
||||||
await claude.status;
|
const [status] = await Promise.all([claude.status, copyError]);
|
||||||
|
if (result?.is_error) {
|
||||||
|
throw new Error(result.result ?? `claude ended with ${result.subtype}`);
|
||||||
|
}
|
||||||
if (result?.result === undefined) {
|
if (result?.result === undefined) {
|
||||||
throw new Error(`claude ended with ${result?.subtype ?? "no result"}`);
|
throw new Error(
|
||||||
|
error.trim() || `claude ended with ${result?.subtype ?? "no result"}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (!status.success) {
|
||||||
|
throw new Error(error.trim() || `claude exited with ${status.code}`);
|
||||||
}
|
}
|
||||||
return result.result;
|
return result.result;
|
||||||
}
|
}
|
||||||
@@ -244,6 +281,8 @@ async function runClaude(prompt: string): Promise<string> {
|
|||||||
async function codexDeviceLogin(): Promise<void> {
|
async function codexDeviceLogin(): Promise<void> {
|
||||||
const login = new Deno.Command("codex", {
|
const login = new Deno.Command("codex", {
|
||||||
args: ["login", "--device-auth"],
|
args: ["login", "--device-auth"],
|
||||||
|
env: HELPER_ENV,
|
||||||
|
clearEnv: true,
|
||||||
stdout: "piped",
|
stdout: "piped",
|
||||||
stderr: "piped",
|
stderr: "piped",
|
||||||
}).spawn();
|
}).spawn();
|
||||||
@@ -266,53 +305,92 @@ async function codexDeviceLogin(): Promise<void> {
|
|||||||
await Promise.all([status, drained]);
|
await Promise.all([status, drained]);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function runCodex(prompt: string): Promise<string> {
|
async function codexApiLogin(token: string, codexHome: string): Promise<void> {
|
||||||
const loggedIn = await new Deno.Command("codex", {
|
const login = new Deno.Command("codex", {
|
||||||
args: ["login", "status"],
|
args: ["login", "--with-api-key"],
|
||||||
})
|
env: { ...HELPER_ENV, CODEX_HOME: codexHome },
|
||||||
.output();
|
clearEnv: true,
|
||||||
if (!loggedIn.success) await codexDeviceLogin();
|
stdin: "piped",
|
||||||
await installSuperpowers("codex");
|
}).spawn();
|
||||||
const file = await Deno.makeTempFile();
|
const writer = login.stdin.getWriter();
|
||||||
const attempt = async () => {
|
await writer.write(new TextEncoder().encode(`${token}\n`));
|
||||||
const codex = new Deno.Command("codex", {
|
await writer.close();
|
||||||
args: [
|
const status = await login.status;
|
||||||
"exec",
|
if (!status.success) {
|
||||||
"--model",
|
throw new Error(`codex login exited with ${status.code}`);
|
||||||
model("codex"),
|
}
|
||||||
"--dangerously-bypass-approvals-and-sandbox",
|
}
|
||||||
"--output-last-message",
|
|
||||||
file,
|
async function runCodex(profile: BotProfile): Promise<string> {
|
||||||
prompt,
|
const currentEnv = agentEnvironment(Deno.env.toObject(), profile);
|
||||||
],
|
const temporaryHome = profile.token ? await Deno.makeTempDir() : null;
|
||||||
env: agentEnv,
|
if (temporaryHome !== null) currentEnv.CODEX_HOME = temporaryHome;
|
||||||
clearEnv: true,
|
try {
|
||||||
stdout: "inherit",
|
if (profile.token) {
|
||||||
stderr: "piped",
|
await codexApiLogin(profile.token, temporaryHome!);
|
||||||
}).spawn();
|
} else {
|
||||||
const decoder = new TextDecoder();
|
const loggedIn = await new Deno.Command("codex", {
|
||||||
let error = "";
|
args: ["login", "status"],
|
||||||
for await (const chunk of codex.stderr) {
|
env: HELPER_ENV,
|
||||||
await Deno.stderr.write(chunk);
|
clearEnv: true,
|
||||||
error += decoder.decode(chunk, { stream: true });
|
}).output();
|
||||||
|
if (!loggedIn.success) await codexDeviceLogin();
|
||||||
}
|
}
|
||||||
error += decoder.decode();
|
const prompt = await renderPrompt(await prepareSuperpowers("codex"));
|
||||||
return { status: await codex.status, error };
|
const file = await Deno.makeTempFile();
|
||||||
};
|
const attempt = async () => {
|
||||||
const { status } = await retryInvalidToken(attempt, async () => {
|
const codex = new Deno.Command("codex", {
|
||||||
await run("codex", ["logout"]);
|
args: [
|
||||||
await codexDeviceLogin();
|
"exec",
|
||||||
});
|
"--model",
|
||||||
if (!status.success) throw new Error(`codex exited with ${status.code}`);
|
profile.model,
|
||||||
return await Deno.readTextFile(file);
|
"--dangerously-bypass-approvals-and-sandbox",
|
||||||
|
"--output-last-message",
|
||||||
|
file,
|
||||||
|
prompt,
|
||||||
|
],
|
||||||
|
env: currentEnv,
|
||||||
|
clearEnv: true,
|
||||||
|
stdout: "inherit",
|
||||||
|
stderr: "piped",
|
||||||
|
}).spawn();
|
||||||
|
const decoder = new TextDecoder();
|
||||||
|
let error = "";
|
||||||
|
for await (const chunk of codex.stderr) {
|
||||||
|
await Deno.stderr.write(chunk);
|
||||||
|
error += decoder.decode(chunk, { stream: true });
|
||||||
|
}
|
||||||
|
error += decoder.decode();
|
||||||
|
return { status: await codex.status, error };
|
||||||
|
};
|
||||||
|
const result = profile.token
|
||||||
|
? await attempt()
|
||||||
|
: await retryInvalidToken(attempt, async () => {
|
||||||
|
await run("codex", ["logout"]);
|
||||||
|
await codexDeviceLogin();
|
||||||
|
});
|
||||||
|
if (!result.status.success) {
|
||||||
|
throw new Error(
|
||||||
|
result.error.trim() || `codex exited with ${result.status.code}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return await Deno.readTextFile(file);
|
||||||
|
} finally {
|
||||||
|
if (temporaryHome !== null) {
|
||||||
|
await Deno.remove(temporaryHome, { recursive: true });
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
await configureGitAuthor();
|
await configureGitAuthor();
|
||||||
const prompt = await renderPrompt();
|
const result = await runProfiles(
|
||||||
const result = BOT === "claude"
|
PROFILES,
|
||||||
? await runClaude(prompt)
|
(profile) =>
|
||||||
: await runCodex(prompt);
|
parseBotType(profile.type) === "claude"
|
||||||
|
? runClaude(profile)
|
||||||
|
: runCodex(profile),
|
||||||
|
);
|
||||||
await postResult(result);
|
await postResult(result);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
await postComment(`Bot failed: ${error}`);
|
await postComment(`Bot failed: ${error}`);
|
||||||
|
|||||||
+105
@@ -1,3 +1,5 @@
|
|||||||
|
import { join } from "jsr:@std/path@1";
|
||||||
|
|
||||||
export type BotType = "claude" | "codex";
|
export type BotType = "claude" | "codex";
|
||||||
|
|
||||||
export type InstallCommand = {
|
export type InstallCommand = {
|
||||||
@@ -5,6 +7,24 @@ export type InstallCommand = {
|
|||||||
args: string[];
|
args: string[];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type SuperpowersReviewGuide = {
|
||||||
|
version: string;
|
||||||
|
skillPath: string;
|
||||||
|
templatePath: string;
|
||||||
|
skill: string;
|
||||||
|
template: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type SuperpowersFileSystem = {
|
||||||
|
readDir(path: string): AsyncIterable<Deno.DirEntry>;
|
||||||
|
readTextFile(path: string): Promise<string>;
|
||||||
|
};
|
||||||
|
|
||||||
|
const systemFileSystem: SuperpowersFileSystem = {
|
||||||
|
readDir: Deno.readDir,
|
||||||
|
readTextFile: Deno.readTextFile,
|
||||||
|
};
|
||||||
|
|
||||||
export function parseBotType(value: string): BotType {
|
export function parseBotType(value: string): BotType {
|
||||||
if (value === "claude" || value === "codex") return value;
|
if (value === "claude" || value === "codex") return value;
|
||||||
throw new Error(`unsupported bot type: ${value}`);
|
throw new Error(`unsupported bot type: ${value}`);
|
||||||
@@ -40,3 +60,88 @@ export function superpowersInstallCommands(
|
|||||||
args: ["plugin", "add", "superpowers@openai-curated-remote"],
|
args: ["plugin", "add", "superpowers@openai-curated-remote"],
|
||||||
}];
|
}];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type Candidate = SuperpowersReviewGuide & { directory: string };
|
||||||
|
|
||||||
|
async function readCandidate(
|
||||||
|
directory: string,
|
||||||
|
fileSystem: SuperpowersFileSystem,
|
||||||
|
): Promise<Candidate | null> {
|
||||||
|
if (!directory.split(/[\\/]/).includes("superpowers")) return null;
|
||||||
|
const skillPath = join(directory, "SKILL.md");
|
||||||
|
const templatePath = join(directory, "code-reviewer.md");
|
||||||
|
try {
|
||||||
|
const [skill, template] = await Promise.all([
|
||||||
|
fileSystem.readTextFile(skillPath),
|
||||||
|
fileSystem.readTextFile(templatePath),
|
||||||
|
]);
|
||||||
|
return {
|
||||||
|
directory,
|
||||||
|
version: directory.split(/[\\/]/).at(-3) ?? "unknown",
|
||||||
|
skillPath,
|
||||||
|
templatePath,
|
||||||
|
skill,
|
||||||
|
template,
|
||||||
|
};
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof Deno.errors.NotFound) return null;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function findCandidates(
|
||||||
|
directory: string,
|
||||||
|
candidates: Candidate[],
|
||||||
|
fileSystem: SuperpowersFileSystem,
|
||||||
|
): Promise<void> {
|
||||||
|
let entries: Deno.DirEntry[];
|
||||||
|
try {
|
||||||
|
entries = [];
|
||||||
|
for await (const entry of fileSystem.readDir(directory)) {
|
||||||
|
entries.push(entry);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof Deno.errors.NotFound) return;
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
for (const entry of entries) {
|
||||||
|
if (!entry.isDirectory) continue;
|
||||||
|
const child = join(directory, entry.name);
|
||||||
|
if (entry.name === "requesting-code-review") {
|
||||||
|
const candidate = await readCandidate(child, fileSystem);
|
||||||
|
if (candidate !== null) candidates.push(candidate);
|
||||||
|
} else {
|
||||||
|
await findCandidates(child, candidates, fileSystem);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Load the installed files rather than trusting skill discovery in a later
|
||||||
|
// non-interactive agent process. The newest cached plugin version is the one
|
||||||
|
// the installers activate, and the exact paths are reported by the caller.
|
||||||
|
export async function loadSuperpowersReviewGuide(
|
||||||
|
bot: BotType,
|
||||||
|
home: string,
|
||||||
|
fileSystem: SuperpowersFileSystem = systemFileSystem,
|
||||||
|
): Promise<SuperpowersReviewGuide> {
|
||||||
|
const root = join(
|
||||||
|
home,
|
||||||
|
bot === "codex" ? ".codex" : ".claude",
|
||||||
|
"plugins",
|
||||||
|
"cache",
|
||||||
|
);
|
||||||
|
const candidates: Candidate[] = [];
|
||||||
|
await findCandidates(root, candidates, fileSystem);
|
||||||
|
candidates.sort((left, right) =>
|
||||||
|
left.version.localeCompare(right.version, undefined, { numeric: true }) ||
|
||||||
|
left.directory.localeCompare(right.directory)
|
||||||
|
);
|
||||||
|
const guide = candidates.at(-1);
|
||||||
|
if (guide === undefined) {
|
||||||
|
throw new Error(
|
||||||
|
`installed Superpowers requesting-code-review files not found under ${root}`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const { directory: _, ...result } = guide;
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|||||||
+81
-2
@@ -1,5 +1,40 @@
|
|||||||
import { assertEquals, assertThrows } from "jsr:@std/assert@1";
|
import { assertEquals, assertRejects, assertThrows } from "jsr:@std/assert@1";
|
||||||
import { parseBotType, superpowersInstallCommands } from "./superpowers.ts";
|
import { join } from "jsr:@std/path@1";
|
||||||
|
import {
|
||||||
|
loadSuperpowersReviewGuide,
|
||||||
|
parseBotType,
|
||||||
|
type SuperpowersFileSystem,
|
||||||
|
superpowersInstallCommands,
|
||||||
|
} from "./superpowers.ts";
|
||||||
|
|
||||||
|
function fakeFileSystem(files: Record<string, string>): SuperpowersFileSystem {
|
||||||
|
return {
|
||||||
|
readTextFile(path) {
|
||||||
|
const contents = files[path];
|
||||||
|
return contents === undefined
|
||||||
|
? Promise.reject(new Deno.errors.NotFound(path))
|
||||||
|
: Promise.resolve(contents);
|
||||||
|
},
|
||||||
|
async *readDir(directory) {
|
||||||
|
const prefix = `${directory}/`;
|
||||||
|
const children = new Map<string, boolean>();
|
||||||
|
for (const path of Object.keys(files)) {
|
||||||
|
if (!path.startsWith(prefix)) continue;
|
||||||
|
const [name, ...rest] = path.slice(prefix.length).split("/");
|
||||||
|
if (name !== "") children.set(name, rest.length > 0);
|
||||||
|
}
|
||||||
|
if (children.size === 0) throw new Deno.errors.NotFound(directory);
|
||||||
|
for (const [name, isDirectory] of children) {
|
||||||
|
yield {
|
||||||
|
name,
|
||||||
|
isDirectory,
|
||||||
|
isFile: !isDirectory,
|
||||||
|
isSymlink: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
Deno.test("installs Superpowers from the Codex marketplace", () => {
|
Deno.test("installs Superpowers from the Codex marketplace", () => {
|
||||||
assertEquals(superpowersInstallCommands("codex"), [{
|
assertEquals(superpowersInstallCommands("codex"), [{
|
||||||
@@ -38,3 +73,47 @@ Deno.test("rejects an unsupported bot type", () => {
|
|||||||
"unsupported bot type: other",
|
"unsupported bot type: other",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Deno.test("loads the newest installed Superpowers review guide", async () => {
|
||||||
|
const home = "/home/bot";
|
||||||
|
const older = join(
|
||||||
|
home,
|
||||||
|
".codex/plugins/cache/openai-curated-remote/superpowers/6.3.0/skills/requesting-code-review",
|
||||||
|
);
|
||||||
|
const newer = join(
|
||||||
|
home,
|
||||||
|
".codex/plugins/cache/openai-curated-remote/superpowers/6.10.0/skills/requesting-code-review",
|
||||||
|
);
|
||||||
|
const guide = await loadSuperpowersReviewGuide(
|
||||||
|
"codex",
|
||||||
|
home,
|
||||||
|
fakeFileSystem({
|
||||||
|
[join(older, "SKILL.md")]: "old",
|
||||||
|
[join(older, "code-reviewer.md")]: "old template",
|
||||||
|
[join(newer, "SKILL.md")]: "new",
|
||||||
|
[join(newer, "code-reviewer.md")]: "template",
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEquals(guide.version, "6.10.0");
|
||||||
|
assertEquals(guide.skill, "new");
|
||||||
|
assertEquals(guide.template, "template");
|
||||||
|
assertEquals(guide.skillPath, join(newer, "SKILL.md"));
|
||||||
|
});
|
||||||
|
|
||||||
|
Deno.test("fails when the installed review guide is incomplete", async () => {
|
||||||
|
const home = "/home/bot";
|
||||||
|
const directory = join(
|
||||||
|
home,
|
||||||
|
".claude/plugins/cache/superpowers-marketplace/superpowers/6.3.0/skills/requesting-code-review",
|
||||||
|
);
|
||||||
|
const fileSystem = fakeFileSystem({
|
||||||
|
[join(directory, "SKILL.md")]: "skill",
|
||||||
|
});
|
||||||
|
|
||||||
|
await assertRejects(
|
||||||
|
() => loadSuperpowersReviewGuide("claude", home, fileSystem),
|
||||||
|
Error,
|
||||||
|
"installed Superpowers requesting-code-review files not found",
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user