@solidactions/cli 3.13.0 → 3.15.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 +70 -2
- package/dist/command-manifest.json +3 -3
- package/dist/commands/deploy.js +52 -2
- package/dist/commands/login.js +111 -48
- package/dist/commands/project-list.js +5 -2
- package/dist/commands/project-view.js +35 -4
- package/dist/commands/run-list.js +3 -15
- package/dist/commands/run-view.js +10 -6
- package/dist/commands/workspaces.js +1 -1
- package/dist/index.js +11 -2
- package/dist/utils/api.js +180 -12
- package/dist/utils/config.js +14 -6
- package/dist/utils/mutating-commands.js +215 -0
- package/dist/utils/source-provenance.js +13 -0
- package/dist/utils/workspace-guard.js +115 -0
- package/dist/utils/workspace-lookup.js +137 -25
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -35,7 +35,8 @@ solidactions run start my-project hello -e production -i '{"name":"Ada"}' --wait
|
|
|
35
35
|
|
|
36
36
|
The generated `hello` workflow requires no third-party credentials. A successful
|
|
37
37
|
run completes with a greeting of `Hello, Ada!`; use the run ID printed by the
|
|
38
|
-
command with `solidactions run view <run-id>`
|
|
38
|
+
command with `solidactions run view <run-id>` (accepts the numeric run id or
|
|
39
|
+
the run UUID) or open the run in the app.
|
|
39
40
|
|
|
40
41
|
For non-interactive automation, explicitly read the key from stdin instead of
|
|
41
42
|
placing it in argv:
|
|
@@ -151,6 +152,71 @@ For each field (`host`, `apiKey`, `workspaceId`), the CLI resolves independently
|
|
|
151
152
|
|
|
152
153
|
You can mix: e.g., set only `SOLIDACTIONS_WORKSPACE_ID` in the environment while letting `host` and `apiKey` come from a file.
|
|
153
154
|
|
|
155
|
+
### Workspace safety
|
|
156
|
+
|
|
157
|
+
Resolution order layers 2 and 3 mean the active workspace can come from *where you are
|
|
158
|
+
standing*: a `./.solidactions/config.json` in the current folder or any ancestor. That's
|
|
159
|
+
convenient in a single project, but running a command from the wrong directory can silently
|
|
160
|
+
target a different workspace than the one you last used.
|
|
161
|
+
|
|
162
|
+
The CLI remembers the workspace it last **wrote** to in `~/.solidactions/state.json` (a
|
|
163
|
+
cosmetic/advisory file — deleting it just means the next command has nothing to compare
|
|
164
|
+
against). Read-only commands never update it — a read must never consume the change that
|
|
165
|
+
gates a write, so the warning below keeps firing until you actually write. When a
|
|
166
|
+
CWD-inferred workspace differs from that last-written-to one, the CLI warns:
|
|
167
|
+
|
|
168
|
+
```
|
|
169
|
+
warn: workspace changed to <name> — organization <org> (<workspaceId>) — inferred from <path>; last used was <last-used-name-or-id>. Pin it with -w <workspaceId>.
|
|
170
|
+
```
|
|
171
|
+
|
|
172
|
+
On a fresh install (or a fresh CI container) there's no `state.json` yet, so a CWD-inferred
|
|
173
|
+
write has nothing to compare against. A **write** in that case still warns — once, on that
|
|
174
|
+
first write — even though nothing has "changed":
|
|
175
|
+
|
|
176
|
+
```
|
|
177
|
+
warn: about to write to <name> — organization <org> (<workspaceId>) — inferred from <path>; no previously recorded workspace to compare against. Pin it with -w <workspaceId>.
|
|
178
|
+
```
|
|
179
|
+
|
|
180
|
+
This warns and proceeds; it never confirms or refuses. That first write records `state.json`,
|
|
181
|
+
so this line cannot fire again — from then on there is a baseline, and a later CWD-inferred
|
|
182
|
+
write against a *different* workspace gets the `workspace changed to …` treatment above.
|
|
183
|
+
|
|
184
|
+
For commands that **write** to the server, it also asks for confirmation before proceeding:
|
|
185
|
+
|
|
186
|
+
```
|
|
187
|
+
This command WRITES to <name> — organization <org> (<workspaceId>). Proceed?
|
|
188
|
+
```
|
|
189
|
+
|
|
190
|
+
Consent to a workspace is exactly two things: stating it explicitly with
|
|
191
|
+
`-w <id-or-slug-or-name>` or `SOLIDACTIONS_WORKSPACE_ID` (either of which skips the prompt
|
|
192
|
+
entirely), or answering the prompt. A command's **own** `--yes` is not workspace consent — it
|
|
193
|
+
acknowledges that command's own destructive act (`database push` requires `-y`, `database
|
|
194
|
+
pull --yes` means "overwrite the local file") and says nothing about which workspace you meant. A
|
|
195
|
+
non-interactive shell is refused rather than guessed:
|
|
196
|
+
|
|
197
|
+
```
|
|
198
|
+
re-run with -w <workspaceId> to confirm the target workspace
|
|
199
|
+
```
|
|
200
|
+
|
|
201
|
+
**Breaking change for existing non-interactive automation.** A script, cron job, or CI step
|
|
202
|
+
that writes from a directory whose `.solidactions/config.json` supplies the workspace, without
|
|
203
|
+
passing `-w` or setting `SOLIDACTIONS_WORKSPACE_ID`, now **exits 1** as soon as
|
|
204
|
+
`~/.solidactions/state.json` records a different workspace as the last one written to. On a
|
|
205
|
+
persistent runner that is not only the first run: any run after the box has written to some
|
|
206
|
+
other workspace — a second project's job, a manual command in another folder — will refuse,
|
|
207
|
+
because the guard compares against whatever was written last, not against a per-directory
|
|
208
|
+
memory. Passing `-w <id>` (or exporting `SOLIDACTIONS_WORKSPACE_ID`) restores the previous
|
|
209
|
+
behaviour and is the recommended fix for every non-interactive caller; it is also what the
|
|
210
|
+
refusal message tells you to do. Deleting `state.json` silences one run, not the next.
|
|
211
|
+
|
|
212
|
+
Read-only commands are never prompted — at most they print the `warn:` line above. Every
|
|
213
|
+
mutating command prints its resolved workspace, organization-qualified, as its first output
|
|
214
|
+
line:
|
|
215
|
+
|
|
216
|
+
```
|
|
217
|
+
Workspace: <name> — organization <org> (<workspaceId>)
|
|
218
|
+
```
|
|
219
|
+
|
|
154
220
|
### `solidactions login` flags
|
|
155
221
|
|
|
156
222
|
- With no positional argument, `login` securely prompts for the API key using
|
|
@@ -288,7 +354,7 @@ its project or schedule.
|
|
|
288
354
|
|---------|-----------|-------------|
|
|
289
355
|
| `run start <project> <workflow>` | `-e`, `-i`, `--wait` | Trigger a workflow run |
|
|
290
356
|
| `run list [project]` | `--json`, `--detailed`, `--status`, `--since`, `--workflow`, `--limit`, `--offset` | List and filter runs |
|
|
291
|
-
| `run view <run-id>` | `--json`, `--timeline`, `--steps`, `--logs` | Inspect a run, incl. the deployed revision (`Revision (latest session): ...`, or `deployed_revision` under `--json`) |
|
|
357
|
+
| `run view <run-id>` | `--json`, `--timeline`, `--steps`, `--logs` | Inspect a run (accepts the numeric run id or the run UUID), incl. the deployed revision (`Revision (latest session): ...`, or `deployed_revision` under `--json`) |
|
|
292
358
|
|
|
293
359
|
### env
|
|
294
360
|
|
|
@@ -392,6 +458,8 @@ You do **not** need `--overwrite` to keep an edited file whose doc was deleted o
|
|
|
392
458
|
| `workspace list` | List all workspaces |
|
|
393
459
|
| `workspace set <id>` | Set active workspace (by ID, slug, or name) |
|
|
394
460
|
|
|
461
|
+
**A name that's ambiguous is refused, not guessed.** If the name is shared across two organizations, or is also the name of an organization that owns other workspaces, `workspace set` refuses (exit 1) and lists the candidates — re-run with the workspace's slug or ID instead. Slugs are unique only within an organization, so when the candidates don't have distinct slugs of their own — including when the ambiguous input *was* a slug shared by two organizations — the refusal asks for the ID specifically, which is the only handle that can separate them.
|
|
462
|
+
|
|
395
463
|
### ai
|
|
396
464
|
|
|
397
465
|
| Command | Key Flags | Description |
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schema_version": 1,
|
|
3
3
|
"cli_name": "solidactions",
|
|
4
|
-
"cli_version": "3.
|
|
4
|
+
"cli_version": "3.15.0",
|
|
5
5
|
"global_options": [
|
|
6
6
|
{
|
|
7
7
|
"flags": "-V, --version",
|
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
"flags": "-w, --workspace-override <id-or-slug-or-name>",
|
|
20
20
|
"long": "--workspace-override",
|
|
21
21
|
"short": "-w",
|
|
22
|
-
"description": "Override active workspace for this command (short form: -w)",
|
|
22
|
+
"description": "Override active workspace for this command (short form: -w; also skips the CWD-inference prompt)",
|
|
23
23
|
"required": false,
|
|
24
24
|
"value_required": true,
|
|
25
25
|
"value_optional": false,
|
|
@@ -1978,7 +1978,7 @@
|
|
|
1978
1978
|
"name": "run-id",
|
|
1979
1979
|
"required": true,
|
|
1980
1980
|
"variadic": false,
|
|
1981
|
-
"description": "Run ID"
|
|
1981
|
+
"description": "Run ID (numeric id or run UUID)"
|
|
1982
1982
|
}
|
|
1983
1983
|
],
|
|
1984
1984
|
"options": [
|
package/dist/commands/deploy.js
CHANGED
|
@@ -11,6 +11,7 @@ exports.isConfirmationMatch = isConfirmationMatch;
|
|
|
11
11
|
exports.confirmDeploymentWithRetry = confirmDeploymentWithRetry;
|
|
12
12
|
exports.formatDeploymentConfirmation = formatDeploymentConfirmation;
|
|
13
13
|
exports.safeCollectSourceMetadata = safeCollectSourceMetadata;
|
|
14
|
+
exports.formatSyncYamlWarnings = formatSyncYamlWarnings;
|
|
14
15
|
exports.pushYamlDeclarations = pushYamlDeclarations;
|
|
15
16
|
exports.shouldPrintWorkspaceMismatch = shouldPrintWorkspaceMismatch;
|
|
16
17
|
exports.isPlanLimitReachedError = isPlanLimitReachedError;
|
|
@@ -212,6 +213,36 @@ function safeCollectSourceMetadata(sourceDir, options, collector = source_proven
|
|
|
212
213
|
return null;
|
|
213
214
|
}
|
|
214
215
|
}
|
|
216
|
+
/**
|
|
217
|
+
* Turns the raw `warnings` array from the sync-yaml response into
|
|
218
|
+
* human-readable lines. Pure, defensive: any non-array input (undefined,
|
|
219
|
+
* null, an object, a string) yields `[]`, and an unrecognized/future
|
|
220
|
+
* `reason` still produces a readable line instead of crashing or printing
|
|
221
|
+
* "undefined" (app#1150).
|
|
222
|
+
*/
|
|
223
|
+
function formatSyncYamlWarnings(warnings) {
|
|
224
|
+
if (!Array.isArray(warnings)) {
|
|
225
|
+
return [];
|
|
226
|
+
}
|
|
227
|
+
return warnings.map((warning) => {
|
|
228
|
+
const envName = warning?.env_name ?? 'unknown';
|
|
229
|
+
// The server always sends `key`/`name` alongside its reason; if one is
|
|
230
|
+
// ever missing, fall through to the generic line rather than naming the
|
|
231
|
+
// unresolved resource "undefined".
|
|
232
|
+
const target = warning?.key ?? warning?.name;
|
|
233
|
+
if (typeof target === 'string' && target !== '') {
|
|
234
|
+
switch (warning?.reason) {
|
|
235
|
+
case 'global_variable_not_found_in_workspace':
|
|
236
|
+
return `${envName} → no workspace variable with key "${target}"`;
|
|
237
|
+
case 'oauth_connection_not_found_in_workspace':
|
|
238
|
+
return `${envName} → no OAuth connection named "${target}"`;
|
|
239
|
+
case 'workspace_database_not_found_in_workspace':
|
|
240
|
+
return `${envName} → no workspace database named "${target}"`;
|
|
241
|
+
}
|
|
242
|
+
}
|
|
243
|
+
return `${envName} → unresolved (${warning?.reason ?? 'unknown reason'})`;
|
|
244
|
+
});
|
|
245
|
+
}
|
|
215
246
|
/**
|
|
216
247
|
* Push YAML env declarations to the project.
|
|
217
248
|
* This registers all YAML-declared vars and their mappings.
|
|
@@ -234,10 +265,29 @@ async function pushYamlDeclarations(config, projectSlug, yamlConfig) {
|
|
|
234
265
|
yaml_default_database_name: v.databaseName,
|
|
235
266
|
source: 'yaml',
|
|
236
267
|
}));
|
|
237
|
-
await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings/sync-yaml`, { declarations }, {
|
|
268
|
+
const response = await axios_1.default.post(`${config.host}/api/v1/projects/${projectSlug}/variable-mappings/sync-yaml`, { declarations }, {
|
|
238
269
|
headers: (0, api_1.getApiHeaders)(config, 'application/json'),
|
|
239
270
|
});
|
|
240
|
-
|
|
271
|
+
// Non-fatal: a warning means a declared resource doesn't exist in the
|
|
272
|
+
// workspace yet, not that the sync failed (app#1150).
|
|
273
|
+
const body = response?.data;
|
|
274
|
+
const rawWarnings = (body !== null && typeof body === 'object') ? body.warnings : undefined;
|
|
275
|
+
const warnings = formatSyncYamlWarnings(rawWarnings);
|
|
276
|
+
const unresolvedSuffix = warnings.length > 0 ? ` (${warnings.length} unresolved)` : '';
|
|
277
|
+
console.log(chalk_1.default.gray(`Synced ${declarations.length} YAML env declarations${unresolvedSuffix}`));
|
|
278
|
+
// A `warnings` key that isn't an array means the response shape changed
|
|
279
|
+
// under us. Say so rather than silently reporting plain success, which is
|
|
280
|
+
// the exact bug app#1150 fixed. An ABSENT key is not a surprise — an older
|
|
281
|
+
// server simply doesn't send one — so it stays quiet.
|
|
282
|
+
if (rawWarnings !== undefined && !Array.isArray(rawWarnings)) {
|
|
283
|
+
console.log(chalk_1.default.gray(' Server returned warnings in an unrecognized shape; unresolved declarations may not be listed.'));
|
|
284
|
+
}
|
|
285
|
+
for (const warning of warnings) {
|
|
286
|
+
console.log(chalk_1.default.yellow(` ⚠ ${warning}`));
|
|
287
|
+
}
|
|
288
|
+
if (warnings.length > 0) {
|
|
289
|
+
console.log(chalk_1.default.yellow(" These variables won't get a value from this declaration until the named resource exists (a value set in the dashboard still applies)."));
|
|
290
|
+
}
|
|
241
291
|
}
|
|
242
292
|
/**
|
|
243
293
|
* Returns true only when a 404 on the environment-specific project lookup
|
package/dist/commands/login.js
CHANGED
|
@@ -223,44 +223,98 @@ function loginHostLines(resolved) {
|
|
|
223
223
|
* already-fetched list, persist the final config, and print success output.
|
|
224
224
|
* Device login passes its already-written, preflighted destination.
|
|
225
225
|
*/
|
|
226
|
-
async function completeLogin(config, workspaces, options, scope = null, preflight = null) {
|
|
226
|
+
async function completeLogin(config, workspaces, options, scope = null, preflight = null, dependencies = {}) {
|
|
227
227
|
// Device-flow tokens carry a scope (mode + workspace_ids) that later
|
|
228
228
|
// gates `workspace set`; absent for user-scoped Sanctum PATs.
|
|
229
229
|
if (scope) {
|
|
230
230
|
config.scopeMode = scope.mode;
|
|
231
231
|
config.scopedWorkspaceIds = scope.workspace_ids;
|
|
232
232
|
}
|
|
233
|
+
// A --workspace the resolver refuses (not-found, ambiguous, or org-only)
|
|
234
|
+
// never reaches writeConfigFile below on an API-key login, so it must exit
|
|
235
|
+
// before the destination/confirm/backup block runs — otherwise the block
|
|
236
|
+
// backs up and claims to overwrite a config that was never touched
|
|
237
|
+
// (app#1197 finding 1). Device login (preflight set) keeps its own
|
|
238
|
+
// --workspace-refusal handling below, which persists the credential first.
|
|
239
|
+
if (!preflight && options.workspace) {
|
|
240
|
+
const preflightMatch = (0, workspace_lookup_1.classifyWorkspaceInput)(options.workspace, workspaces);
|
|
241
|
+
if (preflightMatch.kind !== 'match') {
|
|
242
|
+
console.error(chalk_1.default.red((0, workspace_lookup_1.describeWorkspaceMatchFailure)(preflightMatch)));
|
|
243
|
+
process.exit(1);
|
|
244
|
+
return;
|
|
245
|
+
}
|
|
246
|
+
}
|
|
247
|
+
// Decide the destination and confirm any destructive overwrite BEFORE
|
|
248
|
+
// workspace resolution (including the interactive picker), so the y/N
|
|
249
|
+
// lands before the user has done the picker work, not after (app#1197).
|
|
250
|
+
// Device login has already persisted its base credential via a preflight.
|
|
251
|
+
let target;
|
|
252
|
+
let targetPath;
|
|
253
|
+
let sameCredentialExisting = null;
|
|
254
|
+
if (!preflight) {
|
|
255
|
+
target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global }, undefined, LOGIN_REFUSAL_MESSAGE);
|
|
256
|
+
targetPath = (0, config_write_target_1.pathForTarget)(target);
|
|
257
|
+
// The final config (which gains workspace/workspaceId) isn't known
|
|
258
|
+
// until the workspace is chosen below, so we can't byte-compare
|
|
259
|
+
// against it here. Compare credentials instead — the guard exists to
|
|
260
|
+
// protect a *different* account's config from being clobbered.
|
|
261
|
+
const existingRaw = fs_1.default.existsSync(targetPath) ? fs_1.default.readFileSync(targetPath, 'utf-8') : null;
|
|
262
|
+
let isDestructive = false;
|
|
263
|
+
if (existingRaw !== null) {
|
|
264
|
+
try {
|
|
265
|
+
const existing = JSON.parse(existingRaw);
|
|
266
|
+
isDestructive = existing.host !== config.host || existing.apiKey !== config.apiKey;
|
|
267
|
+
if (!isDestructive) {
|
|
268
|
+
sameCredentialExisting = existing;
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
catch {
|
|
272
|
+
isDestructive = true;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
if (isDestructive) {
|
|
276
|
+
const backupPath = backupPathFor(targetPath);
|
|
277
|
+
const proceed = await (0, config_write_target_1.confirmOverwrite)(targetPath, backupPath, { question: dependencies.overwriteQuestion });
|
|
278
|
+
if (!proceed) {
|
|
279
|
+
console.log(chalk_1.default.yellow('Aborted. No changes were made.'));
|
|
280
|
+
process.exit(0);
|
|
281
|
+
}
|
|
282
|
+
fs_1.default.copyFileSync(targetPath, backupPath);
|
|
283
|
+
console.log(chalk_1.default.gray(`Backup saved to ${backupPath}`));
|
|
284
|
+
}
|
|
285
|
+
}
|
|
233
286
|
// Resolve the workspace. Device login has already persisted its base
|
|
234
287
|
// credential; API-key login still resolves before its first write.
|
|
235
288
|
if (options.workspace) {
|
|
236
|
-
const
|
|
237
|
-
if (
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
289
|
+
const result = (0, workspace_lookup_1.classifyWorkspaceInput)(options.workspace, workspaces);
|
|
290
|
+
if (result.kind !== 'match') {
|
|
291
|
+
// Device login only. The pre-write guard above exits every
|
|
292
|
+
// `!preflight` refusal, and the sole preflight caller
|
|
293
|
+
// (`device-login`) runs `persistPreflightedLoginCredential` —
|
|
294
|
+
// which sets `credentialPersisted` unconditionally — before
|
|
295
|
+
// calling in, so the credential is always already on disk here.
|
|
296
|
+
// Hence no `credentialPersisted` test and no non-preflight
|
|
297
|
+
// fallback: that branch was unreachable and only duplicated the
|
|
298
|
+
// guard's copy.
|
|
299
|
+
(0, config_1.writeConfigFile)(preflight.targetPath, config);
|
|
300
|
+
console.error(chalk_1.default.yellow((0, workspace_lookup_1.describeWorkspaceMatchFailure)(result)));
|
|
301
|
+
console.error(chalk_1.default.yellow(`Authentication was saved to ${preflight.targetPath}.`));
|
|
302
|
+
console.error(chalk_1.default.yellow('Run `solidactions workspace list`, then `solidactions workspace set <name>` to finish setup.'));
|
|
246
303
|
process.exit(1);
|
|
247
304
|
return;
|
|
248
305
|
}
|
|
306
|
+
const match = result.workspace;
|
|
249
307
|
config.workspace = match.slug ?? match.name;
|
|
250
308
|
config.workspaceId = match.id;
|
|
251
309
|
}
|
|
252
|
-
else if (workspaces.length
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
+ 'run `solidactions workspace set <name>`.'));
|
|
261
|
-
}
|
|
262
|
-
else if (process.stdin.isTTY) {
|
|
263
|
-
const selected = await (0, workspace_lookup_1.selectWorkspaceInteractively)(workspaces);
|
|
310
|
+
else if (workspaces.length <= 1 || process.stdin.isTTY) {
|
|
311
|
+
// 0 and 1 workspace need no interactive prompt, but their status copy
|
|
312
|
+
// ("No workspaces found."/"Auto-selected workspace:") already lives in
|
|
313
|
+
// selectWorkspaceInteractively (cli#137, on stderr) — route them
|
|
314
|
+
// through it too so those strings have exactly one call site instead
|
|
315
|
+
// of a stdout duplicate here (app#1482).
|
|
316
|
+
const selectWorkspace = dependencies.selectWorkspace ?? workspace_lookup_1.selectWorkspaceInteractively;
|
|
317
|
+
const selected = await selectWorkspace(workspaces);
|
|
264
318
|
if (selected) {
|
|
265
319
|
config.workspace = selected.slug ?? selected.name;
|
|
266
320
|
config.workspaceId = selected.id;
|
|
@@ -270,43 +324,52 @@ async function completeLogin(config, workspaces, options, scope = null, prefligh
|
|
|
270
324
|
console.log(chalk_1.default.yellow('Multiple workspaces are available, so no workspace was selected. '
|
|
271
325
|
+ 'Run `solidactions workspace list`, then `solidactions workspace set <name>`.'));
|
|
272
326
|
}
|
|
327
|
+
// `writeConfigFile` writes the config wholesale, and the credentials-only
|
|
328
|
+
// compare above cannot see a workspace pin going missing — so a
|
|
329
|
+
// same-credential re-login that resolves no workspace of its own (picker
|
|
330
|
+
// cancelled, or non-interactive with several workspaces) used to delete an
|
|
331
|
+
// existing pin silently: no prompt and no .bak, because identical
|
|
332
|
+
// credentials are not "destructive". The pin is still valid for this exact
|
|
333
|
+
// account, so carry every workspace field forward instead. Deliberately
|
|
334
|
+
// gated on unchanged credentials: when they differ, the pin belongs to a
|
|
335
|
+
// different account and that path is already prompted and backed up.
|
|
336
|
+
if (!config.workspaceId && sameCredentialExisting?.workspaceId) {
|
|
337
|
+
config.workspace = sameCredentialExisting.workspace;
|
|
338
|
+
config.workspaceId = sameCredentialExisting.workspaceId;
|
|
339
|
+
config.workspaceOrg = sameCredentialExisting.workspaceOrg;
|
|
340
|
+
console.log(chalk_1.default.gray(`Keeping the workspace already pinned in this config: ${config.workspace ?? config.workspaceId}`));
|
|
341
|
+
}
|
|
273
342
|
let savedTargetPath;
|
|
274
343
|
if (preflight) {
|
|
275
344
|
savedTargetPath = preflight.targetPath;
|
|
276
345
|
(0, config_1.writeConfigFile)(preflight.targetPath, config);
|
|
277
346
|
}
|
|
278
347
|
else {
|
|
279
|
-
const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global }, undefined, LOGIN_REFUSAL_MESSAGE);
|
|
280
|
-
const targetPath = (0, config_write_target_1.pathForTarget)(target);
|
|
281
348
|
savedTargetPath = targetPath;
|
|
282
|
-
const existingRaw = fs_1.default.existsSync(targetPath) ? fs_1.default.readFileSync(targetPath, 'utf-8') : null;
|
|
283
|
-
const wouldChange = existingRaw !== null && existingRaw.trim() !== JSON.stringify(config, null, 2).trim();
|
|
284
|
-
if (wouldChange) {
|
|
285
|
-
const backupPath = backupPathFor(targetPath);
|
|
286
|
-
const proceed = await (0, config_write_target_1.confirmOverwrite)(targetPath, backupPath);
|
|
287
|
-
if (!proceed) {
|
|
288
|
-
console.log(chalk_1.default.yellow('Aborted. No changes were made.'));
|
|
289
|
-
process.exit(0);
|
|
290
|
-
}
|
|
291
|
-
fs_1.default.copyFileSync(targetPath, backupPath);
|
|
292
|
-
console.log(chalk_1.default.gray(`Backup saved to ${backupPath}`));
|
|
293
|
-
}
|
|
294
349
|
(0, config_1.writeConfigFile)(targetPath, config);
|
|
295
350
|
if (target === 'local') {
|
|
296
351
|
await (0, config_write_target_1.ensureGitignoreCovers)(process.cwd(), !!options.gitignore);
|
|
297
352
|
}
|
|
298
353
|
}
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
354
|
+
if (config.workspaceId) {
|
|
355
|
+
console.log(chalk_1.default.green('Logged in successfully!'));
|
|
356
|
+
console.log(chalk_1.default.gray(`Configuration saved to ${savedTargetPath}`));
|
|
357
|
+
console.log('');
|
|
358
|
+
console.log(chalk_1.default.blue('Next step — scaffold a new project (includes AI tooling):'));
|
|
359
|
+
console.log(chalk_1.default.gray(' solidactions init <project-name> Creates ./<project-name>/ with scaffold + AI skills'));
|
|
360
|
+
console.log(chalk_1.default.gray(' solidactions init Scaffolds in the current (empty) directory'));
|
|
361
|
+
console.log('');
|
|
362
|
+
console.log(chalk_1.default.blue('Quick start:'));
|
|
363
|
+
console.log(chalk_1.default.gray(' solidactions project deploy <name> Deploy current directory'));
|
|
364
|
+
console.log(chalk_1.default.gray(' solidactions run start <proj> <wf> Run a workflow'));
|
|
365
|
+
console.log(chalk_1.default.gray(' solidactions run list List recent runs'));
|
|
366
|
+
}
|
|
367
|
+
else {
|
|
368
|
+
console.log(chalk_1.default.yellow(`Authentication saved to ${savedTargetPath}.`));
|
|
369
|
+
if (workspaces.length > 0) {
|
|
370
|
+
console.log(chalk_1.default.yellow('Run `solidactions workspace list`, then `solidactions workspace set <name>` to finish setup.'));
|
|
371
|
+
}
|
|
372
|
+
}
|
|
310
373
|
}
|
|
311
374
|
async function login(apiKey, options) {
|
|
312
375
|
const resolved = resolveLoginHost(options);
|
|
@@ -8,6 +8,7 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const api_1 = require("../utils/api");
|
|
10
10
|
const table_1 = require("../utils/table");
|
|
11
|
+
const source_provenance_1 = require("../utils/source-provenance");
|
|
11
12
|
function projectEnvironments(project) {
|
|
12
13
|
const details = project.environment_details;
|
|
13
14
|
if (Array.isArray(details) && details.length > 0) {
|
|
@@ -46,10 +47,11 @@ async function projectList(options = {}) {
|
|
|
46
47
|
project.name || '?',
|
|
47
48
|
project.status || '?',
|
|
48
49
|
project.snapshot_name || '-',
|
|
50
|
+
(0, source_provenance_1.formatRevisionCell)(project.deployed_revision ?? null),
|
|
49
51
|
environmentCells[index],
|
|
50
52
|
]);
|
|
51
|
-
const lines = (0, table_1.renderTable)(['NAME', 'STATUS', 'SNAPSHOT', 'ENVIRONMENTS'], rows, {
|
|
52
|
-
minWidths: [25, 15, 30],
|
|
53
|
+
const lines = (0, table_1.renderTable)(['NAME', 'STATUS', 'SNAPSHOT', 'REVISION', 'ENVIRONMENTS'], rows, {
|
|
54
|
+
minWidths: [25, 15, 30, 14],
|
|
53
55
|
});
|
|
54
56
|
console.log(chalk_1.default.gray(lines[0]));
|
|
55
57
|
console.log(chalk_1.default.gray(lines[1]));
|
|
@@ -60,6 +62,7 @@ async function projectList(options = {}) {
|
|
|
60
62
|
console.log(prefix + colorizeEnvironmentStates(environmentCell));
|
|
61
63
|
}
|
|
62
64
|
console.log('');
|
|
65
|
+
console.log(chalk_1.default.gray('REVISION shows the latest successful deployment: * dirty, ? dirty state unknown, ↓N behind default branch at deploy.'));
|
|
63
66
|
console.log(chalk_1.default.gray(`${projects.length} project(s)`));
|
|
64
67
|
}
|
|
65
68
|
catch (error) {
|
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.projectViewJsonProjection = projectViewJsonProjection;
|
|
7
|
+
exports.quoteCommandArg = quoteCommandArg;
|
|
7
8
|
exports.projectSlugForView = projectSlugForView;
|
|
8
9
|
exports.formatDeploymentRevision = formatDeploymentRevision;
|
|
9
10
|
exports.formatProjectView = formatProjectView;
|
|
@@ -55,6 +56,14 @@ function projectViewJsonProjection(project) {
|
|
|
55
56
|
latest_successful_deployment: deployment === null ? null : deploymentJsonProjection(deployment),
|
|
56
57
|
};
|
|
57
58
|
}
|
|
59
|
+
/**
|
|
60
|
+
* Quote a copy-pasteable command argument so the printed remedy survives a
|
|
61
|
+
* shell. Slugs from the API are normally bare words needing nothing; anything
|
|
62
|
+
* with whitespace or shell metacharacters gets single-quoted.
|
|
63
|
+
*/
|
|
64
|
+
function quoteCommandArg(arg) {
|
|
65
|
+
return /^[A-Za-z0-9._/-]+$/.test(arg) ? arg : `'${arg.replace(/'/g, "'\\''")}'`;
|
|
66
|
+
}
|
|
58
67
|
function projectSlugForView(project, environment) {
|
|
59
68
|
if (environment === undefined) {
|
|
60
69
|
return project;
|
|
@@ -141,9 +150,10 @@ function formatProjectView(project) {
|
|
|
141
150
|
return lines;
|
|
142
151
|
}
|
|
143
152
|
async function projectViewWithConfig(project, options, config, writeLine = console.log) {
|
|
153
|
+
const environment = options.env ?? 'dev';
|
|
144
154
|
let slug;
|
|
145
155
|
try {
|
|
146
|
-
slug = projectSlugForView(project,
|
|
156
|
+
slug = projectSlugForView(project, environment);
|
|
147
157
|
}
|
|
148
158
|
catch (error) {
|
|
149
159
|
console.error(chalk_1.default.red(error.message));
|
|
@@ -166,9 +176,30 @@ async function projectViewWithConfig(project, options, config, writeLine = conso
|
|
|
166
176
|
console.error(chalk_1.default.red('Authentication failed. Run "solidactions login --global" to re-configure.'));
|
|
167
177
|
}
|
|
168
178
|
else if (error.response?.status === 404) {
|
|
169
|
-
const
|
|
170
|
-
|
|
171
|
-
|
|
179
|
+
const family = await (0, api_1.lookupProjectFamilyEnvironments)(config, project);
|
|
180
|
+
const envs = family?.environments ?? [];
|
|
181
|
+
// Only claim the environment is missing when the family genuinely lacks it.
|
|
182
|
+
// `GET /api/v1/projects` can report the requested environment (a standalone
|
|
183
|
+
// env row, or a row created before its deployment landed) while the detail
|
|
184
|
+
// endpoint 404s for that exact slug; asserting "has no dev environment"
|
|
185
|
+
// against a list that says dev exists is self-contradictory, so let the
|
|
186
|
+
// server's own message through instead.
|
|
187
|
+
if (envs.length > 0 && !envs.includes(environment)) {
|
|
188
|
+
const suggested = envs.includes('production') ? 'production' : envs[0];
|
|
189
|
+
// The remedy must name the environment's REAL slug: `project view` passes a
|
|
190
|
+
// production argument through un-slugified, so echoing back a name-typed
|
|
191
|
+
// argument ("My App") would print a command that 404s in its turn.
|
|
192
|
+
const suggestedSlug = (0, source_provenance_1.sanitizeDisplayText)(family?.slugs[suggested], 255);
|
|
193
|
+
console.error(chalk_1.default.red(`Project "${project}" has no ${environment} environment (exists in: ${envs.join(', ')}).`));
|
|
194
|
+
if (suggestedSlug) {
|
|
195
|
+
console.error(` solidactions project view ${quoteCommandArg(suggestedSlug)} -e ${suggested}`);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
const message = (0, source_provenance_1.sanitizeDisplayText)(error.response.data?.message, 500)
|
|
200
|
+
?? `Project "${slug}" not found.`;
|
|
201
|
+
console.error(chalk_1.default.red(message));
|
|
202
|
+
}
|
|
172
203
|
}
|
|
173
204
|
else if (error.response) {
|
|
174
205
|
console.error(chalk_1.default.red(`Failed to view project: ${error.response.status}`));
|
|
@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.formatDetailedRevision = void 0;
|
|
6
|
+
exports.formatRevisionCell = exports.formatDetailedRevision = void 0;
|
|
7
7
|
exports.buildRunListParams = buildRunListParams;
|
|
8
8
|
exports.runs = runs;
|
|
9
9
|
exports.summaryStatusLabel = summaryStatusLabel;
|
|
10
10
|
exports.detailedOutcomeTag = detailedOutcomeTag;
|
|
11
|
-
exports.formatRevisionCell = formatRevisionCell;
|
|
12
11
|
exports.displaySummaryTable = displaySummaryTable;
|
|
13
12
|
exports.displayDetailedList = displayDetailedList;
|
|
14
13
|
const axios_1 = __importDefault(require("axios"));
|
|
@@ -18,6 +17,7 @@ const table_1 = require("../utils/table");
|
|
|
18
17
|
const source_provenance_1 = require("../utils/source-provenance");
|
|
19
18
|
var source_provenance_2 = require("../utils/source-provenance");
|
|
20
19
|
Object.defineProperty(exports, "formatDetailedRevision", { enumerable: true, get: function () { return source_provenance_2.formatDetailedRevision; } });
|
|
20
|
+
Object.defineProperty(exports, "formatRevisionCell", { enumerable: true, get: function () { return source_provenance_2.formatRevisionCell; } });
|
|
21
21
|
/**
|
|
22
22
|
* Build the params object for GET /api/v1/runs.
|
|
23
23
|
* Extracted as a pure function so it can be unit-tested without mocking axios.
|
|
@@ -128,18 +128,6 @@ function detailedOutcomeTag(run) {
|
|
|
128
128
|
return ' [DEGRADED]';
|
|
129
129
|
return '';
|
|
130
130
|
}
|
|
131
|
-
function formatRevisionCell(revision) {
|
|
132
|
-
const sha = (0, source_provenance_1.revisionSha)(revision);
|
|
133
|
-
if (!sha)
|
|
134
|
-
return '-';
|
|
135
|
-
const dirty = revision?.dirty === true ? '*' : revision?.dirty === false ? '' : '?';
|
|
136
|
-
const behind = typeof revision?.commits_behind === 'number'
|
|
137
|
-
&& Number.isSafeInteger(revision.commits_behind)
|
|
138
|
-
&& revision.commits_behind > 0
|
|
139
|
-
? ` ↓${revision.commits_behind}`
|
|
140
|
-
: '';
|
|
141
|
-
return (0, table_1.sanitizeCell)(`${sha}${dirty}${behind}`);
|
|
142
|
-
}
|
|
143
131
|
function displaySummaryTable(runsList, projectName) {
|
|
144
132
|
const header = projectName ? `Recent runs for "${projectName}":` : 'Recent runs:';
|
|
145
133
|
console.log(chalk_1.default.blue(header));
|
|
@@ -152,7 +140,7 @@ function displaySummaryTable(runsList, projectName) {
|
|
|
152
140
|
String(run.id || '?'),
|
|
153
141
|
(0, table_1.sanitizeCell)((0, table_1.truncateCell)(run.workflow_name || '?', 24)),
|
|
154
142
|
status,
|
|
155
|
-
formatRevisionCell(run.deployed_revision ?? null),
|
|
143
|
+
(0, source_provenance_1.formatRevisionCell)(run.deployed_revision ?? null),
|
|
156
144
|
triggeredAt,
|
|
157
145
|
(0, table_1.sanitizeCell)(run.triggered_by || '-'),
|
|
158
146
|
];
|
|
@@ -12,16 +12,20 @@ const axios_1 = __importDefault(require("axios"));
|
|
|
12
12
|
const chalk_1 = __importDefault(require("chalk"));
|
|
13
13
|
const api_1 = require("../utils/api");
|
|
14
14
|
const source_provenance_1 = require("../utils/source-provenance");
|
|
15
|
+
const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
15
16
|
async function runView(runId, options) {
|
|
16
|
-
if (!/^\d+$/.test(runId)) {
|
|
17
|
-
console.error(chalk_1.default.red(`Invalid run id: "${runId}" (run
|
|
17
|
+
if (!/^\d+$/.test(runId) && !UUID_PATTERN.test(runId)) {
|
|
18
|
+
console.error(chalk_1.default.red(`Invalid run id: "${runId}" (expected a numeric run id or a run UUID — see \`solidactions run list\`).`));
|
|
18
19
|
process.exit(1);
|
|
19
20
|
return;
|
|
20
21
|
}
|
|
22
|
+
// The server stores `run_uuid` lowercase and compares it verbatim, so an
|
|
23
|
+
// uppercase UUID must be normalized here or it would silently 404.
|
|
24
|
+
const resolvedRunId = UUID_PATTERN.test(runId) ? runId.toLowerCase() : runId;
|
|
21
25
|
const config = await (0, api_1.requireConfigWithWorkspace)();
|
|
22
26
|
try {
|
|
23
27
|
// Fetch run data (includes session timing)
|
|
24
|
-
const runResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${
|
|
28
|
+
const runResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${resolvedRunId}`, {
|
|
25
29
|
headers: (0, api_1.getApiHeaders)(config),
|
|
26
30
|
});
|
|
27
31
|
const runData = runResponse.data;
|
|
@@ -41,7 +45,7 @@ async function runView(runId, options) {
|
|
|
41
45
|
};
|
|
42
46
|
// --logs: fetch and display raw logs
|
|
43
47
|
if (options.logs) {
|
|
44
|
-
const logsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${
|
|
48
|
+
const logsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${resolvedRunId}/logs`, {
|
|
45
49
|
headers: (0, api_1.getApiHeaders)(config),
|
|
46
50
|
});
|
|
47
51
|
const logData = logsResponse.data.logs || '';
|
|
@@ -55,7 +59,7 @@ async function runView(runId, options) {
|
|
|
55
59
|
return;
|
|
56
60
|
}
|
|
57
61
|
// Fetch steps data
|
|
58
|
-
const stepsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${
|
|
62
|
+
const stepsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${resolvedRunId}/steps`, {
|
|
59
63
|
headers: (0, api_1.getApiHeaders)(config),
|
|
60
64
|
});
|
|
61
65
|
const stepsData = stepsResponse.data;
|
|
@@ -82,7 +86,7 @@ async function runView(runId, options) {
|
|
|
82
86
|
}
|
|
83
87
|
// Full view
|
|
84
88
|
// Fetch logs for the full view
|
|
85
|
-
const logsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${
|
|
89
|
+
const logsResponse = await axios_1.default.get(`${config.host}/api/v1/runs/${resolvedRunId}/logs`, {
|
|
86
90
|
headers: (0, api_1.getApiHeaders)(config),
|
|
87
91
|
});
|
|
88
92
|
if (options.json) {
|
|
@@ -67,7 +67,7 @@ async function workspaceSet(input, options = {}) {
|
|
|
67
67
|
const workspace = await (0, workspace_lookup_1.resolveWorkspaceInput)(config, input);
|
|
68
68
|
const target = await (0, config_write_target_1.decideWriteTarget)({ local: options.local, global: options.global });
|
|
69
69
|
const targetPath = (0, config_write_target_1.pathForTarget)(target);
|
|
70
|
-
(0, config_1.writeWorkspaceToFile)(targetPath, workspace.slug ?? workspace.name, workspace.id);
|
|
70
|
+
(0, config_1.writeWorkspaceToFile)(targetPath, workspace.slug ?? workspace.name, workspace.id, workspace.org_name);
|
|
71
71
|
if (target === 'local') {
|
|
72
72
|
await (0, config_write_target_1.ensureGitignoreCovers)(process.cwd(), !!options.gitignore);
|
|
73
73
|
}
|