Group the sources into aliased modules and lint with the published plugins (#23)

Groups the flat `src/` into cohesive modules and turns on the published lint plugins. No behavior change.

## Module layout

Each module is a direct `src/` subfolder with an `index.ts` barrel and a `#` alias in `package.json` `imports` (layer order, top first):

| Alias | Files |
| --- | --- |
| `#prepare` | `index.ts` (the prepare phase entry point) |
| `#run` | `index.ts` (the run phase entry point) |
| `#post` | `index.ts` (the post phase entry point), `post.ts`, `post.test.ts` |
| `#agents` | `auth.ts`, `opencode.ts` (Codex / Claude Code sign-in, OpenCode args and output) |
| `#processes` | `child.ts`, `isolation.ts` |
| `#runtime` | `runtime.ts`, `credentials.ts` |
| `#profiles` | `profiles.ts` |
| `#common` | `errors.ts`, `json.ts` |
| `#testing` | `index.ts` (unchanged) |

Every top-level entry of `src/` is an aliased module folder. Tests stay next to their code as `*.test.ts`. Each phase's `index.ts` is its entry point, and `action.yml` now runs `node src/<phase>/index.ts`. The post phase's logic moved to `src/post/post.ts` so its test can import it; `index.ts` keeps the env reading and the `import.meta.main` call. `run`'s prompt URL is now `../../prompt.md`. `scripts/protect-source.sh` now copies `src/` recursively (it used to copy `src/*.ts` only), and the workflow test checks that module files get staged too.

## Lint plugins

- New devDependencies: `eslint-plugin-explicit-types@^0.6.1` and `eslint-plugin-import-structure@^0.10.2`, both in `jsPlugins`. The lockfile comes from a real `npm install`.
- Enabled configs: `importStructure.configs.modules`, `explicitTypes.configs.concrete`, `explicitTypes.configs.absence`.
- **explicit-types `naming` is off** (the other app repos turn it on). Its `upper-snake-string-unions` and `no-upper-snake-object-keys` rules fire on wire tokens this repo doesn't choose: profile types `"claude" | "codex" | "opencode"` from `profiles.json`, failure reasons posted to Gitea, Gitea's `"new" | "old"` side, and environment variable names such as `PATH`. Satisfying them would change behavior or need opt-outs. This is logged as an open question for the user.

Lint fixes, all type-level:
- `Pick<BotProfile, "type" | "model">` became a named `ProfileIdentity` interface that `BotProfile`, `ProfileFailure`, and `RuntimeProfile` extend. `RuntimeOutcome` is now `RuntimeSuccess | RuntimeFailure`.
- Inline object types became named interfaces.
- `Record<string, string>` env maps became `NodeJS.ProcessEnv`. `JsonObject` and the verdict table became `NodeJS.Dict<…>`.
- `T | undefined` locals and returns became `T | null` with matching checks. `typeof fetch` became a `Fetcher` type.
- Claude's result fields are held in camelCase (`isError`, `apiErrorStatus`) after parsing, because `id-match` rejects snake_case interface members.
- Duplicate import sources are merged (`import-structure/no-duplicate-import-source`).

## Verification

- `vp check`: clean.
- `vp test`: 61 passed and 5 skipped as a normal user. All 66 passed as root in `node:24-bookworm`.
- Each phase (`node src/<phase>/index.ts`) run from a `protect-source.sh` copy loads its full alias graph under Node.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Reviewed-on: #23
Reviewed-by: bot <noreply@capsulizers.com>
Co-authored-by: Danny Kim <temeddix@gmail.com>
Co-committed-by: Danny Kim <temeddix@gmail.com>

.agents/memory/bot-agents-child-processes.md

@@ -1,5 +1,5 @@
 ---
-description: Child processes use plain node:child_process spawn (explicit stdio, uid/gid, whole env); src/child.ts has exitCode (128+signo) and echo; no execFile maxBuffer
+description: Child processes use plain node:child_process spawn (explicit stdio, uid/gid, whole env); src/processes/child.ts has exitCode (128+signo) and echo; no execFile maxBuffer
 ---
 
 Every call site calls `spawn` from `node:child_process` itself, with
@@ -15,7 +15,7 @@ everything explicit:
 - No `execFile`/`exec`: their `maxBuffer` (1 MiB) kills a chatty child. Read
   piped streams incrementally instead.
 
-`src/child.ts` holds what the call sites share:
+`src/processes/child.ts` holds what the call sites share:
 
 - **`exitCode(child)`**: call it right after `spawn`. It settles on `exit`
   (not `close`, which a daemonized grandchild can hold open), maps a signal to
@@ -28,9 +28,9 @@ Tests use `spawnSync` for short commands.
 
 Other port details:
 
-- **`src/errors.ts`** `isNotFound` checks `ENOENT` (file) or `ESRCH` (process).
+- **`src/common/errors.ts`** `isNotFound` checks `ENOENT` (file) or `ESRCH` (process).
 - Temporary files are an exclusive `wx` create with mode `0600`.
-- `src/json.ts` holds type guards used instead of `as` casts on parsed JSON.
+- `src/common/json.ts` holds type guards used instead of `as` casts on parsed JSON.
 - `process` and `Buffer` must come from `node:` imports:
   `no-restricted-globals` in `scripts/project-lint.ts` enforces it
   ([[lint-parity-never-shrinks]]).

.agents/memory/bot-agents-lint-opt-outs.md

@@ -15,7 +15,7 @@ when the migration PR was approved:
   ([[lint-overrides-policy]]).
 
 Size and complexity limits match Deno, which had none here, so every Oxlint
-limit rule is `"off"` ([[lint-config-shape]]). `run.ts` and `post.ts` keep
+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.

.agents/memory/bot-agents-migration-decisions.md

@@ -1,5 +1,5 @@
 ---
-description: bot-agents migration decisions: live @main action for six repos, JSON profiles, Node 24.2+, no eslint-plugin-* packages needed
+description: bot-agents migration decisions: live @main action for six repos, JSON profiles, Node 24.2+, lints with eslint-plugin-import-structure and explicit-types (concrete, absence)
 ---
 
 Decisions for `commons/bot-agents` (Capsulizers Gitea), from the Deno to
@@ -15,16 +15,19 @@ Node + Vite+ migration (PR #20, `node-migration`, 2026-10-15/16):
   removed the only runtime dependency (`@std/yaml`); keep it free of runtime
   dependencies (`@eslint/core` and the other devDependencies serve only the
   tooling).
-- **Node 24.2+**, not 22: `src/post.ts` uses `import.meta.main`. There is no
+- **Node 24.2+**, not 22: `src/post/index.ts` uses `import.meta.main`. There is no
   `engines` (user decision 2026-10-18): the `node:24-bookworm` job image
   decides the version ([[bot-agents-runtime-no-build]]).
-- **No `eslint-plugin-*` packages** (`eslint-plugin-explicit-types`,
+- **Published lint plugins** (2026-10-18, after they reached npm):
-  `eslint-plugin-import-structure`, `eslint-plugin-lit-robust`; unscoped
+  `eslint-plugin-import-structure` (`modules` config) and
-  since 2026-10-18, formerly `@cunarist/...`). The Deno setup enabled no
+  `eslint-plugin-explicit-types` (`concrete` and `absence` configs) are
-  plugin, so this repo depends on none and CI passes without them being
+  devDependencies, enabled in `vite.config.ts`. explicit-types' `naming`
-  published. Planned (2026-10-17): once the plugins are on npm, add
+  config is left off: its `upper-snake-string-unions` and
-  `eslint-plugin-import-structure` (rule prefix `import-structure/`) here for
+  `no-upper-snake-object-keys` rules fire on wire tokens this repo does not
-  its import checks.
+  name (profile types such as `"claude"`, failure reasons posted to Gitea,
+  environment variable names), which cannot change without changing
+  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
   comment responses, the runtime manifest, and the outcome's profile type are
   validated; some type errors became `TypeError` with the same messages.

.agents/memory/bot-agents-runtime-no-build.md

@@ -10,7 +10,7 @@ dependency**. Hence `tsconfig.json` has `erasableSyntaxOnly` and
 properties, no decorators) and relative `.ts` imports.
 
 - **Image:** the steps assume the `node:24-bookworm` job container. Node must
-  be 24.2+ for `import.meta.main` in `post.ts`. That image is the only Node
+  be 24.2+ for `import.meta.main` in `src/post/index.ts`. That image is the only Node
   pin (`package.json` has no `engines`); `check.yml` prints `node --version`
   to confirm the cached image's minor.
 - **Root-owned source copy:** `scripts/protect-source.sh` copies the action

.agents/memory/bot-agents-tests-root-only.md

@@ -2,24 +2,24 @@
 description: Isolation and credential tests need root and use test.skipIf(!IS_ROOT); locally 5 skip, CI runs as root so all 66 run; verify isolation changes in node:24-bookworm as root
 ---
 
-Some tests exercise real UID isolation, process cleanup, and `prepare.ts`
+Some tests exercise real UID isolation, process cleanup, and the prepare phase's
 credential cleanup. They need root and are written as
 `test.skipIf(!IS_ROOT)(...)` (`IS_ROOT` from `#testing`), so they show
 as skipped instead of silently passing.
 
 - As a normal user `vp test` passes 61 and skips 5. In CI (self-hosted
   runner, root) all 66 run.
-- When changing `isolation.ts`, `runtime.ts`, `credentials.ts`, `prepare.ts`,
+- When changing `isolation.ts`, `runtime.ts`, `credentials.ts`, `prepare/index.ts`,
   or `child.ts`, run the suite as root in `node:24-bookworm` (e.g. a
   container with the repo mounted) before pushing; a green non-root run
   proves nothing about those paths.
 - The migration also ran an end-to-end smoke as root with fake
   `codex`/`claude`/`npx` binaries and a fake Gitea through
-  `protect-source.sh` -> `prepare.ts` -> `run.ts` -> `post.ts`; repeat that
+  `protect-source.sh` -> `prepare/index.ts` -> `run/index.ts` -> `post/index.ts`; repeat that
   for changes to the phase flow ([[bot-agents-runtime-no-build]]).
 - `src/testing/index.ts` holds the shared test helpers (user IDs, temp dirs,
   `runCommand`) behind the `#testing` alias. Every test imports it as
   `#testing`. It imports no source module, so `tests/` (which may not use
   `../`) never reaches internals. Tests follow
-  [[tests-layout-vitest]] (unit tests in `src/*.test.ts`, repo-level ones in
+  [[tests-layout-vitest]] (unit tests next to their code in `src/`, repo-level ones in
   `tests/`).

.agents/memory/imports-aliases-barrels.md

@@ -97,7 +97,8 @@ It is not a plugin rule.
 - Every `package.json` `imports` alias points only at the `index.ts` of a
   direct subfolder of `src/`, e.g. `"#helpers": "./src/helpers/index.ts"`.
   No alias to a single file, a deeper folder, or anything outside `src/`.
-  Here the one alias is `"#testing": "./src/testing/index.ts"`.
+  Here the aliases are `#prepare`, `#run`, `#post`, `#agents`, `#processes`, `#runtime`, `#profiles`,
+  `#common`, and `#testing`, in that layer order.
 - Code outside `src/` (`scripts/`, `tests/`, `vite.config.ts`) gets no alias
   of its own and imports its own files by `./` relative paths. It reaches
   `src/` only through the aliases, since `../` is banned.

.agents/memory/toolchain-node-vite-plus.md

@@ -14,7 +14,7 @@ description: Node.js (no engines in apps; images pin 24) with Vite+ (vp) and npm
   `engines` or a `.node-version`, local `vp` uses its default Node
   (`vp env default`). bot-agents has no Containerfile or setup step: the
   self-hosted runner's `node:24-bookworm` job image runs the action and its
-  checks, and `src/post.ts` needs 24.2+ (`import.meta.main`).
+  checks, and `src/post/index.ts` needs 24.2+ (`import.meta.main`).
 - **Bun is not supported** (dropped 2026-10-15). No Bun CI legs, docs, or
   runtime branches. Oxlint's `RuleTester` refuses to run under Bun anyway, and
   `vp` brings its own Node, the way uv brings its own Python.

.gitea/workflows/check.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      # The action runs on this same image; src/post.ts needs Node 24.2+.
+      # The action runs on this same image; src/post/index.ts needs Node 24.2+.
       - run: node --version
 
       - run: npm ci

AGENTS.md

@@ -20,7 +20,7 @@ dependency. Keep the sources to erasable syntax and `.ts` imports, which
 `exactOptionalPropertyTypes` off
 ([.agents/memory/ts-only-files-and-imports.md](.agents/memory/ts-only-files-and-imports.md)).
 Checks use Vite+: `vp check` formats, lints, and type-checks, and `vp test`
-runs Vitest. Unit tests sit next to the code as `src/*.test.ts`;
+runs Vitest. Unit tests sit next to the code as `*.test.ts` in `src/`;
 repository-level tests live in `tests/`.
 
 A `#` alias in `package.json` `imports` may point anywhere and owns its
@@ -34,9 +34,16 @@ import is banned in every file, owned or not
 (`import/no-relative-parent-imports`); runtime file URLs such as
 `new URL("../prompt.md", import.meta.url)` are paths, not imports, and stay.
 Files no alias owns need no `index.ts` and no alias, and import `./` siblings
-and subfolders freely. The one alias is `#testing` (`./src/testing/index.ts`):
+and subfolders freely. Every top-level entry of `src/` is an aliased module
-tests that use its helpers import it by alias, and `tests/` imports `src/`
+folder. The aliases, in layer order, are the three phases `#prepare`, `#run`,
-only through it. Local convention, stricter than the general rule above: in
+and `#post`, then `#agents` (Codex,
+Claude Code and OpenCode specifics), `#processes` (child processes and the
+isolated profile users), `#runtime` (the prepared runtime and its
+credentials), `#profiles`, `#common` (error and JSON checks), and `#testing`
+(test helpers), each with a `src/<name>/index.ts` barrel. A phase's
+`index.ts` is also its entry point, which `action.yml` runs as
+`node src/<phase>/index.ts`. Tests that use the test
+helpers import `#testing`, and `tests/` imports `src/` only through it. Local convention, stricter than the general rule above: in
 this repo, aliases point only at a direct subfolder of `src/`
 (`"#helpers": "./src/helpers/index.ts"`), and code outside `src/` uses `./`
 relative imports. `scripts/` is flat: one file per tool, no subfolders and no `index.ts`, imported directly by file path

action.yml

@@ -35,7 +35,7 @@ runs:
     - name: Prepare credentials
       id: prepare
       shell: bash
-      run: node "${{ steps.source.outputs.path }}/src/prepare.ts"
+      run: node "${{ steps.source.outputs.path }}/src/prepare/index.ts"
       env:
         ACTION_PATH: ${{ steps.source.outputs.path }}
         BOT_AGENTS_MASTER_KEY: ${{ inputs.master-key }}
@@ -43,7 +43,7 @@ runs:
     - name: Run bot
       id: agent
       shell: bash
-      run: node "${{ steps.source.outputs.path }}/src/run.ts"
+      run: node "${{ steps.source.outputs.path }}/src/run/index.ts"
       env:
         BOT_AGENTS_MANIFEST: ${{ steps.prepare.outputs.manifest }}
         GITEA_TOKEN: ${{ gitea.token }}
@@ -56,7 +56,7 @@ runs:
       id: post
       if: always() && steps.prepare.outputs.manifest != ''
       shell: bash
-      run: node "${{ steps.source.outputs.path }}/src/post.ts"
+      run: node "${{ steps.source.outputs.path }}/src/post/index.ts"
       env:
         BOT_AGENTS_MANIFEST: ${{ steps.prepare.outputs.manifest }}
         GITEA_API_URL: ${{ gitea.api_url }}

package-lock.json

@@ -9,6 +9,8 @@
         "@eslint/core": "^0.17.0",
         "@types/node": "^24.19.2",
         "@typescript-eslint/types": "^8.71.2",
+        "eslint-plugin-explicit-types": "^0.6.1",
+        "eslint-plugin-import-structure": "^0.10.2",
         "vite-plus": "^1.2.0",
         "yaml": "^2.9.1"
       }
@@ -1887,6 +1889,32 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/eslint-plugin-explicit-types": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-explicit-types/-/eslint-plugin-explicit-types-0.6.1.tgz",
+      "integrity": "sha512-8JU2Ceoi1aLbhYo4LHwb9Eone/pJuMnzVP1ZlGJn/ETxVzJQFziRnJwOF2dRmInn9dGqvwq05dc3o5tVyTGP2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": ">=22.18"
+      }
+    },
+    "node_modules/eslint-plugin-import-structure": {
+      "version": "0.10.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import-structure/-/eslint-plugin-import-structure-0.10.2.tgz",
+      "integrity": "sha512-jvx4sccxEdURGXrDtBJZtCHiKqELkHRVlLrMU5bVZIjglN0U464Joopcfn6JvmNB2zyIh2FkolaJQJaKkvy6Xw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint/core": "^0.17.0"
+      },
+      "engines": {
+        "node": ">=22.18"
+      }
+    },
     "node_modules/estree-walker": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",

package.json

@@ -4,12 +4,22 @@
   "description": "A Gitea composite action that runs a coding agent for approved issue and pull request automation.",
   "type": "module",
   "imports": {
+    "#prepare": "./src/prepare/index.ts",
+    "#run": "./src/run/index.ts",
+    "#post": "./src/post/index.ts",
+    "#agents": "./src/agents/index.ts",
+    "#processes": "./src/processes/index.ts",
+    "#runtime": "./src/runtime/index.ts",
+    "#profiles": "./src/profiles/index.ts",
+    "#common": "./src/common/index.ts",
     "#testing": "./src/testing/index.ts"
   },
   "devDependencies": {
     "@eslint/core": "^0.17.0",
     "@types/node": "^24.19.2",
     "@typescript-eslint/types": "^8.71.2",
+    "eslint-plugin-explicit-types": "^0.6.1",
+    "eslint-plugin-import-structure": "^0.10.2",
     "vite-plus": "^1.2.0",
     "yaml": "^2.9.1"
   }

scripts/protect-source.sh

@@ -2,9 +2,9 @@
 set -euo pipefail
 
 path=$(mktemp -d "${RUNNER_TEMP}/bot-agents-source-XXXXXX")
-mkdir "${path}/src"
+cp -a "${ACTION_PATH}/src" "${path}/"
-cp -a "${ACTION_PATH}"/src/*.ts "${path}/src/"
+# package.json makes Node load the TypeScript sources as ES modules and
-# package.json makes Node load the TypeScript sources as ES modules.
+# resolves their `#` aliases.
 cp -a "${ACTION_PATH}/package.json" "${ACTION_PATH}/profiles.json" "${ACTION_PATH}/prompt.md" "${path}/"
 chmod -R go-w "${path}"
 printf 'path=%s\n' "${path}" >> "${GITHUB_OUTPUT}"

src/agents/auth.test.ts

@@ -1,5 +1,7 @@
-import { expect, test } from "vite-plus/test";
 import { mkdir, readFile, rm, stat, symlink, writeFile } from "node:fs/promises";
+import { expect, test } from "vite-plus/test";
+
+import { currentGid, currentUid, IS_WINDOWS, makeTempDir } from "#testing";
 
 import {
   codexAuthentication,
@@ -9,7 +11,6 @@ import {
   retryInvalidToken,
   stageCodexAuth,
 } from "./auth.ts";
-import { currentGid, currentUid, IS_WINDOWS, makeTempDir } from "#testing";
 
 test("retries once after an invalid refresh token", async () => {
   let attempts = 0;
@@ -104,7 +105,7 @@ test("re-logs in after the job 9837 revoked-session stderr", async () => {
 test("recognizes a rejected Claude OAuth token", () => {
   expect(
     isClaudeAuthFailure({
-      api_error_status: 401,
+      apiErrorStatus: 401,
       result: "Failed to authenticate. API Error: 401 OAuth access token is invalid.",
     }),
   ).toBe(true);
@@ -113,7 +114,7 @@ test("recognizes a rejected Claude OAuth token", () => {
       result: "OAuth token has expired. Please obtain a new token or refresh your existing token.",
     }),
   ).toBe(true);
-  expect(isClaudeAuthFailure({ api_error_status: 429, result: "API Error: 429" })).toBe(false);
+  expect(isClaudeAuthFailure({ apiErrorStatus: 429, result: "API Error: 429" })).toBe(false);
 });
 
 test("selects API-key login only for a configured Codex token", () => {

src/agents/auth.ts

@@ -12,10 +12,18 @@ import {
 } from "node:fs/promises";
 import { dirname, join } from "node:path";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound, isObject } from "#common";
-import { isObject } from "./json.ts";
 
-export type CodexAuthentication = { kind: "api-key"; token: string } | { kind: "persistent" };
+interface CodexApiKey {
+  kind: "api-key";
+  token: string;
+}
+
+interface CodexPersistent {
+  kind: "persistent";
+}
+
+export type CodexAuthentication = CodexApiKey | CodexPersistent;
 
 export function codexAuthentication(token?: string): CodexAuthentication {
   return token === undefined ? { kind: "persistent" } : { kind: "api-key", token };
@@ -34,21 +42,27 @@ export function isCodexAuthFailure(error: string): boolean {
 // stream-json result, e.g. "Failed to authenticate. API Error: 401 OAuth
 // access token is invalid." with api_error_status 401.
 // The fields of Claude Code's stream-json `result` event that tell a sign-in
-// failure apart, under their own names.
+// failure apart, as `apiErrorStatus` and `result`.
-export type ClaudeFailureFields = Partial<Record<"api_error_status", number | null>> & {
+export interface ClaudeFailureFields {
+  apiErrorStatus?: number;
   result?: string;
-};
+}
 
 export function isClaudeAuthFailure(result: ClaudeFailureFields): boolean {
   return (
-    result.api_error_status === 401 ||
+    result.apiErrorStatus === 401 ||
     /failed to authenticate|oauth (?:access )?token (?:is invalid|has expired)|invalid api key|authentication_error|please run \/login|not logged in/iu.test(
       result.result ?? "",
     )
   );
 }
 
-export async function retryInvalidToken<T extends { code: number; error: string }>(
+export interface CommandResult {
+  code: number;
+  error: string;
+}
+
+export async function retryInvalidToken<T extends CommandResult>(
   attempt: () => Promise<T>,
   relogin: () => Promise<void>,
 ): Promise<T> {

src/agents/index.ts

@@ -0,0 +1,17 @@
+// Agent command-line specifics: Codex and Claude Code sign-in handling and
+// OpenCode's arguments and output.
+export {
+  codexAuthentication,
+  isClaudeAuthFailure,
+  isCodexAuthFailure,
+  persistCodexAuth,
+  retryInvalidToken,
+  stageCodexAuth,
+} from "./auth.ts";
+export type { ClaudeFailureFields, CodexAuthentication, CommandResult } from "./auth.ts";
+export {
+  collectOpenCodeOutput,
+  openCodeArgs,
+  openCodeError,
+  parseOpenCodeEvents,
+} from "./opencode.ts";

src/agents/opencode.test.ts

@@ -1,11 +1,13 @@
 import { assert, expect, test } from "vite-plus/test";
+
+import { AgentAuthError } from "#profiles";
+
 import {
   collectOpenCodeOutput,
   openCodeArgs,
   openCodeError,
   parseOpenCodeEvents,
 } from "./opencode.ts";
-import { AgentAuthError } from "./profiles.ts";
 
 test("builds a non-interactive auto-approved OpenCode command", () => {
   expect(openCodeArgs("openrouter/qwen/qwen3.8-27b", "Review this")).toStrictEqual([
@@ -99,5 +101,5 @@ test("surfaces an OpenCode error event instead of empty output", () => {
   expect(() => parseOpenCodeEvents(openRouterError(429, "Rate limit exceeded"))).toThrow(
     "API error 429",
   );
-  expect(openCodeError('{"type":"text","part":{"text":"ok"}}')).toBe(undefined);
+  expect(openCodeError('{"type":"text","part":{"text":"ok"}}')).toBeNull();
 });

src/agents/opencode.ts

@@ -1,5 +1,5 @@
-import { isObject } from "./json.ts";
+import { isObject } from "#common";
-import { AgentAuthError } from "./profiles.ts";
+import { AgentAuthError } from "#profiles";
 
 export function openCodeArgs(model: string, prompt: string): string[] {
   return ["run", "--format", "json", "--auto", "--model", model, prompt];
@@ -7,13 +7,21 @@ export function openCodeArgs(model: string, prompt: string): string[] {
 
 type ChunkWriter = (chunk: Uint8Array) => void | Promise<void>;
 
+interface OpenCodeOutput {
+  stdout: string;
+  stderr: string;
+}
+
 export async function collectOpenCodeOutput(
   stdout: AsyncIterable<Uint8Array>,
   stderr: AsyncIterable<Uint8Array>,
   writeStdout: ChunkWriter,
   writeStderr: ChunkWriter,
-): Promise<{ stdout: string; stderr: string }> {
+): Promise<OpenCodeOutput> {
-  const collect = async (stream: AsyncIterable<Uint8Array>, write: ChunkWriter) => {
+  const collect = async (
+    stream: AsyncIterable<Uint8Array>,
+    write: ChunkWriter,
+  ): Promise<string> => {
     const chunks: Uint8Array[] = [];
     for await (const chunk of stream) {
       chunks.push(chunk);
@@ -38,8 +46,8 @@ export async function collectOpenCodeOutput(
 // OpenCode reports provider failures, including a rejected OpenRouter key
 // (401 "User not found."), as a JSON error event on stdout and exits 1 with an
 // empty stderr.
-export function openCodeError(output: string): Error | undefined {
+export function openCodeError(output: string): Error | null {
-  let failure: Error | undefined;
+  let failure: Error | null = null;
   for (const line of output.split("\n")) {
     if (line.trim() === "") continue;
     let event: unknown;
@@ -69,7 +77,7 @@ export function openCodeError(output: string): Error | undefined {
 }
 
 export function parseOpenCodeEvents(output: string): string {
-  let result: string | undefined;
+  let result: string | null = null;
   for (const line of output.split("\n")) {
     if (line.trim() === "") continue;
     const event: unknown = JSON.parse(line);
@@ -79,7 +87,7 @@ export function parseOpenCodeEvents(output: string): string {
     const { text } = part;
     if (typeof text === "string" && text.trim() !== "") result = text;
   }
-  if (result === undefined) {
+  if (result === null) {
     throw openCodeError(output) ?? new Error("OpenCode produced no text output");
   }
   return result;

src/common/index.ts

@@ -0,0 +1,4 @@
+// Helpers every phase shares: error and JSON value checks.
+export { isNotFound } from "./errors.ts";
+export { isMapping, isObject } from "./json.ts";
+export type { JsonObject } from "./json.ts";

src/common/json.ts

@@ -1,5 +1,5 @@
 // Type guards for values read from JSON, which arrive as `unknown`.
-export type JsonObject = Record<string, unknown>;
+export type JsonObject = NodeJS.Dict<unknown>;
 
 // Any non-null object, arrays included: reading a missing key yields undefined.
 export function isObject(value: unknown): value is JsonObject {

src/post/index.ts

@@ -0,0 +1,22 @@
+// The post phase: posts the agent's result as the reviewer and removes the
+// runtime credentials.
+import process from "node:process";
+
+import { postRuntime } from "./post.ts";
+
+export { type Fetcher, type PostContext, postRuntime } from "./post.ts";
+
+function required(name: string): string {
+  const value = process.env[name];
+  if (value === undefined || value === "") throw new Error(`${name} is not set`);
+  return value;
+}
+
+if (import.meta.main) {
+  await postRuntime(required("BOT_AGENTS_MANIFEST"), {
+    apiUrl: required("GITEA_API_URL"),
+    repository: required("GITEA_REPOSITORY"),
+    issueIndex: required("ISSUE_INDEX"),
+    eventName: required("EVENT_NAME"),
+  });
+}

src/post/post.test.ts

@@ -1,13 +1,12 @@
 import { chmod, mkdir, rm, stat, symlink, writeFile } from "node:fs/promises";
-
 import { assert, expect, test } from "vite-plus/test";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound } from "#common";
-import { postRuntime } from "./post.ts";
+import type { RuntimeFailure, RuntimeManifest, RuntimeOutcome } from "#runtime";
-import type { PostContext } from "./post.ts";
-import type { RuntimeManifest, RuntimeOutcome } from "./runtime.ts";
 import { currentGid, currentUid, IS_WINDOWS, makeTempDir } from "#testing";
 
+import { type Fetcher, type PostContext, postRuntime } from "./post.ts";
+
 const context: PostContext = {
   apiUrl: "https://gitea.example/api/v1",
   repository: "owner/repo",
@@ -23,7 +22,18 @@ interface Fixture {
   outcomeFile: string;
 }
 
-type FixtureSource = Extract<RuntimeOutcome, { ok: false }> | { ok: true; body: string };
+interface FixtureSuccess {
+  ok: true;
+  body: string;
+}
+
+type FixtureSource = RuntimeFailure | FixtureSuccess;
+
+// One request the fake Gitea received.
+interface RecordedRequest {
+  url: string;
+  init: RequestInit;
+}
 
 async function writePrivate(path: string, text: string): Promise<void> {
   await writeFile(path, text, { mode: 0o600 });
@@ -32,8 +42,8 @@ async function writePrivate(path: string, text: string): Promise<void> {
 
 async function writeArtifacts(
   outcome: RuntimeOutcome,
-  review: string | undefined,
+  review?: string,
-  anchors: unknown,
+  anchors?: unknown,
 ): Promise<void> {
   if (!outcome.ok) return;
   if (review !== undefined) await writePrivate(outcome.reviewPath, review);
@@ -107,7 +117,7 @@ function requestBody(init?: RequestInit): unknown {
 }
 
 // A fake Gitea that records each request body and answers with `status`.
-function recordingFetch(bodies: unknown[], status = 201): typeof fetch {
+function recordingFetch(bodies: unknown[], status = 201): Fetcher {
   return (_url, init) => {
     bodies.push(requestBody(init));
     return Promise.resolve(new Response(null, { status }));
@@ -116,7 +126,7 @@ function recordingFetch(bodies: unknown[], status = 201): typeof fetch {
 
 test("posts a successful issue result and removes runtime credentials", async () => {
   const result = await fixture({ ok: true, body: "done" });
-  const requests: { url: unknown; init: RequestInit | undefined }[] = [];
+  const requests: RecordedRequest[] = [];
 
   await postRuntime(result.manifestPath, context, (url, init) => {
     requests.push({ url, init });

src/post/post.ts

@@ -1,14 +1,10 @@
 import type { Stats } from "node:fs";
 import { lstat, readFile, rm } from "node:fs/promises";
 import { join } from "node:path";
-import process from "node:process";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound, isObject } from "#common";
-import { isObject } from "./json.ts";
+import { failureFooter, type FailureReason, type ProfileFailure, withProfile } from "#profiles";
-import { failureFooter, withProfile } from "./profiles.ts";
+import { readRuntimeManifest, type RuntimeManifest, type RuntimeOutcome } from "#runtime";
-import type { FailureReason, ProfileFailure } from "./profiles.ts";
-import { readRuntimeManifest } from "./runtime.ts";
-import type { RuntimeManifest, RuntimeOutcome } from "./runtime.ts";
 
 export interface PostContext {
   apiUrl: string;
@@ -26,7 +22,7 @@ interface Anchor {
 
 const ANSI = new RegExp(`${String.fromCodePoint(27)}\\[[0-9;]*[A-Za-z]`, "gu");
 const stripAnsi = (text: string): string => text.replace(ANSI, "");
-const VERDICTS: Record<string, [event: string, mark: string]> = {
+const VERDICTS: NodeJS.Dict<[event: string, mark: string]> = {
   Approved: ["APPROVED", "✅"],
   "Changes requested": ["REQUEST_CHANGES", "🛑"],
 };
@@ -37,6 +33,9 @@ const isFailureReason = (value: unknown): value is FailureReason => FAILURE_REAS
 const failureComment = (failures: ProfileFailure[]): string =>
   `AI bot failed.\n\n${failureFooter(failures)}`;
 
+// The `fetch` subset the reviewer posts through, which tests replace.
+export type Fetcher = (url: string, init: RequestInit) => Promise<Response>;
+
 class GiteaRequestError extends Error {}
 
 function parseAnchors(text: string, sourcePath: string): Anchor[] {
@@ -137,7 +136,7 @@ async function readAgentArtifact(
 export async function postRuntime(
   manifestPath: string,
   context: PostContext,
-  fetcher: typeof fetch = fetch,
+  fetcher: Fetcher = fetch,
 ): Promise<void> {
   const manifest = await readRuntimeManifest(manifestPath);
   try {
@@ -223,18 +222,3 @@ export async function postRuntime(
     });
   }
 }
-
-function required(name: string): string {
-  const value = process.env[name];
-  if (value === undefined || value === "") throw new Error(`${name} is not set`);
-  return value;
-}
-
-if (import.meta.main) {
-  await postRuntime(required("BOT_AGENTS_MANIFEST"), {
-    apiUrl: required("GITEA_API_URL"),
-    repository: required("GITEA_REPOSITORY"),
-    issueIndex: required("ISSUE_INDEX"),
-    eventName: required("EVENT_NAME"),
-  });
-}

src/prepare/index.ts

@@ -1,7 +1,7 @@
 import { appendFile, rm } from "node:fs/promises";
 import process from "node:process";
 
-import { prepareRuntime } from "./runtime.ts";
+import { prepareRuntime } from "#runtime";
 
 const env = (name: string): string => {
   const value = process.env[name];

src/processes/child.test.ts

@@ -1,8 +1,8 @@
 import { spawn } from "node:child_process";
-
 import { expect, test } from "vite-plus/test";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound } from "#common";
+
 import { exitCode } from "./child.ts";
 
 test("reports the exit code", async () => {

src/processes/index.ts

@@ -0,0 +1,4 @@
+// Child processes: waiting on and echoing them, and the isolated profile
+// user's processes and files.
+export { echo, exitCode } from "./child.ts";
+export { killProfileProcesses, readProfileFile } from "./isolation.ts";

src/processes/isolation.test.ts

@@ -1,14 +1,14 @@
-import { spawnSync } from "node:child_process";
+import { spawnSync, type SpawnSyncReturns } from "node:child_process";
-import type { SpawnSyncReturns } from "node:child_process";
-import { expect, test } from "vite-plus/test";
 import { chmod, chown, mkdir, readFile, rm, symlink, writeFile } from "node:fs/promises";
 import process from "node:process";
+import { expect, test } from "vite-plus/test";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound } from "#common";
-import { isRunnableProfileProcess, killProfileProcesses, readProfileFile } from "./isolation.ts";
+import type { RuntimeProfile } from "#runtime";
-import type { RuntimeProfile } from "./runtime.ts";
 import { currentUid, IS_ROOT, IS_WINDOWS, makeTempDir } from "#testing";
 
+import { isRunnableProfileProcess, killProfileProcesses, readProfileFile } from "./isolation.ts";
+
 const profile = (uid: number, home: string): RuntimeProfile => ({
   index: uid - 20_000,
   type: "claude",
@@ -25,7 +25,7 @@ function runAs(
   selected: RuntimeProfile,
   command: string,
   args: string[],
-  env?: Record<string, string>,
+  env?: NodeJS.ProcessEnv,
 ): SpawnSyncReturns<string> {
   return spawnSync(command, args, {
     cwd: "/",

src/processes/isolation.ts

@@ -2,8 +2,8 @@ import { lstat, readdir, readFile } from "node:fs/promises";
 import process from "node:process";
 import { setTimeout as sleep } from "node:timers/promises";
 
-import { isNotFound } from "./errors.ts";
+import { isNotFound } from "#common";
-import type { RuntimeProfile } from "./runtime.ts";
+import type { RuntimeProfile } from "#runtime";
 
 export function isRunnableProfileProcess(status: string, uid: number): boolean {
   const owner = /^Uid:\s+(\d+)/mu.exec(status)?.[1];

src/profiles/index.ts

@@ -0,0 +1,12 @@
+// Bot profiles: their footers, failure reports, ordered runs, and the
+// environment each agent gets.
+export {
+  AgentAuthError,
+  agentEnvironment,
+  failureFooter,
+  profileFooter,
+  runProfiles,
+  sanitizedEnvironment,
+  withProfile,
+} from "./profiles.ts";
+export type { BotProfile, FailureReason, ProfileFailure, ProfileIdentity } from "./profiles.ts";

src/profiles/profiles.test.ts

@@ -1,4 +1,5 @@
 import { expect, test } from "vite-plus/test";
+
 import {
   AgentAuthError,
   agentEnvironment,

src/profiles/profiles.ts

@@ -1,22 +1,32 @@
-export interface BotProfile {
+// The agent and model a profile runs, which every report names.
+export interface ProfileIdentity {
   type: "claude" | "codex" | "opencode";
   model: string;
+}
+
+export interface BotProfile extends ProfileIdentity {
   token?: string;
 }
 
-export function profileFooter(profile: Pick<BotProfile, "type" | "model">): string {
+export function profileFooter(profile: ProfileIdentity): string {
   return `> Profile: \`${profile.type}\` · \`${profile.model}\``;
 }
 
-export function withProfile(body: string, profile: Pick<BotProfile, "type" | "model">): string {
+export function withProfile(body: string, profile: ProfileIdentity): string {
   return `${body}\n\n${profileFooter(profile)}`;
 }
 
 export type FailureReason = "sign-in failed" | "usage exhausted" | "failed";
 
-export type ProfileFailure = Pick<BotProfile, "type" | "model"> & {
+export interface ProfileFailure extends ProfileIdentity {
   reason: FailureReason;
-};
+}
+
+// Where a profile's isolated user keeps its home.
+interface ProfileHome {
+  type: ProfileIdentity["type"];
+  home: string;
+}
 
 // Raised once an agent's credentials are rejected and any re-login is spent.
 export class AgentAuthError extends Error {}
@@ -41,7 +51,7 @@ export function failureFooter(failures: ProfileFailure[]): string {
 
 // Tries the profiles from `index` on, moving on only after a sign-in failure
 // or exhausted usage, and records every profile it tried.
-async function attemptFrom<T, P extends Pick<BotProfile, "type" | "model">>(
+async function attemptFrom<T, P extends ProfileIdentity>(
   profiles: P[],
   attempt: (profile: P) => Promise<T>,
   failures: ProfileFailure[],
@@ -62,7 +72,7 @@ async function attemptFrom<T, P extends Pick<BotProfile, "type" | "model">>(
   }
 }
 
-export function runProfiles<T, P extends Pick<BotProfile, "type" | "model">>(
+export function runProfiles<T, P extends ProfileIdentity>(
   profiles: P[],
   attempt: (profile: P) => Promise<T>,
   failures: ProfileFailure[] = [],
@@ -70,8 +80,8 @@ export function runProfiles<T, P extends Pick<BotProfile, "type" | "model">>(
   return attemptFrom(profiles, attempt, failures, 0);
 }
 
-export function sanitizedEnvironment(environment: Record<string, string>): Record<string, string> {
+export function sanitizedEnvironment(environment: NodeJS.ProcessEnv): NodeJS.ProcessEnv {
-  const result: Record<string, string> = {};
+  const result: NodeJS.ProcessEnv = {};
   for (const name of [
     "PATH",
     "HOME",
@@ -105,10 +115,10 @@ export function sanitizedEnvironment(environment: Record<string, string>): Recor
 }
 
 export function agentEnvironment(
-  environment: Record<string, string>,
+  environment: NodeJS.ProcessEnv,
-  profile: Pick<BotProfile, "type"> & { home: string },
+  profile: ProfileHome,
   token?: string,
-): Record<string, string> {
+): NodeJS.ProcessEnv {
   const result = sanitizedEnvironment(environment);
   result["HOME"] = profile.home;
   if (profile.type === "codex") result["CODEX_HOME"] = `${profile.home}/.codex`;

src/run/index.ts

@@ -10,46 +10,51 @@ import { finished } from "node:stream/promises";
 import { setTimeout as sleep } from "node:timers/promises";
 
 import {
+  type ClaudeFailureFields,
+  type CodexAuthentication,
   codexAuthentication,
+  collectOpenCodeOutput,
+  type CommandResult,
   isClaudeAuthFailure,
   isCodexAuthFailure,
-  persistCodexAuth,
-  retryInvalidToken,
-  stageCodexAuth,
-} from "./auth.ts";
-import type { ClaudeFailureFields, CodexAuthentication } from "./auth.ts";
-import { echo, exitCode } from "./child.ts";
-import { killProfileProcesses, readProfileFile } from "./isolation.ts";
-import { isObject } from "./json.ts";
-import {
-  collectOpenCodeOutput,
   openCodeArgs,
   openCodeError,
   parseOpenCodeEvents,
-} from "./opencode.ts";
+  persistCodexAuth,
+  retryInvalidToken,
+  stageCodexAuth,
+} from "#agents";
+import { isObject } from "#common";
+import { echo, exitCode, killProfileProcesses, readProfileFile } from "#processes";
 import {
   AgentAuthError,
   agentEnvironment,
+  type ProfileFailure,
+  type ProfileIdentity,
   runProfiles,
   sanitizedEnvironment,
   withProfile,
-} from "./profiles.ts";
+} from "#profiles";
-import type { ProfileFailure } from "./profiles.ts";
+import { readRuntimeManifest, type RuntimeOutcome, type RuntimeProfile } from "#runtime";
-import { readRuntimeManifest } from "./runtime.ts";
-import type { RuntimeOutcome, RuntimeProfile } from "./runtime.ts";
 
 interface AttemptResult {
   body: string;
   reviewPath: string;
   anchorsPath: string;
-  profile: Pick<RuntimeProfile, "type" | "model">;
+  profile: ProfileIdentity;
 }
 
-// Claude Code's stream-json `result` event, in its own field names.
+// Claude Code's stream-json `result` event, with camelCase field names.
-type ClaudeResult = ClaudeFailureFields &
+interface ClaudeResult extends ClaudeFailureFields {
-  Partial<Record<"is_error", boolean>> & {
+  isError?: boolean;
   subtype: string;
-  };
+}
+
+interface RenderedPrompt {
+  prompt: string;
+  reviewPath: string;
+  anchorsPath: string;
+}
 
 const env = (name: string): string => {
   const value = process.env[name];
@@ -57,8 +62,8 @@ const env = (name: string): string => {
   return value;
 };
 
-function definedEnvironment(): Record<string, string> {
+function definedEnvironment(): NodeJS.ProcessEnv {
-  const result: Record<string, string> = {};
+  const result: NodeJS.ProcessEnv = {};
   for (const [name, value] of Object.entries(process.env)) {
     if (value !== undefined) {
       result[name] = value;
@@ -112,8 +117,8 @@ async function configureGitAuthor(): Promise<void> {
   await runRoot("git", ["config", "user.email", user["email"]]);
 }
 
-async function readProfileToken(profile: RuntimeProfile): Promise<string | undefined> {
+async function readProfileToken(profile: RuntimeProfile): Promise<string | null> {
-  const token = profile.tokenFile === null ? undefined : await readFile(profile.tokenFile, "utf8");
+  const token = profile.tokenFile === null ? null : await readFile(profile.tokenFile, "utf8");
   return token;
 }
 
@@ -159,9 +164,7 @@ function formatComment(comment: unknown): string {
   return `## ${String(login)} at ${String(createdAt)}\n\n${String(body)}\n`;
 }
 
-async function renderPrompt(
+async function renderPrompt(profile: RuntimeProfile): Promise<RenderedPrompt> {
-  profile: RuntimeProfile,
-): Promise<{ prompt: string; reviewPath: string; anchorsPath: string }> {
   const reviewPath = await makeProfileFile(profile, "review.md");
   const anchorsPath = await makeProfileFile(profile, "anchors.json");
   const comments: unknown = await (
@@ -170,7 +173,7 @@ async function renderPrompt(
   if (!Array.isArray(comments)) {
     throw new TypeError("comments: unexpected Gitea response");
   }
-  const values: Record<string, string> = {
+  const values: NodeJS.ProcessEnv = {
     COMMENT: env("COMMENT"),
     ISSUE_COMMENTS: comments.map((comment: unknown) => formatComment(comment)).join("\n"),
     CODE_RULES: await (await gitea(RULES_PATH)).text(),
@@ -181,7 +184,7 @@ async function renderPrompt(
     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 {
     prompt: template.replaceAll(
       /\$\{(\w+)\}/gu,
@@ -217,7 +220,7 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
     },
   );
   const status = exitCode(claude);
-  let result: ClaudeResult | undefined;
+  let result: ClaudeResult | null = null;
   let error = "";
   const copyError = (async (): Promise<void> => {
     claude.stderr.setEncoding("utf8");
@@ -243,18 +246,17 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
         if (event["type"] === "result") {
           const { is_error: isError, result: answer, subtype, api_error_status: apiStatus } = event;
           result = {
-            is_error: typeof isError === "boolean" ? isError : undefined,
+            isError: typeof isError === "boolean" ? isError : undefined,
             result: typeof answer === "string" ? answer : undefined,
             subtype: String(subtype),
-            api_error_status:
+            apiErrorStatus: typeof apiStatus === "number" ? apiStatus : undefined,
-              typeof apiStatus === "number" || apiStatus === null ? apiStatus : undefined,
           };
         }
       }
     }
   }
   const [code] = await Promise.all([status, copyError]);
-  if (result?.is_error === true) {
+  if (result?.isError === true) {
     const failure = new Error(result.result ?? `claude ended with ${result.subtype}`);
     if (isClaudeAuthFailure(result)) {
       throw new AgentAuthError("claude sign-in failed", { cause: failure });
@@ -287,7 +289,7 @@ async function pollForInstructions(
 
 async function codexDeviceLogin(
   profile: RuntimeProfile,
-  environment: Record<string, string>,
+  environment: NodeJS.ProcessEnv,
 ): Promise<void> {
   const login = spawn("codex", ["login", "--device-auth"], {
     cwd: WORKSPACE,
@@ -316,7 +318,7 @@ async function codexDeviceLogin(
 
 async function codexApiLogin(
   profile: RuntimeProfile,
-  environment: Record<string, string>,
+  environment: NodeJS.ProcessEnv,
   token: string,
 ): Promise<void> {
   const login = spawn("codex", ["login", "--with-api-key"], {
@@ -363,7 +365,7 @@ async function runCodex(
     if ((await exitCode(check)) !== 0) await codexDeviceLogin(profile, environment);
   }
   const outputPath = await makeProfileFile(profile, "result.md");
-  const attempt = async (): Promise<{ code: number; error: string }> => {
+  const attempt = async (): Promise<CommandResult> => {
     const codex = spawn(
       "codex",
       [
@@ -440,12 +442,12 @@ async function runOpenCode(
 
 async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
   const token = await readProfileToken(profile);
-  const authentication = profile.type === "codex" ? codexAuthentication(token) : null;
+  const authentication = profile.type === "codex" ? codexAuthentication(token ?? undefined) : null;
   let stagedCodexAuth: string | null = null;
-  let body: string | undefined;
+  let body: string | null = null;
   let resultPath: string | null = null;
-  let reviewPath: string | undefined;
+  let reviewPath: string | null = null;
-  let anchorsPath: string | undefined;
+  let anchorsPath: string | null = null;
   try {
     if (authentication?.kind === "persistent") {
       stagedCodexAuth = await stageCodexAuth(CODEX_AUTH, profile.home, profile.uid, profile.gid);
@@ -460,7 +462,7 @@ async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
       resultPath = await runCodex(
         profile,
         rendered.prompt,
-        authentication ?? codexAuthentication(token),
+        authentication ?? codexAuthentication(token ?? undefined),
       );
     } else {
       body = await runOpenCode(profile, token ?? "", rendered.prompt);
@@ -472,7 +474,7 @@ async function runProfile(profile: RuntimeProfile): Promise<AttemptResult> {
     }
   }
   if (resultPath !== null) body = await readProfileFile(profile, resultPath);
-  if (body === undefined || reviewPath === undefined || anchorsPath === undefined) {
+  if (body === null || reviewPath === null || anchorsPath === null) {
     throw new Error("agent attempt produced no result");
   }
   return {

src/runtime/credentials.test.ts

@@ -1,4 +1,5 @@
 import { expect, test } from "vite-plus/test";
+
 import { decryptCredential, encryptCredential, parseCredentials } from "./credentials.ts";
 
 const MASTER_KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8";

src/runtime/credentials.ts

@@ -1,9 +1,15 @@
 import { webcrypto } from "node:crypto";
 
-import { isMapping } from "./json.ts";
+import { isMapping } from "#common";
-import type { BotProfile } from "./profiles.ts";
+import type { BotProfile } from "#profiles";
 
-const DEFAULT_MODELS: Record<BotProfile["type"], string> = {
+interface DefaultModels {
+  claude: string;
+  codex: string;
+  opencode: string;
+}
+
+const DEFAULT_MODELS: DefaultModels = {
   claude: "claude-sonnet-5",
   codex: "gpt-5.6-terra",
   opencode: "openrouter/qwen/qwen3.8-27b",

src/runtime/index.ts

@@ -0,0 +1,10 @@
+// The runtime the prepare phase writes for the later phases: decrypted
+// credentials laid out per profile, described by a manifest.
+export { prepareRuntime, readRuntimeManifest } from "./runtime.ts";
+export type {
+  RuntimeFailure,
+  RuntimeManifest,
+  RuntimeOutcome,
+  RuntimeProfile,
+  RuntimeSuccess,
+} from "./runtime.ts";

src/runtime/runtime.test.ts

@@ -2,13 +2,12 @@ import { spawnSync } from "node:child_process";
 import { chmod, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-
 import { assert, expect, test } from "vite-plus/test";
 
-import { prepareRuntime } from "./runtime.ts";
-import type { RuntimeProfile } from "./runtime.ts";
 import { IS_ROOT, makeTempDir } from "#testing";
 
+import { prepareRuntime, type RuntimeProfile } from "./runtime.ts";
+
 const MASTER_KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8";
 const ENCRYPTED = "v1:ICEiIyQlJicoKSor:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA";
 
@@ -82,7 +81,7 @@ test.skipIf(!IS_ROOT)("removes prepared credentials when output publication fail
     );
     const result = spawnSync(
       process.execPath,
-      [fileURLToPath(new URL("prepare.ts", import.meta.url))],
+      [fileURLToPath(new URL("../prepare/index.ts", import.meta.url))],
       {
         env: {
           ACTION_PATH: action,

src/runtime/runtime.ts

@@ -1,19 +1,20 @@
 import { chmod, chown, mkdir, mkdtemp, readFile, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 
+import { isMapping } from "#common";
+import type { ProfileFailure, ProfileIdentity } from "#profiles";
+
 import { parseCredentials } from "./credentials.ts";
-import { isMapping } from "./json.ts";
-import type { BotProfile, ProfileFailure } from "./profiles.ts";
 
 const FIRST_PROFILE_UID = 20_000;
 
-export type RuntimeProfile = Pick<BotProfile, "type" | "model"> & {
+export interface RuntimeProfile extends ProfileIdentity {
   index: number;
   uid: number;
   gid: number;
   home: string;
   tokenFile: string | null;
-};
+}
 
 export interface RuntimeManifest {
   runtimeDir: string;
@@ -23,15 +24,20 @@ export interface RuntimeManifest {
   profiles: RuntimeProfile[];
 }
 
-export type RuntimeOutcome =
+export interface RuntimeSuccess {
-  | {
   ok: true;
   body: string;
   reviewPath: string;
   anchorsPath: string;
-      profile: Pick<RuntimeProfile, "type" | "model">;
+  profile: ProfileIdentity;
 }
-  | { ok: false; failures: ProfileFailure[] };
+
+export interface RuntimeFailure {
+  ok: false;
+  failures: ProfileFailure[];
+}
+
+export type RuntimeOutcome = RuntimeSuccess | RuntimeFailure;
 
 async function writePrivate(path: string, value: string, uid: number, gid: number): Promise<void> {
   await writeFile(path, value, { mode: 0o600 });

src/testing/index.ts

@@ -38,7 +38,7 @@ export interface CommandResult {
 export async function runCommand(
   command: string,
   args: string[],
-  env: Record<string, string>,
+  env: NodeJS.ProcessEnv,
 ): Promise<CommandResult> {
   const child = spawn(command, args, { env, stdio: ["ignore", "ignore", "pipe"] });
   const [stderr, closed] = await Promise.all([text(child.stderr), once(child, "close")]);

tests/entrypoints.test.ts

@@ -1,11 +1,10 @@
 import process from "node:process";
 import { fileURLToPath } from "node:url";
-
 import { expect, test } from "vite-plus/test";
 
 import { runCommand } from "#testing";
 
-// Each phase runs as `node src/<phase>.ts` with no build step. Node loads the
+// Each phase runs as `node src/<phase>/index.ts` with no build step. Node loads the
 // whole import graph, stripping types, before the phase reads its first
 // variable, so failing on that variable proves every module loads.
 const PHASES: [phase: string, firstVariable: string][] = [
@@ -15,7 +14,7 @@ const PHASES: [phase: string, firstVariable: string][] = [
 ];
 
 test.each(PHASES)("Node loads the %s phase", async (phase, firstVariable) => {
-  const path = fileURLToPath(new URL(`../src/${phase}.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"] ?? "" });
   expect(result.success).toBe(false);
   expect(result.stderr).toContain(`${firstVariable} is not set`);

tests/workflow.test.ts

@@ -1,12 +1,11 @@
 import { readdir, readFile, rm, stat } from "node:fs/promises";
 import process from "node:process";
-
 import { assert, expect, test } from "vite-plus/test";
 import { parse } from "yaml";
 
 import { makeTempDir, runCommand } from "#testing";
 
-type JsonObject = Record<string, unknown>;
+type JsonObject = NodeJS.Dict<unknown>;
 
 const isMapping = (value: unknown): value is JsonObject =>
   typeof value === "object" && value !== null && !Array.isArray(value);
@@ -87,9 +86,11 @@ test("the source protection script stages immutable action files", async () => {
 
     const path = (await readFile(outputFile, "utf8")).trim().slice(5);
     const files = [
-      "src/prepare.ts",
+      "src/prepare/index.ts",
-      "src/run.ts",
+      "src/run/index.ts",
-      "src/post.ts",
+      "src/post/index.ts",
+      "src/runtime/index.ts",
+      "src/agents/auth.ts",
       "package.json",
       "profiles.json",
       "prompt.md",
@@ -105,7 +106,7 @@ test("the source protection script stages immutable action files", async () => {
 });
 
 test("module-relative runtime assets exist", async () => {
-  const module = new URL("../src/run.ts", import.meta.url);
+  const module = new URL("../src/run/index.ts", import.meta.url);
   const source = await readFile(module, "utf8");
   const assets = [...source.matchAll(/new URL\("([^"]+)", import\.meta\.url\)/gu)].map(
     ([, asset = ""]) => new URL(asset, module),
@@ -148,7 +149,7 @@ test("CI checks every phase and the root isolation suite", async () => {
 });
 
 test("uses the standard Skills installer without custom discovery", async () => {
-  const runner = await readFile("src/run.ts", "utf8");
+  const runner = await readFile("src/run/index.ts", "utf8");
   assert(runner.includes("skills add obra/superpowers"));
   const removed = await stat("superpowers.ts").then(
     () => false,
@@ -168,7 +169,7 @@ test("does not install Deno", async () => {
 });
 
 test("profile preparation does not receive provider credentials", async () => {
-  const runner = await readFile("src/run.ts", "utf8");
+  const runner = await readFile("src/run/index.ts", "utf8");
   assert(runner.includes("await prepareProfile(profile);"));
   expect(runner.includes("prepareProfile(profile, token)")).toBe(false);
 });

vite.config.ts

@@ -1,3 +1,5 @@
+import explicitTypes from "eslint-plugin-explicit-types";
+import importStructure from "eslint-plugin-import-structure";
 import { defineConfig } from "vite-plus";
 
 import projectLint from "./scripts/project-lint.ts";
@@ -5,9 +7,18 @@ import projectLint from "./scripts/project-lint.ts";
 export default defineConfig({
   lint: {
     plugins: ["typescript", "unicorn", "oxc", "import"],
-    jsPlugins: ["./scripts/project-lint.ts"],
+    jsPlugins: [
+      "eslint-plugin-explicit-types",
+      "eslint-plugin-import-structure",
+      "./scripts/project-lint.ts",
+    ],
     categories: { correctness: "error", suspicious: "error", pedantic: "error", perf: "error" },
-    rules: projectLint.configs.project.rules,
+    rules: {
+      ...explicitTypes.configs.concrete.rules,
+      ...explicitTypes.configs.absence.rules,
+      ...importStructure.configs.modules.rules,
+      ...projectLint.configs.project.rules,
+    },
     options: {
       typeAware: true,
       typeCheck: true,