crysk 0.4.0 → 0.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +26 -17
- package/config/models/anthropic.json +1 -1
- package/dist/SKILL-k4k0zn1w.md +143 -0
- package/dist/SKILL-vhb4c3vv.md +553 -0
- package/dist/SKILL-xpf6kmdw.md +74 -0
- package/dist/ci-admission-0ken6ehx.md +128 -0
- package/dist/cli.js +3056 -1623
- package/dist/index.js +1744 -938
- package/dist/opencode-ci-ac5zksdn.md +106 -0
- package/dist/workflow-4pkyck01.yml +160 -0
- package/package.json +1 -1
- package/prompts/default/PROVENANCE.md +1 -0
- package/skills/crysk/SKILL.md +16 -16
- package/skills/crysk-ci-setup/SKILL.md +41 -38
- package/skills/crysk-ci-setup/assets/workflow.yml +31 -22
- package/skills/crysk-ci-setup/references/ci-admission.md +1 -1
- package/skills/crysk-ci-setup/references/opencode-ci.md +53 -88
- package/skills/crysk-loop/SKILL.md +1 -1
- package/src/asset-manifest.ts +0 -4
- package/src/assets.ts +1 -1
- package/src/ci/admission-ledger.ts +4 -0
- package/src/ci/classify-error.ts +21 -24
- package/src/ci/cli-record.ts +53 -1
- package/src/ci/crysk-secrets.ts +409 -0
- package/src/ci/gates.ts +22 -36
- package/src/ci/outcome.ts +421 -330
- package/src/ci/platform-config.ts +2 -2
- package/src/ci/platform-report.ts +274 -41
- package/src/ci/platform-trace.ts +551 -0
- package/src/ci/platform.ts +28 -12
- package/src/ci/publish.ts +19 -6
- package/src/ci/review-levels.ts +8 -7
- package/src/ci/run.ts +88 -0
- package/src/ci/setup.ts +453 -118
- package/src/ci/trace-bundle.ts +1282 -0
- package/src/ci/trace-transcripts.ts +415 -0
- package/src/ci/trigger.ts +176 -33
- package/src/cli.ts +11 -3
- package/src/commands/ci-setup-questions.ts +3 -3
- package/src/commands/ci-setup.ts +152 -6
- package/src/commands/config.ts +3 -0
- package/src/commands/doctor.ts +15 -6
- package/src/config/config.ts +16 -3
- package/src/diversity/clustering.ts +0 -1
- package/src/diversity/identity.ts +4 -5
- package/src/diversity/pipeline-integration.ts +1 -9
- package/src/doctor.ts +3 -3
- package/src/execution/attempt-evidence.ts +10 -5
- package/src/execution/claude-session-trace.ts +480 -0
- package/src/execution/contracts.ts +21 -4
- package/src/execution/harness.ts +105 -8
- package/src/execution/model-fallback.ts +239 -0
- package/src/execution/usage-normalized.ts +6 -4
- package/src/home-preflight.ts +1 -1
- package/src/index.ts +1 -1
- package/src/model/catalog.ts +13 -37
- package/src/model/free-discovery.ts +117 -8
- package/src/model/model-name.ts +404 -0
- package/src/model/provider-capabilities.ts +22 -7
- package/src/model/routing.ts +346 -467
- package/src/pr/admission.ts +18 -0
- package/src/pr/plan.ts +20 -4
- package/src/pr/preflight.ts +1 -1
- package/src/pr/publish-outcome.ts +1 -1
- package/src/pr/review-pr.ts +15 -1
- package/src/pr/target.ts +12 -3
- package/src/production-runtime.ts +760 -331
- package/src/review/pipeline.ts +277 -101
- package/src/review/preflight.ts +201 -294
- package/src/review/report.ts +26 -26
- package/src/review/review.ts +20 -3
- package/src/review/route-preflight.ts +79 -11
- package/src/review/run.ts +28 -6
- package/src/review/scout.ts +1 -1
- package/src/review/spec.ts +3 -3
- package/src/review/step-runner.ts +70 -1
- package/src/runner-authority.ts +127 -9
- package/src/security/binding-policy.ts +1 -2
- package/src/security/claude-credential.ts +355 -0
- package/src/security/credential-broker.ts +56 -40
- package/src/security/evidence-redaction.ts +179 -4
- package/src/security/opencode-secret-manifest.ts +114 -0
- package/src/security/redact.ts +45 -0
- package/src/system-tools.ts +48 -21
- package/src/transport-registry.ts +12 -2
- package/src/transports/claude-code-cli.ts +21 -2
- package/src/transports/opencode-sdk.ts +11 -9
- package/src/transports/opencode-server.ts +7 -10
- package/src/ui/config-edit.ts +9 -20
- package/src/ui/config.ts +32 -27
- package/src/ui/plan.ts +76 -47
- package/src/updater.ts +10 -7
- package/prompts/default/deep-review-lifecycle.md +0 -362
package/src/ci/classify-error.ts
CHANGED
|
@@ -5,16 +5,12 @@
|
|
|
5
5
|
//
|
|
6
6
|
// Each mapping is justified by the throw site and by the catalog text of its code
|
|
7
7
|
// (src/ci/outcome.ts ERROR_CATALOG):
|
|
8
|
-
// -
|
|
9
|
-
//
|
|
10
|
-
//
|
|
11
|
-
// - AmbiguousMappingError (src/model/routing.ts) -> route/ambiguous: "found N
|
|
12
|
-
// duplicate mappings"; its text asks to remove the duplicate.
|
|
13
|
-
// - UnauthorizedRouteError (src/model/routing.ts) -> route/spend-disabled: every
|
|
14
|
-
// throw says "Spend is disabled"; its text asks to enable spend.
|
|
8
|
+
// - No route class: the alias-keyed routing and its codes were removed
|
|
9
|
+
// (odd/tasks/role-model-routing.md S2, E-f F0). A model is now a name that parses
|
|
10
|
+
// or a usage error that says how to write it.
|
|
15
11
|
// - OpenCodeVersionAdmissionError (src/transport-registry.ts) with reason "version"
|
|
16
12
|
// -> capability/version_unsupported: the pinned version-pair checks
|
|
17
|
-
// (admitOpenCodeVersionPair, loadOpenCodeSdk);
|
|
13
|
+
// (admitOpenCodeVersionPair, loadOpenCodeSdk); CRYSK-RUNTIME-UNAVAILABLE calls the
|
|
18
14
|
// action-installed runtime a pr-hero defect, which the pinned version is.
|
|
19
15
|
// - The same class with reason "identity" -> unknown: the observed identity is missing
|
|
20
16
|
// in production, or the declared versions contradict it (transport-registry.ts). That
|
|
@@ -23,7 +19,14 @@
|
|
|
23
19
|
// - OpenCodeSdkUnavailableError (src/transports/opencode-admission.ts) -> capability/
|
|
24
20
|
// sdk_unavailable: "is not installed"; the same code, the local text says reconcile.
|
|
25
21
|
//
|
|
26
|
-
//
|
|
22
|
+
// - CredentialRefusalError (src/security/claude-credential.ts) names its own class
|
|
23
|
+
// (CliError.cls): a Claude route with no credential -> trigger/no-credential
|
|
24
|
+
// (CRYSK-CRED-MISSING), an OpenCode route with no auth record -> credential/
|
|
25
|
+
// missing_provider_record or missing_subscription_record (CRYSK-CRED-UNUSABLE). Its
|
|
26
|
+
// params (cliErrorParams below) let the record name the route and its fixes.
|
|
27
|
+
//
|
|
28
|
+
// Not mapped, on purpose: ModelRoutingError and InvalidModelError (their message is
|
|
29
|
+
// the fix, and no catalog text names it),
|
|
27
30
|
// RouteAdmissionError and OpenCodeProductionGatedError (a readiness gate, which no
|
|
28
31
|
// capability issue names), CliError and everything else.
|
|
29
32
|
//
|
|
@@ -32,14 +35,10 @@
|
|
|
32
35
|
// that runs before it.
|
|
33
36
|
|
|
34
37
|
import { CliError, CliUsageError, recordClassOf } from "../errors";
|
|
35
|
-
import {
|
|
36
|
-
AmbiguousMappingError,
|
|
37
|
-
UnauthorizedRouteError,
|
|
38
|
-
UnmappedRouteError,
|
|
39
|
-
} from "../model/routing";
|
|
38
|
+
import { CredentialRefusalError } from "../security/claude-credential";
|
|
40
39
|
import { OpenCodeVersionAdmissionError } from "../transport-registry";
|
|
41
40
|
import { OpenCodeSdkUnavailableError } from "../transports/opencode-admission";
|
|
42
|
-
import type { CliErrorClass } from "./outcome";
|
|
41
|
+
import type { CliErrorClass, ErrorParams } from "./outcome";
|
|
43
42
|
|
|
44
43
|
export function classifyCliError(error: unknown): CliErrorClass {
|
|
45
44
|
// The class the throw site named wins over the instanceof mapping below. WHY: the
|
|
@@ -52,15 +51,6 @@ export function classifyCliError(error: unknown): CliErrorClass {
|
|
|
52
51
|
) {
|
|
53
52
|
return error.cls;
|
|
54
53
|
}
|
|
55
|
-
if (error instanceof UnmappedRouteError) {
|
|
56
|
-
return { kind: "route", reason: "unmapped" };
|
|
57
|
-
}
|
|
58
|
-
if (error instanceof AmbiguousMappingError) {
|
|
59
|
-
return { kind: "route", reason: "ambiguous" };
|
|
60
|
-
}
|
|
61
|
-
if (error instanceof UnauthorizedRouteError) {
|
|
62
|
-
return { kind: "route", reason: "spend-disabled" };
|
|
63
|
-
}
|
|
64
54
|
if (error instanceof OpenCodeVersionAdmissionError) {
|
|
65
55
|
return error.reason === "identity"
|
|
66
56
|
? { kind: "unknown" }
|
|
@@ -71,3 +61,10 @@ export function classifyCliError(error: unknown): CliErrorClass {
|
|
|
71
61
|
}
|
|
72
62
|
return { kind: "unknown" };
|
|
73
63
|
}
|
|
64
|
+
|
|
65
|
+
// The params a throw site named for the record, or undefined. Only a credential
|
|
66
|
+
// refusal names any today. Provider and model pass the record's own checks
|
|
67
|
+
// (safeProviderName, safeModelName) in the writer.
|
|
68
|
+
export function cliErrorParams(error: unknown): ErrorParams | undefined {
|
|
69
|
+
return error instanceof CredentialRefusalError ? error.params : undefined;
|
|
70
|
+
}
|
package/src/ci/cli-record.ts
CHANGED
|
@@ -43,11 +43,13 @@ import {
|
|
|
43
43
|
CLI_RECORD_FILE,
|
|
44
44
|
type CliErrorClass,
|
|
45
45
|
type CliRecord,
|
|
46
|
+
type ErrorParams,
|
|
46
47
|
type HunterFailureRecord,
|
|
47
48
|
knownFailureCredential,
|
|
48
49
|
knownTransportCause,
|
|
49
50
|
PENDING_AT_FILE,
|
|
50
51
|
parseCliRecord,
|
|
52
|
+
RUN_DIR_FILE,
|
|
51
53
|
safeFailureDetail,
|
|
52
54
|
safeModelName,
|
|
53
55
|
safeProviderName,
|
|
@@ -162,6 +164,26 @@ export function recordPendingCreatedAt(
|
|
|
162
164
|
}
|
|
163
165
|
}
|
|
164
166
|
|
|
167
|
+
// The run directory's writer: src/pr/review-pr.ts calls it as soon as the directory
|
|
168
|
+
// exists, so a run that never reaches the run step's outputs (every hunter failed, a
|
|
169
|
+
// fatal error, a cancelled job) still names its files for the trace step
|
|
170
|
+
// (src/ci/platform-trace.ts). Never throws, and writes nothing outside action mode. A
|
|
171
|
+
// path with a line break writes nothing: the reader takes the first line.
|
|
172
|
+
export function recordRunDir(
|
|
173
|
+
runDir: string,
|
|
174
|
+
env: Readonly<Record<string, string | undefined>> = process.env,
|
|
175
|
+
): void {
|
|
176
|
+
const dir = env.CRYSK_OUTCOME_DIR ?? "";
|
|
177
|
+
if (dir === "" || runDir === "" || /[\r\n]/.test(runDir)) return;
|
|
178
|
+
try {
|
|
179
|
+
writeRecordAtomically(dir, RUN_DIR_FILE, `${runDir}\n`, NODE_FS);
|
|
180
|
+
} catch (error) {
|
|
181
|
+
process.stderr.write(
|
|
182
|
+
`crysk: could not write the run directory record: ${errnoCode(error)}\n`,
|
|
183
|
+
);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
165
187
|
// The delivery writer: publishRunOutcome calls it once the review is delivered (see the
|
|
166
188
|
// header for which delivery point, and why). A run that did not deliver never calls it.
|
|
167
189
|
export function recordReviewDelivered(
|
|
@@ -232,9 +254,14 @@ export function recordUnsettledStatus(
|
|
|
232
254
|
// WHY no check that the record belongs to this job: the trigger clears cli.json at
|
|
233
255
|
// job start (clearStaleMarkers in trigger.ts), so a record present here was written
|
|
234
256
|
// by this job.
|
|
257
|
+
//
|
|
258
|
+
// `params` are the ones the throw site named (cliErrorParams, classify-error.ts). Only
|
|
259
|
+
// the values the record accepts are written: a provider or model that fails its check,
|
|
260
|
+
// or an empty string, is left out, so a bad value costs that detail, never the record.
|
|
235
261
|
export function writeFatalCliRecord(
|
|
236
262
|
cls: CliErrorClass,
|
|
237
263
|
env: Readonly<Record<string, string | undefined>> = process.env,
|
|
264
|
+
params?: ErrorParams,
|
|
238
265
|
): void {
|
|
239
266
|
const dir = env.CRYSK_OUTCOME_DIR ?? "";
|
|
240
267
|
if (dir === "") return;
|
|
@@ -245,7 +272,32 @@ export function writeFatalCliRecord(
|
|
|
245
272
|
);
|
|
246
273
|
return;
|
|
247
274
|
}
|
|
248
|
-
|
|
275
|
+
const recorded = params === undefined ? undefined : recordParams(params);
|
|
276
|
+
writeCliRecord(
|
|
277
|
+
{
|
|
278
|
+
v: 1,
|
|
279
|
+
outcome: "error",
|
|
280
|
+
cls,
|
|
281
|
+
...(recorded === undefined ? {} : { params: recorded }),
|
|
282
|
+
},
|
|
283
|
+
env,
|
|
284
|
+
);
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
// The string params a fatal record may carry. Provider and model go through the
|
|
288
|
+
// record's own name checks; the others are names Crysk wrote (a backend, a step key,
|
|
289
|
+
// a CRYSK_* secret), kept when they are one non-empty line.
|
|
290
|
+
function recordParams(params: ErrorParams): ErrorParams | undefined {
|
|
291
|
+
const out: ErrorParams = {};
|
|
292
|
+
const provider = safeProviderName(params.provider);
|
|
293
|
+
if (provider !== undefined) out.provider = provider;
|
|
294
|
+
const model = safeModelName(params.model);
|
|
295
|
+
if (model !== undefined) out.model = model;
|
|
296
|
+
for (const key of ["backend", "step", "secret"] as const) {
|
|
297
|
+
const value = safeFailureDetail(params[key]);
|
|
298
|
+
if (value !== undefined) out[key] = value;
|
|
299
|
+
}
|
|
300
|
+
return Object.keys(out).length === 0 ? undefined : out;
|
|
249
301
|
}
|
|
250
302
|
|
|
251
303
|
// The record this job already wrote, or undefined when there is none, it cannot be
|
|
@@ -0,0 +1,409 @@
|
|
|
1
|
+
// The CRYSK_* secrets intake (odd/tasks/role-model-routing.md, S8/S9, L12-L13).
|
|
2
|
+
//
|
|
3
|
+
// The workflow names each Crysk secret explicitly and hands them to the action as
|
|
4
|
+
// one `crysk-secrets` input of `NAME=value` lines:
|
|
5
|
+
//
|
|
6
|
+
// crysk-secrets: |
|
|
7
|
+
// CRYSK_CLAUDE_OAUTH_TOKEN=${{ secrets.CRYSK_CLAUDE_OAUTH_TOKEN }}
|
|
8
|
+
// CRYSK_OPENCODE_DEEPSEEK_API_KEY=${{ secrets.CRYSK_OPENCODE_DEEPSEEK_API_KEY }}
|
|
9
|
+
//
|
|
10
|
+
// WHY explicit names and never `toJSON(secrets)` (L13): the action, and whatever
|
|
11
|
+
// it installs, must never receive the customer's other secrets. A secret the
|
|
12
|
+
// repository does not have arrives as an empty value, which counts as absent.
|
|
13
|
+
//
|
|
14
|
+
// This module is the grammar and nothing else: pure, builtins only (Buffer is a
|
|
15
|
+
// global), so the trigger, which runs before `bun install`, can import it later.
|
|
16
|
+
// It never prints. Every message it returns names a secret or a line number,
|
|
17
|
+
// never a value, and `masks` lists every value the caller must `::add-mask::`
|
|
18
|
+
// before it writes anything else.
|
|
19
|
+
//
|
|
20
|
+
// The names (S8):
|
|
21
|
+
// CRYSK_CLAUDE_OAUTH_TOKEN Claude Code subscription (`claude setup-token`)
|
|
22
|
+
// CRYSK_CLAUDE_API_KEY Claude Code on an Anthropic API key
|
|
23
|
+
// CRYSK_OPENCODE_<P>_API_KEY an OpenCode provider's API key
|
|
24
|
+
// CRYSK_OPENCODE_<P>_OAUTH base64 of that provider's `opencode auth login` record
|
|
25
|
+
// <P> is the Models.dev provider id uppercased with `-` and `.` as `_`
|
|
26
|
+
// (opencodeSecretToken). CRYSK_CLAUDE_(OAUTH_TOKEN|API_KEY)_<NAME> is reserved
|
|
27
|
+
// for several Claude accounts (S6, out of scope) and ignored with a notice.
|
|
28
|
+
|
|
29
|
+
export type ClaudeCredentialKind = "subscription" | "api_key";
|
|
30
|
+
|
|
31
|
+
// The `opencode auth login` record of an OAuth provider. Only `type` is checked:
|
|
32
|
+
// the rest is the provider's own shape (access, refresh, expires, ...), carried
|
|
33
|
+
// whole into the OpenCode auth file (U3, setup.ts), so the child can refresh it.
|
|
34
|
+
export interface OpenCodeOAuthRecord {
|
|
35
|
+
readonly type: "oauth";
|
|
36
|
+
readonly [field: string]: unknown;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
export interface OpenCodeProviderSecrets {
|
|
40
|
+
apiKey?: string;
|
|
41
|
+
oauth?: OpenCodeOAuthRecord;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
export interface CryskSecrets {
|
|
45
|
+
// Keyed by the S5 credential kinds, so `credentials.claude` reads it directly.
|
|
46
|
+
readonly claude: { subscription?: string; api_key?: string };
|
|
47
|
+
// Keyed by <P>, the normalized provider token. Look a plan provider up with
|
|
48
|
+
// opencodeSecretsFor, which normalizes the provider: a secret name is never
|
|
49
|
+
// reversed into a provider id (`WAFER_AI` could be `wafer.ai` or `wafer-ai`).
|
|
50
|
+
readonly opencode: ReadonlyMap<string, OpenCodeProviderSecrets>;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// The names the engine read before S8. Recorded by presence only, for the clean
|
|
54
|
+
// break (U5), which names the new secret for each.
|
|
55
|
+
export const LEGACY_SECRET_NAMES = [
|
|
56
|
+
"CLAUDE_CODE_OAUTH_TOKEN",
|
|
57
|
+
"ANTHROPIC_API_KEY",
|
|
58
|
+
"OPENCODE_AUTH_JSON",
|
|
59
|
+
] as const;
|
|
60
|
+
export type LegacySecretName = (typeof LEGACY_SECRET_NAMES)[number];
|
|
61
|
+
|
|
62
|
+
// The CRYSK_* secret to set in place of each old name (U5), for the messages that
|
|
63
|
+
// name it. OPENCODE_AUTH_JSON held the whole store; its replacement is one secret
|
|
64
|
+
// per provider, and an `_OAUTH` record is read only for openai (U3).
|
|
65
|
+
export const LEGACY_SECRET_REPLACEMENT: Readonly<
|
|
66
|
+
Record<LegacySecretName, string>
|
|
67
|
+
> = {
|
|
68
|
+
CLAUDE_CODE_OAUTH_TOKEN: "CRYSK_CLAUDE_OAUTH_TOKEN",
|
|
69
|
+
ANTHROPIC_API_KEY: "CRYSK_CLAUDE_API_KEY",
|
|
70
|
+
OPENCODE_AUTH_JSON:
|
|
71
|
+
"one CRYSK_OPENCODE_<PROVIDER>_API_KEY per provider (CRYSK_OPENCODE_OPENAI_OAUTH for an OpenAI subscription)",
|
|
72
|
+
};
|
|
73
|
+
|
|
74
|
+
export interface CryskSecretsParse {
|
|
75
|
+
readonly secrets: CryskSecrets;
|
|
76
|
+
// The kept names, sorted. Names only: they are already in the workflow file.
|
|
77
|
+
readonly names: readonly string[];
|
|
78
|
+
// The old names that arrived with a value, in LEGACY_SECRET_NAMES order.
|
|
79
|
+
readonly legacy: readonly LegacySecretName[];
|
|
80
|
+
// Every value to mask, in input order, without repeats.
|
|
81
|
+
readonly masks: readonly string[];
|
|
82
|
+
// Ignored names, for a `::notice::`. Names or line numbers only.
|
|
83
|
+
readonly notices: readonly string[];
|
|
84
|
+
// Non-empty means the input is refused. Names or line numbers only.
|
|
85
|
+
readonly problems: readonly string[];
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
const CLAUDE_NAMES: Readonly<Record<string, ClaudeCredentialKind>> = {
|
|
89
|
+
CRYSK_CLAUDE_OAUTH_TOKEN: "subscription",
|
|
90
|
+
CRYSK_CLAUDE_API_KEY: "api_key",
|
|
91
|
+
};
|
|
92
|
+
const CLAUDE_RESERVED_RE = /^CRYSK_CLAUDE_(?:OAUTH_TOKEN|API_KEY)_[A-Z0-9_]+$/;
|
|
93
|
+
// <P> is exactly the image of opencodeSecretToken: one or more [A-Z0-9] runs
|
|
94
|
+
// joined by single underscores. The provider runs up to the fixed suffix, so a
|
|
95
|
+
// provider whose own name ends in `_API` still parses (FOO_API + _API_KEY).
|
|
96
|
+
const OPENCODE_RE =
|
|
97
|
+
/^CRYSK_OPENCODE_([A-Z0-9]+(?:_[A-Z0-9]+)*)_(API_KEY|OAUTH)$/;
|
|
98
|
+
// A line is NAME=value when it starts with an identifier and an `=`; the value
|
|
99
|
+
// runs from the FIRST `=`, so base64 padding survives.
|
|
100
|
+
const LINE_RE = /^([A-Za-z_][A-Za-z0-9_]*)=(.*)$/;
|
|
101
|
+
// Names printed back are only these: a CRYSK_ name or an old name. Anything else
|
|
102
|
+
// may be the tail of a value split across lines (a base64 wrapped at 76
|
|
103
|
+
// characters can look like `QQ==`), so it is reported by line number only.
|
|
104
|
+
const CRYSK_NAME_RE = /^CRYSK_[A-Z0-9_]+$/;
|
|
105
|
+
// Standard base64, padded: what `base64 -w0` and the platform write.
|
|
106
|
+
const BASE64_RE = /^[A-Za-z0-9+/]+={0,2}$/;
|
|
107
|
+
// No credential is this short, and masking one would blank common text such as
|
|
108
|
+
// a lone `=` across the whole job log.
|
|
109
|
+
const MIN_MASK_LENGTH = 4;
|
|
110
|
+
// <P>'s source: a Models.dev style provider id. Dots are accepted (`wafer.ai`)
|
|
111
|
+
// and become `_` like dashes, as S8 says; `_` itself stays `_`.
|
|
112
|
+
const PROVIDER_ID_RE = /^[A-Za-z0-9]+(?:[._-][A-Za-z0-9]+)*$/;
|
|
113
|
+
|
|
114
|
+
// The platform stub forwards OpenCode API keys through dynamic slots,
|
|
115
|
+
// `CRYSK_OPENCODE_<TOKEN>_API_KEY=<secret>` with the token from a dispatch input
|
|
116
|
+
// (platform L97-L98). An unused slot renders exactly as this line (empty token,
|
|
117
|
+
// empty value; verified on GitHub, run 42544917469 on cryskai/crysk-sandbox).
|
|
118
|
+
const EMPTY_OPENCODE_SLOT_NAME = "CRYSK_OPENCODE__API_KEY";
|
|
119
|
+
const EMPTY_OPENCODE_SLOT_LINE = `${EMPTY_OPENCODE_SLOT_NAME}=`;
|
|
120
|
+
|
|
121
|
+
// How many OpenCode provider slots a workflow carries, so the most OpenCode
|
|
122
|
+
// providers one review's models may name. The scaffolded workflow (E-f F4, D2)
|
|
123
|
+
// has this many slot lines, driven by vars.CRYSK_OPENCODE_PROVIDERS, and
|
|
124
|
+
// `crysk ci init` refuses models that name more. The platform's stub has the
|
|
125
|
+
// same count (its MAX_OPENCODE_PROVIDERS).
|
|
126
|
+
export const MAX_OPENCODE_PROVIDER_SLOTS = 5;
|
|
127
|
+
|
|
128
|
+
// E-f F5: action.yml empties the Claude variables in every step, but an OpenCode
|
|
129
|
+
// secret's name is per provider, so a job-level CRYSK_OPENCODE_* variable cannot be
|
|
130
|
+
// emptied there and reaches every process the step starts. The trigger and the run
|
|
131
|
+
// step name such a variable in a warning, never its value. Empty ones carry nothing.
|
|
132
|
+
const OPENCODE_ENV_NAME_RE = /^CRYSK_OPENCODE_[A-Z0-9_]+$/;
|
|
133
|
+
|
|
134
|
+
export function inheritedOpenCodeSecretNames(
|
|
135
|
+
env: Readonly<Record<string, string | undefined>>,
|
|
136
|
+
): string[] {
|
|
137
|
+
return Object.keys(env)
|
|
138
|
+
.filter(
|
|
139
|
+
(name) => OPENCODE_ENV_NAME_RE.test(name) && (env[name] ?? "") !== "",
|
|
140
|
+
)
|
|
141
|
+
.sort();
|
|
142
|
+
}
|
|
143
|
+
|
|
144
|
+
export function inheritedOpenCodeSecretWarning(name: string): string {
|
|
145
|
+
return `${name} is set in this step's environment, so every process the step starts can read it: pass it only in the crysk-secrets input, and remove it from the workflow's env.`;
|
|
146
|
+
}
|
|
147
|
+
|
|
148
|
+
const SPLIT_HINT =
|
|
149
|
+
"(a value split across lines? encode _OAUTH secrets with base64 -w0)";
|
|
150
|
+
|
|
151
|
+
// A plan provider id to the <P> of its secret names, or undefined when no secret
|
|
152
|
+
// name can carry it (empty, a leading, trailing or doubled separator, or any
|
|
153
|
+
// other character). Two ids that differ only in `-`, `.` or `_` share a token;
|
|
154
|
+
// Models.dev has no such pair today.
|
|
155
|
+
export function opencodeSecretToken(providerId: string): string | undefined {
|
|
156
|
+
if (!PROVIDER_ID_RE.test(providerId)) return undefined;
|
|
157
|
+
return providerId.toUpperCase().replace(/[.-]/g, "_");
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
export function opencodeSecretsFor(
|
|
161
|
+
secrets: CryskSecrets,
|
|
162
|
+
providerId: string,
|
|
163
|
+
): OpenCodeProviderSecrets | undefined {
|
|
164
|
+
const token = opencodeSecretToken(providerId);
|
|
165
|
+
return token === undefined ? undefined : secrets.opencode.get(token);
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
// U3 (L12 decision 5): an `_OAUTH` secret is read for this provider only, the
|
|
169
|
+
// one whose subscription record the engine projects (OPENCODE_OAUTH_PROVIDER in
|
|
170
|
+
// security/credential-broker.ts, not imported so this module stays builtins-only;
|
|
171
|
+
// a test pins the two equal). Another provider's OAuth record has no broker yet.
|
|
172
|
+
export const OPENCODE_OAUTH_SECRET_PROVIDER = "openai";
|
|
173
|
+
|
|
174
|
+
export type OpenCodeSecretChoice =
|
|
175
|
+
| {
|
|
176
|
+
readonly kind: "oauth" | "api_key";
|
|
177
|
+
// The secret whose value builds the provider's auth record.
|
|
178
|
+
readonly secret: string;
|
|
179
|
+
// A secret of the same provider that is set but not used.
|
|
180
|
+
readonly unused?: string;
|
|
181
|
+
readonly problem?: undefined;
|
|
182
|
+
}
|
|
183
|
+
| { readonly problem: string; readonly kind?: undefined };
|
|
184
|
+
|
|
185
|
+
// Which CRYSK_* secret serves an OpenCode provider, from the secret NAMES alone,
|
|
186
|
+
// so the setup step that writes the auth record and credentialKindForRoute, which
|
|
187
|
+
// binds the kind, read one rule and cannot disagree. Undefined when no secret
|
|
188
|
+
// serves it. The subscription comes first (L12 decision 4), like the Claude
|
|
189
|
+
// order's default. The provider is normalized with opencodeSecretToken; a secret
|
|
190
|
+
// name is never reversed into a provider.
|
|
191
|
+
// outcome.ts matches this refusal to give it its own fix (the provider's
|
|
192
|
+
// _API_KEY); test/ci/publish.test.ts runs this function's text through it.
|
|
193
|
+
const UNSUPPORTED_OAUTH_TEXT = `is an OpenCode subscription record, which Crysk reads only for ${OPENCODE_OAUTH_SECRET_PROVIDER} for now`;
|
|
194
|
+
export function chooseOpenCodeSecret(
|
|
195
|
+
providerId: string,
|
|
196
|
+
names: readonly string[],
|
|
197
|
+
): OpenCodeSecretChoice | undefined {
|
|
198
|
+
const token = opencodeSecretToken(providerId);
|
|
199
|
+
if (token === undefined) return undefined;
|
|
200
|
+
const apiKey = `CRYSK_OPENCODE_${token}_API_KEY`;
|
|
201
|
+
const oauth = `CRYSK_OPENCODE_${token}_OAUTH`;
|
|
202
|
+
const hasApiKey = names.includes(apiKey);
|
|
203
|
+
if (names.includes(oauth)) {
|
|
204
|
+
if (providerId !== OPENCODE_OAUTH_SECRET_PROVIDER) {
|
|
205
|
+
return {
|
|
206
|
+
problem: `${oauth} ${UNSUPPORTED_OAUTH_TEXT}; set ${apiKey} instead`,
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
return hasApiKey
|
|
210
|
+
? { kind: "oauth", secret: oauth, unused: apiKey }
|
|
211
|
+
: { kind: "oauth", secret: oauth };
|
|
212
|
+
}
|
|
213
|
+
return hasApiKey ? { kind: "api_key", secret: apiKey } : undefined;
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
// Whether the input carries any Crysk credential, for the trigger's no-credential
|
|
217
|
+
// check (U5). A refused value counts: the setup step names what is wrong with it
|
|
218
|
+
// (credential/malformed_payload), which says more than "no credential". An old
|
|
219
|
+
// name never counts, and an empty value is absent.
|
|
220
|
+
export function cryskSecretsCarryCredential(parse: CryskSecretsParse): boolean {
|
|
221
|
+
const presence = cryskSecretsPresence(parse);
|
|
222
|
+
return (
|
|
223
|
+
presence.claude.length > 0 ||
|
|
224
|
+
presence.opencodeProviders.length > 0 ||
|
|
225
|
+
parse.problems.length > 0
|
|
226
|
+
);
|
|
227
|
+
}
|
|
228
|
+
|
|
229
|
+
// What the setup step may tell later steps: names and kinds, never a value.
|
|
230
|
+
export function cryskSecretsPresence(parse: CryskSecretsParse): {
|
|
231
|
+
names: string[];
|
|
232
|
+
claude: ClaudeCredentialKind[];
|
|
233
|
+
opencodeProviders: string[];
|
|
234
|
+
} {
|
|
235
|
+
const claude = (["subscription", "api_key"] as const).filter(
|
|
236
|
+
(kind) => parse.secrets.claude[kind] !== undefined,
|
|
237
|
+
);
|
|
238
|
+
return {
|
|
239
|
+
names: [...parse.names],
|
|
240
|
+
claude,
|
|
241
|
+
opencodeProviders: [...parse.secrets.opencode.keys()].sort(),
|
|
242
|
+
};
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
type OAuthDecode =
|
|
246
|
+
| { ok: true; record: OpenCodeOAuthRecord; leaves: string[] }
|
|
247
|
+
| { ok: false; problem: string };
|
|
248
|
+
|
|
249
|
+
function isPlainObject(value: unknown): value is Record<string, unknown> {
|
|
250
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
// Every string inside the record but its top-level `type`: GitHub registered the
|
|
254
|
+
// base64 text as the secret, never the tokens inside it, so these masks are the
|
|
255
|
+
// only thing that hides a decoded access or refresh token.
|
|
256
|
+
function stringLeaves(value: unknown, out: string[], skipType: boolean): void {
|
|
257
|
+
if (typeof value === "string") {
|
|
258
|
+
out.push(value);
|
|
259
|
+
} else if (Array.isArray(value)) {
|
|
260
|
+
for (const item of value) stringLeaves(item, out, false);
|
|
261
|
+
} else if (isPlainObject(value)) {
|
|
262
|
+
for (const [key, item] of Object.entries(value)) {
|
|
263
|
+
if (skipType && key === "type") continue;
|
|
264
|
+
stringLeaves(item, out, false);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
|
|
269
|
+
function decodeOAuth(name: string, value: string): OAuthDecode {
|
|
270
|
+
// Buffer.from(x, "base64") skips characters outside the alphabet without a
|
|
271
|
+
// word, so the alphabet and the padded length are checked first.
|
|
272
|
+
if (!BASE64_RE.test(value) || value.length % 4 !== 0) {
|
|
273
|
+
return {
|
|
274
|
+
ok: false,
|
|
275
|
+
problem: `${name} is not base64 (encode the OpenCode auth record with base64 -w0)`,
|
|
276
|
+
};
|
|
277
|
+
}
|
|
278
|
+
let parsed: unknown;
|
|
279
|
+
try {
|
|
280
|
+
parsed = JSON.parse(Buffer.from(value, "base64").toString("utf8"));
|
|
281
|
+
} catch {
|
|
282
|
+
parsed = undefined;
|
|
283
|
+
}
|
|
284
|
+
if (!isPlainObject(parsed)) {
|
|
285
|
+
return { ok: false, problem: `${name} does not decode to a JSON object` };
|
|
286
|
+
}
|
|
287
|
+
if (parsed.type !== "oauth") {
|
|
288
|
+
return {
|
|
289
|
+
ok: false,
|
|
290
|
+
problem: `${name} is not an OpenCode OAuth record (its type is not "oauth")`,
|
|
291
|
+
};
|
|
292
|
+
}
|
|
293
|
+
const leaves: string[] = [];
|
|
294
|
+
stringLeaves(parsed, leaves, true);
|
|
295
|
+
return { ok: true, record: parsed as OpenCodeOAuthRecord, leaves };
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
export function parseCryskSecrets(raw: string): CryskSecretsParse {
|
|
299
|
+
const claude: { subscription?: string; api_key?: string } = {};
|
|
300
|
+
const opencode = new Map<string, OpenCodeProviderSecrets>();
|
|
301
|
+
const names = new Set<string>();
|
|
302
|
+
const legacy = new Set<LegacySecretName>();
|
|
303
|
+
const masks: string[] = [];
|
|
304
|
+
const notices: string[] = [];
|
|
305
|
+
const problems: string[] = [];
|
|
306
|
+
const seen = new Set<string>();
|
|
307
|
+
|
|
308
|
+
const mask = (text: string) => {
|
|
309
|
+
if (text.length >= MIN_MASK_LENGTH && !masks.includes(text)) {
|
|
310
|
+
masks.push(text);
|
|
311
|
+
}
|
|
312
|
+
};
|
|
313
|
+
|
|
314
|
+
const lines = raw.split("\n");
|
|
315
|
+
for (const [index, rawLine] of lines.entries()) {
|
|
316
|
+
const line = rawLine.trim();
|
|
317
|
+
if (line === "") continue;
|
|
318
|
+
// An unused platform slot: skipped silently, never present. Only this exact
|
|
319
|
+
// line; a value under the empty token is refused below.
|
|
320
|
+
if (line === EMPTY_OPENCODE_SLOT_LINE) continue;
|
|
321
|
+
const lineNo = index + 1;
|
|
322
|
+
const match = LINE_RE.exec(line);
|
|
323
|
+
if (match === null) {
|
|
324
|
+
mask(line);
|
|
325
|
+
problems.push(
|
|
326
|
+
`line ${lineNo} of the crysk-secrets input is not NAME=value ${SPLIT_HINT}`,
|
|
327
|
+
);
|
|
328
|
+
continue;
|
|
329
|
+
}
|
|
330
|
+
const name = match[1] as string;
|
|
331
|
+
const value = (match[2] as string).trim();
|
|
332
|
+
const printable =
|
|
333
|
+
CRYSK_NAME_RE.test(name) ||
|
|
334
|
+
(LEGACY_SECRET_NAMES as readonly string[]).includes(name);
|
|
335
|
+
|
|
336
|
+
if (!printable) {
|
|
337
|
+
mask(line);
|
|
338
|
+
if (value !== "") mask(value);
|
|
339
|
+
notices.push(
|
|
340
|
+
`line ${lineNo} of the crysk-secrets input is not a Crysk credential; it is ignored.`,
|
|
341
|
+
);
|
|
342
|
+
continue;
|
|
343
|
+
}
|
|
344
|
+
// Empty counts as absent: a secret the repository does not have arrives as
|
|
345
|
+
// `NAME=` from `${{ secrets.NAME }}`.
|
|
346
|
+
if (value === "") continue;
|
|
347
|
+
mask(value);
|
|
348
|
+
if (name === EMPTY_OPENCODE_SLOT_NAME) {
|
|
349
|
+
problems.push(
|
|
350
|
+
`${name} has a value but no provider: an unused OpenCode slot must be empty`,
|
|
351
|
+
);
|
|
352
|
+
continue;
|
|
353
|
+
}
|
|
354
|
+
|
|
355
|
+
if ((LEGACY_SECRET_NAMES as readonly string[]).includes(name)) {
|
|
356
|
+
legacy.add(name as LegacySecretName);
|
|
357
|
+
continue;
|
|
358
|
+
}
|
|
359
|
+
if (CLAUDE_RESERVED_RE.test(name)) {
|
|
360
|
+
notices.push(
|
|
361
|
+
`${name} is reserved for several Claude accounts, which Crysk does not read yet; it is ignored.`,
|
|
362
|
+
);
|
|
363
|
+
continue;
|
|
364
|
+
}
|
|
365
|
+
|
|
366
|
+
const claudeKind = CLAUDE_NAMES[name];
|
|
367
|
+
const opencodeMatch = OPENCODE_RE.exec(name);
|
|
368
|
+
if (claudeKind === undefined && opencodeMatch === null) {
|
|
369
|
+
notices.push(`${name} is not a Crysk credential name; it is ignored.`);
|
|
370
|
+
continue;
|
|
371
|
+
}
|
|
372
|
+
if (seen.has(name)) {
|
|
373
|
+
problems.push(`${name} is given more than once`);
|
|
374
|
+
continue;
|
|
375
|
+
}
|
|
376
|
+
seen.add(name);
|
|
377
|
+
|
|
378
|
+
if (claudeKind !== undefined) {
|
|
379
|
+
claude[claudeKind] = value;
|
|
380
|
+
names.add(name);
|
|
381
|
+
continue;
|
|
382
|
+
}
|
|
383
|
+
const token = (opencodeMatch as RegExpExecArray)[1] as string;
|
|
384
|
+
const kind = (opencodeMatch as RegExpExecArray)[2];
|
|
385
|
+
const entry: OpenCodeProviderSecrets = opencode.get(token) ?? {};
|
|
386
|
+
if (kind === "API_KEY") {
|
|
387
|
+
entry.apiKey = value;
|
|
388
|
+
} else {
|
|
389
|
+
const decoded = decodeOAuth(name, value);
|
|
390
|
+
if (!decoded.ok) {
|
|
391
|
+
problems.push(decoded.problem);
|
|
392
|
+
continue;
|
|
393
|
+
}
|
|
394
|
+
for (const leaf of decoded.leaves) mask(leaf);
|
|
395
|
+
entry.oauth = decoded.record;
|
|
396
|
+
}
|
|
397
|
+
opencode.set(token, entry);
|
|
398
|
+
names.add(name);
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
return {
|
|
402
|
+
secrets: { claude, opencode },
|
|
403
|
+
names: [...names].sort(),
|
|
404
|
+
legacy: LEGACY_SECRET_NAMES.filter((name) => legacy.has(name)),
|
|
405
|
+
masks,
|
|
406
|
+
notices,
|
|
407
|
+
problems,
|
|
408
|
+
};
|
|
409
|
+
}
|
package/src/ci/gates.ts
CHANGED
|
@@ -330,44 +330,30 @@ export type CiBillingMode = "subscription" | "metered";
|
|
|
330
330
|
// ANTHROPIC_AUTH_TOKEN joined the signal in the same move. It was never
|
|
331
331
|
// excluded by a decision — the doctrine below never mentions it — and
|
|
332
332
|
// `ENV_PASSTHROUGH` (harness.ts) projects it into the child immediately beside
|
|
333
|
-
// ANTHROPIC_API_KEY as the same per-token credential class, so the rule
|
|
334
|
-
//
|
|
335
|
-
//
|
|
336
|
-
//
|
|
337
|
-
//
|
|
333
|
+
// ANTHROPIC_API_KEY as the same per-token credential class, so the presence rule
|
|
334
|
+
// that stood below (retired by S5) already covered it. It cannot reach a run's
|
|
335
|
+
// ceiling any more: the action takes Claude credentials only from the CRYSK_CLAUDE_*
|
|
336
|
+
// secrets in its crysk-secrets input (S8, U5) and empties the CLI's own variables,
|
|
337
|
+
// and the run env (claudeRunEnv) removes ANTHROPIC_AUTH_TOKEN whatever its source.
|
|
338
338
|
//
|
|
339
|
-
//
|
|
340
|
-
//
|
|
341
|
-
//
|
|
342
|
-
//
|
|
343
|
-
//
|
|
344
|
-
//
|
|
345
|
-
//
|
|
346
|
-
//
|
|
347
|
-
//
|
|
348
|
-
// the projection with no precedence between them, and `defaultClaudeAuthProbe`
|
|
349
|
-
// (model/provider-capabilities.ts:402-405) ORs them into a single boolean. Whichever
|
|
350
|
-
// one the Claude CLI itself prefers wins, and that fact is recorded nowhere in
|
|
351
|
-
// this codebase.
|
|
339
|
+
// S5 (2026-11-06) retired the rule that stood here: "the mere PRESENCE of a key keeps
|
|
340
|
+
// the ceiling", written while nobody chose which credential billed when both were set
|
|
341
|
+
// (the CLI preferred the key, observed on CLI 2.1.312). Now the run chooses: the first
|
|
342
|
+
// credential in `credentials.claude` (default subscription, then api_key) that is
|
|
343
|
+
// present, once at run start (security/claude-credential.ts). The env this function
|
|
344
|
+
// receives is that run's env, which holds the chosen Claude credential and no other,
|
|
345
|
+
// so `metered` here means the run uses the API key, and a repo holding both secrets
|
|
346
|
+
// with the default order runs on the subscription with no ceiling. A caller that
|
|
347
|
+
// passes the raw process env instead gets the old presence answer.
|
|
352
348
|
//
|
|
353
|
-
//
|
|
354
|
-
//
|
|
355
|
-
//
|
|
356
|
-
//
|
|
357
|
-
//
|
|
358
|
-
//
|
|
359
|
-
//
|
|
360
|
-
//
|
|
361
|
-
//
|
|
362
|
-
// Trimming is load-bearing. 2026-09-02, #177 corrects the overstatement this
|
|
363
|
-
// paragraph used to carry ("without the trim, no route would ever resolve as
|
|
364
|
-
// a subscription in Actions"): action.yml:111 binds the input UNCONDITIONALLY
|
|
365
|
-
// and GitHub renders an unset input as the empty string, so every
|
|
366
|
-
// subscription-route CI run carries `ANTHROPIC_API_KEY=""` — and `""` is
|
|
367
|
-
// already falsy, so that case never needed the trim. What the trim catches is
|
|
368
|
-
// a WHITESPACE-ONLY value, which is truthy and would otherwise impose a
|
|
369
|
-
// ceiling on a subscription route. `test/ci/gates.test.ts` asserts both cases
|
|
370
|
-
// separately, and only the whitespace ones flip when the trim is removed.
|
|
349
|
+
// Trimming is load-bearing. An empty value never needed it: `""` is already
|
|
350
|
+
// falsy, and it is what the action binds the CLI's Claude variables to and how
|
|
351
|
+
// GitHub renders a secret the repository does not have. What the trim catches is
|
|
352
|
+
// a WHITESPACE-ONLY value, which is truthy and would otherwise impose a ceiling
|
|
353
|
+
// on a subscription route, for a caller that passes a raw env (the run env never
|
|
354
|
+
// holds one: claudeCredentialPresence trims the same way and drops it).
|
|
355
|
+
// `test/ci/gates.test.ts` asserts both cases separately, and only the
|
|
356
|
+
// whitespace ones flip when the trim is removed.
|
|
371
357
|
//
|
|
372
358
|
// This is deliberately NOT `model/provider-capabilities.ts`'s
|
|
373
359
|
// `CLAUDE_CAPABILITY_STATICS.billingMode`, and the two must not be "unified"
|