@12ui/design 0.2.30 → 0.2.32
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 +15 -15
- package/SKILL.md +1 -1
- package/dist/auth-request.d.ts +9 -0
- package/dist/auth-request.d.ts.map +1 -0
- package/dist/auth-request.js +32 -0
- package/dist/auth-request.js.map +1 -0
- package/dist/cli-auth-command.d.ts +1 -1
- package/dist/cli-auth-command.d.ts.map +1 -1
- package/dist/cli-auth-command.js +37 -7
- package/dist/cli-auth-command.js.map +1 -1
- package/dist/cli-auth-onboarding.d.ts +15 -1
- package/dist/cli-auth-onboarding.d.ts.map +1 -1
- package/dist/cli-auth-onboarding.js +46 -12
- package/dist/cli-auth-onboarding.js.map +1 -1
- package/dist/cli-branch-command.d.ts +1 -6
- package/dist/cli-branch-command.d.ts.map +1 -1
- package/dist/cli-branch-command.js +0 -26
- package/dist/cli-branch-command.js.map +1 -1
- package/dist/cli-capabilities.d.ts +5 -7
- package/dist/cli-capabilities.d.ts.map +1 -1
- package/dist/cli-capabilities.js +5 -8
- package/dist/cli-capabilities.js.map +1 -1
- package/dist/cli-cli-command.d.ts.map +1 -1
- package/dist/cli-cli-command.js +5 -1
- package/dist/cli-cli-command.js.map +1 -1
- package/dist/cli-draft-command.d.ts +13 -10
- package/dist/cli-draft-command.d.ts.map +1 -1
- package/dist/cli-draft-command.js +201 -111
- package/dist/cli-draft-command.js.map +1 -1
- package/dist/cli-help/design.d.ts +4 -4
- package/dist/cli-help/design.d.ts.map +1 -1
- package/dist/cli-help/design.js +6 -4
- package/dist/cli-help/design.js.map +1 -1
- package/dist/cli-help/index.d.ts +12 -5
- package/dist/cli-help/index.d.ts.map +1 -1
- package/dist/cli-help/setup.d.ts +8 -1
- package/dist/cli-help/setup.d.ts.map +1 -1
- package/dist/cli-help/setup.js +11 -0
- package/dist/cli-help/setup.js.map +1 -1
- package/dist/cli-next-command.d.ts +4 -0
- package/dist/cli-next-command.d.ts.map +1 -1
- package/dist/cli-next-command.js +74 -24
- package/dist/cli-next-command.js.map +1 -1
- package/dist/cli-pending-auth.d.ts +2 -0
- package/dist/cli-pending-auth.d.ts.map +1 -1
- package/dist/cli-pending-auth.js +39 -15
- package/dist/cli-pending-auth.js.map +1 -1
- package/dist/cli-persistence-report.d.ts.map +1 -1
- package/dist/cli-persistence-report.js +11 -0
- package/dist/cli-persistence-report.js.map +1 -1
- package/dist/cli-persistence.d.ts +10 -0
- package/dist/cli-persistence.d.ts.map +1 -1
- package/dist/cli-persistence.js +149 -20
- package/dist/cli-persistence.js.map +1 -1
- package/dist/cli-run.d.ts +2 -2
- package/dist/cli-run.d.ts.map +1 -1
- package/dist/cli-run.js +7 -64
- package/dist/cli-run.js.map +1 -1
- package/dist/cli-skill-command.d.ts.map +1 -1
- package/dist/cli-skill-command.js +9 -3
- package/dist/cli-skill-command.js.map +1 -1
- package/dist/cli-usage.d.ts.map +1 -1
- package/dist/cli-usage.js +6 -4
- package/dist/cli-usage.js.map +1 -1
- package/dist/cli.js +2 -6
- package/dist/cli.js.map +1 -1
- package/dist/credential-setup.d.ts +4 -1
- package/dist/credential-setup.d.ts.map +1 -1
- package/dist/credential-setup.js +28 -3
- package/dist/credential-setup.js.map +1 -1
- package/dist/draft-adoption.d.ts +0 -6
- package/dist/draft-adoption.d.ts.map +1 -1
- package/dist/draft-adoption.js +0 -14
- package/dist/draft-adoption.js.map +1 -1
- package/dist/draft-dispatch-attempt.d.ts +23 -0
- package/dist/draft-dispatch-attempt.d.ts.map +1 -0
- package/dist/draft-dispatch-attempt.js +42 -0
- package/dist/draft-dispatch-attempt.js.map +1 -0
- package/dist/draft-workspace.d.ts +0 -2
- package/dist/draft-workspace.d.ts.map +1 -1
- package/dist/draft-workspace.js +0 -2
- package/dist/draft-workspace.js.map +1 -1
- package/dist/legacy-cli-cleanup.d.ts.map +1 -1
- package/dist/legacy-cli-cleanup.js +3 -2
- package/dist/legacy-cli-cleanup.js.map +1 -1
- package/dist/legacy-npm-global-cli-recognition.d.ts.map +1 -1
- package/dist/legacy-npm-global-cli-recognition.js +4 -3
- package/dist/legacy-npm-global-cli-recognition.js.map +1 -1
- package/dist/legacy-skill-catalog.d.ts.map +1 -1
- package/dist/legacy-skill-catalog.js +23 -0
- package/dist/legacy-skill-catalog.js.map +1 -1
- package/dist/login-auth.d.ts +16 -0
- package/dist/login-auth.d.ts.map +1 -1
- package/dist/login-auth.js +107 -25
- package/dist/login-auth.js.map +1 -1
- package/dist/next-wait-lease.d.ts +12 -2
- package/dist/next-wait-lease.d.ts.map +1 -1
- package/dist/next-wait-lease.js +47 -43
- package/dist/next-wait-lease.js.map +1 -1
- package/dist/next-wait-process.d.ts +6 -14
- package/dist/next-wait-process.d.ts.map +1 -1
- package/dist/next-wait-process.js +11 -29
- package/dist/next-wait-process.js.map +1 -1
- package/dist/run-journal-commands.d.ts +1 -1
- package/dist/run-journal-commands.d.ts.map +1 -1
- package/dist/run-journal-commands.js +2 -6
- package/dist/run-journal-commands.js.map +1 -1
- package/dist/run-journal.d.ts +9 -13
- package/dist/run-journal.d.ts.map +1 -1
- package/dist/run-journal.js +15 -13
- package/dist/run-journal.js.map +1 -1
- package/open-design.json +2 -2
- package/package.json +1 -1
- package/skills/12ui-design/SKILL.md +4 -4
- package/dist/cli-detach.d.ts +0 -70
- package/dist/cli-detach.d.ts.map +0 -1
- package/dist/cli-detach.js +0 -163
- package/dist/cli-detach.js.map +0 -1
package/README.md
CHANGED
|
@@ -128,9 +128,10 @@ manual recreation.
|
|
|
128
128
|
|
|
129
129
|
`draft` accepts 2-16 candidates and defaults to four. It records the corpus set,
|
|
130
130
|
hosted run id, stable service slots, output paths, and claim key in `draft.json`
|
|
131
|
-
before dispatch.
|
|
132
|
-
state is still `pending`; in-flight, succeeded, and
|
|
133
|
-
posted again.
|
|
131
|
+
before dispatch. Every dispatch request stays in the foreground and posts only
|
|
132
|
+
slots whose durable service state is still `pending`; in-flight, succeeded, and
|
|
133
|
+
failed slots are never posted again. `12ui next <run-dir> --wait` repairs only
|
|
134
|
+
never-started slots, then polls and downloads. Successful PNGs are digest-checked and written atomically under
|
|
134
135
|
`<run-dir>/candidates/`, with terminal evidence in `draft.complete.json`.
|
|
135
136
|
|
|
136
137
|
The retired local `image` commands and provider preflight are not part of the
|
|
@@ -290,10 +291,12 @@ page must share one width, checked locally before anything is bought. A viewport
|
|
|
290
291
|
may name `sourceConversionId` to reuse an already succeeded conversion of
|
|
291
292
|
exactly those bytes instead of paying for it twice.
|
|
292
293
|
|
|
293
|
-
Draft and branch
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
294
|
+
Draft dispatch and every branch network request stay in the foreground. Draft
|
|
295
|
+
returns after its slots are durably dispatched; `12ui next <run-dir> --wait`
|
|
296
|
+
repairs recorded never-started slots, polls, and downloads. Branch execute and
|
|
297
|
+
resume remain foreground until terminal. A second shell can run `12ui next
|
|
298
|
+
<run-dir>` for per-item state without dispatching replacement work. Do not infer
|
|
299
|
+
progress from a directory listing.
|
|
297
300
|
|
|
298
301
|
An HTML branch can become a clickable prototype in either of two equivalent
|
|
299
302
|
ways: pass `--prototype` to `branch execute`, or run `12ui prototype <run-dir>`
|
|
@@ -333,7 +336,7 @@ omitted, the client generates a new UUID.
|
|
|
333
336
|
|
|
334
337
|
Image conversions accept `--model fast|standard|pro`; omission selects
|
|
335
338
|
`standard`. Beginning with `layerdoc-worker-v148` and still in the current
|
|
336
|
-
`layerdoc-worker-
|
|
339
|
+
`layerdoc-worker-v194`, Fast, Standard, and Pro all use
|
|
337
340
|
`gpt-5.6-terra-low` for primary extraction. Fast retains color-guided
|
|
338
341
|
deterministic inpainting, source-grounded flat-border cutouts, and 1x source crops without
|
|
339
342
|
secondary metadata refinement, generative cleanup, provider background
|
|
@@ -449,10 +452,8 @@ rewritten, and a durable receipt records the claim, conversion, and artifacts.
|
|
|
449
452
|
Every command that owns a workspace directory — a draft run directory, a branch
|
|
450
453
|
out-dir, or a convert output directory — appends what it did to
|
|
451
454
|
`<workspace>/journal.jsonl`. One JSON line when the command begins and one when
|
|
452
|
-
it exits, including refusals and failures.
|
|
453
|
-
|
|
454
|
-
the same file as the command that started them, so a run's whole history is in
|
|
455
|
-
one place whether or not the shell that launched it survived.
|
|
455
|
+
it exits, including refusals and failures. Draft and branch network work stays
|
|
456
|
+
in that foreground process, so a run's whole history remains in one place.
|
|
456
457
|
|
|
457
458
|
Each line carries the canonical command name, a digest of the argv (hashed with
|
|
458
459
|
credential values redacted, never written down), the run and idempotency
|
|
@@ -462,9 +463,8 @@ terminal, whether the work detached, and the process id. `12ui capabilities`
|
|
|
462
463
|
reports the field list; the file is append-only and never rewritten, so a reader
|
|
463
464
|
tolerates a torn final line while a writer is mid-append.
|
|
464
465
|
|
|
465
|
-
The journal exists because
|
|
466
|
-
|
|
467
|
-
absence of a command in a transcript is not the absence of work.
|
|
466
|
+
The journal exists because one command can span several service stages, and a
|
|
467
|
+
second shell needs durable evidence rather than inference from a directory.
|
|
468
468
|
|
|
469
469
|
## LayerDoc to downstream formats
|
|
470
470
|
|
package/SKILL.md
CHANGED
|
@@ -28,7 +28,7 @@ dispatch paid work when it is absent, rejected, or times out.
|
|
|
28
28
|
Use `12ui` when it is available on `PATH`. Otherwise invoke the pinned CLI that
|
|
29
29
|
the plugin's `open-design.json` MCP entry uses:
|
|
30
30
|
|
|
31
|
-
npx -y @12ui/design@0.2.
|
|
31
|
+
npx -y @12ui/design@0.2.32 <command> ...
|
|
32
32
|
|
|
33
33
|
Run `12ui auth status --json` (or its pinned `npx` equivalent) before the paid
|
|
34
34
|
preflight. A desktop user can authenticate with `12ui auth login`; a headless
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
type Fetch = typeof fetch;
|
|
2
|
+
export declare const AUTH_REQUEST_TIMEOUT_MS = 15000;
|
|
3
|
+
export declare const isAuthRequestTimeout: (error: unknown) => boolean;
|
|
4
|
+
export declare const authRequestFetch: (fetchImpl: Fetch, options?: {
|
|
5
|
+
timeoutMs?: number;
|
|
6
|
+
timeoutSignal?: (milliseconds: number) => AbortSignal;
|
|
7
|
+
}) => Fetch;
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=auth-request.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-request.d.ts","sourceRoot":"","sources":["../src/auth-request.ts"],"names":[],"mappings":"AAAA,KAAK,KAAK,GAAG,OAAO,KAAK,CAAC;AAE1B,eAAO,MAAM,uBAAuB,QAAS,CAAC;AAE9C,eAAO,MAAM,oBAAoB,GAAI,OAAO,OAAO,KAAG,OAIrD,CAAC;AASF,eAAO,MAAM,gBAAgB,GAC3B,WAAW,KAAK,EAChB,UAAS;IACP,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,WAAW,CAAC;CAClD,KACL,KAoBF,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
export const AUTH_REQUEST_TIMEOUT_MS = 15_000;
|
|
2
|
+
export const isAuthRequestTimeout = (error) => {
|
|
3
|
+
const candidate = error;
|
|
4
|
+
return candidate?.name === 'TimeoutError'
|
|
5
|
+
|| candidate?.code === 'UND_ERR_CONNECT_TIMEOUT';
|
|
6
|
+
};
|
|
7
|
+
const signalForAttempt = (callerSignal, timeoutSignal) => (callerSignal ? AbortSignal.any([callerSignal, timeoutSignal]) : timeoutSignal);
|
|
8
|
+
export const authRequestFetch = (fetchImpl, options = {}) => async (input, init = {}) => {
|
|
9
|
+
const timeoutMs = options.timeoutMs ?? AUTH_REQUEST_TIMEOUT_MS;
|
|
10
|
+
const createTimeoutSignal = options.timeoutSignal ?? AbortSignal.timeout;
|
|
11
|
+
let lastError;
|
|
12
|
+
for (let attempt = 0; attempt < 2; attempt += 1) {
|
|
13
|
+
const timeoutSignal = createTimeoutSignal(timeoutMs);
|
|
14
|
+
try {
|
|
15
|
+
return await fetchImpl(input, {
|
|
16
|
+
...init,
|
|
17
|
+
signal: signalForAttempt(init.signal, timeoutSignal),
|
|
18
|
+
});
|
|
19
|
+
}
|
|
20
|
+
catch (error) {
|
|
21
|
+
lastError = error;
|
|
22
|
+
const callerCancelled = init.signal?.aborted === true;
|
|
23
|
+
const timedOut = timeoutSignal.aborted && isAuthRequestTimeout(timeoutSignal.reason ?? error);
|
|
24
|
+
if (callerCancelled || !timedOut)
|
|
25
|
+
throw error;
|
|
26
|
+
if (attempt === 1)
|
|
27
|
+
throw timeoutSignal.reason ?? error;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
throw lastError;
|
|
31
|
+
};
|
|
32
|
+
//# sourceMappingURL=auth-request.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"auth-request.js","sourceRoot":"","sources":["../src/auth-request.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC;AAE9C,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAc,EAAW,EAAE;IAC9D,MAAM,SAAS,GAAG,KAAkD,CAAC;IACrE,OAAO,SAAS,EAAE,IAAI,KAAK,cAAc;WACpC,SAAS,EAAE,IAAI,KAAK,yBAAyB,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CACvB,YAA4C,EAC5C,aAA0B,EACb,EAAE,CAAC,CAChB,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAC9E,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,SAAgB,EAChB,UAGI,EAAE,EACC,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,uBAAuB,CAAC;IAC/D,MAAM,mBAAmB,GAAG,OAAO,CAAC,aAAa,IAAI,WAAW,CAAC,OAAO,CAAC;IACzE,IAAI,SAAkB,CAAC;IACvB,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,IAAI,CAAC,EAAE,CAAC;QAChD,MAAM,aAAa,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,CAAC;YACH,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE;gBAC5B,GAAG,IAAI;gBACP,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,MAAM,EAAE,aAAa,CAAC;aACrD,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,SAAS,GAAG,KAAK,CAAC;YAClB,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;YACtD,MAAM,QAAQ,GAAG,aAAa,CAAC,OAAO,IAAI,oBAAoB,CAAC,aAAa,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;YAC9F,IAAI,eAAe,IAAI,CAAC,QAAQ;gBAAE,MAAM,KAAK,CAAC;YAC9C,IAAI,OAAO,KAAK,CAAC;gBAAE,MAAM,aAAa,CAAC,MAAM,IAAI,KAAK,CAAC;QACzD,CAAC;IACH,CAAC;IACD,MAAM,SAAS,CAAC;AAClB,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { type CliFlags } from './cli-arguments.js';
|
|
2
|
-
export declare const runAuthCommand: (action: string | undefined, flags: CliFlags) => Promise<void>;
|
|
2
|
+
export declare const runAuthCommand: (action: string | undefined, flags: CliFlags, argument?: string) => Promise<void>;
|
|
3
3
|
//# sourceMappingURL=cli-auth-command.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-auth-command.d.ts","sourceRoot":"","sources":["../src/cli-auth-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-auth-command.d.ts","sourceRoot":"","sources":["../src/cli-auth-command.ts"],"names":[],"mappings":"AAUA,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAqD5E,eAAO,MAAM,cAAc,GACzB,QAAQ,MAAM,GAAG,SAAS,EAC1B,OAAO,QAAQ,EACf,WAAW,MAAM,KAChB,OAAO,CAAC,IAAI,CAuGd,CAAC"}
|
package/dist/cli-auth-command.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { readStoredConversionCredentials, removeStoredConversionCredentials, resolveCredentialFile, } from './credential-store.js';
|
|
2
2
|
import { MissingTwelveUiCredentialError } from './cli-auth-onboarding.js';
|
|
3
|
-
import { setUpConversionCredentials } from './credential-setup.js';
|
|
3
|
+
import { setUpConversionCredentials, storeRedeemedConversionCredentials, } from './credential-setup.js';
|
|
4
4
|
import { booleanFlag, stringFlag } from './cli-arguments.js';
|
|
5
5
|
import { declareClientVersion } from './client-version.js';
|
|
6
6
|
import { usageRefusal } from './cli-usage.js';
|
|
7
|
-
import { hasConfiguredConversionCredential } from './config.js';
|
|
8
|
-
import { revokeConvertApiKey, TWELVE_UI_DEVICE_SCOPES, verifyTwelveUiCredential, } from './login-auth.js';
|
|
7
|
+
import { hasConfiguredConversionCredential, normalizeConversionOrigin } from './config.js';
|
|
8
|
+
import { exchangeTwelveUiLinkCode, normalizeLoginOrigin, revokeConvertApiKey, TWELVE_UI_DEVICE_SCOPES, verifyTwelveUiCredential, } from './login-auth.js';
|
|
9
9
|
const readQuota = async (origin, apiKey) => {
|
|
10
10
|
const response = await fetch(`${origin}/api/v1/convert/quota`, {
|
|
11
11
|
headers: declareClientVersion(new Headers({
|
|
@@ -39,8 +39,36 @@ const verifyAvailableCredentialScope = async (apiKey, loginOrigin) => {
|
|
|
39
39
|
}
|
|
40
40
|
throw new AggregateError(failures, 'The stored 12ui credential could not be verified for any supported design scope');
|
|
41
41
|
};
|
|
42
|
-
export const runAuthCommand = async (action, flags) => {
|
|
42
|
+
export const runAuthCommand = async (action, flags, argument) => {
|
|
43
43
|
const loginOrigin = stringFlag(flags, 'login-origin');
|
|
44
|
+
if (action === 'connect') {
|
|
45
|
+
const normalized = argument?.toUpperCase().replace(/[^A-Z0-9]/gu, '') ?? '';
|
|
46
|
+
if (normalized.length !== 8) {
|
|
47
|
+
throw usageRefusal({
|
|
48
|
+
reason: '`12ui auth connect` requires the 8-character code shown on /connect-cli.',
|
|
49
|
+
code: 'auth_connect_code_required',
|
|
50
|
+
verb: ['auth', 'connect'],
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
const linkCode = `${normalized.slice(0, 4)}-${normalized.slice(4)}`;
|
|
54
|
+
const origin = normalizeConversionOrigin(stringFlag(flags, 'origin') ?? process.env.TWELVE_UI_ORIGIN ?? 'https://12ui.com');
|
|
55
|
+
const credential = await exchangeTwelveUiLinkCode({
|
|
56
|
+
linkCode,
|
|
57
|
+
connectOrigin: origin,
|
|
58
|
+
loginOrigin,
|
|
59
|
+
requiredScopes: TWELVE_UI_DEVICE_SCOPES,
|
|
60
|
+
});
|
|
61
|
+
const stored = await storeRedeemedConversionCredentials({
|
|
62
|
+
credential,
|
|
63
|
+
origin,
|
|
64
|
+
loginOrigin: normalizeLoginOrigin(loginOrigin),
|
|
65
|
+
requiredScopes: TWELVE_UI_DEVICE_SCOPES,
|
|
66
|
+
});
|
|
67
|
+
if (stored.source !== 'session') {
|
|
68
|
+
console.log(`Connected and verified the personal 12ui account at ${stored.credentialFile}.`);
|
|
69
|
+
}
|
|
70
|
+
return;
|
|
71
|
+
}
|
|
44
72
|
if (action === 'login') {
|
|
45
73
|
const credentials = await setUpConversionCredentials({
|
|
46
74
|
apiKey: stringFlag(flags, 'api-key'),
|
|
@@ -53,8 +81,10 @@ export const runAuthCommand = async (action, flags) => {
|
|
|
53
81
|
console.log(url);
|
|
54
82
|
},
|
|
55
83
|
});
|
|
56
|
-
|
|
57
|
-
|
|
84
|
+
if (credentials.source !== 'session') {
|
|
85
|
+
console.log(`Personal Convert credentials ${credentials.source === 'browser' ? 'created' : 'imported'}`
|
|
86
|
+
+ ` and verified at ${credentials.credentialFile}.`);
|
|
87
|
+
}
|
|
58
88
|
return;
|
|
59
89
|
}
|
|
60
90
|
const stored = await readStoredConversionCredentials();
|
|
@@ -104,7 +134,7 @@ export const runAuthCommand = async (action, flags) => {
|
|
|
104
134
|
}
|
|
105
135
|
throw usageRefusal({
|
|
106
136
|
reason: `${action ? `\`${action}\` is not` : 'No action was given, and'}`
|
|
107
|
-
+ ' a `12ui auth` action. The actions are login, status, and logout.',
|
|
137
|
+
+ ' a `12ui auth` action. The actions are login, connect, status, and logout.',
|
|
108
138
|
code: 'auth_usage',
|
|
109
139
|
verb: ['auth'],
|
|
110
140
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-auth-command.js","sourceRoot":"","sources":["../src/cli-auth-command.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,iCAAiC,EACjC,qBAAqB,GACtB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,8BAA8B,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"cli-auth-command.js","sourceRoot":"","sources":["../src/cli-auth-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,26 @@
|
|
|
1
1
|
export declare const TWELVE_UI_CONNECT_CLI_URL = "https://12ui.com/connect-cli";
|
|
2
|
+
export type AuthOnboardingFailure = {
|
|
3
|
+
errorClass: string;
|
|
4
|
+
reason: string;
|
|
5
|
+
stage: 'device_code_mint' | 'device_token_redemption';
|
|
6
|
+
};
|
|
2
7
|
export declare const authOnboardingMessage: (options?: {
|
|
3
8
|
agentFacing?: boolean;
|
|
4
9
|
approvalUrl?: string;
|
|
10
|
+
failure?: AuthOnboardingFailure;
|
|
11
|
+
staticFallback?: boolean;
|
|
5
12
|
}) => string;
|
|
6
13
|
export declare const printAuthOnboarding: (options?: {
|
|
7
14
|
approvalUrl?: string;
|
|
15
|
+
failure?: AuthOnboardingFailure;
|
|
16
|
+
staticFallback?: boolean;
|
|
8
17
|
}) => void;
|
|
9
18
|
export declare class MissingTwelveUiCredentialError extends Error {
|
|
10
|
-
|
|
19
|
+
readonly journalErrorClass?: string;
|
|
20
|
+
constructor(options?: string | {
|
|
21
|
+
approvalUrl?: string;
|
|
22
|
+
failure?: AuthOnboardingFailure;
|
|
23
|
+
staticFallback?: boolean;
|
|
24
|
+
});
|
|
11
25
|
}
|
|
12
26
|
//# sourceMappingURL=cli-auth-onboarding.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-auth-onboarding.d.ts","sourceRoot":"","sources":["../src/cli-auth-onboarding.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-auth-onboarding.d.ts","sourceRoot":"","sources":["../src/cli-auth-onboarding.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,yBAAyB,iCAAiC,CAAC;AAExE,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,kBAAkB,GAAG,yBAAyB,CAAC;CACvD,CAAC;AAsBF,eAAO,MAAM,qBAAqB,GAAI,UAAS;IAC7C,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,KAAG,MAcR,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAAI,UAAS;IAC3C,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,cAAc,CAAC,EAAE,OAAO,CAAC;CACrB,KAAG,IAMR,CAAC;AAEF,qBAAa,8BAA+B,SAAQ,KAAK;IACvD,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;gBAExB,OAAO,GAAE,MAAM,GAAG;QAC5B,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,OAAO,CAAC,EAAE,qBAAqB,CAAC;QAChC,cAAc,CAAC,EAAE,OAAO,CAAC;KACrB;CAWP"}
|
|
@@ -1,21 +1,55 @@
|
|
|
1
1
|
export const TWELVE_UI_CONNECT_CLI_URL = 'https://12ui.com/connect-cli';
|
|
2
|
-
const ownerAuthOnboardingLines = (
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
2
|
+
const ownerAuthOnboardingLines = (options) => {
|
|
3
|
+
if (options.staticFallback) {
|
|
4
|
+
return [
|
|
5
|
+
options.failure?.reason
|
|
6
|
+
?? 'Could not generate a coded sign-in link because the sign-in service was unreachable from this environment.',
|
|
7
|
+
'Retry after network access changes to mint a fresh coded link.',
|
|
8
|
+
`Fallback: Sign in at ${options.approvalUrl}, copy the link code, then run \`12ui auth connect CODE\`.`,
|
|
9
|
+
];
|
|
10
|
+
}
|
|
11
|
+
return [
|
|
12
|
+
`Sign in/Create an account with this magic link: ${options.approvalUrl}`,
|
|
13
|
+
'Takes 5 seconds and you can use 12ui for free.',
|
|
14
|
+
...(options.failure ? [options.failure.reason] : []),
|
|
15
|
+
];
|
|
16
|
+
};
|
|
17
|
+
export const authOnboardingMessage = (options = {}) => {
|
|
18
|
+
const approvalUrl = options.approvalUrl ?? TWELVE_UI_CONNECT_CLI_URL;
|
|
19
|
+
const lines = ownerAuthOnboardingLines({
|
|
20
|
+
approvalUrl,
|
|
21
|
+
staticFallback: options.staticFallback,
|
|
22
|
+
failure: options.failure,
|
|
23
|
+
});
|
|
24
|
+
if (!options.agentFacing)
|
|
25
|
+
return lines.join('\n');
|
|
26
|
+
return [
|
|
27
|
+
...lines,
|
|
28
|
+
options.staticFallback
|
|
29
|
+
? 'Agent: The bare link is not a coded connection. Ask the user for its link code, then run `12ui auth connect CODE`.'
|
|
30
|
+
: 'Agent: Give this coded link to your user, then retry after they approve it.',
|
|
31
|
+
].join('\n');
|
|
32
|
+
};
|
|
11
33
|
export const printAuthOnboarding = (options = {}) => {
|
|
12
|
-
for (const line of ownerAuthOnboardingLines(
|
|
34
|
+
for (const line of ownerAuthOnboardingLines({
|
|
35
|
+
approvalUrl: options.approvalUrl ?? TWELVE_UI_CONNECT_CLI_URL,
|
|
36
|
+
staticFallback: options.staticFallback,
|
|
37
|
+
failure: options.failure,
|
|
38
|
+
}))
|
|
13
39
|
console.log(line);
|
|
14
40
|
};
|
|
15
41
|
export class MissingTwelveUiCredentialError extends Error {
|
|
16
|
-
|
|
17
|
-
|
|
42
|
+
journalErrorClass;
|
|
43
|
+
constructor(options = {}) {
|
|
44
|
+
const normalized = typeof options === 'string' ? { approvalUrl: options } : options;
|
|
45
|
+
super(authOnboardingMessage({
|
|
46
|
+
agentFacing: true,
|
|
47
|
+
approvalUrl: normalized.approvalUrl,
|
|
48
|
+
failure: normalized.failure,
|
|
49
|
+
staticFallback: normalized.staticFallback,
|
|
50
|
+
}));
|
|
18
51
|
this.name = 'MissingTwelveUiCredentialError';
|
|
52
|
+
this.journalErrorClass = normalized.failure?.errorClass;
|
|
19
53
|
}
|
|
20
54
|
}
|
|
21
55
|
//# sourceMappingURL=cli-auth-onboarding.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-auth-onboarding.js","sourceRoot":"","sources":["../src/cli-auth-onboarding.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,yBAAyB,GAAG,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-auth-onboarding.js","sourceRoot":"","sources":["../src/cli-auth-onboarding.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,yBAAyB,GAAG,8BAA8B,CAAC;AAQxE,MAAM,wBAAwB,GAAG,CAAC,OAIjC,EAAqB,EAAE;IACtB,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC;QAC3B,OAAO;YACL,OAAO,CAAC,OAAO,EAAE,MAAM;mBAClB,4GAA4G;YACjH,gEAAgE;YAChE,wBAAwB,OAAO,CAAC,WAAW,4DAA4D;SACxG,CAAC;IACJ,CAAC;IACD,OAAO;QACL,mDAAmD,OAAO,CAAC,WAAW,EAAE;QACxE,gDAAgD;QAChD,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KACrD,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,UAKlC,EAAE,EAAU,EAAE;IAChB,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,yBAAyB,CAAC;IACrE,MAAM,KAAK,GAAG,wBAAwB,CAAC;QACrC,WAAW;QACX,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO;QACL,GAAG,KAAK;QACR,OAAO,CAAC,cAAc;YACpB,CAAC,CAAC,oHAAoH;YACtH,CAAC,CAAC,6EAA6E;KAClF,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,UAIhC,EAAE,EAAQ,EAAE;IACd,KAAK,MAAM,IAAI,IAAI,wBAAwB,CAAC;QAC1C,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,yBAAyB;QAC7D,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;QAAE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AACxB,CAAC,CAAC;AAEF,MAAM,OAAO,8BAA+B,SAAQ,KAAK;IAC9C,iBAAiB,CAAU;IAEpC,YAAY,UAIR,EAAE;QACJ,MAAM,UAAU,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACpF,KAAK,CAAC,qBAAqB,CAAC;YAC1B,WAAW,EAAE,IAAI;YACjB,WAAW,EAAE,UAAU,CAAC,WAAW;YACnC,OAAO,EAAE,UAAU,CAAC,OAAO;YAC3B,cAAc,EAAE,UAAU,CAAC,cAAc;SAC1C,CAAC,CAAC,CAAC;QACJ,IAAI,CAAC,IAAI,GAAG,gCAAgC,CAAC;QAC7C,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC;IAC1D,CAAC;CACF"}
|
|
@@ -32,18 +32,13 @@ export declare const resolveBranchDirectory: (args: {
|
|
|
32
32
|
runDirArgument?: string;
|
|
33
33
|
outDirFlag?: string;
|
|
34
34
|
}) => Promise<ResolvedBranchDirectory>;
|
|
35
|
-
/** Validate every execute input before a detached parent creates its workspace. */
|
|
36
|
-
export declare const prepareDetachedBranchDirectory: (args: {
|
|
37
|
-
flags: CliFlags;
|
|
38
|
-
workspaceRoot?: string;
|
|
39
|
-
}) => Promise<ResolvedBranchDirectory>;
|
|
40
35
|
export declare const runBranchCommand: (action: string | undefined, flags: CliFlags, dependencies?: {
|
|
41
36
|
readConfig?: typeof readConversionConfig;
|
|
42
37
|
createBranchClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiBranchClient;
|
|
43
38
|
createPackageClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiConversionPackageClient;
|
|
44
39
|
createPrototypeLabelClient?: (config: ReturnType<typeof readConversionConfig>) => TwelveUiPrototypeLabelClient;
|
|
45
40
|
runPrototype?: typeof runPrototypePipeline;
|
|
46
|
-
/**
|
|
41
|
+
/** Public execute or resume run directory. */
|
|
47
42
|
runDirArgument?: string;
|
|
48
43
|
/** Test-only root for an automatically created run directory. */
|
|
49
44
|
workspaceRoot?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-branch-command.d.ts","sourceRoot":"","sources":["../src/cli-branch-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAqB,MAAM,oBAAoB,CAAC;AAsB7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAM7D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAOnE,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GAAU,MAAM;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,KAAG,OAAO,CAAC,uBAAuB,CAuBlC,CAAC;AAoGF,
|
|
1
|
+
{"version":3,"file":"cli-branch-command.d.ts","sourceRoot":"","sources":["../src/cli-branch-command.ts"],"names":[],"mappings":"AAIA,OAAO,EAA2B,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAI5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAqB,MAAM,oBAAoB,CAAC;AAsB7E,OAAO,EAAE,+BAA+B,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,4BAA4B,EAAE,MAAM,6BAA6B,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAM7D;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,IAOnE,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,gEAAgE;IAChE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,sBAAsB,GAAU,MAAM;IACjD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,KAAG,OAAO,CAAC,uBAAuB,CAuBlC,CAAC;AAoGF,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,MAAM,GAAG,SAAS,EAC1B,OAAO,QAAQ,EACf,eAAc;IACZ,UAAU,CAAC,EAAE,OAAO,oBAAoB,CAAC;IACzC,kBAAkB,CAAC,EAAE,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAAK,oBAAoB,CAAC;IAC/F,mBAAmB,CAAC,EAAE,CACpB,MAAM,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAC5C,+BAA+B,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAC3B,MAAM,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,KAC5C,4BAA4B,CAAC;IAClC,YAAY,CAAC,EAAE,OAAO,oBAAoB,CAAC;IAC3C,8CAA8C;IAC9C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iEAAiE;IACjE,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qEAAqE;IACrE,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC/B,cAAc,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;IAC1C,kDAAkD;IAClD,OAAO,CAAC,EAAE,eAAe,CAAC;CACtB,KACL,OAAO,CAAC,IAAI,CAqWd,CAAC"}
|
|
@@ -151,32 +151,6 @@ const readPageConcurrency = (flags) => {
|
|
|
151
151
|
}
|
|
152
152
|
return parsed;
|
|
153
153
|
};
|
|
154
|
-
/** Validate every execute input before a detached parent creates its workspace. */
|
|
155
|
-
export const prepareDetachedBranchDirectory = async (args) => {
|
|
156
|
-
const existing = stringFlag(args.flags, 'out-dir')?.trim();
|
|
157
|
-
if (existing)
|
|
158
|
-
return resolveBranchDirectory({ outDirFlag: existing });
|
|
159
|
-
await resolveBranchWinner({ flags: args.flags });
|
|
160
|
-
readScope(args.flags);
|
|
161
|
-
const concept = await readConcept(args.flags);
|
|
162
|
-
readConvert(args.flags);
|
|
163
|
-
if (booleanFlag(args.flags, 'prototype') && !readConvert(args.flags)) {
|
|
164
|
-
throw new CliRefusal('--prototype requires --convert html', 'branch_prototype_requires_html');
|
|
165
|
-
}
|
|
166
|
-
readMaxScreens(args.flags);
|
|
167
|
-
readPageConcurrency(args.flags);
|
|
168
|
-
const aspect = stringFlag(args.flags, 'aspect')?.trim();
|
|
169
|
-
if (aspect !== undefined && !['landscape', 'portrait', 'square'].includes(aspect)) {
|
|
170
|
-
throw new CliRefusal('--aspect must be landscape, portrait, or square', 'branch_aspect_invalid');
|
|
171
|
-
}
|
|
172
|
-
normalizeOptionalIdempotencyKey(stringFlag(args.flags, 'idempotency-key'), '--idempotency-key');
|
|
173
|
-
const paths = await createDraftWorkspace({
|
|
174
|
-
query: concept,
|
|
175
|
-
...(args.workspaceRoot ? { root: args.workspaceRoot } : {}),
|
|
176
|
-
});
|
|
177
|
-
await prepareOutputDirectory(paths.branchDir);
|
|
178
|
-
return { runDir: paths.runDir, branchDir: paths.branchDir };
|
|
179
|
-
};
|
|
180
154
|
export const runBranchCommand = async (action, flags, dependencies = {}) => {
|
|
181
155
|
if (action === 'status') {
|
|
182
156
|
// Merged into `12ui next` in 0.2.20, along with the other three status
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-branch-command.js","sourceRoot":"","sources":["../src/cli-branch-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli-branch-command.js","sourceRoot":"","sources":["../src/cli-branch-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export declare const CLI_CAPABILITIES: {
|
|
|
42
42
|
readonly conversionPackage: 360;
|
|
43
43
|
};
|
|
44
44
|
/**
|
|
45
|
-
* Long commands block
|
|
45
|
+
* Long network commands block in the foreground. While one runs, ONE status surface
|
|
46
46
|
* reports what is moving and what to do next, for every run shape; a caller
|
|
47
47
|
* must never infer progress from a directory listing. It replaced the four
|
|
48
48
|
* per-subsystem status spellings in 0.2.20.
|
|
@@ -60,17 +60,15 @@ export declare const CLI_CAPABILITIES: {
|
|
|
60
60
|
/**
|
|
61
61
|
* What the CLI did, written where the work landed.
|
|
62
62
|
*
|
|
63
|
-
*
|
|
64
|
-
*
|
|
65
|
-
*
|
|
66
|
-
* start and an end line here, including the workers it spawns, and a run's
|
|
67
|
-
* whole history is readable from the one file without asking the service.
|
|
63
|
+
* Single commands do several things, so every command that owns a workspace
|
|
64
|
+
* appends a start and an end line here. A run's whole history is readable
|
|
65
|
+
* from the one file without asking the service.
|
|
68
66
|
*/
|
|
69
67
|
readonly runJournal: {
|
|
70
68
|
readonly file: "<workspace>/journal.jsonl";
|
|
71
69
|
readonly schemaVersion: 1;
|
|
72
70
|
readonly format: "JSON lines, append-only, one start and one end per command";
|
|
73
|
-
readonly writtenBy:
|
|
71
|
+
readonly writtenBy: "every command that owns a workspace directory";
|
|
74
72
|
readonly records: readonly ["cmd", "args_digest", "run_id", "idempotency_key", "paid", "event", "outcome", "error_class", "artifacts", "purchased", "terminal", "detached", "pid"];
|
|
75
73
|
/** Argv is hashed, never written down, with credential values redacted first. */
|
|
76
74
|
readonly redacted: readonly ["--api-key"];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-capabilities.d.ts","sourceRoot":"","sources":["../src/cli-capabilities.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB;;;;;;;;;;;IAmB3B;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;;IAyBH;;;;;OAKG;;;;;;;;;;;IAeH
|
|
1
|
+
{"version":3,"file":"cli-capabilities.d.ts","sourceRoot":"","sources":["../src/cli-capabilities.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,gBAAgB;;;;;;;;;;;IAmB3B;;;;;;;;;;;OAWG;;;;;;;;;;;;;;;;;;;;;IAyBH;;;;;OAKG;;;;;;;;;;;IAeH;;;;;;OAMG;;;;;;;QAUD,iFAAiF;;;IAGnF;;;;;;OAMG;;;QAGD,yEAAyE;;;;;QASzE,6EAA6E;;QAE7E,6EAA6E;;;;;;;IAO/E,uEAAuE;;;;;;;;;;;;QAYrE;;;WAGG;;;;;;;;;;;;;;;;;CAiBG,CAAC"}
|
package/dist/cli-capabilities.js
CHANGED
|
@@ -59,7 +59,7 @@ export const CLI_CAPABILITIES = {
|
|
|
59
59
|
conversionPackage: OPERATION_DURATION_HINTS.package,
|
|
60
60
|
},
|
|
61
61
|
/**
|
|
62
|
-
* Long commands block
|
|
62
|
+
* Long network commands block in the foreground. While one runs, ONE status surface
|
|
63
63
|
* reports what is moving and what to do next, for every run shape; a caller
|
|
64
64
|
* must never infer progress from a directory listing. It replaced the four
|
|
65
65
|
* per-subsystem status spellings in 0.2.20.
|
|
@@ -81,18 +81,15 @@ export const CLI_CAPABILITIES = {
|
|
|
81
81
|
/**
|
|
82
82
|
* What the CLI did, written where the work landed.
|
|
83
83
|
*
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
* start and an end line here, including the workers it spawns, and a run's
|
|
88
|
-
* whole history is readable from the one file without asking the service.
|
|
84
|
+
* Single commands do several things, so every command that owns a workspace
|
|
85
|
+
* appends a start and an end line here. A run's whole history is readable
|
|
86
|
+
* from the one file without asking the service.
|
|
89
87
|
*/
|
|
90
88
|
runJournal: {
|
|
91
89
|
file: `<workspace>/${RUN_JOURNAL_FILENAME}`,
|
|
92
90
|
schemaVersion: RUN_JOURNAL_VERSION,
|
|
93
91
|
format: 'JSON lines, append-only, one start and one end per command',
|
|
94
|
-
writtenBy: 'every command that owns a workspace directory,
|
|
95
|
-
+ ' workers they spawn, which append to the same file',
|
|
92
|
+
writtenBy: 'every command that owns a workspace directory',
|
|
96
93
|
records: [
|
|
97
94
|
'cmd', 'args_digest', 'run_id', 'idempotency_key', 'paid', 'event',
|
|
98
95
|
'outcome', 'error_class', 'artifacts', 'purchased', 'terminal', 'detached', 'pid',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-capabilities.js","sourceRoot":"","sources":["../src/cli-capabilities.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,+BAA+B,EAC/B,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EACL,sBAAsB,EACtB,6BAA6B,GAC9B,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,+BAA+B,EAAE,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAE7E,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,MAAM,EAAE;QACN,WAAW;QACX,YAAY;QACZ,YAAY;QACZ,6BAA6B,CAAC,QAAQ;KACvC;IACD,OAAO,EAAE,sBAAsB;IAC/B,iBAAiB,EACf,2FAA2F;UACzF,2FAA2F;UAC3F,0FAA0F;IAC9F,WAAW,EAAE,iBAAiB;IAC9B,gBAAgB,EAAE;QAChB,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,sBAAsB;QAC/B,WAAW,EAAE,uFAAuF;KACrG;IACD;;;;;;;;;;;OAWG;IACH,OAAO,EAAE;QACP,KAAK,EAAE,CAAC,WAAW,EAAE,gBAAgB,CAAC;QACtC,QAAQ,EAAE,CAAC,YAAY,EAAE,qBAAqB,CAAC;QAC/C,iBAAiB,EAAE,CAAC;QACpB,iBAAiB,EAAE,sBAAsB;QACzC,OAAO,EAAE,mEAAmE;QAC5E,WAAW,EACT,6FAA6F;cAC3F,0FAA0F;cAC1F,wFAAwF;cACxF,gBAAgB;KACrB;IACD,mBAAmB,EAAE,+BAA+B;IACpD,eAAe,EAAE;QACf,OAAO,EAAE,yBAAyB,CAAC,OAAO;QAC1C,cAAc,EAAE,yBAAyB,CAAC,MAAM;QAChD,SAAS,EAAE,yBAAyB,CAAC,KAAK;QAC1C,oBAAoB,EAAE,wBAAwB,CAAC,oBAAoB;QACnE,WAAW,EAAE,wBAAwB,CAAC,WAAW;QACjD,YAAY,EAAE,wBAAwB,CAAC,YAAY;QACnD,aAAa,EAAE,wBAAwB,CAAC,UAAU;QAClD,aAAa,EAAE,wBAAwB,CAAC,UAAU;QAClD,iBAAiB,EAAE,wBAAwB,CAAC,OAAO;KACpD;IACD;;;;;OAKG;IACH,cAAc,EAAE;QACd,GAAG,EAAE,4BAA4B;QACjC,QAAQ,EAAE,mCAAmC;KAC9C;IACD,MAAM,EAAE;QACN,OAAO,EAAE,6BAA6B;QACtC,OAAO,EAAE,gCAAgC;QACzC,YAAY,EAAE,uBAAuB;QACrC,OAAO,EAAE;YACP,yCAAyC;YACzC,2CAA2C;YAC3C,0EAA0E;SAC3E;KACF;IACD
|
|
1
|
+
{"version":3,"file":"cli-capabilities.js","sourceRoot":"","sources":["../src/cli-capabilities.ts"],"names":[],"mappings":"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"}
|