envshed 0.17.0 → 0.19.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 +1 -0
- package/bin/envshed.js +1 -1
- package/dist/agent/claude-code-hook.d.ts +9 -0
- package/dist/agent/claude-code-hook.d.ts.map +1 -0
- package/dist/agent/claude-code-hook.js +55 -0
- package/dist/agent/claude-code-hook.js.map +1 -0
- package/dist/agent/claude-code-hook.test.d.ts +2 -0
- package/dist/agent/claude-code-hook.test.d.ts.map +1 -0
- package/dist/agent/claude-code-hook.test.js +200 -0
- package/dist/agent/claude-code-hook.test.js.map +1 -0
- package/dist/agent/claude-code.d.ts +3 -0
- package/dist/agent/claude-code.d.ts.map +1 -0
- package/dist/agent/claude-code.js +206 -0
- package/dist/agent/claude-code.js.map +1 -0
- package/dist/agent/claude-code.test.d.ts +2 -0
- package/dist/agent/claude-code.test.d.ts.map +1 -0
- package/dist/agent/claude-code.test.js +302 -0
- package/dist/agent/claude-code.test.js.map +1 -0
- package/dist/agent/guard.d.ts +8 -0
- package/dist/agent/guard.d.ts.map +1 -0
- package/dist/agent/guard.js +357 -0
- package/dist/agent/guard.js.map +1 -0
- package/dist/agent/guard.test.d.ts +2 -0
- package/dist/agent/guard.test.d.ts.map +1 -0
- package/dist/agent/guard.test.js +263 -0
- package/dist/agent/guard.test.js.map +1 -0
- package/dist/agent/hook-main.d.ts +8 -0
- package/dist/agent/hook-main.d.ts.map +1 -0
- package/dist/agent/hook-main.js +45 -0
- package/dist/agent/hook-main.js.map +1 -0
- package/dist/agent/hook-messages.d.ts +7 -0
- package/dist/agent/hook-messages.d.ts.map +1 -0
- package/dist/agent/hook-messages.js +18 -0
- package/dist/agent/hook-messages.js.map +1 -0
- package/dist/agent/registry.d.ts +5 -0
- package/dist/agent/registry.d.ts.map +1 -0
- package/dist/agent/registry.js +6 -0
- package/dist/agent/registry.js.map +1 -0
- package/dist/agent/skill-content.d.ts +6 -0
- package/dist/agent/skill-content.d.ts.map +1 -0
- package/dist/agent/skill-content.js +62 -0
- package/dist/agent/skill-content.js.map +1 -0
- package/dist/agent/skill-content.test.d.ts +2 -0
- package/dist/agent/skill-content.test.d.ts.map +1 -0
- package/dist/agent/skill-content.test.js +15 -0
- package/dist/agent/skill-content.test.js.map +1 -0
- package/dist/agent/types.d.ts +35 -0
- package/dist/agent/types.d.ts.map +1 -0
- package/dist/agent/types.js +9 -0
- package/dist/agent/types.js.map +1 -0
- package/dist/commands/agent-session.d.ts +11 -0
- package/dist/commands/agent-session.d.ts.map +1 -0
- package/dist/commands/agent-session.js +300 -0
- package/dist/commands/agent-session.js.map +1 -0
- package/dist/commands/agent-session.test.d.ts +2 -0
- package/dist/commands/agent-session.test.d.ts.map +1 -0
- package/dist/commands/agent-session.test.js +381 -0
- package/dist/commands/agent-session.test.js.map +1 -0
- package/dist/commands/agent.d.ts +15 -0
- package/dist/commands/agent.d.ts.map +1 -0
- package/dist/commands/agent.js +114 -0
- package/dist/commands/agent.js.map +1 -0
- package/dist/commands/agent.test.d.ts +2 -0
- package/dist/commands/agent.test.d.ts.map +1 -0
- package/dist/commands/agent.test.js +132 -0
- package/dist/commands/agent.test.js.map +1 -0
- package/dist/commands/completions.d.ts.map +1 -1
- package/dist/commands/completions.js +37 -3
- package/dist/commands/completions.js.map +1 -1
- package/dist/commands/login.d.ts.map +1 -1
- package/dist/commands/login.js +42 -4
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/login.test.js +55 -5
- package/dist/commands/login.test.js.map +1 -1
- package/dist/commands/pull.d.ts.map +1 -1
- package/dist/commands/pull.js +2 -1
- package/dist/commands/pull.js.map +1 -1
- package/dist/commands/request.d.ts +25 -0
- package/dist/commands/request.d.ts.map +1 -0
- package/dist/commands/request.js +157 -0
- package/dist/commands/request.js.map +1 -0
- package/dist/commands/request.test.d.ts +2 -0
- package/dist/commands/request.test.d.ts.map +1 -0
- package/dist/commands/request.test.js +177 -0
- package/dist/commands/request.test.js.map +1 -0
- package/dist/commands/run-redact.test.d.ts +2 -0
- package/dist/commands/run-redact.test.d.ts.map +1 -0
- package/dist/commands/run-redact.test.js +479 -0
- package/dist/commands/run-redact.test.js.map +1 -0
- package/dist/commands/run.d.ts +7 -1
- package/dist/commands/run.d.ts.map +1 -1
- package/dist/commands/run.js +169 -29
- package/dist/commands/run.js.map +1 -1
- package/dist/commands/run.test.js +214 -1
- package/dist/commands/run.test.js.map +1 -1
- package/dist/commands/scan.d.ts +9 -0
- package/dist/commands/scan.d.ts.map +1 -0
- package/dist/commands/scan.js +324 -0
- package/dist/commands/scan.js.map +1 -0
- package/dist/commands/scan.test.d.ts +2 -0
- package/dist/commands/scan.test.d.ts.map +1 -0
- package/dist/commands/scan.test.js +334 -0
- package/dist/commands/scan.test.js.map +1 -0
- package/dist/commands/share.d.ts.map +1 -1
- package/dist/commands/share.js +2 -1
- package/dist/commands/share.js.map +1 -1
- package/dist/commands/share.test.js +7 -4
- package/dist/commands/share.test.js.map +1 -1
- package/dist/commands/token.d.ts.map +1 -1
- package/dist/commands/token.js +28 -11
- package/dist/commands/token.js.map +1 -1
- package/dist/commands/token.test.js +41 -7
- package/dist/commands/token.test.js.map +1 -1
- package/dist/commands/whoami.d.ts.map +1 -1
- package/dist/commands/whoami.js +8 -1
- package/dist/commands/whoami.js.map +1 -1
- package/dist/commands/whoami.test.js +16 -0
- package/dist/commands/whoami.test.js.map +1 -1
- package/dist/config-token.test.d.ts +2 -0
- package/dist/config-token.test.d.ts.map +1 -0
- package/dist/config-token.test.js +134 -0
- package/dist/config-token.test.js.map +1 -0
- package/dist/config.d.ts +16 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +65 -3
- package/dist/config.js.map +1 -1
- package/dist/entry.d.ts +3 -0
- package/dist/entry.d.ts.map +1 -0
- package/dist/entry.js +15 -0
- package/dist/entry.js.map +1 -0
- package/dist/i18n.d.ts.map +1 -1
- package/dist/i18n.js +4 -16
- package/dist/i18n.js.map +1 -1
- package/dist/index.js +6 -0
- package/dist/index.js.map +1 -1
- package/dist/lib/agent-mode.d.ts +16 -0
- package/dist/lib/agent-mode.d.ts.map +1 -0
- package/dist/lib/agent-mode.js +24 -0
- package/dist/lib/agent-mode.js.map +1 -0
- package/dist/lib/agent-mode.test.d.ts +2 -0
- package/dist/lib/agent-mode.test.d.ts.map +1 -0
- package/dist/lib/agent-mode.test.js +35 -0
- package/dist/lib/agent-mode.test.js.map +1 -0
- package/dist/lib/agent-sessions.d.ts +37 -0
- package/dist/lib/agent-sessions.d.ts.map +1 -0
- package/dist/lib/agent-sessions.js +64 -0
- package/dist/lib/agent-sessions.js.map +1 -0
- package/dist/lib/allow-file.d.ts +21 -0
- package/dist/lib/allow-file.d.ts.map +1 -0
- package/dist/lib/allow-file.js +63 -0
- package/dist/lib/allow-file.js.map +1 -0
- package/dist/lib/allow-file.test.d.ts +2 -0
- package/dist/lib/allow-file.test.d.ts.map +1 -0
- package/dist/lib/allow-file.test.js +58 -0
- package/dist/lib/allow-file.test.js.map +1 -0
- package/dist/lib/command-spawn.d.ts +18 -0
- package/dist/lib/command-spawn.d.ts.map +1 -0
- package/dist/lib/command-spawn.js +46 -0
- package/dist/lib/command-spawn.js.map +1 -0
- package/dist/lib/command-spawn.test.d.ts +2 -0
- package/dist/lib/command-spawn.test.d.ts.map +1 -0
- package/dist/lib/command-spawn.test.js +46 -0
- package/dist/lib/command-spawn.test.js.map +1 -0
- package/dist/lib/duration.d.ts +3 -0
- package/dist/lib/duration.d.ts.map +1 -0
- package/dist/lib/duration.js +10 -0
- package/dist/lib/duration.js.map +1 -0
- package/dist/lib/duration.test.d.ts +2 -0
- package/dist/lib/duration.test.d.ts.map +1 -0
- package/dist/lib/duration.test.js +17 -0
- package/dist/lib/duration.test.js.map +1 -0
- package/dist/lib/env-format.d.ts +3 -0
- package/dist/lib/env-format.d.ts.map +1 -0
- package/dist/lib/env-format.js +20 -0
- package/dist/lib/env-format.js.map +1 -0
- package/dist/lib/history-clean.d.ts +42 -0
- package/dist/lib/history-clean.d.ts.map +1 -0
- package/dist/lib/history-clean.js +507 -0
- package/dist/lib/history-clean.js.map +1 -0
- package/dist/lib/history-clean.test.d.ts +2 -0
- package/dist/lib/history-clean.test.d.ts.map +1 -0
- package/dist/lib/history-clean.test.js +451 -0
- package/dist/lib/history-clean.test.js.map +1 -0
- package/dist/lib/history-scan.d.ts +108 -0
- package/dist/lib/history-scan.d.ts.map +1 -0
- package/dist/lib/history-scan.js +318 -0
- package/dist/lib/history-scan.js.map +1 -0
- package/dist/lib/history-scan.test.d.ts +2 -0
- package/dist/lib/history-scan.test.d.ts.map +1 -0
- package/dist/lib/history-scan.test.js +160 -0
- package/dist/lib/history-scan.test.js.map +1 -0
- package/dist/lib/keychain.d.ts +28 -0
- package/dist/lib/keychain.d.ts.map +1 -0
- package/dist/lib/keychain.js +87 -0
- package/dist/lib/keychain.js.map +1 -0
- package/dist/lib/keychain.test.d.ts +2 -0
- package/dist/lib/keychain.test.d.ts.map +1 -0
- package/dist/lib/keychain.test.js +128 -0
- package/dist/lib/keychain.test.js.map +1 -0
- package/dist/lib/locale-env.d.ts +3 -0
- package/dist/lib/locale-env.d.ts.map +1 -0
- package/dist/lib/locale-env.js +21 -0
- package/dist/lib/locale-env.js.map +1 -0
- package/dist/lib/oidc.d.ts +22 -0
- package/dist/lib/oidc.d.ts.map +1 -0
- package/dist/lib/oidc.js +84 -0
- package/dist/lib/oidc.js.map +1 -0
- package/dist/lib/oidc.test.d.ts +2 -0
- package/dist/lib/oidc.test.d.ts.map +1 -0
- package/dist/lib/oidc.test.js +107 -0
- package/dist/lib/oidc.test.js.map +1 -0
- package/dist/lib/redact.d.ts +60 -0
- package/dist/lib/redact.d.ts.map +1 -0
- package/dist/lib/redact.js +222 -0
- package/dist/lib/redact.js.map +1 -0
- package/dist/lib/redact.test.d.ts +2 -0
- package/dist/lib/redact.test.d.ts.map +1 -0
- package/dist/lib/redact.test.js +259 -0
- package/dist/lib/redact.test.js.map +1 -0
- package/dist/lib/redacted-output.d.ts +35 -0
- package/dist/lib/redacted-output.d.ts.map +1 -0
- package/dist/lib/redacted-output.js +155 -0
- package/dist/lib/redacted-output.js.map +1 -0
- package/dist/lib/secret-detector.d.ts +26 -0
- package/dist/lib/secret-detector.d.ts.map +1 -0
- package/dist/lib/secret-detector.js +332 -0
- package/dist/lib/secret-detector.js.map +1 -0
- package/dist/lib/secret-detector.test.d.ts +2 -0
- package/dist/lib/secret-detector.test.d.ts.map +1 -0
- package/dist/lib/secret-detector.test.js +207 -0
- package/dist/lib/secret-detector.test.js.map +1 -0
- package/dist/lib/shell-parse.d.ts +17 -0
- package/dist/lib/shell-parse.d.ts.map +1 -0
- package/dist/lib/shell-parse.js +191 -0
- package/dist/lib/shell-parse.js.map +1 -0
- package/dist/lib/shell-parse.test.d.ts +2 -0
- package/dist/lib/shell-parse.test.d.ts.map +1 -0
- package/dist/lib/shell-parse.test.js +41 -0
- package/dist/lib/shell-parse.test.js.map +1 -0
- package/dist/lib/token-input.d.ts +6 -0
- package/dist/lib/token-input.d.ts.map +1 -0
- package/dist/lib/token-input.js +42 -0
- package/dist/lib/token-input.js.map +1 -0
- package/dist/lib/token-input.test.d.ts +2 -0
- package/dist/lib/token-input.test.d.ts.map +1 -0
- package/dist/lib/token-input.test.js +38 -0
- package/dist/lib/token-input.test.js.map +1 -0
- package/dist/locales/en.json +222 -6
- package/dist/locales/es.json +219 -3
- package/dist/locales/pt-BR.json +219 -3
- package/dist/utils.d.ts +1 -1
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +5 -24
- package/dist/utils.js.map +1 -1
- package/dist/utils.test.js +14 -0
- package/dist/utils.test.js.map +1 -1
- package/package.json +5 -3
- package/dist/bin/envshed-linux-x64 +0 -4
- package/dist/bundle.cjs +0 -48909
package/dist/commands/run.js
CHANGED
|
@@ -4,8 +4,14 @@ import path from "path";
|
|
|
4
4
|
import ora from "ora";
|
|
5
5
|
import { apiGet } from "../api.js";
|
|
6
6
|
import chalk from "chalk";
|
|
7
|
-
import { resolveOpts, getOriginalCwd, logContext, getWorkspaceContext, resolveWorkspaceOpts, getVersionCache, hasProjectConfig, getToken, getApiUrl, } from "../config.js";
|
|
7
|
+
import { resolveOpts, getOriginalCwd, logContext, getWorkspaceContext, resolveWorkspaceOpts, getVersionCache, hasProjectConfig, getToken, getApiUrl, setSessionToken, } from "../config.js";
|
|
8
8
|
import { t } from "../i18n.js";
|
|
9
|
+
import { activateAgentSession } from "../lib/agent-sessions.js";
|
|
10
|
+
import { dropOidcVariables, exchangeOidcToken } from "../lib/oidc.js";
|
|
11
|
+
import { shouldRedact } from "../lib/agent-mode.js";
|
|
12
|
+
import { buildMaskSet } from "../lib/redact.js";
|
|
13
|
+
import { pipeRedactedOutput } from "../lib/redacted-output.js";
|
|
14
|
+
import { needsShell, spawnErrorExitCode } from "../lib/command-spawn.js";
|
|
9
15
|
function buildChildEnv(secrets) {
|
|
10
16
|
const env = { ...process.env, ...secrets };
|
|
11
17
|
delete env["ENVSHED_TOKEN"];
|
|
@@ -14,6 +20,10 @@ function buildChildEnv(secrets) {
|
|
|
14
20
|
}
|
|
15
21
|
/** Signals that mean "shut down"; anything else is left to the default action. */
|
|
16
22
|
export const FORWARDED_SIGNALS = ["SIGTERM", "SIGINT", "SIGHUP"];
|
|
23
|
+
/** Without a shell in between, nothing else says that the command could not start. */
|
|
24
|
+
function reportSpawnError(err) {
|
|
25
|
+
console.error(chalk.red(t("run.spawnFailed", { command: err.path ?? "", message: err.code ?? err.message })));
|
|
26
|
+
}
|
|
17
27
|
/**
|
|
18
28
|
* Make `envshed run` transparent to process supervisors.
|
|
19
29
|
*
|
|
@@ -30,8 +40,14 @@ export const FORWARDED_SIGNALS = ["SIGTERM", "SIGINT", "SIGHUP"];
|
|
|
30
40
|
* So: forward the signal, then wait. The child decides when it is done, and we
|
|
31
41
|
* reproduce its exit status exactly, including death by signal, so whatever is
|
|
32
42
|
* supervising us sees the truth.
|
|
43
|
+
*
|
|
44
|
+
* With stdio "inherit" nothing stands between the child and the terminal, so we
|
|
45
|
+
* exit as soon as the child does. With piped output, "exit" fires before the
|
|
46
|
+
* pipes drain, so a caller that pipes passes `beforeExit` to hold our exit until
|
|
47
|
+
* the output is complete. The handlers stay installed until then: PID 1 must not
|
|
48
|
+
* lose its signal disposition during that window.
|
|
33
49
|
*/
|
|
34
|
-
export function forwardSignalsToChild(child, proc = process) {
|
|
50
|
+
export function forwardSignalsToChild(child, proc = process, beforeExit) {
|
|
35
51
|
const handlers = new Map();
|
|
36
52
|
const stopListening = () => {
|
|
37
53
|
for (const [signal, handler] of handlers)
|
|
@@ -54,23 +70,71 @@ export function forwardSignalsToChild(child, proc = process) {
|
|
|
54
70
|
handlers.set(signal, handler);
|
|
55
71
|
proc.on(signal, handler);
|
|
56
72
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
child.on("exit", (code, signal) => {
|
|
62
|
-
// Drop our handlers first so re-raising below takes the default action
|
|
63
|
-
// instead of re-entering this forwarder.
|
|
64
|
-
stopListening();
|
|
65
|
-
if (signal) {
|
|
66
|
-
proc.kill(proc.pid, signal);
|
|
67
|
-
// Reached only if the signal was somehow not fatal for us.
|
|
68
|
-
proc.exit(1);
|
|
73
|
+
let exiting = false;
|
|
74
|
+
const whenOutputComplete = (exit) => {
|
|
75
|
+
if (!beforeExit) {
|
|
76
|
+
exit();
|
|
69
77
|
return;
|
|
70
78
|
}
|
|
71
|
-
|
|
79
|
+
if (exiting)
|
|
80
|
+
return;
|
|
81
|
+
exiting = true;
|
|
82
|
+
beforeExit(exit);
|
|
83
|
+
};
|
|
84
|
+
child.on("error", (err) => {
|
|
85
|
+
reportSpawnError(err);
|
|
86
|
+
whenOutputComplete(() => {
|
|
87
|
+
stopListening();
|
|
88
|
+
proc.exit(spawnErrorExitCode(err));
|
|
89
|
+
});
|
|
90
|
+
});
|
|
91
|
+
child.on("exit", (code, signal) => {
|
|
92
|
+
whenOutputComplete(() => {
|
|
93
|
+
// Drop our handlers first so re-raising below takes the default action
|
|
94
|
+
// instead of re-entering this forwarder.
|
|
95
|
+
stopListening();
|
|
96
|
+
if (signal) {
|
|
97
|
+
proc.kill(proc.pid, signal);
|
|
98
|
+
// Reached only if the signal was somehow not fatal for us.
|
|
99
|
+
proc.exit(1);
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
proc.exit(code ?? 0);
|
|
103
|
+
});
|
|
72
104
|
});
|
|
73
105
|
}
|
|
106
|
+
/**
|
|
107
|
+
* Starts the session for `--oidc` or ENVSHED_OIDC_POLICY. The token stays in this
|
|
108
|
+
* process's memory: it is not printed, not stored and not passed to the command. That is
|
|
109
|
+
* also why there is no `::add-mask::` line here, which would write the token to stdout,
|
|
110
|
+
* where anything wrapping this process can read it, to guard a value nothing else sees.
|
|
111
|
+
*/
|
|
112
|
+
async function startOidcSession(policy, watch) {
|
|
113
|
+
const fail = (message) => {
|
|
114
|
+
console.error(chalk.red(message));
|
|
115
|
+
process.exit(1);
|
|
116
|
+
};
|
|
117
|
+
if (watch)
|
|
118
|
+
fail(t("oidc.noWatch"));
|
|
119
|
+
if (process.env.ENVSHED_TOKEN)
|
|
120
|
+
fail(t("oidc.tokenConflict"));
|
|
121
|
+
const spinner = ora(t("oidc.exchanging")).start();
|
|
122
|
+
try {
|
|
123
|
+
const session = await exchangeOidcToken(policy);
|
|
124
|
+
setSessionToken(session.token);
|
|
125
|
+
dropOidcVariables();
|
|
126
|
+
spinner.stop();
|
|
127
|
+
console.log(chalk.dim(` ${t("oidc.using", {
|
|
128
|
+
id: session.id,
|
|
129
|
+
date: new Date(session.expiresAt).toLocaleString(),
|
|
130
|
+
})}`));
|
|
131
|
+
return session;
|
|
132
|
+
}
|
|
133
|
+
catch (err) {
|
|
134
|
+
spinner.fail(err.message);
|
|
135
|
+
process.exit(1);
|
|
136
|
+
}
|
|
137
|
+
}
|
|
74
138
|
export const runCommand = new Command("run")
|
|
75
139
|
.description(t("run.description"))
|
|
76
140
|
.option("-o, --org <slug>", t("common.orgOption"))
|
|
@@ -78,6 +142,10 @@ export const runCommand = new Command("run")
|
|
|
78
142
|
.option("-e, --env <slug>", t("common.envOption"))
|
|
79
143
|
.option("--watch", t("run.watchOption"))
|
|
80
144
|
.option("--interval <seconds>", t("run.intervalOption"), "30")
|
|
145
|
+
// --redact must come first: declared alone, --no-redact would default to true.
|
|
146
|
+
.option("--redact", t("run.redactOption"))
|
|
147
|
+
.option("--no-redact", t("run.noRedactOption"))
|
|
148
|
+
.option("--oidc <policy>", t("run.oidcOption"))
|
|
81
149
|
.argument("<command...>", t("run.commandArg"))
|
|
82
150
|
.action(async (commandArgs, opts) => {
|
|
83
151
|
const program = runCommand.parent;
|
|
@@ -87,7 +155,23 @@ export const runCommand = new Command("run")
|
|
|
87
155
|
let project;
|
|
88
156
|
let env;
|
|
89
157
|
let cwd;
|
|
90
|
-
|
|
158
|
+
const oidcPolicy = opts.oidc || process.env.ENVSHED_OIDC_POLICY;
|
|
159
|
+
const oidcSession = oidcPolicy ? await startOidcSession(oidcPolicy, !!opts.watch) : null;
|
|
160
|
+
if (oidcSession) {
|
|
161
|
+
// The policy decides the target. A flag that disagrees is a mistake worth stopping
|
|
162
|
+
// for, and a default from .envshed.json is not a reason to fail a job.
|
|
163
|
+
for (const name of ["org", "project", "env"]) {
|
|
164
|
+
if (opts[name] && opts[name] !== oidcSession[name]) {
|
|
165
|
+
console.error(chalk.red(t("oidc.targetMismatch", { name, value: oidcSession[name] })));
|
|
166
|
+
process.exit(1);
|
|
167
|
+
}
|
|
168
|
+
}
|
|
169
|
+
org = oidcSession.org;
|
|
170
|
+
project = oidcSession.project;
|
|
171
|
+
env = oidcSession.env;
|
|
172
|
+
cwd = ctx.mode === "workspace" ? path.resolve(ctx.configDir, ctx.workspacePath) : getOriginalCwd();
|
|
173
|
+
}
|
|
174
|
+
else if (ctx.mode === "single") {
|
|
91
175
|
const resolved = resolveOpts(opts);
|
|
92
176
|
org = resolved.org;
|
|
93
177
|
project = resolved.project;
|
|
@@ -116,6 +200,19 @@ export const runCommand = new Command("run")
|
|
|
116
200
|
process.exit(1);
|
|
117
201
|
}
|
|
118
202
|
logContext({ org, project, env });
|
|
203
|
+
const agentSession = oidcSession
|
|
204
|
+
? { status: "none" }
|
|
205
|
+
: activateAgentSession({ org, project, env });
|
|
206
|
+
if (agentSession.status === "unusable") {
|
|
207
|
+
console.error(chalk.red(t("agentSession.runExpired", { id: agentSession.session.id })));
|
|
208
|
+
process.exit(1);
|
|
209
|
+
}
|
|
210
|
+
if (agentSession.status === "active") {
|
|
211
|
+
console.log(chalk.dim(` ${t("agentSession.runUsing", {
|
|
212
|
+
id: agentSession.session.id,
|
|
213
|
+
date: new Date(agentSession.session.expiresAt).toLocaleString(),
|
|
214
|
+
})}`));
|
|
215
|
+
}
|
|
119
216
|
const spinner = ora(t("run.fetching")).start();
|
|
120
217
|
try {
|
|
121
218
|
const res = await apiGet(`/secrets/${org}/${project}/${env}`);
|
|
@@ -133,7 +230,29 @@ export const runCommand = new Command("run")
|
|
|
133
230
|
console.log(chalk.dim(` ${t("run.staleHint")}\n`));
|
|
134
231
|
}
|
|
135
232
|
const [cmd, ...args] = commandArgs;
|
|
233
|
+
const shell = needsShell(commandArgs);
|
|
234
|
+
// A job moving from `secrets.X` to --oidc would otherwise lose GitHub's log masking.
|
|
235
|
+
const redact = shouldRedact(opts.redact ?? (oidcSession ? true : undefined), process.env);
|
|
236
|
+
if (redact) {
|
|
237
|
+
const { maskedKeys, skippedKeys } = buildMaskSet(data.secrets);
|
|
238
|
+
console.error(chalk.dim(` ${t("run.redactActive", { count: maskedKeys.length, skipped: skippedKeys.length })}`));
|
|
239
|
+
}
|
|
240
|
+
// Stdin stays inherited, so a child can still read from the caller.
|
|
241
|
+
const spawnRedacted = (secrets) => {
|
|
242
|
+
const child = spawn(cmd, args, {
|
|
243
|
+
stdio: ["inherit", "pipe", "pipe"],
|
|
244
|
+
env: buildChildEnv(secrets),
|
|
245
|
+
cwd,
|
|
246
|
+
shell,
|
|
247
|
+
});
|
|
248
|
+
return { child, output: pipeRedactedOutput(child, buildMaskSet(secrets)) };
|
|
249
|
+
};
|
|
136
250
|
if (!opts.watch) {
|
|
251
|
+
if (redact) {
|
|
252
|
+
const { child, output } = spawnRedacted(data.secrets);
|
|
253
|
+
forwardSignalsToChild(child, process, (done) => output.drain(done));
|
|
254
|
+
return;
|
|
255
|
+
}
|
|
137
256
|
// Non-watch mode: scrub ENVSHED_TOKEN/ENVSHED_API_URL from the child
|
|
138
257
|
// env (buildChildEnv) so the CLI's own credentials are not inherited by
|
|
139
258
|
// the spawned process — matching watch mode.
|
|
@@ -141,7 +260,7 @@ export const runCommand = new Command("run")
|
|
|
141
260
|
stdio: "inherit",
|
|
142
261
|
env: buildChildEnv(data.secrets),
|
|
143
262
|
cwd,
|
|
144
|
-
shell
|
|
263
|
+
shell,
|
|
145
264
|
});
|
|
146
265
|
forwardSignalsToChild(child);
|
|
147
266
|
return;
|
|
@@ -150,12 +269,30 @@ export const runCommand = new Command("run")
|
|
|
150
269
|
const intervalSec = Math.max(10, parseInt(opts.interval ?? "30", 10));
|
|
151
270
|
const intervalMs = intervalSec * 1_000;
|
|
152
271
|
const MAX_BACKOFF_MS = 5 * 60 * 1_000; // 5 minutes
|
|
153
|
-
let
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
272
|
+
let redactedOutput = null;
|
|
273
|
+
// Each child's output stays bound to the masks for the values it was given.
|
|
274
|
+
const startWatchedChild = (secrets) => {
|
|
275
|
+
if (redact) {
|
|
276
|
+
const started = spawnRedacted(secrets);
|
|
277
|
+
redactedOutput = started.output;
|
|
278
|
+
return started.child;
|
|
279
|
+
}
|
|
280
|
+
return spawn(cmd, args, {
|
|
281
|
+
stdio: "inherit",
|
|
282
|
+
env: buildChildEnv(secrets),
|
|
283
|
+
cwd,
|
|
284
|
+
shell,
|
|
285
|
+
});
|
|
286
|
+
};
|
|
287
|
+
const startWatched = (secrets) => {
|
|
288
|
+
const started = startWatchedChild(secrets);
|
|
289
|
+
started.on("error", (err) => {
|
|
290
|
+
reportSpawnError(err);
|
|
291
|
+
process.exit(spawnErrorExitCode(err));
|
|
292
|
+
});
|
|
293
|
+
return started;
|
|
294
|
+
};
|
|
295
|
+
let child = startWatched(data.secrets);
|
|
159
296
|
// Seed ETag from version endpoint
|
|
160
297
|
const versionUrl = `${getApiUrl()}/api/v1/version/${org}/${project}/${env}`;
|
|
161
298
|
let currentEtag = null;
|
|
@@ -171,6 +308,11 @@ export const runCommand = new Command("run")
|
|
|
171
308
|
clearInterval(pollTimer);
|
|
172
309
|
if (child)
|
|
173
310
|
child.kill("SIGTERM");
|
|
311
|
+
// With pipes the child's shutdown output only reaches the caller through us.
|
|
312
|
+
if (redactedOutput) {
|
|
313
|
+
redactedOutput.drain(() => process.exit(0));
|
|
314
|
+
return;
|
|
315
|
+
}
|
|
174
316
|
process.exit(0);
|
|
175
317
|
};
|
|
176
318
|
process.on("SIGINT", cleanup);
|
|
@@ -216,12 +358,7 @@ export const runCommand = new Command("run")
|
|
|
216
358
|
// Re-fetch secrets then re-spawn
|
|
217
359
|
const secretsRes = await apiGet(`/secrets/${org}/${project}/${env}`);
|
|
218
360
|
const newData = (await secretsRes.json());
|
|
219
|
-
child =
|
|
220
|
-
stdio: "inherit",
|
|
221
|
-
env: buildChildEnv(newData.secrets),
|
|
222
|
-
cwd,
|
|
223
|
-
shell: true,
|
|
224
|
-
});
|
|
361
|
+
child = startWatched(newData.secrets);
|
|
225
362
|
// Note: do NOT chain child.on("exit") → process.exit in watch mode
|
|
226
363
|
}
|
|
227
364
|
catch (err) {
|
|
@@ -234,6 +371,9 @@ export const runCommand = new Command("run")
|
|
|
234
371
|
}
|
|
235
372
|
catch (err) {
|
|
236
373
|
spinner.fail(t("run.runFailed", { message: err.message }));
|
|
374
|
+
if (agentSession.status === "active") {
|
|
375
|
+
console.error(chalk.dim(t("agentSession.runRejected", { id: agentSession.session.id })));
|
|
376
|
+
}
|
|
237
377
|
process.exit(1);
|
|
238
378
|
}
|
|
239
379
|
});
|
package/dist/commands/run.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../src/commands/run.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,11 +48,155 @@ vi.mock("../config.js", () => ({
|
|
|
48
48
|
hasProjectConfig: vi.fn(() => true),
|
|
49
49
|
getToken: vi.fn(() => "test-token"),
|
|
50
50
|
getApiUrl: vi.fn(() => "https://api.envshed.com"),
|
|
51
|
+
setSessionToken: vi.fn(),
|
|
51
52
|
}));
|
|
53
|
+
const activateAgentSession = vi.hoisted(() => vi.fn(() => ({ status: "none" })));
|
|
54
|
+
vi.mock("../lib/agent-sessions.js", () => ({ activateAgentSession }));
|
|
55
|
+
const exchangeOidcToken = vi.hoisted(() => vi.fn());
|
|
56
|
+
vi.mock("../lib/oidc.js", async (importOriginal) => {
|
|
57
|
+
const orig = await importOriginal();
|
|
58
|
+
return { ...orig, exchangeOidcToken };
|
|
59
|
+
});
|
|
52
60
|
import { apiGet } from "../api.js";
|
|
53
|
-
import { getVersionCache } from "../config.js";
|
|
61
|
+
import { getVersionCache, setSessionToken } from "../config.js";
|
|
62
|
+
/**
|
|
63
|
+
* These tests expect the default path, so they must not depend on whether the
|
|
64
|
+
* shell running them is itself an agent session.
|
|
65
|
+
*/
|
|
66
|
+
function clearAgentEnv() {
|
|
67
|
+
vi.stubEnv("CLAUDE_CODE_CHILD_SESSION", "");
|
|
68
|
+
vi.stubEnv("ENVSHED_AGENT_MODE", "");
|
|
69
|
+
}
|
|
70
|
+
afterEach(() => {
|
|
71
|
+
vi.unstubAllEnvs();
|
|
72
|
+
});
|
|
73
|
+
describe("run --oidc", () => {
|
|
74
|
+
// Assembled at runtime so nothing token-shaped sits in the repo.
|
|
75
|
+
const SESSION_TOKEN = ["envshed", "svc", "fixture"].join("_");
|
|
76
|
+
const POLICY = "11111111-1111-4111-8111-111111111111";
|
|
77
|
+
const output = [];
|
|
78
|
+
const session = {
|
|
79
|
+
token: SESSION_TOKEN,
|
|
80
|
+
id: "session-id",
|
|
81
|
+
expiresAt: "2026-11-01T00:00:00.000Z",
|
|
82
|
+
org: "acme",
|
|
83
|
+
project: "billing",
|
|
84
|
+
env: "production",
|
|
85
|
+
};
|
|
86
|
+
async function run(args) {
|
|
87
|
+
const { runCommand } = await import("./run.js");
|
|
88
|
+
const { Command } = await import("commander");
|
|
89
|
+
for (const name of ["oidc", "org", "project", "env", "watch"]) {
|
|
90
|
+
runCommand.setOptionValueWithSource(name, undefined, "default");
|
|
91
|
+
}
|
|
92
|
+
const program = new Command();
|
|
93
|
+
program.addCommand(runCommand);
|
|
94
|
+
await program.parseAsync(["node", "test", "run", ...args, "--", "echo", "hello"], {
|
|
95
|
+
from: "node",
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
beforeEach(() => {
|
|
99
|
+
output.length = 0;
|
|
100
|
+
clearAgentEnv();
|
|
101
|
+
vi.stubEnv("ENVSHED_TOKEN", "");
|
|
102
|
+
vi.stubEnv("ENVSHED_OIDC_POLICY", "");
|
|
103
|
+
vi.mocked(setSessionToken).mockClear();
|
|
104
|
+
vi.mocked(apiGet).mockReset();
|
|
105
|
+
vi.mocked(apiGet).mockResolvedValue({
|
|
106
|
+
json: () => Promise.resolve({ secrets: { A_KEY: "a" } }),
|
|
107
|
+
});
|
|
108
|
+
exchangeOidcToken.mockReset();
|
|
109
|
+
exchangeOidcToken.mockResolvedValue(session);
|
|
110
|
+
spawnMock.mockReset();
|
|
111
|
+
spawnMock.mockImplementation(() => ({ on: vi.fn(), kill: vi.fn() }));
|
|
112
|
+
const capture = (...args) => {
|
|
113
|
+
output.push(args.map(String).join(" "));
|
|
114
|
+
};
|
|
115
|
+
vi.spyOn(console, "log").mockImplementation(capture);
|
|
116
|
+
vi.spyOn(console, "error").mockImplementation(capture);
|
|
117
|
+
vi.spyOn(console, "warn").mockImplementation(capture);
|
|
118
|
+
vi.spyOn(process.stdout, "write").mockImplementation((chunk) => {
|
|
119
|
+
capture(chunk);
|
|
120
|
+
return true;
|
|
121
|
+
});
|
|
122
|
+
vi.spyOn(process.stderr, "write").mockImplementation((chunk) => {
|
|
123
|
+
capture(chunk);
|
|
124
|
+
return true;
|
|
125
|
+
});
|
|
126
|
+
vi.spyOn(process, "exit").mockImplementation(() => {
|
|
127
|
+
throw new Error("process.exit");
|
|
128
|
+
});
|
|
129
|
+
});
|
|
130
|
+
it("exchanges, uses the session in memory, and fetches the policy's environment", async () => {
|
|
131
|
+
await run(["--oidc", POLICY]);
|
|
132
|
+
expect(exchangeOidcToken).toHaveBeenCalledWith(POLICY);
|
|
133
|
+
expect(setSessionToken).toHaveBeenCalledWith(SESSION_TOKEN);
|
|
134
|
+
expect(apiGet).toHaveBeenCalledWith("/secrets/acme/billing/production");
|
|
135
|
+
expect(activateAgentSession).not.toHaveBeenCalled();
|
|
136
|
+
});
|
|
137
|
+
it("reads the policy from ENVSHED_OIDC_POLICY", async () => {
|
|
138
|
+
vi.stubEnv("ENVSHED_OIDC_POLICY", POLICY);
|
|
139
|
+
await run([]);
|
|
140
|
+
expect(exchangeOidcToken).toHaveBeenCalledWith(POLICY);
|
|
141
|
+
});
|
|
142
|
+
it("never writes the token to any output, and masks nothing", async () => {
|
|
143
|
+
await run(["--oidc", POLICY]);
|
|
144
|
+
const all = output.join("\n");
|
|
145
|
+
expect(all).toContain("oidc.using");
|
|
146
|
+
expect(all).not.toContain(SESSION_TOKEN);
|
|
147
|
+
expect(all).not.toContain("::add-mask::");
|
|
148
|
+
});
|
|
149
|
+
it("does not hand the token, or the means to get another, to the command", async () => {
|
|
150
|
+
vi.stubEnv("ACTIONS_ID_TOKEN_REQUEST_URL", "https://runner.example.test/token");
|
|
151
|
+
vi.stubEnv("ACTIONS_ID_TOKEN_REQUEST_TOKEN", ["request", "credential"].join("-"));
|
|
152
|
+
await run(["--oidc", POLICY]);
|
|
153
|
+
const childEnv = spawnMock.mock.calls[0][2].env;
|
|
154
|
+
expect(childEnv.A_KEY).toBe("a");
|
|
155
|
+
expect(JSON.stringify(childEnv)).not.toContain(SESSION_TOKEN);
|
|
156
|
+
expect(childEnv.ACTIONS_ID_TOKEN_REQUEST_URL).toBeUndefined();
|
|
157
|
+
expect(childEnv.ACTIONS_ID_TOKEN_REQUEST_TOKEN).toBeUndefined();
|
|
158
|
+
expect(childEnv.ENVSHED_OIDC_POLICY).toBeUndefined();
|
|
159
|
+
});
|
|
160
|
+
it("masks output by default, and --no-redact turns that off", async () => {
|
|
161
|
+
await run(["--oidc", POLICY]);
|
|
162
|
+
expect(spawnMock.mock.calls[0][2].stdio).not.toBe("inherit");
|
|
163
|
+
spawnMock.mockClear();
|
|
164
|
+
await run(["--oidc", POLICY, "--no-redact"]);
|
|
165
|
+
expect(spawnMock.mock.calls[0][2].stdio).toBe("inherit");
|
|
166
|
+
});
|
|
167
|
+
it("refuses when ENVSHED_TOKEN is also set, rather than using it", async () => {
|
|
168
|
+
vi.stubEnv("ENVSHED_TOKEN", ["another", "credential"].join("-"));
|
|
169
|
+
await expect(run(["--oidc", POLICY])).rejects.toThrow("process.exit");
|
|
170
|
+
expect(exchangeOidcToken).not.toHaveBeenCalled();
|
|
171
|
+
expect(spawnMock).not.toHaveBeenCalled();
|
|
172
|
+
expect(output.join("\n")).toContain("oidc.tokenConflict");
|
|
173
|
+
});
|
|
174
|
+
it("refuses --watch, which would outlive the session", async () => {
|
|
175
|
+
await expect(run(["--oidc", POLICY, "--watch"])).rejects.toThrow("process.exit");
|
|
176
|
+
expect(exchangeOidcToken).not.toHaveBeenCalled();
|
|
177
|
+
});
|
|
178
|
+
it("stops with no command run when the exchange is refused", async () => {
|
|
179
|
+
exchangeOidcToken.mockRejectedValue(new Error("oidc.refused"));
|
|
180
|
+
await expect(run(["--oidc", POLICY])).rejects.toThrow("process.exit");
|
|
181
|
+
expect(spinnerMock.calls.fail).toHaveBeenCalledWith("oidc.refused");
|
|
182
|
+
expect(apiGet).not.toHaveBeenCalled();
|
|
183
|
+
expect(spawnMock).not.toHaveBeenCalled();
|
|
184
|
+
});
|
|
185
|
+
it("stops when a flag names a different target than the policy", async () => {
|
|
186
|
+
await expect(run(["--oidc", POLICY, "-e", "staging"])).rejects.toThrow("process.exit");
|
|
187
|
+
expect(apiGet).not.toHaveBeenCalled();
|
|
188
|
+
expect(output.join("\n")).toContain("oidc.targetMismatch");
|
|
189
|
+
});
|
|
190
|
+
it("does nothing without a policy", async () => {
|
|
191
|
+
await run([]);
|
|
192
|
+
expect(exchangeOidcToken).not.toHaveBeenCalled();
|
|
193
|
+
expect(setSessionToken).not.toHaveBeenCalled();
|
|
194
|
+
});
|
|
195
|
+
});
|
|
54
196
|
describe("run command", () => {
|
|
55
197
|
beforeEach(() => {
|
|
198
|
+
activateAgentSession.mockReturnValue({ status: "none" });
|
|
199
|
+
clearAgentEnv();
|
|
56
200
|
vi.spyOn(console, "log").mockImplementation(() => { });
|
|
57
201
|
vi.spyOn(console, "error").mockImplementation(() => { });
|
|
58
202
|
vi.spyOn(process, "exit").mockImplementation(() => {
|
|
@@ -84,6 +228,31 @@ describe("run command", () => {
|
|
|
84
228
|
env: expect.objectContaining({ DATABASE_URL: "postgres://localhost/db" }),
|
|
85
229
|
}));
|
|
86
230
|
});
|
|
231
|
+
it("starts a command of plain words without a shell, so signals reach it", async () => {
|
|
232
|
+
vi.mocked(apiGet).mockResolvedValue({
|
|
233
|
+
json: () => Promise.resolve({ secrets: {} }),
|
|
234
|
+
});
|
|
235
|
+
const { runCommand } = await import("./run.js");
|
|
236
|
+
const { Command } = await import("commander");
|
|
237
|
+
const program = new Command();
|
|
238
|
+
program.addCommand(runCommand);
|
|
239
|
+
await program.parseAsync(["node", "test", "run", "node", "dist/main"], { from: "node" });
|
|
240
|
+
expect(spawnMock).toHaveBeenCalledWith("node", ["dist/main"], expect.objectContaining({ shell: process.platform === "win32" }));
|
|
241
|
+
});
|
|
242
|
+
it("keeps stdio inherit with --no-redact in agent mode", async () => {
|
|
243
|
+
vi.stubEnv("CLAUDE_CODE_CHILD_SESSION", "1");
|
|
244
|
+
vi.mocked(apiGet).mockResolvedValue({
|
|
245
|
+
json: () => Promise.resolve({ secrets: {} }),
|
|
246
|
+
});
|
|
247
|
+
const { runCommand } = await import("./run.js");
|
|
248
|
+
const { Command } = await import("commander");
|
|
249
|
+
const program = new Command();
|
|
250
|
+
program.addCommand(runCommand);
|
|
251
|
+
await program.parseAsync(["node", "test", "run", "--no-redact", "--", "ls"], {
|
|
252
|
+
from: "node",
|
|
253
|
+
});
|
|
254
|
+
expect(spawnMock).toHaveBeenCalledWith("ls", [], expect.objectContaining({ stdio: "inherit" }));
|
|
255
|
+
});
|
|
87
256
|
it("passes correct cwd to spawned process", async () => {
|
|
88
257
|
vi.mocked(apiGet).mockResolvedValue({
|
|
89
258
|
json: () => Promise.resolve({ secrets: {} }),
|
|
@@ -111,6 +280,49 @@ describe("run command", () => {
|
|
|
111
280
|
});
|
|
112
281
|
expect(console.log).toHaveBeenCalledWith(expect.stringContaining("run.staleWarning"));
|
|
113
282
|
});
|
|
283
|
+
it("stops instead of using the person's own token when the session has expired", async () => {
|
|
284
|
+
activateAgentSession.mockReturnValue({ status: "unusable", session: { id: "sess-1" } });
|
|
285
|
+
const { runCommand } = await import("./run.js");
|
|
286
|
+
const { Command } = await import("commander");
|
|
287
|
+
const program = new Command();
|
|
288
|
+
program.addCommand(runCommand);
|
|
289
|
+
await expect(program.parseAsync(["node", "test", "run", "echo", "hi"], { from: "node" })).rejects.toThrow("process.exit");
|
|
290
|
+
expect(apiGet).not.toHaveBeenCalled();
|
|
291
|
+
expect(spawnMock).not.toHaveBeenCalled();
|
|
292
|
+
expect(console.error).toHaveBeenCalledWith(expect.stringContaining("agentSession.runExpired"));
|
|
293
|
+
});
|
|
294
|
+
it("says which session it used, and does not put a credential in the child's env", async () => {
|
|
295
|
+
activateAgentSession.mockReturnValue({
|
|
296
|
+
status: "active",
|
|
297
|
+
session: { id: "sess-1", expiresAt: new Date(Date.now() + 60_000).toISOString() },
|
|
298
|
+
});
|
|
299
|
+
vi.mocked(apiGet).mockResolvedValue({
|
|
300
|
+
json: () => Promise.resolve({ secrets: { A_KEY: "x" }, version: 1 }),
|
|
301
|
+
});
|
|
302
|
+
const { runCommand } = await import("./run.js");
|
|
303
|
+
const { Command } = await import("commander");
|
|
304
|
+
const program = new Command();
|
|
305
|
+
program.addCommand(runCommand);
|
|
306
|
+
await program.parseAsync(["node", "test", "run", "echo", "hi"], { from: "node" });
|
|
307
|
+
expect(activateAgentSession).toHaveBeenCalledWith({ org: "my-org", project: "my-project", env: "development" });
|
|
308
|
+
expect(console.log).toHaveBeenCalledWith(expect.stringContaining("agentSession.runUsing"));
|
|
309
|
+
const childEnv = spawnMock.mock.calls[0][2].env;
|
|
310
|
+
expect(childEnv.A_KEY).toBe("x");
|
|
311
|
+
expect(childEnv.ENVSHED_TOKEN).toBeUndefined();
|
|
312
|
+
});
|
|
313
|
+
it("tells a session user why a rejected token may have failed", async () => {
|
|
314
|
+
activateAgentSession.mockReturnValue({
|
|
315
|
+
status: "active",
|
|
316
|
+
session: { id: "sess-1", expiresAt: new Date(Date.now() + 60_000).toISOString() },
|
|
317
|
+
});
|
|
318
|
+
vi.mocked(apiGet).mockRejectedValue(new Error("401"));
|
|
319
|
+
const { runCommand } = await import("./run.js");
|
|
320
|
+
const { Command } = await import("commander");
|
|
321
|
+
const program = new Command();
|
|
322
|
+
program.addCommand(runCommand);
|
|
323
|
+
await expect(program.parseAsync(["node", "test", "run", "echo", "hi"], { from: "node" })).rejects.toThrow("process.exit");
|
|
324
|
+
expect(console.error).toHaveBeenCalledWith(expect.stringContaining("agentSession.runRejected"));
|
|
325
|
+
});
|
|
114
326
|
it("exits with failure on API error", async () => {
|
|
115
327
|
vi.mocked(apiGet).mockRejectedValue(new Error("Network error"));
|
|
116
328
|
const { runCommand } = await import("./run.js");
|
|
@@ -161,6 +373,7 @@ describe("run --watch", () => {
|
|
|
161
373
|
capturedIntervalCallback = null;
|
|
162
374
|
capturedIntervalMs = null;
|
|
163
375
|
intervalCleared = false;
|
|
376
|
+
clearAgentEnv();
|
|
164
377
|
vi.spyOn(console, "log").mockImplementation(() => { });
|
|
165
378
|
vi.spyOn(console, "warn").mockImplementation(() => { });
|
|
166
379
|
vi.spyOn(console, "error").mockImplementation(() => { });
|