Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0920a4e91b | |||
| 627458fb5f | |||
| 50df193a8c | |||
| 5b568f9ea6 | |||
| 60c63dee98 |
@@ -1,39 +0,0 @@
|
||||
---
|
||||
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
|
||||
---
|
||||
|
||||
Every call site calls `spawn` from `node:child_process` itself, with
|
||||
everything explicit:
|
||||
|
||||
- **`uid`/`gid`** of the profile for anything an agent profile runs (each
|
||||
profile is its own UID, 20000+). Never drop them.
|
||||
- **`env`** is the whole environment the child gets (a sanitized one for
|
||||
agents); nothing from the coordinator is merged in.
|
||||
- **`stdio`**: stdin is `"ignore"` so an agent CLI never waits on input
|
||||
(only `codex login --with-api-key` pipes the token in). Output that is not
|
||||
read is `"ignore"`; output that is read is `"pipe"` and streamed.
|
||||
- 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:
|
||||
|
||||
- **`exitCode(child)`**: call it right after `spawn`. It settles on `exit`
|
||||
(not `close`, which a daemonized grandchild can hold open), maps a signal to
|
||||
`128 + signo` as a shell does, and rejects on a failed start. The rejection
|
||||
is pre-caught so it is not reported as unhandled before the caller awaits it.
|
||||
- **`echo(stream, chunk)`**: writes and waits for `drain` when the buffer is
|
||||
full, so echoing never outruns a slow reader.
|
||||
|
||||
Tests use `spawnSync` for short commands.
|
||||
|
||||
Other port details:
|
||||
|
||||
- **`src/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.
|
||||
- `process` and `Buffer` must come from `node:` imports:
|
||||
`no-restricted-globals` in `scripts/project-lint.ts` enforces it
|
||||
([[lint-parity-never-shrinks]]).
|
||||
|
||||
Related: how each agent CLI reports bad credentials is in
|
||||
[[agent-cli-auth-failures]].
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
description: bot-agents migration decisions: live @main action for six repos, JSON profiles, Node 24.2+, no @cunarist plugins needed
|
||||
description: bot-agents migration decisions: live @main action for six repos, JSON profiles, Node 24.2+, Deno kept only for agents, no eslint-plugin-* packages needed
|
||||
---
|
||||
|
||||
Decisions for `commons/bot-agents` (Capsulizers Gitea), from the Deno to
|
||||
@@ -18,10 +18,17 @@ Node + Vite+ migration (PR #20, `node-migration`, 2026-10-15/16):
|
||||
- **Node 24.2+**, not 22: `src/post.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 `@cunarist/eslint-plugin-*`.** The Deno setup enabled no plugin, so
|
||||
this repo depends on none and CI passes without them being published.
|
||||
Planned (2026-10-17): once the plugins are on npm, add
|
||||
`@cunarist/eslint-plugin-modules` here for its import checks.
|
||||
- **Deno stays in the action's global npm install** (`action.yml`), only
|
||||
because the agents still check Deno-based consumer repos (memona,
|
||||
memona-home). Remove it once those repos have moved; it is not a
|
||||
dependency of this repo's TypeScript.
|
||||
- **No `eslint-plugin-*` packages** (`eslint-plugin-explicit-types`,
|
||||
`eslint-plugin-import-structure`, `eslint-plugin-lit-robust`; unscoped
|
||||
since 2026-10-18, formerly `@cunarist/...`). The Deno setup enabled no
|
||||
plugin, so this repo depends on none and CI passes without them being
|
||||
published. Planned (2026-10-17): once the plugins are on npm, add
|
||||
`eslint-plugin-import-structure` (rule prefix `import-structure/`) here for
|
||||
its import checks.
|
||||
- **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.
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
---
|
||||
description: src/command.ts reproduces Deno.Command on child_process.spawn (stdio defaults, clearEnv, uid/gid, 128+signo); src/errors.ts maps NotFound to ENOENT/ESRCH
|
||||
---
|
||||
|
||||
The Deno code was ported one for one; two small modules keep the old shapes
|
||||
so callers barely changed:
|
||||
|
||||
- **`src/command.ts`** wraps `child_process.spawn` with `Deno.Command`'s API:
|
||||
`output()` and `spawn()`, `clearEnv`, `uid`/`gid` (the agent isolation runs
|
||||
each profile as its own UID, 20000+), and Deno's stdio defaults: stdin
|
||||
inherited; stdout/stderr piped for `output()`, inherited for `spawn()`. A
|
||||
signal exit maps to status `128 + signo`. Status settles on process exit,
|
||||
not on stream close. Use it instead of calling `node:child_process`
|
||||
directly so isolation and status handling stay uniform.
|
||||
- **`src/errors.ts`** replaces `Deno.errors.NotFound` checks with an
|
||||
`ENOENT`/`ESRCH` code check.
|
||||
- `makeTempFile` became an exclusive `wx` create with mode `0600`.
|
||||
- `src/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` maps Deno's
|
||||
`no-window`/`no-process-global`/`no-node-globals` there
|
||||
([[lint-parity-never-shrinks]]).
|
||||
|
||||
Related: how each agent CLI reports bad credentials is in
|
||||
[[agent-cli-auth-failures]].
|
||||
@@ -1,5 +1,5 @@
|
||||
---
|
||||
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
|
||||
description: Isolation and credential tests need root and use test.skipIf(!IS_ROOT); locally 5 skip, CI runs as root so all 61 run; verify isolation changes in node:24-bookworm as root
|
||||
---
|
||||
|
||||
Some tests exercise real UID isolation, process cleanup, and `prepare.ts`
|
||||
@@ -7,10 +7,10 @@ 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.
|
||||
- As a normal user `vp test` passes 56 and skips 5. In CI (self-hosted
|
||||
runner, root) all 61 run.
|
||||
- When changing `isolation.ts`, `runtime.ts`, `credentials.ts`, `prepare.ts`,
|
||||
or `child.ts`, run the suite as root in `node:24-bookworm` (e.g. a
|
||||
or `command.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
|
||||
|
||||
@@ -11,23 +11,25 @@ unbuilt. `vp pack` inlines them, so they never reach package consumers.
|
||||
|
||||
One rule for every file, never tied to folder or file names (user rule
|
||||
2026-10-17; it replaces the earlier "aliases only point at direct `src/`
|
||||
subfolders" rule as the general rule, and the "modules plugin checks only
|
||||
aliased folders" scope; this repo keeps the stricter rule as a local
|
||||
convention, see the last section):
|
||||
subfolders" rule as the general rule, and the "import-structure plugin
|
||||
checks only aliased folders" scope; this repo keeps the stricter rule as a
|
||||
local convention, see the last section):
|
||||
|
||||
- **An alias may point anywhere** and owns its target. An alias to a
|
||||
folder's `index.ts` owns that folder and everything below it; an alias to
|
||||
any other file owns only that file.
|
||||
- **No overlap.** No file may be owned by 2 aliases: no alias inside another
|
||||
alias's area, and no 2 aliases with the same target. The modules plugin's
|
||||
`enforce-layer-order` reports it once at the top of every file 2 aliases
|
||||
claim. Fix by merging the aliases or moving files apart.
|
||||
alias's area, and no 2 aliases with the same target. The import-structure
|
||||
plugin's `enforce-layer-order` reports it once at the top of every file 2
|
||||
aliases claim. Fix by merging the aliases or moving files apart.
|
||||
- **Outside an area, only the exact alias reaches it.** A deeper alias
|
||||
specifier (`#a/one.ts`, `no-barrel-bypass`) and a relative path into the
|
||||
area (`./a/one.ts`, `no-relative-bypass`; `./b/f.ts` to a file alias,
|
||||
`prefer-alias-import`, fixed to the alias) are bypasses.
|
||||
- **Inside an area, relative imports of siblings and subfolders are free.**
|
||||
- **`../` is banned in every file**, owned or not (`no-parent-import`).
|
||||
- **A `../` import is banned in every file**, owned or not (`no-parent-import`).
|
||||
Runtime file URLs (`new URL("../prompt.md", import.meta.url)`) are not
|
||||
imports and are allowed.
|
||||
Anything above a file needs an alias.
|
||||
- **Files no alias owns** need no `index.ts` and no alias, and import `./`
|
||||
siblings and subfolders freely.
|
||||
@@ -89,8 +91,8 @@ Relative imports are written with the `.ts` extension.
|
||||
## Local convention: aliases target direct `src/` subfolders
|
||||
|
||||
This is a convention of this repo only, stricter than the general rule above
|
||||
(which the published modules plugin checks and which allows more). It is not
|
||||
a plugin rule.
|
||||
(which the published import-structure plugin checks and which allows more).
|
||||
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"`.
|
||||
|
||||
@@ -8,7 +8,7 @@ turn on whole categories, then list only what parity or a real need adds.
|
||||
```ts
|
||||
lint: {
|
||||
plugins: ["typescript", "unicorn", "oxc", "import"],
|
||||
jsPlugins: ["@cunarist/eslint-plugin-explicit-types", "./scripts/project-lint.ts"],
|
||||
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
|
||||
@@ -40,8 +40,8 @@ lint: {
|
||||
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 modules plugin's `enforce-import-order` is
|
||||
the only one, and Oxfmt's `sortImports` stays off.
|
||||
- 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.
|
||||
|
||||
@@ -9,7 +9,7 @@ Oxfmt's standard `package.json` sorting is accepted: there is no
|
||||
replaces the earlier hand-written order (metadata, `scripts`, `exports`,
|
||||
`imports`, `devDependencies`, `dependencies`).
|
||||
|
||||
The `imports` key order can carry meaning: the modules plugin's
|
||||
The `imports` key order can carry meaning: the import-structure plugin's
|
||||
`enforce-layer-order` reads it as the layer order. Never reorder it casually.
|
||||
|
||||
## Fields
|
||||
@@ -23,7 +23,7 @@ The `imports` key order can carry meaning: the modules plugin's
|
||||
- **No `peerDependencies`, ever** (user preference, 2026-10-14). If something
|
||||
is needed at runtime, it goes in `dependencies`.
|
||||
- **`dependencies`** = what runs or is type-referenced at runtime by consumers
|
||||
(the lit plugin ships `parse5`, `oxc-parser`, `oxc-resolver`, and
|
||||
(the lit-robust plugin ships `parse5`, `oxc-parser`, `oxc-resolver`, and
|
||||
`@eslint/core` for its public types; they stay external, never bundled).
|
||||
- **`devDependencies`** = everything else: `vite-plus`, `eslint`,
|
||||
`@typescript-eslint/parser`, `eslint-doc-generator`, `esbuild`,
|
||||
|
||||
@@ -7,8 +7,8 @@ description: Node.js (no engines in apps; images pin 24) with Vite+ (vp) and npm
|
||||
- **Runtime:** Node.js. App repos have no `engines` field (user decision
|
||||
2026-10-18): the container or runner image decides the version, so the
|
||||
Containerfile base image (`node:24-alpine`) and CI's `node-version: "24"`
|
||||
are the pins. Published packages (the lint plugins) keep
|
||||
`engines: { "node": ">=22" }`. `npm run lit-check` runs
|
||||
are the pins. Published packages (the lint plugins) keep their own
|
||||
`engines.node` floor. `npm run lit-check` runs
|
||||
`node scripts/lit-check.ts`, which needs Node 22.18+ (unflagged type
|
||||
stripping and `module.registerHooks`); Node 24 satisfies it. Without
|
||||
`engines` or a `.node-version`, local `vp` uses its default Node
|
||||
|
||||
@@ -6,16 +6,17 @@ The user's rule, from the Deno days and restated for Node (2026-10-12): "No
|
||||
JS, not even JSX/TSX, only TS." Source, scripts, tests, and configs are all
|
||||
plain `.ts`. Build output in a gitignored folder is the only JS.
|
||||
|
||||
`tsconfig.json`: no `allowJs`, no `jsx`, and exactly this strictness set
|
||||
(user decision, 2026-10-18): `strict` (written out), `noUncheckedIndexedAccess`,
|
||||
`tsconfig.json`: no `allowJs`, no `jsx`, and exactly this strictness set (user
|
||||
decision, 2026-10-18): `strict` (written out), `noUncheckedIndexedAccess`,
|
||||
`noPropertyAccessFromIndexSignature`, `noImplicitReturns`, `noUnusedLocals`,
|
||||
`noUnusedParameters`, `noImplicitOverride`, `noFallthroughCasesInSwitch`,
|
||||
`erasableSyntaxOnly`, plus the mechanical `verbatimModuleSyntax`,
|
||||
`allowImportingTsExtensions`, and `noEmit` (packages also keep `declaration`
|
||||
and `isolatedDeclarations`). `exactOptionalPropertyTypes` is off everywhere:
|
||||
write `{ key: maybeUndefined }` rather than leaving the key out to please it.
|
||||
If a tool or framework seems to need a JS or TSX file, stop and flag it
|
||||
instead of adding one.
|
||||
`erasableSyntaxOnly`, and `allowUnreachableCode: false` plus
|
||||
`allowUnusedLabels: false` (user decision, 2026-10-18; on in the Deno setup),
|
||||
plus the mechanical `verbatimModuleSyntax`, `allowImportingTsExtensions`, and
|
||||
`noEmit` (packages also keep `declaration` and `isolatedDeclarations`).
|
||||
`exactOptionalPropertyTypes` is off everywhere: write `{ key: maybeUndefined }`
|
||||
rather than leaving the key out to please it. If a tool or framework seems to
|
||||
need a JS or TSX file, stop and flag it instead of adding one.
|
||||
|
||||
## No asset imports (2026-10-14, widened 2026-10-16 and 2026-10-17)
|
||||
|
||||
|
||||
@@ -29,16 +29,17 @@ below it; an alias to any other file owns only that file. No overlap: no file
|
||||
may be owned by 2 aliases, so no alias inside another alias's area and no 2
|
||||
aliases with the same target. Outside an area, only the exact alias reaches
|
||||
it; a deeper alias specifier or a relative path into the area is a bypass.
|
||||
Inside an area, relative imports of siblings and subfolders are free. `../`
|
||||
is banned in every file, owned or not
|
||||
(`import/no-relative-parent-imports`). 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`): every test imports it by alias, and
|
||||
`tests/` reaches `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
|
||||
Inside an area, relative imports of siblings and subfolders are free. A `../`
|
||||
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`):
|
||||
tests that use its helpers import it by alias, 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
|
||||
([.agents/memory/imports-aliases-barrels.md](.agents/memory/imports-aliases-barrels.md)).
|
||||
|
||||
The only config files are `package.json`, `tsconfig.json`, and
|
||||
@@ -47,5 +48,6 @@ list live in `scripts/project-lint.ts`. Lint disable comments are not allowed;
|
||||
fix the source instead.
|
||||
|
||||
The composite action uses npm only to install the externally distributed
|
||||
Claude Code, Codex, and OpenCode command-line tools; do not treat those
|
||||
vendor executables as repository TypeScript dependencies.
|
||||
Claude Code, Codex, and OpenCode command-line tools, plus Deno for agents that
|
||||
check Deno-based repositories; do not treat those vendor executables as
|
||||
repository TypeScript dependencies.
|
||||
|
||||
+3
-2
@@ -16,10 +16,11 @@ runs:
|
||||
fetch-depth: 0
|
||||
token: ${{ gitea.token }}
|
||||
# This step assumes this is `node:24-bookworm` container. The action runs
|
||||
# its TypeScript on that Node directly.
|
||||
# its TypeScript on that Node directly; Deno stays for the agents, which
|
||||
# still check Deno-based repositories with it.
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
run: npm install -g @openai/codex @anthropic-ai/claude-code opencode-ai
|
||||
run: npm install -g @openai/codex @anthropic-ai/claude-code opencode-ai deno
|
||||
# A local action lives inside the writable checkout. Execute a root-owned
|
||||
# copy so an agent changing this repository cannot replace a later phase.
|
||||
- name: Protect action source
|
||||
|
||||
+5
-5
@@ -17,7 +17,7 @@ test("retries once after an invalid refresh token", async () => {
|
||||
const result = await retryInvalidToken(
|
||||
() =>
|
||||
Promise.resolve({
|
||||
code: 1,
|
||||
status: { success: false },
|
||||
error: attempts++ === 0 ? "ERROR: invalid_refresh_token" : "still failed",
|
||||
}),
|
||||
() => {
|
||||
@@ -40,7 +40,7 @@ test("does not retry an unrelated failure", async () => {
|
||||
() => {
|
||||
attempts++;
|
||||
return Promise.resolve({
|
||||
code: 1,
|
||||
status: { success: false },
|
||||
error: "rate limited",
|
||||
});
|
||||
},
|
||||
@@ -86,7 +86,7 @@ test("re-logs in after the job 9837 revoked-session stderr", async () => {
|
||||
const result = await retryInvalidToken(
|
||||
() =>
|
||||
Promise.resolve({
|
||||
code: attempts++ > 0 ? 0 : 1,
|
||||
status: { success: attempts++ > 0 },
|
||||
error: attempts === 1 ? REVOKED_CODEX.join("\n") : "",
|
||||
}),
|
||||
() => {
|
||||
@@ -95,9 +95,9 @@ test("re-logs in after the job 9837 revoked-session stderr", async () => {
|
||||
},
|
||||
);
|
||||
|
||||
expect({ relogins, code: result.code }).toStrictEqual({
|
||||
expect({ relogins, success: result.status.success }).toStrictEqual({
|
||||
relogins: 1,
|
||||
code: 0,
|
||||
success: true,
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
+3
-3
@@ -48,12 +48,12 @@ export function isClaudeAuthFailure(result: ClaudeFailureFields): boolean {
|
||||
);
|
||||
}
|
||||
|
||||
export async function retryInvalidToken<T extends { code: number; error: string }>(
|
||||
export async function retryInvalidToken<T extends { status: { success: boolean }; error: string }>(
|
||||
attempt: () => Promise<T>,
|
||||
relogin: () => Promise<void>,
|
||||
): Promise<T> {
|
||||
let result = await attempt();
|
||||
if (result.code !== 0 && isCodexAuthFailure(result.error)) {
|
||||
if (!result.status.success && isCodexAuthFailure(result.error)) {
|
||||
await relogin();
|
||||
result = await attempt();
|
||||
}
|
||||
@@ -111,7 +111,7 @@ export async function stageCodexAuth(
|
||||
return stagedPath;
|
||||
}
|
||||
|
||||
// Creates an empty private file under a fresh name.
|
||||
// Creates an empty private file under a fresh name, as Deno.makeTempFile did.
|
||||
async function makeTempFile(directory: string): Promise<string> {
|
||||
const path = join(directory, `.tmp-${randomUUID()}`);
|
||||
const handle = await open(path, "wx", 0o600);
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
import { spawn } from "node:child_process";
|
||||
|
||||
import { expect, test } from "vite-plus/test";
|
||||
|
||||
import { isNotFound } from "./errors.ts";
|
||||
import { exitCode } from "./child.ts";
|
||||
|
||||
test("reports the exit code", async () => {
|
||||
expect(await exitCode(spawn("/bin/sh", ["-c", "exit 0"], { stdio: "ignore" }))).toBe(0);
|
||||
expect(await exitCode(spawn("/bin/sh", ["-c", "exit 3"], { stdio: "ignore" }))).toBe(3);
|
||||
});
|
||||
|
||||
test("reports a signal as 128 plus its number", async () => {
|
||||
const child = spawn("/bin/sh", ["-c", "kill -KILL $$"], { stdio: "ignore" });
|
||||
expect(await exitCode(child)).toBe(137);
|
||||
});
|
||||
|
||||
test("resolves on exit while a grandchild still holds the output open", async () => {
|
||||
const child = spawn("/bin/sh", ["-c", "sleep 2 & exit 5"], { stdio: ["ignore", "pipe", "pipe"] });
|
||||
const started = Date.now();
|
||||
expect(await exitCode(child)).toBe(5);
|
||||
expect(Date.now() - started).toBeLessThan(1500);
|
||||
child.stdout.destroy();
|
||||
child.stderr.destroy();
|
||||
});
|
||||
|
||||
test("rejects when the command does not exist", async () => {
|
||||
const child = spawn("/nonexistent/command", [], { stdio: "ignore" });
|
||||
const code = exitCode(child);
|
||||
// The rejection must stay unhandled-safe until it is awaited.
|
||||
await new Promise((resolve) => {
|
||||
setTimeout(resolve, 50);
|
||||
});
|
||||
await expect(code).rejects.toSatisfy(isNotFound);
|
||||
});
|
||||
@@ -1,30 +0,0 @@
|
||||
// What the child process call sites share: the exit status, read right after
|
||||
// `spawn` so the exit event cannot pass unseen while the caller reads the
|
||||
// streams, and echoing output without outrunning a slow reader.
|
||||
import type { ChildProcess } from "node:child_process";
|
||||
import { once } from "node:events";
|
||||
import { constants } from "node:os";
|
||||
import type { Writable } from "node:stream";
|
||||
|
||||
// Resolves once the process exits, before its streams close, with its exit
|
||||
// code, or with 128 plus the signal number if a signal killed it, as a shell
|
||||
// reports. A process that fails to start rejects with the spawn error.
|
||||
export function exitCode(child: ChildProcess): Promise<number> {
|
||||
const code = new Promise<number>((resolve, reject) => {
|
||||
child.once("error", reject);
|
||||
child.once("exit", (exit, signal) => {
|
||||
resolve(exit ?? (signal === null ? 1 : 128 + constants.signals[signal]));
|
||||
});
|
||||
});
|
||||
// Callers await it after draining the streams; a failed start must not be
|
||||
// reported as an unhandled rejection before then.
|
||||
code.catch(() => {});
|
||||
return code;
|
||||
}
|
||||
|
||||
// Writes a chunk, waiting for the stream to drain when its buffer is full.
|
||||
export async function echo(stream: Writable, chunk: string | Uint8Array): Promise<void> {
|
||||
if (!stream.write(chunk)) {
|
||||
await once(stream, "drain");
|
||||
}
|
||||
}
|
||||
+160
@@ -0,0 +1,160 @@
|
||||
// A child process with the call shapes the runner was reviewed with: `output()`
|
||||
// collects both streams, `spawn()` hands them out, and `clearEnv` passes only
|
||||
// the given environment. Streams default as Deno's did: stdin is inherited,
|
||||
// stdout and stderr are piped for `output()` and inherited for `spawn()`.
|
||||
import { spawn as spawnProcess } from "node:child_process";
|
||||
import type { ChildProcess, StdioOptions } from "node:child_process";
|
||||
import { Buffer } from "node:buffer";
|
||||
import { constants } from "node:os";
|
||||
import process from "node:process";
|
||||
import type { Readable, Writable } from "node:stream";
|
||||
import { buffer } from "node:stream/consumers";
|
||||
import { finished } from "node:stream/promises";
|
||||
|
||||
export type StdioMode = "inherit" | "piped" | "null";
|
||||
|
||||
export interface CommandOptions {
|
||||
args?: string[];
|
||||
cwd?: string;
|
||||
env?: Record<string, string>;
|
||||
clearEnv?: boolean;
|
||||
uid?: number;
|
||||
gid?: number;
|
||||
stdin?: StdioMode;
|
||||
stdout?: StdioMode;
|
||||
stderr?: StdioMode;
|
||||
}
|
||||
|
||||
export interface CommandStatus {
|
||||
success: boolean;
|
||||
code: number;
|
||||
}
|
||||
|
||||
export interface CommandOutput extends CommandStatus {
|
||||
stdout: Uint8Array;
|
||||
stderr: Uint8Array;
|
||||
}
|
||||
|
||||
export interface CommandChild {
|
||||
status: Promise<CommandStatus>;
|
||||
stdin: Writable;
|
||||
stdout: Readable;
|
||||
stderr: Readable;
|
||||
}
|
||||
|
||||
const STDIO: Record<StdioMode, "inherit" | "pipe" | "ignore"> = {
|
||||
inherit: "inherit",
|
||||
piped: "pipe",
|
||||
null: "ignore",
|
||||
};
|
||||
|
||||
function signalNumber(signal: NodeJS.Signals): number {
|
||||
return constants.signals[signal];
|
||||
}
|
||||
|
||||
function startProcess(
|
||||
command: string,
|
||||
options: CommandOptions,
|
||||
outputDefault: StdioMode,
|
||||
): ChildProcess {
|
||||
const stdio: StdioOptions = [
|
||||
STDIO[options.stdin ?? "inherit"],
|
||||
STDIO[options.stdout ?? outputDefault],
|
||||
STDIO[options.stderr ?? outputDefault],
|
||||
];
|
||||
const environment = options.clearEnv === true ? options.env : { ...process.env, ...options.env };
|
||||
return spawnProcess(command, options.args ?? [], {
|
||||
stdio,
|
||||
...(options.cwd !== undefined && { cwd: options.cwd }),
|
||||
...(environment !== undefined && { env: environment }),
|
||||
...(options.uid !== undefined && { uid: options.uid }),
|
||||
...(options.gid !== undefined && { gid: options.gid }),
|
||||
});
|
||||
}
|
||||
|
||||
// Settles when the process exits, before its streams close, as Deno's did. A
|
||||
// signal-killed process reports 128 plus the signal number, as a shell does.
|
||||
function waitForStatus(child: ChildProcess): Promise<CommandStatus> {
|
||||
return new Promise((resolve, reject) => {
|
||||
child.once("error", reject);
|
||||
child.once("exit", (code, signal) => {
|
||||
const exitCode = code ?? (signal === null ? 1 : 128 + signalNumber(signal));
|
||||
resolve({ success: exitCode === 0, code: exitCode });
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function piped<T>(stream: T | null, name: string): T {
|
||||
if (stream === null) {
|
||||
throw new TypeError(`${name} is not piped`);
|
||||
}
|
||||
return stream;
|
||||
}
|
||||
|
||||
function collect(stream: Readable | null): Promise<Uint8Array> {
|
||||
return stream === null ? Promise.resolve(new Uint8Array()) : buffer(stream);
|
||||
}
|
||||
|
||||
// A stream's chunks as bytes, whether or not it has an encoding set.
|
||||
export async function* chunks(stream: Readable): AsyncGenerator<Uint8Array> {
|
||||
for await (const chunk of stream) {
|
||||
const value: unknown = chunk;
|
||||
if (value instanceof Uint8Array) {
|
||||
yield value;
|
||||
} else if (typeof value === "string") {
|
||||
yield Buffer.from(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function spawn(command: string, options: CommandOptions = {}): CommandChild {
|
||||
const child = startProcess(command, options, "inherit");
|
||||
const status = waitForStatus(child);
|
||||
// A failed start rejects `status`; the caller sees it once it awaits that.
|
||||
status.catch(() => {});
|
||||
return {
|
||||
status,
|
||||
get stdin(): Writable {
|
||||
return piped(child.stdin, "stdin");
|
||||
},
|
||||
get stdout(): Readable {
|
||||
return piped(child.stdout, "stdout");
|
||||
},
|
||||
get stderr(): Readable {
|
||||
return piped(child.stderr, "stderr");
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export async function output(
|
||||
command: string,
|
||||
options: CommandOptions = {},
|
||||
): Promise<CommandOutput> {
|
||||
const child = startProcess(command, options, "piped");
|
||||
const [status, stdout, stderr] = await Promise.all([
|
||||
waitForStatus(child),
|
||||
collect(child.stdout),
|
||||
collect(child.stderr),
|
||||
]);
|
||||
return { ...status, stdout, stderr };
|
||||
}
|
||||
|
||||
// Writes one chunk and settles once the stream has taken it, as Deno's
|
||||
// `Deno.stdout.write` did.
|
||||
export async function writeChunk(stream: Writable, chunk: Uint8Array): Promise<void> {
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
stream.write(chunk, (error) => {
|
||||
if (error) {
|
||||
reject(error);
|
||||
} else {
|
||||
resolve();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
// Writes the last chunk and settles once the stream has flushed and closed.
|
||||
export async function endWith(stream: Writable, chunk: string): Promise<void> {
|
||||
stream.end(chunk);
|
||||
await finished(stream);
|
||||
}
|
||||
+2
-1
@@ -1,4 +1,5 @@
|
||||
// A missing file or a missing process: Node reports them as ENOENT and ESRCH.
|
||||
// Node reports a missing file as ENOENT and a missing process as ESRCH, where
|
||||
// Deno threw `Deno.errors.NotFound` for both.
|
||||
export function isNotFound(error: unknown): boolean {
|
||||
if (!(error instanceof Error) || !("code" in error)) {
|
||||
return false;
|
||||
|
||||
+34
-34
@@ -1,11 +1,14 @@
|
||||
import { spawnSync } 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 { isNotFound } from "./errors.ts";
|
||||
import { isRunnableProfileProcess, killProfileProcesses, readProfileFile } from "./isolation.ts";
|
||||
import {
|
||||
agentCommand,
|
||||
isRunnableProfileProcess,
|
||||
killProfileProcesses,
|
||||
readProfileFile,
|
||||
} from "./isolation.ts";
|
||||
import type { RuntimeProfile } from "./runtime.ts";
|
||||
import { currentUid, IS_ROOT, IS_WINDOWS, makeTempDir } from "#testing";
|
||||
|
||||
@@ -19,23 +22,6 @@ const profile = (uid: number, home: string): RuntimeProfile => ({
|
||||
tokenFile: null,
|
||||
});
|
||||
|
||||
// Runs a command as the profile's user from the root directory. Without `env`
|
||||
// it inherits this process's environment.
|
||||
function runAs(
|
||||
selected: RuntimeProfile,
|
||||
command: string,
|
||||
args: string[],
|
||||
env?: Record<string, string>,
|
||||
): SpawnSyncReturns<string> {
|
||||
return spawnSync(command, args, {
|
||||
cwd: "/",
|
||||
uid: selected.uid,
|
||||
gid: selected.gid,
|
||||
encoding: "utf8",
|
||||
...(env !== undefined && { env }),
|
||||
});
|
||||
}
|
||||
|
||||
test("zombie process entries are already quiescent", () => {
|
||||
const status = "State:\tZ (zombie)\nUid:\t20010\t20010\t20010\t20010\n";
|
||||
expect(isRunnableProfileProcess(status, 20_010)).toBe(false);
|
||||
@@ -74,14 +60,20 @@ test.skipIf(!IS_ROOT)("a profile process can read only its own private files", a
|
||||
await writeFile(`${root}/reviewer`, "root", { mode: 0o600 });
|
||||
|
||||
const selected = profile(20_000, homeA);
|
||||
const own = runAs(selected, "/bin/cat", [`${homeA}/token`]);
|
||||
const sibling = runAs(selected, "/bin/cat", [`${homeB}/token`]);
|
||||
const reviewer = runAs(selected, "/bin/cat", [`${root}/reviewer`]);
|
||||
const own = await agentCommand(selected, "/bin/cat", [`${homeA}/token`], {
|
||||
cwd: "/",
|
||||
}).output();
|
||||
const sibling = await agentCommand(selected, "/bin/cat", [`${homeB}/token`], {
|
||||
cwd: "/",
|
||||
}).output();
|
||||
const reviewer = await agentCommand(selected, "/bin/cat", [`${root}/reviewer`], {
|
||||
cwd: "/",
|
||||
}).output();
|
||||
|
||||
expect(own.stdout).toBe("own");
|
||||
expect(own.status).toBe(0);
|
||||
expect(sibling.status).not.toBe(0);
|
||||
expect(reviewer.status).not.toBe(0);
|
||||
expect(new TextDecoder().decode(own.stdout)).toBe("own");
|
||||
expect(own.success).toBe(true);
|
||||
expect(sibling.success).toBe(false);
|
||||
expect(reviewer.success).toBe(false);
|
||||
} finally {
|
||||
await rm(root, { recursive: true });
|
||||
}
|
||||
@@ -89,8 +81,13 @@ test.skipIf(!IS_ROOT)("a profile process can read only its own private files", a
|
||||
|
||||
test.skipIf(!IS_ROOT)("cleanup leaves no runnable daemonized process", async () => {
|
||||
const selected = profile(20_010, "/tmp");
|
||||
const launched = runAs(selected, "/bin/sh", ["-c", "sleep 60 >/dev/null 2>&1 & echo $!"]);
|
||||
const pid = Number(launched.stdout.trim());
|
||||
const launched = await agentCommand(
|
||||
selected,
|
||||
"/bin/sh",
|
||||
["-c", "sleep 60 >/dev/null 2>&1 & echo $!"],
|
||||
{ cwd: "/" },
|
||||
).output();
|
||||
const pid = Number(new TextDecoder().decode(launched.stdout).trim());
|
||||
expect(Number.isInteger(pid)).toBe(true);
|
||||
|
||||
await killProfileProcesses(selected.uid);
|
||||
@@ -102,11 +99,14 @@ test.skipIf(!IS_ROOT)("cleanup leaves no runnable daemonized process", async ()
|
||||
expect(status === null || !isRunnableProfileProcess(status, selected.uid)).toBe(true);
|
||||
});
|
||||
|
||||
test.skipIf(!IS_ROOT)("the agent process cannot read its coordinator environment", () => {
|
||||
test.skipIf(!IS_ROOT)("the agent process cannot read its coordinator environment", async () => {
|
||||
const selected = profile(20_020, "/tmp");
|
||||
const result = runAs(selected, "/usr/bin/cat", [`/proc/${process.pid}/environ`], {
|
||||
PARENT_SECRET: "must-not-cross-boundary",
|
||||
});
|
||||
const result = await agentCommand(selected, "/usr/bin/cat", [`/proc/${process.pid}/environ`], {
|
||||
cwd: "/",
|
||||
env: { PARENT_SECRET: "must-not-cross-boundary" },
|
||||
clearEnv: true,
|
||||
stderr: "piped",
|
||||
}).output();
|
||||
|
||||
expect(result.status).not.toBe(0);
|
||||
expect(result.success).toBe(false);
|
||||
});
|
||||
|
||||
@@ -2,9 +2,31 @@ import { lstat, readdir, readFile } from "node:fs/promises";
|
||||
import process from "node:process";
|
||||
import { setTimeout as sleep } from "node:timers/promises";
|
||||
|
||||
import { output, spawn } from "./command.ts";
|
||||
import type { CommandChild, CommandOptions, CommandOutput } from "./command.ts";
|
||||
import { isNotFound } from "./errors.ts";
|
||||
import type { RuntimeProfile } from "./runtime.ts";
|
||||
|
||||
export type AgentCommandOptions = Omit<CommandOptions, "args" | "uid" | "gid">;
|
||||
|
||||
export interface AgentCommand {
|
||||
output(): Promise<CommandOutput>;
|
||||
spawn(): CommandChild;
|
||||
}
|
||||
|
||||
export function agentCommand(
|
||||
profile: RuntimeProfile,
|
||||
command: string,
|
||||
args: string[],
|
||||
options: AgentCommandOptions = {},
|
||||
): AgentCommand {
|
||||
const full: CommandOptions = { ...options, args, uid: profile.uid, gid: profile.gid };
|
||||
return {
|
||||
output: () => output(command, full),
|
||||
spawn: () => spawn(command, full),
|
||||
};
|
||||
}
|
||||
|
||||
export function isRunnableProfileProcess(status: string, uid: number): boolean {
|
||||
const owner = /^Uid:\s+(\d+)/mu.exec(status)?.[1];
|
||||
const state = /^State:\s+(\w)/mu.exec(status)?.[1];
|
||||
|
||||
+82
-83
@@ -1,12 +1,10 @@
|
||||
// Runs one ordered agent profile. Credential decryption and reviewer posting
|
||||
// live in separate processes so neither privileged secret reaches this runner.
|
||||
import { spawn } from "node:child_process";
|
||||
import { chmod, chown, readFile, writeFile } from "node:fs/promises";
|
||||
import process from "node:process";
|
||||
import { createInterface } from "node:readline";
|
||||
import type { Readable } from "node:stream";
|
||||
import { text as readText } from "node:stream/consumers";
|
||||
import { finished } from "node:stream/promises";
|
||||
import { setTimeout as sleep } from "node:timers/promises";
|
||||
|
||||
import {
|
||||
@@ -18,8 +16,9 @@ import {
|
||||
stageCodexAuth,
|
||||
} from "./auth.ts";
|
||||
import type { ClaudeFailureFields, CodexAuthentication } from "./auth.ts";
|
||||
import { echo, exitCode } from "./child.ts";
|
||||
import { killProfileProcesses, readProfileFile } from "./isolation.ts";
|
||||
import { chunks, endWith, output, writeChunk } from "./command.ts";
|
||||
import type { CommandStatus } from "./command.ts";
|
||||
import { agentCommand, killProfileProcesses, readProfileFile } from "./isolation.ts";
|
||||
import { isObject } from "./json.ts";
|
||||
import {
|
||||
collectOpenCodeOutput,
|
||||
@@ -99,8 +98,8 @@ async function postAuthorComment(body: string): Promise<void> {
|
||||
}
|
||||
|
||||
async function runRoot(command: string, args: string[]): Promise<void> {
|
||||
const code = await exitCode(spawn(command, args, { env: PROCESS_ENV, stdio: "ignore" }));
|
||||
if (code !== 0) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||
const { success, code } = await output(command, { args, env: PROCESS_ENV, clearEnv: true });
|
||||
if (!success) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||
}
|
||||
|
||||
async function configureGitAuthor(): Promise<void> {
|
||||
@@ -123,15 +122,12 @@ async function runAgentCommand(
|
||||
args: string[],
|
||||
token?: string,
|
||||
): Promise<void> {
|
||||
const child = spawn(command, args, {
|
||||
const { success, code } = await agentCommand(profile, command, args, {
|
||||
cwd: WORKSPACE,
|
||||
env: agentEnvironment(PROCESS_ENV, profile, token),
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: "ignore",
|
||||
});
|
||||
const code = await exitCode(child);
|
||||
if (code !== 0) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||
clearEnv: true,
|
||||
}).output();
|
||||
if (!success) throw new Error(`${command} ${args[0]} exited with ${code}`);
|
||||
}
|
||||
|
||||
async function prepareProfile(profile: RuntimeProfile): Promise<void> {
|
||||
@@ -193,7 +189,8 @@ async function renderPrompt(
|
||||
}
|
||||
|
||||
async function runClaude(profile: RuntimeProfile, token: string, prompt: string): Promise<string> {
|
||||
const claude = spawn(
|
||||
const claude = agentCommand(
|
||||
profile,
|
||||
"claude",
|
||||
[
|
||||
"--print",
|
||||
@@ -211,21 +208,21 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
||||
...agentEnvironment(PROCESS_ENV, profile, token),
|
||||
IS_SANDBOX: "1",
|
||||
},
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
clearEnv: true,
|
||||
stdout: "piped",
|
||||
stderr: "piped",
|
||||
},
|
||||
);
|
||||
const status = exitCode(claude);
|
||||
).spawn();
|
||||
let result: ClaudeResult | undefined;
|
||||
let error = "";
|
||||
const copyError = (async (): Promise<void> => {
|
||||
claude.stderr.setEncoding("utf8");
|
||||
for await (const chunk of claude.stderr) {
|
||||
const part = String(chunk);
|
||||
const decoder = new TextDecoder();
|
||||
for await (const chunk of chunks(claude.stderr)) {
|
||||
const part = decoder.decode(chunk, { stream: true });
|
||||
error += part;
|
||||
console.error(part);
|
||||
}
|
||||
error += decoder.decode();
|
||||
})();
|
||||
for await (const line of createInterface({ input: claude.stdout, crlfDelay: Infinity })) {
|
||||
if (line !== "") {
|
||||
@@ -253,7 +250,7 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
||||
}
|
||||
}
|
||||
}
|
||||
const [code] = await Promise.all([status, copyError]);
|
||||
const [status] = await Promise.all([claude.status, copyError]);
|
||||
if (result?.is_error === true) {
|
||||
const failure = new Error(result.result ?? `claude ended with ${result.subtype}`);
|
||||
if (isClaudeAuthFailure(result)) {
|
||||
@@ -264,8 +261,8 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
||||
if (result?.result === undefined) {
|
||||
throw new Error(error.trim() || `claude ended with ${result?.subtype ?? "no result"}`);
|
||||
}
|
||||
if (code !== 0) {
|
||||
throw new Error(error.trim() || `claude exited with ${code}`);
|
||||
if (!status.success) {
|
||||
throw new Error(error.trim() || `claude exited with ${status.code}`);
|
||||
}
|
||||
return result.result;
|
||||
}
|
||||
@@ -273,7 +270,7 @@ async function runClaude(profile: RuntimeProfile, token: string, prompt: string)
|
||||
// Polls every 100 ms until the login prints something, failing if it exits first.
|
||||
async function pollForInstructions(
|
||||
shownText: () => string,
|
||||
status: Promise<number>,
|
||||
status: Promise<CommandStatus>,
|
||||
): Promise<void> {
|
||||
if (shownText().trim() !== "") {
|
||||
return;
|
||||
@@ -289,28 +286,29 @@ async function codexDeviceLogin(
|
||||
profile: RuntimeProfile,
|
||||
environment: Record<string, string>,
|
||||
): Promise<void> {
|
||||
const login = spawn("codex", ["login", "--device-auth"], {
|
||||
const login = agentCommand(profile, "codex", ["login", "--device-auth"], {
|
||||
cwd: WORKSPACE,
|
||||
env: environment,
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
});
|
||||
const status = exitCode(login);
|
||||
clearEnv: true,
|
||||
stdout: "piped",
|
||||
stderr: "piped",
|
||||
}).spawn();
|
||||
let shown = "";
|
||||
const collect = async (stream: Readable): Promise<void> => {
|
||||
stream.setEncoding("utf8");
|
||||
for await (const chunk of stream) {
|
||||
shown += String(chunk);
|
||||
const decoder = new TextDecoder();
|
||||
for await (const chunk of chunks(stream)) {
|
||||
shown += decoder.decode(chunk, { stream: true });
|
||||
}
|
||||
shown += decoder.decode();
|
||||
};
|
||||
const drained = Promise.all([collect(login.stdout), collect(login.stderr)]);
|
||||
const status = login.status;
|
||||
await sleep(3000);
|
||||
await pollForInstructions(() => shown, status);
|
||||
await postAuthorComment(withProfile(shown, profile));
|
||||
const [code] = await Promise.all([status, drained]);
|
||||
if (code !== 0) {
|
||||
throw new AgentAuthError(`codex login exited with ${code}`);
|
||||
const [result] = await Promise.all([status, drained]);
|
||||
if (!result.success) {
|
||||
throw new AgentAuthError(`codex login exited with ${result.code}`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -319,19 +317,17 @@ async function codexApiLogin(
|
||||
environment: Record<string, string>,
|
||||
token: string,
|
||||
): Promise<void> {
|
||||
const login = spawn("codex", ["login", "--with-api-key"], {
|
||||
const login = agentCommand(profile, "codex", ["login", "--with-api-key"], {
|
||||
cwd: WORKSPACE,
|
||||
env: environment,
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: ["pipe", "inherit", "pipe"],
|
||||
});
|
||||
const status = exitCode(login);
|
||||
login.stdin.end(`${token}\n`);
|
||||
await finished(login.stdin);
|
||||
const [code, error] = await Promise.all([status, readText(login.stderr)]);
|
||||
if (code !== 0) {
|
||||
throw new Error(error.trim() || `codex login exited with ${code}`);
|
||||
clearEnv: true,
|
||||
stdin: "piped",
|
||||
stderr: "piped",
|
||||
}).spawn();
|
||||
await endWith(login.stdin, `${token}\n`);
|
||||
const [status, error] = await Promise.all([login.status, readText(login.stderr)]);
|
||||
if (!status.success) {
|
||||
throw new Error(error.trim() || `codex login exited with ${status.code}`);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -353,18 +349,17 @@ async function runCodex(
|
||||
if (authentication.kind === "api-key") {
|
||||
await codexApiLogin(profile, environment, authentication.token);
|
||||
} else {
|
||||
const check = spawn("codex", ["login", "status"], {
|
||||
const loggedIn = await agentCommand(profile, "codex", ["login", "status"], {
|
||||
cwd: WORKSPACE,
|
||||
env: environment,
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: "ignore",
|
||||
});
|
||||
if ((await exitCode(check)) !== 0) await codexDeviceLogin(profile, environment);
|
||||
clearEnv: true,
|
||||
}).output();
|
||||
if (!loggedIn.success) await codexDeviceLogin(profile, environment);
|
||||
}
|
||||
const outputPath = await makeProfileFile(profile, "result.md");
|
||||
const attempt = async (): Promise<{ code: number; error: string }> => {
|
||||
const codex = spawn(
|
||||
const attempt = async (): Promise<{ status: CommandStatus; error: string }> => {
|
||||
const codex = agentCommand(
|
||||
profile,
|
||||
"codex",
|
||||
[
|
||||
"exec",
|
||||
@@ -378,21 +373,20 @@ async function runCodex(
|
||||
{
|
||||
cwd: WORKSPACE,
|
||||
env: environment,
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: ["ignore", "inherit", "pipe"],
|
||||
clearEnv: true,
|
||||
stdout: "inherit",
|
||||
stderr: "piped",
|
||||
},
|
||||
);
|
||||
const status = exitCode(codex);
|
||||
codex.stderr.setEncoding("utf8");
|
||||
).spawn();
|
||||
const decoder = new TextDecoder();
|
||||
let error = "";
|
||||
for await (const chunk of codex.stderr) {
|
||||
const part = String(chunk);
|
||||
await echo(process.stderr, part);
|
||||
error += part;
|
||||
for await (const chunk of chunks(codex.stderr)) {
|
||||
await writeChunk(process.stderr, chunk);
|
||||
error += decoder.decode(chunk, { stream: true });
|
||||
}
|
||||
error += decoder.decode();
|
||||
// Codex echoes the prompt, whose comments may quote auth errors.
|
||||
return { code: await status, error: error.replaceAll(prompt, "") };
|
||||
return { status: await codex.status, error: error.replaceAll(prompt, "") };
|
||||
};
|
||||
const result =
|
||||
authentication.kind === "api-key"
|
||||
@@ -401,8 +395,8 @@ async function runCodex(
|
||||
await runAgentCommand(profile, "codex", ["logout"]);
|
||||
await codexDeviceLogin(profile, environment);
|
||||
});
|
||||
if (result.code !== 0) {
|
||||
const failure = new Error(result.error.trim() || `codex exited with ${result.code}`);
|
||||
if (!result.status.success) {
|
||||
const failure = new Error(result.error.trim() || `codex exited with ${result.status.code}`);
|
||||
if (isCodexAuthFailure(result.error)) {
|
||||
throw new AgentAuthError("codex sign-in failed", { cause: failure });
|
||||
}
|
||||
@@ -416,24 +410,29 @@ async function runOpenCode(
|
||||
token: string,
|
||||
prompt: string,
|
||||
): Promise<string> {
|
||||
const child = spawn("opencode", openCodeArgs(profile.model, prompt), {
|
||||
const child = agentCommand(profile, "opencode", openCodeArgs(profile.model, prompt), {
|
||||
cwd: WORKSPACE,
|
||||
env: agentEnvironment(PROCESS_ENV, profile, token),
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
});
|
||||
const status = exitCode(child);
|
||||
clearEnv: true,
|
||||
stdout: "piped",
|
||||
stderr: "piped",
|
||||
}).spawn();
|
||||
const collected = collectOpenCodeOutput(
|
||||
child.stdout,
|
||||
child.stderr,
|
||||
(chunk) => echo(process.stdout, chunk),
|
||||
(chunk) => echo(process.stderr, chunk),
|
||||
chunks(child.stdout),
|
||||
chunks(child.stderr),
|
||||
async (chunk) => {
|
||||
await writeChunk(process.stdout, chunk);
|
||||
},
|
||||
async (chunk) => {
|
||||
await writeChunk(process.stderr, chunk);
|
||||
},
|
||||
);
|
||||
const [code, streams] = await Promise.all([status, collected]);
|
||||
const [status, streams] = await Promise.all([child.status, collected]);
|
||||
const error = streams.stderr.trim();
|
||||
if (code !== 0) {
|
||||
throw openCodeError(streams.stdout) ?? new Error(error || `opencode exited with ${code}`);
|
||||
if (!status.success) {
|
||||
throw (
|
||||
openCodeError(streams.stdout) ?? new Error(error || `opencode exited with ${status.code}`)
|
||||
);
|
||||
}
|
||||
return parseOpenCodeEvents(streams.stdout);
|
||||
}
|
||||
|
||||
+25
-22
@@ -1,10 +1,10 @@
|
||||
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 { output } from "./command.ts";
|
||||
import { prepareRuntime } from "./runtime.ts";
|
||||
import type { RuntimeProfile } from "./runtime.ts";
|
||||
import { IS_ROOT, makeTempDir } from "#testing";
|
||||
@@ -13,9 +13,14 @@ const MASTER_KEY = "AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwdHh8";
|
||||
const ENCRYPTED = "v1:ICEiIyQlJicoKSor:oV_FAgnsN3p1FyegJxwGVdyjfyPio6qDeSUwbA";
|
||||
|
||||
// Runs `command` as the profile's user, from the root directory.
|
||||
function runAs(profile: RuntimeProfile, command: string, path: string): boolean {
|
||||
const result = spawnSync(command, [path], { cwd: "/", uid: profile.uid, gid: profile.gid });
|
||||
return result.status === 0;
|
||||
async function runAs(profile: RuntimeProfile, command: string, path: string): Promise<boolean> {
|
||||
const result = await output(command, {
|
||||
args: [path],
|
||||
cwd: "/",
|
||||
uid: profile.uid,
|
||||
gid: profile.gid,
|
||||
});
|
||||
return result.success;
|
||||
}
|
||||
|
||||
async function expectPrivate(path: string, uid: number, mode: number): Promise<void> {
|
||||
@@ -53,16 +58,16 @@ test.skipIf(!IS_ROOT)("prepares root-only reviewer and isolated profile credenti
|
||||
expect((await stat(codex.home)).uid).toStrictEqual(codex.uid);
|
||||
expect(codex.tokenFile).toBe(null);
|
||||
|
||||
const ownToken = spawnSync("/bin/cat", [claude.tokenFile], {
|
||||
const ownToken = await output("/bin/cat", {
|
||||
args: [claude.tokenFile],
|
||||
cwd: "/",
|
||||
uid: claude.uid,
|
||||
gid: claude.gid,
|
||||
encoding: "utf8",
|
||||
});
|
||||
expect(ownToken.status).toBe(0);
|
||||
expect(ownToken.stdout).toBe("secret-token");
|
||||
expect(runAs(claude, "/bin/cat", manifest.reviewerFile)).toBe(false);
|
||||
expect(runAs(claude, "/bin/ls", codex.home)).toBe(false);
|
||||
expect(ownToken.success).toBe(true);
|
||||
expect(new TextDecoder().decode(ownToken.stdout)).toBe("secret-token");
|
||||
expect(await runAs(claude, "/bin/cat", manifest.reviewerFile)).toBe(false);
|
||||
expect(await runAs(claude, "/bin/ls", codex.home)).toBe(false);
|
||||
} finally {
|
||||
await rm(root, { recursive: true });
|
||||
await rm(action, { recursive: true });
|
||||
@@ -80,20 +85,18 @@ test.skipIf(!IS_ROOT)("removes prepared credentials when output publication fail
|
||||
profiles: [{ type: "claude", token: ENCRYPTED }],
|
||||
}),
|
||||
);
|
||||
const result = spawnSync(
|
||||
process.execPath,
|
||||
[fileURLToPath(new URL("prepare.ts", import.meta.url))],
|
||||
{
|
||||
env: {
|
||||
ACTION_PATH: action,
|
||||
RUNNER_TEMP: root,
|
||||
BOT_AGENTS_MASTER_KEY: MASTER_KEY,
|
||||
GITHUB_OUTPUT: action,
|
||||
},
|
||||
const result = await output(process.execPath, {
|
||||
args: [fileURLToPath(new URL("prepare.ts", import.meta.url))],
|
||||
env: {
|
||||
ACTION_PATH: action,
|
||||
RUNNER_TEMP: root,
|
||||
BOT_AGENTS_MASTER_KEY: MASTER_KEY,
|
||||
GITHUB_OUTPUT: action,
|
||||
},
|
||||
);
|
||||
clearEnv: true,
|
||||
});
|
||||
|
||||
expect(result.status).not.toBe(0);
|
||||
expect(result.success).toBe(false);
|
||||
expect(await readdir(root)).toStrictEqual([]);
|
||||
} finally {
|
||||
await rm(root, { recursive: true });
|
||||
|
||||
@@ -162,11 +162,6 @@ test("installs the OpenCode CLI", async () => {
|
||||
assert(action.includes("opencode-ai"));
|
||||
});
|
||||
|
||||
test("does not install Deno", async () => {
|
||||
const action = await readFile("action.yml", "utf8");
|
||||
expect(action).not.toMatch(/\bdeno\b/iu);
|
||||
});
|
||||
|
||||
test("profile preparation does not receive provider credentials", async () => {
|
||||
const runner = await readFile("src/run.ts", "utf8");
|
||||
assert(runner.includes("await prepareProfile(profile);"));
|
||||
|
||||
+3
-1
@@ -15,6 +15,8 @@
|
||||
"noImplicitReturns": true,
|
||||
"noFallthroughCasesInSwitch": true,
|
||||
"noUnusedLocals": true,
|
||||
"noUnusedParameters": true
|
||||
"noUnusedParameters": true,
|
||||
"allowUnreachableCode": false,
|
||||
"allowUnusedLabels": false
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user