@supersdk/supercli 0.3.0 → 0.3.1-staging.40

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.
Files changed (60) hide show
  1. package/dist/api/analyticsClient.js +48 -0
  2. package/dist/api/analyticsClient.js.map +1 -0
  3. package/dist/api/consoleClient.js +58 -42
  4. package/dist/api/consoleClient.js.map +1 -1
  5. package/dist/api/dbClient.js +90 -0
  6. package/dist/api/dbClient.js.map +1 -0
  7. package/dist/api/settingsClient.js +43 -0
  8. package/dist/api/settingsClient.js.map +1 -0
  9. package/dist/cli.js +24 -2
  10. package/dist/cli.js.map +1 -1
  11. package/dist/commands/add.js +67 -226
  12. package/dist/commands/add.js.map +1 -1
  13. package/dist/commands/analytics.js +265 -0
  14. package/dist/commands/analytics.js.map +1 -0
  15. package/dist/commands/db.js +590 -0
  16. package/dist/commands/db.js.map +1 -0
  17. package/dist/commands/deploy.js +883 -0
  18. package/dist/commands/deploy.js.map +1 -0
  19. package/dist/commands/env.js +53 -0
  20. package/dist/commands/env.js.map +1 -0
  21. package/dist/commands/image.js +471 -0
  22. package/dist/commands/image.js.map +1 -0
  23. package/dist/commands/logs.js +131 -0
  24. package/dist/commands/logs.js.map +1 -0
  25. package/dist/commands/publishSite.js +28 -10
  26. package/dist/commands/publishSite.js.map +1 -1
  27. package/dist/commands/register.js +363 -0
  28. package/dist/commands/register.js.map +1 -0
  29. package/dist/commands/settings.js +307 -0
  30. package/dist/commands/settings.js.map +1 -0
  31. package/dist/commands/sqlInput.js +48 -0
  32. package/dist/commands/sqlInput.js.map +1 -0
  33. package/dist/docker/dockerCli.js +301 -0
  34. package/dist/docker/dockerCli.js.map +1 -0
  35. package/dist/docker/registry.js +128 -0
  36. package/dist/docker/registry.js.map +1 -0
  37. package/dist/generated/log_contract.js +33 -0
  38. package/dist/generated/log_contract.js.map +1 -0
  39. package/dist/output/envelope.js +20 -5
  40. package/dist/output/envelope.js.map +1 -1
  41. package/dist/output/resultPrinter.js +35 -6
  42. package/dist/output/resultPrinter.js.map +1 -1
  43. package/dist/publish/registryClient.js +128 -0
  44. package/dist/publish/registryClient.js.map +1 -0
  45. package/dist/publish/runClient.js +495 -0
  46. package/dist/publish/runClient.js.map +1 -0
  47. package/dist/template/scripts/build_android.sh +107 -8
  48. package/dist/template/scripts/web_package.py +15 -3
  49. package/dist/template/web/src/js/app.js +3 -2
  50. package/dist/template/web/src/js/supersdk.js +1 -2024
  51. package/dist/template/web/src/js/supersdk.provenance.json +5 -4
  52. package/dist/util/prompt.js +7 -2
  53. package/dist/util/prompt.js.map +1 -1
  54. package/dist/workspace/config.js +1 -0
  55. package/dist/workspace/config.js.map +1 -1
  56. package/dist/workspace/inspect.js +274 -0
  57. package/dist/workspace/inspect.js.map +1 -0
  58. package/dist/workspace/projectIdentity.js +255 -0
  59. package/dist/workspace/projectIdentity.js.map +1 -0
  60. package/package.json +4 -4
@@ -0,0 +1,301 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || (function () {
19
+ var ownKeys = function(o) {
20
+ ownKeys = Object.getOwnPropertyNames || function (o) {
21
+ var ar = [];
22
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
23
+ return ar;
24
+ };
25
+ return ownKeys(o);
26
+ };
27
+ return function (mod) {
28
+ if (mod && mod.__esModule) return mod;
29
+ var result = {};
30
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
31
+ __setModuleDefault(result, mod);
32
+ return result;
33
+ };
34
+ })();
35
+ Object.defineProperty(exports, "__esModule", { value: true });
36
+ exports.defaultDockerFacade = exports.SUPERCLI_DOCKER_BIN_ENV = void 0;
37
+ exports.dockerBin = dockerBin;
38
+ exports.buildArgs = buildArgs;
39
+ exports.pushArgs = pushArgs;
40
+ exports.versionArgs = versionArgs;
41
+ exports.parsePushDigest = parsePushDigest;
42
+ exports.dockerConfigContent = dockerConfigContent;
43
+ exports.resetSignalCleanupForTests = resetSignalCleanupForTests;
44
+ exports.withEphemeralDockerConfig = withEphemeralDockerConfig;
45
+ exports.runDocker = runDocker;
46
+ exports.probeDocker = probeDocker;
47
+ // The `docker`面 of `supercli deploy` (AC-16 / AC-17). SuperCLI had no docker
48
+ // integration before this command, so the shape here is deliberately minimal:
49
+ //
50
+ // - no docker SDK dependency — we shell out to the user's own `docker` binary
51
+ // with `spawnSync`, the same zero-native-dependency discipline the credential
52
+ // backends follow (`store/backends/osKeyring.ts`);
53
+ // - argv是纯函数(`buildArgs`/`pushArgs`)so the exact command line is unit
54
+ // testable without a daemon (the convention `update/installSafety.ts` set);
55
+ // - 🔴 AC-17: credentials live in an EPHEMERAL `DOCKER_CONFIG` directory that is
56
+ // created per invocation and removed in a `finally` — the user never has to
57
+ // `docker login`, and `~/.docker/config.json` is never read for auth nor
58
+ // written to;
59
+ // - 🔴 stdout purity (Agent Contract): docker's own output NEVER reaches our
60
+ // stdout. Build output streams straight onto fd 2 (stderr); push output is
61
+ // captured (we must parse the digest out of it) and echoed to stderr.
62
+ const node_child_process_1 = require("node:child_process");
63
+ const fs = __importStar(require("node:fs"));
64
+ const os = __importStar(require("node:os"));
65
+ const path = __importStar(require("node:path"));
66
+ exports.SUPERCLI_DOCKER_BIN_ENV = 'SUPERCLI_DOCKER_BIN';
67
+ /** The docker binary to invoke (overridable so tests / odd installs can point elsewhere). */
68
+ function dockerBin() {
69
+ const override = process.env[exports.SUPERCLI_DOCKER_BIN_ENV]?.trim();
70
+ return override && override.length > 0 ? override : 'docker';
71
+ }
72
+ function buildArgs(input) {
73
+ const args = ['build', '-f', input.dockerfile, '-t', input.tag];
74
+ if (input.platform)
75
+ args.push('--platform', input.platform);
76
+ for (const arg of input.buildArgs ?? [])
77
+ args.push('--build-arg', arg);
78
+ args.push(input.context);
79
+ return args;
80
+ }
81
+ function pushArgs(tag) {
82
+ return ['push', tag];
83
+ }
84
+ function versionArgs() {
85
+ // `{{.Server.Version}}` fails when the CLI is installed but the daemon is not
86
+ // reachable — exactly the distinction AC-16 has to report.
87
+ return ['version', '--format', '{{.Server.Version}}'];
88
+ }
89
+ /**
90
+ * `docker push` prints `<tag>: digest: sha256:… size: …` on success. That line is
91
+ * the authoritative digest of what the registry now holds (AC-2's first-class
92
+ * input), so we parse it rather than re-deriving one locally.
93
+ */
94
+ const PUSH_DIGEST_PATTERN = /digest:\s*(sha256:[0-9a-f]{64})/;
95
+ function parsePushDigest(output) {
96
+ const match = PUSH_DIGEST_PATTERN.exec(output);
97
+ return match ? match[1] : null;
98
+ }
99
+ /**
100
+ * The minimal docker config that authenticates ONE registry. Written into a
101
+ * throwaway directory; never merged into, and never derived from, the user's
102
+ * global `~/.docker/config.json`.
103
+ */
104
+ function dockerConfigContent(credential) {
105
+ const auth = Buffer.from(`${credential.username}:${credential.secret}`, 'utf8').toString('base64');
106
+ return JSON.stringify({ auths: { [credential.registry]: { auth } } });
107
+ }
108
+ // ---------------------------------------------------------------------------
109
+ // signal-safe cleanup (ARC-R12)
110
+ // ---------------------------------------------------------------------------
111
+ //
112
+ // 🔴 `finally` alone is not enough: with NO `process.on('SIGINT' | 'SIGTERM')`
113
+ // listener registered anywhere in this repo, Node's DEFAULT disposition for
114
+ // those signals terminates the process immediately, bypassing the JS call
115
+ // stack — and therefore `withEphemeralDockerConfig`'s own `finally` below never
116
+ // runs. A Ctrl-C (or an orchestrator's SIGTERM) during a long `docker build`
117
+ // would leave the 0600 credential file sitting in `os.tmpdir()`. Registering a
118
+ // listener fixes that, but it also means Node no longer exits on its own once
119
+ // the signal arrives — the listener has to finish the job itself.
120
+ const TERMINATION_SIGNALS = ['SIGINT', 'SIGTERM'];
121
+ const activeEphemeralDirs = new Set();
122
+ let installedSignalHandler;
123
+ function cleanupActiveEphemeralDirs() {
124
+ for (const dir of activeEphemeralDirs) {
125
+ try {
126
+ fs.rmSync(dir, { recursive: true, force: true });
127
+ }
128
+ catch {
129
+ // Best-effort — see withEphemeralDockerConfig's own `finally` below for why
130
+ // this never masks the real outcome.
131
+ }
132
+ }
133
+ activeEphemeralDirs.clear();
134
+ }
135
+ /**
136
+ * Installed exactly once no matter how many times it is called (idempotent —
137
+ * one call per `deploy` invocation inside a long-running host process must not
138
+ * stack up duplicate listeners; that would both leak listeners and run the
139
+ * cleanup + exit N times over on a single signal).
140
+ */
141
+ function ensureSignalCleanupInstalled() {
142
+ if (installedSignalHandler)
143
+ return;
144
+ const handler = (signal) => {
145
+ cleanupActiveEphemeralDirs();
146
+ // A registered listener disables Node's default terminate-on-signal
147
+ // behaviour, so exiting is now this handler's job too — otherwise Ctrl-C
148
+ // would clean up the credential file and then just hang instead of
149
+ // stopping the CLI. 128+signum matches the conventional shell exit code.
150
+ process.exit(128 + os.constants.signals[signal]);
151
+ };
152
+ installedSignalHandler = handler;
153
+ for (const signal of TERMINATION_SIGNALS)
154
+ process.on(signal, handler);
155
+ }
156
+ /**
157
+ * Test-only escape hatch: undoes `ensureSignalCleanupInstalled` so specs that
158
+ * exercise it do not leak a listener into every test that runs after them in
159
+ * the same process.
160
+ */
161
+ function resetSignalCleanupForTests() {
162
+ if (installedSignalHandler) {
163
+ for (const signal of TERMINATION_SIGNALS)
164
+ process.removeListener(signal, installedSignalHandler);
165
+ }
166
+ installedSignalHandler = undefined;
167
+ activeEphemeralDirs.clear();
168
+ }
169
+ /**
170
+ * Runs `fn` with a private `DOCKER_CONFIG` directory holding a single-registry
171
+ * credential, and removes it afterwards — success or failure alike.
172
+ *
173
+ * 🔴 The whole point of AC-17: the token is on disk only for the duration of the
174
+ * build+push, only inside a 0700 temp directory, and only for the one registry
175
+ * we are pushing to. `finally` is not optional — a thrown error must not leave a
176
+ * credential file behind. Neither is the signal handler above: a `finally` never
177
+ * runs if the process is torn down by a signal's default disposition first.
178
+ */
179
+ function withEphemeralDockerConfig(credential, fn) {
180
+ ensureSignalCleanupInstalled();
181
+ const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'supercli-docker-'));
182
+ const configPath = path.join(dir, 'config.json');
183
+ activeEphemeralDirs.add(dir);
184
+ try {
185
+ fs.chmodSync(dir, 0o700);
186
+ fs.writeFileSync(configPath, dockerConfigContent(credential), { mode: 0o600 });
187
+ return fn({ dir, configPath });
188
+ }
189
+ finally {
190
+ activeEphemeralDirs.delete(dir);
191
+ try {
192
+ fs.rmSync(dir, { recursive: true, force: true });
193
+ }
194
+ catch {
195
+ // Best-effort cleanup of a temp dir; never mask the real outcome. The file
196
+ // is 0600 inside a 0700 dir under the OS temp root either way.
197
+ }
198
+ }
199
+ }
200
+ function runDocker(args, opts = {}) {
201
+ const env = { ...process.env };
202
+ if (opts.dockerConfigDir) {
203
+ env.DOCKER_CONFIG = opts.dockerConfigDir;
204
+ }
205
+ const res = opts.mode === 'stream'
206
+ ? (0, node_child_process_1.spawnSync)(dockerBin(), [...args], {
207
+ // 🔴 fd 2 for BOTH child streams: docker's progress output must never
208
+ // land on our stdout, which in `--output json` carries exactly one
209
+ // envelope line.
210
+ stdio: ['ignore', 2, 2],
211
+ env,
212
+ ...(opts.cwd ? { cwd: opts.cwd } : {}),
213
+ })
214
+ : (0, node_child_process_1.spawnSync)(dockerBin(), [...args], {
215
+ stdio: ['ignore', 'pipe', 'pipe'],
216
+ encoding: 'utf8',
217
+ env,
218
+ ...(opts.cwd ? { cwd: opts.cwd } : {}),
219
+ });
220
+ const error = res.error;
221
+ return {
222
+ status: res.status,
223
+ stdout: typeof res.stdout === 'string' ? res.stdout : '',
224
+ stderr: typeof res.stderr === 'string' ? res.stderr : '',
225
+ ...(error ? { spawnErrorCode: error.code ?? 'SPAWN_ERROR', spawnErrorMessage: error.message } : {}),
226
+ };
227
+ }
228
+ function firstMeaningfulLine(text, fallback) {
229
+ const line = text
230
+ .split('\n')
231
+ .map((entry) => entry.trim())
232
+ .filter((entry) => entry.length > 0)
233
+ .pop();
234
+ return line && line.length > 0 ? line : fallback;
235
+ }
236
+ function probeDocker() {
237
+ const res = runDocker(versionArgs(), { mode: 'capture' });
238
+ if (res.spawnErrorCode === 'ENOENT') {
239
+ return { available: false, reason: 'not-installed', detail: `\`${dockerBin()}\` was not found on PATH` };
240
+ }
241
+ if (res.spawnErrorCode) {
242
+ return {
243
+ available: false,
244
+ reason: 'not-installed',
245
+ detail: res.spawnErrorMessage ?? `\`${dockerBin()}\` could not be started (${res.spawnErrorCode})`,
246
+ };
247
+ }
248
+ if (res.status !== 0) {
249
+ return {
250
+ available: false,
251
+ reason: 'daemon-unreachable',
252
+ detail: firstMeaningfulLine(res.stderr, 'the docker CLI is installed but the daemon did not answer'),
253
+ };
254
+ }
255
+ return { available: true, serverVersion: res.stdout.trim() || undefined };
256
+ }
257
+ exports.defaultDockerFacade = {
258
+ probe: probeDocker,
259
+ async buildAndPush(input) {
260
+ return withEphemeralDockerConfig(input.credential, ({ dir }) => {
261
+ const build = runDocker(buildArgs({
262
+ dockerfile: input.dockerfile,
263
+ context: input.context,
264
+ tag: input.tag,
265
+ ...(input.platform ? { platform: input.platform } : {}),
266
+ ...(input.buildArgs ? { buildArgs: input.buildArgs } : {}),
267
+ }), { mode: 'stream', dockerConfigDir: dir });
268
+ if (build.spawnErrorCode || build.status !== 0) {
269
+ return {
270
+ ok: false,
271
+ stage: 'build',
272
+ message: build.spawnErrorMessage ?? `docker build exited with status ${build.status ?? 'unknown'}`,
273
+ };
274
+ }
275
+ // Captured (not streamed): the digest line is the machine-readable output
276
+ // of this step. Echoed to stderr right after so the user still sees it.
277
+ const push = runDocker(pushArgs(input.tag), { mode: 'capture', dockerConfigDir: dir });
278
+ if (push.stdout)
279
+ process.stderr.write(push.stdout);
280
+ if (push.stderr)
281
+ process.stderr.write(push.stderr);
282
+ if (push.spawnErrorCode || push.status !== 0) {
283
+ return {
284
+ ok: false,
285
+ stage: 'push',
286
+ message: push.spawnErrorMessage ?? firstMeaningfulLine(push.stderr, `docker push exited with status ${push.status ?? 'unknown'}`),
287
+ };
288
+ }
289
+ const digest = parsePushDigest(`${push.stdout}\n${push.stderr}`);
290
+ if (!digest) {
291
+ return {
292
+ ok: false,
293
+ stage: 'digest',
294
+ message: 'docker push succeeded but printed no `digest: sha256:…` line',
295
+ };
296
+ }
297
+ return { ok: true, digest };
298
+ });
299
+ },
300
+ };
301
+ //# sourceMappingURL=dockerCli.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"dockerCli.js","sourceRoot":"","sources":["../../src/docker/dockerCli.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,128 @@
1
+ "use strict";
2
+ // Registry coordinates for `supercli deploy` (AC-17).
3
+ //
4
+ // The container registry is a SuperRun component (`repo.{zone}`, zot behind the
5
+ // `/auth/token` bearer flow in `services/super-run/src/modules/registry_auth`).
6
+ // The Console API does not publish its host today, so the CLI derives it from
7
+ // the API origin's zone — the same "one zone per platform deployment" rule the
8
+ // rest of the platform uses (CLAUDE.md §平台域名与环境隔离):
9
+ //
10
+ // https://console.supersdk.com -> repo.supersdk.com
11
+ // https://console.supersdk.top -> repo.supersdk.top
12
+ //
13
+ // 🔴 The derivation is deliberately narrow: anything that is not a
14
+ // `console.<zone>` origin (a local dev API, a custom deployment) yields null and
15
+ // the caller must be told to set SUPERCLI_REGISTRY explicitly — the CLI never
16
+ // guesses a host to push a private image to.
17
+ //
18
+ // TODO-verify(CA contract): if CA later exposes the registry host in a response
19
+ // (e.g. a `registry` field on the project/service view), switch to that value —
20
+ // server-returned coordinates always beat a locally derived one.
21
+ Object.defineProperty(exports, "__esModule", { value: true });
22
+ exports.DIGEST_PATTERN = exports.REGISTRY_BASIC_USERNAME = exports.SUPERCLI_REGISTRY_ENV = void 0;
23
+ exports.resolveRegistryHost = resolveRegistryHost;
24
+ exports.imageRepository = imageRepository;
25
+ exports.imageTag = imageTag;
26
+ exports.digestRef = digestRef;
27
+ exports.splitDigestRef = splitDigestRef;
28
+ exports.SUPERCLI_REGISTRY_ENV = 'SUPERCLI_REGISTRY';
29
+ /**
30
+ * Basic-auth username presented to the registry token endpoint. The password is
31
+ * the caller's `cli_` token; the username is only a principal selector on the
32
+ * server (`registry_auth/mod.rs`: anything that is not the configured robot user
33
+ * routes to the CA-authenticated user arm, and the JWT `sub` is replaced by the
34
+ * resolved user id — the client-supplied username is never trusted).
35
+ *
36
+ * 🔴 It must NOT collide with the cluster robot user, which is why it is a fixed,
37
+ * obviously-client-side name rather than something user-supplied.
38
+ */
39
+ exports.REGISTRY_BASIC_USERNAME = 'supercli';
40
+ /**
41
+ * `SUPERCLI_REGISTRY` if set (subject to the same-zone check below), else the
42
+ * `repo.<zone>` derived from a console origin.
43
+ *
44
+ * 🔴 EXT-R7: whatever host this resolves to gets the caller's full-power `cli_`
45
+ * console token as the registry Basic password (`docker/dockerCli.ts`'s
46
+ * `RegistryCredential` — see its own docstring: the "one-time" part is only the
47
+ * ephemeral `DOCKER_CONFIG` directory, the credential inside it is the same
48
+ * long-lived console token). An unrestricted override could send that token to
49
+ * any host the environment names. So when `apiOrigin` is a canonical
50
+ * `console.<zone>` origin, an override MUST resolve to a hostname inside that
51
+ * SAME zone (`<zone>` itself or any `*.<zone>` subdomain) — matching the
52
+ * `repo.<zone>` the derived path would have picked — unless the caller passes
53
+ * `allowForeignRegistry: true`. When `apiOrigin` is NOT that shape (local dev,
54
+ * a custom/self-hosted deployment with no platform zone to compare against),
55
+ * there is nothing to be "foreign" to, so the override is accepted as-is —
56
+ * this preserves the pre-existing behaviour for those setups and only
57
+ * tightens the canonical-origin case the token is actually scoped to.
58
+ */
59
+ function resolveRegistryHost(apiOrigin, options = {}) {
60
+ const zone = deriveZone(apiOrigin);
61
+ const override = process.env[exports.SUPERCLI_REGISTRY_ENV]?.trim();
62
+ if (override) {
63
+ const host = stripScheme(override);
64
+ if (zone && !options.allowForeignRegistry && !isInZone(host, zone)) {
65
+ return { kind: 'blocked', host, zone };
66
+ }
67
+ return { kind: 'resolved', host };
68
+ }
69
+ return zone ? { kind: 'resolved', host: `repo.${zone}` } : { kind: 'unresolved' };
70
+ }
71
+ function deriveZone(apiOrigin) {
72
+ let hostname;
73
+ try {
74
+ hostname = new URL(apiOrigin).hostname;
75
+ }
76
+ catch {
77
+ return null;
78
+ }
79
+ return hostname.startsWith('console.') ? hostname.slice('console.'.length) : null;
80
+ }
81
+ /** `host` (bare hostname, optionally with a port) is `zone` itself or a `*.zone` subdomain. */
82
+ function isInZone(host, zone) {
83
+ let hostname;
84
+ try {
85
+ hostname = new URL(`https://${host}`).hostname;
86
+ }
87
+ catch {
88
+ return false;
89
+ }
90
+ return hostname === zone || hostname.endsWith(`.${zone}`);
91
+ }
92
+ function stripScheme(value) {
93
+ return value.replace(/^https?:\/\//i, '').replace(/\/+$/, '');
94
+ }
95
+ /**
96
+ * `{registry}/{spid}/{slug}` — the repository name the registry's entitlement
97
+ * filter keys on: it authorizes by the FIRST PATH SEGMENT being an spid the
98
+ * caller owns (`registry_auth/scope.rs`), so the spid must lead.
99
+ */
100
+ function imageRepository(registry, spid, slug) {
101
+ return `${registry}/${spid}/${slug}`;
102
+ }
103
+ /**
104
+ * The mutable tag a deploy pushes to. Deliberately stable per environment rather
105
+ * than unique per build: the registry enforces a per-repo TAG COUNT quota
106
+ * (`registry_auth/quota.rs`) and a fresh tag per deploy would burn through it,
107
+ * losing `push` entitlement. Immutability comes from the digest, which is what
108
+ * actually gets deployed (AC-2).
109
+ */
110
+ function imageTag(repository, env) {
111
+ return `${repository}:${env}`;
112
+ }
113
+ /** The digest-pinned reference sent to the Console API (AC-2). */
114
+ function digestRef(repository, digest) {
115
+ return `${repository}@${digest}`;
116
+ }
117
+ exports.DIGEST_PATTERN = /^sha256:[0-9a-f]{64}$/;
118
+ /** Splits `repo[:tag]@sha256:…` into its repository part and digest, if pinned. */
119
+ function splitDigestRef(imageRef) {
120
+ const at = imageRef.lastIndexOf('@');
121
+ if (at <= 0)
122
+ return null;
123
+ const digest = imageRef.slice(at + 1);
124
+ if (!exports.DIGEST_PATTERN.test(digest))
125
+ return null;
126
+ return { repository: imageRef.slice(0, at), digest };
127
+ }
128
+ //# sourceMappingURL=registry.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"registry.js","sourceRoot":"","sources":["../../src/docker/registry.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,8EAA8E;AAC9E,+EAA+E;AAC/E,oDAAoD;AACpD,EAAE;AACF,0DAA0D;AAC1D,0DAA0D;AAC1D,EAAE;AACF,mEAAmE;AACnE,iFAAiF;AACjF,8EAA8E;AAC9E,6CAA6C;AAC7C,EAAE;AACF,gFAAgF;AAChF,gFAAgF;AAChF,iEAAiE;;;AAmDjE,kDAcC;AAgCD,0CAEC;AASD,4BAEC;AAGD,8BAEC;AAKD,wCAMC;AA5HY,QAAA,qBAAqB,GAAG,mBAAmB,CAAC;AAEzD;;;;;;;;;GASG;AACU,QAAA,uBAAuB,GAAG,UAAU,CAAC;AAkBlD;;;;;;;;;;;;;;;;;;GAkBG;AACH,SAAgB,mBAAmB,CACjC,SAAiB,EACjB,UAAsC,EAAE;IAExC,MAAM,IAAI,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,6BAAqB,CAAC,EAAE,IAAI,EAAE,CAAC;IAC5D,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,IAAI,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,oBAAoB,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;YACnE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QACzC,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACpC,CAAC;IACD,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,CAAC;AACpF,CAAC;AAED,SAAS,UAAU,CAAC,SAAiB;IACnC,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACpF,CAAC;AAED,+FAA+F;AAC/F,SAAS,QAAQ,CAAC,IAAY,EAAE,IAAY;IAC1C,IAAI,QAAgB,CAAC;IACrB,IAAI,CAAC;QACH,QAAQ,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,QAAQ,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,WAAW,CAAC,KAAa;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,SAAgB,eAAe,CAAC,QAAgB,EAAE,IAAY,EAAE,IAAY;IAC1E,OAAO,GAAG,QAAQ,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;AACvC,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,QAAQ,CAAC,UAAkB,EAAE,GAAW;IACtD,OAAO,GAAG,UAAU,IAAI,GAAG,EAAE,CAAC;AAChC,CAAC;AAED,kEAAkE;AAClE,SAAgB,SAAS,CAAC,UAAkB,EAAE,MAAc;IAC1D,OAAO,GAAG,UAAU,IAAI,MAAM,EAAE,CAAC;AACnC,CAAC;AAEY,QAAA,cAAc,GAAG,uBAAuB,CAAC;AAEtD,mFAAmF;AACnF,SAAgB,cAAc,CAAC,QAAgB;IAC7C,MAAM,EAAE,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IACrC,IAAI,EAAE,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACtC,IAAI,CAAC,sBAAc,CAAC,IAAI,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAC;IAC9C,OAAO,EAAE,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;AACvD,CAAC"}
@@ -0,0 +1,33 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.COMPACTED_ID_FIXED_VECTOR = exports.COMPACTED_ID_FRAMING = exports.SEGMENT_ID_FRAMING = exports.STREAM_ORDER = exports.CANONICAL_ORDER_FIELDS = exports.EVENT_ID_FIXED_VECTOR = exports.EVENT_ID_SEPARATOR_BYTE = exports.EVENT_ID_FIELDS = exports.ARCHIVE_SEQ_MAX = exports.ARCHIVE_SEQ_MIN = exports.QUERY_MESSAGE_MAX_BYTES = exports.LOG_MESSAGE_MAX_BYTES = exports.LOG_CONTRACT_SCHEMA_VERSION = void 0;
4
+ exports.parseArchiveSeq = parseArchiveSeq;
5
+ exports.compareCanonicalOrder = compareCanonicalOrder;
6
+ // Generated from log-contract/schema.json (sha256:79ebff19a8e84842f50846ea9664e6fb4da4122b4cbd831d1da2c4dc867df9ac). DO NOT EDIT.
7
+ exports.LOG_CONTRACT_SCHEMA_VERSION = '1';
8
+ exports.LOG_MESSAGE_MAX_BYTES = 16777216;
9
+ exports.QUERY_MESSAGE_MAX_BYTES = 65536;
10
+ exports.ARCHIVE_SEQ_MIN = '1';
11
+ exports.ARCHIVE_SEQ_MAX = '18446744073709551615';
12
+ exports.EVENT_ID_FIELDS = ["source_id", "pod_uid", "container", "restart_count", "event_time_unix_nano", "stream", "occurrence"];
13
+ exports.EVENT_ID_SEPARATOR_BYTE = 0;
14
+ exports.EVENT_ID_FIXED_VECTOR = { "fields": ["lsrc_0123456789abcdef0123456789abcdef", "83fe7e31-86c1-45e9-97a8-d16405e9ee74", "user-container", "0", "1786431600123456789", "stdout", "0"], "framed_utf8_hex": "6c7372635f30313233343536373839616263646566303132333435363738396162636465660038336665376533312d383663312d343565392d393761382d64313634303565396565373400757365722d636f6e7461696e657200300031373836343331363030313233343536373839007374646f7574003000", "sha256": "2527c9ae89f388977866e97d5c56b3b178feadbfd2c96f3a04d0b557efdc5886" };
15
+ exports.CANONICAL_ORDER_FIELDS = ["archive_seq", "event_id"];
16
+ exports.STREAM_ORDER = { stdout: 0, stderr: 1 };
17
+ exports.SEGMENT_ID_FRAMING = "UTF-8(ingest_batch_id + '+' + source_id + '+' + utc_hour_yyyymmddhh + '+' + unsigned_decimal(split_ordinal)) with no trailing delimiter";
18
+ exports.COMPACTED_ID_FRAMING = "Sort unique triples by key, then etag, then catalog_key using unsigned UTF-8 byte order; for each triple append UTF-8(key), 0x00, UTF-8(etag), 0x00, UTF-8(catalog_key), 0x00. The final field is also followed by 0x00.";
19
+ exports.COMPACTED_ID_FIXED_VECTOR = { "inputs": [{ "key": "r7/source/b", "etag": "etag-1", "catalog_key": "r7q/lsrc_0123456789abcdef0123456789abcdef/p=00000000000000000000/00000000000000000002-00000000000000000002-bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb.json" }, { "key": "r7/source/a", "etag": "etag-2", "catalog_key": "r7q/lsrc_0123456789abcdef0123456789abcdef/p=00000000000000000000/00000000000000000001-00000000000000000001-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.json" }], "framed_utf8_hex": "72372f736f757263652f6100657461672d32007237712f6c7372635f30313233343536373839616263646566303132333435363738396162636465662f703d30303030303030303030303030303030303030302f30303030303030303030303030303030303030312d30303030303030303030303030303030303030312d616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161616161612e6a736f6e0072372f736f757263652f6200657461672d31007237712f6c7372635f30313233343536373839616263646566303132333435363738396162636465662f703d30303030303030303030303030303030303030302f30303030303030303030303030303030303030322d30303030303030303030303030303030303030322d626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262626262622e6a736f6e00", "sha256": "7c62f178f488f6caa7a677fe4a1c8ef0188aca11686efff50714762e3e58c987" };
20
+ function parseArchiveSeq(value) {
21
+ if (!/^[1-9][0-9]{0,19}$/.test(value))
22
+ throw new RangeError('archive_seq must be canonical decimal u64 in 1..=u64::MAX');
23
+ const parsed = BigInt(value);
24
+ if (parsed > BigInt(exports.ARCHIVE_SEQ_MAX))
25
+ throw new RangeError('archive_seq exceeds u64::MAX');
26
+ return parsed;
27
+ }
28
+ function compareCanonicalOrder(left, right) {
29
+ const leftSeq = parseArchiveSeq(left.archive_seq);
30
+ const rightSeq = parseArchiveSeq(right.archive_seq);
31
+ return leftSeq < rightSeq ? -1 : leftSeq > rightSeq ? 1 : 0;
32
+ }
33
+ //# sourceMappingURL=log_contract.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"log_contract.js","sourceRoot":"","sources":["../../src/generated/log_contract.ts"],"names":[],"mappings":";;;AAkUA,0CAKC;AAED,sDAIC;AA7UD,kIAAkI;AACrH,QAAA,2BAA2B,GAAG,GAAY,CAAC;AAC3C,QAAA,qBAAqB,GAAG,QAAiB,CAAC;AAC1C,QAAA,uBAAuB,GAAG,KAAc,CAAC;AACzC,QAAA,eAAe,GAAG,GAAY,CAAC;AAC/B,QAAA,eAAe,GAAG,sBAA+B,CAAC;AAClD,QAAA,eAAe,GAAG,CAAC,WAAW,EAAC,SAAS,EAAC,WAAW,EAAC,eAAe,EAAC,sBAAsB,EAAC,QAAQ,EAAC,YAAY,CAAU,CAAC;AAC5H,QAAA,uBAAuB,GAAG,CAAU,CAAC;AACrC,QAAA,qBAAqB,GAAG,EAAC,QAAQ,EAAC,CAAC,uCAAuC,EAAC,sCAAsC,EAAC,gBAAgB,EAAC,GAAG,EAAC,qBAAqB,EAAC,QAAQ,EAAC,GAAG,CAAC,EAAC,iBAAiB,EAAC,oPAAoP,EAAC,QAAQ,EAAC,kEAAkE,EAAU,CAAC;AACxgB,QAAA,sBAAsB,GAAG,CAAC,aAAa,EAAC,UAAU,CAAU,CAAC;AAC7D,QAAA,YAAY,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAW,CAAC;AACjD,QAAA,kBAAkB,GAAG,yIAAkJ,CAAC;AACxK,QAAA,oBAAoB,GAAG,0NAAmO,CAAC;AAC3P,QAAA,yBAAyB,GAAG,EAAC,QAAQ,EAAC,CAAC,EAAC,KAAK,EAAC,aAAa,EAAC,MAAM,EAAC,QAAQ,EAAC,aAAa,EAAC,kLAAkL,EAAC,EAAC,EAAC,KAAK,EAAC,aAAa,EAAC,MAAM,EAAC,QAAQ,EAAC,aAAa,EAAC,kLAAkL,EAAC,CAAC,EAAC,iBAAiB,EAAC,kxBAAkxB,EAAC,QAAQ,EAAC,kEAAkE,EAAU,CAAC;AAqT93C,SAAgB,eAAe,CAAC,KAAiB;IAC/C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,UAAU,CAAC,2DAA2D,CAAC,CAAC;IACzH,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,IAAI,MAAM,GAAG,MAAM,CAAC,uBAAe,CAAC;QAAE,MAAM,IAAI,UAAU,CAAC,8BAA8B,CAAC,CAAC;IAC3F,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAgB,qBAAqB,CAAC,IAAoB,EAAE,KAAqB;IAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACpD,OAAO,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC"}
@@ -76,6 +76,16 @@ class ResultLeakError extends Error {
76
76
  }
77
77
  }
78
78
  exports.ResultLeakError = ResultLeakError;
79
+ function pathIsAllowed(pathStr, allowTokenShapedPaths) {
80
+ const normalized = pathStr.replace(/\[\d+\]/g, '[*]');
81
+ return allowTokenShapedPaths.some((allowed) => {
82
+ if (allowed.endsWith('.**')) {
83
+ const root = allowed.slice(0, -3);
84
+ return normalized === root || normalized.startsWith(`${root}.`) || normalized.startsWith(`${root}[`);
85
+ }
86
+ return normalized === allowed;
87
+ });
88
+ }
79
89
  /**
80
90
  * Defense-in-depth self-check (PRD "开工前项"): a `result` payload is written to
81
91
  * stdout WITHOUT going through log.ts's redact(), so before emitting it we assert
@@ -83,21 +93,26 @@ exports.ResultLeakError = ResultLeakError;
83
93
  * leaking a token onto stdout — the primary control is still "commands never put
84
94
  * a raw token into result".
85
95
  */
86
- function assertNoTokenShapedValue(value, pathStr = '$', depth = 0) {
87
- if (value == null || depth > 8)
96
+ function assertNoTokenShapedValue(value, pathStr = '$', depth = 0, opts = {}) {
97
+ if (value == null)
88
98
  return;
99
+ // The traversal budget is only a denial-of-service guard. Exceeding it must
100
+ // fail closed; silently skipping a deep subtree could expose a credential.
101
+ if (depth > 64)
102
+ throw new ResultLeakError(pathStr);
89
103
  if (typeof value === 'string') {
90
- if (TOKEN_VALUE_PATTERN.test(value))
104
+ if (TOKEN_VALUE_PATTERN.test(value) && !pathIsAllowed(pathStr, opts.allowTokenShapedPaths ?? [])) {
91
105
  throw new ResultLeakError(pathStr);
106
+ }
92
107
  return;
93
108
  }
94
109
  if (Array.isArray(value)) {
95
- value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1));
110
+ value.forEach((v, i) => assertNoTokenShapedValue(v, `${pathStr}[${i}]`, depth + 1, opts));
96
111
  return;
97
112
  }
98
113
  if (typeof value === 'object') {
99
114
  for (const [k, v] of Object.entries(value)) {
100
- assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1);
115
+ assertNoTokenShapedValue(v, `${pathStr}.${k}`, depth + 1, opts);
101
116
  }
102
117
  }
103
118
  }
@@ -1 +1 @@
1
- {"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6BA,8CAEC;AAgBD,8CAEC;AAgBD,4DAeC;AAhFD,8EAA8E;AAC9E,yCAAyC;AACzC,EAAE;AACF,4EAA4E;AAC5E,EAAE;AACF,iFAAiF;AACjF,+EAA+E;AAC/E,iFAAiF;AACjF,4DAA4D;AAC5D,oDAAsC;AAEtC,gFAAgF;AACnE,QAAA,cAAc,GAAG,CAAC,CAAC;AAgBhC,kFAAkF;AAClF,SAAgB,iBAAiB;IAC/B,OAAO,OAAO,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;AACtC,CAAC;AAED,6EAA6E;AAC7E,uFAAuF;AACvF,wFAAwF;AACxF,uFAAuF;AACvF,uBAAuB;AACvB,MAAM,mBAAmB,GAAG,gCAAgC,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,qBAAqB,GAAG,iCAAiC,CAAC;AAChE,SAAgB,iBAAiB,CAAC,OAAe;IAC/C,OAAO,OAAO,CAAC,OAAO,CAAC,qBAAqB,EAAE,YAAY,CAAC,CAAC;AAC9D,CAAC;AAED,MAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,KAAa;QACvB,KAAK,CAAC,8DAA8D,KAAK,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CACF;AALD,0CAKC;AAED;;;;;;GAMG;AACH,SAAgB,wBAAwB,CAAC,KAAc,EAAE,OAAO,GAAG,GAAG,EAAE,KAAK,GAAG,CAAC;IAC/E,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,IAAI,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC;QACxE,OAAO;IACT,CAAC;IACD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QACpF,OAAO;IACT,CAAC;IACD,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAgC,CAAC,EAAE,CAAC;YACtE,wBAAwB,CAAC,CAAC,EAAE,GAAG,OAAO,IAAI,CAAC,EAAE,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"envelope.js","sourceRoot":"","sources":["../../src/output/envelope.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,7 @@ exports.ResultPrinter = void 0;
10
10
  const envelope_1 = require("./envelope");
11
11
  const exitCodes_1 = require("../exit/exitCodes");
12
12
  const log_1 = require("../util/log");
13
+ const PUBLIC_CODE = /^[A-Z][A-Z0-9_]{0,63}$/;
13
14
  function writeStdoutLine(s) {
14
15
  process.stdout.write(`${s}\n`);
15
16
  }
@@ -22,8 +23,20 @@ class ResultPrinter {
22
23
  }
23
24
  /** Emit a success result (exit stays 0). */
24
25
  success(result, opts = {}) {
26
+ // CA query results intentionally echo this printer's CLI-local request id.
27
+ // It resembles a credential, so accept only this exact top-level value; all
28
+ // other values are guarded in both JSON and human modes.
29
+ if (result !== null &&
30
+ typeof result === 'object' &&
31
+ !Array.isArray(result) &&
32
+ result.request_id === this.requestId) {
33
+ const { request_id: _requestId, ...withoutRequestId } = result;
34
+ (0, envelope_1.assertNoTokenShapedValue)(withoutRequestId, '$', 0, opts);
35
+ }
36
+ else {
37
+ (0, envelope_1.assertNoTokenShapedValue)(result, '$', 0, opts);
38
+ }
25
39
  if (this.mode === 'json') {
26
- (0, envelope_1.assertNoTokenShapedValue)(result);
27
40
  const envelope = {
28
41
  schema_version: envelope_1.SCHEMA_VERSION,
29
42
  ok: true,
@@ -38,31 +51,47 @@ class ResultPrinter {
38
51
  log_1.log.info(opts.humanMessage);
39
52
  }
40
53
  /** Emit a structured failure and set process.exitCode from the AC-3 table. */
41
- failure(kind, message) {
54
+ failure(kind, message, opts = {}) {
42
55
  // EXR-5: scrub any token-shaped run from the free-text message before it reaches
43
56
  // stdout (json) or stderr (human) — error messages bypass log.ts's redact().
44
57
  const safeMessage = (0, envelope_1.redactTokenShaped)(message);
45
58
  const { errorCode, exitCode } = (0, exitCodes_1.classifyFailure)(kind);
59
+ // A validated server code may refine the Agent Contract classifier while
60
+ // `kind` still controls the stable exit class. This lets infrastructure CA
61
+ // codes remain machine-readable without being misclassified as exit 2.
62
+ const publicCode = opts.publicCode && PUBLIC_CODE.test(opts.publicCode)
63
+ ? opts.publicCode
64
+ : errorCode;
46
65
  process.exitCode = exitCode;
66
+ if (opts.logMeta) {
67
+ // Opt-in command-owned diagnostic. This stays off by default so adding
68
+ // structured context for one command cannot duplicate legacy logs.
69
+ log_1.log.error(safeMessage, opts.logMeta);
70
+ }
47
71
  if (this.mode === 'json') {
48
72
  const envelope = {
49
73
  schema_version: envelope_1.SCHEMA_VERSION,
50
74
  ok: false,
51
- error: { code: errorCode, message: safeMessage },
75
+ error: { code: publicCode, message: safeMessage },
52
76
  request_id: this.requestId,
53
77
  };
54
78
  writeStdoutLine(JSON.stringify(envelope));
55
79
  return;
56
80
  }
57
- log_1.log.error(safeMessage);
81
+ if (!opts.logMeta)
82
+ log_1.log.error(safeMessage);
58
83
  }
59
84
  /** Render a CommandOutcome uniformly. */
60
85
  emit(outcome) {
61
86
  if (outcome.ok) {
62
- this.success(outcome.result, { soft: outcome.soft, humanMessage: outcome.humanMessage });
87
+ this.success(outcome.result, {
88
+ soft: outcome.soft,
89
+ humanMessage: outcome.humanMessage,
90
+ allowTokenShapedPaths: outcome.allowTokenShapedPaths,
91
+ });
63
92
  }
64
93
  else {
65
- this.failure(outcome.kind, outcome.message);
94
+ this.failure(outcome.kind, outcome.message, { publicCode: outcome.publicCode });
66
95
  }
67
96
  }
68
97
  }