@claudexor/cli 3.1.0 → 3.1.1
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/dist/acp-auth-command.d.ts +3 -0
- package/dist/acp-auth-command.d.ts.map +1 -0
- package/dist/acp-auth-command.js +18 -0
- package/dist/acp-auth-command.js.map +1 -0
- package/dist/acp-auth.d.ts +13 -0
- package/dist/acp-auth.d.ts.map +1 -0
- package/dist/acp-auth.js +47 -0
- package/dist/acp-auth.js.map +1 -0
- package/dist/bridge-serve.d.ts.map +1 -1
- package/dist/bridge-serve.js +2 -0
- package/dist/bridge-serve.js.map +1 -1
- package/dist/claudexord.d.ts.map +1 -1
- package/dist/claudexord.js +11 -15
- package/dist/claudexord.js.map +1 -1
- package/dist/cli.js +5 -6
- package/dist/cli.js.map +1 -1
- package/dist/command-flags.d.ts +0 -6
- package/dist/command-flags.d.ts.map +1 -1
- package/dist/command-flags.js +8 -1
- package/dist/command-flags.js.map +1 -1
- package/dist/command-registry.js +3 -3
- package/dist/command-registry.js.map +1 -1
- package/dist/control-services.d.ts +9 -9
- package/dist/ops-commands.d.ts +5 -1
- package/dist/ops-commands.d.ts.map +1 -1
- package/dist/ops-commands.js +4 -2
- package/dist/ops-commands.js.map +1 -1
- package/dist/repo-asset-authority.d.ts +9 -13
- package/dist/repo-asset-authority.d.ts.map +1 -1
- package/dist/repo-asset-authority.js +41 -44
- package/dist/repo-asset-authority.js.map +1 -1
- package/dist/retry-command.d.ts +15 -0
- package/dist/retry-command.d.ts.map +1 -1
- package/dist/retry-command.js +7 -4
- package/dist/retry-command.js.map +1 -1
- package/dist/reviewer-options.d.ts +11 -1
- package/dist/reviewer-options.d.ts.map +1 -1
- package/dist/reviewer-options.js +24 -9
- package/dist/reviewer-options.js.map +1 -1
- package/dist/run-options.d.ts.map +1 -1
- package/dist/run-options.js +13 -1
- package/dist/run-options.js.map +1 -1
- package/dist/settings-service.d.ts +64 -22
- package/dist/settings-service.d.ts.map +1 -1
- package/dist/settings-service.js +95 -30
- package/dist/settings-service.js.map +1 -1
- package/dist/setup-job-store.d.ts +2 -2
- package/dist/setup-login-inline.d.ts +2 -0
- package/dist/setup-login-inline.d.ts.map +1 -1
- package/dist/setup-login-inline.js +4 -3
- package/dist/setup-login-inline.js.map +1 -1
- package/dist/setup-login-protocol.d.ts +2 -2
- package/dist/setup-login-protocol.d.ts.map +1 -1
- package/dist/setup-login-protocol.js.map +1 -1
- package/dist/thread-execution-workspace.d.ts +22 -0
- package/dist/thread-execution-workspace.d.ts.map +1 -0
- package/dist/thread-execution-workspace.js +21 -0
- package/dist/thread-execution-workspace.js.map +1 -0
- package/package.json +23 -23
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retry-command.js","sourceRoot":"","sources":["../src/retry-command.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"retry-command.js","sourceRoot":"","sources":["../src/retry-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,16 @@ export declare function parseReviewerModelMap(value: string | undefined): Partia
|
|
|
13
13
|
* into an ordered reviewer list. Entries are harness-id based, not
|
|
14
14
|
* provider-family based, so repeated harnesses are preserved for multi-model
|
|
15
15
|
* panels on the same native provider.
|
|
16
|
+
*
|
|
17
|
+
* `advertisedEfforts` disambiguates a trailing `:token`: every slug is a
|
|
18
|
+
* well-formed effort, so only membership in a harness-ADVERTISED set can say
|
|
19
|
+
* whether `cursor=org:model:v2` ends in an effort or a model-id segment. The
|
|
20
|
+
* set is the union across harnesses (the harness's live manifest is not
|
|
21
|
+
* resolvable at flag-parse time); a level outside it stays part of the model
|
|
22
|
+
* id or, in the `harness:effort` spelling, is refused — the unambiguous
|
|
23
|
+
* `--reviewer-effort family=level` spelling carries any level the set has not
|
|
24
|
+
* caught up with. The macOS composer applies the same rule with its live
|
|
25
|
+
* manifest union (`ComposerOptionParser`).
|
|
16
26
|
*/
|
|
17
|
-
export declare function parseReviewerPanel(value: string | undefined): ControlReviewerPanelEntry[] | undefined;
|
|
27
|
+
export declare function parseReviewerPanel(value: string | undefined, advertisedEfforts: ReadonlySet<string>): ControlReviewerPanelEntry[] | undefined;
|
|
18
28
|
//# sourceMappingURL=reviewer-options.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reviewer-options.d.ts","sourceRoot":"","sources":["../src/reviewer-options.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"reviewer-options.d.ts","sourceRoot":"","sources":["../src/reviewer-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EACd,KAAK,yBAAyB,EAC9B,KAAK,UAAU,IAAI,eAAe,EACnC,MAAM,mBAAmB,CAAC;AAE3B,4FAA4F;AAC5F,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,GAAG,SAAS,CAuB9D;AAED;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,GAAG,SAAS,GACxB,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAqBrD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,GAAG,SAAS,EACzB,iBAAiB,EAAE,WAAW,CAAC,MAAM,CAAC,GACrC,yBAAyB,EAAE,GAAG,SAAS,CAsDzC"}
|
package/dist/reviewer-options.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EffortHint, ProviderFamily, } from "@claudexor/schema";
|
|
1
|
+
import { EFFORT_HINT_HELP, EffortHint, ProviderFamily, } from "@claudexor/schema";
|
|
2
2
|
/** Parse `--reviewer-effort openai=xhigh,anthropic=high` into the control-api DTO shape. */
|
|
3
3
|
export function parseReviewerEffortMap(value) {
|
|
4
4
|
if (value === undefined)
|
|
@@ -20,7 +20,7 @@ export function parseReviewerEffortMap(value) {
|
|
|
20
20
|
throw new Error(`invalid reviewer provider '${family}' (expected openai|anthropic|google|cursor|opencode|xai|local|unknown)`);
|
|
21
21
|
const parsed = EffortHint.safeParse(effort);
|
|
22
22
|
if (!parsed.success)
|
|
23
|
-
throw new Error(`invalid reviewer effort '${effort}' (expected
|
|
23
|
+
throw new Error(`invalid reviewer effort '${effort}' (expected a ${EFFORT_HINT_HELP})`);
|
|
24
24
|
map[parsedFamily.data] = parsed.data;
|
|
25
25
|
}
|
|
26
26
|
return Object.keys(map).length > 0 ? map : undefined;
|
|
@@ -59,8 +59,18 @@ export function parseReviewerModelMap(value) {
|
|
|
59
59
|
* into an ordered reviewer list. Entries are harness-id based, not
|
|
60
60
|
* provider-family based, so repeated harnesses are preserved for multi-model
|
|
61
61
|
* panels on the same native provider.
|
|
62
|
+
*
|
|
63
|
+
* `advertisedEfforts` disambiguates a trailing `:token`: every slug is a
|
|
64
|
+
* well-formed effort, so only membership in a harness-ADVERTISED set can say
|
|
65
|
+
* whether `cursor=org:model:v2` ends in an effort or a model-id segment. The
|
|
66
|
+
* set is the union across harnesses (the harness's live manifest is not
|
|
67
|
+
* resolvable at flag-parse time); a level outside it stays part of the model
|
|
68
|
+
* id or, in the `harness:effort` spelling, is refused — the unambiguous
|
|
69
|
+
* `--reviewer-effort family=level` spelling carries any level the set has not
|
|
70
|
+
* caught up with. The macOS composer applies the same rule with its live
|
|
71
|
+
* manifest union (`ComposerOptionParser`).
|
|
62
72
|
*/
|
|
63
|
-
export function parseReviewerPanel(value) {
|
|
73
|
+
export function parseReviewerPanel(value, advertisedEfforts) {
|
|
64
74
|
if (value === undefined)
|
|
65
75
|
return undefined;
|
|
66
76
|
const out = [];
|
|
@@ -78,10 +88,14 @@ export function parseReviewerPanel(value) {
|
|
|
78
88
|
const colon = harness.lastIndexOf(":");
|
|
79
89
|
if (colon > -1) {
|
|
80
90
|
const suffix = harness.slice(colon + 1).trim();
|
|
81
|
-
|
|
82
|
-
|
|
91
|
+
// Disambiguation keys off the ADVERTISED set, not the open vocabulary:
|
|
92
|
+
// every slug is a well-formed effort, so accepting any of them here
|
|
93
|
+
// would make `cursor=org:model:v2` swallow `v2`. A level the set does
|
|
94
|
+
// not know rides the unambiguous `--reviewer-effort family=level`
|
|
95
|
+
// spelling instead.
|
|
96
|
+
if (!advertisedEfforts.has(suffix))
|
|
83
97
|
throw new Error(`invalid --reviewer-panel entry '${pair}' (expected harness[:effort] or harness[=model[:effort]])`);
|
|
84
|
-
effort =
|
|
98
|
+
effort = suffix;
|
|
85
99
|
harness = harness.slice(0, colon).trim();
|
|
86
100
|
}
|
|
87
101
|
}
|
|
@@ -92,9 +106,10 @@ export function parseReviewerPanel(value) {
|
|
|
92
106
|
const colon = model.lastIndexOf(":");
|
|
93
107
|
if (colon > -1) {
|
|
94
108
|
const suffix = model.slice(colon + 1).trim();
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
109
|
+
// Same advertised-set disambiguation: a colon suffix no harness
|
|
110
|
+
// advertises stays part of the model id (`org:model:v2`).
|
|
111
|
+
if (advertisedEfforts.has(suffix)) {
|
|
112
|
+
effort = suffix;
|
|
98
113
|
model = model.slice(0, colon).trim();
|
|
99
114
|
if (!model)
|
|
100
115
|
throw new Error(`invalid --reviewer-panel entry '${pair}' (missing model after '=')`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reviewer-options.js","sourceRoot":"","sources":["../src/reviewer-options.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,cAAc,GAGf,MAAM,mBAAmB,CAAC;AAE3B,4FAA4F;AAC5F,MAAM,UAAU,sBAAsB,CACpC,KAAyB;IAEzB,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC1C,MAAM,GAAG,GAAqD,EAAE,CAAC;IACjE,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QAC3F,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,MAAM,MAAM,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC3D,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM;YAAE,SAAS;QACjC,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,4BAA4B,CAAC,CAAC;QACxF,MAAM,YAAY,GAAG,cAAc,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,OAAO;YACvB,MAAM,IAAI,KAAK,CACb,8BAA8B,MAAM,wEAAwE,CAC7G,CAAC;QACJ,MAAM,MAAM,GAAG,UAAU,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC5C,IAAI,CAAC,MAAM,CAAC,OAAO;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,
|
|
1
|
+
{"version":3,"file":"reviewer-options.js","sourceRoot":"","sources":["../src/reviewer-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-options.d.ts","sourceRoot":"","sources":["../src/run-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,UAAU,EACV,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"run-options.d.ts","sourceRoot":"","sources":["../src/run-options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,UAAU,EACV,qBAAqB,EACrB,cAAc,EACd,qBAAqB,EACtB,MAAM,mBAAmB,CAAC;AAoB3B,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAKxF;AAED,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,GAC9B,qBAAqB,EAAE,GAAG,SAAS,CAarC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,GAC9B,qBAAqB,EAAE,GAAG,SAAS,CAqCrC;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,GAC9B,yBAAyB,EAAE,GAAG,SAAS,CAMzC;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAGrD;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,OAAO,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,GAAG,SAAS,CAGzD"}
|
package/dist/run-options.js
CHANGED
|
@@ -1,4 +1,16 @@
|
|
|
1
|
+
import { CLAUDE_EFFORT_SNAPSHOT } from "@claudexor/harness-claude";
|
|
2
|
+
import { CODEX_EFFORT_SNAPSHOT, unionEffortLevels } from "@claudexor/harness-codex";
|
|
1
3
|
import { parseReviewerEffortMap, parseReviewerModelMap, parseReviewerPanel, } from "./reviewer-options.js";
|
|
4
|
+
/**
|
|
5
|
+
* Effort levels the recorded vendor snapshots advertise, unioned across
|
|
6
|
+
* harnesses — the CLI's parse-time answer to "could this `:token` be an
|
|
7
|
+
* effort?". Stamped vendor data (the same snapshots discovery falls back to),
|
|
8
|
+
* never a hand-ranked table; a live-only level the snapshots have not caught
|
|
9
|
+
* up with rides the unambiguous `--reviewer-effort family=level` spelling.
|
|
10
|
+
*/
|
|
11
|
+
function snapshotAdvertisedEfforts() {
|
|
12
|
+
return new Set([...CLAUDE_EFFORT_SNAPSHOT, ...unionEffortLevels(CODEX_EFFORT_SNAPSHOT.models)]);
|
|
13
|
+
}
|
|
2
14
|
export function stringFlagValues(values, flag) {
|
|
3
15
|
const strings = values.filter((value) => typeof value === "string");
|
|
4
16
|
if (strings.length !== values.length)
|
|
@@ -59,7 +71,7 @@ export function parseTestCommandFlags(values) {
|
|
|
59
71
|
}
|
|
60
72
|
export function parseReviewerPanelFlags(values) {
|
|
61
73
|
const strings = stringFlagValues(values, "reviewer-panel");
|
|
62
|
-
return parseReviewerPanel(strings.length > 0 ? strings.join(",") : undefined);
|
|
74
|
+
return parseReviewerPanel(strings.length > 0 ? strings.join(",") : undefined, snapshotAdvertisedEfforts());
|
|
63
75
|
}
|
|
64
76
|
export function parseReviewerModelFlags(values) {
|
|
65
77
|
const strings = stringFlagValues(values, "reviewer-model");
|
package/dist/run-options.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-options.js","sourceRoot":"","sources":["../src/run-options.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"run-options.js","sourceRoot":"","sources":["../src/run-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@
|
|
|
3
3
|
*
|
|
4
4
|
* STRICT (INV-104): persisted routing ids must be REAL registered
|
|
5
5
|
* harnesses (fakes are test fixtures, never persistable routing targets),
|
|
6
|
-
* model values must pass the harness's model truth source, and effort
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* later as an opaque
|
|
6
|
+
* model values must pass the harness's model truth source, and the effort a
|
|
7
|
+
* harness ends up holding must be on the ladder of the model it ends up
|
|
8
|
+
* pointing at. All violations are 400s naming the harness, the value, and the
|
|
9
|
+
* truth source — a bad value must never be persisted to die later as an opaque
|
|
10
|
+
* native error.
|
|
10
11
|
*/
|
|
11
|
-
import type { ControlSettingsUpdateRequest, GlobalConfig as GlobalConfigT, QualityTierSet, RoutingGoal } from "@claudexor/schema";
|
|
12
|
+
import type { ControlSettingsUpdateRequest, GlobalConfig as GlobalConfigT, HarnessCapabilities, QualityTierSet, RoutingGoal } from "@claudexor/schema";
|
|
12
13
|
export declare function settingsSnapshot(repoRoot: string): {
|
|
13
14
|
sources: string[];
|
|
14
15
|
interactionTimeoutMs: number;
|
|
@@ -19,10 +20,10 @@ export declare function settingsSnapshot(repoRoot: string): {
|
|
|
19
20
|
authPreference: "api_key" | "auto" | "subscription";
|
|
20
21
|
goal: "auto" | "quality" | "economy";
|
|
21
22
|
paidFallback: "never" | "when_unavailable" | "allowed_within_cap";
|
|
22
|
-
qualityTiers: Partial<Record<"
|
|
23
|
+
qualityTiers: Partial<Record<"plan" | "review" | "synthesize" | "spec" | "implement" | "create_from_scratch" | "repair" | "verify" | "explain" | "audit", {
|
|
23
24
|
harness: string;
|
|
24
25
|
model: string;
|
|
25
|
-
effort:
|
|
26
|
+
effort: string;
|
|
26
27
|
}[][]>>;
|
|
27
28
|
};
|
|
28
29
|
budget: {
|
|
@@ -47,13 +48,13 @@ export declare function settingsSnapshot(repoRoot: string): {
|
|
|
47
48
|
enabled: boolean;
|
|
48
49
|
nativeCredentialsEnabled: boolean;
|
|
49
50
|
defaultModel: string | null;
|
|
50
|
-
effort:
|
|
51
|
+
effort: string | null;
|
|
51
52
|
maxTurns: number | null;
|
|
52
53
|
maxRounds: number | null;
|
|
53
54
|
toolsAllow: string[];
|
|
54
55
|
toolsDeny: string[];
|
|
55
56
|
fallbackModel: string | null;
|
|
56
|
-
web: "auto" | "
|
|
57
|
+
web: "auto" | "off" | "cached" | "live";
|
|
57
58
|
authPreference: "api_key" | "auto" | "subscription";
|
|
58
59
|
profileLimitAction: "fail" | "ask" | "rotate";
|
|
59
60
|
};
|
|
@@ -69,19 +70,57 @@ export declare function settingsSnapshot(repoRoot: string): {
|
|
|
69
70
|
*/
|
|
70
71
|
export declare function assertRoutingGoalTiersConsistent(goal: RoutingGoal, tiers: QualityTierSet): void;
|
|
71
72
|
/**
|
|
72
|
-
*
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
*
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
*
|
|
73
|
+
* Manifest effort facts for the harnesses ONE patch touches, resolved once from
|
|
74
|
+
* live manifests (`discover()`, which spawns vendor CLIs) so the merged-effective
|
|
75
|
+
* effort invariant can be re-checked SYNCHRONOUSLY inside the config lock without
|
|
76
|
+
* probing again. `null` means the harness has no adapter to ask.
|
|
77
|
+
*/
|
|
78
|
+
export type PatchEffortCapabilities = ReadonlyMap<string, HarnessCapabilities | null>;
|
|
79
|
+
/**
|
|
80
|
+
* The merged-effective (model, effort) invariant (INV-104 pairing): an effort
|
|
81
|
+
* ceiling belongs to the MODEL, so the effort a harness ends up holding must sit
|
|
82
|
+
* on the ladder of the model it ends up pointing at.
|
|
83
|
+
*
|
|
84
|
+
* Only the MERGE tells the truth here, because either half of the pair can arrive
|
|
85
|
+
* alone. An effort-only patch inherits the STORED default model, whose ladder may
|
|
86
|
+
* be narrower than the harness-wide union (`gpt-5.5` stops at `xhigh` while the
|
|
87
|
+
* union carries `ultra`), so judging it against the union accepted a setting the
|
|
88
|
+
* routed model rejects. A defaultModel-only patch inherits the STORED effort, so
|
|
89
|
+
* skipping the effort check entirely let a narrowing model silently strand an
|
|
90
|
+
* already-saved effort.
|
|
91
|
+
*
|
|
92
|
+
* `harnesses` is the ALREADY-MERGED settings map (patch folded over stored, via
|
|
93
|
+
* `applyHarnessSettingsPatches` — the same merge the persist path uses, so
|
|
94
|
+
* validation can never disagree with what gets written). `capabilities` is keyed
|
|
95
|
+
* by the ids whose pair this write actually touches, so an unrelated write to a
|
|
96
|
+
* harness whose stored pair drifted (a vendor narrowing a ladder under a value
|
|
97
|
+
* saved long ago) is not turned into a refusal. A model the manifest records no
|
|
98
|
+
* ladder for keeps the harness-wide union rather than becoming a hard refusal —
|
|
99
|
+
* that fallback is `effortLevelsForModel`'s, the ONE owner of the lookup.
|
|
100
|
+
*
|
|
101
|
+
* Pure + synchronous so it runs BOTH as the pre-lock fast-fail and inside the
|
|
102
|
+
* locked read-mutate-write cycle, exactly like `assertRoutingGoalTiersConsistent`.
|
|
103
|
+
*/
|
|
104
|
+
export declare function assertHarnessEffortPairsValid(harnesses: GlobalConfigT["harnesses"], capabilities: PatchEffortCapabilities): void;
|
|
105
|
+
/**
|
|
106
|
+
* `current` is the currently-stored state this write merges over, and is
|
|
107
|
+
* REQUIRED: the merged-effective invariants (goal/tiers per D-9/#22, and the
|
|
108
|
+
* per-harness model/effort pair per INV-104) can only be enforced against the
|
|
109
|
+
* stored state, so making it optional would let a future writer call this +
|
|
110
|
+
* `updateGlobalConfig` directly and silently bypass the fences. The effective
|
|
111
|
+
* value is the patch's field when present, otherwise the stored one;
|
|
112
|
+
* `qualityTiers` REPLACES wholesale exactly as the persist path merges it
|
|
113
|
+
* (control-services updateSettings), so a patch clearing tiers ({}) is honored
|
|
114
|
+
* here too.
|
|
115
|
+
*
|
|
116
|
+
* Returns the manifest effort facts it probed, so `commitSettingsUpdate` can
|
|
117
|
+
* re-run the pair invariant under the lock without spawning the vendor CLIs twice.
|
|
80
118
|
*/
|
|
81
119
|
export declare function assertSettingsPatchValid(p: ControlSettingsUpdateRequest, current: {
|
|
82
120
|
goal: RoutingGoal;
|
|
83
121
|
qualityTiers: QualityTierSet;
|
|
84
|
-
|
|
122
|
+
harnesses: GlobalConfigT["harnesses"];
|
|
123
|
+
}): Promise<PatchEffortCapabilities>;
|
|
85
124
|
/**
|
|
86
125
|
* Merge a validated settings patch into the snake_case GlobalConfig shape. Pure
|
|
87
126
|
* fold of patch-over-current — no I/O, no validation — so the ONLY authority
|
|
@@ -103,10 +142,13 @@ export declare function mergeSettingsPatch(cfg: GlobalConfigT, p: ControlSetting
|
|
|
103
142
|
* The fix serializes the whole transaction on the ONE config lock
|
|
104
143
|
* (`updateGlobalConfig` holds it across the read-mutate-write): the pre-lock
|
|
105
144
|
* `assertSettingsPatchValid` still runs the async patch-local truth checks
|
|
106
|
-
* (harness ids,
|
|
107
|
-
*
|
|
108
|
-
*
|
|
109
|
-
*
|
|
145
|
+
* (harness ids, models — these never race) and a fast-fail, but EVERY
|
|
146
|
+
* merged-effective invariant is RE-CHECKED against the EXACT merged config under
|
|
147
|
+
* the lock, so an invalid final combination can never be persisted regardless of
|
|
148
|
+
* interleaving. The per-harness (model, effort) pair is merged-effective too — a
|
|
149
|
+
* racing writer can narrow `default_model` under an effort this one validated —
|
|
150
|
+
* so it is re-checked here as well, from the manifest facts the pre-lock pass
|
|
151
|
+
* already probed (no second vendor-CLI spawn under the lock).
|
|
110
152
|
*/
|
|
111
153
|
export declare function commitSettingsUpdate(repoRoot: string, p: ControlSettingsUpdateRequest): Promise<void>;
|
|
112
154
|
/** Merge camelCase per-harness patches into the snake_case GlobalConfig shape. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-service.d.ts","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"settings-service.d.ts","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,KAAK,EACV,4BAA4B,EAC5B,YAAY,IAAI,aAAa,EAC7B,mBAAmB,EACnB,cAAc,EACd,WAAW,EACZ,MAAM,mBAAmB,CAAC;AAO3B,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA4ChD;AAyBD;;;;;;;GAOG;AACH,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,cAAc,GAAG,IAAI,CAM/F;AAED;;;;;GAKG;AACH,MAAM,MAAM,uBAAuB,GAAG,WAAW,CAAC,MAAM,EAAE,mBAAmB,GAAG,IAAI,CAAC,CAAC;AAEtF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,EACrC,YAAY,EAAE,uBAAuB,GACpC,IAAI,CAcN;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAsB,wBAAwB,CAC5C,CAAC,EAAE,4BAA4B,EAC/B,OAAO,EAAE;IACP,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,EAAE,cAAc,CAAC;IAC7B,SAAS,EAAE,aAAa,CAAC,WAAW,CAAC,CAAC;CACvC,GACA,OAAO,CAAC,uBAAuB,CAAC,CAkHlC;AAWD;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,aAAa,EAClB,CAAC,EAAE,4BAA4B,GAC9B,aAAa,CAoBf;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,oBAAoB,CACxC,QAAQ,EAAE,MAAM,EAChB,CAAC,EAAE,4BAA4B,GAC9B,OAAO,CAAC,IAAI,CAAC,CAsBf;AAED,kFAAkF;AAClF,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,aAAa,CAAC,WAAW,CAAC,EACnC,OAAO,EAAE,4BAA4B,CAAC,WAAW,CAAC,GACjD,aAAa,CAAC,WAAW,CAAC,CA2C5B"}
|
package/dist/settings-service.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { GlobalConfig } from "@claudexor/schema";
|
|
2
2
|
import { validateModel } from "@claudexor/core";
|
|
3
|
+
import { effortLevelsForModel } from "@claudexor/schema";
|
|
3
4
|
import { loadConfig, updateGlobalConfig } from "@claudexor/config";
|
|
4
5
|
import { buildRegistry, harnessModels } from "./registry.js";
|
|
5
6
|
export function settingsSnapshot(repoRoot) {
|
|
@@ -79,18 +80,63 @@ export function assertRoutingGoalTiersConsistent(goal, tiers) {
|
|
|
79
80
|
}
|
|
80
81
|
}
|
|
81
82
|
/**
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
87
|
-
*
|
|
88
|
-
*
|
|
89
|
-
*
|
|
83
|
+
* The merged-effective (model, effort) invariant (INV-104 pairing): an effort
|
|
84
|
+
* ceiling belongs to the MODEL, so the effort a harness ends up holding must sit
|
|
85
|
+
* on the ladder of the model it ends up pointing at.
|
|
86
|
+
*
|
|
87
|
+
* Only the MERGE tells the truth here, because either half of the pair can arrive
|
|
88
|
+
* alone. An effort-only patch inherits the STORED default model, whose ladder may
|
|
89
|
+
* be narrower than the harness-wide union (`gpt-5.5` stops at `xhigh` while the
|
|
90
|
+
* union carries `ultra`), so judging it against the union accepted a setting the
|
|
91
|
+
* routed model rejects. A defaultModel-only patch inherits the STORED effort, so
|
|
92
|
+
* skipping the effort check entirely let a narrowing model silently strand an
|
|
93
|
+
* already-saved effort.
|
|
94
|
+
*
|
|
95
|
+
* `harnesses` is the ALREADY-MERGED settings map (patch folded over stored, via
|
|
96
|
+
* `applyHarnessSettingsPatches` — the same merge the persist path uses, so
|
|
97
|
+
* validation can never disagree with what gets written). `capabilities` is keyed
|
|
98
|
+
* by the ids whose pair this write actually touches, so an unrelated write to a
|
|
99
|
+
* harness whose stored pair drifted (a vendor narrowing a ladder under a value
|
|
100
|
+
* saved long ago) is not turned into a refusal. A model the manifest records no
|
|
101
|
+
* ladder for keeps the harness-wide union rather than becoming a hard refusal —
|
|
102
|
+
* that fallback is `effortLevelsForModel`'s, the ONE owner of the lookup.
|
|
103
|
+
*
|
|
104
|
+
* Pure + synchronous so it runs BOTH as the pre-lock fast-fail and inside the
|
|
105
|
+
* locked read-mutate-write cycle, exactly like `assertRoutingGoalTiersConsistent`.
|
|
106
|
+
*/
|
|
107
|
+
export function assertHarnessEffortPairsValid(harnesses, capabilities) {
|
|
108
|
+
for (const [id, caps] of capabilities) {
|
|
109
|
+
const settings = harnesses[id];
|
|
110
|
+
const effort = settings?.effort ?? null;
|
|
111
|
+
if (!effort)
|
|
112
|
+
continue;
|
|
113
|
+
const model = settings?.default_model ?? null;
|
|
114
|
+
const ladder = caps ? effortLevelsForModel(caps, model) : [];
|
|
115
|
+
if (ladder.includes(effort))
|
|
116
|
+
continue;
|
|
117
|
+
badRequest(ladder.length === 0
|
|
118
|
+
? `harness '${id}' declares no effort ladder; leave effort unset`
|
|
119
|
+
: `harness '${id}'${model ? ` model '${model}'` : ""} does not accept effort '${effort}' (advertised: ${ladder.join(", ")})`);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
/**
|
|
123
|
+
* `current` is the currently-stored state this write merges over, and is
|
|
124
|
+
* REQUIRED: the merged-effective invariants (goal/tiers per D-9/#22, and the
|
|
125
|
+
* per-harness model/effort pair per INV-104) can only be enforced against the
|
|
126
|
+
* stored state, so making it optional would let a future writer call this +
|
|
127
|
+
* `updateGlobalConfig` directly and silently bypass the fences. The effective
|
|
128
|
+
* value is the patch's field when present, otherwise the stored one;
|
|
129
|
+
* `qualityTiers` REPLACES wholesale exactly as the persist path merges it
|
|
130
|
+
* (control-services updateSettings), so a patch clearing tiers ({}) is honored
|
|
131
|
+
* here too.
|
|
132
|
+
*
|
|
133
|
+
* Returns the manifest effort facts it probed, so `commitSettingsUpdate` can
|
|
134
|
+
* re-run the pair invariant under the lock without spawning the vendor CLIs twice.
|
|
90
135
|
*/
|
|
91
136
|
export async function assertSettingsPatchValid(p, current) {
|
|
92
137
|
const realIds = new Set(buildRegistry({ includeFakes: false }).keys());
|
|
93
138
|
const realList = [...realIds].sort().join(", ");
|
|
139
|
+
const effortCapabilities = new Map();
|
|
94
140
|
if (p.primaryHarness) {
|
|
95
141
|
if (!realIds.has(p.primaryHarness)) {
|
|
96
142
|
badRequest(`primaryHarness '${p.primaryHarness}' is not a real registered harness (expected one of: ${realList})`);
|
|
@@ -112,8 +158,15 @@ export async function assertSettingsPatchValid(p, current) {
|
|
|
112
158
|
if (model.status !== "ok")
|
|
113
159
|
badRequest(model.message ?? `model '${route.model}' was refused`);
|
|
114
160
|
const manifest = await buildRegistry().get(route.harness)?.discover();
|
|
115
|
-
|
|
116
|
-
|
|
161
|
+
// A tier names harness AND model, so hold it to what that MODEL
|
|
162
|
+
// advertises rather than the harness-wide union. No merge is involved
|
|
163
|
+
// here, unlike the per-harness pair below: a tier route is a COMPLETE
|
|
164
|
+
// (harness, model, effort) triple and `qualityTiers` replaces wholesale,
|
|
165
|
+
// so `route.model`/`route.effort` already ARE the effective pair.
|
|
166
|
+
const advertised = manifest ? effortLevelsForModel(manifest.capabilities, route.model) : [];
|
|
167
|
+
if (!advertised.includes(route.effort)) {
|
|
168
|
+
badRequest(`quality tier route '${route.harness}/${route.model}' does not accept effort '${route.effort}'` +
|
|
169
|
+
(advertised.length > 0 ? ` (advertised: ${advertised.join(", ")})` : ""));
|
|
117
170
|
}
|
|
118
171
|
}
|
|
119
172
|
}
|
|
@@ -139,24 +192,28 @@ export async function assertSettingsPatchValid(p, current) {
|
|
|
139
192
|
}
|
|
140
193
|
}
|
|
141
194
|
}
|
|
142
|
-
|
|
195
|
+
// Touching EITHER half of the (model, effort) pair puts the merged pair up for
|
|
196
|
+
// validation, so this only resolves the manifest facts; the pair itself is
|
|
197
|
+
// judged from the merged settings below. A patch that touches neither half is
|
|
198
|
+
// left alone — see `assertHarnessEffortPairsValid`.
|
|
199
|
+
if (patch.effort !== undefined || patch.defaultModel !== undefined) {
|
|
143
200
|
const adapter = buildRegistry().get(id);
|
|
144
|
-
let ladder = [];
|
|
145
201
|
try {
|
|
146
|
-
|
|
202
|
+
effortCapabilities.set(id, adapter ? (await adapter.discover()).capabilities : null);
|
|
147
203
|
}
|
|
148
204
|
catch (err) {
|
|
149
205
|
// A harness whose manifest cannot be discovered (binary missing) still
|
|
150
206
|
// 400s honestly rather than bubbling a raw error out of the endpoint.
|
|
151
207
|
badRequest(`cannot verify effort for '${id}': ${err instanceof Error ? err.message : String(err)}`);
|
|
152
208
|
}
|
|
153
|
-
if (!ladder.includes(patch.effort)) {
|
|
154
|
-
badRequest(ladder.length === 0
|
|
155
|
-
? `harness '${id}' declares no effort ladder; leave effort unset`
|
|
156
|
-
: `harness '${id}' does not accept effort '${patch.effort}' (declared ladder: ${ladder.join(", ")})`);
|
|
157
|
-
}
|
|
158
209
|
}
|
|
159
210
|
}
|
|
211
|
+
// INV-104 pairing, against the MERGED settings rather than the patch fields:
|
|
212
|
+
// the effort a harness will hold must be on the ladder of the model it will
|
|
213
|
+
// point at, whichever half of the pair this write supplied.
|
|
214
|
+
if (effortCapabilities.size > 0) {
|
|
215
|
+
assertHarnessEffortPairsValid(applyHarnessSettingsPatches(current.harnesses, p.harnesses), effortCapabilities);
|
|
216
|
+
}
|
|
160
217
|
// D-9/#22 server half: validate the MERGED EFFECTIVE routing, not just the
|
|
161
218
|
// patch. If the write would leave `goal: quality` with zero configured tiers
|
|
162
219
|
// across every intent, the engine would refuse EVERY quality run at preflight
|
|
@@ -169,6 +226,7 @@ export async function assertSettingsPatchValid(p, current) {
|
|
|
169
226
|
const effectiveGoal = p.routingGoal ?? current.goal;
|
|
170
227
|
const effectiveTiers = p.qualityTiers ?? current.qualityTiers;
|
|
171
228
|
assertRoutingGoalTiersConsistent(effectiveGoal, effectiveTiers);
|
|
229
|
+
return effortCapabilities;
|
|
172
230
|
}
|
|
173
231
|
const nullableSettingName = (value, current) => {
|
|
174
232
|
if (value === undefined)
|
|
@@ -218,27 +276,34 @@ export function mergeSettingsPatch(cfg, p) {
|
|
|
218
276
|
* The fix serializes the whole transaction on the ONE config lock
|
|
219
277
|
* (`updateGlobalConfig` holds it across the read-mutate-write): the pre-lock
|
|
220
278
|
* `assertSettingsPatchValid` still runs the async patch-local truth checks
|
|
221
|
-
* (harness ids,
|
|
222
|
-
*
|
|
223
|
-
*
|
|
224
|
-
*
|
|
279
|
+
* (harness ids, models — these never race) and a fast-fail, but EVERY
|
|
280
|
+
* merged-effective invariant is RE-CHECKED against the EXACT merged config under
|
|
281
|
+
* the lock, so an invalid final combination can never be persisted regardless of
|
|
282
|
+
* interleaving. The per-harness (model, effort) pair is merged-effective too — a
|
|
283
|
+
* racing writer can narrow `default_model` under an effort this one validated —
|
|
284
|
+
* so it is re-checked here as well, from the manifest facts the pre-lock pass
|
|
285
|
+
* already probed (no second vendor-CLI spawn under the lock).
|
|
225
286
|
*/
|
|
226
287
|
export async function commitSettingsUpdate(repoRoot, p) {
|
|
227
|
-
const
|
|
228
|
-
// Pre-lock: the patch-local truth (harness ids, models,
|
|
229
|
-
// fast-fail on the
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
288
|
+
const currentGlobal = loadConfig(repoRoot).global;
|
|
289
|
+
// Pre-lock: the patch-local truth (harness ids, models), the manifest effort
|
|
290
|
+
// facts, and a fast-fail on the merged-effective invariants against the
|
|
291
|
+
// current snapshot.
|
|
292
|
+
const effortCapabilities = await assertSettingsPatchValid(p, {
|
|
293
|
+
goal: currentGlobal.routing.goal,
|
|
294
|
+
qualityTiers: currentGlobal.routing.quality_tiers,
|
|
295
|
+
harnesses: currentGlobal.harnesses,
|
|
233
296
|
});
|
|
234
297
|
// Atomic write: the merge + the cross-field re-validation both run INSIDE the
|
|
235
298
|
// config lock against the state actually being mutated. A racing writer that
|
|
236
299
|
// committed between the pre-lock snapshot and here is seen by `cfg`, so a
|
|
237
|
-
// final quality-with-zero-tiers combination
|
|
238
|
-
// written) instead of
|
|
300
|
+
// final quality-with-zero-tiers combination (or a stranded harness
|
|
301
|
+
// model/effort pair) throws here (before any bytes are written) instead of
|
|
302
|
+
// silently persisting.
|
|
239
303
|
updateGlobalConfig((cfg) => {
|
|
240
304
|
const next = mergeSettingsPatch(cfg, p);
|
|
241
305
|
assertRoutingGoalTiersConsistent(next.routing.goal, next.routing.quality_tiers);
|
|
306
|
+
assertHarnessEffortPairsValid(next.harnesses, effortCapabilities);
|
|
242
307
|
return next;
|
|
243
308
|
});
|
|
244
309
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-service.js","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settings-service.js","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { DurableJournal, type JournalRecoveryState } from "@claudexor/journal";
|
|
2
2
|
import { type ControlSetupJob, type ControlSetupJobListFilter, type ControlSetupJobSnapshot } from "@claudexor/schema";
|
|
3
|
-
export declare const ACTIVE_SETUP_STATES: Set<"failed" | "succeeded" | "running" | "queued" | "cancelled" | "
|
|
4
|
-
export declare const TERMINAL_SETUP_STATES: Set<"failed" | "succeeded" | "running" | "queued" | "cancelled" | "
|
|
3
|
+
export declare const ACTIVE_SETUP_STATES: Set<"failed" | "succeeded" | "running" | "queued" | "cancelled" | "timed_out" | "not_supported" | "interrupted_unknown" | "waiting_for_input">;
|
|
4
|
+
export declare const TERMINAL_SETUP_STATES: Set<"failed" | "succeeded" | "running" | "queued" | "cancelled" | "timed_out" | "not_supported" | "interrupted_unknown" | "waiting_for_input">;
|
|
5
5
|
export interface SetupJobPaths {
|
|
6
6
|
dir: string;
|
|
7
7
|
manifest: string;
|
|
@@ -50,6 +50,8 @@ export interface StreamDurableCodexLoginOptions {
|
|
|
50
50
|
/** Enables the one-action Terminal fallback on a device_auth_unsupported
|
|
51
51
|
* miss (a y/N prompt on a TTY; a typed `nextAction` in `--json`). */
|
|
52
52
|
fallback?: TerminalLoginFallbackTarget;
|
|
53
|
+
/** Ordinary CLI detach is success; ACP terminal auth must report cancellation as non-success. */
|
|
54
|
+
detachExitCode?: number;
|
|
53
55
|
pollMs?: number;
|
|
54
56
|
sleep?: (ms: number) => Promise<void>;
|
|
55
57
|
promptYesNo?: (question: string) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-login-inline.d.ts","sourceRoot":"","sources":["../src/setup-login-inline.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,eAAe,EAIhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAMpE;;2EAE2E;AAC3E,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,yBAAyB,CAAC;IAChC,MAAM,EAAE,yBAAyB,CAAC;IAClC,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,eAAe,CAAC,GACpD,uBAAuB,GAAG,IAAI,CAShC;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS,GAAG,eAAe,CAAC,EACjE,KAAK,EAAE,MAAM,EACb,MAAM,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAgBvC;AAED;+EAC+E;AAC/E,KAAK,SAAS,GAAG,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;AAsDhE,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd;8EAC0E;IAC1E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;yEACqE;IACrE,QAAQ,CAAC,EAAE,2BAA2B,CAAC;IACvC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,8BAAmD,GACxD,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"setup-login-inline.d.ts","sourceRoot":"","sources":["../src/setup-login-inline.ts"],"names":[],"mappings":"AAWA,OAAO,EACL,eAAe,EAIhB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAmB,KAAK,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAMpE;;2EAE2E;AAC3E,MAAM,WAAW,2BAA2B;IAC1C,OAAO,EAAE,OAAO,CAAC;IACjB,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,yBAAyB,CAAC;IAChC,MAAM,EAAE,yBAAyB,CAAC;IAClC,SAAS,EAAE,kBAAkB,CAAC;CAC/B;AAED,iFAAiF;AACjF,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,eAAe,CAAC,GACpD,uBAAuB,GAAG,IAAI,CAShC;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,GAAG,SAAS,GAAG,eAAe,CAAC,EACjE,KAAK,EAAE,MAAM,EACb,MAAM,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAO,GAClC;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAgBvC;AAED;+EAC+E;AAC/E,KAAK,SAAS,GAAG,CACf,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,WAAW,KACf,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,GAAG,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;AAsDhE,MAAM,WAAW,8BAA8B;IAC7C,KAAK,EAAE,MAAM,CAAC;IACd;8EAC0E;IAC1E,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;yEACqE;IACrE,QAAQ,CAAC,EAAE,2BAA2B,CAAC;IACvC,iGAAiG;IACjG,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACrD,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,MAAM,EACb,IAAI,GAAE,8BAAmD,GACxD,OAAO,CAAC,MAAM,CAAC,CA4GjB"}
|