@stigmer/cli 0.1.3 → 0.2.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/auth/browser.d.ts +7 -0
- package/auth/browser.d.ts.map +1 -0
- package/auth/browser.js +49 -0
- package/auth/browser.js.map +1 -0
- package/auth/callback-server.d.ts +8 -3
- package/auth/callback-server.d.ts.map +1 -1
- package/auth/callback-server.js +53 -19
- package/auth/callback-server.js.map +1 -1
- package/auth/device.d.ts +23 -0
- package/auth/device.d.ts.map +1 -0
- package/auth/device.js +119 -0
- package/auth/device.js.map +1 -0
- package/auth/index.d.ts +4 -3
- package/auth/index.d.ts.map +1 -1
- package/auth/index.js +4 -3
- package/auth/index.js.map +1 -1
- package/auth/login.d.ts +49 -1
- package/auth/login.d.ts.map +1 -1
- package/auth/login.js +161 -51
- package/auth/login.js.map +1 -1
- package/auth/oidc.d.ts +67 -0
- package/auth/oidc.d.ts.map +1 -0
- package/auth/oidc.js +213 -0
- package/auth/oidc.js.map +1 -0
- package/auth/token.d.ts +17 -23
- package/auth/token.d.ts.map +1 -1
- package/auth/token.js +51 -60
- package/auth/token.js.map +1 -1
- package/client/client.d.ts.map +1 -1
- package/client/client.js +4 -1
- package/client/client.js.map +1 -1
- package/client/current-organization.d.ts +5 -0
- package/client/current-organization.d.ts.map +1 -0
- package/client/current-organization.js +15 -0
- package/client/current-organization.js.map +1 -0
- package/commands/apikey/index.d.ts +16 -1
- package/commands/apikey/index.d.ts.map +1 -1
- package/commands/apikey/index.js +81 -0
- package/commands/apikey/index.js.map +1 -1
- package/commands/app-handover.d.ts +17 -0
- package/commands/app-handover.d.ts.map +1 -0
- package/commands/app-handover.js +155 -0
- package/commands/app-handover.js.map +1 -0
- package/commands/auth/index.d.ts.map +1 -1
- package/commands/auth/index.js +15 -9
- package/commands/auth/index.js.map +1 -1
- package/commands/auth/login.d.ts +7 -2
- package/commands/auth/login.d.ts.map +1 -1
- package/commands/auth/login.js +26 -23
- package/commands/auth/login.js.map +1 -1
- package/commands/auth/whoami.d.ts +5 -0
- package/commands/auth/whoami.d.ts.map +1 -1
- package/commands/auth/whoami.js +13 -1
- package/commands/auth/whoami.js.map +1 -1
- package/commands/coding-agent.d.ts +5 -0
- package/commands/coding-agent.d.ts.map +1 -0
- package/commands/coding-agent.js +30 -0
- package/commands/coding-agent.js.map +1 -0
- package/commands/config/backend.js +20 -6
- package/commands/config/backend.js.map +1 -1
- package/commands/embedding.d.ts +28 -0
- package/commands/embedding.d.ts.map +1 -0
- package/commands/embedding.js +170 -0
- package/commands/embedding.js.map +1 -0
- package/commands/example.d.ts +13 -0
- package/commands/example.d.ts.map +1 -0
- package/commands/example.js +126 -0
- package/commands/example.js.map +1 -0
- package/commands/help.d.ts.map +1 -1
- package/commands/help.js +16 -3
- package/commands/help.js.map +1 -1
- package/commands/load-test/burst.d.ts +64 -0
- package/commands/load-test/burst.d.ts.map +1 -0
- package/commands/load-test/burst.js +202 -0
- package/commands/load-test/burst.js.map +1 -0
- package/commands/load-test/index.d.ts +37 -0
- package/commands/load-test/index.d.ts.map +1 -0
- package/commands/load-test/index.js +154 -0
- package/commands/load-test/index.js.map +1 -0
- package/commands/load-test/report.d.ts +98 -0
- package/commands/load-test/report.d.ts.map +1 -0
- package/commands/load-test/report.js +210 -0
- package/commands/load-test/report.js.map +1 -0
- package/commands/mcp-server.d.ts +3 -3
- package/commands/mcp-server.d.ts.map +1 -1
- package/commands/mcp-server.js +4 -4
- package/commands/mcp-server.js.map +1 -1
- package/commands/setup.d.ts +17 -0
- package/commands/setup.d.ts.map +1 -1
- package/commands/setup.js +71 -1
- package/commands/setup.js.map +1 -1
- package/commands/up.d.ts.map +1 -1
- package/commands/up.js +67 -9
- package/commands/up.js.map +1 -1
- package/commands/usage.d.ts +15 -0
- package/commands/usage.d.ts.map +1 -1
- package/commands/usage.js +52 -2
- package/commands/usage.js.map +1 -1
- package/config/config.d.ts +14 -7
- package/config/config.d.ts.map +1 -1
- package/config/config.js +5 -1
- package/config/config.js.map +1 -1
- package/config/index.d.ts +1 -1
- package/config/index.d.ts.map +1 -1
- package/config/index.js +1 -1
- package/config/index.js.map +1 -1
- package/config/resolve.d.ts +1 -1
- package/config/resolve.d.ts.map +1 -1
- package/config/resolve.js +6 -3
- package/config/resolve.js.map +1 -1
- package/errors/classify.d.ts.map +1 -1
- package/errors/classify.js +10 -1
- package/errors/classify.js.map +1 -1
- package/errors/cli-exit-error.d.ts +3 -1
- package/errors/cli-exit-error.d.ts.map +1 -1
- package/errors/cli-exit-error.js +6 -2
- package/errors/cli-exit-error.js.map +1 -1
- package/errors/handle.d.ts +32 -5
- package/errors/handle.d.ts.map +1 -1
- package/errors/handle.js +67 -8
- package/errors/handle.js.map +1 -1
- package/local/daemon/components.d.ts +28 -1
- package/local/daemon/components.d.ts.map +1 -1
- package/local/daemon/components.js +64 -2
- package/local/daemon/components.js.map +1 -1
- package/local/daemon/host.d.ts.map +1 -1
- package/local/daemon/host.js +6 -2
- package/local/daemon/host.js.map +1 -1
- package/local/daemon/launch.d.ts +12 -4
- package/local/daemon/launch.d.ts.map +1 -1
- package/local/daemon/launch.js +49 -16
- package/local/daemon/launch.js.map +1 -1
- package/local/daemon/types.d.ts +9 -1
- package/local/daemon/types.d.ts.map +1 -1
- package/local/key-check.d.ts +20 -0
- package/local/key-check.d.ts.map +1 -0
- package/local/key-check.js +45 -0
- package/local/key-check.js.map +1 -0
- package/local/model-key-step.d.ts +63 -0
- package/local/model-key-step.d.ts.map +1 -0
- package/local/model-key-step.js +133 -0
- package/local/model-key-step.js.map +1 -0
- package/local/setup/prompt.d.ts.map +1 -1
- package/local/setup/prompt.js +22 -18
- package/local/setup/prompt.js.map +1 -1
- package/local/setup/wizard.d.ts +10 -0
- package/local/setup/wizard.d.ts.map +1 -1
- package/local/setup/wizard.js +40 -17
- package/local/setup/wizard.js.map +1 -1
- package/local/state/lock.d.ts.map +1 -1
- package/local/state/lock.js +123 -36
- package/local/state/lock.js.map +1 -1
- package/local/state/pidfile.d.ts +4 -0
- package/local/state/pidfile.d.ts.map +1 -1
- package/local/state/pidfile.js +12 -3
- package/local/state/pidfile.js.map +1 -1
- package/package.json +12 -9
- package/program.d.ts.map +1 -1
- package/program.js +10 -0
- package/program.js.map +1 -1
- package/resources/get.js +1 -1
- package/resources/get.js.map +1 -1
- package/resources/run/stream.d.ts.map +1 -1
- package/resources/run/stream.js +2 -1
- package/resources/run/stream.js.map +1 -1
- package/resources/stream/render-plaintext.d.ts +3 -0
- package/resources/stream/render-plaintext.d.ts.map +1 -1
- package/resources/stream/render-plaintext.js +20 -2
- package/resources/stream/render-plaintext.js.map +1 -1
- package/resources/usage.d.ts +8 -0
- package/resources/usage.d.ts.map +1 -1
- package/resources/usage.js +37 -0
- package/resources/usage.js.map +1 -1
- package/runtime.d.ts +9 -0
- package/runtime.d.ts.map +1 -1
- package/runtime.js +12 -1
- package/runtime.js.map +1 -1
- package/src/auth/browser.ts +57 -0
- package/src/auth/callback-server.ts +58 -22
- package/src/auth/device.ts +151 -0
- package/src/auth/index.ts +4 -3
- package/src/auth/login.ts +243 -67
- package/src/auth/oidc.ts +270 -0
- package/src/auth/token.ts +53 -90
- package/src/client/client.ts +4 -1
- package/src/client/current-organization.ts +27 -0
- package/src/commands/apikey/index.ts +85 -0
- package/src/commands/app-handover.ts +188 -0
- package/src/commands/auth/index.ts +16 -10
- package/src/commands/auth/login.ts +30 -23
- package/src/commands/auth/whoami.ts +16 -1
- package/src/commands/coding-agent.ts +33 -0
- package/src/commands/config/backend.ts +20 -6
- package/src/commands/embedding.ts +209 -0
- package/src/commands/example.ts +146 -0
- package/src/commands/help.ts +16 -3
- package/src/commands/load-test/burst.ts +291 -0
- package/src/commands/load-test/index.ts +183 -0
- package/src/commands/load-test/report.ts +302 -0
- package/src/commands/mcp-server.ts +5 -5
- package/src/commands/setup.ts +76 -2
- package/src/commands/up.ts +76 -10
- package/src/commands/usage.ts +55 -2
- package/src/config/config.ts +18 -8
- package/src/config/index.ts +1 -0
- package/src/config/resolve.ts +5 -3
- package/src/errors/classify.ts +10 -1
- package/src/errors/cli-exit-error.ts +6 -2
- package/src/errors/handle.ts +74 -8
- package/src/local/daemon/components.ts +66 -2
- package/src/local/daemon/host.ts +6 -2
- package/src/local/daemon/launch.ts +51 -16
- package/src/local/daemon/types.ts +9 -1
- package/src/local/key-check.ts +61 -0
- package/src/local/model-key-step.ts +164 -0
- package/src/local/setup/prompt.ts +22 -18
- package/src/local/setup/wizard.ts +45 -18
- package/src/local/state/lock.ts +116 -35
- package/src/local/state/pidfile.ts +14 -3
- package/src/program.ts +10 -0
- package/src/resources/get.ts +1 -1
- package/src/resources/run/stream.ts +2 -1
- package/src/resources/stream/render-plaintext.ts +20 -2
- package/src/resources/usage.ts +42 -0
- package/src/runtime.ts +17 -1
- package/auth/auth0.d.ts +0 -19
- package/auth/auth0.d.ts.map +0 -1
- package/auth/auth0.js +0 -39
- package/auth/auth0.js.map +0 -1
- package/src/auth/auth0.ts +0 -43
|
@@ -0,0 +1,210 @@
|
|
|
1
|
+
// What `stigmer load-test` reports: each run's start and ending, read apart,
|
|
2
|
+
// and the burst's summary, as a table with sentences or as one JSON (or
|
|
3
|
+
// YAML) document. Pure: the engine (burst.ts) hands in what it saw, and this
|
|
4
|
+
// module decides the words.
|
|
5
|
+
//
|
|
6
|
+
// A run's start is one of five words. `started` once the runner stamped
|
|
7
|
+
// `status.started_at`; `refused` when the create itself was answered with an
|
|
8
|
+
// error (its code and the server's own sentence, verbatim, so a plan's limit
|
|
9
|
+
// reads in the server's words without this tool knowing them); `wait ran out`
|
|
10
|
+
// when the run ended `no_sandbox_room`; `never started` for any other ending
|
|
11
|
+
// before a start; `still waiting` when the watch ended first.
|
|
12
|
+
//
|
|
13
|
+
// Two times per run, both from the server's side, never this machine's clock:
|
|
14
|
+
// - to start: `status.started_at` (the runner) minus
|
|
15
|
+
// `status.audit.spec_audit.created_at` (the server, when it accepted the
|
|
16
|
+
// message). A `started_at` written without milliseconds (it is a
|
|
17
|
+
// string; the create's stamp is a Timestamp), or a negative difference,
|
|
18
|
+
// is "unclear" and left out of the figures.
|
|
19
|
+
// - waited for a sandbox: the longest `awaiting_sandbox_for` the run's
|
|
20
|
+
// liveness carried. The server's own number counts from its first "no
|
|
21
|
+
// room" to the answer that found room, and liveness is sent on each "no
|
|
22
|
+
// room" answer, at most one backoff (15 s) apart, so the server's figure
|
|
23
|
+
// is at least this one and at most "to start": the report writes "≥".
|
|
24
|
+
// Liveness is the serving process's memory, so the report says a run
|
|
25
|
+
// "reported" a wait, and when none did it says so in its own line: a
|
|
26
|
+
// fleet that cannot run out of room never reads as one that held.
|
|
27
|
+
//
|
|
28
|
+
// Spend is the sum of the runs' own estimates
|
|
29
|
+
// (`status.streaming_usage.estimated_cost_usd`), the number each run's
|
|
30
|
+
// budget share is enforced against.
|
|
31
|
+
import { timestampMs } from "@bufbuild/protobuf/wkt";
|
|
32
|
+
import { formatElapsed, turnPhaseOf } from "@stigmer/client";
|
|
33
|
+
import { stringify } from "yaml";
|
|
34
|
+
import { renderTable } from "../../output/index.js";
|
|
35
|
+
const NO_SANDBOX_ROOM = "no_sandbox_room";
|
|
36
|
+
const COST_CAP = "cost_cap";
|
|
37
|
+
// A stamp's fraction of a second: three digits or more is millisecond-precise.
|
|
38
|
+
const FRACTION = /\.(\d+)/;
|
|
39
|
+
/** One run's row, from what the engine saw. */
|
|
40
|
+
export function outcomeOf(sighting) {
|
|
41
|
+
const base = {
|
|
42
|
+
index: sighting.index,
|
|
43
|
+
runId: sighting.runId,
|
|
44
|
+
sessionId: sighting.sessionId,
|
|
45
|
+
waitedForRoomMs: sighting.waitedMs ?? null,
|
|
46
|
+
};
|
|
47
|
+
if (sighting.refusal !== undefined) {
|
|
48
|
+
return { ...base, start: "refused", toStartMs: null, toStartUnclear: false, ending: "", stopCause: "", stopKind: "", costUsd: null, refusal: sighting.refusal };
|
|
49
|
+
}
|
|
50
|
+
const status = sighting.run?.status;
|
|
51
|
+
const stopCause = status?.stopCause ?? "";
|
|
52
|
+
const stopKind = status?.stopDetail?.kind ?? "";
|
|
53
|
+
const phase = turnPhaseOf(status?.phase ?? 0);
|
|
54
|
+
const ended = phase === "completed" || phase === "failed" || phase === "cancelled" || phase === "terminated";
|
|
55
|
+
const cost = status?.streamingUsage?.estimatedCostUsd;
|
|
56
|
+
const common = { ...base, stopCause, stopKind, costUsd: cost === undefined ? null : cost, refusal: null };
|
|
57
|
+
const startedAt = status?.startedAt ?? "";
|
|
58
|
+
if (startedAt !== "") {
|
|
59
|
+
const toStart = toStartOf(sighting.run, startedAt);
|
|
60
|
+
return {
|
|
61
|
+
...common,
|
|
62
|
+
start: "started",
|
|
63
|
+
toStartMs: toStart,
|
|
64
|
+
toStartUnclear: toStart === null,
|
|
65
|
+
ending: ended ? endingOf(phase, stopCause, stopKind) : "",
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
const notStarted = { ...common, toStartMs: null, toStartUnclear: false };
|
|
69
|
+
if (stopKind === NO_SANDBOX_ROOM)
|
|
70
|
+
return { ...notStarted, start: "wait ran out", ending: "" };
|
|
71
|
+
if (ended)
|
|
72
|
+
return { ...notStarted, start: "never started", ending: endingOf(phase, stopCause, stopKind) };
|
|
73
|
+
return { ...notStarted, start: "still waiting", ending: "" };
|
|
74
|
+
}
|
|
75
|
+
/** The report of a burst: every run's row, the counts, the figures and the spend. */
|
|
76
|
+
export function buildReport(frame, sightings, leftBehind) {
|
|
77
|
+
const runs = sightings.map(outcomeOf);
|
|
78
|
+
const count = (start) => runs.filter((run) => run.start === start).length;
|
|
79
|
+
const started = runs.filter((run) => run.start === "started");
|
|
80
|
+
const waits = runs.flatMap((run) => (run.waitedForRoomMs === null ? [] : [run.waitedForRoomMs]));
|
|
81
|
+
return {
|
|
82
|
+
...frame,
|
|
83
|
+
counts: {
|
|
84
|
+
started: started.length,
|
|
85
|
+
refused: count("refused"),
|
|
86
|
+
waitRanOut: count("wait ran out"),
|
|
87
|
+
neverStarted: count("never started"),
|
|
88
|
+
stillWaiting: count("still waiting"),
|
|
89
|
+
},
|
|
90
|
+
toStartMs: {
|
|
91
|
+
...figuresOf(started.flatMap((run) => (run.toStartMs === null ? [] : [run.toStartMs]))),
|
|
92
|
+
unclear: started.filter((run) => run.toStartUnclear).length,
|
|
93
|
+
},
|
|
94
|
+
waitedForRoomMs: { ...figuresOf(waits), runs: waits.length },
|
|
95
|
+
anyWaitReported: waits.length > 0,
|
|
96
|
+
refusals: groupRefusals(runs),
|
|
97
|
+
spentUsd: runs.reduce((sum, run) => sum + (run.costUsd ?? 0), 0),
|
|
98
|
+
runs,
|
|
99
|
+
leftBehind,
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
/** The report in the asked format: table and summary, or the JSON or YAML document. */
|
|
103
|
+
export function renderReport(report, format) {
|
|
104
|
+
if (format === "json")
|
|
105
|
+
return `${JSON.stringify(report, null, 2)}\n`;
|
|
106
|
+
if (format === "yaml")
|
|
107
|
+
return stringify(report);
|
|
108
|
+
return `${renderRuns(report.runs)}\n${summaryLines(report).join("\n")}\n`;
|
|
109
|
+
}
|
|
110
|
+
/** The burst's summary sentences, in the order the report prints them. */
|
|
111
|
+
export function summaryLines(report) {
|
|
112
|
+
const lines = [countsLine(report)];
|
|
113
|
+
const toStart = report.toStartMs;
|
|
114
|
+
if (toStart.median !== null) {
|
|
115
|
+
lines.push(`To start: ${figuresText(toStart)}.`);
|
|
116
|
+
}
|
|
117
|
+
if (toStart.unclear > 0) {
|
|
118
|
+
lines.push(`To start was unclear for ${plural(toStart.unclear, "run")}: a stamp was too coarse to time it.`);
|
|
119
|
+
}
|
|
120
|
+
if (report.anyWaitReported) {
|
|
121
|
+
const waited = report.waitedForRoomMs;
|
|
122
|
+
lines.push(`Waited for a sandbox, ${plural(waited.runs, "run")}: ${figuresText(waited)} (at least).`);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
lines.push("No run reported waiting for a sandbox during the burst.");
|
|
126
|
+
}
|
|
127
|
+
for (const refusal of report.refusals) {
|
|
128
|
+
lines.push(`Refused ${refusal.count}: ${refusal.code}, "${refusal.message}"`);
|
|
129
|
+
}
|
|
130
|
+
lines.push(`Spent about ${usd(report.spentUsd)}, by the runs' own estimates.`);
|
|
131
|
+
return lines;
|
|
132
|
+
}
|
|
133
|
+
/** A dollar amount: cents, or four places below a cent so a tiny spend is not "$0.00". */
|
|
134
|
+
export function usd(amount) {
|
|
135
|
+
return amount > 0 && amount < 0.01 ? `$${amount.toFixed(4)}` : `$${amount.toFixed(2)}`;
|
|
136
|
+
}
|
|
137
|
+
function renderRuns(runs) {
|
|
138
|
+
const rows = runs.map((run) => [
|
|
139
|
+
String(run.index),
|
|
140
|
+
run.start,
|
|
141
|
+
run.toStartUnclear ? "unclear" : duration(run.toStartMs),
|
|
142
|
+
run.waitedForRoomMs === null ? "-" : `≥ ${formatElapsed(run.waitedForRoomMs)}`,
|
|
143
|
+
run.ending === "" ? "-" : run.ending,
|
|
144
|
+
run.costUsd === null ? "-" : usd(run.costUsd),
|
|
145
|
+
]);
|
|
146
|
+
return renderTable(["#", "START", "TO START", "WAITED FOR A SANDBOX", "ENDING", "COST"], rows);
|
|
147
|
+
}
|
|
148
|
+
function countsLine(report) {
|
|
149
|
+
const { counts } = report;
|
|
150
|
+
const parts = [
|
|
151
|
+
`${counts.started} started`,
|
|
152
|
+
counts.refused > 0 ? `${counts.refused} refused` : "",
|
|
153
|
+
counts.waitRanOut > 0 ? `${counts.waitRanOut} wait ran out` : "",
|
|
154
|
+
counts.neverStarted > 0 ? `${counts.neverStarted} never started` : "",
|
|
155
|
+
counts.stillWaiting > 0 ? `${counts.stillWaiting} still waiting` : "",
|
|
156
|
+
].filter((part) => part !== "");
|
|
157
|
+
return `${plural(report.requested, "agent")}: ${parts.join(", ")}.`;
|
|
158
|
+
}
|
|
159
|
+
function figuresText(figures) {
|
|
160
|
+
return `median ${duration(figures.median)}, 90th percentile ${duration(figures.p90)}, longest ${duration(figures.longest)}`;
|
|
161
|
+
}
|
|
162
|
+
function duration(ms) {
|
|
163
|
+
return ms === null ? "-" : formatElapsed(ms);
|
|
164
|
+
}
|
|
165
|
+
function plural(count, noun) {
|
|
166
|
+
return `${count} ${noun}${count === 1 ? "" : "s"}`;
|
|
167
|
+
}
|
|
168
|
+
// How an ended run ended, in the report's words: a completion, its budget,
|
|
169
|
+
// or the stop's cause and kind as the run names them.
|
|
170
|
+
function endingOf(phase, stopCause, stopKind) {
|
|
171
|
+
if (stopKind === COST_CAP)
|
|
172
|
+
return "stopped at its budget";
|
|
173
|
+
if (stopCause === "" && phase === "completed")
|
|
174
|
+
return "completed";
|
|
175
|
+
const cause = stopCause === "" ? (phase ?? "ended") : stopCause;
|
|
176
|
+
return stopKind === "" ? cause : `${cause} (${stopKind})`;
|
|
177
|
+
}
|
|
178
|
+
// `started_at` minus the create's stamp, when `started_at` is
|
|
179
|
+
// millisecond-precise and the pair is in order; null otherwise.
|
|
180
|
+
function toStartOf(run, startedAt) {
|
|
181
|
+
const created = run?.status?.audit?.specAudit?.createdAt;
|
|
182
|
+
const fraction = FRACTION.exec(startedAt);
|
|
183
|
+
if (created === undefined || fraction === null || fraction[1].length < 3)
|
|
184
|
+
return null;
|
|
185
|
+
const started = Date.parse(startedAt);
|
|
186
|
+
const ms = started - timestampMs(created);
|
|
187
|
+
return Number.isNaN(started) || ms < 0 ? null : ms;
|
|
188
|
+
}
|
|
189
|
+
function figuresOf(values) {
|
|
190
|
+
if (values.length === 0)
|
|
191
|
+
return { median: null, p90: null, longest: null };
|
|
192
|
+
const sorted = [...values].sort((a, b) => a - b);
|
|
193
|
+
const rank = (p) => sorted[Math.max(0, Math.ceil(p * sorted.length) - 1)];
|
|
194
|
+
return { median: rank(0.5), p90: rank(0.9), longest: sorted[sorted.length - 1] };
|
|
195
|
+
}
|
|
196
|
+
function groupRefusals(runs) {
|
|
197
|
+
const groups = new Map();
|
|
198
|
+
for (const run of runs) {
|
|
199
|
+
if (run.refusal === null)
|
|
200
|
+
continue;
|
|
201
|
+
const key = `${run.refusal.code}\u0000${run.refusal.message}`;
|
|
202
|
+
const group = groups.get(key);
|
|
203
|
+
if (group === undefined)
|
|
204
|
+
groups.set(key, { ...run.refusal, count: 1 });
|
|
205
|
+
else
|
|
206
|
+
group.count += 1;
|
|
207
|
+
}
|
|
208
|
+
return [...groups.values()];
|
|
209
|
+
}
|
|
210
|
+
//# sourceMappingURL=report.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/commands/load-test/report.ts"],"names":[],"mappings":"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"}
|
package/commands/mcp-server.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Command } from "commander";
|
|
2
2
|
import { type Config } from "../config/config.js";
|
|
3
|
-
/** The
|
|
3
|
+
/** The signed-in backend the server's credential comes from. */
|
|
4
4
|
export interface CloudSignIn {
|
|
5
5
|
readonly name: string;
|
|
6
6
|
/** The address the server dials, the entry's own or Stigmer Cloud's. */
|
|
@@ -20,8 +20,8 @@ export declare function registerMcpServer(program: Command): void;
|
|
|
20
20
|
* Bridge the active backend into the server's environment, but only where
|
|
21
21
|
* unset, so a pre-existing environment variable (or a flag bridged before this)
|
|
22
22
|
* wins. The local daemon is reached without auth; a named backend contributes
|
|
23
|
-
* its endpoint, and a self-hosted entry its API key. A
|
|
24
|
-
* returned instead of bridged, for the caller to hand the server as a token
|
|
23
|
+
* its endpoint, and a self-hosted entry with no sign-in its API key. A sign-in
|
|
24
|
+
* (any cloud entry, or a selfhost one signed in to) is returned instead of bridged, for the caller to hand the server as a token
|
|
25
25
|
* provider. The credential goes only to its own backend: when the environment
|
|
26
26
|
* already names another address (a runner spawning this command for its
|
|
27
27
|
* server), none applies, and none does when a key was already given.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/commands/mcp-server.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,MAAM,
|
|
1
|
+
{"version":3,"file":"mcp-server.d.ts","sourceRoot":"","sources":["../src/commands/mcp-server.ts"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,MAAM,EAA4B,MAAM,qBAAqB,CAAC;AAG5E,gEAAgE;AAChE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,+DAA+D;AAC/D,MAAM,WAAW,cAAc;IAC7B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAeD,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAYxD;AA6BD;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,WAAW,GAAG,SAAS,CAiB9F;AAED,sFAAsF;AACtF,wBAAgB,aAAa,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAOjF"}
|
package/commands/mcp-server.js
CHANGED
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
// backend instead (auth/token.ts, createBackendTokenSource), which refreshes the
|
|
23
23
|
// sign-in and saves it as every other command does. A given key (flag or
|
|
24
24
|
// environment) still wins and is never refreshed.
|
|
25
|
-
import { activeBackend } from "../config/config.js";
|
|
25
|
+
import { activeBackend, hasSignIn } from "../config/config.js";
|
|
26
26
|
import { DEFAULT_CLOUD_ENDPOINT } from "../config/resolve.js";
|
|
27
27
|
const HELP_AFTER = `
|
|
28
28
|
Environment variables:
|
|
@@ -77,8 +77,8 @@ async function runMcpServer(flags) {
|
|
|
77
77
|
* Bridge the active backend into the server's environment, but only where
|
|
78
78
|
* unset, so a pre-existing environment variable (or a flag bridged before this)
|
|
79
79
|
* wins. The local daemon is reached without auth; a named backend contributes
|
|
80
|
-
* its endpoint, and a self-hosted entry its API key. A
|
|
81
|
-
* returned instead of bridged, for the caller to hand the server as a token
|
|
80
|
+
* its endpoint, and a self-hosted entry with no sign-in its API key. A sign-in
|
|
81
|
+
* (any cloud entry, or a selfhost one signed in to) is returned instead of bridged, for the caller to hand the server as a token
|
|
82
82
|
* provider. The credential goes only to its own backend: when the environment
|
|
83
83
|
* already names another address (a runner spawning this command for its
|
|
84
84
|
* server), none applies, and none does when a key was already given.
|
|
@@ -100,7 +100,7 @@ export function applyConfigEnv(config, env) {
|
|
|
100
100
|
setIfEmpty(env, "STIGMER_SERVER_ADDRESS", endpoint);
|
|
101
101
|
if (env.STIGMER_SERVER_ADDRESS !== endpoint || isSet(env.STIGMER_API_KEY))
|
|
102
102
|
return undefined;
|
|
103
|
-
if (entry.type === "cloud")
|
|
103
|
+
if (entry.type === "cloud" || hasSignIn(entry))
|
|
104
104
|
return { name, endpoint };
|
|
105
105
|
setIfEmpty(env, "STIGMER_API_KEY", entry.api_key);
|
|
106
106
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../src/commands/mcp-server.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,EAAE;AACF,kFAAkF;AAClF,gFAAgF;AAChF,6FAA6F;AAC7F,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,0EAA0E;AAC1E,kBAAkB;AAClB,EAAE;AACF,4DAA4D;AAC5D,4EAA4E;AAC5E,kFAAkF;AAClF,2DAA2D;AAC3D,EAAE;AACF,8EAA8E;AAC9E,gFAAgF;AAChF,iFAAiF;AACjF,iFAAiF;AACjF,yEAAyE;AACzE,kDAAkD;AAGlD,OAAO,EAAe,aAAa,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"mcp-server.js","sourceRoot":"","sources":["../src/commands/mcp-server.ts"],"names":[],"mappings":"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"}
|
package/commands/setup.d.ts
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
1
|
import type { Command } from "commander";
|
|
2
|
+
import { type OutputFlags } from "../output/index.js";
|
|
3
|
+
export interface SetupFlags extends OutputFlags {
|
|
4
|
+
provider?: string;
|
|
5
|
+
apiKey?: string;
|
|
6
|
+
apiKeyStdin?: boolean;
|
|
7
|
+
operatorEmail?: string;
|
|
8
|
+
operatorName?: string;
|
|
9
|
+
}
|
|
2
10
|
export declare function registerSetup(program: Command): void;
|
|
11
|
+
/**
|
|
12
|
+
* The flags with `--api-key-stdin` read into `apiKey`: refused beside
|
|
13
|
+
* `--api-key`, on a terminal, and when stdin is empty; the provider is
|
|
14
|
+
* Anthropic unless the flags said it.
|
|
15
|
+
*/
|
|
16
|
+
export declare function withStdinKey(flags: SetupFlags, io?: {
|
|
17
|
+
readonly stdinIsTty: boolean;
|
|
18
|
+
readonly readStdin: () => Promise<string>;
|
|
19
|
+
}): Promise<SetupFlags>;
|
|
3
20
|
//# sourceMappingURL=setup.d.ts.map
|
package/commands/setup.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/commands/setup.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../src/commands/setup.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAE,KAAK,WAAW,EAA+B,MAAM,oBAAoB,CAAC;AAGnF,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWpD;AAmED;;;;GAIG;AACH,wBAAsB,YAAY,CAChC,KAAK,EAAE,UAAU,EACjB,EAAE,GAAE;IAAE,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;CAO5E,GACA,OAAO,CAAC,UAAU,CAAC,CAerB"}
|
package/commands/setup.js
CHANGED
|
@@ -11,6 +11,17 @@
|
|
|
11
11
|
// (Anthropic + skip: the key setup saves; the runner reaches other providers
|
|
12
12
|
// by keys exported in the shell, local/provider-reach.ts).
|
|
13
13
|
//
|
|
14
|
+
// `--api-key-stdin` reads the key from stdin instead of the command line,
|
|
15
|
+
// where a shell's history and a coding agent's transcript would keep it
|
|
16
|
+
// (`printenv ANTHROPIC_API_KEY | stigmer setup --provider anthropic
|
|
17
|
+
// --api-key-stdin`); it implies `--provider anthropic` and refuses a terminal,
|
|
18
|
+
// where the interactive `stigmer setup` asks at a hidden prompt instead.
|
|
19
|
+
//
|
|
20
|
+
// A key given to setup is checked with Anthropic before it is saved, on both
|
|
21
|
+
// paths (local/model-key-step.ts): the flag path refuses a key Anthropic
|
|
22
|
+
// rejects with exit code 1 and saves nothing, and saves a key Anthropic did not
|
|
23
|
+
// answer for with a line saying so; the interactive path asks again.
|
|
24
|
+
//
|
|
14
25
|
// Setup deliberately has NO model concept: the platform model registry owns
|
|
15
26
|
// the execution default, and per-run overrides belong to `stigmer run
|
|
16
27
|
// --model`. A setup-level pin would look authoritative and reach no
|
|
@@ -24,12 +35,14 @@ export function registerSetup(program) {
|
|
|
24
35
|
.description("configure the LLM provider and operator identity for local execution")
|
|
25
36
|
.option("--provider <name>", "provider: anthropic, or skip to clear (non-interactive)")
|
|
26
37
|
.option("--api-key <key>", "Anthropic API key")
|
|
38
|
+
.option("--api-key-stdin", "read the Anthropic API key from stdin (keeps it out of history and transcripts)")
|
|
27
39
|
.option("--operator-email <email>", "operator identity for local caller attribution (non-interactive)")
|
|
28
40
|
.option("--operator-name <name>", "operator display name (requires --operator-email)")
|
|
29
41
|
.action((options) => runSetup(options));
|
|
30
42
|
addResultFlags(setup);
|
|
31
43
|
}
|
|
32
|
-
async function runSetup(
|
|
44
|
+
async function runSetup(flags) {
|
|
45
|
+
const options = await withStdinKey(flags);
|
|
33
46
|
const { load, save } = await import("../config/config.js");
|
|
34
47
|
const { PROVIDER_CHOICES, applyChoice, applyOperatorIdentity, runInteractiveWizard } = await import("../local/setup/wizard.js");
|
|
35
48
|
const { isRunning } = await import("../local/daemon/launch.js");
|
|
@@ -40,6 +53,7 @@ async function runSetup(options) {
|
|
|
40
53
|
options.operatorEmail !== undefined ||
|
|
41
54
|
options.operatorName !== undefined;
|
|
42
55
|
let updated;
|
|
56
|
+
let unchecked = false;
|
|
43
57
|
if (nonInteractive) {
|
|
44
58
|
updated = config;
|
|
45
59
|
if (options.provider !== undefined) {
|
|
@@ -49,6 +63,9 @@ async function runSetup(options) {
|
|
|
49
63
|
`Valid providers: ${PROVIDER_CHOICES.join(", ")}`,
|
|
50
64
|
]);
|
|
51
65
|
}
|
|
66
|
+
if (provider === "anthropic" && (options.apiKey ?? "").trim() !== "") {
|
|
67
|
+
unchecked = await refuseRejectedKey(options.apiKey.trim());
|
|
68
|
+
}
|
|
52
69
|
updated = applyChoice(updated, provider, {
|
|
53
70
|
apiKey: options.apiKey,
|
|
54
71
|
});
|
|
@@ -68,9 +85,62 @@ async function runSetup(options) {
|
|
|
68
85
|
}
|
|
69
86
|
save(updated);
|
|
70
87
|
const result = CommandResult.success("Configuration saved");
|
|
88
|
+
if (unchecked) {
|
|
89
|
+
const { KEY_UNCHECKED } = await import("../local/model-key-step.js");
|
|
90
|
+
result.hint(KEY_UNCHECKED);
|
|
91
|
+
}
|
|
71
92
|
if (await isRunning(homedir())) {
|
|
72
93
|
result.hint("Restart to apply: stigmer down && stigmer up");
|
|
73
94
|
}
|
|
74
95
|
renderResult(result, resultFormat(options));
|
|
75
96
|
}
|
|
97
|
+
/**
|
|
98
|
+
* The flags with `--api-key-stdin` read into `apiKey`: refused beside
|
|
99
|
+
* `--api-key`, on a terminal, and when stdin is empty; the provider is
|
|
100
|
+
* Anthropic unless the flags said it.
|
|
101
|
+
*/
|
|
102
|
+
export async function withStdinKey(flags, io = {
|
|
103
|
+
stdinIsTty: process.stdin.isTTY === true,
|
|
104
|
+
readStdin: async () => {
|
|
105
|
+
const chunks = [];
|
|
106
|
+
for await (const chunk of process.stdin)
|
|
107
|
+
chunks.push(chunk);
|
|
108
|
+
return Buffer.concat(chunks).toString("utf8");
|
|
109
|
+
},
|
|
110
|
+
}) {
|
|
111
|
+
if (flags.apiKeyStdin !== true)
|
|
112
|
+
return flags;
|
|
113
|
+
const { UsageError } = await import("../errors/usage-error.js");
|
|
114
|
+
if (flags.apiKey !== undefined) {
|
|
115
|
+
throw new UsageError("--api-key and --api-key-stdin both give the key\n\nUse one.");
|
|
116
|
+
}
|
|
117
|
+
if (io.stdinIsTty) {
|
|
118
|
+
throw new UsageError("--api-key-stdin reads a key piped in, and stdin is a terminal\n\n" +
|
|
119
|
+
"Pipe it: printenv ANTHROPIC_API_KEY | stigmer setup --api-key-stdin\nor type it at a hidden prompt: stigmer setup");
|
|
120
|
+
}
|
|
121
|
+
const key = (await io.readStdin()).trim();
|
|
122
|
+
if (key === "")
|
|
123
|
+
throw new UsageError("--api-key-stdin read nothing from stdin");
|
|
124
|
+
return { ...flags, provider: flags.provider ?? "anthropic", apiKey: key };
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* Check a key given by flag with Anthropic, where the runner would send it:
|
|
128
|
+
* a refused key ends the command with exit code 1 before anything is saved.
|
|
129
|
+
* Returns whether Anthropic did not answer (the key is saved, and the card
|
|
130
|
+
* says so).
|
|
131
|
+
*/
|
|
132
|
+
async function refuseRejectedKey(key) {
|
|
133
|
+
const { ANTHROPIC_KEYS_URL, anthropicKeyTarget, KEY_REJECTED } = await import("../local/model-key-step.js");
|
|
134
|
+
const { checkAnthropicKey } = await import("../local/key-check.js");
|
|
135
|
+
const { CliExitError } = await import("../errors/cli-exit-error.js");
|
|
136
|
+
const { ExitCode } = await import("@stigmer/client/exit-codes");
|
|
137
|
+
const target = anthropicKeyTarget({ ...process.env, ANTHROPIC_API_KEY: key });
|
|
138
|
+
if (target === null)
|
|
139
|
+
return false;
|
|
140
|
+
const check = await checkAnthropicKey(key, target.baseUrl);
|
|
141
|
+
if (check === "rejected") {
|
|
142
|
+
throw new CliExitError(`${KEY_REJECTED}.`, ExitCode.General, [`Nothing was saved. Get a key at ${ANTHROPIC_KEYS_URL}`]);
|
|
143
|
+
}
|
|
144
|
+
return check === "unchecked";
|
|
145
|
+
}
|
|
76
146
|
//# sourceMappingURL=setup.js.map
|
package/commands/setup.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/commands/setup.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,wDAAwD;AACxD,EAAE;AACF,+EAA+E;AAC/E,6EAA6E;AAC7E,2EAA2E;AAC3E,2EAA2E;AAC3E,+DAA+D;AAC/D,4EAA4E;AAC5E,yEAAyE;AACzE,6EAA6E;AAC7E,2DAA2D;AAC3D,EAAE;AACF,4EAA4E;AAC5E,sEAAsE;AACtE,oEAAoE;AACpE,0CAA0C;AAG1C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAoB,aAAa,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../src/commands/setup.ts"],"names":[],"mappings":"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"}
|
package/commands/up.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"up.d.ts","sourceRoot":"","sources":["../src/commands/up.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"up.d.ts","sourceRoot":"","sources":["../src/commands/up.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgCzC,wBAAgB,UAAU,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAwBjD"}
|
package/commands/up.js
CHANGED
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
// started runner reaches, the same answer the server was handed (stigmer#1084).
|
|
14
14
|
// A stack that does not start ends with why, in either shape: the failed
|
|
15
15
|
// component, how it ended and its last stderr lines (stigmer#1845).
|
|
16
|
+
//
|
|
17
|
+
// The agents line also says what Anthropic made of the runner's key
|
|
18
|
+
// (stigmer#3036): the key is checked before the card calls it ready, and on a
|
|
19
|
+
// terminal a missing or refused key is asked for before the daemon starts, so
|
|
20
|
+
// the key entered reaches the runner in this start (local/model-key-step.ts).
|
|
21
|
+
// Off a terminal nothing is asked, and the check runs beside the start.
|
|
16
22
|
import { homedir } from "node:os";
|
|
17
23
|
import { CliExitError } from "../errors/cli-exit-error.js";
|
|
18
24
|
import { ExitCode } from "@stigmer/client/exit-codes";
|
|
@@ -46,18 +52,32 @@ export function registerUp(program) {
|
|
|
46
52
|
addResultFlags(server);
|
|
47
53
|
}
|
|
48
54
|
async function runUp(run, flags) {
|
|
49
|
-
process.stderr.write("Starting Stigmer local stack… (first run may take a moment)\n");
|
|
50
55
|
const launch = await import("../local/daemon/launch.js");
|
|
56
|
+
const interactive = process.stdin.isTTY === true && process.stderr.isTTY === true && resultFormat(flags) === "human";
|
|
57
|
+
let keyStep = Promise.resolve(undefined);
|
|
58
|
+
if (!run.serverOnly) {
|
|
59
|
+
if (interactive) {
|
|
60
|
+
// Never ask for a key and then refuse to start.
|
|
61
|
+
const { dataDir } = await import("../local/paths.js");
|
|
62
|
+
launch.refuseRunningStack(dataDir(homedir()));
|
|
63
|
+
keyStep = Promise.resolve(await runKeyStep(true));
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
// A fault here (an unreadable config) is the launch's to report.
|
|
67
|
+
keyStep = runKeyStep(false).catch(() => undefined);
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
process.stderr.write("Starting Stigmer local stack… (first run may take a moment)\n");
|
|
51
71
|
if (!run.foreground) {
|
|
52
72
|
const report = await launch.up(run);
|
|
53
|
-
await renderUpCard(run, flags, report);
|
|
73
|
+
await renderUpCard(run, flags, report, await keyStep);
|
|
54
74
|
return;
|
|
55
75
|
}
|
|
56
76
|
// The card renders when the stack is serving — the moment the
|
|
57
77
|
// detached shape would have returned — and the process then stays up,
|
|
58
78
|
// mirroring the server's and runner's output, until a shutdown signal.
|
|
59
79
|
const code = await launch.upForeground(run, homedir(), {
|
|
60
|
-
onReady: (report) => renderUpCard(run, flags, report),
|
|
80
|
+
onReady: async (report) => renderUpCard(run, flags, report, await keyStep),
|
|
61
81
|
});
|
|
62
82
|
if (code !== 0) {
|
|
63
83
|
// The daemon body ran as this process, so its record carries our PID; the
|
|
@@ -69,7 +89,25 @@ async function runUp(run, flags) {
|
|
|
69
89
|
]));
|
|
70
90
|
}
|
|
71
91
|
}
|
|
72
|
-
|
|
92
|
+
/** The model key step over the real terminal, config file and Anthropic. */
|
|
93
|
+
async function runKeyStep(interactive) {
|
|
94
|
+
const [{ modelKeyStep }, { checkAnthropicKey }, { load, save }, { promptSecret }] = await Promise.all([
|
|
95
|
+
import("../local/model-key-step.js"),
|
|
96
|
+
import("../local/key-check.js"),
|
|
97
|
+
import("../config/config.js"),
|
|
98
|
+
import("../local/setup/prompt.js"),
|
|
99
|
+
]);
|
|
100
|
+
return modelKeyStep({
|
|
101
|
+
env: process.env,
|
|
102
|
+
interactive,
|
|
103
|
+
loadConfig: () => load(),
|
|
104
|
+
saveConfig: (config) => save(config),
|
|
105
|
+
promptSecret,
|
|
106
|
+
write: (text) => process.stderr.write(text),
|
|
107
|
+
check: (key, baseUrl) => checkAnthropicKey(key, baseUrl),
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
async function renderUpCard(run, flags, report, key) {
|
|
73
111
|
const result = CommandResult.success(run.serverOnly ? "Stigmer control plane is up" : "Stigmer local stack is up");
|
|
74
112
|
const section = result.addSection("Endpoints");
|
|
75
113
|
section.field("server", `http://localhost:${SERVER_PORT}`);
|
|
@@ -79,7 +117,7 @@ async function renderUpCard(run, flags, report) {
|
|
|
79
117
|
// server without a bundled export must not advertise a dead URL.
|
|
80
118
|
section.field("console", `http://localhost:${SERVER_PORT}`);
|
|
81
119
|
}
|
|
82
|
-
addAgentsSection(result, report);
|
|
120
|
+
addAgentsSection(result, report, key);
|
|
83
121
|
result.hint("Check status with: stigmer status");
|
|
84
122
|
result.hint(run.foreground ? "Stop it with: Ctrl-C (or stigmer down from another shell)" : "Stop it with: stigmer down");
|
|
85
123
|
renderResult(result, resultFormat(flags));
|
|
@@ -95,20 +133,40 @@ async function consoleServed() {
|
|
|
95
133
|
const { isWebConsoleAvailable } = await import("../local/webconsole/index.js");
|
|
96
134
|
return isWebConsoleAvailable();
|
|
97
135
|
}
|
|
98
|
-
/**
|
|
99
|
-
|
|
136
|
+
/**
|
|
137
|
+
* Whether agents can run on this stack, through which providers, and what
|
|
138
|
+
* Anthropic said of the runner's key: checked, not answered, or refused (a
|
|
139
|
+
* refused key is not ready, whatever the runner reaches).
|
|
140
|
+
*/
|
|
141
|
+
function addAgentsSection(result, report, key) {
|
|
100
142
|
const section = result.addSection("Agents");
|
|
101
143
|
if (report.runnerReach === undefined) {
|
|
102
144
|
section.field("not ready", "no local runner (control plane only)");
|
|
103
145
|
return;
|
|
104
146
|
}
|
|
147
|
+
const rejected = key?.check === "rejected";
|
|
148
|
+
const ready = report.runnerReach.filter((entry) => !(rejected && entry.provider === "anthropic"));
|
|
149
|
+
if (ready.length > 0)
|
|
150
|
+
section.field("ready", ready.map((entry) => describeEntry(entry, key)).join(", "));
|
|
151
|
+
if (rejected) {
|
|
152
|
+
section.field("not ready", "anthropic key rejected");
|
|
153
|
+
result.hint(key.fromEnvironment
|
|
154
|
+
? "Export a working ANTHROPIC_API_KEY, or unset it and run stigmer setup, then stigmer down && stigmer up"
|
|
155
|
+
: "Add a working key: stigmer setup, then stigmer down && stigmer up");
|
|
156
|
+
return;
|
|
157
|
+
}
|
|
105
158
|
if (report.runnerReach.length === 0) {
|
|
106
159
|
section.field("not ready", "no model provider");
|
|
107
160
|
// The daemon hands its runner the key only at start, so a key saved
|
|
108
161
|
// while the stack runs needs a restart to reach it.
|
|
109
162
|
result.hint("Add a model provider: stigmer setup, then stigmer down && stigmer up");
|
|
110
|
-
return;
|
|
111
163
|
}
|
|
112
|
-
|
|
164
|
+
}
|
|
165
|
+
/** One provider for the card: `anthropic (key checked just now)`, `openai (key)`, `anthropic (vertex)`. */
|
|
166
|
+
function describeEntry(entry, key) {
|
|
167
|
+
if (entry.provider !== "anthropic" || key === undefined)
|
|
168
|
+
return describeReach([entry]);
|
|
169
|
+
const said = key.check === "accepted" ? "key checked just now" : "key not checked: Anthropic didn't answer";
|
|
170
|
+
return entry.via === "gateway" ? `anthropic (gateway, ${said})` : `anthropic (${said})`;
|
|
113
171
|
}
|
|
114
172
|
//# sourceMappingURL=up.js.map
|
package/commands/up.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"up.js","sourceRoot":"","sources":["../src/commands/up.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,2EAA2E;AAC3E,6EAA6E;AAC7E,0BAA0B;AAC1B,EAAE;AACF,+EAA+E;AAC/E,6EAA6E;AAC7E,uBAAuB;AACvB,EAAE;AACF,yEAAyE;AACzE,6EAA6E;AAC7E,6EAA6E;AAC7E,gFAAgF;AAChF,yEAAyE;AACzE,oEAAoE;
|
|
1
|
+
{"version":3,"file":"up.js","sourceRoot":"","sources":["../src/commands/up.ts"],"names":[],"mappings":"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"}
|