@outerlayer/cli 0.41.2-next.20261119010339 → 0.42.0-next.20261119032403
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 +1 -1
- package/dist/build-info.json +1 -1
- package/dist/{caller-ZUQVRQMY.js → caller-WLYRCJKR.js} +1 -1
- package/dist/{check-BXJBIMLW.js → check-ZCF7AI73.js} +7 -7
- package/dist/{chunk-7HH6C45Q.js → chunk-3IRBKL4B.js} +1 -1
- package/dist/{chunk-DQ3IKV5Q.js → chunk-AGB4OA6T.js} +119 -33
- package/dist/{chunk-OLXB2YMX.js → chunk-CW74N36I.js} +1 -1
- package/dist/{chunk-X6WL4AQY.js → chunk-EIAE4HE5.js} +1 -1
- package/dist/{chunk-U5MLUAY3.js → chunk-J5FVUVGR.js} +1 -1
- package/dist/{chunk-Z27PY2OJ.js → chunk-TG5ITPUR.js} +1 -1
- package/dist/{chunk-AAL7FZPH.js → chunk-UAERR4NB.js} +1 -1
- package/dist/{chunk-S3VUP7LF.js → chunk-V3T36H4O.js} +2 -2
- package/dist/{chunk-7TDLQUJ5.js → chunk-W2TGACUB.js} +1 -1
- package/dist/{chunk-72NCZTEG.js → chunk-WTI5JAZ3.js} +2 -2
- package/dist/{chunk-RCE5YQFT.js → chunk-XI635QEJ.js} +117 -59
- package/dist/{chunk-3ZZSQG2A.js → chunk-YBPEOKBK.js} +1 -1
- package/dist/{cli-7QRILUMX.js → cli-376NPUD5.js} +29 -29
- package/dist/{command-TOAYBFFZ.js → command-6IRYBERW.js} +4 -4
- package/dist/{container-start-6FSO54P4.js → container-start-UGVA5X7P.js} +5 -5
- package/dist/{doctor-XDN7XS64.js → doctor-IBYJAM6B.js} +5 -5
- package/dist/{host-checks-XGFTDLLF.js → host-checks-KFUGD4FC.js} +3 -3
- package/dist/index.js +1 -1
- package/dist/{init-VOKKIEKX.js → init-R45QKBSR.js} +3 -3
- package/dist/{init-JU5GZJWH.js → init-VBAY7DST.js} +3 -3
- package/dist/{init-agent-XMC3ZJWR.js → init-agent-GA3TKIWH.js} +3 -3
- package/dist/{init-cmd-CKMBOAZ5.js → init-cmd-TOS5IA2V.js} +2 -2
- package/dist/{loop-WPT6ILVY.js → loop-OODXAKC6.js} +7 -7
- package/dist/{machine-BZBJNTTU.js → machine-NUZIF5L5.js} +3 -3
- package/dist/{runner-key-LTA6PHOI.js → runner-key-4UXNGDJA.js} +3 -3
- package/dist/{setup-cmd-ANDLH2E7.js → setup-cmd-HAYSPZJQ.js} +4 -4
- package/dist/{setup-wiring-4YSYU7OV.js → setup-wiring-HABXYP6Y.js} +6 -6
- package/dist/{status-4MTM45CS.js → status-CM3K7FBG.js} +3 -3
- package/dist/{update-steps-GJ6WGON2.js → update-steps-PDYCC5HX.js} +4 -4
- package/dist/{work-claim-cmd-BZ5RFKVN.js → work-claim-cmd-JURSVSEI.js} +1 -1
- package/dist/{work-proofs-cmd-FIEPKCPW.js → work-proofs-cmd-FSPZ64EK.js} +1 -1
- package/dist/{work-proofs-record-BQ7EAT5R.js → work-proofs-record-I36WZHH3.js} +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { RUNNER_PROTOCOL } from './chunk-
|
|
3
|
+
import { RUNNER_PROTOCOL } from './chunk-W2TGACUB.js';
|
|
4
4
|
import { MAX_TEST_FILE_BYTES, criteriaOf, hostItemsOf, loadCitationFinder, testFileMatcher, planCriteria, wholeItems, judgeGroups, failedItems, inCriteriaOrder, itemsSentence, testsByCriterion, oneLineReason, criterionInputs, parseJudgeAnswer, judgedItems, hostCheckOf } from './chunk-2QK7L3WV.js';
|
|
5
5
|
import { sha256OfFile, downloadPinned, VoiceDownloadError } from './chunk-2PGI6RDE.js';
|
|
6
6
|
import { hasStoredCredential, storedCredentialVariables, storeAgentCredential, replaceFile, isAgentName, credentialFromStdin } from './chunk-57MLWALQ.js';
|
|
@@ -10,7 +10,7 @@ import { senderPidfile } from './chunk-QZFQ6EWP.js';
|
|
|
10
10
|
import { installScrubContext } from './chunk-AFU6UF34.js';
|
|
11
11
|
import { readsJobState, READ_JOB_STATE_FORMATS, jobStateFormatOf } from './chunk-B4XB5QFD.js';
|
|
12
12
|
import { runnerImageVersion } from './chunk-NXYTICCS.js';
|
|
13
|
-
import { claimCalls, spoolHomeFor, itemCalls, claimItem, leftByRunnerKey, configForJob } from './chunk-
|
|
13
|
+
import { claimCalls, spoolHomeFor, itemCalls, claimItem, leftByRunnerKey, configForJob } from './chunk-V3T36H4O.js';
|
|
14
14
|
import { receiveFiles } from './chunk-NN33FYXG.js';
|
|
15
15
|
import { readDefaultBranchFiles, readDefaultBranchHead, buildRepositoryImage, readRepositoryRecipe, fetchCommit, prepareImageBuild, readBranchHead, diffBetween, KEY_PREFIX, TAG_HOST, SHARED_OWNER, SHARED_NAME, universalBase, metadataFromLabels, writeRecord, changedPathsBetween } from './chunk-XETFYRKD.js';
|
|
16
16
|
import { FETCHED_DIR, toolsDockerfile, FETCHED_FFMPEG, FETCHED_GH, FETCHED_TINI, FETCHED_HEADLESS_SHELL, FETCHED_PLAYWRIGHT_FFMPEG, FETCHED_VOICE_DIR } from './chunk-CQKCNDPP.js';
|
|
@@ -258,9 +258,8 @@ function claimRepos(repos) {
|
|
|
258
258
|
const bare = (pattern) => pattern.replace(/^github\.com\//i, "");
|
|
259
259
|
return { include: (repos.include ?? []).map(bare), exclude: (repos.exclude ?? []).map(bare) };
|
|
260
260
|
}
|
|
261
|
-
function
|
|
262
|
-
const run =
|
|
263
|
-
const runKey = data.runKey;
|
|
261
|
+
function parseRunClaim(runValue, runKey) {
|
|
262
|
+
const run = runValue;
|
|
264
263
|
if (run === null || run === void 0 || typeof run !== "object") return { kind: "none" };
|
|
265
264
|
if (typeof run.id !== "string" || typeof run.repository !== "string" || typeof run.instructions !== "string" || typeof run.issuesLeft !== "number" || typeof run.timeLimitSeconds !== "number" || typeof runKey !== "string" || runKey === "") {
|
|
266
265
|
return { kind: "malformed", reason: "the gateway's answer to the run claim is missing a field the runner needs; upgrade the runner or the gateway" };
|
|
@@ -271,6 +270,9 @@ function parseClaim(data) {
|
|
|
271
270
|
runKey
|
|
272
271
|
};
|
|
273
272
|
}
|
|
273
|
+
function parseClaim(data) {
|
|
274
|
+
return parseRunClaim(data.run, data.runKey);
|
|
275
|
+
}
|
|
274
276
|
async function claimRun(input) {
|
|
275
277
|
const { config } = input;
|
|
276
278
|
const repos = claimRepos(config.repos);
|
|
@@ -409,6 +411,25 @@ function judgeProbe(probe, missedBefore) {
|
|
|
409
411
|
if (probe.alive) return { kind: "running" };
|
|
410
412
|
return missedBefore ? { kind: "lost" } : { kind: "recheck" };
|
|
411
413
|
}
|
|
414
|
+
|
|
415
|
+
// src/runner/refused-hosts.ts
|
|
416
|
+
var ALLOWED_HOSTS_SETTING = "Settings \u2192 Build settings \u2192 Allowed hosts";
|
|
417
|
+
var NOT_ALLOWED = "not-allowed";
|
|
418
|
+
var NOTE_MAX = 140;
|
|
419
|
+
function hostsNotAllowed(record) {
|
|
420
|
+
return [...new Set((record?.refusals ?? []).filter((refusal) => refusal.range === NOT_ALLOWED).map((refusal) => refusal.host))];
|
|
421
|
+
}
|
|
422
|
+
function refusedHostsNote(hosts) {
|
|
423
|
+
if (hosts.length === 0) return void 0;
|
|
424
|
+
const note = (named2) => {
|
|
425
|
+
const others = hosts.length - named2.length;
|
|
426
|
+
const list = others === 0 ? named2.join(", ") : `${named2.join(", ")} and ${others} other ${others === 1 ? "host" : "hosts"}`;
|
|
427
|
+
return hosts.length === 1 ? `The build could not reach ${list}, which is not an allowed host. Add it under ${ALLOWED_HOSTS_SETTING}.` : `The build could not reach ${list}, which are not allowed hosts. Add them under ${ALLOWED_HOSTS_SETTING}.`;
|
|
428
|
+
};
|
|
429
|
+
let named = hosts.slice(0, 1);
|
|
430
|
+
while (named.length < hosts.length && note(hosts.slice(0, named.length + 1)).length <= NOTE_MAX) named = hosts.slice(0, named.length + 1);
|
|
431
|
+
return note(named);
|
|
432
|
+
}
|
|
412
433
|
var RESUME_DIR = "/build/home/.outerlayer/resume";
|
|
413
434
|
var META_FILE = "meta.json";
|
|
414
435
|
var SESSION_ID_VARIABLE = "OUTERLAYER_SESSION_ID";
|
|
@@ -718,7 +739,7 @@ function failedStepLineOf(path) {
|
|
|
718
739
|
// src/runner/managed-model-key.ts
|
|
719
740
|
var FETCH_RETRY_WINDOW_MS = 3e4;
|
|
720
741
|
var ADOPTED_FETCH_RETRY_WINDOW_MS = 3e5;
|
|
721
|
-
var OWN_404_CODES = /* @__PURE__ */ new Set(["work_item_not_found", "model_provider_unknown"]);
|
|
742
|
+
var OWN_404_CODES = /* @__PURE__ */ new Set(["work_item_not_found", "run_not_found", "model_provider_unknown"]);
|
|
722
743
|
async function fetchAnthropicKeyOfOlderGateway(config, item, fetchImpl, deps) {
|
|
723
744
|
const outcome = await retrySend(
|
|
724
745
|
async () => postJson(config.url, `/v1/work-items/${item}/claim/anthropic-key`, config.apiKey, config.appId, {}, fetchImpl, void 0, await signerFor(config.configPath)),
|
|
@@ -734,12 +755,13 @@ async function fetchAnthropicKeyOfOlderGateway(config, item, fetchImpl, deps) {
|
|
|
734
755
|
async function fetchManagedModelKey(config, item, deps = {}) {
|
|
735
756
|
const fetchImpl = deps.fetchImpl ?? fetch;
|
|
736
757
|
const body = deps.provider === void 0 ? {} : { provider: deps.provider };
|
|
758
|
+
const path = deps.run === true ? `/v1/schedule-runs/${item}/model-key` : `/v1/work-items/${item}/claim/model-key`;
|
|
737
759
|
const outcome = await retrySend(
|
|
738
|
-
async () => postJson(config.url,
|
|
760
|
+
async () => postJson(config.url, path, config.apiKey, config.appId, body, fetchImpl, void 0, await signerFor(config.configPath)),
|
|
739
761
|
{ now: deps.now, sleep: deps.sleep, windowMs: deps.windowMs ?? FETCH_RETRY_WINDOW_MS }
|
|
740
762
|
);
|
|
741
763
|
if (!outcome.ok) {
|
|
742
|
-
if (outcome.status === 404 && !OWN_404_CODES.has(outcome.code ?? "") && (deps.provider === void 0 || deps.provider === "anthropic")) {
|
|
764
|
+
if (deps.run !== true && outcome.status === 404 && !OWN_404_CODES.has(outcome.code ?? "") && (deps.provider === void 0 || deps.provider === "anthropic")) {
|
|
743
765
|
return fetchAnthropicKeyOfOlderGateway(config, item, fetchImpl, deps);
|
|
744
766
|
}
|
|
745
767
|
return { ok: false, code: outcome.code, reason: outcome.message ?? outcome.reason, retryable: outcome.retryable };
|
|
@@ -843,8 +865,9 @@ function parseSettings(data) {
|
|
|
843
865
|
}
|
|
844
866
|
async function fetchManagedBuildSettings(config, item, deps = {}) {
|
|
845
867
|
const fetchImpl = deps.fetchImpl ?? fetch;
|
|
868
|
+
const path = deps.run === true ? `/v1/schedule-runs/${item}/build-settings` : `/v1/work-items/${item}/claim/build-settings`;
|
|
846
869
|
const outcome = await retrySend(
|
|
847
|
-
async () => postJson(config.url,
|
|
870
|
+
async () => postJson(config.url, path, config.apiKey, config.appId, {}, fetchImpl, void 0, await signerFor(config.configPath)),
|
|
848
871
|
{ now: deps.now, sleep: deps.sleep, windowMs: deps.windowMs ?? FETCH_RETRY_WINDOW_MS2 }
|
|
849
872
|
);
|
|
850
873
|
if (!outcome.ok) return { ok: false, code: outcome.code, reason: outcome.message ?? outcome.reason, retryable: outcome.retryable };
|
|
@@ -8202,6 +8225,18 @@ function readRegularFile(path, limit) {
|
|
|
8202
8225
|
}
|
|
8203
8226
|
}
|
|
8204
8227
|
|
|
8228
|
+
// src/runner/provision-fault.ts
|
|
8229
|
+
var PROVIDER_REFUSED = { cause: "sandbox_provider", what: "the sandbox provider refused to create its sandbox" };
|
|
8230
|
+
var SANDBOX_NOT_STARTED = { cause: "sandbox_provider", what: "its sandbox did not start" };
|
|
8231
|
+
var SANDBOX_NOT_PREPARED = { cause: "sandbox_setup", what: "the runner could not prepare its sandbox" };
|
|
8232
|
+
var NO_DOCKER = { cause: "build_image", what: "its build image does not run Docker" };
|
|
8233
|
+
function imageLacksAgent(agentLabel) {
|
|
8234
|
+
return { cause: "build_image", what: `its build image has no ${agentLabel}` };
|
|
8235
|
+
}
|
|
8236
|
+
function managedFaultReason(fault) {
|
|
8237
|
+
return `The managed runner could not start this build: ${fault.what}. Only OuterLayer can fix this. Build the item again later.`;
|
|
8238
|
+
}
|
|
8239
|
+
|
|
8205
8240
|
// src/runner/sandbox/sweep.ts
|
|
8206
8241
|
var RUNNER_METADATA = "outerlayerRunner";
|
|
8207
8242
|
var BUILD_METADATA = "outerlayerBuild";
|
|
@@ -8952,24 +8987,30 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
8952
8987
|
const { config, runtime, item, itemKey, jobDir, log, tokens } = input;
|
|
8953
8988
|
const tag = itemTag({ item: item.number, organizationId: input.organizationId, claimId: input.claimId });
|
|
8954
8989
|
const logPath = join(jobDir, "provision.log");
|
|
8955
|
-
const fail = (reason, transient = false, retryAfterMs) => ({
|
|
8990
|
+
const fail = (reason, fault, transient = false, retryAfterMs) => ({
|
|
8991
|
+
ok: false,
|
|
8992
|
+
reason,
|
|
8993
|
+
...fault === void 0 ? {} : { fault },
|
|
8994
|
+
...transient ? { transient: true } : {},
|
|
8995
|
+
...transient && retryAfterMs !== void 0 ? { retryAfterMs } : {}
|
|
8996
|
+
});
|
|
8956
8997
|
const own = config.sandbox;
|
|
8957
|
-
if (own === void 0) return fail("runner.sandbox is not set in the config file");
|
|
8998
|
+
if (own === void 0) return fail("runner.sandbox is not set in the config file", void 0);
|
|
8958
8999
|
const repositories = repositoriesOf({ repositories: input.repositories, repository: item.specRepository, branch: input.branch });
|
|
8959
9000
|
const primary = primaryOf(repositories);
|
|
8960
|
-
if (primary === void 0) return fail("the work item names no repository to clone");
|
|
9001
|
+
if (primary === void 0) return fail("the work item names no repository to clone", void 0);
|
|
8961
9002
|
const repository = primary.repository;
|
|
8962
|
-
if ((managedBuildSettingsFor(jobDir)?.proxied?.length ?? 0) > 0) return fail(PROXIED_IN_SANDBOX_REASON);
|
|
9003
|
+
if ((managedBuildSettingsFor(jobDir)?.proxied?.length ?? 0) > 0) return fail(PROXIED_IN_SANDBOX_REASON, void 0);
|
|
8963
9004
|
const sized = sandboxSizeFor(config, jobDir);
|
|
8964
|
-
if (!sized.ok) return fail(sized.reason);
|
|
9005
|
+
if (!sized.ok) return fail(sized.reason, void 0);
|
|
8965
9006
|
let sandboxClient;
|
|
8966
9007
|
try {
|
|
8967
9008
|
sandboxClient = client(runtime);
|
|
8968
9009
|
} catch (err) {
|
|
8969
|
-
return fail(err instanceof SandboxError ? describeSandboxError(err) : describeCallFailure(err));
|
|
9010
|
+
return fail(err instanceof SandboxError ? describeSandboxError(err) : describeCallFailure(err), SANDBOX_NOT_PREPARED);
|
|
8970
9011
|
}
|
|
8971
9012
|
const governing = input.queue === "run" || input.queue === "review" ? SELF_GOVERNED : await resolveGoverningSource({ config, repository, fetchImpl: input.fetchImpl });
|
|
8972
|
-
if (!governing.ok) return fail(governing.reason);
|
|
9013
|
+
if (!governing.ok) return fail(governing.reason, void 0);
|
|
8973
9014
|
const governingSource = governing.source;
|
|
8974
9015
|
const controlPlaneUrl = (controlPlane) => runtime.remoteFor?.(controlPlane) ?? `${runtime.github.gitUrl}/${controlPlane}.git`;
|
|
8975
9016
|
if (governingSource.kind === "governed") {
|
|
@@ -8984,10 +9025,10 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
8984
9025
|
log,
|
|
8985
9026
|
tag
|
|
8986
9027
|
});
|
|
8987
|
-
if (unfetched !== void 0) return fail(unfetched.reason, unfetched.transient);
|
|
9028
|
+
if (unfetched !== void 0) return fail(unfetched.reason, void 0, unfetched.transient);
|
|
8988
9029
|
}
|
|
8989
9030
|
const read = await readSandboxRecipe({ runtime, config, tokens, repository, governingSource, organizationId: input.organizationId, ...input.queue === "review" ? { universal: true } : {} });
|
|
8990
|
-
if (!read.ok) return fail(read.reason, read.transient);
|
|
9031
|
+
if (!read.ok) return fail(read.reason, void 0, read.transient);
|
|
8991
9032
|
const recipe = read.recipe;
|
|
8992
9033
|
const recipeRepository = read.repository;
|
|
8993
9034
|
const apply = recipe.classification.apply;
|
|
@@ -9081,29 +9122,29 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9081
9122
|
variables: env.variables,
|
|
9082
9123
|
cliVersion: input.cliVersion
|
|
9083
9124
|
};
|
|
9084
|
-
const bail = async (reason, aborted2 = false, transient = false, retryAfterMs) => {
|
|
9125
|
+
const bail = async (reason, fault, aborted2 = false, transient = false, retryAfterMs) => {
|
|
9085
9126
|
try {
|
|
9086
9127
|
await cleanupSandbox(runtime, { buildId, sandboxId: state.sandboxId, container: containerState });
|
|
9087
9128
|
} catch (err) {
|
|
9088
9129
|
log.error(`${tag} cleanup failed: ${describeCallFailure(err)}`);
|
|
9089
9130
|
}
|
|
9090
|
-
return aborted2 ? { ok: false, reason: "ended before provision finished", aborted: true } : fail(reason, transient, retryAfterMs);
|
|
9131
|
+
return aborted2 ? { ok: false, reason: "ended before provision finished", aborted: true } : fail(reason, fault, transient, retryAfterMs);
|
|
9091
9132
|
};
|
|
9092
9133
|
const giveUpItemDisk = async (reason, why) => {
|
|
9093
|
-
await bail(reason);
|
|
9134
|
+
await bail(reason, void 0);
|
|
9094
9135
|
return discardUnusableItemDisk({ kept: keptDisk, reason, why, removeVolume: async () => void 0, endSandbox: (id) => sandboxClient.end(id), onError: (line2) => log.error(`${tag} ${line2}`) });
|
|
9095
9136
|
};
|
|
9096
9137
|
const giveUpState = async (record, reason) => {
|
|
9097
|
-
await bail(reason);
|
|
9138
|
+
await bail(reason, void 0);
|
|
9098
9139
|
return forgetState(record, reason);
|
|
9099
9140
|
};
|
|
9100
|
-
const end = (reason, aborted2 = false) => fromState !== void 0 && !aborted2 ? giveUpState(fromState, reason) : bail(reason, aborted2);
|
|
9141
|
+
const end = (reason, fault, aborted2 = false) => fromState !== void 0 && !aborted2 ? giveUpState(fromState, reason) : bail(reason, fault, aborted2);
|
|
9101
9142
|
const forgetManagedDisk = async (id, err) => {
|
|
9102
9143
|
const reason = `the kept sandbox ${id} could not be resumed: ${err.reason ?? describeSandboxError(err)}`;
|
|
9103
|
-
await bail(reason);
|
|
9144
|
+
await bail(reason, void 0);
|
|
9104
9145
|
return discardUnusableItemDisk({ kept: keptDisk, reason, why: "disk_not_restored", removeVolume: async () => void 0, endSandbox: async () => void 0, onError: (line2) => log.error(`${tag} ${line2}`) });
|
|
9105
9146
|
};
|
|
9106
|
-
if (input.aborted()) return bail("", true);
|
|
9147
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9107
9148
|
mkdirSync(buildDir2, { recursive: true });
|
|
9108
9149
|
const ghDir = ghConfigDir(buildDir2);
|
|
9109
9150
|
let readToken;
|
|
@@ -9111,14 +9152,14 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9111
9152
|
readToken = await tokens.token("read");
|
|
9112
9153
|
writeGhConfig(ghDir, readToken);
|
|
9113
9154
|
} catch (err) {
|
|
9114
|
-
return
|
|
9155
|
+
return err instanceof WorkCommandError ? bail(`the build's read token could not be had: ${refusalCode(err)}`, void 0) : bail(`the build's gh configuration could not be written: ${describeCallFailure(err)}`, SANDBOX_NOT_PREPARED);
|
|
9115
9156
|
}
|
|
9116
9157
|
for (const entry of repositories) {
|
|
9117
9158
|
if (entry.repository === primary.repository) continue;
|
|
9118
9159
|
try {
|
|
9119
9160
|
await tokens.token("read", entry.repository);
|
|
9120
9161
|
} catch (err) {
|
|
9121
|
-
return bail(`the build's read token for ${entry.repository} could not be had: ${refusalCode(err)}
|
|
9162
|
+
return bail(`the build's read token for ${entry.repository} could not be had: ${refusalCode(err)}`, void 0);
|
|
9122
9163
|
}
|
|
9123
9164
|
}
|
|
9124
9165
|
keepGhConfigCurrent(tokens, buildDir2, (err) => log.error(`${tag} the read token could not be written for gh: ${describeCallFailure(err)}`));
|
|
@@ -9130,9 +9171,9 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9130
9171
|
services = await startServicesFor(runtime, config, buildDir2, jobDir, itemKey, true, gitRemote, "stream", input.leaseExpiryMs === void 0 ? void 0 : leaseFor(runtime, buildId, input.leaseExpiryMs), void 0, (line2) => log.line(`${tag} ${line2}`));
|
|
9131
9172
|
runtime.tunnels.set(buildId, services);
|
|
9132
9173
|
} catch (err) {
|
|
9133
|
-
return bail(`the tunnel could not start: ${describeCallFailure(err)}
|
|
9174
|
+
return bail(`the tunnel could not start: ${describeCallFailure(err)}`, SANDBOX_NOT_PREPARED);
|
|
9134
9175
|
}
|
|
9135
|
-
if (input.aborted()) return bail("", true);
|
|
9176
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9136
9177
|
let resumed;
|
|
9137
9178
|
const keptSandbox = keptDisk?.record.sandbox;
|
|
9138
9179
|
if (keptSandbox !== void 0) {
|
|
@@ -9186,7 +9227,7 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9186
9227
|
if (resume !== void 0) runtime.sandbox.resuming.delete(resume);
|
|
9187
9228
|
if (err instanceof ProvisionAborted) {
|
|
9188
9229
|
runtime.sandbox.creating.delete(buildId);
|
|
9189
|
-
return bail("", true);
|
|
9230
|
+
return bail("", void 0, true);
|
|
9190
9231
|
}
|
|
9191
9232
|
if (resume !== void 0 && err instanceof SandboxError && (err.code === "sandbox_not_resumable" || err.code === "sandbox_provider_refused")) {
|
|
9192
9233
|
runtime.sandbox.creating.delete(buildId);
|
|
@@ -9196,16 +9237,17 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9196
9237
|
if (late?.kind !== "started") {
|
|
9197
9238
|
runtime.sandbox.creating.delete(buildId);
|
|
9198
9239
|
if (err instanceof SandboxError && err.status === 0) await endUnansweredSandbox(sandboxClient, runnerId, buildId, (line2) => log.error(`${tag} ${line2}`));
|
|
9199
|
-
if (late?.kind === "aborted") return bail("", true);
|
|
9240
|
+
if (late?.kind === "aborted") return bail("", void 0, true);
|
|
9200
9241
|
const held3 = err instanceof SandboxError ? gatewayRefusalReason(err) : void 0;
|
|
9201
9242
|
if (held3 !== void 0) {
|
|
9202
|
-
await bail(held3);
|
|
9243
|
+
await bail(held3, void 0);
|
|
9203
9244
|
return { ok: false, reason: held3, held: true };
|
|
9204
9245
|
}
|
|
9205
9246
|
const transient = late?.kind !== "timed_out" && late?.kind !== "ended" && err instanceof SandboxError && providerMayAnswerLater(err);
|
|
9206
9247
|
const refused2 = `The provider refused to create the sandbox: ${slowStartReason(late) ?? (err instanceof SandboxError ? describeSandboxError(err) : describeCallFailure(err))}`;
|
|
9207
9248
|
if (fromState !== void 0) return giveUpState(fromState, refused2);
|
|
9208
|
-
|
|
9249
|
+
const fault = late?.kind === "timed_out" || late?.kind === "ended" ? SANDBOX_NOT_STARTED : PROVIDER_REFUSED;
|
|
9250
|
+
return bail(refused2, fault, false, transient, err instanceof SandboxError ? err.retryAfterMs : void 0);
|
|
9209
9251
|
}
|
|
9210
9252
|
sandbox = late.sandbox;
|
|
9211
9253
|
}
|
|
@@ -9245,8 +9287,8 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9245
9287
|
} catch (err) {
|
|
9246
9288
|
log.error(`${tag} could not end sandbox ${sandbox.id}: ${describeCallFailure(err)} \xB7 the next sweep ends it`);
|
|
9247
9289
|
}
|
|
9248
|
-
if (started2.kind === "aborted") return bail("", true);
|
|
9249
|
-
return end(slowStartReason(started2) ?? `sandbox ${sandbox.id} did not start
|
|
9290
|
+
if (started2.kind === "aborted") return bail("", void 0, true);
|
|
9291
|
+
return end(slowStartReason(started2) ?? `sandbox ${sandbox.id} did not start`, SANDBOX_NOT_STARTED);
|
|
9250
9292
|
}
|
|
9251
9293
|
}
|
|
9252
9294
|
runtime.sandbox.sandboxes.set(buildId, sandbox);
|
|
@@ -9258,14 +9300,14 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9258
9300
|
log.line(
|
|
9259
9301
|
resumed !== void 0 ? `${tag} restored the disk that claim ${shortClaim(keptDisk.record.claimId)} kept: sandbox ${sandbox.id} resumed` : fromState !== void 0 && plan.restore !== void 0 ? `${tag} starting from saved state ${fromState.id}, saved ${formatDuration(plan.restore.ageMs)} ago: sandbox ${sandbox.id} created from it \xB7 ${name}` : `${tag} sandbox ${sandbox.id} created \xB7 ${name}`
|
|
9260
9302
|
);
|
|
9261
|
-
if (input.aborted()) return bail("", true);
|
|
9303
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9262
9304
|
if (fromState !== void 0) {
|
|
9263
9305
|
const unusable = await checkStateSandbox({ sandboxClient, sandbox, volume: volumeName, nowMs: clockOf(input.now)().getTime(), log: tagged });
|
|
9264
9306
|
if (unusable !== void 0) return giveUpState(fromState, unusable);
|
|
9265
9307
|
}
|
|
9266
9308
|
const sandboxed = runtimeInSandbox(runtime, sandbox);
|
|
9267
9309
|
const { host } = sandboxed;
|
|
9268
|
-
const dockerFailed = (what, result) => end(`${what} failed (exit ${result.status})${said(result.stderr)}
|
|
9310
|
+
const dockerFailed = (what, result) => end(`${what} failed (exit ${result.status})${said(result.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9269
9311
|
const joinSecret = randomBytes(32);
|
|
9270
9312
|
runtime.sandbox.joinSecrets.set(buildId, joinSecret);
|
|
9271
9313
|
const packDir = join(runtime.cliBuild().distDir, "..", "skill-pack");
|
|
@@ -9274,26 +9316,26 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9274
9316
|
const packageFile = existsSync(packagePath) ? packagePath : void 0;
|
|
9275
9317
|
try {
|
|
9276
9318
|
const made = await sandboxClient.command(sandbox, `sudo mkdir -p ${CLI_DIR} && sudo chown -R "$(id -u):$(id -g)" ${SANDBOX_DIR}`);
|
|
9277
|
-
if (made.exitCode !== 0) return end(`making ${SANDBOX_DIR} in the sandbox failed (exit ${made.exitCode ?? "none"})${said(made.stderr)}
|
|
9319
|
+
if (made.exitCode !== 0) return end(`making ${SANDBOX_DIR} in the sandbox failed (exit ${made.exitCode ?? "none"})${said(made.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9278
9320
|
await sandboxClient.upload(sandbox, `${SANDBOX_DIR}/dist.tgz`, gzipSync(packFolder(runtime.cliBuild().distDir)));
|
|
9279
9321
|
if (skillPack !== void 0) {
|
|
9280
9322
|
await sandboxClient.upload(sandbox, `${SANDBOX_DIR}/skill-pack.tgz`, gzipSync(packFolder(skillPack)));
|
|
9281
9323
|
const placed = await sandboxClient.command(sandbox, `mkdir -p ${SKILL_PACK_DIR} && tar xzf ${SANDBOX_DIR}/skill-pack.tgz -C ${SKILL_PACK_DIR} && rm -f ${SANDBOX_DIR}/skill-pack.tgz`);
|
|
9282
|
-
if (placed.exitCode !== 0) return end(`putting the skill pack in the sandbox failed (exit ${placed.exitCode ?? "none"})${said(placed.stderr)}
|
|
9324
|
+
if (placed.exitCode !== 0) return end(`putting the skill pack in the sandbox failed (exit ${placed.exitCode ?? "none"})${said(placed.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9283
9325
|
}
|
|
9284
9326
|
if (packageFile !== void 0) await sandboxClient.upload(sandbox, PACKAGE_FILE, readFileSync(packageFile));
|
|
9285
9327
|
await sandboxClient.upload(sandbox, SECRET_FILE, joinSecret);
|
|
9286
9328
|
const unpacked = await sandboxClient.command(sandbox, `tar xzf ${SANDBOX_DIR}/dist.tgz -C ${CLI_DIR} && rm -f ${SANDBOX_DIR}/dist.tgz && sudo chown 60100:60100 ${SECRET_FILE} && sudo chmod 400 ${SECRET_FILE}`);
|
|
9287
|
-
if (unpacked.exitCode !== 0) return end(`putting the CLI in the sandbox failed (exit ${unpacked.exitCode ?? "none"})${said(unpacked.stderr)}
|
|
9329
|
+
if (unpacked.exitCode !== 0) return end(`putting the CLI in the sandbox failed (exit ${unpacked.exitCode ?? "none"})${said(unpacked.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9288
9330
|
} catch (err) {
|
|
9289
|
-
return end(`putting the CLI in the sandbox failed: ${err instanceof SandboxError ? describeSandboxError(err) : describeCallFailure(err)}
|
|
9331
|
+
return end(`putting the CLI in the sandbox failed: ${err instanceof SandboxError ? describeSandboxError(err) : describeCallFailure(err)}`, SANDBOX_NOT_PREPARED);
|
|
9290
9332
|
}
|
|
9291
9333
|
if (own.docker) {
|
|
9292
9334
|
const set = await commandIn(sandboxClient, sandbox, daemonSetupLine());
|
|
9293
|
-
if (set.exitCode !== 0) return end(`setting the Docker daemon's proxy in the sandbox failed (exit ${set.exitCode ?? "none"})${said(set.stderr)}
|
|
9335
|
+
if (set.exitCode !== 0) return end(`setting the Docker daemon's proxy in the sandbox failed (exit ${set.exitCode ?? "none"})${said(set.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9294
9336
|
}
|
|
9295
9337
|
const engine = await host.version();
|
|
9296
|
-
if (engine === null) return end("Docker is not available in the sandbox: `docker version` failed");
|
|
9338
|
+
if (engine === null) return end("Docker is not available in the sandbox: `docker version` failed", NO_DOCKER);
|
|
9297
9339
|
const limits2 = containerLimitsOf(containerSizeOf(sandbox, sized.size), config.build);
|
|
9298
9340
|
const volume = await host.createVolume(volumeName, { [BUILD_LABEL]: buildId, [RUNNER_LABEL]: runnerId });
|
|
9299
9341
|
if (volume.status !== 0) return dockerFailed("creating the build's volume", volume);
|
|
@@ -9315,14 +9357,14 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9315
9357
|
let dockerGroup;
|
|
9316
9358
|
if (own.docker) {
|
|
9317
9359
|
const mounted = await commandIn(sandboxClient, sandbox, hostMountLine(volumeName));
|
|
9318
|
-
if (mounted.exitCode !== 0) return end(`mounting the build's volume at ${HOST_BUILD_DIR} in the sandbox failed (exit ${mounted.exitCode ?? "none"})${said(mounted.stderr)}
|
|
9360
|
+
if (mounted.exitCode !== 0) return end(`mounting the build's volume at ${HOST_BUILD_DIR} in the sandbox failed (exit ${mounted.exitCode ?? "none"})${said(mounted.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9319
9361
|
const group = await commandIn(sandboxClient, sandbox, `stat -c %g ${DOCKER_SOCKET}`);
|
|
9320
9362
|
dockerGroup = group.stdout.trim();
|
|
9321
|
-
if (group.exitCode !== 0 || !/^\d+$/.test(dockerGroup)) return end(`reading the group of the Docker socket in the sandbox failed (exit ${group.exitCode ?? "none"})${said(group.stderr)}
|
|
9363
|
+
if (group.exitCode !== 0 || !/^\d+$/.test(dockerGroup)) return end(`reading the group of the Docker socket in the sandbox failed (exit ${group.exitCode ?? "none"})${said(group.stderr)}`, SANDBOX_NOT_PREPARED);
|
|
9322
9364
|
}
|
|
9323
9365
|
const imageConfig = await host.imageConfig(image);
|
|
9324
9366
|
const resolved = await resolveBuildUser(sandboxed, runInput, { remoteUser: apply.remoteUser, imageUser: imageConfig.user }, logPath);
|
|
9325
|
-
if (!resolved.ok) return end(resolved.reason);
|
|
9367
|
+
if (!resolved.ok) return end(resolved.reason, void 0);
|
|
9326
9368
|
containerState.agentUser = resolved.user;
|
|
9327
9369
|
if (resolved.home !== void 0) containerState.home = resolved.home;
|
|
9328
9370
|
const agentUser = resolved.user;
|
|
@@ -9332,17 +9374,17 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9332
9374
|
if (changed !== void 0) return giveUpState(fromState, changed);
|
|
9333
9375
|
}
|
|
9334
9376
|
input.save(state, environment);
|
|
9335
|
-
if (input.aborted()) return bail("", true);
|
|
9377
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9336
9378
|
const network = await startSandboxNetwork({ runtime, sandboxed, sandboxClient, sandbox, runnerDir: runnerDir(config.configPath), build: { buildId, runnerId, container, image, limits: limits2 }, logPath, docker: own.docker });
|
|
9337
|
-
if ("failed" in network) return end(network.failed);
|
|
9379
|
+
if ("failed" in network) return end(network.failed, SANDBOX_NOT_PREPARED);
|
|
9338
9380
|
if ("none" in network) log.line(`${tag} ${noHelperLine(network.none)}`);
|
|
9339
9381
|
else containerState.network = network.helper;
|
|
9340
9382
|
const runArgs = containerRunArgs({ ...runInput, home: containerState.home, network: containerState.network }, runtime.agents);
|
|
9341
9383
|
const started = await host.run(sandboxRunArgs(runArgs, { skillPack: skillPack !== void 0, packageFile: packageFile !== void 0, dockerGroup, joined: containerState.network !== void 0 }), { logPath });
|
|
9342
9384
|
if (started.status !== 0) return dockerFailed("starting the build's container", started);
|
|
9343
9385
|
joinRelay(runtime, sandbox, { buildId, container }, services.streams, joinSecret, (line2) => log.line(`${tag} ${line2}`));
|
|
9344
|
-
if (input.aborted()) return bail("", true);
|
|
9345
|
-
if (!await waitForRelay2(sandboxed, container)) return end("the relay in the build's container did not start");
|
|
9386
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9387
|
+
if (!await waitForRelay2(sandboxed, container)) return end("the relay in the build's container did not start", SANDBOX_NOT_PREPARED);
|
|
9346
9388
|
const deliverGh = async (delivered) => {
|
|
9347
9389
|
const ghDelivered = await deliverJobFiles(sandboxed, containerState, ["gh"], secrets);
|
|
9348
9390
|
if (!ghDelivered.ok) return ghDelivered;
|
|
@@ -9358,11 +9400,11 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9358
9400
|
const deliverHeldGh = async () => deliverGh(await tokens.token("read").catch(() => void 0));
|
|
9359
9401
|
if (!managed) {
|
|
9360
9402
|
const ghDelivered = await deliverGh(readToken);
|
|
9361
|
-
if (!ghDelivered.ok) return end(ghDelivered.reason);
|
|
9403
|
+
if (!ghDelivered.ok) return end(ghDelivered.reason, SANDBOX_NOT_PREPARED);
|
|
9362
9404
|
}
|
|
9363
9405
|
const tools = await host.exec({ container, user: ADDED_USER, env: NO_ENV2, argv: ["cat", "/opt/outerlayer/tools.json"] });
|
|
9364
9406
|
const missingAgent = agentMissingFromImage(tools.stdout, runtime.agents, input.job);
|
|
9365
|
-
if (missingAgent !== void 0) return end(imageLacksAgentReason(missingAgent.descriptor.label, managed));
|
|
9407
|
+
if (missingAgent !== void 0) return end(imageLacksAgentReason(missingAgent.descriptor.label, managed), imageLacksAgent(missingAgent.descriptor.label));
|
|
9366
9408
|
const agentVersion = agentVersionOf(tools.status === 0 ? tools.stdout : "", runtime.agents, input.job);
|
|
9367
9409
|
environment.agentVersion = agentVersion;
|
|
9368
9410
|
const judgeProgram2 = await judgeProgramRecord((argv) => host.exec({ container, user: ADDED_USER, env: NO_ENV2, argv }), runtime.agents, input.job);
|
|
@@ -9370,7 +9412,7 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9370
9412
|
input.save(state, environment);
|
|
9371
9413
|
if (input.queue === "review") {
|
|
9372
9414
|
const ghDelivered = managed ? await deliverHeldGh() : { ok: true };
|
|
9373
|
-
if (!ghDelivered.ok) return end(ghDelivered.reason);
|
|
9415
|
+
if (!ghDelivered.ok) return end(ghDelivered.reason, SANDBOX_NOT_PREPARED);
|
|
9374
9416
|
return { ok: true, workdir: CHECKOUT_DIR, state, environment };
|
|
9375
9417
|
}
|
|
9376
9418
|
const stepExec = async (argv, workdir, opts) => {
|
|
@@ -9442,7 +9484,7 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9442
9484
|
}
|
|
9443
9485
|
});
|
|
9444
9486
|
if (!steps.ok && steps.handedOver === true) {
|
|
9445
|
-
if (input.aborted()) return bail("", true);
|
|
9487
|
+
if (input.aborted()) return bail("", void 0, true);
|
|
9446
9488
|
const result = saved;
|
|
9447
9489
|
try {
|
|
9448
9490
|
await cleanupSandbox(runtime, { buildId, sandboxId: state.sandboxId, container: containerState });
|
|
@@ -9453,7 +9495,7 @@ async function provisionSandboxOnce(input, allowRestore, itemDiskFailed, noSave)
|
|
|
9453
9495
|
}
|
|
9454
9496
|
if (!steps.ok) {
|
|
9455
9497
|
if (fromState !== void 0 && !setupPassed && steps.aborted !== true) return giveUpState(fromState, steps.reason);
|
|
9456
|
-
return settleFailedSteps(steps, { giveUp: (reason) => giveUpItemDisk(reason, "checkout_not_switched"), bail });
|
|
9498
|
+
return settleFailedSteps(steps, { giveUp: (reason) => giveUpItemDisk(reason, "checkout_not_switched"), bail: (reason, aborted2) => bail(reason, void 0, aborted2) });
|
|
9457
9499
|
}
|
|
9458
9500
|
containerState.startCommit = steps.startCommit;
|
|
9459
9501
|
keepRuntimeStep(containerState, steps);
|
|
@@ -13405,6 +13447,16 @@ function oneCutLine(text2, max) {
|
|
|
13405
13447
|
function sendableReason(reason) {
|
|
13406
13448
|
return reason === void 0 ? void 0 : oneCutLine(withoutControls(reason), REASON_MAX2);
|
|
13407
13449
|
}
|
|
13450
|
+
var BARE_CODE = /^[a-z][a-z0-9_]*$/;
|
|
13451
|
+
function reasonWithNote(reason, note) {
|
|
13452
|
+
const head = reason?.trim() ?? "";
|
|
13453
|
+
if (head === "") return cutReasonLine(note);
|
|
13454
|
+
const joint = BARE_CODE.test(head) ? ": " : /[.!?]$/.test(head) ? " " : ". ";
|
|
13455
|
+
const room = REASON_MAX2 - note.length - joint.length;
|
|
13456
|
+
if (head.length <= room) return `${head}${joint}${note}`;
|
|
13457
|
+
const kept = REASON_MAX2 - note.length - 1 - REASON_CUT.length;
|
|
13458
|
+
return kept <= 0 ? cutReasonLine(note) : `${cutReasonLine(head, kept).trimEnd()}${REASON_CUT} ${note}`;
|
|
13459
|
+
}
|
|
13408
13460
|
function scrubTunnelRecord(record, config, jobDir) {
|
|
13409
13461
|
if (record === void 0) return void 0;
|
|
13410
13462
|
const home = homeFromEnv();
|
|
@@ -13539,7 +13591,7 @@ async function releaseLease(config, item, outcome, detail, fetchImpl) {
|
|
|
13539
13591
|
`/v1/work-items/${item}/claim/release`,
|
|
13540
13592
|
config.apiKey,
|
|
13541
13593
|
config.appId,
|
|
13542
|
-
{ host: config.host, claimId: detail.claimId, outcome: sent2, stage: detail.stage, exitCode: detail.exitCode, reason: detail.reason, environment: environment2, resume: resume2, disk: disk2, log: log2, endedAt: endedAt2 },
|
|
13594
|
+
{ host: config.host, claimId: detail.claimId, outcome: sent2, stage: detail.stage, exitCode: detail.exitCode, reason: detail.reason, cause: detail.cause, environment: environment2, resume: resume2, disk: disk2, log: log2, endedAt: endedAt2 },
|
|
13543
13595
|
fetchImpl,
|
|
13544
13596
|
void 0,
|
|
13545
13597
|
await signerFor(config.configPath)
|
|
@@ -13791,6 +13843,7 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
|
|
|
13791
13843
|
}
|
|
13792
13844
|
if (outcome !== void 0 && ending?.reason !== void 0) {
|
|
13793
13845
|
job.reason = RUNNER_WORDED_REASONS.has(ending.reason) ? ending.reason : scrubReason(ending.reason, config, void 0, jobDirPath);
|
|
13846
|
+
job.cause = ending.cause;
|
|
13794
13847
|
writeJobFile(jobFilePath, job);
|
|
13795
13848
|
}
|
|
13796
13849
|
const uploadSessions = async (workdir) => {
|
|
@@ -14056,6 +14109,11 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
|
|
|
14056
14109
|
const said2 = agentErrorReason(job, commandOutputTail(jobDirPath, job));
|
|
14057
14110
|
if (said2 !== void 0) job.reason = scrubReason(said2, config, void 0, jobDirPath);
|
|
14058
14111
|
}
|
|
14112
|
+
if (outcome === "failed" && config.fleet === true && job.cause === void 0) {
|
|
14113
|
+
tunnelRecord ??= readTunnelRecord(join(jobDirPath, "tunnel.json"));
|
|
14114
|
+
const note = refusedHostsNote(hostsNotAllowed(scrubTunnelRecord(tunnelRecord, config, jobDirPath)));
|
|
14115
|
+
if (note !== void 0 && job.reason?.includes(ALLOWED_HOSTS_SETTING) !== true) job.reason = reasonWithNote(job.reason, note);
|
|
14116
|
+
}
|
|
14059
14117
|
const cliVersion = deps.cliVersion ?? resolveVersion();
|
|
14060
14118
|
const base = job.environment ?? (job.microvm !== void 0 ? { isolation: "vm", cliVersion } : !isIsolatedJob(job) ? sharedUserEnvironment(cliVersion) : { isolation: "container", cliVersion });
|
|
14061
14119
|
if (isolated || job.build !== void 0) {
|
|
@@ -14074,7 +14132,7 @@ async function finishJob(job, jobDirPath, outcome, config, deps, ending) {
|
|
|
14074
14132
|
const sentAtMs = endedAt.getTime();
|
|
14075
14133
|
const runnerLog = valuesNotHeld ? `The runner sends no log for this attempt: ${VALUES_NOT_HELD}.
|
|
14076
14134
|
` : releaseLogFor(jobDirPath, job, config);
|
|
14077
|
-
const detail = outcome === void 0 ? { log: runnerLog, endedAt: endedAt.toISOString() } : { stage: job.endStage, exitCode: job.endExitCode, reason: sendableReason(job.reason), environment: job.environment, resume: job.resume, disk: job.disk, log: runnerLog, endedAt: endedAt.toISOString() };
|
|
14135
|
+
const detail = outcome === void 0 ? { log: runnerLog, endedAt: endedAt.toISOString() } : { stage: job.endStage, exitCode: job.endExitCode, reason: sendableReason(job.reason), cause: job.cause, environment: job.environment, resume: job.resume, disk: job.disk, log: runnerLog, endedAt: endedAt.toISOString() };
|
|
14078
14136
|
const release = await retrySend(() => sendRelease(config, job, outcome, detail, deps.fetchImpl), {
|
|
14079
14137
|
now: deps.now,
|
|
14080
14138
|
sleep: deps.sleep
|
|
@@ -14154,7 +14212,7 @@ async function retryFailedReleases(jobsDirPath, config, deps) {
|
|
|
14154
14212
|
continue;
|
|
14155
14213
|
}
|
|
14156
14214
|
const runnerLog = readScrubbedReleaseLog(dirPath) ?? releaseLogFor(dirPath, job, config);
|
|
14157
|
-
const detail = job.outcome === void 0 ? { log: runnerLog, endedAt: job.endedAt } : { stage: job.endStage, exitCode: job.endExitCode, reason: sendableReason(job.reason), environment: job.environment, resume: job.resume, disk: job.disk, log: runnerLog, endedAt: job.endedAt };
|
|
14215
|
+
const detail = job.outcome === void 0 ? { log: runnerLog, endedAt: job.endedAt } : { stage: job.endStage, exitCode: job.endExitCode, reason: sendableReason(job.reason), cause: job.cause, environment: job.environment, resume: job.resume, disk: job.disk, log: runnerLog, endedAt: job.endedAt };
|
|
14158
14216
|
const release = await retrySend(() => sendRelease(config, job, job.outcome, detail, deps.fetchImpl), {
|
|
14159
14217
|
now: deps.now,
|
|
14160
14218
|
sleep: deps.sleep
|
|
@@ -14403,4 +14461,4 @@ function makeRecorder(input) {
|
|
|
14403
14461
|
};
|
|
14404
14462
|
}
|
|
14405
14463
|
|
|
14406
|
-
export { ADOPTED_FETCH_RETRY_WINDOW_MS, ALREADY_RELEASED, AttemptLogBook, EXIT_CODE_FILE, GUEST_USAGE_INTERVAL_MS, HELPER_ENV, KIND_LABEL, LEASE_SECONDS, MICROVM_COMMAND_DIR, MIN_ENGINE_MAJOR, NO_LOG, PLACEHOLDER_MARKER, RENEW_INTERVAL_SECONDS, RunnerInitError, SandboxContainerStoppedError, SandboxGoneError, addRunnerAgent, agentCredentialCheck, agentCredentialFromFiles, appendCommandLog, attemptNote, buildSkillPaths, builtOf, carriedProblems, checksIn, claimPermissionProblem, claimRun, commandEndReasonOf, commandLogOffset, containerCommandExec, createContainerRuntime, createGatewaySandboxClient, createHousekeepingDocker, createLeaseChannel, credentialVerdict, currentSkillCommand, decideHostBuildSkill, deliverCommitHooks, deliverContainerHooks, deliverExecMaven, deliverJobFiles, deliverSandboxHooks, describeHookEnd, describeMachineDocker, detectMachine, dropNonProblems, ensureFirecrackerAndJailer, ensureNetworkReady, ensureTunnel, environmentFor, execArgv, execCommandLine, fetchManagedBuildSettings, fetchManagedModelKey, filesAreCopied, finishJob, foldSample, formerSkillProblem, formerSkillQueues, freeItemDisksUntil, gatewayRefusalReason, gitRemoteFor, hasRunnerBlock, heldSandboxClaimsOf, helperFirecrackerNote, helperSocketPath, holdManagedBuildSettings, holdManagedKey, holdsHostDisk, hookLimitsFor, hostCommandEnvironment, hostEnvironment, housekeepingDockerIfReachable, inSandbox, inTeardown, installTrust, isContainerTracked, isGroupAlive, isIdle, isIsolatedJob, isMicroVmTracked, isPlaceholderCommand, isReadable, isSandboxTracked, isTimedOut, isTracked, isUnfinished, issueText, itemScope, itemTag, jobEnv, jobRecordsClaim, jobTimeLimitMinutes, judgeCredential, judgeProbe, keepGhConfigCurrent, keptCommitsLine, keptSandboxIds, keptSessionDir, leaseExpiresAtMs, leaseTimeLeftMs, lifecycleFailureReason, lifecycleSteps, listAdoptableJobs, listItemDisks, listTrackedJobs, listUnreadableJobs, listenOnBroker, makeRecorder, managedBuildSettingsFor, markdownSection, measureDisk, mergeAnswers, microVmArchSupported, microVmAssetsPinned, microVmCommandLine, microVmOomKills, missingJudgeCredential, missingPermissionFix, missingPermissionOf, modellessProblem, modellessQueues, nativeWindowsSandboxRefusal, needsAgentCredential, needsBuildSkill, needsRenew, noteMissingCredential, outcomeFromExitCode, parseCpuList, permissionModeProblem, permissionModeProblems, placeholderProblem, placeholderQueues, prepareBranch, prepareResume, prepareRunnerInit, probeCommand, probeHelper, probeMicroVmCommand, probeSandboxCommand, provisionContainer, provisionEnvironment, provisionMicroVm, provisionSandbox, reachDockerStep, readConfigObject, readCpuUsec, readDefinitions, readProvisionOut, readRecords, readWorkItem, recordsProofsOnly, recoverLostJobs, rejoinSandboxBuild, releaseLease, removeOldestUntil, removeRunnerBlock, renewLease, renewRun, resolveHostBuild, restartSender, restoreSessionIntoContainer, restoreSessionIntoMicroVm, restoreSessionIntoSandbox, restoreWork, retryFailedReleases, reviewFiles, runCommand, runCommandFor, runCommandOf, runDecision, runHook, runHousekeeping, runRunnerInit, runWithSpawn, sampleGuest, savedStatesDir, scrubReason, serveLease, sessionGuestOfContainer, sessionGuestOfMicroVm, sessionGuestOfSandbox, setStage, setUpRunnerCgroup, shellQuote, startHostServices, startMicroVmCommand, startSandboxCommand, startSender, startServicesFor, stopOrphanedMicroVms, stoppedHelperReason, storedProblemsText, stripTerminalControls, superviseRuns, supportsContainerBuilds, supportsMicroVmBuilds, sweepImageBuilders, sweepSandboxes, territories, territoryBrief, timeoutAfter, treeFileText, unfinishedJobs, unreviewedFiles, unreviewedItem, vmAlive, withJobTimeLimit, withTunnelLog, workRestoredEnv, workdirProblem, writeGuestGhConfig, writeRunnerInit };
|
|
14464
|
+
export { ADOPTED_FETCH_RETRY_WINDOW_MS, ALREADY_RELEASED, AttemptLogBook, EXIT_CODE_FILE, GUEST_USAGE_INTERVAL_MS, HELPER_ENV, KIND_LABEL, LEASE_SECONDS, MICROVM_COMMAND_DIR, MIN_ENGINE_MAJOR, NO_LOG, PLACEHOLDER_MARKER, RENEW_INTERVAL_SECONDS, RunnerInitError, SANDBOX_NOT_PREPARED, SandboxContainerStoppedError, SandboxGoneError, addRunnerAgent, agentCredentialCheck, agentCredentialFromFiles, appendCommandLog, attemptNote, buildSkillPaths, builtOf, carriedProblems, checksIn, claimPermissionProblem, claimRun, commandEndReasonOf, commandLogOffset, containerCommandExec, createContainerRuntime, createGatewaySandboxClient, createHousekeepingDocker, createLeaseChannel, credentialVerdict, currentSkillCommand, decideHostBuildSkill, deliverCommitHooks, deliverContainerHooks, deliverExecMaven, deliverJobFiles, deliverSandboxHooks, describeHookEnd, describeMachineDocker, detectMachine, dropNonProblems, ensureFirecrackerAndJailer, ensureNetworkReady, ensureTunnel, environmentFor, execArgv, execCommandLine, fetchManagedBuildSettings, fetchManagedModelKey, filesAreCopied, finishJob, foldSample, formerSkillProblem, formerSkillQueues, freeItemDisksUntil, gatewayRefusalReason, gitRemoteFor, hasRunnerBlock, heldSandboxClaimsOf, helperFirecrackerNote, helperSocketPath, holdManagedBuildSettings, holdManagedKey, holdsHostDisk, hookLimitsFor, hostCommandEnvironment, hostEnvironment, housekeepingDockerIfReachable, inSandbox, inTeardown, installTrust, isContainerTracked, isGroupAlive, isIdle, isIsolatedJob, isMicroVmTracked, isPlaceholderCommand, isReadable, isSandboxTracked, isTimedOut, isTracked, isUnfinished, issueText, itemScope, itemTag, jobEnv, jobRecordsClaim, jobTimeLimitMinutes, judgeCredential, judgeProbe, keepGhConfigCurrent, keptCommitsLine, keptSandboxIds, keptSessionDir, leaseExpiresAtMs, leaseTimeLeftMs, lifecycleFailureReason, lifecycleSteps, listAdoptableJobs, listItemDisks, listTrackedJobs, listUnreadableJobs, listenOnBroker, makeRecorder, managedBuildSettingsFor, managedFaultReason, markdownSection, measureDisk, mergeAnswers, microVmArchSupported, microVmAssetsPinned, microVmCommandLine, microVmOomKills, missingJudgeCredential, missingPermissionFix, missingPermissionOf, modellessProblem, modellessQueues, nativeWindowsSandboxRefusal, needsAgentCredential, needsBuildSkill, needsRenew, noteMissingCredential, outcomeFromExitCode, parseCpuList, parseRunClaim, permissionModeProblem, permissionModeProblems, placeholderProblem, placeholderQueues, prepareBranch, prepareResume, prepareRunnerInit, probeCommand, probeHelper, probeMicroVmCommand, probeSandboxCommand, provisionContainer, provisionEnvironment, provisionMicroVm, provisionSandbox, reachDockerStep, readConfigObject, readCpuUsec, readDefinitions, readProvisionOut, readRecords, readWorkItem, recordsProofsOnly, recoverLostJobs, rejoinSandboxBuild, releaseLease, releaseRun, removeOldestUntil, removeRunnerBlock, renewLease, renewRun, resolveHostBuild, restartSender, restoreSessionIntoContainer, restoreSessionIntoMicroVm, restoreSessionIntoSandbox, restoreWork, retryFailedReleases, reviewFiles, runCommand, runCommandFor, runCommandOf, runDecision, runHook, runHousekeeping, runRunnerInit, runWithSpawn, sampleGuest, savedStatesDir, scrubReason, serveLease, sessionGuestOfContainer, sessionGuestOfMicroVm, sessionGuestOfSandbox, setStage, setUpRunnerCgroup, shellQuote, startHostServices, startMicroVmCommand, startSandboxCommand, startSender, startServicesFor, stopOrphanedMicroVms, stoppedHelperReason, storedProblemsText, stripTerminalControls, superviseRuns, supportsContainerBuilds, supportsMicroVmBuilds, sweepImageBuilders, sweepSandboxes, territories, territoryBrief, timeoutAfter, treeFileText, unfinishedJobs, unreviewedFiles, unreviewedItem, vmAlive, withJobTimeLimit, withTunnelLog, workRestoredEnv, workdirProblem, writeGuestGhConfig, writeRunnerInit };
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import { stripTerminalControls } from './chunk-
|
|
3
|
+
import { stripTerminalControls } from './chunk-XI635QEJ.js';
|
|
4
4
|
import { tagToPull, imageTag, pullInstruction, readUpdateStatus, runnerImageVersion } from './chunk-NXYTICCS.js';
|
|
5
5
|
import { readFileSync } from 'fs';
|
|
6
6
|
|