Compare commits
11 Commits
main
...
8b9aedf911
| Author | SHA1 | Date | |
|---|---|---|---|
| 8b9aedf911 | |||
| a0dce6a4c2 | |||
| c783935936 | |||
| 71150900ff | |||
| d879b04e46 | |||
| a65bf353ab | |||
| bd1ddb9406 | |||
| f2de92067f | |||
| df66bea5e4 | |||
| d09806daad | |||
| c8ffb9cc6f |
@@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
description: bot-agents lint has prefer-readonly-parameter-types and the size/complexity rules off (Deno had no limits) and no overrides; nothing else
|
|
||||||
---
|
|
||||||
|
|
||||||
The repo follows [[lint-config-shape]] with one recorded exception, present
|
|
||||||
when the migration PR was approved:
|
|
||||||
|
|
||||||
- `typescript/prefer-readonly-parameter-types` is `"off"` in
|
|
||||||
`scripts/project-lint.ts`, as in the explicit-types template, because
|
|
||||||
Node/web types (`Response`, `Stats`, `RequestInit`) can never satisfy it.
|
|
||||||
- `vite.config.ts` has no `overrides`. The `scripts/**` override for
|
|
||||||
`typescript/no-unsafe-enum-comparison` was removed (2026-10-16):
|
|
||||||
`scripts/project-lint.ts` compares node types with `AST_NODE_TYPES` members
|
|
||||||
from `@typescript-eslint/types` instead of string literals
|
|
||||||
([[lint-overrides-policy]]).
|
|
||||||
|
|
||||||
Size and complexity limits match Deno, which had none here, so every Oxlint
|
|
||||||
limit rule is `"off"` ([[lint-config-shape]]). `src/run/index.ts` and `src/post/index.ts` keep
|
|
||||||
main's single-file layout (2026-10-17 revert of the size splits). Sequential
|
|
||||||
awaits in loops became recursion or a `reduce` chain (`no-await-in-loop`) to
|
|
||||||
stay sequential. Add no other opt-out without the user.
|
|
||||||
@@ -21,13 +21,11 @@ Node + Vite+ migration (PR #20, `node-migration`, 2026-10-15/16):
|
|||||||
- **Published lint plugins** (2026-10-18, after they reached npm):
|
- **Published lint plugins** (2026-10-18, after they reached npm):
|
||||||
`eslint-plugin-import-structure` (`modules` config) and
|
`eslint-plugin-import-structure` (`modules` config) and
|
||||||
`eslint-plugin-explicit-types` (`concrete` and `absence` configs) are
|
`eslint-plugin-explicit-types` (`concrete` and `absence` configs) are
|
||||||
devDependencies, enabled in `vite.config.ts`. explicit-types' `naming`
|
devDependencies, enabled in `vite.config.ts` through their `all` configs.
|
||||||
config is left off: its `upper-snake-string-unions` and
|
`upper-snake-string-unions` was off while the user decided; since
|
||||||
`no-upper-snake-object-keys` rules fire on wire tokens this repo does not
|
2026-10-19 it is on and profile types, failure reasons, and anchor sides
|
||||||
name (profile types such as `"claude"`, failure reasons posted to Gitea,
|
are `UPPER_SNAKE` ([[enum-values-upper-snake]]). `eslint-plugin-lit-robust`
|
||||||
environment variable names), which cannot change without changing
|
does not apply (no Lit).
|
||||||
behavior. Open question for the user. `eslint-plugin-lit-robust` does not apply
|
|
||||||
(no Lit).
|
|
||||||
- **Stricter input checks were accepted** in the migration: Gitea `/user` and
|
- **Stricter input checks were accepted** in the migration: Gitea `/user` and
|
||||||
comment responses, the runtime manifest, and the outcome's profile type are
|
comment responses, the runtime manifest, and the outcome's profile type are
|
||||||
validated; some type errors became `TypeError` with the same messages.
|
validated; some type errors became `TypeError` with the same messages.
|
||||||
|
|||||||
@@ -0,0 +1,48 @@
|
|||||||
|
---
|
||||||
|
description: Enum-like string values are UPPER_SNAKE everywhere this repo owns the format, JSON included; external standards are converted at the boundary with explicit switch functions
|
||||||
|
---
|
||||||
|
|
||||||
|
Decided 2026-10-19 (all repos). An enum-like string value, a member of a
|
||||||
|
string-literal union, is `UPPER_SNAKE` wherever this repo owns the format:
|
||||||
|
TypeScript unions, `profiles.json`, the runtime outcome file, and the
|
||||||
|
`anchors.json` the agent writes per `prompt.md`. explicit-types
|
||||||
|
`upper-snake-string-unions` enforces it and stays on.
|
||||||
|
|
||||||
|
A value an outside party defines (a CLI flag, an environment variable name,
|
||||||
|
an HTTP API field, a human-readable message) is converted at the boundary by
|
||||||
|
an explicit `switch` function, never by renaming our own values to match it:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
export interface ProfileIdentity {
|
||||||
|
type: "CLAUDE" | "CODEX" | "OPENCODE";
|
||||||
|
model: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
// The agent name the skills installer knows each profile type by.
|
||||||
|
function skillsAgent(type: RuntimeProfile["type"]): string {
|
||||||
|
switch (type) {
|
||||||
|
case "CLAUDE":
|
||||||
|
return "claude-code";
|
||||||
|
case "CODEX":
|
||||||
|
return "codex";
|
||||||
|
case "OPENCODE":
|
||||||
|
return "opencode";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
In this repo:
|
||||||
|
|
||||||
|
- Profile `type`: `CLAUDE`, `CODEX`, `OPENCODE` (also in `profiles.json`).
|
||||||
|
`skillsAgent()` (run phase) and `tokenVariable()` (profiles) map them to the
|
||||||
|
installer's agent name and the credential environment variable;
|
||||||
|
`defaultModel()` (credentials) picks a model.
|
||||||
|
- `FailureReason`: `SIGN_IN_FAILED`, `USAGE_EXHAUSTED`, `FAILED`; `toMessage()`
|
||||||
|
gives the words that logs and posted comments show.
|
||||||
|
- Anchor `side`: `NEW` or `OLD` (`prompt.md` tells the agent so); the Gitea
|
||||||
|
review call turns it into `new_position` / `old_position`.
|
||||||
|
|
||||||
|
A lookup object keyed by enum values would need `UPPER_SNAKE` keys, which
|
||||||
|
explicit-types `no-upper-snake-object-keys` bans, so use a `switch`. TypeScript
|
||||||
|
checks such a switch for exhaustiveness through the declared return type; no
|
||||||
|
`default:` branch ([[lint-config]]).
|
||||||
@@ -72,7 +72,7 @@ import { x } from "../x.ts"; // no: no ../ anywhere
|
|||||||
- An area used from outside exposes its API through its alias target, and
|
- An area used from outside exposes its API through its alias target, and
|
||||||
callers import the alias (`#ui`), not files inside it.
|
callers import the alias (`#ui`), not files inside it.
|
||||||
- Barrels are also the standard fix for `import/max-dependencies`: one barrel
|
- Barrels are also the standard fix for `import/max-dependencies`: one barrel
|
||||||
import replaces many direct ones ([[lint-overrides-policy]]).
|
import replaces many direct ones ([[lint-config]]).
|
||||||
- `import/no-cycle` is on; a barrel must not create a cycle.
|
- `import/no-cycle` is on; a barrel must not create a cycle.
|
||||||
|
|
||||||
Relative imports are written with the `.ts` extension.
|
Relative imports are written with the `.ts` extension.
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
---
|
|
||||||
description: vite.config.ts lint uses Oxlint categories at error with Deno size limits, names no rule itself, and spreads configs from the plugins and scripts/project-lint.ts
|
|
||||||
---
|
|
||||||
|
|
||||||
The lint config is short and category-driven (user decisions 2026-10-14/15):
|
|
||||||
turn on whole categories, then list only what parity or a real need adds.
|
|
||||||
|
|
||||||
```ts
|
|
||||||
lint: {
|
|
||||||
plugins: ["typescript", "unicorn", "oxc", "import"],
|
|
||||||
jsPlugins: ["eslint-plugin-explicit-types", "./scripts/project-lint.ts"],
|
|
||||||
categories: { correctness: "error", suspicious: "error", pedantic: "error", perf: "error" },
|
|
||||||
rules: { ...explicitTypes.configs.concrete.rules, ...projectLint.configs.project.rules },
|
|
||||||
ignorePatterns: ["src/generated/**"], // generated files only, see below
|
|
||||||
options: { typeAware: true, typeCheck: true, maxWarnings: 0, reportUnusedDisableDirectives: "error" },
|
|
||||||
},
|
|
||||||
```
|
|
||||||
|
|
||||||
- **Categories:** `correctness`, `suspicious`, `pedantic`, `perf` at `error`.
|
|
||||||
`style` and `restriction` are never turned on wholesale; pick single rules
|
|
||||||
from them in `configs.project`. Extra rules that categories bring are fine.
|
|
||||||
- **Size limits match Deno** (2026-10-17, replaces the 2026-10-16 "default
|
|
||||||
limits stay"): repos behave as they did on Deno. bot-agents ran `deno lint`
|
|
||||||
with no config, so it had no size or complexity limit, and every Oxlint
|
|
||||||
limit rule (`complexity`, `max-lines`, `max-params`, `id-length`,
|
|
||||||
`no-nested-ternary`, `max-lines-per-function`, `max-classes-per-file`,
|
|
||||||
`max-depth`, `max-nested-callbacks`, `max-statements`,
|
|
||||||
`import/max-dependencies`, `unicorn/max-nested-calls`) is `"off"` in
|
|
||||||
`configs.project`. No file is split for size. Do not add new opt-outs
|
|
||||||
anywhere without asking the user.
|
|
||||||
- **`vite.config.ts` names no rule.** Every rule id, built-in ones included,
|
|
||||||
lives in `configs.project` of `scripts/project-lint.ts`
|
|
||||||
([[project-lint-plugin]]). `vite.config.ts` only spreads configs.
|
|
||||||
- **Published plugins are consumed through their configs**: ESLint flat config
|
|
||||||
uses `plugin.configs.<name>`; Oxlint lists the package in `jsPlugins` and
|
|
||||||
spreads `plugin.configs.<name>.rules`, since Oxlint plugins carry no configs.
|
|
||||||
Use the configs equivalent to what the repo enabled under Deno.
|
|
||||||
- **`maxWarnings: 0`** keeps Deno's "every diagnostic fails" behaviour.
|
|
||||||
- **`ignorePatterns`** is only for generated files (compiled output, codegen).
|
|
||||||
Hand-written code is never ignored.
|
|
||||||
- **No lint disable comments**: [[lint-no-disable-comments]].
|
|
||||||
- **Parity:** [[lint-parity-never-shrinks]]. **Naming:** [[naming-id-match]].
|
|
||||||
- Don't add a second import sorter; the import-structure plugin's
|
|
||||||
`enforce-import-order` is the only one, and Oxfmt's `sortImports` stays off.
|
|
||||||
|
|
||||||
`perf` came last: in the template it flagged nine `.includes` on constant
|
|
||||||
arrays, fixed as `ReadonlySet` + `.has()` rather than by turning a rule off.
|
|
||||||
That is the expected response to any new rule: change the code.
|
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
---
|
||||||
|
description: Lint config shape: every non-nursery Oxlint category on, plugins via `all`, a blacklist of offs in configs.project, per-file exceptions only in projectOverrides, ignorePatterns only for generated output
|
||||||
|
---
|
||||||
|
|
||||||
|
Policy (2026-10-19): a blacklist, not a whitelist. Replaces the older
|
||||||
|
category-subset and "no overrides" notes.
|
||||||
|
|
||||||
|
- **Categories:** `correctness`, `suspicious`, `pedantic`, `perf`, `style`,
|
||||||
|
`restriction` at `error`. `nursery` stays off (no line for it).
|
||||||
|
- **Plugins** are enabled whole through their `all` config
|
||||||
|
(`explicitTypes.configs.all.rules`, `importStructure.configs.all.rules`).
|
||||||
|
- **Blacklist:** repo-wide offs and option tweaks live in
|
||||||
|
`projectLint.configs.project.rules` in `scripts/project-lint.ts`, spread
|
||||||
|
last in `rules`, each with a one-line reason. Never re-list a rule a
|
||||||
|
category already turns on. bot-agents runs on Node everywhere, so
|
||||||
|
`import/no-nodejs-modules`, `unicorn/no-process-exit`, and `no-console` are
|
||||||
|
off repo-wide.
|
||||||
|
- **Per-file exceptions** only via `projectOverrides`, the whole `overrides`
|
||||||
|
array exported from `scripts/project-lint.ts`: the Node code entry
|
||||||
|
(`vite.config.ts`, `scripts/**`, `nodeRules`) first, then one entry per
|
||||||
|
exception with a why-comment. `vite.config.ts` has exactly
|
||||||
|
`overrides: projectOverrides`.
|
||||||
|
- **No `allowFiles`** options in custom rules, and no disable comments
|
||||||
|
([[lint-no-disable-comments]]).
|
||||||
|
- **`ignorePatterns`** only for generated or build output, never hand-written
|
||||||
|
code. A hand-written file is linted, with override entries for only what it
|
||||||
|
legitimately breaks. bot-agents has no generated code, so none.
|
||||||
|
- **Precedence:** categories < `rules` (a later spread wins) < `overrides` (a
|
||||||
|
later entry wins).
|
||||||
|
- Size and complexity limits (`complexity`, `max-lines`, ...) are set to the
|
||||||
|
smallest value the current code passes.
|
||||||
|
|
||||||
|
```ts
|
||||||
|
// scripts/project-lint.ts
|
||||||
|
export const projectOverrides: OxlintOverride[] = [
|
||||||
|
{ files: ["vite.config.ts", "scripts/**"], rules: nodeRules },
|
||||||
|
// Why: src/example.ts must ... (a per-file exception, if one is ever needed)
|
||||||
|
// { files: ["src/example.ts"], rules: { "some-rule": "off" } },
|
||||||
|
];
|
||||||
|
|
||||||
|
// vite.config.ts
|
||||||
|
rules: {
|
||||||
|
...explicitTypes.configs.all.rules,
|
||||||
|
...importStructure.configs.all.rules,
|
||||||
|
...projectLint.configs.project.rules,
|
||||||
|
},
|
||||||
|
overrides: projectOverrides,
|
||||||
|
```
|
||||||
|
|
||||||
|
## Rule decisions (2026-10-19, all repos)
|
||||||
|
|
||||||
|
- `typescript/promise-function-async` is on with `require-await` and
|
||||||
|
`typescript/return-await`. A function that returns a promise is `async`
|
||||||
|
and awaits it: `async f() { const x = await g(); return x; }`. Test
|
||||||
|
doubles do the same (`const resolved = await Promise.resolve(v); return
|
||||||
|
resolved;`), and `expect(promise).rejects` takes the promise itself.
|
||||||
|
`src/processes/child.ts` is exempt in `projectOverrides`: `exitCode` must
|
||||||
|
return the very promise it marks handled, or a failed spawn would surface
|
||||||
|
as an unhandled rejection before callers await it.
|
||||||
|
- `init-declarations` is on: an uninitialized `let` becomes
|
||||||
|
`let x: T | null = null;` (`unknown` already includes `null`); a `try` that
|
||||||
|
assigns and a `catch` that exits still narrow it.
|
||||||
|
- `no-use-before-define` is on with only `{ functions: false }`.
|
||||||
|
- `no-await-in-loop` is off (sequential awaits are intentional) and
|
||||||
|
`unicorn/no-array-reduce` is on: sequential steps are plain `for` loops,
|
||||||
|
never `reduce` chains or recursion.
|
||||||
|
- `consistent-return`, `typescript/switch-exhaustiveness-check`, and
|
||||||
|
`default-case` are off: TypeScript's checks cover them, and no `default:`
|
||||||
|
branch is added to an exhaustive switch.
|
||||||
|
- `unknown` is allowed; `any` is banned and the `typescript/no-unsafe-*`
|
||||||
|
rules are on. Untrusted data is `unknown` plus a type guard.
|
||||||
|
- `unicorn/no-array-for-each` (use `for...of`),
|
||||||
|
`unicorn/prefer-structured-clone`, and `typescript/prefer-nullish-coalescing`
|
||||||
|
(defaults) stay on.
|
||||||
|
- explicit-types `upper-snake-string-unions` is on
|
||||||
|
([[enum-values-upper-snake]]); `unicorn/custom-error-definition` is on, so a
|
||||||
|
custom error has a constructor that sets `this.name`.
|
||||||
|
- `src/post/` and `src/profiles/` (code and tests) are exempt from
|
||||||
|
`project/prefer-ascii` in `projectOverrides`: posted Gitea text shows emoji
|
||||||
|
verdict marks and a middle dot.
|
||||||
|
|
||||||
|
A new category hit is fixed in the code; an off or exception is added only
|
||||||
|
for a real collision or churn, with its reason. Rules: [[project-lint-plugin]].
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
---
|
|
||||||
description: No lint overrides for source files; narrow ones only for scripts/**; generated files go in ignorePatterns; size limits match Deno, so nothing is split for size
|
|
||||||
---
|
|
||||||
|
|
||||||
Final policy (2026-10-16). The user considers per-file `overrides` bad
|
|
||||||
practice.
|
|
||||||
|
|
||||||
- **Source files: never.** No `overrides` entry may target `src/**` or any
|
|
||||||
other hand-written production or test code.
|
|
||||||
- **The one exception** is in lint-plugin repos: `import/max-dependencies`
|
|
||||||
off for `src/rules/index.ts`, the rule registry, which must import every
|
|
||||||
rule. It is not a precedent for apps.
|
|
||||||
- **`scripts/**`:** a narrow override is allowed when a tooling script truly
|
|
||||||
needs it, e.g. `no-console` in a CLI script.
|
|
||||||
- **Generated files:** list them in `ignorePatterns`, never `overrides`.
|
|
||||||
- **Anything else needs the user's approval first.** When the user is away,
|
|
||||||
don't add it: refactor, or leave the violation failing and log the question.
|
|
||||||
|
|
||||||
## Fix the code instead
|
|
||||||
|
|
||||||
Category rule violations are fixed in the code without behavior change,
|
|
||||||
covered by the tests, inside the same migration PR; e.g. `prefer-set-has`
|
|
||||||
becomes `const K: ReadonlySet<string> = new Set([...])` with `.has`.
|
|
||||||
|
|
||||||
Size and complexity limits are not refactored for: they match what Deno
|
|
||||||
enforced (2026-10-17, replacing the earlier "refactor to Oxlint's defaults"),
|
|
||||||
which for bot-agents is none, so those rules are `"off"`
|
|
||||||
([[lint-config-shape]]).
|
|
||||||
|
|
||||||
Alias rule: an alias may point anywhere and owns its target (a folder's
|
|
||||||
`index.ts` owns the folder and below, any other file owns only itself); no
|
|
||||||
two aliases may own the same file, and `../` is banned everywhere
|
|
||||||
([[imports-aliases-barrels]]).
|
|
||||||
@@ -11,12 +11,19 @@ Oxlint plugin with `meta.name` `"project"`, loaded through `jsPlugins` in
|
|||||||
plugin configs: Deno parity rules, extras, per-rule options, and opt-outs,
|
plugin configs: Deno parity rules, extras, per-rule options, and opt-outs,
|
||||||
built-in Oxlint ids included (`curly`, `id-match`, `import/no-cycle`, ...).
|
built-in Oxlint ids included (`curly`, `id-match`, `import/no-cycle`, ...).
|
||||||
- **Custom rules**, enabled as `project/<rule>`. Every repo has
|
- **Custom rules**, enabled as `project/<rule>`. Every repo has
|
||||||
`no-disable-comments` and `no-asset-imports`; bot-agents has no others.
|
`no-disable-comments` and `no-asset-imports`. Since 2026-10-19 every repo
|
||||||
|
also has `prefer-ascii`, `no-nan` (a "no number" value is `null`, never
|
||||||
|
`NaN`), and the hugoalh `recommended` ports from
|
||||||
|
eslint-plugin-import-structure's own lint: `no-duplicate-typeofs`,
|
||||||
|
`no-empty-yield`, `no-unsafe-number`, `no-useless-continue`,
|
||||||
|
`no-duplicate-interfaces`, `no-duplicate-types`, `no-useless-type`, and
|
||||||
|
`no-modifier-private`. `no-duplicate-awaits` and `no-duplicate-voids` are
|
||||||
|
covered by `unicorn/no-unnecessary-await` and
|
||||||
|
`typescript/no-meaningless-void-operator`, and `no-enum` by explicit-types.
|
||||||
|
|
||||||
`scripts/` stays flat; don't add `scripts/rules/`. If the plugin ever needs
|
`scripts/` stays flat; don't add `scripts/rules/`. All rules live in the one
|
||||||
more files, they sit flat beside it and share the prefix
|
`scripts/project-lint.ts` (no file splitting), next to the plugin object and
|
||||||
(`project-lint-modules.ts`, ...); `scripts/project-lint.ts` keeps the plugin
|
the rule list.
|
||||||
object and the rule list.
|
|
||||||
|
|
||||||
```ts
|
```ts
|
||||||
import type { DummyRuleMap } from "vite-plus/lint";
|
import type { DummyRuleMap } from "vite-plus/lint";
|
||||||
@@ -52,5 +59,5 @@ export default plugin;
|
|||||||
and every repo should look the same.
|
and every repo should look the same.
|
||||||
|
|
||||||
`scripts/` is tooling, not production code: never packed or published, and
|
`scripts/` is tooling, not production code: never packed or published, and
|
||||||
no tests. Narrow `overrides` for `scripts/**` are allowed when a script truly
|
no tests. Its offs sit in the Node code entry of `projectOverrides`; see
|
||||||
needs one (e.g. `no-console`); see [[lint-overrides-policy]].
|
[[lint-config]].
|
||||||
|
|||||||
@@ -50,9 +50,11 @@ relative imports. `scripts/` is flat: one file per tool, no subfolders and no `i
|
|||||||
([.agents/memory/imports-aliases-barrels.md](.agents/memory/imports-aliases-barrels.md)).
|
([.agents/memory/imports-aliases-barrels.md](.agents/memory/imports-aliases-barrels.md)).
|
||||||
|
|
||||||
The only config files are `package.json`, `tsconfig.json`, and
|
The only config files are `package.json`, `tsconfig.json`, and
|
||||||
`vite.config.ts`, plus `package-lock.json`. Repo-local lint rules and the rule
|
`vite.config.ts`, plus `package-lock.json`. Repo-local lint rules, the rule
|
||||||
list live in `scripts/project-lint.ts`. Lint disable comments are not allowed;
|
list, and the `overrides` array (`projectOverrides`) live in
|
||||||
fix the source instead.
|
`scripts/project-lint.ts`
|
||||||
|
([.agents/memory/lint-config.md](.agents/memory/lint-config.md)). Lint disable
|
||||||
|
comments are not allowed; fix the source instead.
|
||||||
|
|
||||||
The composite action uses npm only to install the externally distributed
|
The composite action uses npm only to install the externally distributed
|
||||||
Claude Code, Codex, and OpenCode command-line tools; do not treat those
|
Claude Code, Codex, and OpenCode command-line tools; do not treat those
|
||||||
|
|||||||
Generated
+4
-4
@@ -9,7 +9,7 @@
|
|||||||
"@eslint/core": "^0.17.0",
|
"@eslint/core": "^0.17.0",
|
||||||
"@types/node": "^24.19.2",
|
"@types/node": "^24.19.2",
|
||||||
"@typescript-eslint/types": "^8.71.2",
|
"@typescript-eslint/types": "^8.71.2",
|
||||||
"eslint-plugin-explicit-types": "^0.6.1",
|
"eslint-plugin-explicit-types": "^0.7.0",
|
||||||
"eslint-plugin-import-structure": "^0.10.2",
|
"eslint-plugin-import-structure": "^0.10.2",
|
||||||
"vite-plus": "^1.2.0",
|
"vite-plus": "^1.2.0",
|
||||||
"yaml": "^2.9.1"
|
"yaml": "^2.9.1"
|
||||||
@@ -1890,9 +1890,9 @@
|
|||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
"node_modules/eslint-plugin-explicit-types": {
|
"node_modules/eslint-plugin-explicit-types": {
|
||||||
"version": "0.6.1",
|
"version": "0.7.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-plugin-explicit-types/-/eslint-plugin-explicit-types-0.6.1.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-plugin-explicit-types/-/eslint-plugin-explicit-types-0.7.0.tgz",
|
||||||
"integrity": "sha512-8JU2Ceoi1aLbhYo4LHwb9Eone/pJuMnzVP1ZlGJn/ETxVzJQFziRnJwOF2dRmInn9dGqvwq05dc3o5tVyTGP2Q==",
|
"integrity": "sha512-TCX40NrxEKH+zXhIPvuY6e9dWjhHfAlEbkNlcyvhY7fUFG+sSIt3VMT0C/U2QGFbtVhDnV1xE7JkOlGGXzPcZQ==",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|||||||
+1
-1
@@ -18,7 +18,7 @@
|
|||||||
"@eslint/core": "^0.17.0",
|
"@eslint/core": "^0.17.0",
|
||||||
"@types/node": "^24.19.2",
|
"@types/node": "^24.19.2",
|
||||||
"@typescript-eslint/types": "^8.71.2",
|
"@typescript-eslint/types": "^8.71.2",
|
||||||
"eslint-plugin-explicit-types": "^0.6.1",
|
"eslint-plugin-explicit-types": "^0.7.0",
|
||||||
"eslint-plugin-import-structure": "^0.10.2",
|
"eslint-plugin-import-structure": "^0.10.2",
|
||||||
"vite-plus": "^1.2.0",
|
"vite-plus": "^1.2.0",
|
||||||
"yaml": "^2.9.1"
|
"yaml": "^2.9.1"
|
||||||
|
|||||||
+3
-3
@@ -2,16 +2,16 @@
|
|||||||
"reviewer-token": "v1:XFUvCI9PnXVaW-ig:_3S9BvXywUp29cVYGA_EzFScKwC5oHkV9x2Ld8k-V_uiG7iA8n3fmjXCArzh2Lz-JDgy3IMTHoY",
|
"reviewer-token": "v1:XFUvCI9PnXVaW-ig:_3S9BvXywUp29cVYGA_EzFScKwC5oHkV9x2Ld8k-V_uiG7iA8n3fmjXCArzh2Lz-JDgy3IMTHoY",
|
||||||
"profiles": [
|
"profiles": [
|
||||||
{
|
{
|
||||||
"type": "codex",
|
"type": "CODEX",
|
||||||
"model": "gpt-5.6-terra"
|
"model": "gpt-5.6-terra"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "claude",
|
"type": "CLAUDE",
|
||||||
"model": "claude-sonnet-5",
|
"model": "claude-sonnet-5",
|
||||||
"token": "v1:-dyfF6ZicEhjPk4C:WCuMaGd09tYjtzUCl7abloRzPITvP5C35WpR372w3O_tcaD-ls-yV5sJBdU8iIVApZVCC98sY2gOyM3o9RMa8ciJq8Fuys7KxlYOp8QiluL9AYMSQi6rEsSH71EPWnxSACgo3uDQY8bWQpUlEZvXH9O-ZN9A58dh6b3vRg"
|
"token": "v1:-dyfF6ZicEhjPk4C:WCuMaGd09tYjtzUCl7abloRzPITvP5C35WpR372w3O_tcaD-ls-yV5sJBdU8iIVApZVCC98sY2gOyM3o9RMa8ciJq8Fuys7KxlYOp8QiluL9AYMSQi6rEsSH71EPWnxSACgo3uDQY8bWQpUlEZvXH9O-ZN9A58dh6b3vRg"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "opencode",
|
"type": "OPENCODE",
|
||||||
"model": "openrouter/qwen/qwen3.8-27b",
|
"model": "openrouter/qwen/qwen3.8-27b",
|
||||||
"token": "v1:4qdfJCdUx9jfiabC:8X0ic_J82lPlq_R3uTLaEbQy7UmEh7BgtG0bDKAcc8FeJ0xvEwkGCKaDoLmT5nta03hgjGdcWKjDdOSMi1kSDfp8J7tRTLtMRzDT8GX8OU_PVDPVahQIAU0"
|
"token": "v1:4qdfJCdUx9jfiabC:8X0ic_J82lPlq_R3uTLaEbQy7UmEh7BgtG0bDKAcc8FeJ0xvEwkGCKaDoLmT5nta03hgjGdcWKjDdOSMi1kSDfp8J7tRTLtMRzDT8GX8OU_PVDPVahQIAU0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,9 +47,9 @@ achieved.
|
|||||||
|
|
||||||
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
|
||||||
`{"path": "<path from the repository root>", "line": <number>, "side": "new" |
|
`{"path": "<path from the repository root>", "line": <number>, "side": "NEW" |
|
||||||
"old", "body": "<the finding>"}`.
|
"OLD", "body": "<the finding>"}`.
|
||||||
`side` is `new` for a line in the head file and `old` for one only in the base
|
`side` is `NEW` for a line in the head file and `OLD` for one only in the base
|
||||||
file; `line` is that file's own line number, and it must be a line the diff
|
file; `line` is that file's own line number, and it must be a line the diff
|
||||||
touches, or Gitea refuses the anchor. Write the file only when there is
|
touches, or Gitea refuses the anchor. Write the file only when there is
|
||||||
something to anchor, and keep each body to the what, the why, and the how, with
|
something to anchor, and keep each body to the what, the why, and the how, with
|
||||||
|
|||||||
+674
-73
@@ -1,20 +1,29 @@
|
|||||||
/**
|
/**
|
||||||
* `project` — lint rules this repository holds its own source to, on top of
|
* `project` - this repository's changes to the Oxlint categories in
|
||||||
* the Oxlint categories in `vite.config.ts`. Its rules of its own are
|
* `vite.config.ts`. Its rules of its own are `no-disable-comments`,
|
||||||
* `no-disable-comments` and `no-asset-imports`.
|
* `no-asset-imports`, `prefer-ascii`, and ports of the hugoalh `recommended`
|
||||||
|
* rules Oxlint lacks, as in eslint-plugin-import-structure's own lint.
|
||||||
*
|
*
|
||||||
* Loaded by `vite.config.ts` as an Oxlint `jsPlugins` entry.
|
* Loaded by `vite.config.ts` as an Oxlint `jsPlugins` entry.
|
||||||
*
|
*
|
||||||
* @module
|
* @module
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import type { LanguageOptions, RuleDefinition, RuleVisitor, TextSourceCode } from "@eslint/core";
|
import type {
|
||||||
|
LanguageOptions,
|
||||||
|
Position,
|
||||||
|
RuleDefinition,
|
||||||
|
RuleTextEdit,
|
||||||
|
RuleVisitor,
|
||||||
|
TextSourceCode,
|
||||||
|
} from "@eslint/core";
|
||||||
import { AST_NODE_TYPES, type TSESTree } from "@typescript-eslint/types";
|
import { AST_NODE_TYPES, type TSESTree } from "@typescript-eslint/types";
|
||||||
import type { DummyRuleMap } from "vite-plus/lint";
|
import type { DummyRuleMap, OxlintOverride } from "vite-plus/lint";
|
||||||
|
|
||||||
/** The source code both hosts hand a rule, with the comment list. */
|
/** The source code both hosts hand a rule, with the comment list and index lookup. */
|
||||||
interface ProjectSourceCode extends TextSourceCode {
|
interface ProjectSourceCode extends TextSourceCode {
|
||||||
getAllComments(): TSESTree.Comment[];
|
getAllComments: () => TSESTree.Comment[];
|
||||||
|
getLocFromIndex: (index: number) => Position;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ESLint's default rule types, reporting TypeScript-ESTree nodes. */
|
/** ESLint's default rule types, reporting TypeScript-ESTree nodes. */
|
||||||
@@ -38,7 +47,7 @@ const DIRECTIVE_PATTERN: RegExp = /^\s*(?:eslint|oxlint)-(?:disable|enable)/u;
|
|||||||
const RULE_NAME: string = "no-disable-comments";
|
const RULE_NAME: string = "no-disable-comments";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `no-disable-comments` — rejects every `eslint-disable*`, `eslint-enable*`,
|
* `no-disable-comments` - rejects every `eslint-disable*`, `eslint-enable*`,
|
||||||
* `oxlint-disable*`, and `oxlint-enable*` comment, line or block. Oxlint has
|
* `oxlint-disable*`, and `oxlint-enable*` comment, line or block. Oxlint has
|
||||||
* no `noInlineConfig` and no `eslint-comments` rules, so this repo bans them
|
* no `noInlineConfig` and no `eslint-comments` rules, so this repo bans them
|
||||||
* itself: when a rule fires, fix the source.
|
* itself: when a rule fires, fix the source.
|
||||||
@@ -68,6 +77,501 @@ const noDisableCommentsRule: ProjectRule = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** The highest code point `prefer-ascii` lets through. */
|
||||||
|
const MAX_ASCII_CODE_POINT: number = 127;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `prefer-ascii` - every character of the source is ASCII. A file is exempted
|
||||||
|
* only through an entry in `projectOverrides`.
|
||||||
|
*/
|
||||||
|
const preferAsciiRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Require the source to be ASCII" },
|
||||||
|
schema: [],
|
||||||
|
messages: {
|
||||||
|
nonAscii: "Non-ASCII character '{{character}}' (U+{{codePoint}}) is not allowed.",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
Program(_node: TSESTree.Program): void {
|
||||||
|
const { sourceCode } = context;
|
||||||
|
let index: number = 0;
|
||||||
|
for (const character of sourceCode.text) {
|
||||||
|
const codePoint: number = character.codePointAt(0) ?? 0;
|
||||||
|
if (codePoint > MAX_ASCII_CODE_POINT) {
|
||||||
|
context.report({
|
||||||
|
loc: {
|
||||||
|
start: sourceCode.getLocFromIndex(index),
|
||||||
|
end: sourceCode.getLocFromIndex(index + character.length),
|
||||||
|
},
|
||||||
|
messageId: "nonAscii",
|
||||||
|
data: { character, codePoint: codePoint.toString(16).toUpperCase().padStart(4, "0") },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
index += character.length;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** `no-duplicate-typeofs` - `typeof typeof x` is always `"string"`. */
|
||||||
|
const noDuplicateTypeofsRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "problem",
|
||||||
|
docs: { description: "Disallow `typeof` applied twice in a row" },
|
||||||
|
schema: [],
|
||||||
|
messages: { doubled: 'Multiple `typeof`s always return `"string"`, possibly not intended.' },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
UnaryExpression(node: TSESTree.UnaryExpression): void {
|
||||||
|
if (
|
||||||
|
node.operator === "typeof" &&
|
||||||
|
node.argument.type === AST_NODE_TYPES.UnaryExpression &&
|
||||||
|
node.argument.operator === "typeof"
|
||||||
|
) {
|
||||||
|
context.report({ node, messageId: "doubled" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** `no-empty-yield` - a `yield` with no expression, likely missing one. */
|
||||||
|
const noEmptyYieldRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "problem",
|
||||||
|
docs: { description: "Disallow `yield` without an expression" },
|
||||||
|
schema: [],
|
||||||
|
messages: { empty: "Empty `yield` is not allowed, possibly missing the expression." },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
YieldExpression(node: TSESTree.YieldExpression): void {
|
||||||
|
if (node.argument === null) {
|
||||||
|
context.report({ node, messageId: "empty" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** The globals `no-nan` sees through, as in `globalThis.Number.NaN`. */
|
||||||
|
const GLOBAL_NAMES: ReadonlySet<string> = new Set<string>(["globalThis", "self", "window"]);
|
||||||
|
|
||||||
|
/** The name a member expression's property spells, computed or not. */
|
||||||
|
function propertyName(node: TSESTree.MemberExpression): string | null {
|
||||||
|
if (node.property.type === AST_NODE_TYPES.Identifier && !node.computed) {
|
||||||
|
return node.property.name;
|
||||||
|
}
|
||||||
|
if (node.property.type === AST_NODE_TYPES.Literal && typeof node.property.value === "string") {
|
||||||
|
return node.property.value;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether `node` is a global object, such as `globalThis` or `globalThis.self`. */
|
||||||
|
function isGlobalChain(node: TSESTree.Expression): boolean {
|
||||||
|
if (node.type === AST_NODE_TYPES.Identifier) {
|
||||||
|
return GLOBAL_NAMES.has(node.name);
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
node.type === AST_NODE_TYPES.MemberExpression &&
|
||||||
|
GLOBAL_NAMES.has(propertyName(node) ?? "") &&
|
||||||
|
isGlobalChain(node.object)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Whether a member expression reads the global `NaN`: `Number.NaN`,
|
||||||
|
* `globalThis.NaN`, or `globalThis.Number.NaN`.
|
||||||
|
*/
|
||||||
|
function isNanMember(node: TSESTree.MemberExpression): boolean {
|
||||||
|
if (propertyName(node) !== "NaN") {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
const { object } = node;
|
||||||
|
if (object.type === AST_NODE_TYPES.Identifier && object.name === "Number") {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
isGlobalChain(object) ||
|
||||||
|
(object.type === AST_NODE_TYPES.MemberExpression &&
|
||||||
|
propertyName(object) === "Number" &&
|
||||||
|
isGlobalChain(object.object))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `no-nan` - a `NaN` value is usually an error; use `null` for "no number". */
|
||||||
|
const noNanRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "problem",
|
||||||
|
docs: { description: "Disallow `NaN` as a value" },
|
||||||
|
schema: [],
|
||||||
|
messages: { nan: "Using `NaN` as a value is usually an error and not intended." },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
Identifier(node: TSESTree.Identifier): void {
|
||||||
|
if (node.name === "NaN" && node.parent.type !== AST_NODE_TYPES.MemberExpression) {
|
||||||
|
context.report({ node, messageId: "nan" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
MemberExpression(node: TSESTree.MemberExpression): void {
|
||||||
|
if (isNanMember(node)) {
|
||||||
|
context.report({ node, messageId: "nan" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** `no-unsafe-number` - a number literal outside the safe integer range. */
|
||||||
|
const noUnsafeNumberRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "problem",
|
||||||
|
docs: { description: "Disallow number literals outside the safe integer range" },
|
||||||
|
schema: [],
|
||||||
|
messages: {
|
||||||
|
unsafe:
|
||||||
|
"Number literals with values equal to 2^53 or greater are too large to be represented accurately.",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
Literal(node: TSESTree.Literal): void {
|
||||||
|
if (
|
||||||
|
typeof node.value === "number" &&
|
||||||
|
(node.value < Number.MIN_SAFE_INTEGER || node.value > Number.MAX_SAFE_INTEGER)
|
||||||
|
) {
|
||||||
|
context.report({ node, messageId: "unsafe" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** A loop statement, whose last `continue` `no-useless-continue` checks. */
|
||||||
|
type LoopStatement =
|
||||||
|
| TSESTree.DoWhileStatement
|
||||||
|
| TSESTree.ForInStatement
|
||||||
|
| TSESTree.ForOfStatement
|
||||||
|
| TSESTree.ForStatement
|
||||||
|
| TSESTree.WhileStatement;
|
||||||
|
|
||||||
|
/** A loop's trailing unlabeled `continue`, and whether removing it is a safe fix. */
|
||||||
|
interface TrailingContinue {
|
||||||
|
statement: TSESTree.ContinueStatement;
|
||||||
|
removable: boolean;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The unlabeled `continue` a loop ends with, and whether removing it is a
|
||||||
|
* safe fix: it is in a block, rather than the loop's whole body.
|
||||||
|
*/
|
||||||
|
function trailingContinue(node: LoopStatement): TrailingContinue | null {
|
||||||
|
if (node.body.type === AST_NODE_TYPES.BlockStatement) {
|
||||||
|
const last = node.body.body.at(-1);
|
||||||
|
return last?.type === AST_NODE_TYPES.ContinueStatement && last.label === null
|
||||||
|
? { statement: last, removable: true }
|
||||||
|
: null;
|
||||||
|
}
|
||||||
|
if (node.body.type === AST_NODE_TYPES.ContinueStatement && node.body.label === null) {
|
||||||
|
return { statement: node.body, removable: false };
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `no-useless-continue` - an unlabeled `continue` that ends a loop body. A
|
||||||
|
* trailing `continue;` in a block is removed by the fix; a loop whose whole
|
||||||
|
* body is `continue;` is only reported.
|
||||||
|
*/
|
||||||
|
const noUselessContinueRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Disallow an unlabeled `continue` at the end of a loop" },
|
||||||
|
fixable: "code",
|
||||||
|
schema: [],
|
||||||
|
messages: {
|
||||||
|
useless: "The statement `continue` at the end of the loop and without a label is useless.",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
function check(node: LoopStatement): void {
|
||||||
|
const found: TrailingContinue | null = trailingContinue(node);
|
||||||
|
if (found === null) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (found.removable) {
|
||||||
|
context.report({
|
||||||
|
node: found.statement,
|
||||||
|
messageId: "useless",
|
||||||
|
fix: (fixer): RuleTextEdit => fixer.remove(found.statement),
|
||||||
|
});
|
||||||
|
} else {
|
||||||
|
context.report({ node: found.statement, messageId: "useless" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
DoWhileStatement: check,
|
||||||
|
ForInStatement: check,
|
||||||
|
ForOfStatement: check,
|
||||||
|
ForStatement: check,
|
||||||
|
WhileStatement: check,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Node keys that say where a node is, not what it is, in ESLint and Oxlint. */
|
||||||
|
const POSITION_KEYS: ReadonlySet<string> = new Set<string>([
|
||||||
|
"parent",
|
||||||
|
"range",
|
||||||
|
"loc",
|
||||||
|
"start",
|
||||||
|
"end",
|
||||||
|
]);
|
||||||
|
|
||||||
|
/** Node types whose member lists mean the same in any order. */
|
||||||
|
const UNORDERED_TYPES: ReadonlySet<string> = new Set<string>([
|
||||||
|
"TSInterfaceBody",
|
||||||
|
"TSTypeLiteral",
|
||||||
|
"TSUnionType",
|
||||||
|
"TSIntersectionType",
|
||||||
|
]);
|
||||||
|
|
||||||
|
/** Type annotations too simple for an alias of their own (`no-useless-type`). */
|
||||||
|
const SIMPLE_TYPES: ReadonlySet<string> = new Set<string>([
|
||||||
|
"TSAnyKeyword",
|
||||||
|
"TSBigIntKeyword",
|
||||||
|
"TSBooleanKeyword",
|
||||||
|
"TSIntrinsicKeyword",
|
||||||
|
"TSNeverKeyword",
|
||||||
|
"TSNullKeyword",
|
||||||
|
"TSNumberKeyword",
|
||||||
|
"TSObjectKeyword",
|
||||||
|
"TSStringKeyword",
|
||||||
|
"TSSymbolKeyword",
|
||||||
|
"TSUndefinedKeyword",
|
||||||
|
"TSUnknownKeyword",
|
||||||
|
"TSVoidKeyword",
|
||||||
|
]);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A node's shape as text, without positions, so two declarations compare
|
||||||
|
* alike wherever they sit. Members of a type literal, interface body,
|
||||||
|
* union, or intersection are sorted, since their order means nothing.
|
||||||
|
*/
|
||||||
|
function serialize(value: unknown): string {
|
||||||
|
if (Array.isArray(value)) {
|
||||||
|
return `[${value.map((item: unknown) => serialize(item)).join(",")}]`;
|
||||||
|
}
|
||||||
|
if (typeof value !== "object" || value === null) {
|
||||||
|
return JSON.stringify(value) ?? "undefined";
|
||||||
|
}
|
||||||
|
const unordered: boolean = "type" in value && UNORDERED_TYPES.has(String(value.type));
|
||||||
|
const parts: string[] = Object.entries(value)
|
||||||
|
.filter(([key]: [string, unknown]) => !POSITION_KEYS.has(key))
|
||||||
|
.map(([key, child]: [string, unknown]) => {
|
||||||
|
const text: string =
|
||||||
|
unordered && Array.isArray(child)
|
||||||
|
? `[${child
|
||||||
|
.map((item: unknown) => serialize(item))
|
||||||
|
.toSorted()
|
||||||
|
.join(",")}]`
|
||||||
|
: serialize(child);
|
||||||
|
return `${key}:${text}`;
|
||||||
|
});
|
||||||
|
return `{${parts.join(",")}}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** The top-level declarations in a block, exported or not, that `matches`. */
|
||||||
|
function declarationsOf<T extends TSESTree.Node>(
|
||||||
|
statements: TSESTree.Node[],
|
||||||
|
matches: (node: TSESTree.Node) => node is T,
|
||||||
|
): T[] {
|
||||||
|
const found: T[] = [];
|
||||||
|
for (const statement of statements) {
|
||||||
|
const declaration: TSESTree.Node | null =
|
||||||
|
statement.type === AST_NODE_TYPES.ExportNamedDeclaration ? statement.declaration : statement;
|
||||||
|
if (declaration !== null && matches(declaration)) {
|
||||||
|
found.push(declaration);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return found;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether a node is an interface declaration. */
|
||||||
|
function isInterface(node: TSESTree.Node): node is TSESTree.TSInterfaceDeclaration {
|
||||||
|
return node.type === AST_NODE_TYPES.TSInterfaceDeclaration;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Whether a node is a type alias declaration. */
|
||||||
|
function isTypeAlias(node: TSESTree.Node): node is TSESTree.TSTypeAliasDeclaration {
|
||||||
|
return node.type === AST_NODE_TYPES.TSTypeAliasDeclaration;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Groups nodes by a key and returns the groups with more than one node. */
|
||||||
|
function duplicateGroups<T>(nodes: T[], keyOf: (node: T) => string): T[][] {
|
||||||
|
const groups: Map<string, T[]> = Map.groupBy(nodes, keyOf);
|
||||||
|
return [...groups.values()].filter((group: T[]) => group.length > 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** What an interface declares, its `extends` list included. */
|
||||||
|
function interfaceShape(node: TSESTree.TSInterfaceDeclaration): string {
|
||||||
|
return `${serialize(node.extends)}&${serialize(node.body)}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** An interface's name. */
|
||||||
|
function interfaceName(node: TSESTree.TSInterfaceDeclaration): string {
|
||||||
|
return node.id.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** What a type alias stands for. */
|
||||||
|
function typeAliasShape(node: TSESTree.TSTypeAliasDeclaration): string {
|
||||||
|
return serialize(node.typeAnnotation);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `no-duplicate-interfaces` - two interfaces in one block with the same
|
||||||
|
* name, which merge silently, or with the same shape, which could be one.
|
||||||
|
*/
|
||||||
|
const noDuplicateInterfacesRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Disallow interfaces with the same name or shape in one block" },
|
||||||
|
schema: [],
|
||||||
|
messages: {
|
||||||
|
sameShape: "Found multiple interfaces with the same shape, possibly mergeable.",
|
||||||
|
sameName: "Found multiple interfaces named '{{name}}', possibly not intended.",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
function check(statements: TSESTree.Node[]): void {
|
||||||
|
const nodes: TSESTree.TSInterfaceDeclaration[] = declarationsOf(statements, isInterface);
|
||||||
|
for (const node of duplicateGroups(nodes, interfaceShape).flat()) {
|
||||||
|
context.report({ node, messageId: "sameShape" });
|
||||||
|
}
|
||||||
|
for (const node of duplicateGroups(nodes, interfaceName).flat()) {
|
||||||
|
context.report({ node, messageId: "sameName", data: { name: node.id.name } });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
BlockStatement(node: TSESTree.BlockStatement): void {
|
||||||
|
check(node.body);
|
||||||
|
},
|
||||||
|
Program(node: TSESTree.Program): void {
|
||||||
|
check(node.body);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** `no-duplicate-types` - two type aliases in one block with the same type. */
|
||||||
|
const noDuplicateTypesRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Disallow type aliases with the same type in one block" },
|
||||||
|
schema: [],
|
||||||
|
messages: { sameShape: "Found multiple types with the same shape, possibly mergeable." },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
function check(statements: TSESTree.Node[]): void {
|
||||||
|
const nodes: TSESTree.TSTypeAliasDeclaration[] = declarationsOf(statements, isTypeAlias);
|
||||||
|
for (const node of duplicateGroups(nodes, typeAliasShape).flat()) {
|
||||||
|
context.report({ node, messageId: "sameShape" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
BlockStatement(node: TSESTree.BlockStatement): void {
|
||||||
|
check(node.body);
|
||||||
|
},
|
||||||
|
Program(node: TSESTree.Program): void {
|
||||||
|
check(node.body);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** A class member that can carry the `private` keyword. */
|
||||||
|
type AccessibilityCarrier =
|
||||||
|
| TSESTree.AccessorProperty
|
||||||
|
| TSESTree.MethodDefinition
|
||||||
|
| TSESTree.PropertyDefinition
|
||||||
|
| TSESTree.TSAbstractAccessorProperty
|
||||||
|
| TSESTree.TSAbstractMethodDefinition
|
||||||
|
| TSESTree.TSAbstractPropertyDefinition
|
||||||
|
| TSESTree.TSParameterProperty;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* `no-modifier-private` - class members are made private with `#`, never the
|
||||||
|
* `private` keyword, which only TypeScript enforces. A `private constructor`
|
||||||
|
* has no `#` form and stays allowed.
|
||||||
|
*/
|
||||||
|
const noModifierPrivateRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Disallow the private modifier" },
|
||||||
|
schema: [],
|
||||||
|
messages: { private: "Use a # private name instead of the private modifier." },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
function check(node: AccessibilityCarrier): void {
|
||||||
|
const isConstructor: boolean =
|
||||||
|
node.type === AST_NODE_TYPES.MethodDefinition && node.kind === "constructor";
|
||||||
|
if (node.accessibility === "private" && !isConstructor) {
|
||||||
|
context.report({ node, messageId: "private" });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
AccessorProperty: check,
|
||||||
|
MethodDefinition: check,
|
||||||
|
PropertyDefinition: check,
|
||||||
|
TSAbstractAccessorProperty: check,
|
||||||
|
TSAbstractMethodDefinition: check,
|
||||||
|
TSAbstractPropertyDefinition: check,
|
||||||
|
TSParameterProperty: check,
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
/** Whether a type is too simple to need an alias: a keyword, literal, or bare name. */
|
||||||
|
function isSimpleType(node: TSESTree.TypeNode): boolean {
|
||||||
|
if (SIMPLE_TYPES.has(node.type)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (node.type === AST_NODE_TYPES.TSLiteralType) {
|
||||||
|
return node.literal.type === AST_NODE_TYPES.Literal;
|
||||||
|
}
|
||||||
|
return (
|
||||||
|
node.type === AST_NODE_TYPES.TSTypeReference &&
|
||||||
|
node.typeName.type === AST_NODE_TYPES.Identifier &&
|
||||||
|
node.typeArguments === undefined
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `no-useless-type` - a type alias for a keyword, literal, or bare type name. */
|
||||||
|
const noUselessTypeRule: ProjectRule = {
|
||||||
|
meta: {
|
||||||
|
type: "suggestion",
|
||||||
|
docs: { description: "Disallow type aliases too simple to need a name" },
|
||||||
|
schema: [],
|
||||||
|
messages: { simple: "The type is too simple to need an alias." },
|
||||||
|
},
|
||||||
|
create(context) {
|
||||||
|
return {
|
||||||
|
TSTypeAliasDeclaration(node: TSESTree.TSTypeAliasDeclaration): void {
|
||||||
|
if (isSimpleType(node.typeAnnotation)) {
|
||||||
|
context.report({ node, messageId: "simple" });
|
||||||
|
}
|
||||||
|
},
|
||||||
|
};
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
/** A module specifier read as a path: relative, absolute, or a `#` alias. */
|
/** A module specifier read as a path: relative, absolute, or a `#` alias. */
|
||||||
const PATH_SPECIFIER_PATTERN: RegExp = /^[./#]/u;
|
const PATH_SPECIFIER_PATTERN: RegExp = /^[./#]/u;
|
||||||
|
|
||||||
@@ -104,7 +608,7 @@ function isAssetSource(source: string): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* `no-asset-imports` — rejects importing anything but a script module: a
|
* `no-asset-imports` - rejects importing anything but a script module: a
|
||||||
* source path, static or a dynamic `import()` with a string literal, ending in
|
* source path, static or a dynamic `import()` with a string literal, ending in
|
||||||
* an extension other than `.ts`, `.js`, `.mts`, or `.mjs` (`.css`, `.json`,
|
* an extension other than `.ts`, `.js`, `.mts`, or `.mjs` (`.css`, `.json`,
|
||||||
* `.svg`, `.jsx`, `.tsx`, `.cjs`) or carrying a query string (`?raw`, `?url`),
|
* `.svg`, `.jsx`, `.tsx`, `.cjs`) or carrying a query string (`?raw`, `?url`),
|
||||||
@@ -161,9 +665,9 @@ const noAssetImportsRule: ProjectRule = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This repository's own rule list, spread by `vite.config.ts`: rules that
|
* This repository's changes to the Oxlint categories in `vite.config.ts`,
|
||||||
* sit outside the Oxlint categories, plus the template's extras. Built-in
|
* which turn every non-nursery category on: its own rules, the category
|
||||||
* Oxlint rule ids sit here too, so `vite.config.ts` lists no rule by name.
|
* rules it turns off, and options that differ from a rule's defaults.
|
||||||
*/
|
*/
|
||||||
const rules: DummyRuleMap = {
|
const rules: DummyRuleMap = {
|
||||||
// The explicit-types template's `camelcase` stand-in: no `_` inside a name
|
// The explicit-types template's `camelcase` stand-in: no `_` inside a name
|
||||||
@@ -174,31 +678,6 @@ const rules: DummyRuleMap = {
|
|||||||
"^_*[^_]*_*$|^[^a-z]*$",
|
"^_*[^_]*_*$|^[^a-z]*$",
|
||||||
{ properties: false, classFields: false, onlyDeclarations: false, ignoreDestructuring: true },
|
{ properties: false, classFields: false, onlyDeclarations: false, ignoreDestructuring: true },
|
||||||
],
|
],
|
||||||
// Rules outside the categories.
|
|
||||||
"no-array-constructor": "error",
|
|
||||||
"no-case-declarations": "error",
|
|
||||||
"no-empty": "error",
|
|
||||||
"no-fallthrough": "error",
|
|
||||||
"no-inner-declarations": "error",
|
|
||||||
"no-prototype-builtins": "error",
|
|
||||||
"no-redeclare": "error",
|
|
||||||
"no-regex-spaces": "error",
|
|
||||||
"no-var": "error",
|
|
||||||
"prefer-const": "error",
|
|
||||||
"require-await": "error",
|
|
||||||
"require-yield": "error",
|
|
||||||
"typescript/adjacent-overload-signatures": "error",
|
|
||||||
"typescript/ban-ts-comment": "error",
|
|
||||||
"typescript/no-empty-interface": "error",
|
|
||||||
"typescript/no-empty-object-type": "error",
|
|
||||||
"typescript/no-explicit-any": "error",
|
|
||||||
"typescript/no-namespace": "error",
|
|
||||||
"typescript/no-non-null-asserted-optional-chain": "error",
|
|
||||||
"typescript/no-unsafe-function-type": "error",
|
|
||||||
"typescript/no-wrapper-object-types": "error",
|
|
||||||
"typescript/prefer-as-const": "error",
|
|
||||||
"typescript/prefer-namespace-keyword": "error",
|
|
||||||
"typescript/triple-slash-reference": "error",
|
|
||||||
// On Node, these come from an explicit `node:` import instead of the global scope.
|
// On Node, these come from an explicit `node:` import instead of the global scope.
|
||||||
"no-restricted-globals": [
|
"no-restricted-globals": [
|
||||||
"error",
|
"error",
|
||||||
@@ -209,47 +688,159 @@ const rules: DummyRuleMap = {
|
|||||||
"setImmediate",
|
"setImmediate",
|
||||||
"clearImmediate",
|
"clearImmediate",
|
||||||
],
|
],
|
||||||
// The explicit-types template's extras.
|
// Single capital type parameters, which explicit-types requires, may be one letter.
|
||||||
"import/no-cycle": "error",
|
"id-length": ["error", { exceptionPatterns: ["^[A-Z]$"] }],
|
||||||
// `../` is banned in every file; anything above a file needs a `#` alias.
|
// Option tweaks.
|
||||||
"import/no-relative-parent-imports": "error",
|
"one-var": ["error", "never"],
|
||||||
"typescript/consistent-type-imports": "error",
|
"no-use-before-define": ["error", { functions: false }],
|
||||||
"typescript/no-import-type-side-effects": "error",
|
"func-style": ["error", "declaration", { allowArrowFunctions: true }],
|
||||||
"typescript/no-non-null-assertion": "error",
|
"unicorn/import-style": ["error", { styles: { "node:path": { named: true } } }],
|
||||||
// No disable comments at all.
|
// Each limit is the smallest value the current code passes.
|
||||||
|
complexity: ["error", 26],
|
||||||
|
"max-depth": ["error", 6],
|
||||||
|
"max-lines": ["error", { max: 2048, skipBlankLines: false, skipComments: false }],
|
||||||
|
"max-lines-per-function": ["error", 98],
|
||||||
|
"max-params": ["error", 4],
|
||||||
|
"max-statements": ["error", 32],
|
||||||
|
"import/max-dependencies": ["error", { max: 13 }],
|
||||||
|
"unicorn/max-nested-calls": ["error", { max: 4 }],
|
||||||
|
// No lint suppression and only `.ts` imports, as in the plugin template.
|
||||||
"project/no-disable-comments": "error",
|
"project/no-disable-comments": "error",
|
||||||
"project/no-asset-imports": "error",
|
"project/no-asset-imports": "error",
|
||||||
"unicorn/no-abusive-eslint-disable": "error",
|
// Ports of the hugoalh `recommended` rules Oxlint lacks, and ASCII-only source.
|
||||||
// Size and complexity limits match Deno's: this repo's `deno lint` ran the
|
"project/prefer-ascii": "error",
|
||||||
// `recommended` set with no config file, so no size or complexity rule
|
"project/no-duplicate-typeofs": "error",
|
||||||
// applied and none applies here. Each Oxlint limit rule, from a category or
|
"project/no-empty-yield": "error",
|
||||||
// not, is off:
|
"project/no-nan": "error",
|
||||||
// - `complexity`: Deno had no `max-complexity`.
|
"project/no-unsafe-number": "error",
|
||||||
// - `max-lines`: Deno had no `max-file-lines`.
|
"project/no-useless-continue": "error",
|
||||||
// - `max-params`: Deno had no `max-params`.
|
"project/no-duplicate-interfaces": "error",
|
||||||
// - `id-length`: Deno had no `max-identifier-length`.
|
"project/no-duplicate-types": "error",
|
||||||
// - `no-nested-ternary`: Deno had no `max-nest-ternaries`.
|
"project/no-modifier-private": "error",
|
||||||
// - `max-lines-per-function`, `max-classes-per-file`, `max-depth`,
|
"project/no-useless-type": "error",
|
||||||
// `max-nested-callbacks`, `max-statements`, `import/max-dependencies`,
|
// Off, collides with a repo or plugin rule, Oxfmt, or another category rule:
|
||||||
// `unicorn/max-nested-calls`: Deno had none of these.
|
// Collides with `#private`: members are public unless marked so.
|
||||||
complexity: "off",
|
"typescript/explicit-member-accessibility": "off",
|
||||||
"max-lines": "off",
|
// Collides with `typescript/prefer-readonly-parameter-types` being off.
|
||||||
"max-params": "off",
|
"typescript/prefer-readonly": "off",
|
||||||
"id-length": "off",
|
// Collides with Node's and the web's mutable types (`Response`, `Stats`).
|
||||||
"no-nested-ternary": "off",
|
|
||||||
"max-lines-per-function": "off",
|
|
||||||
"max-classes-per-file": "off",
|
|
||||||
"max-depth": "off",
|
|
||||||
"max-nested-callbacks": "off",
|
|
||||||
"max-statements": "off",
|
|
||||||
"import/max-dependencies": "off",
|
|
||||||
"unicorn/max-nested-calls": "off",
|
|
||||||
// Pedantic, but Node's and the web's own types (`Response`, `Stats`,
|
|
||||||
// `RequestInit`) are mutable, so no parameter of theirs can pass; the
|
|
||||||
// explicit-types template and the app repos turn it off too.
|
|
||||||
"typescript/prefer-readonly-parameter-types": "off",
|
"typescript/prefer-readonly-parameter-types": "off",
|
||||||
|
// Collides with explicit-types `no-utility-types`, which bans `Record`.
|
||||||
|
"typescript/consistent-indexed-object-style": "off",
|
||||||
|
// Collides with explicitly annotated declarations.
|
||||||
|
"typescript/no-inferrable-types": "off",
|
||||||
|
// Collides with import-structure `enforce-import-order`.
|
||||||
|
"sort-imports": "off",
|
||||||
|
// Collides with import-structure `enforce-mod-file` barrels.
|
||||||
|
"oxc/no-barrel-file": "off",
|
||||||
|
// Collides with exporting each declaration where it stands.
|
||||||
|
"import/group-exports": "off",
|
||||||
|
// Collides with exporting each declaration where it stands.
|
||||||
|
"import/exports-last": "off",
|
||||||
|
// Collides with `import/no-default-export`.
|
||||||
|
"import/prefer-default-export": "off",
|
||||||
|
// Collides with `unicorn/prefer-ternary`.
|
||||||
|
"no-ternary": "off",
|
||||||
|
// Collides with `require-await` and `promise-function-async`.
|
||||||
|
"oxc/no-async-await": "off",
|
||||||
|
// Collides with `typescript/prefer-optional-chain`.
|
||||||
|
"oxc/no-optional-chaining": "off",
|
||||||
|
// Collides with file mode checks such as `mode & 0o077`.
|
||||||
|
"no-bitwise": "off",
|
||||||
|
// Collides with explicit-types `no-optional-null`, which makes `undefined` the absent value.
|
||||||
|
"no-undefined": "off",
|
||||||
|
// Collides with `typescript/no-floating-promises`, which `void` satisfies.
|
||||||
|
"no-void": "off",
|
||||||
|
// Collides with JSON and Node APIs, which return `null`.
|
||||||
|
"unicorn/no-null": "off",
|
||||||
|
// Collides with `import/no-default-export`.
|
||||||
|
"import/no-named-export": "off",
|
||||||
|
// Collides with `typescript/consistent-type-imports`.
|
||||||
|
"import/consistent-type-specifier-style": "off",
|
||||||
|
// Collides with literal Gitea Actions `${{ }}` expressions in workflow strings.
|
||||||
|
"no-template-curly-in-string": "off",
|
||||||
|
// Node code, everywhere: this action runs on Node.
|
||||||
|
// Node built-ins are the action's runtime.
|
||||||
|
"import/no-nodejs-modules": "off",
|
||||||
|
// Command-line entry points set their exit status.
|
||||||
|
"unicorn/no-process-exit": "off",
|
||||||
|
// The action reports to the job log through the console.
|
||||||
|
"no-console": "off",
|
||||||
|
// Sequential awaits are intentional; workarounds cost more than they save.
|
||||||
|
"no-await-in-loop": "off",
|
||||||
|
// Not type-aware; TypeScript's `noImplicitReturns` covers it.
|
||||||
|
"consistent-return": "off",
|
||||||
|
// TypeScript's type checking covers exhaustive switches.
|
||||||
|
"typescript/switch-exhaustiveness-check": "off",
|
||||||
|
// A `default` on a switch over a union would hide a new member from TS.
|
||||||
|
"default-case": "off",
|
||||||
|
// Off, too much churn:
|
||||||
|
// Literal numbers read better than a constant per use.
|
||||||
|
"no-magic-numbers": "off",
|
||||||
|
// Keys follow meaning, not the alphabet.
|
||||||
|
"sort-keys": "off",
|
||||||
|
// Comments may start with code or lowercase identifiers.
|
||||||
|
"capitalized-comments": "off",
|
||||||
|
// explicit-types `require-return-type` covers return types.
|
||||||
|
"typescript/explicit-function-return-type": "off",
|
||||||
|
// explicit-types `require-return-type` covers return types.
|
||||||
|
"typescript/explicit-module-boundary-types": "off",
|
||||||
|
// Empty callbacks are legitimate no-ops.
|
||||||
|
"no-empty-function": "off",
|
||||||
|
// Methods may not need `this`.
|
||||||
|
"class-methods-use-this": "off",
|
||||||
|
// Braces only where a case declares.
|
||||||
|
"unicorn/switch-case-braces": "off",
|
||||||
|
// Plain property reads are fine.
|
||||||
|
"prefer-destructuring": "off",
|
||||||
|
// Object rest and spread are idiomatic.
|
||||||
|
"oxc/no-rest-spread-properties": "off",
|
||||||
|
// Short numbers need no separators.
|
||||||
|
"unicorn/numeric-separators-style": "off",
|
||||||
|
// `continue` keeps loop bodies flat.
|
||||||
|
"no-continue": "off",
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/** Node code (`vite.config.ts` and `scripts/`): the first `projectOverrides` entry. */
|
||||||
|
const nodeRules: DummyRuleMap = {
|
||||||
|
// Vite and the Oxlint plugin host read a default export.
|
||||||
|
"import/no-default-export": "off",
|
||||||
|
// Node code: tooling imports Node's built-ins.
|
||||||
|
"import/no-nodejs-modules": "off",
|
||||||
|
// Node code: a CLI exits with a status.
|
||||||
|
"unicorn/no-process-exit": "off",
|
||||||
|
// Node code: a CLI reports through the console.
|
||||||
|
"no-console": "off",
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The whole `overrides` array of `vite.config.ts`: the Node code entry first,
|
||||||
|
* then each per-file exception, each with a comment saying why. Later entries
|
||||||
|
* win over earlier ones, and all of them over `rules`.
|
||||||
|
*/
|
||||||
|
export const projectOverrides: OxlintOverride[] = [
|
||||||
|
{
|
||||||
|
files: ["vite.config.ts", "scripts/**"],
|
||||||
|
rules: nodeRules,
|
||||||
|
},
|
||||||
|
// exitCode must return the promise it marks handled; an async wrapper's
|
||||||
|
// promise would reject unhandled before callers await it.
|
||||||
|
{
|
||||||
|
files: ["src/processes/child.ts"],
|
||||||
|
rules: { "typescript/promise-function-async": "off" },
|
||||||
|
},
|
||||||
|
// Posted Gitea text shows emoji verdict marks and a middle dot.
|
||||||
|
{
|
||||||
|
files: [
|
||||||
|
"src/post/post.ts",
|
||||||
|
"src/post/post.test.ts",
|
||||||
|
"src/profiles/profiles.ts",
|
||||||
|
"src/profiles/profiles.test.ts",
|
||||||
|
],
|
||||||
|
rules: { "project/prefer-ascii": "off" },
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The repo-local plugin, namespace `project`: its own rules, enabled as
|
* The repo-local plugin, namespace `project`: its own rules, enabled as
|
||||||
* `project/<rule>`, and `configs.project`, the rule list above.
|
* `project/<rule>`, and `configs.project`, the rule list above.
|
||||||
@@ -259,6 +850,16 @@ const plugin = {
|
|||||||
rules: {
|
rules: {
|
||||||
"no-disable-comments": noDisableCommentsRule,
|
"no-disable-comments": noDisableCommentsRule,
|
||||||
"no-asset-imports": noAssetImportsRule,
|
"no-asset-imports": noAssetImportsRule,
|
||||||
|
"prefer-ascii": preferAsciiRule,
|
||||||
|
"no-duplicate-typeofs": noDuplicateTypeofsRule,
|
||||||
|
"no-empty-yield": noEmptyYieldRule,
|
||||||
|
"no-nan": noNanRule,
|
||||||
|
"no-unsafe-number": noUnsafeNumberRule,
|
||||||
|
"no-useless-continue": noUselessContinueRule,
|
||||||
|
"no-duplicate-interfaces": noDuplicateInterfacesRule,
|
||||||
|
"no-duplicate-types": noDuplicateTypesRule,
|
||||||
|
"no-modifier-private": noModifierPrivateRule,
|
||||||
|
"no-useless-type": noUselessTypeRule,
|
||||||
},
|
},
|
||||||
configs: { project: { rules } },
|
configs: { project: { rules } },
|
||||||
};
|
};
|
||||||
|
|||||||
+31
-26
@@ -16,14 +16,16 @@ test("retries once after an invalid refresh token", async () => {
|
|||||||
let attempts = 0;
|
let attempts = 0;
|
||||||
let relogins = 0;
|
let relogins = 0;
|
||||||
const result = await retryInvalidToken(
|
const result = await retryInvalidToken(
|
||||||
() =>
|
async () => {
|
||||||
Promise.resolve({
|
const resolved = await Promise.resolve({
|
||||||
code: 1,
|
code: 1,
|
||||||
error: attempts++ === 0 ? "ERROR: invalid_refresh_token" : "still failed",
|
error: (attempts += 1) === 1 ? "ERROR: invalid_refresh_token" : "still failed",
|
||||||
}),
|
});
|
||||||
() => {
|
return resolved;
|
||||||
relogins++;
|
},
|
||||||
return Promise.resolve();
|
async () => {
|
||||||
|
relogins += 1;
|
||||||
|
await Promise.resolve();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -38,16 +40,17 @@ test("does not retry an unrelated failure", async () => {
|
|||||||
let attempts = 0;
|
let attempts = 0;
|
||||||
let relogins = 0;
|
let relogins = 0;
|
||||||
await retryInvalidToken(
|
await retryInvalidToken(
|
||||||
() => {
|
async () => {
|
||||||
attempts++;
|
attempts += 1;
|
||||||
return Promise.resolve({
|
const resolved = await Promise.resolve({
|
||||||
code: 1,
|
code: 1,
|
||||||
error: "rate limited",
|
error: "rate limited",
|
||||||
});
|
});
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
() => {
|
async () => {
|
||||||
relogins++;
|
relogins += 1;
|
||||||
return Promise.resolve();
|
await Promise.resolve();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -85,14 +88,16 @@ test("re-logs in after the job 9837 revoked-session stderr", async () => {
|
|||||||
let relogins = 0;
|
let relogins = 0;
|
||||||
let attempts = 0;
|
let attempts = 0;
|
||||||
const result = await retryInvalidToken(
|
const result = await retryInvalidToken(
|
||||||
() =>
|
async () => {
|
||||||
Promise.resolve({
|
const resolved = await Promise.resolve({
|
||||||
code: attempts++ > 0 ? 0 : 1,
|
code: (attempts += 1) > 1 ? 0 : 1,
|
||||||
error: attempts === 1 ? REVOKED_CODEX.join("\n") : "",
|
error: attempts === 1 ? REVOKED_CODEX.join("\n") : "",
|
||||||
}),
|
});
|
||||||
() => {
|
return resolved;
|
||||||
relogins++;
|
},
|
||||||
return Promise.resolve();
|
async () => {
|
||||||
|
relogins += 1;
|
||||||
|
await Promise.resolve();
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -144,7 +149,8 @@ test.skipIf(IS_WINDOWS)("stages and persists only a regular private Codex login"
|
|||||||
|
|
||||||
const staged = await stageCodexAuth(canonical, home, currentUid(), currentGid());
|
const staged = await stageCodexAuth(canonical, home, currentUid(), currentGid());
|
||||||
expect(await readFile(staged, "utf8")).toStrictEqual(AUTH);
|
expect(await readFile(staged, "utf8")).toStrictEqual(AUTH);
|
||||||
expect((await stat(staged)).mode & 0o777).toBe(0o600);
|
const stagedStat = await stat(staged);
|
||||||
|
expect(stagedStat.mode & 0o777).toBe(0o600);
|
||||||
|
|
||||||
const refreshed = JSON.stringify({
|
const refreshed = JSON.stringify({
|
||||||
auth_mode: "chatgpt",
|
auth_mode: "chatgpt",
|
||||||
@@ -153,7 +159,8 @@ test.skipIf(IS_WINDOWS)("stages and persists only a regular private Codex login"
|
|||||||
await writeFile(staged, refreshed);
|
await writeFile(staged, refreshed);
|
||||||
await persistCodexAuth(staged, canonical);
|
await persistCodexAuth(staged, canonical);
|
||||||
expect(await readFile(canonical, "utf8")).toStrictEqual(refreshed);
|
expect(await readFile(canonical, "utf8")).toStrictEqual(refreshed);
|
||||||
expect((await stat(canonical)).mode & 0o777).toBe(0o600);
|
const canonicalStat = await stat(canonical);
|
||||||
|
expect(canonicalStat.mode & 0o777).toBe(0o600);
|
||||||
} finally {
|
} finally {
|
||||||
await rm(root, { recursive: true });
|
await rm(root, { recursive: true });
|
||||||
}
|
}
|
||||||
@@ -169,10 +176,8 @@ test.skipIf(IS_WINDOWS)("rejects a symlink or malformed Codex login", async () =
|
|||||||
await writeFile(malformed, '{"tokens":{}}', { mode: 0o600 });
|
await writeFile(malformed, '{"tokens":{}}', { mode: 0o600 });
|
||||||
await symlink(canonical, linked);
|
await symlink(canonical, linked);
|
||||||
|
|
||||||
await expect(() => persistCodexAuth(linked, canonical)).rejects.toThrow("regular file");
|
await expect(persistCodexAuth(linked, canonical)).rejects.toThrow("regular file");
|
||||||
await expect(() => persistCodexAuth(malformed, canonical)).rejects.toThrow(
|
await expect(persistCodexAuth(malformed, canonical)).rejects.toThrow("invalid Codex login");
|
||||||
"invalid Codex login",
|
|
||||||
);
|
|
||||||
} finally {
|
} finally {
|
||||||
await rm(root, { recursive: true });
|
await rm(root, { recursive: true });
|
||||||
}
|
}
|
||||||
|
|||||||
+13
-10
@@ -12,7 +12,7 @@ import {
|
|||||||
} from "node:fs/promises";
|
} from "node:fs/promises";
|
||||||
import { dirname, join } from "node:path";
|
import { dirname, join } from "node:path";
|
||||||
|
|
||||||
import { isNotFound, isObject } from "#common";
|
import { field, isNotFound, isObject } from "#common";
|
||||||
|
|
||||||
interface CodexApiKey {
|
interface CodexApiKey {
|
||||||
kind: "api-key";
|
kind: "api-key";
|
||||||
@@ -83,21 +83,22 @@ async function readCodexAuth(path: string): Promise<string> {
|
|||||||
throw new Error("Codex login must be private");
|
throw new Error("Codex login must be private");
|
||||||
}
|
}
|
||||||
const text = await readFile(path, "utf8");
|
const text = await readFile(path, "utf8");
|
||||||
let value: unknown;
|
let value: unknown = null;
|
||||||
try {
|
try {
|
||||||
value = JSON.parse(text);
|
value = JSON.parse(text);
|
||||||
} catch {
|
} catch {
|
||||||
throw new Error("invalid Codex login");
|
throw new Error("invalid Codex login");
|
||||||
}
|
}
|
||||||
const tokens = isObject(value) ? value["tokens"] : undefined;
|
const authMode = field(value, "auth_mode");
|
||||||
|
const tokens = field(value, "tokens");
|
||||||
if (
|
if (
|
||||||
!isObject(value) ||
|
typeof authMode !== "string" ||
|
||||||
typeof value["auth_mode"] !== "string" ||
|
authMode === "" ||
|
||||||
value["auth_mode"] === "" ||
|
|
||||||
!isObject(tokens) ||
|
!isObject(tokens) ||
|
||||||
!["access_token", "refresh_token", "id_token", "account_id"].every(
|
!["access_token", "refresh_token", "id_token", "account_id"].every((name) => {
|
||||||
(name) => typeof tokens[name] === "string" && tokens[name] !== "",
|
const token = field(tokens, name);
|
||||||
)
|
return typeof token === "string" && token !== "";
|
||||||
|
})
|
||||||
) {
|
) {
|
||||||
throw new Error("invalid Codex login");
|
throw new Error("invalid Codex login");
|
||||||
}
|
}
|
||||||
@@ -120,7 +121,9 @@ export async function stageCodexAuth(
|
|||||||
await chmod(stagedPath, 0o600);
|
await chmod(stagedPath, 0o600);
|
||||||
await chown(stagedPath, uid, gid);
|
await chown(stagedPath, uid, gid);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (!isNotFound(error)) throw error;
|
if (!isNotFound(error)) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return stagedPath;
|
return stagedPath;
|
||||||
}
|
}
|
||||||
|
|||||||
+22
-14
@@ -1,4 +1,4 @@
|
|||||||
import { isObject } from "#common";
|
import { field, isObject } from "#common";
|
||||||
import { AgentAuthError } from "#profiles";
|
import { AgentAuthError } from "#profiles";
|
||||||
|
|
||||||
export function openCodeArgs(model: string, prompt: string): string[] {
|
export function openCodeArgs(model: string, prompt: string): string[] {
|
||||||
@@ -49,20 +49,23 @@ export async function collectOpenCodeOutput(
|
|||||||
export function openCodeError(output: string): Error | null {
|
export function openCodeError(output: string): Error | null {
|
||||||
let failure: Error | null = null;
|
let failure: Error | null = null;
|
||||||
for (const line of output.split("\n")) {
|
for (const line of output.split("\n")) {
|
||||||
if (line.trim() === "") continue;
|
if (line.trim() === "") {
|
||||||
let event: unknown;
|
continue;
|
||||||
|
}
|
||||||
|
let event: unknown = null;
|
||||||
try {
|
try {
|
||||||
event = JSON.parse(line);
|
event = JSON.parse(line);
|
||||||
} catch {
|
} catch {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if (!isObject(event)) continue;
|
const error = field(event, "error");
|
||||||
const { type, error } = event;
|
if (field(event, "type") !== "error" || !isObject(error)) {
|
||||||
if (type !== "error" || !isObject(error)) {
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
const { name, data } = error;
|
const name = field(error, "name");
|
||||||
const { message, statusCode } = isObject(data) ? data : {};
|
const data = field(error, "data");
|
||||||
|
const message = field(data, "message");
|
||||||
|
const statusCode = field(data, "statusCode");
|
||||||
const detail = `opencode ${typeof name === "string" ? name : "error"}${
|
const detail = `opencode ${typeof name === "string" ? name : "error"}${
|
||||||
typeof statusCode === "number" ? ` (API error ${statusCode})` : ""
|
typeof statusCode === "number" ? ` (API error ${statusCode})` : ""
|
||||||
}: ${typeof message === "string" ? message : "unknown error"}`;
|
}: ${typeof message === "string" ? message : "unknown error"}`;
|
||||||
@@ -79,13 +82,18 @@ export function openCodeError(output: string): Error | null {
|
|||||||
export function parseOpenCodeEvents(output: string): string {
|
export function parseOpenCodeEvents(output: string): string {
|
||||||
let result: string | null = null;
|
let result: string | null = null;
|
||||||
for (const line of output.split("\n")) {
|
for (const line of output.split("\n")) {
|
||||||
if (line.trim() === "") continue;
|
if (line.trim() === "") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
const event: unknown = JSON.parse(line);
|
const event: unknown = JSON.parse(line);
|
||||||
if (!isObject(event)) continue;
|
const part = field(event, "part");
|
||||||
const { type, part } = event;
|
if (field(event, "type") !== "text" || !isObject(part)) {
|
||||||
if (type !== "text" || !isObject(part)) continue;
|
continue;
|
||||||
const { text } = part;
|
}
|
||||||
if (typeof text === "string" && text.trim() !== "") result = text;
|
const text = field(part, "text");
|
||||||
|
if (typeof text === "string" && text.trim() !== "") {
|
||||||
|
result = text;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (result === null) {
|
if (result === null) {
|
||||||
throw openCodeError(output) ?? new Error("OpenCode produced no text output");
|
throw openCodeError(output) ?? new Error("OpenCode produced no text output");
|
||||||
|
|||||||
+1
-2
@@ -1,4 +1,3 @@
|
|||||||
// Helpers every phase shares: error and JSON value checks.
|
// Helpers every phase shares: error and JSON value checks.
|
||||||
export { isNotFound } from "./errors.ts";
|
export { isNotFound } from "./errors.ts";
|
||||||
export { isMapping, isObject } from "./json.ts";
|
export { field, isMapping, isObject } from "./json.ts";
|
||||||
export type { JsonObject } from "./json.ts";
|
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
import { expect, test } from "vite-plus/test";
|
||||||
|
|
||||||
|
import { field, isMapping, isObject } from "./json.ts";
|
||||||
|
|
||||||
|
test("reads a named field of a parsed object", () => {
|
||||||
|
const value: unknown = JSON.parse('{"login":"bot","user":{"login":"nested"}}');
|
||||||
|
expect(field(value, "login")).toBe("bot");
|
||||||
|
expect(field(field(value, "user"), "login")).toBe("nested");
|
||||||
|
expect(field(value, "missing")).toBeUndefined();
|
||||||
|
});
|
||||||
|
|
||||||
|
test("reads no field of a value that is not an object", () => {
|
||||||
|
for (const value of [null, undefined, "text", 1, true]) {
|
||||||
|
expect(field(value, "login")).toBeUndefined();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test("counts arrays as objects but not as mappings", () => {
|
||||||
|
expect(isObject([])).toBe(true);
|
||||||
|
expect(isMapping([])).toBe(false);
|
||||||
|
expect(isMapping({})).toBe(true);
|
||||||
|
expect(field(["first"], "0")).toBe("first");
|
||||||
|
});
|
||||||
+12
-5
@@ -1,12 +1,19 @@
|
|||||||
// Type guards for values read from JSON, which arrive as `unknown`.
|
// Checks and field reads for values parsed from JSON, which arrive as
|
||||||
export type JsonObject = NodeJS.Dict<unknown>;
|
// `unknown`. Callers read the fields they know by name into their own
|
||||||
|
// declared interfaces.
|
||||||
|
|
||||||
// Any non-null object, arrays included: reading a missing key yields undefined.
|
// Any non-null object, arrays included.
|
||||||
export function isObject(value: unknown): value is JsonObject {
|
export function isObject(value: unknown): value is object {
|
||||||
return typeof value === "object" && value !== null;
|
return typeof value === "object" && value !== null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// A plain mapping, which an array is not.
|
// A plain mapping, which an array is not.
|
||||||
export function isMapping(value: unknown): value is JsonObject {
|
export function isMapping(value: unknown): value is object {
|
||||||
return isObject(value) && !Array.isArray(value);
|
return isObject(value) && !Array.isArray(value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The named field of an object, or undefined for a missing field or a value
|
||||||
|
// that is not an object.
|
||||||
|
export function field(value: unknown, name: string): unknown {
|
||||||
|
return isObject(value) ? Reflect.get(value, name) : undefined;
|
||||||
|
}
|
||||||
|
|||||||
+3
-1
@@ -8,7 +8,9 @@ export { type Fetcher, type PostContext, postRuntime } from "./post.ts";
|
|||||||
|
|
||||||
function required(name: string): string {
|
function required(name: string): string {
|
||||||
const value = process.env[name];
|
const value = process.env[name];
|
||||||
if (value === undefined || value === "") throw new Error(`${name} is not set`);
|
if (value === undefined || value === "") {
|
||||||
|
throw new Error(`${name} is not set`);
|
||||||
|
}
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+63
-47
@@ -45,9 +45,15 @@ async function writeArtifacts(
|
|||||||
review?: string,
|
review?: string,
|
||||||
anchors?: unknown,
|
anchors?: unknown,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
if (!outcome.ok) return;
|
if (!outcome.ok) {
|
||||||
if (review !== undefined) await writePrivate(outcome.reviewPath, review);
|
return;
|
||||||
if (anchors !== undefined) await writePrivate(outcome.anchorsPath, JSON.stringify(anchors));
|
}
|
||||||
|
if (review !== undefined) {
|
||||||
|
await writePrivate(outcome.reviewPath, review);
|
||||||
|
}
|
||||||
|
if (anchors !== undefined) {
|
||||||
|
await writePrivate(outcome.anchorsPath, JSON.stringify(anchors));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function manifestFor(runtimeDir: string, profileHome: string): RuntimeManifest {
|
function manifestFor(runtimeDir: string, profileHome: string): RuntimeManifest {
|
||||||
@@ -59,7 +65,7 @@ function manifestFor(runtimeDir: string, profileHome: string): RuntimeManifest {
|
|||||||
profiles: [
|
profiles: [
|
||||||
{
|
{
|
||||||
index: 0,
|
index: 0,
|
||||||
type: "claude",
|
type: "CLAUDE",
|
||||||
model: "test",
|
model: "test",
|
||||||
uid: currentUid(),
|
uid: currentUid(),
|
||||||
gid: currentGid(),
|
gid: currentGid(),
|
||||||
@@ -83,7 +89,7 @@ async function fixture(
|
|||||||
const outcome: RuntimeOutcome = source.ok
|
const outcome: RuntimeOutcome = source.ok
|
||||||
? {
|
? {
|
||||||
...source,
|
...source,
|
||||||
profile: { type: "codex", model: "gpt-test" },
|
profile: { type: "CODEX", model: "gpt-test" },
|
||||||
reviewPath: `${profileHome}/review.md`,
|
reviewPath: `${profileHome}/review.md`,
|
||||||
anchorsPath: `${profileHome}/anchors.json`,
|
anchorsPath: `${profileHome}/anchors.json`,
|
||||||
}
|
}
|
||||||
@@ -106,7 +112,9 @@ const missing = async (path: string): Promise<boolean> => {
|
|||||||
await stat(path);
|
await stat(path);
|
||||||
return false;
|
return false;
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (isNotFound(error)) return true;
|
if (isNotFound(error)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -118,9 +126,10 @@ function requestBody(init?: RequestInit): unknown {
|
|||||||
|
|
||||||
// A fake Gitea that records each request body and answers with `status`.
|
// A fake Gitea that records each request body and answers with `status`.
|
||||||
function recordingFetch(bodies: unknown[], status = 201): Fetcher {
|
function recordingFetch(bodies: unknown[], status = 201): Fetcher {
|
||||||
return (_url, init) => {
|
return async (_url, init) => {
|
||||||
bodies.push(requestBody(init));
|
bodies.push(requestBody(init));
|
||||||
return Promise.resolve(new Response(null, { status }));
|
const resolved = await Promise.resolve(new Response(null, { status }));
|
||||||
|
return resolved;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,16 +137,17 @@ test("posts a successful issue result and removes runtime credentials", async ()
|
|||||||
const result = await fixture({ ok: true, body: "done" });
|
const result = await fixture({ ok: true, body: "done" });
|
||||||
const requests: RecordedRequest[] = [];
|
const requests: RecordedRequest[] = [];
|
||||||
|
|
||||||
await postRuntime(result.manifestPath, context, (url, init) => {
|
await postRuntime(result.manifestPath, context, async (url, init) => {
|
||||||
requests.push({ url, init });
|
requests.push({ url, init });
|
||||||
return Promise.resolve(new Response(null, { status: 201 }));
|
const resolved = await Promise.resolve(new Response(null, { status: 201 }));
|
||||||
|
return resolved;
|
||||||
});
|
});
|
||||||
|
|
||||||
expect(requests.length).toBe(1);
|
expect(requests.length).toBe(1);
|
||||||
const [request] = requests;
|
const [request] = requests;
|
||||||
expect(request?.url).toStrictEqual(`${context.apiUrl}/repos/owner/repo/issues/7/comments`);
|
expect(request?.url).toStrictEqual(`${context.apiUrl}/repos/owner/repo/issues/7/comments`);
|
||||||
expect(requestBody(request?.init)).toStrictEqual({
|
expect(requestBody(request?.init)).toStrictEqual({
|
||||||
body: "done\n\n> Profile: `codex` · `gpt-test`",
|
body: "done\n\n> Profile: `CODEX` · `gpt-test`",
|
||||||
});
|
});
|
||||||
expect(request?.init?.headers).toStrictEqual({
|
expect(request?.init?.headers).toStrictEqual({
|
||||||
Authorization: "token reviewer-secret",
|
Authorization: "token reviewer-secret",
|
||||||
@@ -148,7 +158,7 @@ test("posts a successful issue result and removes runtime credentials", async ()
|
|||||||
|
|
||||||
test("retries a rejected inline review without anchors", async () => {
|
test("retries a rejected inline review without anchors", async () => {
|
||||||
const result = await fixture({ ok: true, body: "ignored final response" }, "Approved\nReady", [
|
const result = await fixture({ ok: true, body: "ignored final response" }, "Approved\nReady", [
|
||||||
{ path: "run.ts", line: 1, side: "new", body: "Finding" },
|
{ path: "run.ts", line: 1, side: "NEW", body: "Finding" },
|
||||||
]);
|
]);
|
||||||
const bodies: unknown[] = [];
|
const bodies: unknown[] = [];
|
||||||
|
|
||||||
@@ -158,18 +168,21 @@ test("retries a rejected inline review without anchors", async () => {
|
|||||||
...context,
|
...context,
|
||||||
eventName: "pull_request",
|
eventName: "pull_request",
|
||||||
},
|
},
|
||||||
(_url, init) => {
|
async (_url, init) => {
|
||||||
bodies.push(requestBody(init));
|
bodies.push(requestBody(init));
|
||||||
return Promise.resolve(new Response(null, { status: bodies.length === 1 ? 422 : 200 }));
|
const resolved = await Promise.resolve(
|
||||||
|
new Response(null, { status: bodies.length === 1 ? 422 : 200 }),
|
||||||
|
);
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(bodies[0]).toMatchObject({
|
expect(bodies[0]).toMatchObject({
|
||||||
comments: [{ body: "Finding\n\n> Profile: `codex` · `gpt-test`" }],
|
comments: [{ body: "Finding\n\n> Profile: `CODEX` · `gpt-test`" }],
|
||||||
});
|
});
|
||||||
expect(bodies[1]).toMatchObject({
|
expect(bodies[1]).toMatchObject({
|
||||||
comments: [],
|
comments: [],
|
||||||
body: "✅ Approved\nReady\n\n> Profile: `codex` · `gpt-test`",
|
body: "✅ Approved\nReady\n\n> Profile: `CODEX` · `gpt-test`",
|
||||||
});
|
});
|
||||||
assert(await missing(result.runtimeDir));
|
assert(await missing(result.runtimeDir));
|
||||||
});
|
});
|
||||||
@@ -178,23 +191,23 @@ test("reports each tried profile and keeps the action failed", async () => {
|
|||||||
const result = await fixture({
|
const result = await fixture({
|
||||||
ok: false,
|
ok: false,
|
||||||
failures: [
|
failures: [
|
||||||
{ type: "codex", model: "gpt-test", reason: "sign-in failed" },
|
{ type: "CODEX", model: "gpt-test", reason: "SIGN_IN_FAILED" },
|
||||||
{ type: "claude", model: "claude-test", reason: "usage exhausted" },
|
{ type: "CLAUDE", model: "claude-test", reason: "USAGE_EXHAUSTED" },
|
||||||
{ type: "opencode", model: "openrouter/test", reason: "failed" },
|
{ type: "OPENCODE", model: "openrouter/test", reason: "FAILED" },
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
const bodies: unknown[] = [];
|
const bodies: unknown[] = [];
|
||||||
|
|
||||||
await expect(() =>
|
await expect(postRuntime(result.manifestPath, context, recordingFetch(bodies))).rejects.toThrow(
|
||||||
postRuntime(result.manifestPath, context, recordingFetch(bodies)),
|
"agent phase failed",
|
||||||
).rejects.toThrow("agent phase failed");
|
);
|
||||||
|
|
||||||
expect(bodies).toStrictEqual([
|
expect(bodies).toStrictEqual([
|
||||||
{
|
{
|
||||||
body:
|
body:
|
||||||
"AI bot failed.\n\n> Tried: `codex` · `gpt-test` (sign-in failed), " +
|
"AI bot failed.\n\n> Tried: `CODEX` · `gpt-test` (sign-in failed), " +
|
||||||
"`claude` · `claude-test` (usage exhausted), " +
|
"`CLAUDE` · `claude-test` (usage exhausted), " +
|
||||||
"`opencode` · `openrouter/test` (failed)",
|
"`OPENCODE` · `openrouter/test` (failed)",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
assert(!JSON.stringify(bodies).includes("reviewer-secret"));
|
assert(!JSON.stringify(bodies).includes("reviewer-secret"));
|
||||||
@@ -208,21 +221,21 @@ test("drops failure entries that are not known labels", async () => {
|
|||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
ok: false,
|
ok: false,
|
||||||
failures: [
|
failures: [
|
||||||
{ type: "codex", model: "gpt-test", reason: "token sk-secret leaked" },
|
{ type: "CODEX", model: "gpt-test", reason: "token sk-secret leaked" },
|
||||||
{ type: "shell", model: "x", reason: "failed" },
|
{ type: "shell", model: "x", reason: "FAILED" },
|
||||||
{ type: "claude", model: "claude-test", reason: "sign-in failed" },
|
{ type: "CLAUDE", model: "claude-test", reason: "SIGN_IN_FAILED" },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
const bodies: unknown[] = [];
|
const bodies: unknown[] = [];
|
||||||
|
|
||||||
await expect(() =>
|
await expect(postRuntime(result.manifestPath, context, recordingFetch(bodies))).rejects.toThrow(
|
||||||
postRuntime(result.manifestPath, context, recordingFetch(bodies)),
|
"agent phase failed",
|
||||||
).rejects.toThrow("agent phase failed");
|
);
|
||||||
|
|
||||||
expect(bodies).toStrictEqual([
|
expect(bodies).toStrictEqual([
|
||||||
{
|
{
|
||||||
body: "AI bot failed.\n\n> Tried: `claude` · `claude-test` (sign-in failed)",
|
body: "AI bot failed.\n\n> Tried: `CLAUDE` · `claude-test` (sign-in failed)",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
@@ -232,9 +245,9 @@ test("reports a generic failure when the runner wrote no outcome", async () => {
|
|||||||
await rm(result.outcomeFile);
|
await rm(result.outcomeFile);
|
||||||
const bodies: unknown[] = [];
|
const bodies: unknown[] = [];
|
||||||
|
|
||||||
await expect(() =>
|
await expect(postRuntime(result.manifestPath, context, recordingFetch(bodies))).rejects.toThrow(
|
||||||
postRuntime(result.manifestPath, context, recordingFetch(bodies)),
|
"agent phase failed",
|
||||||
).rejects.toThrow("agent phase failed");
|
);
|
||||||
|
|
||||||
expect(bodies).toStrictEqual([{ body: "AI bot failed.\n\n> Profile: none" }]);
|
expect(bodies).toStrictEqual([{ body: "AI bot failed.\n\n> Profile: none" }]);
|
||||||
assert(await missing(result.runtimeDir));
|
assert(await missing(result.runtimeDir));
|
||||||
@@ -243,10 +256,11 @@ test("reports a generic failure when the runner wrote no outcome", async () => {
|
|||||||
test("removes runtime credentials when posting fails", async () => {
|
test("removes runtime credentials when posting fails", async () => {
|
||||||
const result = await fixture({ ok: true, body: "done" });
|
const result = await fixture({ ok: true, body: "done" });
|
||||||
|
|
||||||
await expect(() =>
|
await expect(
|
||||||
postRuntime(result.manifestPath, context, () =>
|
postRuntime(result.manifestPath, context, async () => {
|
||||||
Promise.resolve(new Response("failed", { status: 500 })),
|
const resolved = await Promise.resolve(new Response("failed", { status: 500 }));
|
||||||
),
|
return resolved;
|
||||||
|
}),
|
||||||
).rejects.toThrow("500");
|
).rejects.toThrow("500");
|
||||||
assert(await missing(result.runtimeDir));
|
assert(await missing(result.runtimeDir));
|
||||||
});
|
});
|
||||||
@@ -255,10 +269,11 @@ test("preserves a Gitea transport failure without retrying a comment", async ()
|
|||||||
const result = await fixture({ ok: true, body: "done" });
|
const result = await fixture({ ok: true, body: "done" });
|
||||||
let requests = 0;
|
let requests = 0;
|
||||||
|
|
||||||
await expect(() =>
|
await expect(
|
||||||
postRuntime(result.manifestPath, context, () => {
|
postRuntime(result.manifestPath, context, async () => {
|
||||||
requests += 1;
|
requests += 1;
|
||||||
return Promise.reject(new Error(`network failure ${requests}`));
|
await Promise.resolve();
|
||||||
|
throw new Error(`network failure ${requests}`);
|
||||||
}),
|
}),
|
||||||
).rejects.toThrow("network failure 1");
|
).rejects.toThrow("network failure 1");
|
||||||
|
|
||||||
@@ -271,10 +286,11 @@ test.skipIf(IS_WINDOWS)("refuses to follow an agent artifact symlink", async ()
|
|||||||
await symlink(result.reviewerFile, result.reviewPath);
|
await symlink(result.reviewerFile, result.reviewPath);
|
||||||
let requests = 0;
|
let requests = 0;
|
||||||
|
|
||||||
await expect(() =>
|
await expect(
|
||||||
postRuntime(result.manifestPath, context, () => {
|
postRuntime(result.manifestPath, context, async () => {
|
||||||
requests += 1;
|
requests += 1;
|
||||||
return Promise.resolve(new Response(null, { status: 200 }));
|
const resolved = await Promise.resolve(new Response(null, { status: 200 }));
|
||||||
|
return resolved;
|
||||||
}),
|
}),
|
||||||
).rejects.toThrow("regular private file");
|
).rejects.toThrow("regular private file");
|
||||||
|
|
||||||
@@ -286,7 +302,7 @@ test("reports an attributed failure when a pull request review is missing", asyn
|
|||||||
const result = await fixture({ ok: true, body: "done" });
|
const result = await fixture({ ok: true, body: "done" });
|
||||||
const bodies: unknown[] = [];
|
const bodies: unknown[] = [];
|
||||||
|
|
||||||
await expect(() =>
|
await expect(
|
||||||
postRuntime(
|
postRuntime(
|
||||||
result.manifestPath,
|
result.manifestPath,
|
||||||
{
|
{
|
||||||
@@ -299,7 +315,7 @@ test("reports an attributed failure when a pull request review is missing", asyn
|
|||||||
|
|
||||||
expect(bodies).toStrictEqual([
|
expect(bodies).toStrictEqual([
|
||||||
{
|
{
|
||||||
body: "AI bot failed.\n\n> Tried: `codex` · `gpt-test` (failed)",
|
body: "AI bot failed.\n\n> Tried: `CODEX` · `gpt-test` (failed)",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
assert(await missing(result.runtimeDir));
|
assert(await missing(result.runtimeDir));
|
||||||
|
|||||||
+74
-51
@@ -2,7 +2,7 @@ import type { Stats } from "node:fs";
|
|||||||
import { lstat, readFile, rm } from "node:fs/promises";
|
import { lstat, readFile, rm } from "node:fs/promises";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
|
||||||
import { isNotFound, isObject } from "#common";
|
import { field, isNotFound, isObject } from "#common";
|
||||||
import { failureFooter, type FailureReason, type ProfileFailure, withProfile } from "#profiles";
|
import { failureFooter, type FailureReason, type ProfileFailure, withProfile } from "#profiles";
|
||||||
import { readRuntimeManifest, type RuntimeManifest, type RuntimeOutcome } from "#runtime";
|
import { readRuntimeManifest, type RuntimeManifest, type RuntimeOutcome } from "#runtime";
|
||||||
|
|
||||||
@@ -16,18 +16,18 @@ export interface PostContext {
|
|||||||
interface Anchor {
|
interface Anchor {
|
||||||
path: string;
|
path: string;
|
||||||
line: number;
|
line: number;
|
||||||
side: "new" | "old";
|
side: "NEW" | "OLD";
|
||||||
body: string;
|
body: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const ANSI = new RegExp(`${String.fromCodePoint(27)}\\[[0-9;]*[A-Za-z]`, "gu");
|
const ANSI = new RegExp(`${String.fromCodePoint(27)}\\[[0-9;]*[A-Za-z]`, "gu");
|
||||||
const stripAnsi = (text: string): string => text.replace(ANSI, "");
|
const stripAnsi = (text: string): string => text.replace(ANSI, "");
|
||||||
const VERDICTS: NodeJS.Dict<[event: string, mark: string]> = {
|
const VERDICTS = new Map<string, [event: string, mark: string]>([
|
||||||
Approved: ["APPROVED", "✅"],
|
["Approved", ["APPROVED", "✅"]],
|
||||||
"Changes requested": ["REQUEST_CHANGES", "🛑"],
|
["Changes requested", ["REQUEST_CHANGES", "🛑"]],
|
||||||
};
|
]);
|
||||||
const PROFILE_TYPES: Set<unknown> = new Set(["claude", "codex", "opencode"]);
|
const PROFILE_TYPES = new Set<unknown>(["CLAUDE", "CODEX", "OPENCODE"]);
|
||||||
const FAILURE_REASONS: Set<unknown> = new Set(["sign-in failed", "usage exhausted", "failed"]);
|
const FAILURE_REASONS = new Set<unknown>(["SIGN_IN_FAILED", "USAGE_EXHAUSTED", "FAILED"]);
|
||||||
const isProfileType = (value: unknown): value is ProfileFailure["type"] => PROFILE_TYPES.has(value);
|
const isProfileType = (value: unknown): value is ProfileFailure["type"] => PROFILE_TYPES.has(value);
|
||||||
const isFailureReason = (value: unknown): value is FailureReason => FAILURE_REASONS.has(value);
|
const isFailureReason = (value: unknown): value is FailureReason => FAILURE_REASONS.has(value);
|
||||||
const failureComment = (failures: ProfileFailure[]): string =>
|
const failureComment = (failures: ProfileFailure[]): string =>
|
||||||
@@ -36,25 +36,36 @@ const failureComment = (failures: ProfileFailure[]): string =>
|
|||||||
// The `fetch` subset the reviewer posts through, which tests replace.
|
// The `fetch` subset the reviewer posts through, which tests replace.
|
||||||
export type Fetcher = (url: string, init: RequestInit) => Promise<Response>;
|
export type Fetcher = (url: string, init: RequestInit) => Promise<Response>;
|
||||||
|
|
||||||
class GiteaRequestError extends Error {}
|
class GiteaRequestError extends Error {
|
||||||
|
constructor(message: string, options?: ErrorOptions) {
|
||||||
|
super(message, options);
|
||||||
|
this.name = "GiteaRequestError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function parseAnchors(text: string, sourcePath: string): Anchor[] {
|
function parseAnchors(text: string, sourcePath: string): Anchor[] {
|
||||||
const entries: unknown = JSON.parse(text);
|
const entries: unknown = JSON.parse(text);
|
||||||
if (!Array.isArray(entries)) throw new TypeError(`${sourcePath}: not an array`);
|
if (!Array.isArray(entries)) {
|
||||||
|
throw new TypeError(`${sourcePath}: not an array`);
|
||||||
|
}
|
||||||
return entries.map((entry: unknown, index) => {
|
return entries.map((entry: unknown, index) => {
|
||||||
const at = `${sourcePath}[${index}]`;
|
const at = `${sourcePath}[${index}]`;
|
||||||
if (!isObject(entry)) {
|
if (!isObject(entry)) {
|
||||||
throw new TypeError(`${at}: not an object`);
|
throw new TypeError(`${at}: not an object`);
|
||||||
}
|
}
|
||||||
const { path, line, side = "new", body } = entry;
|
const path = field(entry, "path");
|
||||||
|
const line = field(entry, "line");
|
||||||
|
const givenSide = field(entry, "side");
|
||||||
|
const side = givenSide === undefined ? "NEW" : givenSide;
|
||||||
|
const body = field(entry, "body");
|
||||||
if (typeof path !== "string" || path === "") {
|
if (typeof path !== "string" || path === "") {
|
||||||
throw new TypeError(`${at}.path: expected a repository path`);
|
throw new TypeError(`${at}.path: expected a repository path`);
|
||||||
}
|
}
|
||||||
if (typeof line !== "number" || !Number.isInteger(line) || line < 1) {
|
if (typeof line !== "number" || !Number.isInteger(line) || line < 1) {
|
||||||
throw new TypeError(`${at}.line: expected a line number`);
|
throw new TypeError(`${at}.line: expected a line number`);
|
||||||
}
|
}
|
||||||
if (side !== "new" && side !== "old") {
|
if (side !== "NEW" && side !== "OLD") {
|
||||||
throw new Error(`${at}.side: expected "new" or "old"`);
|
throw new Error(`${at}.side: expected "NEW" or "OLD"`);
|
||||||
}
|
}
|
||||||
if (typeof body !== "string" || body.trim() === "") {
|
if (typeof body !== "string" || body.trim() === "") {
|
||||||
throw new TypeError(`${at}.body: expected the finding`);
|
throw new TypeError(`${at}.body: expected the finding`);
|
||||||
@@ -68,43 +79,42 @@ async function readOutcome(path: string): Promise<RuntimeOutcome> {
|
|||||||
if (!isObject(value) || !("ok" in value)) {
|
if (!isObject(value) || !("ok" in value)) {
|
||||||
throw new Error("invalid agent outcome");
|
throw new Error("invalid agent outcome");
|
||||||
}
|
}
|
||||||
const outcome = value;
|
const ok = field(value, "ok");
|
||||||
if (outcome["ok"] === false) {
|
if (ok === false) {
|
||||||
// Only known labels reach the comment, never raw agent output.
|
// Only known labels reach the comment, never raw agent output.
|
||||||
const failures: unknown[] = Array.isArray(outcome["failures"]) ? outcome["failures"] : [];
|
const listed = field(value, "failures");
|
||||||
|
const failures: unknown[] = Array.isArray(listed) ? listed : [];
|
||||||
return {
|
return {
|
||||||
ok: false,
|
ok: false,
|
||||||
failures: failures.flatMap((entry: unknown) => {
|
failures: failures.flatMap((entry: unknown) => {
|
||||||
const { type, model, reason } = isObject(entry) ? entry : {};
|
const type = field(entry, "type");
|
||||||
|
const model = field(entry, "model");
|
||||||
|
const reason = field(entry, "reason");
|
||||||
return isProfileType(type) && typeof model === "string" && isFailureReason(reason)
|
return isProfileType(type) && typeof model === "string" && isFailureReason(reason)
|
||||||
? [{ type, model, reason }]
|
? [{ type, model, reason }]
|
||||||
: [];
|
: [];
|
||||||
}),
|
}),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
const body = field(value, "body");
|
||||||
|
const reviewPath = field(value, "reviewPath");
|
||||||
|
const anchorsPath = field(value, "anchorsPath");
|
||||||
|
const profile = field(value, "profile");
|
||||||
if (
|
if (
|
||||||
outcome["ok"] !== true ||
|
ok !== true ||
|
||||||
typeof outcome["body"] !== "string" ||
|
typeof body !== "string" ||
|
||||||
typeof outcome["reviewPath"] !== "string" ||
|
typeof reviewPath !== "string" ||
|
||||||
typeof outcome["anchorsPath"] !== "string" ||
|
typeof anchorsPath !== "string" ||
|
||||||
!isObject(outcome["profile"])
|
!isObject(profile)
|
||||||
) {
|
) {
|
||||||
throw new Error("invalid agent outcome");
|
throw new Error("invalid agent outcome");
|
||||||
}
|
}
|
||||||
const profile = outcome["profile"];
|
const type = field(profile, "type");
|
||||||
if (!isProfileType(profile["type"]) || typeof profile["model"] !== "string") {
|
const model = field(profile, "model");
|
||||||
|
if (!isProfileType(type) || typeof model !== "string") {
|
||||||
throw new Error("invalid agent outcome");
|
throw new Error("invalid agent outcome");
|
||||||
}
|
}
|
||||||
return {
|
return { ok: true, body, reviewPath, anchorsPath, profile: { type, model } };
|
||||||
ok: true,
|
|
||||||
body: outcome["body"],
|
|
||||||
reviewPath: outcome["reviewPath"],
|
|
||||||
anchorsPath: outcome["anchorsPath"],
|
|
||||||
profile: {
|
|
||||||
type: profile["type"],
|
|
||||||
model: profile["model"],
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async function readAgentArtifact(
|
async function readAgentArtifact(
|
||||||
@@ -113,12 +123,16 @@ async function readAgentArtifact(
|
|||||||
name: string,
|
name: string,
|
||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const profile = manifest.profiles.find((entry) => join(entry.home, name) === path);
|
const profile = manifest.profiles.find((entry) => join(entry.home, name) === path);
|
||||||
if (profile === undefined) throw new Error(`${name}: outside profile home`);
|
if (profile === undefined) {
|
||||||
let stat: Stats;
|
throw new Error(`${name}: outside profile home`);
|
||||||
|
}
|
||||||
|
let stat: Stats | null = null;
|
||||||
try {
|
try {
|
||||||
stat = await lstat(path);
|
stat = await lstat(path);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (isNotFound(error)) return null;
|
if (isNotFound(error)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
@@ -140,9 +154,10 @@ export async function postRuntime(
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const manifest = await readRuntimeManifest(manifestPath);
|
const manifest = await readRuntimeManifest(manifestPath);
|
||||||
try {
|
try {
|
||||||
const reviewerToken = (await readFile(manifest.reviewerFile, "utf8")).trim();
|
const reviewerText = await readFile(manifest.reviewerFile, "utf8");
|
||||||
|
const reviewerToken = reviewerText.trim();
|
||||||
const request = async (path: string, body: unknown): Promise<void> => {
|
const request = async (path: string, body: unknown): Promise<void> => {
|
||||||
let response: Response;
|
let response: Response | null = null;
|
||||||
try {
|
try {
|
||||||
response = await fetcher(`${context.apiUrl}/${path}`, {
|
response = await fetcher(`${context.apiUrl}/${path}`, {
|
||||||
method: "POST",
|
method: "POST",
|
||||||
@@ -160,12 +175,13 @@ export async function postRuntime(
|
|||||||
throw new GiteaRequestError(`${path}: ${response.status} ${await response.text()}`);
|
throw new GiteaRequestError(`${path}: ${response.status} ${await response.text()}`);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
const postComment = (body: string): Promise<void> =>
|
const postComment = async (body: string): Promise<void> => {
|
||||||
request(`repos/${context.repository}/issues/${context.issueIndex}/comments`, {
|
await request(`repos/${context.repository}/issues/${context.issueIndex}/comments`, {
|
||||||
body: stripAnsi(body),
|
body: stripAnsi(body),
|
||||||
});
|
});
|
||||||
|
};
|
||||||
|
|
||||||
let outcome: RuntimeOutcome;
|
let outcome: RuntimeOutcome | null = null;
|
||||||
try {
|
try {
|
||||||
outcome = await readOutcome(manifest.outcomeFile);
|
outcome = await readOutcome(manifest.outcomeFile);
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
@@ -188,11 +204,11 @@ export async function postRuntime(
|
|||||||
}
|
}
|
||||||
|
|
||||||
const [verdict = "", ...rest] = review.split("\n");
|
const [verdict = "", ...rest] = review.split("\n");
|
||||||
const [event, mark] = VERDICTS[verdict.trim()] ?? ["COMMENT", "💬"];
|
const [event, mark] = VERDICTS.get(verdict.trim()) ?? ["COMMENT", "💬"];
|
||||||
const anchorText = await readAgentArtifact(manifest, outcome.anchorsPath, "anchors.json");
|
const anchorText = await readAgentArtifact(manifest, outcome.anchorsPath, "anchors.json");
|
||||||
const anchors = anchorText === null ? [] : parseAnchors(anchorText, outcome.anchorsPath);
|
const anchors = anchorText === null ? [] : parseAnchors(anchorText, outcome.anchorsPath);
|
||||||
const postReview = (entries: Anchor[]): Promise<void> =>
|
const postReview = async (entries: Anchor[]): Promise<void> => {
|
||||||
request(`repos/${context.repository}/pulls/${context.issueIndex}/reviews`, {
|
await request(`repos/${context.repository}/pulls/${context.issueIndex}/reviews`, {
|
||||||
body: stripAnsi(
|
body: stripAnsi(
|
||||||
withProfile([`${mark} ${verdict.trim()}`, ...rest].join("\n"), outcome.profile),
|
withProfile([`${mark} ${verdict.trim()}`, ...rest].join("\n"), outcome.profile),
|
||||||
),
|
),
|
||||||
@@ -200,25 +216,32 @@ export async function postRuntime(
|
|||||||
comments: entries.map(({ path, line, side, body }) => ({
|
comments: entries.map(({ path, line, side, body }) => ({
|
||||||
path,
|
path,
|
||||||
body: stripAnsi(withProfile(body, outcome.profile)),
|
body: stripAnsi(withProfile(body, outcome.profile)),
|
||||||
new_position: side === "new" ? line : 0,
|
new_position: side === "NEW" ? line : 0,
|
||||||
old_position: side === "old" ? line : 0,
|
old_position: side === "OLD" ? line : 0,
|
||||||
})),
|
})),
|
||||||
});
|
});
|
||||||
|
};
|
||||||
await postReview(anchors).catch(async (error: unknown) => {
|
await postReview(anchors).catch(async (error: unknown) => {
|
||||||
if (anchors.length === 0) throw error;
|
if (anchors.length === 0) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
console.error(
|
console.error(
|
||||||
`inline comments rejected: ${error instanceof Error ? error.message : String(error)}`,
|
`inline comments rejected: ${error instanceof Error ? error.message : String(error)}`,
|
||||||
);
|
);
|
||||||
await postReview([]);
|
await postReview([]);
|
||||||
});
|
});
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (error instanceof GiteaRequestError) throw error;
|
if (error instanceof GiteaRequestError) {
|
||||||
await postComment(failureComment([{ ...outcome.profile, reason: "failed" }]));
|
throw error;
|
||||||
|
}
|
||||||
|
await postComment(failureComment([{ ...outcome.profile, reason: "FAILED" }]));
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
} finally {
|
} finally {
|
||||||
await rm(manifest.runtimeDir, { recursive: true }).catch((error: unknown) => {
|
await rm(manifest.runtimeDir, { recursive: true }).catch((error: unknown) => {
|
||||||
if (!isNotFound(error)) throw error;
|
if (!isNotFound(error)) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,9 @@ import { prepareRuntime } from "#runtime";
|
|||||||
|
|
||||||
const env = (name: string): string => {
|
const env = (name: string): string => {
|
||||||
const value = process.env[name];
|
const value = process.env[name];
|
||||||
if (value === undefined || value === "") throw new Error(`${name} is not set`);
|
if (value === undefined || value === "") {
|
||||||
|
throw new Error(`${name} is not set`);
|
||||||
|
}
|
||||||
return value;
|
return value;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { isRunnableProfileProcess, killProfileProcesses, readProfileFile } from
|
|||||||
|
|
||||||
const profile = (uid: number, home: string): RuntimeProfile => ({
|
const profile = (uid: number, home: string): RuntimeProfile => ({
|
||||||
index: uid - 20_000,
|
index: uid - 20_000,
|
||||||
type: "claude",
|
type: "CLAUDE",
|
||||||
model: "test",
|
model: "test",
|
||||||
uid,
|
uid,
|
||||||
gid: uid,
|
gid: uid,
|
||||||
@@ -25,14 +25,14 @@ function runAs(
|
|||||||
selected: RuntimeProfile,
|
selected: RuntimeProfile,
|
||||||
command: string,
|
command: string,
|
||||||
args: string[],
|
args: string[],
|
||||||
env?: NodeJS.ProcessEnv,
|
env?: ReadonlyMap<string, string>,
|
||||||
): SpawnSyncReturns<string> {
|
): SpawnSyncReturns<string> {
|
||||||
return spawnSync(command, args, {
|
return spawnSync(command, args, {
|
||||||
cwd: "/",
|
cwd: "/",
|
||||||
uid: selected.uid,
|
uid: selected.uid,
|
||||||
gid: selected.gid,
|
gid: selected.gid,
|
||||||
encoding: "utf8",
|
encoding: "utf8",
|
||||||
...(env !== undefined && { env }),
|
...(env !== undefined && { env: Object.fromEntries(env) }),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +49,7 @@ test.skipIf(IS_WINDOWS)("refuses to read a profile result symlink as root", asyn
|
|||||||
await writeFile(secret, "reviewer-secret", { mode: 0o600 });
|
await writeFile(secret, "reviewer-secret", { mode: 0o600 });
|
||||||
await symlink(secret, result);
|
await symlink(secret, result);
|
||||||
|
|
||||||
await expect(() => readProfileFile(profile(currentUid(), root), result)).rejects.toThrow(
|
await expect(readProfileFile(profile(currentUid(), root), result)).rejects.toThrow(
|
||||||
"regular private file",
|
"regular private file",
|
||||||
);
|
);
|
||||||
} finally {
|
} finally {
|
||||||
@@ -96,7 +96,9 @@ test.skipIf(!IS_ROOT)("cleanup leaves no runnable daemonized process", async ()
|
|||||||
await killProfileProcesses(selected.uid);
|
await killProfileProcesses(selected.uid);
|
||||||
|
|
||||||
const status = await readFile(`/proc/${pid}/status`, "utf8").catch((error: unknown) => {
|
const status = await readFile(`/proc/${pid}/status`, "utf8").catch((error: unknown) => {
|
||||||
if (isNotFound(error)) return null;
|
if (isNotFound(error)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
throw error;
|
throw error;
|
||||||
});
|
});
|
||||||
expect(status === null || !isRunnableProfileProcess(status, selected.uid)).toBe(true);
|
expect(status === null || !isRunnableProfileProcess(status, selected.uid)).toBe(true);
|
||||||
@@ -104,9 +106,12 @@ test.skipIf(!IS_ROOT)("cleanup leaves no runnable daemonized process", async ()
|
|||||||
|
|
||||||
test.skipIf(!IS_ROOT)("the agent process cannot read its coordinator environment", () => {
|
test.skipIf(!IS_ROOT)("the agent process cannot read its coordinator environment", () => {
|
||||||
const selected = profile(20_020, "/tmp");
|
const selected = profile(20_020, "/tmp");
|
||||||
const result = runAs(selected, "/usr/bin/cat", [`/proc/${process.pid}/environ`], {
|
const result = runAs(
|
||||||
PARENT_SECRET: "must-not-cross-boundary",
|
selected,
|
||||||
});
|
"/usr/bin/cat",
|
||||||
|
[`/proc/${process.pid}/environ`],
|
||||||
|
new Map([["PARENT_SECRET", "must-not-cross-boundary"]]),
|
||||||
|
);
|
||||||
|
|
||||||
expect(result.status).not.toBe(0);
|
expect(result.status).not.toBe(0);
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -6,8 +6,8 @@ import { isNotFound } from "#common";
|
|||||||
import type { RuntimeProfile } from "#runtime";
|
import type { RuntimeProfile } from "#runtime";
|
||||||
|
|
||||||
export function isRunnableProfileProcess(status: string, uid: number): boolean {
|
export function isRunnableProfileProcess(status: string, uid: number): boolean {
|
||||||
const owner = /^Uid:\s+(\d+)/mu.exec(status)?.[1];
|
const owner = /^Uid:\s+(?<uid>\d+)/mu.exec(status)?.[1];
|
||||||
const state = /^State:\s+(\w)/mu.exec(status)?.[1];
|
const state = /^State:\s+(?<state>\w)/mu.exec(status)?.[1];
|
||||||
return owner !== undefined && Number(owner) === uid && state !== "Z";
|
return owner !== undefined && Number(owner) === uid && state !== "Z";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -17,7 +17,10 @@ async function profileProcessIds(uid: number): Promise<number[]> {
|
|||||||
.filter((entry) => entry.isDirectory() && /^\d+$/u.test(entry.name))
|
.filter((entry) => entry.isDirectory() && /^\d+$/u.test(entry.name))
|
||||||
.map((entry) => entry.name);
|
.map((entry) => entry.name);
|
||||||
const statuses = await Promise.all(
|
const statuses = await Promise.all(
|
||||||
pids.map((pid) => readFile(`/proc/${pid}/status`, "utf8").catch(() => null)),
|
pids.map(async (pid) => {
|
||||||
|
const status = await readFile(`/proc/${pid}/status`, "utf8").catch(() => null);
|
||||||
|
return status;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
return pids
|
return pids
|
||||||
.filter((_pid, index) => {
|
.filter((_pid, index) => {
|
||||||
@@ -33,12 +36,16 @@ export async function killProfileProcesses(uid: number, attempt = 0): Promise<vo
|
|||||||
throw new Error(`profile UID ${uid} still owns processes after cleanup`);
|
throw new Error(`profile UID ${uid} still owns processes after cleanup`);
|
||||||
}
|
}
|
||||||
const ids = await profileProcessIds(uid);
|
const ids = await profileProcessIds(uid);
|
||||||
if (ids.length === 0) return;
|
if (ids.length === 0) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
for (const pid of ids) {
|
for (const pid of ids) {
|
||||||
try {
|
try {
|
||||||
process.kill(pid, "SIGKILL");
|
process.kill(pid, "SIGKILL");
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
if (!isNotFound(error)) throw error;
|
if (!isNotFound(error)) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
await sleep(10);
|
await sleep(10);
|
||||||
|
|||||||
+100
-82
@@ -11,8 +11,8 @@ import {
|
|||||||
} from "./profiles.ts";
|
} from "./profiles.ts";
|
||||||
|
|
||||||
test("formats profile attribution as a Markdown quote", () => {
|
test("formats profile attribution as a Markdown quote", () => {
|
||||||
expect(profileFooter({ type: "opencode", model: "openrouter/qwen/qwen3.8-27b" })).toBe(
|
expect(profileFooter({ type: "OPENCODE", model: "openrouter/qwen/qwen3.8-27b" })).toBe(
|
||||||
"> Profile: `opencode` · `openrouter/qwen/qwen3.8-27b`",
|
"> Profile: `OPENCODE` · `openrouter/qwen/qwen3.8-27b`",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -20,33 +20,35 @@ test("falls through only after usage exhaustion", async () => {
|
|||||||
const visited: string[] = [];
|
const visited: string[] = [];
|
||||||
const result = await runProfiles(
|
const result = await runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
async (profile) => {
|
||||||
visited.push(profile.type);
|
visited.push(profile.type);
|
||||||
if (profile.type === "claude") {
|
if (profile.type === "CLAUDE") {
|
||||||
throw new Error("You've hit your usage limit");
|
throw new Error("You've hit your usage limit");
|
||||||
}
|
}
|
||||||
return Promise.resolve("done");
|
const resolved = await Promise.resolve("done");
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(result).toBe("done");
|
expect(result).toBe("done");
|
||||||
expect(visited).toStrictEqual(["claude", "codex"]);
|
expect(visited).toStrictEqual(["CLAUDE", "CODEX"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("recognizes Claude's weekly limit message", async () => {
|
test("recognizes Claude's weekly limit message", async () => {
|
||||||
const result = await runProfiles(
|
const result = await runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
async (profile) => {
|
||||||
if (profile.type === "claude") {
|
if (profile.type === "CLAUDE") {
|
||||||
throw new Error("You've hit your weekly limit · resets 12am (UTC)");
|
throw new Error("You've hit your weekly limit · resets 12am (UTC)");
|
||||||
}
|
}
|
||||||
return Promise.resolve("fallback");
|
const resolved = await Promise.resolve("fallback");
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -55,18 +57,22 @@ test("recognizes Claude's weekly limit message", async () => {
|
|||||||
|
|
||||||
test("recognizes provider API exhaustion status", async () => {
|
test("recognizes provider API exhaustion status", async () => {
|
||||||
const results = await Promise.all(
|
const results = await Promise.all(
|
||||||
["API Error: 402 Insufficient funds", "HTTP error: 429"].map((message) =>
|
["API Error: 402 Insufficient funds", "HTTP error: 429"].map(async (message) => {
|
||||||
runProfiles(
|
const result = await runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
async (profile) => {
|
||||||
if (profile.type === "claude") throw new Error(message);
|
if (profile.type === "CLAUDE") {
|
||||||
return Promise.resolve("fallback");
|
throw new Error(message);
|
||||||
|
}
|
||||||
|
const resolved = await Promise.resolve("fallback");
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
),
|
);
|
||||||
),
|
return result;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(results).toStrictEqual(["fallback", "fallback"]);
|
expect(results).toStrictEqual(["fallback", "fallback"]);
|
||||||
@@ -76,38 +82,41 @@ test("falls through after a sign-in failure and records each try", async () => {
|
|||||||
const failures: ProfileFailure[] = [];
|
const failures: ProfileFailure[] = [];
|
||||||
const result = await runProfiles(
|
const result = await runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "opencode", model: "openrouter/qwen/qwen3.8-27b" },
|
{ type: "OPENCODE", model: "openrouter/qwen/qwen3.8-27b" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
async (profile) => {
|
||||||
if (profile.type === "codex") {
|
if (profile.type === "CODEX") {
|
||||||
throw new AgentAuthError("codex sign-in failed");
|
throw new AgentAuthError("codex sign-in failed");
|
||||||
}
|
}
|
||||||
if (profile.type === "claude") throw new Error("API Error: 429");
|
if (profile.type === "CLAUDE") {
|
||||||
return Promise.resolve("fallback");
|
throw new Error("API Error: 429");
|
||||||
|
}
|
||||||
|
const resolved = await Promise.resolve("fallback");
|
||||||
|
return resolved;
|
||||||
},
|
},
|
||||||
failures,
|
failures,
|
||||||
);
|
);
|
||||||
|
|
||||||
expect(result).toBe("fallback");
|
expect(result).toBe("fallback");
|
||||||
expect(failures).toStrictEqual([
|
expect(failures).toStrictEqual([
|
||||||
{ type: "codex", model: "gpt-5.6-terra", reason: "sign-in failed" },
|
{ type: "CODEX", model: "gpt-5.6-terra", reason: "SIGN_IN_FAILED" },
|
||||||
{ type: "claude", model: "claude-sonnet-5", reason: "usage exhausted" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", reason: "USAGE_EXHAUSTED" },
|
||||||
]);
|
]);
|
||||||
expect(failureFooter(failures)).toStrictEqual(
|
expect(failureFooter(failures)).toStrictEqual(
|
||||||
"> Tried: `codex` · `gpt-5.6-terra` (sign-in failed), " +
|
"> Tried: `CODEX` · `gpt-5.6-terra` (sign-in failed), " +
|
||||||
"`claude` · `claude-sonnet-5` (usage exhausted)",
|
"`CLAUDE` · `claude-sonnet-5` (usage exhausted)",
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("throws the last sign-in failure when every profile fails", async () => {
|
test("throws the last sign-in failure when every profile fails", async () => {
|
||||||
const failures: ProfileFailure[] = [];
|
const failures: ProfileFailure[] = [];
|
||||||
await expect(() =>
|
await expect(
|
||||||
runProfiles(
|
runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
(profile) => {
|
||||||
throw new AgentAuthError(`${profile.type} sign-in failed`);
|
throw new AgentAuthError(`${profile.type} sign-in failed`);
|
||||||
@@ -116,19 +125,20 @@ test("throws the last sign-in failure when every profile fails", async () => {
|
|||||||
),
|
),
|
||||||
).rejects.toThrow(
|
).rejects.toThrow(
|
||||||
expect.toSatisfy(
|
expect.toSatisfy(
|
||||||
(e: unknown) => e instanceof AgentAuthError && e.message.includes("claude sign-in failed"),
|
(error: unknown) =>
|
||||||
|
error instanceof AgentAuthError && error.message.includes("CLAUDE sign-in failed"),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
expect(failures.map(({ reason }) => reason)).toStrictEqual(["sign-in failed", "sign-in failed"]);
|
expect(failures.map(({ reason }) => reason)).toStrictEqual(["SIGN_IN_FAILED", "SIGN_IN_FAILED"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("preserves an ordinary agent failure", async () => {
|
test("preserves an ordinary agent failure", async () => {
|
||||||
const visited: string[] = [];
|
const visited: string[] = [];
|
||||||
await expect(() =>
|
await expect(
|
||||||
runProfiles(
|
runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
(profile) => {
|
||||||
visited.push(profile.type);
|
visited.push(profile.type);
|
||||||
@@ -136,16 +146,16 @@ test("preserves an ordinary agent failure", async () => {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
).rejects.toThrow("tests failed");
|
).rejects.toThrow("tests failed");
|
||||||
expect(visited).toStrictEqual(["claude"]);
|
expect(visited).toStrictEqual(["CLAUDE"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("does not mistake incidental quota text for exhaustion", async () => {
|
test("does not mistake incidental quota text for exhaustion", async () => {
|
||||||
const visited: string[] = [];
|
const visited: string[] = [];
|
||||||
await expect(() =>
|
await expect(
|
||||||
runProfiles(
|
runProfiles(
|
||||||
[
|
[
|
||||||
{ type: "claude", model: "claude-sonnet-5", token: "first" },
|
{ type: "CLAUDE", model: "claude-sonnet-5", token: "first" },
|
||||||
{ type: "codex", model: "gpt-5.6-terra" },
|
{ type: "CODEX", model: "gpt-5.6-terra" },
|
||||||
],
|
],
|
||||||
(profile) => {
|
(profile) => {
|
||||||
visited.push(profile.type);
|
visited.push(profile.type);
|
||||||
@@ -153,27 +163,27 @@ test("does not mistake incidental quota text for exhaustion", async () => {
|
|||||||
},
|
},
|
||||||
),
|
),
|
||||||
).rejects.toThrow("quota parser test failed");
|
).rejects.toThrow("quota parser test failed");
|
||||||
expect(visited).toStrictEqual(["claude"]);
|
expect(visited).toStrictEqual(["CLAUDE"]);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("exposes only the selected profile credential to the agent", () => {
|
test("exposes only the selected profile credential to the agent", () => {
|
||||||
const base = {
|
const base = new Map([
|
||||||
PATH: "/usr/bin",
|
["PATH", "/usr/bin"],
|
||||||
HOME: "/home/bot",
|
["HOME", "/home/bot"],
|
||||||
UNRELATED_SECRET: "must-not-reach-agent",
|
["UNRELATED_SECRET", "must-not-reach-agent"],
|
||||||
BOT_AGENTS_MASTER_KEY: "master",
|
["BOT_AGENTS_MASTER_KEY", "master"],
|
||||||
PROFILES: "contains every secret",
|
["PROFILES", "contains every secret"],
|
||||||
REVIEWER_TOKEN: "reviewer",
|
["REVIEWER_TOKEN", "reviewer"],
|
||||||
CLAUDE_CODE_OAUTH_TOKEN: "old-claude",
|
["CLAUDE_CODE_OAUTH_TOKEN", "old-claude"],
|
||||||
ANTHROPIC_API_KEY: "old-anthropic-key",
|
["ANTHROPIC_API_KEY", "old-anthropic-key"],
|
||||||
ANTHROPIC_AUTH_TOKEN: "old-anthropic-token",
|
["ANTHROPIC_AUTH_TOKEN", "old-anthropic-token"],
|
||||||
OPENAI_API_KEY: "old-openai",
|
["OPENAI_API_KEY", "old-openai"],
|
||||||
CODEX_API_KEY: "old-codex-key",
|
["CODEX_API_KEY", "old-codex-key"],
|
||||||
CODEX_ACCESS_TOKEN: "old-codex-token",
|
["CODEX_ACCESS_TOKEN", "old-codex-token"],
|
||||||
};
|
]);
|
||||||
const profile = {
|
const profile = {
|
||||||
index: 0,
|
index: 0,
|
||||||
type: "claude" as const,
|
type: "CLAUDE" as const,
|
||||||
model: "claude-sonnet-5",
|
model: "claude-sonnet-5",
|
||||||
uid: 20_000,
|
uid: 20_000,
|
||||||
gid: 20_000,
|
gid: 20_000,
|
||||||
@@ -181,21 +191,25 @@ test("exposes only the selected profile credential to the agent", () => {
|
|||||||
tokenFile: "/runtime/profile-0/token",
|
tokenFile: "/runtime/profile-0/token",
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(agentEnvironment(base, profile, "selected")).toStrictEqual({
|
expect(agentEnvironment(base, profile, "selected")).toStrictEqual(
|
||||||
PATH: "/usr/bin",
|
new Map([
|
||||||
HOME: "/runtime/profile-0",
|
["PATH", "/usr/bin"],
|
||||||
CLAUDE_CODE_OAUTH_TOKEN: "selected",
|
["HOME", "/runtime/profile-0"],
|
||||||
});
|
["CLAUDE_CODE_OAUTH_TOKEN", "selected"],
|
||||||
expect(sanitizedEnvironment(base)).toStrictEqual({
|
]),
|
||||||
PATH: "/usr/bin",
|
);
|
||||||
HOME: "/home/bot",
|
expect(sanitizedEnvironment(base)).toStrictEqual(
|
||||||
});
|
new Map([
|
||||||
|
["PATH", "/usr/bin"],
|
||||||
|
["HOME", "/home/bot"],
|
||||||
|
]),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("uses a private Codex home without inventing an API credential", () => {
|
test("uses a private Codex home without inventing an API credential", () => {
|
||||||
const profile = {
|
const profile = {
|
||||||
index: 1,
|
index: 1,
|
||||||
type: "codex" as const,
|
type: "CODEX" as const,
|
||||||
model: "gpt-5.6-terra",
|
model: "gpt-5.6-terra",
|
||||||
uid: 20_001,
|
uid: 20_001,
|
||||||
gid: 20_001,
|
gid: 20_001,
|
||||||
@@ -203,17 +217,19 @@ test("uses a private Codex home without inventing an API credential", () => {
|
|||||||
tokenFile: null,
|
tokenFile: null,
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(agentEnvironment({ PATH: "/bin" }, profile)).toStrictEqual({
|
expect(agentEnvironment(new Map([["PATH", "/bin"]]), profile)).toStrictEqual(
|
||||||
PATH: "/bin",
|
new Map([
|
||||||
HOME: "/runtime/profile-1",
|
["PATH", "/bin"],
|
||||||
CODEX_HOME: "/runtime/profile-1/.codex",
|
["HOME", "/runtime/profile-1"],
|
||||||
});
|
["CODEX_HOME", "/runtime/profile-1/.codex"],
|
||||||
|
]),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("exposes an OpenRouter key only to the OpenCode profile", () => {
|
test("exposes an OpenRouter key only to the OpenCode profile", () => {
|
||||||
const profile = {
|
const profile = {
|
||||||
index: 2,
|
index: 2,
|
||||||
type: "opencode" as const,
|
type: "OPENCODE" as const,
|
||||||
model: "openrouter/qwen/qwen3.8-27b",
|
model: "openrouter/qwen/qwen3.8-27b",
|
||||||
uid: 20_002,
|
uid: 20_002,
|
||||||
gid: 20_002,
|
gid: 20_002,
|
||||||
@@ -221,9 +237,11 @@ test("exposes an OpenRouter key only to the OpenCode profile", () => {
|
|||||||
tokenFile: "/runtime/profile-2/token",
|
tokenFile: "/runtime/profile-2/token",
|
||||||
};
|
};
|
||||||
|
|
||||||
expect(agentEnvironment({ PATH: "/bin" }, profile, "selected")).toStrictEqual({
|
expect(agentEnvironment(new Map([["PATH", "/bin"]]), profile, "selected")).toStrictEqual(
|
||||||
PATH: "/bin",
|
new Map([
|
||||||
HOME: "/runtime/profile-2",
|
["PATH", "/bin"],
|
||||||
OPENROUTER_API_KEY: "selected",
|
["HOME", "/runtime/profile-2"],
|
||||||
});
|
["OPENROUTER_API_KEY", "selected"],
|
||||||
|
]),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
+74
-46
@@ -1,6 +1,6 @@
|
|||||||
// The agent and model a profile runs, which every report names.
|
// The agent and model a profile runs, which every report names.
|
||||||
export interface ProfileIdentity {
|
export interface ProfileIdentity {
|
||||||
type: "claude" | "codex" | "opencode";
|
type: "CLAUDE" | "CODEX" | "OPENCODE";
|
||||||
model: string;
|
model: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -16,7 +16,19 @@ export function withProfile(body: string, profile: ProfileIdentity): string {
|
|||||||
return `${body}\n\n${profileFooter(profile)}`;
|
return `${body}\n\n${profileFooter(profile)}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
export type FailureReason = "sign-in failed" | "usage exhausted" | "failed";
|
export type FailureReason = "SIGN_IN_FAILED" | "USAGE_EXHAUSTED" | "FAILED";
|
||||||
|
|
||||||
|
// The words a failure reason reads as in logs and posted comments.
|
||||||
|
function toMessage(reason: FailureReason): string {
|
||||||
|
switch (reason) {
|
||||||
|
case "SIGN_IN_FAILED":
|
||||||
|
return "sign-in failed";
|
||||||
|
case "USAGE_EXHAUSTED":
|
||||||
|
return "usage exhausted";
|
||||||
|
case "FAILED":
|
||||||
|
return "failed";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export interface ProfileFailure extends ProfileIdentity {
|
export interface ProfileFailure extends ProfileIdentity {
|
||||||
reason: FailureReason;
|
reason: FailureReason;
|
||||||
@@ -29,7 +41,12 @@ interface ProfileHome {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Raised once an agent's credentials are rejected and any re-login is spent.
|
// Raised once an agent's credentials are rejected and any re-login is spent.
|
||||||
export class AgentAuthError extends Error {}
|
export class AgentAuthError extends Error {
|
||||||
|
constructor(message: string, options?: ErrorOptions) {
|
||||||
|
super(message, options);
|
||||||
|
this.name = "AgentAuthError";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function isUsageExhausted(error: unknown): boolean {
|
function isUsageExhausted(error: unknown): boolean {
|
||||||
return /(?:usage|rate) limit|hit your (?:weekly )?limit|insufficient_quota|exceeded your current quota|too many requests|(?:api error|http error|http|status(?: code)?)[ :]+4(?:02|29)\b/iu.test(
|
return /(?:usage|rate) limit|hit your (?:weekly )?limit|insufficient_quota|exceeded your current quota|too many requests|(?:api error|http error|http|status(?: code)?)[ :]+4(?:02|29)\b/iu.test(
|
||||||
@@ -38,50 +55,49 @@ function isUsageExhausted(error: unknown): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function failureReason(error: unknown): FailureReason {
|
function failureReason(error: unknown): FailureReason {
|
||||||
if (error instanceof AgentAuthError) return "sign-in failed";
|
if (error instanceof AgentAuthError) {
|
||||||
return isUsageExhausted(error) ? "usage exhausted" : "failed";
|
return "SIGN_IN_FAILED";
|
||||||
|
}
|
||||||
|
return isUsageExhausted(error) ? "USAGE_EXHAUSTED" : "FAILED";
|
||||||
}
|
}
|
||||||
|
|
||||||
export function failureFooter(failures: ProfileFailure[]): string {
|
export function failureFooter(failures: ProfileFailure[]): string {
|
||||||
if (failures.length === 0) return "> Profile: none";
|
if (failures.length === 0) {
|
||||||
|
return "> Profile: none";
|
||||||
|
}
|
||||||
return `> Tried: ${failures
|
return `> Tried: ${failures
|
||||||
.map(({ type, model, reason }) => `\`${type}\` · \`${model}\` (${reason})`)
|
.map(({ type, model, reason }) => `\`${type}\` · \`${model}\` (${toMessage(reason)})`)
|
||||||
.join(", ")}`;
|
.join(", ")}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Tries the profiles from `index` on, moving on only after a sign-in failure
|
// Tries the profiles in order, moving on only after a sign-in failure or
|
||||||
// or exhausted usage, and records every profile it tried.
|
// exhausted usage, and records every profile it tried.
|
||||||
async function attemptFrom<T, P extends ProfileIdentity>(
|
export async function runProfiles<T, P extends ProfileIdentity>(
|
||||||
profiles: P[],
|
|
||||||
attempt: (profile: P) => Promise<T>,
|
|
||||||
failures: ProfileFailure[],
|
|
||||||
index: number,
|
|
||||||
): Promise<T> {
|
|
||||||
const profile = profiles[index];
|
|
||||||
if (profile === undefined) {
|
|
||||||
throw new Error("profiles must contain at least one profile");
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
return await attempt(profile);
|
|
||||||
} catch (error) {
|
|
||||||
const reason = failureReason(error);
|
|
||||||
failures.push({ type: profile.type, model: profile.model, reason });
|
|
||||||
if (reason === "failed" || index === profiles.length - 1) throw error;
|
|
||||||
console.error(`${profile.type} ${reason}; trying next profile`);
|
|
||||||
return attemptFrom(profiles, attempt, failures, index + 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export function runProfiles<T, P extends ProfileIdentity>(
|
|
||||||
profiles: P[],
|
profiles: P[],
|
||||||
attempt: (profile: P) => Promise<T>,
|
attempt: (profile: P) => Promise<T>,
|
||||||
failures: ProfileFailure[] = [],
|
failures: ProfileFailure[] = [],
|
||||||
): Promise<T> {
|
): Promise<T> {
|
||||||
return attemptFrom(profiles, attempt, failures, 0);
|
for (const [index, profile] of profiles.entries()) {
|
||||||
|
try {
|
||||||
|
return await attempt(profile);
|
||||||
|
} catch (error) {
|
||||||
|
const reason = failureReason(error);
|
||||||
|
failures.push({ type: profile.type, model: profile.model, reason });
|
||||||
|
if (reason === "FAILED" || index === profiles.length - 1) {
|
||||||
|
throw error;
|
||||||
|
}
|
||||||
|
console.error(`${profile.type} ${toMessage(reason)}; trying next profile`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
throw new Error("profiles must contain at least one profile");
|
||||||
}
|
}
|
||||||
|
|
||||||
export function sanitizedEnvironment(environment: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
|
// Environments are maps from variable name to value, converted to the object
|
||||||
const result: NodeJS.ProcessEnv = {};
|
// form only where a child process is spawned.
|
||||||
|
export function sanitizedEnvironment(
|
||||||
|
environment: ReadonlyMap<string, string>,
|
||||||
|
): Map<string, string> {
|
||||||
|
const result = new Map<string, string>();
|
||||||
for (const name of [
|
for (const name of [
|
||||||
"PATH",
|
"PATH",
|
||||||
"HOME",
|
"HOME",
|
||||||
@@ -108,27 +124,39 @@ export function sanitizedEnvironment(environment: NodeJS.ProcessEnv): NodeJS.Pro
|
|||||||
"SSL_CERT_DIR",
|
"SSL_CERT_DIR",
|
||||||
"NODE_EXTRA_CA_CERTS",
|
"NODE_EXTRA_CA_CERTS",
|
||||||
]) {
|
]) {
|
||||||
const value = environment[name];
|
const value = environment.get(name);
|
||||||
if (value !== undefined) result[name] = value;
|
if (value !== undefined) {
|
||||||
|
result.set(name, value);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The environment variable each agent CLI reads its credential from.
|
||||||
|
function tokenVariable(type: ProfileIdentity["type"]): string {
|
||||||
|
switch (type) {
|
||||||
|
case "CLAUDE":
|
||||||
|
return "CLAUDE_CODE_OAUTH_TOKEN";
|
||||||
|
case "CODEX":
|
||||||
|
return "OPENAI_API_KEY";
|
||||||
|
case "OPENCODE":
|
||||||
|
return "OPENROUTER_API_KEY";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export function agentEnvironment(
|
export function agentEnvironment(
|
||||||
environment: NodeJS.ProcessEnv,
|
environment: ReadonlyMap<string, string>,
|
||||||
profile: ProfileHome,
|
profile: ProfileHome,
|
||||||
token?: string,
|
token?: string,
|
||||||
): NodeJS.ProcessEnv {
|
): Map<string, string> {
|
||||||
const result = sanitizedEnvironment(environment);
|
const result = sanitizedEnvironment(environment);
|
||||||
result["HOME"] = profile.home;
|
result.set("HOME", profile.home);
|
||||||
if (profile.type === "codex") result["CODEX_HOME"] = `${profile.home}/.codex`;
|
if (profile.type === "CODEX") {
|
||||||
|
result.set("CODEX_HOME", `${profile.home}/.codex`);
|
||||||
|
}
|
||||||
if (token !== undefined && token !== "") {
|
if (token !== undefined && token !== "") {
|
||||||
const tokenName = {
|
const tokenName = tokenVariable(profile.type);
|
||||||
claude: "CLAUDE_CODE_OAUTH_TOKEN",
|
result.set(tokenName, token);
|
||||||
codex: "OPENAI_API_KEY",
|
|
||||||
opencode: "OPENROUTER_API_KEY",
|
|
||||||
}[profile.type];
|
|
||||||
result[tokenName] = token;
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
+94
-71
@@ -24,7 +24,7 @@ import {
|
|||||||
retryInvalidToken,
|
retryInvalidToken,
|
||||||
stageCodexAuth,
|
stageCodexAuth,
|
||||||
} from "#agents";
|
} from "#agents";
|
||||||
import { isObject } from "#common";
|
import { field, isObject } from "#common";
|
||||||
import { echo, exitCode, killProfileProcesses, readProfileFile } from "#processes";
|
import { echo, exitCode, killProfileProcesses, readProfileFile } from "#processes";
|
||||||
import {
|
import {
|
||||||
AgentAuthError,
|
AgentAuthError,
|
||||||
@@ -58,15 +58,17 @@ interface RenderedPrompt {
|
|||||||
|
|
||||||
const env = (name: string): string => {
|
const env = (name: string): string => {
|
||||||
const value = process.env[name];
|
const value = process.env[name];
|
||||||
if (value === undefined) throw new Error(`${name} is not set`);
|
if (value === undefined) {
|
||||||
|
throw new Error(`${name} is not set`);
|
||||||
|
}
|
||||||
return value;
|
return value;
|
||||||
};
|
};
|
||||||
|
|
||||||
function definedEnvironment(): NodeJS.ProcessEnv {
|
function definedEnvironment(): Map<string, string> {
|
||||||
const result: NodeJS.ProcessEnv = {};
|
const result = new Map<string, string>();
|
||||||
for (const [name, value] of Object.entries(process.env)) {
|
for (const [name, value] of Object.entries(process.env)) {
|
||||||
if (value !== undefined) {
|
if (value !== undefined) {
|
||||||
result[name] = value;
|
result.set(name, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
@@ -104,17 +106,24 @@ async function postAuthorComment(body: string): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function runRoot(command: string, args: string[]): Promise<void> {
|
async function runRoot(command: string, args: string[]): Promise<void> {
|
||||||
const code = await exitCode(spawn(command, args, { env: PROCESS_ENV, stdio: "ignore" }));
|
const code = await exitCode(
|
||||||
if (code !== 0) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
spawn(command, args, { env: Object.fromEntries(PROCESS_ENV), stdio: "ignore" }),
|
||||||
|
);
|
||||||
|
if (code !== 0) {
|
||||||
|
throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function configureGitAuthor(): Promise<void> {
|
async function configureGitAuthor(): Promise<void> {
|
||||||
const user: unknown = await (await gitea("user")).json();
|
const userResponse = await gitea("user");
|
||||||
if (!isObject(user) || typeof user["login"] !== "string" || typeof user["email"] !== "string") {
|
const user: unknown = await userResponse.json();
|
||||||
throw new Error("user: unexpected Gitea response");
|
const login = field(user, "login");
|
||||||
|
const email = field(user, "email");
|
||||||
|
if (typeof login !== "string" || typeof email !== "string") {
|
||||||
|
throw new TypeError("user: unexpected Gitea response");
|
||||||
}
|
}
|
||||||
await runRoot("git", ["config", "user.name", user["login"]]);
|
await runRoot("git", ["config", "user.name", login]);
|
||||||
await runRoot("git", ["config", "user.email", user["email"]]);
|
await runRoot("git", ["config", "user.email", email]);
|
||||||
}
|
}
|
||||||
|
|
||||||
async function readProfileToken(profile: RuntimeProfile): Promise<string | null> {
|
async function readProfileToken(profile: RuntimeProfile): Promise<string | null> {
|
||||||
@@ -130,13 +139,27 @@ async function runAgentCommand(
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const child = spawn(command, args, {
|
const child = spawn(command, args, {
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: agentEnvironment(PROCESS_ENV, profile, token),
|
env: Object.fromEntries(agentEnvironment(PROCESS_ENV, profile, token)),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: "ignore",
|
stdio: "ignore",
|
||||||
});
|
});
|
||||||
const code = await exitCode(child);
|
const code = await exitCode(child);
|
||||||
if (code !== 0) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
if (code !== 0) {
|
||||||
|
throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// The agent name the skills installer knows each profile type by.
|
||||||
|
function skillsAgent(type: RuntimeProfile["type"]): string {
|
||||||
|
switch (type) {
|
||||||
|
case "CLAUDE":
|
||||||
|
return "claude-code";
|
||||||
|
case "CODEX":
|
||||||
|
return "codex";
|
||||||
|
case "OPENCODE":
|
||||||
|
return "opencode";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function prepareProfile(profile: RuntimeProfile): Promise<void> {
|
async function prepareProfile(profile: RuntimeProfile): Promise<void> {
|
||||||
@@ -152,43 +175,45 @@ async function prepareProfile(profile: RuntimeProfile): Promise<void> {
|
|||||||
...SKILLS_INSTALL.split(" "),
|
...SKILLS_INSTALL.split(" "),
|
||||||
"--global",
|
"--global",
|
||||||
"--agent",
|
"--agent",
|
||||||
profile.type === "claude" ? "claude-code" : profile.type,
|
skillsAgent(profile.type),
|
||||||
"--yes",
|
"--yes",
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// One issue comment as the prompt quotes it.
|
// One issue comment as the prompt quotes it.
|
||||||
function formatComment(comment: unknown): string {
|
function formatComment(comment: unknown): string {
|
||||||
const { user, created_at: createdAt, body } = isObject(comment) ? comment : {};
|
const login = field(field(comment, "user"), "login");
|
||||||
const login = isObject(user) ? user["login"] : undefined;
|
const createdAt = field(comment, "created_at");
|
||||||
|
const body = field(comment, "body");
|
||||||
return `## ${String(login)} at ${String(createdAt)}\n\n${String(body)}\n`;
|
return `## ${String(login)} at ${String(createdAt)}\n\n${String(body)}\n`;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function renderPrompt(profile: RuntimeProfile): Promise<RenderedPrompt> {
|
async function renderPrompt(profile: RuntimeProfile): Promise<RenderedPrompt> {
|
||||||
const reviewPath = await makeProfileFile(profile, "review.md");
|
const reviewPath = await makeProfileFile(profile, "review.md");
|
||||||
const anchorsPath = await makeProfileFile(profile, "anchors.json");
|
const anchorsPath = await makeProfileFile(profile, "anchors.json");
|
||||||
const comments: unknown = await (
|
const commentsResponse = await gitea(`repos/${REPO}/issues/${INDEX}/comments?limit=100`);
|
||||||
await gitea(`repos/${REPO}/issues/${INDEX}/comments?limit=100`)
|
const comments: unknown = await commentsResponse.json();
|
||||||
).json();
|
|
||||||
if (!Array.isArray(comments)) {
|
if (!Array.isArray(comments)) {
|
||||||
throw new TypeError("comments: unexpected Gitea response");
|
throw new TypeError("comments: unexpected Gitea response");
|
||||||
}
|
}
|
||||||
const values: NodeJS.ProcessEnv = {
|
const rulesResponse = await gitea(RULES_PATH);
|
||||||
COMMENT: env("COMMENT"),
|
const codeRules = await rulesResponse.text();
|
||||||
ISSUE_COMMENTS: comments.map((comment: unknown) => formatComment(comment)).join("\n"),
|
const values = new Map<string, string>([
|
||||||
CODE_RULES: await (await gitea(RULES_PATH)).text(),
|
["COMMENT", env("COMMENT")],
|
||||||
EVENT_NAME: EVENT,
|
["ISSUE_COMMENTS", comments.map((comment: unknown) => formatComment(comment)).join("\n")],
|
||||||
GITEA_API_URL: API,
|
["CODE_RULES", codeRules],
|
||||||
GITEA_REPOSITORY: REPO,
|
["EVENT_NAME", EVENT],
|
||||||
ISSUE_INDEX: INDEX,
|
["GITEA_API_URL", API],
|
||||||
REVIEW_PATH: reviewPath,
|
["GITEA_REPOSITORY", REPO],
|
||||||
ANCHORS_PATH: anchorsPath,
|
["ISSUE_INDEX", INDEX],
|
||||||
};
|
["REVIEW_PATH", reviewPath],
|
||||||
|
["ANCHORS_PATH", anchorsPath],
|
||||||
|
]);
|
||||||
const template = await readFile(new URL("../../prompt.md", import.meta.url), "utf8");
|
const template = await readFile(new URL("../../prompt.md", import.meta.url), "utf8");
|
||||||
return {
|
return {
|
||||||
prompt: template.replaceAll(
|
prompt: template.replaceAll(
|
||||||
/\$\{(\w+)\}/gu,
|
/\$\{(?<name>\w+)\}/gu,
|
||||||
(match: string, name: string) => values[name] ?? match,
|
(match: string, name: string) => values.get(name) ?? match,
|
||||||
),
|
),
|
||||||
reviewPath,
|
reviewPath,
|
||||||
anchorsPath,
|
anchorsPath,
|
||||||
@@ -210,10 +235,7 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
|||||||
],
|
],
|
||||||
{
|
{
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: {
|
env: Object.fromEntries(agentEnvironment(PROCESS_ENV, profile, token).set("IS_SANDBOX", "1")),
|
||||||
...agentEnvironment(PROCESS_ENV, profile, token),
|
|
||||||
IS_SANDBOX: "1",
|
|
||||||
},
|
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
stdio: ["ignore", "pipe", "pipe"],
|
||||||
@@ -234,17 +256,20 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
|||||||
if (line !== "") {
|
if (line !== "") {
|
||||||
const event: unknown = JSON.parse(line);
|
const event: unknown = JSON.parse(line);
|
||||||
if (isObject(event)) {
|
if (isObject(event)) {
|
||||||
const content = isObject(event["message"]) ? event["message"]["content"] : undefined;
|
const content = field(field(event, "message"), "content");
|
||||||
for (const part of Array.isArray(content) ? content : []) {
|
for (const part of Array.isArray(content) ? content : []) {
|
||||||
if (isObject(part)) {
|
if (isObject(part)) {
|
||||||
const text = part["thinking"] ?? part["text"] ?? part["name"];
|
const text = field(part, "thinking") ?? field(part, "text") ?? field(part, "name");
|
||||||
if (typeof text === "string" && text !== "") {
|
if (typeof text === "string" && text !== "") {
|
||||||
console.log(text);
|
console.log(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (event["type"] === "result") {
|
if (field(event, "type") === "result") {
|
||||||
const { is_error: isError, result: answer, subtype, api_error_status: apiStatus } = event;
|
const isError = field(event, "is_error");
|
||||||
|
const answer = field(event, "result");
|
||||||
|
const subtype = field(event, "subtype");
|
||||||
|
const apiStatus = field(event, "api_error_status");
|
||||||
result = {
|
result = {
|
||||||
isError: typeof isError === "boolean" ? isError : undefined,
|
isError: typeof isError === "boolean" ? isError : undefined,
|
||||||
result: typeof answer === "string" ? answer : undefined,
|
result: typeof answer === "string" ? answer : undefined,
|
||||||
@@ -272,28 +297,13 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
|||||||
return result.result;
|
return result.result;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Polls every 100 ms until the login prints something, failing if it exits first.
|
|
||||||
async function pollForInstructions(
|
|
||||||
shownText: () => string,
|
|
||||||
status: Promise<number>,
|
|
||||||
): Promise<void> {
|
|
||||||
if (shownText().trim() !== "") {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const exited = await Promise.race([status.then(() => true), sleep(100, false)]);
|
|
||||||
if (exited) {
|
|
||||||
throw new AgentAuthError("AI bot login produced no instructions");
|
|
||||||
}
|
|
||||||
await pollForInstructions(shownText, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function codexDeviceLogin(
|
async function codexDeviceLogin(
|
||||||
profile: RuntimeProfile,
|
profile: RuntimeProfile,
|
||||||
environment: NodeJS.ProcessEnv,
|
environment: ReadonlyMap<string, string>,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const login = spawn("codex", ["login", "--device-auth"], {
|
const login = spawn("codex", ["login", "--device-auth"], {
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: environment,
|
env: Object.fromEntries(environment),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
stdio: ["ignore", "pipe", "pipe"],
|
||||||
@@ -308,7 +318,12 @@ async function codexDeviceLogin(
|
|||||||
};
|
};
|
||||||
const drained = Promise.all([collect(login.stdout), collect(login.stderr)]);
|
const drained = Promise.all([collect(login.stdout), collect(login.stderr)]);
|
||||||
await sleep(3000);
|
await sleep(3000);
|
||||||
await pollForInstructions(() => shown, status);
|
while (shown.trim() === "") {
|
||||||
|
const exited = await Promise.race([status.then(() => true), sleep(100, false)]);
|
||||||
|
if (exited) {
|
||||||
|
throw new AgentAuthError("AI bot login produced no instructions");
|
||||||
|
}
|
||||||
|
}
|
||||||
await postAuthorComment(withProfile(shown, profile));
|
await postAuthorComment(withProfile(shown, profile));
|
||||||
const [code] = await Promise.all([status, drained]);
|
const [code] = await Promise.all([status, drained]);
|
||||||
if (code !== 0) {
|
if (code !== 0) {
|
||||||
@@ -318,12 +333,12 @@ async function codexDeviceLogin(
|
|||||||
|
|
||||||
async function codexApiLogin(
|
async function codexApiLogin(
|
||||||
profile: RuntimeProfile,
|
profile: RuntimeProfile,
|
||||||
environment: NodeJS.ProcessEnv,
|
environment: ReadonlyMap<string, string>,
|
||||||
token: string,
|
token: string,
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const login = spawn("codex", ["login", "--with-api-key"], {
|
const login = spawn("codex", ["login", "--with-api-key"], {
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: environment,
|
env: Object.fromEntries(environment),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: ["pipe", "inherit", "pipe"],
|
stdio: ["pipe", "inherit", "pipe"],
|
||||||
@@ -357,12 +372,14 @@ async function runCodex(
|
|||||||
} else {
|
} else {
|
||||||
const check = spawn("codex", ["login", "status"], {
|
const check = spawn("codex", ["login", "status"], {
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: environment,
|
env: Object.fromEntries(environment),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: "ignore",
|
stdio: "ignore",
|
||||||
});
|
});
|
||||||
if ((await exitCode(check)) !== 0) await codexDeviceLogin(profile, environment);
|
if ((await exitCode(check)) !== 0) {
|
||||||
|
await codexDeviceLogin(profile, environment);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
const outputPath = await makeProfileFile(profile, "result.md");
|
const outputPath = await makeProfileFile(profile, "result.md");
|
||||||
const attempt = async (): Promise<CommandResult> => {
|
const attempt = async (): Promise<CommandResult> => {
|
||||||
@@ -379,7 +396,7 @@ async function runCodex(
|
|||||||
],
|
],
|
||||||
{
|
{
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: environment,
|
env: Object.fromEntries(environment),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: ["ignore", "inherit", "pipe"],
|
stdio: ["ignore", "inherit", "pipe"],
|
||||||
@@ -420,7 +437,7 @@ async function runOpenCode(
|
|||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const child = spawn("opencode", openCodeArgs(profile.model, prompt), {
|
const child = spawn("opencode", openCodeArgs(profile.model, prompt), {
|
||||||
cwd: WORKSPACE,
|
cwd: WORKSPACE,
|
||||||
env: agentEnvironment(PROCESS_ENV, profile, token),
|
env: Object.fromEntries(agentEnvironment(PROCESS_ENV, profile, token)),
|
||||||
uid: profile.uid,
|
uid: profile.uid,
|
||||||
gid: profile.gid,
|
gid: profile.gid,
|
||||||
stdio: ["ignore", "pipe", "pipe"],
|
stdio: ["ignore", "pipe", "pipe"],
|
||||||
@@ -429,8 +446,12 @@ async function runOpenCode(
|
|||||||
const collected = collectOpenCodeOutput(
|
const collected = collectOpenCodeOutput(
|
||||||
child.stdout,
|
child.stdout,
|
||||||
child.stderr,
|
child.stderr,
|
||||||
(chunk) => echo(process.stdout, chunk),
|
async (chunk) => {
|
||||||
(chunk) => echo(process.stderr, chunk),
|
await echo(process.stdout, chunk);
|
||||||
|
},
|
||||||
|
async (chunk) => {
|
||||||
|
await echo(process.stderr, chunk);
|
||||||
|
},
|
||||||
);
|
);
|
||||||
const [code, streams] = await Promise.all([status, collected]);
|
const [code, streams] = await Promise.all([status, collected]);
|
||||||
const error = streams.stderr.trim();
|
const error = streams.stderr.trim();
|
||||||
@@ -442,7 +463,7 @@ async function runOpenCode(
|
|||||||
|
|
||||||
async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
|
async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
|
||||||
const token = await readProfileToken(profile);
|
const token = await readProfileToken(profile);
|
||||||
const authentication = profile.type === "codex" ? codexAuthentication(token ?? undefined) : null;
|
const authentication = profile.type === "CODEX" ? codexAuthentication(token ?? undefined) : null;
|
||||||
let stagedCodexAuth: string | null = null;
|
let stagedCodexAuth: string | null = null;
|
||||||
let body: string | null = null;
|
let body: string | null = null;
|
||||||
let resultPath: string | null = null;
|
let resultPath: string | null = null;
|
||||||
@@ -456,9 +477,9 @@ async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
|
|||||||
const rendered = await renderPrompt(profile);
|
const rendered = await renderPrompt(profile);
|
||||||
reviewPath = rendered.reviewPath;
|
reviewPath = rendered.reviewPath;
|
||||||
anchorsPath = rendered.anchorsPath;
|
anchorsPath = rendered.anchorsPath;
|
||||||
if (profile.type === "claude") {
|
if (profile.type === "CLAUDE") {
|
||||||
body = await runClaude(profile, token ?? "", rendered.prompt);
|
body = await runClaude(profile, token ?? "", rendered.prompt);
|
||||||
} else if (profile.type === "codex") {
|
} else if (profile.type === "CODEX") {
|
||||||
resultPath = await runCodex(
|
resultPath = await runCodex(
|
||||||
profile,
|
profile,
|
||||||
rendered.prompt,
|
rendered.prompt,
|
||||||
@@ -473,7 +494,9 @@ async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
|
|||||||
await persistCodexAuth(stagedCodexAuth, CODEX_AUTH);
|
await persistCodexAuth(stagedCodexAuth, CODEX_AUTH);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (resultPath !== null) body = await readProfileFile(profile, resultPath);
|
if (resultPath !== null) {
|
||||||
|
body = await readProfileFile(profile, resultPath);
|
||||||
|
}
|
||||||
if (body === null || reviewPath === null || anchorsPath === null) {
|
if (body === null || reviewPath === null || anchorsPath === null) {
|
||||||
throw new Error("agent attempt produced no result");
|
throw new Error("agent attempt produced no result");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { decryptCredential, encryptCredential, parseCredentials } from "./creden
|
|||||||
|
|
||||||
const MASTER_KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8";
|
const MASTER_KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8";
|
||||||
const OTHER_KEY = "AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE";
|
const OTHER_KEY = "AQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQE";
|
||||||
const NONCE = Uint8Array.from({ length: 12 }, (_, index) => index + 32);
|
const NONCE = Uint8Array.from({ length: 12 }, (_value, index) => index + 32);
|
||||||
const ENCRYPTED = "v1:ICEiIyQlJicoKSor:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA";
|
const ENCRYPTED = "v1:ICEiIyQlJicoKSor:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA";
|
||||||
|
|
||||||
test("decrypts a known AES-256-GCM credential", async () => {
|
test("decrypts a known AES-256-GCM credential", async () => {
|
||||||
@@ -16,11 +16,11 @@ test("encrypts a credential with a fresh supplied nonce", async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test("rejects a credential encrypted by another master key", async () => {
|
test("rejects a credential encrypted by another master key", async () => {
|
||||||
await expect(() => decryptCredential(ENCRYPTED, OTHER_KEY)).rejects.toThrow();
|
await expect(decryptCredential(ENCRYPTED, OTHER_KEY)).rejects.toThrow();
|
||||||
});
|
});
|
||||||
|
|
||||||
test("rejects a credential with a nonstandard nonce", async () => {
|
test("rejects a credential with a nonstandard nonce", async () => {
|
||||||
await expect(() =>
|
await expect(
|
||||||
decryptCredential("v1:AA:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA", MASTER_KEY),
|
decryptCredential("v1:AA:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA", MASTER_KEY),
|
||||||
).rejects.toThrow("nonce must be 12 bytes");
|
).rejects.toThrow("nonce must be 12 bytes");
|
||||||
});
|
});
|
||||||
@@ -31,9 +31,9 @@ test("decrypts the central reviewer token and ordered profiles", async () => {
|
|||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
"reviewer-token": ENCRYPTED,
|
"reviewer-token": ENCRYPTED,
|
||||||
profiles: [
|
profiles: [
|
||||||
{ type: "codex", model: "gpt-custom" },
|
{ type: "CODEX", model: "gpt-custom" },
|
||||||
{ type: "claude", token: ENCRYPTED },
|
{ type: "CLAUDE", token: ENCRYPTED },
|
||||||
{ type: "opencode", token: ENCRYPTED },
|
{ type: "OPENCODE", token: ENCRYPTED },
|
||||||
],
|
],
|
||||||
}),
|
}),
|
||||||
MASTER_KEY,
|
MASTER_KEY,
|
||||||
@@ -41,14 +41,14 @@ test("decrypts the central reviewer token and ordered profiles", async () => {
|
|||||||
).toStrictEqual({
|
).toStrictEqual({
|
||||||
reviewerToken: "secret-token",
|
reviewerToken: "secret-token",
|
||||||
profiles: [
|
profiles: [
|
||||||
{ type: "codex", model: "gpt-custom" },
|
{ type: "CODEX", model: "gpt-custom" },
|
||||||
{
|
{
|
||||||
type: "claude",
|
type: "CLAUDE",
|
||||||
model: "claude-sonnet-5",
|
model: "claude-sonnet-5",
|
||||||
token: "secret-token",
|
token: "secret-token",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
type: "opencode",
|
type: "OPENCODE",
|
||||||
model: "openrouter/qwen/qwen3.8-27b",
|
model: "openrouter/qwen/qwen3.8-27b",
|
||||||
token: "secret-token",
|
token: "secret-token",
|
||||||
},
|
},
|
||||||
@@ -57,12 +57,10 @@ test("decrypts the central reviewer token and ordered profiles", async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
test("rejects malformed central credentials", async () => {
|
test("rejects malformed central credentials", async () => {
|
||||||
await expect(() => parseCredentials('{"profiles": []}', MASTER_KEY)).rejects.toThrow(
|
await expect(parseCredentials('{"profiles": []}', MASTER_KEY)).rejects.toThrow("reviewer-token");
|
||||||
"reviewer-token",
|
await expect(
|
||||||
);
|
|
||||||
await expect(() =>
|
|
||||||
parseCredentials(
|
parseCredentials(
|
||||||
JSON.stringify({ "reviewer-token": ENCRYPTED, profiles: [{ type: "claude" }] }),
|
JSON.stringify({ "reviewer-token": ENCRYPTED, profiles: [{ type: "CLAUDE" }] }),
|
||||||
MASTER_KEY,
|
MASTER_KEY,
|
||||||
),
|
),
|
||||||
).rejects.toThrow("profiles[0].token");
|
).rejects.toThrow("profiles[0].token");
|
||||||
|
|||||||
+36
-22
@@ -1,20 +1,20 @@
|
|||||||
import { webcrypto } from "node:crypto";
|
import { webcrypto } from "node:crypto";
|
||||||
|
|
||||||
import { isMapping } from "#common";
|
import { field, isMapping } from "#common";
|
||||||
import type { BotProfile } from "#profiles";
|
import type { BotProfile } from "#profiles";
|
||||||
|
|
||||||
interface DefaultModels {
|
// The model a profile runs when profiles.json names none.
|
||||||
claude: string;
|
function defaultModel(type: BotProfile["type"]): string {
|
||||||
codex: string;
|
switch (type) {
|
||||||
opencode: string;
|
case "CLAUDE":
|
||||||
|
return "claude-sonnet-5";
|
||||||
|
case "CODEX":
|
||||||
|
return "gpt-5.6-terra";
|
||||||
|
case "OPENCODE":
|
||||||
|
return "openrouter/qwen/qwen3.8-27b";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_MODELS: DefaultModels = {
|
|
||||||
claude: "claude-sonnet-5",
|
|
||||||
codex: "gpt-5.6-terra",
|
|
||||||
opencode: "openrouter/qwen/qwen3.8-27b",
|
|
||||||
};
|
|
||||||
|
|
||||||
export interface BotCredentials {
|
export interface BotCredentials {
|
||||||
reviewerToken: string;
|
reviewerToken: string;
|
||||||
profiles: BotProfile[];
|
profiles: BotProfile[];
|
||||||
@@ -33,12 +33,16 @@ function encodeBase64Url(value: Uint8Array): string {
|
|||||||
|
|
||||||
const buffer = (value: Uint8Array): ArrayBuffer => Uint8Array.from(value).buffer;
|
const buffer = (value: Uint8Array): ArrayBuffer => Uint8Array.from(value).buffer;
|
||||||
|
|
||||||
function importMasterKey(encoded: string, usage: webcrypto.KeyUsage): Promise<webcrypto.CryptoKey> {
|
async function importMasterKey(
|
||||||
|
encoded: string,
|
||||||
|
usage: webcrypto.KeyUsage,
|
||||||
|
): Promise<webcrypto.CryptoKey> {
|
||||||
const bytes = decodeBase64Url(encoded);
|
const bytes = decodeBase64Url(encoded);
|
||||||
if (bytes.length !== 32) {
|
if (bytes.length !== 32) {
|
||||||
throw new Error("master-key must be 32 bytes encoded as base64url");
|
throw new Error("master-key must be 32 bytes encoded as base64url");
|
||||||
}
|
}
|
||||||
return webcrypto.subtle.importKey("raw", buffer(bytes), "AES-GCM", false, [usage]);
|
const key = await webcrypto.subtle.importKey("raw", buffer(bytes), "AES-GCM", false, [usage]);
|
||||||
|
return key;
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function decryptCredential(encrypted: string, masterKey: string): Promise<string> {
|
export async function decryptCredential(encrypted: string, masterKey: string): Promise<string> {
|
||||||
@@ -47,7 +51,9 @@ export async function decryptCredential(encrypted: string, masterKey: string): P
|
|||||||
throw new Error("credential must use v1:<nonce>:<ciphertext>");
|
throw new Error("credential must use v1:<nonce>:<ciphertext>");
|
||||||
}
|
}
|
||||||
const nonce = decodeBase64Url(encodedNonce);
|
const nonce = decodeBase64Url(encodedNonce);
|
||||||
if (nonce.length !== 12) throw new Error("credential nonce must be 12 bytes");
|
if (nonce.length !== 12) {
|
||||||
|
throw new Error("credential nonce must be 12 bytes");
|
||||||
|
}
|
||||||
const plaintext = await webcrypto.subtle.decrypt(
|
const plaintext = await webcrypto.subtle.decrypt(
|
||||||
{ name: "AES-GCM", iv: buffer(nonce) },
|
{ name: "AES-GCM", iv: buffer(nonce) },
|
||||||
await importMasterKey(masterKey, "decrypt"),
|
await importMasterKey(masterKey, "decrypt"),
|
||||||
@@ -61,7 +67,9 @@ export async function encryptCredential(
|
|||||||
masterKey: string,
|
masterKey: string,
|
||||||
nonce: Uint8Array = webcrypto.getRandomValues(new Uint8Array(12)),
|
nonce: Uint8Array = webcrypto.getRandomValues(new Uint8Array(12)),
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
if (nonce.length !== 12) throw new Error("AES-GCM nonce must be 12 bytes");
|
if (nonce.length !== 12) {
|
||||||
|
throw new Error("AES-GCM nonce must be 12 bytes");
|
||||||
|
}
|
||||||
const ciphertext = await webcrypto.subtle.encrypt(
|
const ciphertext = await webcrypto.subtle.encrypt(
|
||||||
{ name: "AES-GCM", iv: buffer(nonce) },
|
{ name: "AES-GCM", iv: buffer(nonce) },
|
||||||
await importMasterKey(masterKey, "encrypt"),
|
await importMasterKey(masterKey, "encrypt"),
|
||||||
@@ -80,14 +88,16 @@ async function parseProfile(entry: unknown, index: number, masterKey: string): P
|
|||||||
throw new Error(`${at}.${key}: unknown field`);
|
throw new Error(`${at}.${key}: unknown field`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const { type, model, token } = entry;
|
const type = field(entry, "type");
|
||||||
if (type !== "claude" && type !== "codex" && type !== "opencode") {
|
const model = field(entry, "model");
|
||||||
throw new Error(`${at}.type: expected "claude", "codex", or "opencode"`);
|
const token = field(entry, "token");
|
||||||
|
if (type !== "CLAUDE" && type !== "CODEX" && type !== "OPENCODE") {
|
||||||
|
throw new Error(`${at}.type: expected "CLAUDE", "CODEX", or "OPENCODE"`);
|
||||||
}
|
}
|
||||||
if (model !== undefined && (typeof model !== "string" || model === "")) {
|
if (model !== undefined && (typeof model !== "string" || model === "")) {
|
||||||
throw new Error(`${at}.model: expected a model name`);
|
throw new Error(`${at}.model: expected a model name`);
|
||||||
}
|
}
|
||||||
if ((type === "claude" || type === "opencode") && typeof token !== "string") {
|
if ((type === "CLAUDE" || type === "OPENCODE") && typeof token !== "string") {
|
||||||
throw new Error(`${at}.token: expected an encrypted credential`);
|
throw new Error(`${at}.token: expected an encrypted credential`);
|
||||||
}
|
}
|
||||||
if (token !== undefined && typeof token !== "string") {
|
if (token !== undefined && typeof token !== "string") {
|
||||||
@@ -95,7 +105,7 @@ async function parseProfile(entry: unknown, index: number, masterKey: string): P
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
type,
|
type,
|
||||||
model: model ?? DEFAULT_MODELS[type],
|
model: model ?? defaultModel(type),
|
||||||
...(typeof token === "string" && {
|
...(typeof token === "string" && {
|
||||||
token: await decryptCredential(token, masterKey),
|
token: await decryptCredential(token, masterKey),
|
||||||
}),
|
}),
|
||||||
@@ -112,7 +122,8 @@ export async function parseCredentials(text: string, masterKey: string): Promise
|
|||||||
throw new Error(`${key}: unknown field`);
|
throw new Error(`${key}: unknown field`);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const { "reviewer-token": reviewerToken, profiles } = value;
|
const reviewerToken = field(value, "reviewer-token");
|
||||||
|
const profiles = field(value, "profiles");
|
||||||
if (typeof reviewerToken !== "string") {
|
if (typeof reviewerToken !== "string") {
|
||||||
throw new TypeError("reviewer-token: expected an encrypted credential");
|
throw new TypeError("reviewer-token: expected an encrypted credential");
|
||||||
}
|
}
|
||||||
@@ -120,7 +131,10 @@ export async function parseCredentials(text: string, masterKey: string): Promise
|
|||||||
throw new Error("profiles must contain at least one profile");
|
throw new Error("profiles must contain at least one profile");
|
||||||
}
|
}
|
||||||
const parsed = await Promise.all(
|
const parsed = await Promise.all(
|
||||||
profiles.map((entry: unknown, index) => parseProfile(entry, index, masterKey)),
|
profiles.map(async (entry: unknown, index) => {
|
||||||
|
const profile = await parseProfile(entry, index, masterKey);
|
||||||
|
return profile;
|
||||||
|
}),
|
||||||
);
|
);
|
||||||
return { reviewerToken: await decryptCredential(reviewerToken, masterKey), profiles: parsed };
|
return { reviewerToken: await decryptCredential(reviewerToken, masterKey), profiles: parsed };
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ test.skipIf(!IS_ROOT)("prepares root-only reviewer and isolated profile credenti
|
|||||||
`${action}/profiles.json`,
|
`${action}/profiles.json`,
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
"reviewer-token": ENCRYPTED,
|
"reviewer-token": ENCRYPTED,
|
||||||
profiles: [{ type: "claude", token: ENCRYPTED }, { type: "codex" }],
|
profiles: [{ type: "CLAUDE", token: ENCRYPTED }, { type: "CODEX" }],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -49,7 +49,8 @@ test.skipIf(!IS_ROOT)("prepares root-only reviewer and isolated profile credenti
|
|||||||
assert(claude.tokenFile !== null);
|
assert(claude.tokenFile !== null);
|
||||||
expect(await readFile(claude.tokenFile, "utf8")).toBe("secret-token");
|
expect(await readFile(claude.tokenFile, "utf8")).toBe("secret-token");
|
||||||
await expectPrivate(claude.tokenFile, claude.uid, 0o600);
|
await expectPrivate(claude.tokenFile, claude.uid, 0o600);
|
||||||
expect((await stat(codex.home)).uid).toStrictEqual(codex.uid);
|
const codexHome = await stat(codex.home);
|
||||||
|
expect(codexHome.uid).toStrictEqual(codex.uid);
|
||||||
expect(codex.tokenFile).toBe(null);
|
expect(codex.tokenFile).toBe(null);
|
||||||
|
|
||||||
const ownToken = spawnSync("/bin/cat", [claude.tokenFile], {
|
const ownToken = spawnSync("/bin/cat", [claude.tokenFile], {
|
||||||
@@ -76,19 +77,19 @@ test.skipIf(!IS_ROOT)("removes prepared credentials when output publication fail
|
|||||||
`${action}/profiles.json`,
|
`${action}/profiles.json`,
|
||||||
JSON.stringify({
|
JSON.stringify({
|
||||||
"reviewer-token": ENCRYPTED,
|
"reviewer-token": ENCRYPTED,
|
||||||
profiles: [{ type: "claude", token: ENCRYPTED }],
|
profiles: [{ type: "CLAUDE", token: ENCRYPTED }],
|
||||||
}),
|
}),
|
||||||
);
|
);
|
||||||
const result = spawnSync(
|
const result = spawnSync(
|
||||||
process.execPath,
|
process.execPath,
|
||||||
[fileURLToPath(new URL("../prepare/index.ts", import.meta.url))],
|
[fileURLToPath(new URL("../prepare/index.ts", import.meta.url))],
|
||||||
{
|
{
|
||||||
env: {
|
env: Object.fromEntries([
|
||||||
ACTION_PATH: action,
|
["ACTION_PATH", action],
|
||||||
RUNNER_TEMP: root,
|
["RUNNER_TEMP", root],
|
||||||
BOT_AGENTS_MASTER_KEY: MASTER_KEY,
|
["BOT_AGENTS_MASTER_KEY", MASTER_KEY],
|
||||||
GITHUB_OUTPUT: action,
|
["GITHUB_OUTPUT", action],
|
||||||
},
|
]),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
+28
-32
@@ -1,7 +1,7 @@
|
|||||||
import { chmod, chown, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
import { chmod, chown, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
|
||||||
import { join } from "node:path";
|
import { join } from "node:path";
|
||||||
|
|
||||||
import { isMapping } from "#common";
|
import { field, isMapping } from "#common";
|
||||||
import type { ProfileFailure, ProfileIdentity } from "#profiles";
|
import type { ProfileFailure, ProfileIdentity } from "#profiles";
|
||||||
|
|
||||||
import { parseCredentials } from "./credentials.ts";
|
import { parseCredentials } from "./credentials.ts";
|
||||||
@@ -61,32 +61,28 @@ export async function prepareRuntime(
|
|||||||
await writePrivate(reviewerFile, credentials.reviewerToken, 0, 0);
|
await writePrivate(reviewerFile, credentials.reviewerToken, 0, 0);
|
||||||
|
|
||||||
// One profile at a time, in order, as each claims the next UID.
|
// One profile at a time, in order, as each claims the next UID.
|
||||||
const profiles = await credentials.profiles.reduce<Promise<RuntimeProfile[]>>(
|
const profiles: RuntimeProfile[] = [];
|
||||||
async (previous, profile, index) => {
|
for (const [index, profile] of credentials.profiles.entries()) {
|
||||||
const prepared = await previous;
|
const uid = FIRST_PROFILE_UID + index;
|
||||||
const uid = FIRST_PROFILE_UID + index;
|
const home = join(runtimeDir, `profile-${index}`);
|
||||||
const home = join(runtimeDir, `profile-${index}`);
|
await mkdir(home, { mode: 0o700 });
|
||||||
await mkdir(home, { mode: 0o700 });
|
await chmod(home, 0o700);
|
||||||
await chmod(home, 0o700);
|
await chown(home, uid, uid);
|
||||||
await chown(home, uid, uid);
|
const tokenFile =
|
||||||
const tokenFile =
|
profile.token === undefined || profile.token === "" ? null : join(home, "token");
|
||||||
profile.token === undefined || profile.token === "" ? null : join(home, "token");
|
if (tokenFile !== null && profile.token !== undefined) {
|
||||||
if (tokenFile !== null && profile.token !== undefined) {
|
await writePrivate(tokenFile, profile.token, uid, uid);
|
||||||
await writePrivate(tokenFile, profile.token, uid, uid);
|
}
|
||||||
}
|
profiles.push({
|
||||||
prepared.push({
|
index,
|
||||||
index,
|
type: profile.type,
|
||||||
type: profile.type,
|
model: profile.model,
|
||||||
model: profile.model,
|
uid,
|
||||||
uid,
|
gid: uid,
|
||||||
gid: uid,
|
home,
|
||||||
home,
|
tokenFile,
|
||||||
tokenFile,
|
});
|
||||||
});
|
}
|
||||||
return prepared;
|
|
||||||
},
|
|
||||||
Promise.resolve([]),
|
|
||||||
);
|
|
||||||
|
|
||||||
const manifestPath = join(runtimeDir, "manifest.json");
|
const manifestPath = join(runtimeDir, "manifest.json");
|
||||||
const manifest: RuntimeManifest = {
|
const manifest: RuntimeManifest = {
|
||||||
@@ -107,11 +103,11 @@ export async function prepareRuntime(
|
|||||||
function isRuntimeManifest(value: unknown): value is RuntimeManifest {
|
function isRuntimeManifest(value: unknown): value is RuntimeManifest {
|
||||||
return (
|
return (
|
||||||
isMapping(value) &&
|
isMapping(value) &&
|
||||||
typeof value["runtimeDir"] === "string" &&
|
typeof field(value, "runtimeDir") === "string" &&
|
||||||
typeof value["manifestPath"] === "string" &&
|
typeof field(value, "manifestPath") === "string" &&
|
||||||
typeof value["reviewerFile"] === "string" &&
|
typeof field(value, "reviewerFile") === "string" &&
|
||||||
typeof value["outcomeFile"] === "string" &&
|
typeof field(value, "outcomeFile") === "string" &&
|
||||||
Array.isArray(value["profiles"])
|
Array.isArray(field(value, "profiles"))
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+21
-6
@@ -1,5 +1,5 @@
|
|||||||
// Test support: the current user's IDs, a fresh temporary directory, and a
|
// Test support: the current user's IDs, a fresh temporary directory, the
|
||||||
// plain command runner. It imports no source module, so the repository-level
|
// inherited environment, and a plain command runner. It imports no source module, so the repository-level
|
||||||
// tests in tests/, which reach src/ only through `#testing`, never touch
|
// tests in tests/, which reach src/ only through `#testing`, never touch
|
||||||
// internals.
|
// internals.
|
||||||
import { spawn } from "node:child_process";
|
import { spawn } from "node:child_process";
|
||||||
@@ -24,8 +24,9 @@ export const IS_ROOT: boolean = currentUid() === 0;
|
|||||||
// Symlinks and POSIX modes, as these tests use them, need a Unix host.
|
// Symlinks and POSIX modes, as these tests use them, need a Unix host.
|
||||||
export const IS_WINDOWS: boolean = process.platform === "win32";
|
export const IS_WINDOWS: boolean = process.platform === "win32";
|
||||||
|
|
||||||
export function makeTempDir(): Promise<string> {
|
export async function makeTempDir(): Promise<string> {
|
||||||
return mkdtemp(join(tmpdir(), "bot-agents-test-"));
|
const path = await mkdtemp(join(tmpdir(), "bot-agents-test-"));
|
||||||
|
return path;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CommandResult {
|
export interface CommandResult {
|
||||||
@@ -33,14 +34,28 @@ export interface CommandResult {
|
|||||||
stderr: string;
|
stderr: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// This process's environment as a map from variable name to value.
|
||||||
|
export function inheritedEnvironment(): Map<string, string> {
|
||||||
|
const result = new Map<string, string>();
|
||||||
|
for (const [name, value] of Object.entries(process.env)) {
|
||||||
|
if (value !== undefined) {
|
||||||
|
result.set(name, value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
// Runs a command with stdin closed and only the given environment, and
|
// Runs a command with stdin closed and only the given environment, and
|
||||||
// collects its stderr.
|
// collects its stderr.
|
||||||
export async function runCommand(
|
export async function runCommand(
|
||||||
command: string,
|
command: string,
|
||||||
args: string[],
|
args: string[],
|
||||||
env: NodeJS.ProcessEnv,
|
env: ReadonlyMap<string, string>,
|
||||||
): Promise<CommandResult> {
|
): Promise<CommandResult> {
|
||||||
const child = spawn(command, args, { env, stdio: ["ignore", "ignore", "pipe"] });
|
const child = spawn(command, args, {
|
||||||
|
env: Object.fromEntries(env),
|
||||||
|
stdio: ["ignore", "ignore", "pipe"],
|
||||||
|
});
|
||||||
const [stderr, closed] = await Promise.all([text(child.stderr), once(child, "close")]);
|
const [stderr, closed] = await Promise.all([text(child.stderr), once(child, "close")]);
|
||||||
const exitCode: unknown = closed[0];
|
const exitCode: unknown = closed[0];
|
||||||
return { success: exitCode === 0, stderr };
|
return { success: exitCode === 0, stderr };
|
||||||
|
|||||||
@@ -15,7 +15,11 @@ const PHASES: [phase: string, firstVariable: string][] = [
|
|||||||
|
|
||||||
test.each(PHASES)("Node loads the %s phase", async (phase, firstVariable) => {
|
test.each(PHASES)("Node loads the %s phase", async (phase, firstVariable) => {
|
||||||
const path = fileURLToPath(new URL(`../src/${phase}/index.ts`, import.meta.url));
|
const path = fileURLToPath(new URL(`../src/${phase}/index.ts`, import.meta.url));
|
||||||
const result = await runCommand(process.execPath, [path], { PATH: process.env["PATH"] ?? "" });
|
const result = await runCommand(
|
||||||
|
process.execPath,
|
||||||
|
[path],
|
||||||
|
new Map([["PATH", process.env["PATH"] ?? ""]]),
|
||||||
|
);
|
||||||
expect(result.success).toBe(false);
|
expect(result.success).toBe(false);
|
||||||
expect(result.stderr).toContain(`${firstVariable} is not set`);
|
expect(result.stderr).toContain(`${firstVariable} is not set`);
|
||||||
});
|
});
|
||||||
|
|||||||
+68
-48
@@ -3,24 +3,22 @@ import process from "node:process";
|
|||||||
import { assert, expect, test } from "vite-plus/test";
|
import { assert, expect, test } from "vite-plus/test";
|
||||||
import { parse } from "yaml";
|
import { parse } from "yaml";
|
||||||
|
|
||||||
import { makeTempDir, runCommand } from "#testing";
|
import { inheritedEnvironment, makeTempDir, runCommand } from "#testing";
|
||||||
|
|
||||||
type JsonObject = NodeJS.Dict<unknown>;
|
// A parsed YAML or JSON mapping, keyed by its dynamic field names.
|
||||||
|
type Mapping = Map<string, unknown>;
|
||||||
|
|
||||||
const isMapping = (value: unknown): value is JsonObject =>
|
const mapping = (value: unknown, at: string): Mapping => {
|
||||||
typeof value === "object" && value !== null && !Array.isArray(value);
|
assert(typeof value === "object" && value !== null && !Array.isArray(value), at);
|
||||||
|
return new Map(Object.entries(value));
|
||||||
const mapping = (value: unknown, at: string): JsonObject => {
|
|
||||||
assert(isMapping(value), at);
|
|
||||||
return value;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const sequence = (value: unknown, at: string): JsonObject[] => {
|
const sequence = (value: unknown, at: string): Mapping[] => {
|
||||||
assert(Array.isArray(value), at);
|
assert(Array.isArray(value), at);
|
||||||
return value.map((entry: unknown, index) => mapping(entry, `${at}[${index}]`));
|
return value.map((entry: unknown, index) => mapping(entry, `${at}[${index}]`));
|
||||||
};
|
};
|
||||||
|
|
||||||
async function yaml(path: string): Promise<JsonObject> {
|
async function yaml(path: string): Promise<Mapping> {
|
||||||
const value: unknown = parse(await readFile(path, "utf8"));
|
const value: unknown = parse(await readFile(path, "utf8"));
|
||||||
return mapping(value, path);
|
return mapping(value, path);
|
||||||
}
|
}
|
||||||
@@ -33,8 +31,8 @@ async function yamlFiles(): Promise<string[]> {
|
|||||||
.filter((path) => !/^(?:\.git|\.superpowers|node_modules)\//u.test(path));
|
.filter((path) => !/^(?:\.git|\.superpowers|node_modules)\//u.test(path));
|
||||||
}
|
}
|
||||||
|
|
||||||
const findStep = (steps: JsonObject[], key: string, value: string): JsonObject => {
|
const findStep = (steps: Mapping[], key: string, value: string): Mapping => {
|
||||||
const step = steps.find((entry) => entry[key] === value);
|
const step = steps.find((entry) => entry.get(key) === value);
|
||||||
assert(step !== undefined, `${key}: ${value}`);
|
assert(step !== undefined, `${key}: ${value}`);
|
||||||
return step;
|
return step;
|
||||||
};
|
};
|
||||||
@@ -42,16 +40,21 @@ const findStep = (steps: JsonObject[], key: string, value: string): JsonObject =
|
|||||||
test("all committed YAML parses", async () => {
|
test("all committed YAML parses", async () => {
|
||||||
const files = await yamlFiles();
|
const files = await yamlFiles();
|
||||||
assert(files.length > 0);
|
assert(files.length > 0);
|
||||||
await Promise.all(files.map((file) => yaml(file)));
|
await Promise.all(
|
||||||
|
files.map(async (file) => {
|
||||||
|
await yaml(file);
|
||||||
|
}),
|
||||||
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("the action exposes only the master key and scopes it to preparation", async () => {
|
test("the action exposes only the master key and scopes it to preparation", async () => {
|
||||||
const action = await yaml("action.yml");
|
const action = await yaml("action.yml");
|
||||||
expect(Object.keys(mapping(action["inputs"], "inputs"))).toStrictEqual(["master-key"]);
|
expect([...mapping(action.get("inputs"), "inputs").keys()]).toStrictEqual(["master-key"]);
|
||||||
const steps = sequence(mapping(action["runs"], "runs")["steps"], "runs.steps");
|
const steps = sequence(mapping(action.get("runs"), "runs").get("steps"), "runs.steps");
|
||||||
for (const step of steps) {
|
for (const step of steps) {
|
||||||
if (typeof step["run"] === "string") {
|
const run = step.get("run");
|
||||||
expect(step["run"].includes("\n"), String(step["name"])).toBe(false);
|
if (typeof run === "string") {
|
||||||
|
expect(run.includes("\n"), String(step.get("name"))).toBe(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
const checkout = findStep(steps, "uses", "actions/checkout@v4");
|
const checkout = findStep(steps, "uses", "actions/checkout@v4");
|
||||||
@@ -59,16 +62,16 @@ test("the action exposes only the master key and scopes it to preparation", asyn
|
|||||||
const agent = findStep(steps, "id", "agent");
|
const agent = findStep(steps, "id", "agent");
|
||||||
const post = findStep(steps, "id", "post");
|
const post = findStep(steps, "id", "post");
|
||||||
findStep(steps, "id", "source");
|
findStep(steps, "id", "source");
|
||||||
expect(mapping(checkout["with"], "checkout.with")["token"]).toBe("${{ gitea.token }}");
|
expect(mapping(checkout.get("with"), "checkout.with").get("token")).toBe("${{ gitea.token }}");
|
||||||
expect(mapping(prepare["env"], "prepare.env")["BOT_AGENTS_MASTER_KEY"]).toBe(
|
expect(mapping(prepare.get("env"), "prepare.env").get("BOT_AGENTS_MASTER_KEY")).toBe(
|
||||||
"${{ inputs.master-key }}",
|
"${{ inputs.master-key }}",
|
||||||
);
|
);
|
||||||
expect(JSON.stringify(agent).includes("BOT_AGENTS_MASTER_KEY")).toBe(false);
|
expect(JSON.stringify(Object.fromEntries(agent)).includes("BOT_AGENTS_MASTER_KEY")).toBe(false);
|
||||||
expect(JSON.stringify(post).includes("BOT_AGENTS_MASTER_KEY")).toBe(false);
|
expect(JSON.stringify(Object.fromEntries(post)).includes("BOT_AGENTS_MASTER_KEY")).toBe(false);
|
||||||
expect(mapping(agent["env"], "agent.env")["GITEA_TOKEN"]).toBe("${{ gitea.token }}");
|
expect(mapping(agent.get("env"), "agent.env").get("GITEA_TOKEN")).toBe("${{ gitea.token }}");
|
||||||
assert(String(post["if"]).includes("always()"));
|
assert(String(post.get("if")).includes("always()"));
|
||||||
for (const step of [prepare, agent, post]) {
|
for (const step of [prepare, agent, post]) {
|
||||||
assert(String(step["run"]).includes("steps.source.outputs.path"));
|
assert(String(step.get("run")).includes("steps.source.outputs.path"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -76,15 +79,15 @@ test("the source protection script stages immutable action files", async () => {
|
|||||||
const temp = await makeTempDir();
|
const temp = await makeTempDir();
|
||||||
const outputFile = `${temp}/output`;
|
const outputFile = `${temp}/output`;
|
||||||
try {
|
try {
|
||||||
const result = await runCommand("/bin/bash", ["scripts/protect-source.sh"], {
|
const environment = inheritedEnvironment();
|
||||||
...process.env,
|
environment.set("ACTION_PATH", process.cwd());
|
||||||
ACTION_PATH: process.cwd(),
|
environment.set("GITHUB_OUTPUT", outputFile);
|
||||||
GITHUB_OUTPUT: outputFile,
|
environment.set("RUNNER_TEMP", temp);
|
||||||
RUNNER_TEMP: temp,
|
const result = await runCommand("/bin/bash", ["scripts/protect-source.sh"], environment);
|
||||||
});
|
|
||||||
assert(result.success, result.stderr);
|
assert(result.success, result.stderr);
|
||||||
|
|
||||||
const path = (await readFile(outputFile, "utf8")).trim().slice(5);
|
const output = await readFile(outputFile, "utf8");
|
||||||
|
const path = output.trim().slice(5);
|
||||||
const files = [
|
const files = [
|
||||||
"src/prepare/index.ts",
|
"src/prepare/index.ts",
|
||||||
"src/run/index.ts",
|
"src/run/index.ts",
|
||||||
@@ -95,7 +98,12 @@ test("the source protection script stages immutable action files", async () => {
|
|||||||
"profiles.json",
|
"profiles.json",
|
||||||
"prompt.md",
|
"prompt.md",
|
||||||
];
|
];
|
||||||
const stats = await Promise.all(files.map((file) => stat(`${path}/${file}`)));
|
const stats = await Promise.all(
|
||||||
|
files.map(async (file) => {
|
||||||
|
const info = await stat(`${path}/${file}`);
|
||||||
|
return info;
|
||||||
|
}),
|
||||||
|
);
|
||||||
for (const [index, info] of stats.entries()) {
|
for (const [index, info] of stats.entries()) {
|
||||||
assert(info.isFile(), files[index]);
|
assert(info.isFile(), files[index]);
|
||||||
expect(info.mode & 0o022, files[index]).toStrictEqual(0);
|
expect(info.mode & 0o022, files[index]).toStrictEqual(0);
|
||||||
@@ -108,10 +116,15 @@ test("the source protection script stages immutable action files", async () => {
|
|||||||
test("module-relative runtime assets exist", async () => {
|
test("module-relative runtime assets exist", async () => {
|
||||||
const module = new URL("../src/run/index.ts", import.meta.url);
|
const module = new URL("../src/run/index.ts", import.meta.url);
|
||||||
const source = await readFile(module, "utf8");
|
const source = await readFile(module, "utf8");
|
||||||
const assets = [...source.matchAll(/new URL\("([^"]+)", import\.meta\.url\)/gu)].map(
|
const assets = [...source.matchAll(/new URL\("(?<asset>[^"]+)", import\.meta\.url\)/gu)].map(
|
||||||
([, asset = ""]) => new URL(asset, module),
|
([, asset = ""]) => new URL(asset, module),
|
||||||
);
|
);
|
||||||
const stats = await Promise.all(assets.map((asset) => stat(asset)));
|
const stats = await Promise.all(
|
||||||
|
assets.map(async (asset) => {
|
||||||
|
const info = await stat(asset);
|
||||||
|
return info;
|
||||||
|
}),
|
||||||
|
);
|
||||||
for (const [index, info] of stats.entries()) {
|
for (const [index, info] of stats.entries()) {
|
||||||
assert(info.isFile(), assets[index]?.pathname);
|
assert(info.isFile(), assets[index]?.pathname);
|
||||||
}
|
}
|
||||||
@@ -119,27 +132,30 @@ test("module-relative runtime assets exist", async () => {
|
|||||||
|
|
||||||
test("the repository uses its trusted main action", async () => {
|
test("the repository uses its trusted main action", async () => {
|
||||||
const workflow = await yaml(".gitea/workflows/agents.yml");
|
const workflow = await yaml(".gitea/workflows/agents.yml");
|
||||||
const job = mapping(mapping(workflow["jobs"], "jobs")["agent"], "jobs.agent");
|
const job = mapping(mapping(workflow.get("jobs"), "jobs").get("agent"), "jobs.agent");
|
||||||
const permissions = mapping(job["permissions"], "jobs.agent.permissions");
|
const permissions = mapping(job.get("permissions"), "jobs.agent.permissions");
|
||||||
expect(permissions).toStrictEqual({
|
expect(Object.fromEntries(permissions)).toStrictEqual({
|
||||||
code: "write",
|
code: "write",
|
||||||
issues: "write",
|
issues: "write",
|
||||||
"pull-requests": "write",
|
"pull-requests": "write",
|
||||||
});
|
});
|
||||||
const steps = sequence(job["steps"], "jobs.agent.steps");
|
const steps = sequence(job.get("steps"), "jobs.agent.steps");
|
||||||
expect(steps.findIndex((step) => step["uses"] === "./")).toStrictEqual(-1);
|
expect(steps.findIndex((step) => step.get("uses") === "./")).toStrictEqual(-1);
|
||||||
const trusted = findStep(steps, "uses", "https://git.capsulizers.com/commons/bot-agents@main");
|
const trusted = findStep(steps, "uses", "https://git.capsulizers.com/commons/bot-agents@main");
|
||||||
expect(mapping(trusted["with"], "trusted.with")["master-key"]).toBe(
|
expect(mapping(trusted.get("with"), "trusted.with").get("master-key")).toBe(
|
||||||
"${{ secrets.BOT_AGENTS_MASTER_KEY }}",
|
"${{ secrets.BOT_AGENTS_MASTER_KEY }}",
|
||||||
);
|
);
|
||||||
expect(JSON.stringify(workflow).includes("gitea.actor != 'bot'")).toBe(true);
|
expect(JSON.stringify(Object.fromEntries(workflow)).includes("gitea.actor != 'bot'")).toBe(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("CI checks every phase and the root isolation suite", async () => {
|
test("CI checks every phase and the root isolation suite", async () => {
|
||||||
const workflow = await yaml(".gitea/workflows/check.yml");
|
const workflow = await yaml(".gitea/workflows/check.yml");
|
||||||
const job = mapping(mapping(workflow["jobs"], "jobs")["check"], "jobs.check");
|
const job = mapping(mapping(workflow.get("jobs"), "jobs").get("check"), "jobs.check");
|
||||||
const commands = sequence(job["steps"], "jobs.check.steps")
|
const commands = sequence(job.get("steps"), "jobs.check.steps")
|
||||||
.map((step) => (typeof step["run"] === "string" ? step["run"] : ""))
|
.map((step) => {
|
||||||
|
const run = step.get("run");
|
||||||
|
return typeof run === "string" ? run : "";
|
||||||
|
})
|
||||||
.join("\n");
|
.join("\n");
|
||||||
// `vp check` type-checks every phase, and `vp test` runs each of them under
|
// `vp check` type-checks every phase, and `vp test` runs each of them under
|
||||||
// Node as well as the root-only isolation tests.
|
// Node as well as the root-only isolation tests.
|
||||||
@@ -176,8 +192,12 @@ test("profile preparation does not receive provider credentials", async () => {
|
|||||||
|
|
||||||
test("central profiles fall back from Codex to Claude to OpenCode", async () => {
|
test("central profiles fall back from Codex to Claude to OpenCode", async () => {
|
||||||
const credentials: unknown = JSON.parse(await readFile("profiles.json", "utf8"));
|
const credentials: unknown = JSON.parse(await readFile("profiles.json", "utf8"));
|
||||||
const profiles = sequence(mapping(credentials, "profiles.json")["profiles"], "profiles");
|
const profiles = sequence(mapping(credentials, "profiles.json").get("profiles"), "profiles");
|
||||||
expect(profiles.map((profile) => profile["type"])).toStrictEqual(["codex", "claude", "opencode"]);
|
expect(profiles.map((profile) => profile.get("type"))).toStrictEqual([
|
||||||
expect(profiles[2]?.["model"]).toBe("openrouter/qwen/qwen3.8-27b");
|
"CODEX",
|
||||||
assert(String(profiles[2]?.["token"]).startsWith("v1:"));
|
"CLAUDE",
|
||||||
|
"OPENCODE",
|
||||||
|
]);
|
||||||
|
expect(profiles[2]?.get("model")).toBe("openrouter/qwen/qwen3.8-27b");
|
||||||
|
assert(String(profiles[2]?.get("token")).startsWith("v1:"));
|
||||||
});
|
});
|
||||||
|
|||||||
+12
-5
@@ -2,7 +2,7 @@ import explicitTypes from "eslint-plugin-explicit-types";
|
|||||||
import importStructure from "eslint-plugin-import-structure";
|
import importStructure from "eslint-plugin-import-structure";
|
||||||
import { defineConfig } from "vite-plus";
|
import { defineConfig } from "vite-plus";
|
||||||
|
|
||||||
import projectLint from "./scripts/project-lint.ts";
|
import projectLint, { projectOverrides } from "./scripts/project-lint.ts";
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
lint: {
|
lint: {
|
||||||
@@ -12,13 +12,20 @@ export default defineConfig({
|
|||||||
"eslint-plugin-import-structure",
|
"eslint-plugin-import-structure",
|
||||||
"./scripts/project-lint.ts",
|
"./scripts/project-lint.ts",
|
||||||
],
|
],
|
||||||
categories: { correctness: "error", suspicious: "error", pedantic: "error", perf: "error" },
|
categories: {
|
||||||
|
correctness: "error",
|
||||||
|
suspicious: "error",
|
||||||
|
pedantic: "error",
|
||||||
|
perf: "error",
|
||||||
|
style: "error",
|
||||||
|
restriction: "error",
|
||||||
|
},
|
||||||
rules: {
|
rules: {
|
||||||
...explicitTypes.configs.concrete.rules,
|
...explicitTypes.configs.all.rules,
|
||||||
...explicitTypes.configs.absence.rules,
|
...importStructure.configs.all.rules,
|
||||||
...importStructure.configs.modules.rules,
|
|
||||||
...projectLint.configs.project.rules,
|
...projectLint.configs.project.rules,
|
||||||
},
|
},
|
||||||
|
overrides: projectOverrides,
|
||||||
options: {
|
options: {
|
||||||
typeAware: true,
|
typeAware: true,
|
||||||
typeCheck: true,
|
typeCheck: true,
|
||||||
|
|||||||
Reference in New Issue
Block a user