@claudexor/cli 3.5.0 → 3.6.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/dist/accounts-projection.d.ts +18 -12
- package/dist/accounts-projection.d.ts.map +1 -1
- package/dist/accounts-projection.js +63 -58
- package/dist/accounts-projection.js.map +1 -1
- package/dist/accounts-services.d.ts +134 -128
- package/dist/accounts-services.d.ts.map +1 -1
- package/dist/accounts-services.js +15 -7
- package/dist/accounts-services.js.map +1 -1
- package/dist/accounts-unified-migration.d.ts +110 -0
- package/dist/accounts-unified-migration.d.ts.map +1 -0
- package/dist/accounts-unified-migration.js +422 -0
- package/dist/accounts-unified-migration.js.map +1 -0
- package/dist/auth-login-harnesses.d.ts +7 -5
- package/dist/auth-login-harnesses.d.ts.map +1 -1
- package/dist/auth-login-harnesses.js +10 -9
- package/dist/auth-login-harnesses.js.map +1 -1
- package/dist/claude-oauth-usage.d.ts.map +1 -1
- package/dist/claude-oauth-usage.js +9 -3
- package/dist/claude-oauth-usage.js.map +1 -1
- package/dist/claude-statusline.d.ts.map +1 -1
- package/dist/claude-statusline.js +14 -1
- package/dist/claude-statusline.js.map +1 -1
- package/dist/claudexord.d.ts.map +1 -1
- package/dist/claudexord.js +25 -37
- package/dist/claudexord.js.map +1 -1
- package/dist/codex-quota-source.d.ts.map +1 -1
- package/dist/codex-quota-source.js +8 -3
- package/dist/codex-quota-source.js.map +1 -1
- package/dist/control-services.d.ts +179 -175
- package/dist/control-services.d.ts.map +1 -1
- package/dist/control-services.js +38 -117
- package/dist/control-services.js.map +1 -1
- package/dist/credential-commands.d.ts.map +1 -1
- package/dist/credential-commands.js +46 -26
- package/dist/credential-commands.js.map +1 -1
- package/dist/credential-profile-mutations.d.ts +63 -0
- package/dist/credential-profile-mutations.d.ts.map +1 -0
- package/dist/credential-profile-mutations.js +187 -0
- package/dist/credential-profile-mutations.js.map +1 -0
- package/dist/credential-status-invalidation.d.ts +11 -0
- package/dist/credential-status-invalidation.d.ts.map +1 -0
- package/dist/credential-status-invalidation.js +36 -0
- package/dist/credential-status-invalidation.js.map +1 -0
- package/dist/daemon-admission-runtime.d.ts +5 -0
- package/dist/daemon-admission-runtime.d.ts.map +1 -1
- package/dist/daemon-admission-runtime.js +1 -0
- package/dist/daemon-admission-runtime.js.map +1 -1
- package/dist/mcp-run-projections.d.ts +1 -1
- package/dist/native-login.d.ts.map +1 -1
- package/dist/native-login.js +11 -4
- package/dist/native-login.js.map +1 -1
- package/dist/profile-registration.d.ts +13 -1
- package/dist/profile-registration.d.ts.map +1 -1
- package/dist/profile-registration.js +76 -2
- package/dist/profile-registration.js.map +1 -1
- package/dist/quota-services.d.ts +2 -2
- package/dist/quota-subject-universe.d.ts.map +1 -1
- package/dist/quota-subject-universe.js +6 -0
- package/dist/quota-subject-universe.js.map +1 -1
- package/dist/run-orchestrator.d.ts +28 -0
- package/dist/run-orchestrator.d.ts.map +1 -0
- package/dist/run-orchestrator.js +43 -0
- package/dist/run-orchestrator.js.map +1 -0
- package/dist/settings-service.d.ts +1 -1
- package/dist/settings-service.js +3 -3
- package/dist/settings-service.js.map +1 -1
- package/dist/setup-job-support.d.ts +17 -0
- package/dist/setup-job-support.d.ts.map +1 -1
- package/dist/setup-job-support.js +30 -1
- package/dist/setup-job-support.js.map +1 -1
- package/dist/setup-jobs.js +2 -2
- package/dist/setup-jobs.js.map +1 -1
- package/dist/thread-continuity-context.d.ts +24 -0
- package/dist/thread-continuity-context.d.ts.map +1 -1
- package/dist/thread-continuity-context.js +17 -0
- package/dist/thread-continuity-context.js.map +1 -1
- package/package.json +24 -24
|
@@ -96,6 +96,7 @@ export function createStartupAdmissionRuntime(input) {
|
|
|
96
96
|
for (const sweep of sweepRetiredConfigKeysAtStartup()) {
|
|
97
97
|
logLine(logPath(), `swept retired config keys from ${sweep.path}: ${sweep.removed.join(", ")}`);
|
|
98
98
|
}
|
|
99
|
+
input.normalPlane.migrateAccounts();
|
|
99
100
|
await input.normalPlane.startSetup();
|
|
100
101
|
input.normalPlane.quarantineGhosts();
|
|
101
102
|
input.normalPlane.scheduleRetention();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon-admission-runtime.js","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,EACL,SAAS,EACT,OAAO,GAKR,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EACL,wBAAwB,EACxB,yBAAyB,GAE1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,0CAA0C,EAC1C,sBAAsB,GAEvB,MAAM,0BAA0B,CAAC;AASlC;;oEAEoE;AACpE,MAAM,UAAU,sBAAsB,CAAC,QAItC;IACC,IAAI,WAAW,GAAoC,IAAI,CAAC;IACxD,IAAI,CAAC;QACH,WAAW,GAAG,0CAA0C,CAAC;YACvD,cAAc,EAAE,QAAQ,CAAC,OAAO;YAChC,QAAQ,EAAE,QAAQ,CAAC,GAAG;YACtB,SAAS,EAAE,QAAQ,CAAC,KAAK;YACzB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,QAAQ,EAAE,SAAS,EAAE;YACrB,YAAY,EAAE,sBAAsB,CAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;SAC5E,CAAC,CAAC;QACH,WAAW,CAAC,MAAM,CAAC;YACjB,KAAK,EAAE,oBAAoB;YAC3B,OAAO,EAAE,qDAAqD;SAC/D,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CACL,OAAO,EAAE,EACT,oCAAoC,aAAa,CAC/C,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,EAAE,CACJ,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,KAAwD,EAAQ,EAAE;QAChF,IAAI,CAAC;YACH,WAAW,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC,CAAC;IACF,OAAO;QACL,WAAW;QACX,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;QAC3D,aAAa,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,iBAAiB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;QACvF,KAAK,EAAE,GAAG,EAAE,CAAC,WAAW,EAAE,KAAK,EAAE;KAClC,CAAC;AACJ,CAAC;AAED;;;uEAGuE;AACvE,MAAM,UAAU,uBAAuB,CAAC,IAAgB;IACtD,IAAI,KAAK,GAA0B,IAAI,CAAC;IACxC,OAAO;QACL,GAAG,EAAE,GAAG,EAAE;YACR,IAAI,KAAK;gBAAE,OAAO;YAClB,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAClC,KAAK,CAAC,KAAK,EAAE,CAAC;YACd,IAAI,EAAE,CAAC;QACT,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,IAAI,KAAK;gBAAE,aAAa,CAAC,KAAK,CAAC,CAAC;YAChC,KAAK,GAAG,IAAI,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC;
|
|
1
|
+
{"version":3,"file":"daemon-admission-runtime.js","sourceRoot":"","sources":["../src/daemon-admission-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,7 +99,7 @@ export declare function projectImmediateRunDetail(detail: Record<string, unknown
|
|
|
99
99
|
failure: {
|
|
100
100
|
phase: string;
|
|
101
101
|
category: "auth" | "budget" | "cancelled" | "config_error" | "harness_error" | "harness_unavailable" | "internal" | "policy" | "project" | "unknown" | "validation";
|
|
102
|
-
code: "budget_overshoot" | "cost_unverifiable" | "delegated_confinement_unavailable" | "delegated_evidence_incomplete" | "delegated_home_unavailable" | "delegation_child_drain_timeout" | "estimate_headroom" | "finite_zero" | "hard_cap" | "subscription_window_exhausted" | "unknown_paid_in_flight" | null;
|
|
102
|
+
code: "budget_overshoot" | "cost_unverifiable" | "credential_pool_exhausted" | "delegated_confinement_unavailable" | "delegated_evidence_incomplete" | "delegated_home_unavailable" | "delegation_child_drain_timeout" | "estimate_headroom" | "finite_zero" | "hard_cap" | "subscription_window_exhausted" | "unknown_paid_in_flight" | null;
|
|
103
103
|
harnessId: string | null;
|
|
104
104
|
attemptId: string | null;
|
|
105
105
|
safeMessage: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-login.d.ts","sourceRoot":"","sources":["../src/native-login.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;qCAKiC;IACjC,SAAS,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,gBAAgB,GAAG,2BAA2B,CAAC;IACxF,qFAAqF;IACrF,aAAa,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAChD;uEACmE;IACnE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;kFAC8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID;;8CAE8C;AAC9C,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAErF,4EAA4E;AAC5E,eAAO,MAAM,mBAAmB,QAAS,CAAC;AAiD1C;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAA2B,EAClE,SAAS,CAAC,EAAE,cAAc,GACzB,eAAe,GAAG,IAAI,CAsDxB;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAExE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,UAAwB,GACtC,MAAM,CAeR;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,UAAwB,EACvC,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"native-login.d.ts","sourceRoot":"","sources":["../src/native-login.ts"],"names":[],"mappings":"AAaA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB;;;;;qCAKiC;IACjC,SAAS,CAAC,EAAE,UAAU,GAAG,aAAa,GAAG,gBAAgB,GAAG,2BAA2B,CAAC;IACxF,qFAAqF;IACrF,aAAa,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAChD;uEACmE;IACnE,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;kFAC8E;IAC9E,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAID;;8CAE8C;AAC9C,MAAM,MAAM,cAAc,GAAG,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AAErF,4EAA4E;AAC5E,eAAO,MAAM,mBAAmB,QAAS,CAAC;AAiD1C;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAA2B,EAClE,SAAS,CAAC,EAAE,cAAc,GACzB,eAAe,GAAG,IAAI,CAsDxB;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAExE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,UAAwB,GACtC,MAAM,CAeR;AAED,2EAA2E;AAC3E,wBAAgB,cAAc,CAC5B,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,UAAwB,EACvC,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,CAAC,UAAU,CA+EnB"}
|
package/dist/native-login.js
CHANGED
|
@@ -200,11 +200,18 @@ export function nativeLoginEnv(harness, source = process.env, configDirOverride)
|
|
|
200
200
|
// browser on the daemon host (the user may be on another device). The
|
|
201
201
|
// vendor gates this on NO_OPEN_BROWSER (verified in the shipped bundle).
|
|
202
202
|
env.NO_OPEN_BROWSER = "1";
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
203
|
+
// Owner decision D-U3 (unified account model): cursor has NO default
|
|
204
|
+
// credential store — a login without a profile HOME would land in the
|
|
205
|
+
// HOST Keychain, which Claudexor never reads again. Every cursor login
|
|
206
|
+
// targets an isolated file-store row (the bootstrap `cursor-default` row
|
|
207
|
+
// when none was named); an absent override must REFUSE, never fall
|
|
208
|
+
// through to the operator's real HOME.
|
|
209
|
+
if (!configDirOverride) {
|
|
210
|
+
throw new Error("cursor has no default credential store: a Cursor login must target an account row's file-store HOME (D-U3; host Keychain logins are not used)");
|
|
207
211
|
}
|
|
212
|
+
const home = canonicalCursorProfileHome(configDirOverride);
|
|
213
|
+
ensureDir(home);
|
|
214
|
+
Object.assign(env, cursorProfilePathEnv(home));
|
|
208
215
|
}
|
|
209
216
|
return env;
|
|
210
217
|
}
|
package/dist/native-login.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"native-login.js","sourceRoot":"","sources":["../src/native-login.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"native-login.js","sourceRoot":"","sources":["../src/native-login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type CredentialProfile } from "@claudexor/schema";
|
|
2
2
|
export interface RegisterProfileInput {
|
|
3
3
|
harnessId: string;
|
|
4
4
|
profileId: string;
|
|
@@ -8,6 +8,18 @@ export declare function registerConfigDirProfile(input: RegisterProfileInput): {
|
|
|
8
8
|
profile: CredentialProfile;
|
|
9
9
|
configPath: string;
|
|
10
10
|
};
|
|
11
|
+
/**
|
|
12
|
+
* The BOOTSTRAP row `claudexor auth login <harness>` (and a profile-less
|
|
13
|
+
* login-job request) signs into (unified account model, K.4): claude/codex
|
|
14
|
+
* bootstrap onto their Claudexor-owned native dir (the same locator the
|
|
15
|
+
* startup migration registers, so a later migration pass reuses this row);
|
|
16
|
+
* cursor bootstraps onto an isolated file-store dir (owner decision D-U3 —
|
|
17
|
+
* the host Keychain is never read). Idempotent: an existing row holding the
|
|
18
|
+
* locator is returned as-is; a cancelled/failed login keeps the cold row with
|
|
19
|
+
* its "Sign in" affordance (the recovery path always exists). The bootstrap
|
|
20
|
+
* row has NO routing privilege — it is an ordinary pool row.
|
|
21
|
+
*/
|
|
22
|
+
export declare function ensureBootstrapProfile(harnessId: string): CredentialProfile;
|
|
11
23
|
/** The ONE owner of registry removal (mirror of registerConfigDirProfile):
|
|
12
24
|
* locked global-config write returning the removed entry; unknown ids refuse
|
|
13
25
|
* with a typed 404. Credential-material cleanup stays with the caller. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-registration.d.ts","sourceRoot":"","sources":["../src/profile-registration.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"profile-registration.d.ts","sourceRoot":"","sources":["../src/profile-registration.ts"],"names":[],"mappings":"AAUA,OAAO,EAAiC,KAAK,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAc1F,MAAM,WAAW,oBAAoB;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,oBAAoB,GAAG;IACrE,OAAO,EAAE,iBAAiB,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB,CAoDA;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CA0D3E;AAED;;0EAE0E;AAC1E,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,iBAAiB,CA0CjG"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import { mkdirSync } from "node:fs";
|
|
2
2
|
import { join } from "node:path";
|
|
3
3
|
import { configDirLoginHarnessList, isConfigDirLoginHarness, } from "./config-dir-login-harnesses.js";
|
|
4
|
-
import { updateGlobalConfig } from "@claudexor/config";
|
|
5
|
-
import {
|
|
4
|
+
import { loadConfig, updateGlobalConfig } from "@claudexor/config";
|
|
5
|
+
import { normalizeThroughExistingAncestor } from "@claudexor/core";
|
|
6
|
+
import { defaultNativeClaudeConfigDir } from "@claudexor/harness-claude";
|
|
7
|
+
import { defaultNativeCodexHome } from "@claudexor/harness-codex";
|
|
8
|
+
import { harnessSupportsBootstrapLogin } from "@claudexor/schema";
|
|
9
|
+
import { claudexorOwnedRoot, noProjectRepoRoot, nowIso } from "@claudexor/util";
|
|
6
10
|
/**
|
|
7
11
|
* The ONE owner of config-dir credential-profile registration (INV-135),
|
|
8
12
|
* shared by `claudexor profiles add` and POST /v2/credential-profiles: a
|
|
@@ -20,6 +24,13 @@ export function registerConfigDirProfile(input) {
|
|
|
20
24
|
if (!PROFILE_ID_SLUG.test(profileId)) {
|
|
21
25
|
throw Object.assign(new Error(`profile id "${profileId}" must be a bounded slug ([a-z0-9][a-z0-9_-]{0,63})`), { status: 400 });
|
|
22
26
|
}
|
|
27
|
+
// Reserved: the unpinned lane segment is laneProfileSegment(null) =
|
|
28
|
+
// "default", so a literal "default" row would collide with the
|
|
29
|
+
// <harness>-default lane the unified-accounts migration and deletion act
|
|
30
|
+
// on — the row's lanes could be renamed or purged as legacy state.
|
|
31
|
+
if (profileId === "default") {
|
|
32
|
+
throw Object.assign(new Error(`profile id "default" is reserved for the engine's unpinned lane; pick another id (the bootstrap login row is "${harnessId}-default")`), { status: 400 });
|
|
33
|
+
}
|
|
23
34
|
const locator = join(claudexorOwnedRoot(), "profiles", `${harnessId}-${profileId}`);
|
|
24
35
|
mkdirSync(locator, { recursive: true });
|
|
25
36
|
const entry = {
|
|
@@ -46,6 +57,69 @@ export function registerConfigDirProfile(input) {
|
|
|
46
57
|
});
|
|
47
58
|
}
|
|
48
59
|
}
|
|
60
|
+
/**
|
|
61
|
+
* The BOOTSTRAP row `claudexor auth login <harness>` (and a profile-less
|
|
62
|
+
* login-job request) signs into (unified account model, K.4): claude/codex
|
|
63
|
+
* bootstrap onto their Claudexor-owned native dir (the same locator the
|
|
64
|
+
* startup migration registers, so a later migration pass reuses this row);
|
|
65
|
+
* cursor bootstraps onto an isolated file-store dir (owner decision D-U3 —
|
|
66
|
+
* the host Keychain is never read). Idempotent: an existing row holding the
|
|
67
|
+
* locator is returned as-is; a cancelled/failed login keeps the cold row with
|
|
68
|
+
* its "Sign in" affordance (the recovery path always exists). The bootstrap
|
|
69
|
+
* row has NO routing privilege — it is an ordinary pool row.
|
|
70
|
+
*/
|
|
71
|
+
export function ensureBootstrapProfile(harnessId) {
|
|
72
|
+
if (harnessId === "agy" || !harnessSupportsBootstrapLogin(harnessId)) {
|
|
73
|
+
throw Object.assign(new Error(`harness "${harnessId}" has no bootstrap login: sign in from a named account (owner decision Л-4)`), { status: 400 });
|
|
74
|
+
}
|
|
75
|
+
if (!isConfigDirLoginHarness(harnessId)) {
|
|
76
|
+
throw Object.assign(new Error(`harness "${harnessId}" has no isolated config-dir login`), {
|
|
77
|
+
status: 400,
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
const locator = harnessId === "claude"
|
|
81
|
+
? defaultNativeClaudeConfigDir()
|
|
82
|
+
: harnessId === "codex"
|
|
83
|
+
? defaultNativeCodexHome()
|
|
84
|
+
: join(claudexorOwnedRoot(), "profiles", `${harnessId}-default`);
|
|
85
|
+
const norm = (dir) => {
|
|
86
|
+
try {
|
|
87
|
+
return normalizeThroughExistingAncestor(dir);
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
return dir;
|
|
91
|
+
}
|
|
92
|
+
};
|
|
93
|
+
const registry = loadConfig(noProjectRepoRoot()).global.credential_profiles;
|
|
94
|
+
const existing = registry.find((p) => p.harness_id === harnessId &&
|
|
95
|
+
p.isolation_locator &&
|
|
96
|
+
norm(p.isolation_locator) === norm(locator));
|
|
97
|
+
if (existing)
|
|
98
|
+
return existing;
|
|
99
|
+
// Reserved machine id, cross-harness unique with a deterministic suffix —
|
|
100
|
+
// the same policy the startup migration uses (§L.3).
|
|
101
|
+
const base = `${harnessId}-default`;
|
|
102
|
+
let profileId = base;
|
|
103
|
+
for (let i = 2; registry.some((p) => p.profile_id === profileId); i += 1) {
|
|
104
|
+
profileId = `${base}-${i}`;
|
|
105
|
+
}
|
|
106
|
+
mkdirSync(locator, { recursive: true });
|
|
107
|
+
const entry = {
|
|
108
|
+
profile_id: profileId,
|
|
109
|
+
harness_id: harnessId,
|
|
110
|
+
display_name: `${harnessId} default login`,
|
|
111
|
+
credential_kind: "config_dir_login",
|
|
112
|
+
isolation_locator: locator,
|
|
113
|
+
secret_ref: null,
|
|
114
|
+
enabled: true,
|
|
115
|
+
created_at: nowIso(),
|
|
116
|
+
};
|
|
117
|
+
updateGlobalConfig((config) => ({
|
|
118
|
+
...config,
|
|
119
|
+
credential_profiles: [...config.credential_profiles, entry],
|
|
120
|
+
}));
|
|
121
|
+
return entry;
|
|
122
|
+
}
|
|
49
123
|
/** The ONE owner of registry removal (mirror of registerConfigDirProfile):
|
|
50
124
|
* locked global-config write returning the removed entry; unknown ids refuse
|
|
51
125
|
* with a typed 404. Credential-material cleanup stays with the caller. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile-registration.js","sourceRoot":"","sources":["../src/profile-registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EACL,yBAAyB,EACzB,uBAAuB,GACxB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"profile-registration.js","sourceRoot":"","sources":["../src/profile-registration.ts"],"names":[],"mappings":"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"}
|
package/dist/quota-services.d.ts
CHANGED
|
@@ -24,7 +24,7 @@ export declare function quotaControlServices(quotaRegistry: () => QuotaRegistry)
|
|
|
24
24
|
resets_at: string | null;
|
|
25
25
|
cooldown_until: string | null;
|
|
26
26
|
}[];
|
|
27
|
-
source: "agy_command_usage" | "claude_api_retry" | "claude_oauth_usage" | "claude_statusline" | "codex_app_server" | "codex_rollout";
|
|
27
|
+
source: "agy_command_usage" | "claude_api_retry" | "claude_oauth_usage" | "claude_statusline" | "codex_app_server" | "codex_rollout" | "cursor_rate_limit";
|
|
28
28
|
observed_at: string;
|
|
29
29
|
freshness: "fresh" | "stale" | "unknown";
|
|
30
30
|
availability?: {
|
|
@@ -69,7 +69,7 @@ export declare function quotaControlServices(quotaRegistry: () => QuotaRegistry)
|
|
|
69
69
|
resets_at: string | null;
|
|
70
70
|
cooldown_until: string | null;
|
|
71
71
|
}[];
|
|
72
|
-
source: "agy_command_usage" | "claude_api_retry" | "claude_oauth_usage" | "claude_statusline" | "codex_app_server" | "codex_rollout";
|
|
72
|
+
source: "agy_command_usage" | "claude_api_retry" | "claude_oauth_usage" | "claude_statusline" | "codex_app_server" | "codex_rollout" | "cursor_rate_limit";
|
|
73
73
|
observed_at: string;
|
|
74
74
|
freshness: "fresh" | "stale" | "unknown";
|
|
75
75
|
availability?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-subject-universe.d.ts","sourceRoot":"","sources":["../src/quota-subject-universe.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-subject-universe.d.ts","sourceRoot":"","sources":["../src/quota-subject-universe.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,KAAK,YAAY,EAClB,MAAM,mBAAmB,CAAC;AAI3B;;;4CAG4C;AAC5C,wBAAgB,8BAA8B,IAAI,YAAY,EAAE,CAqC/D"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { loadConfig } from "@claudexor/config";
|
|
2
2
|
import { harnessHasDefaultCredentialStore, quotaRefreshDemandHarnesses, } from "@claudexor/schema";
|
|
3
3
|
import { noProjectRepoRoot } from "@claudexor/util";
|
|
4
|
+
import { readAccountsMigrationFile } from "./accounts-unified-migration.js";
|
|
4
5
|
/** The refresh-demand universe for every enabled primary-capable harness:
|
|
5
6
|
* its enabled native credential plus every enabled config-directory profile.
|
|
6
7
|
* Source traits own the harness list, so adding a primary quota source cannot
|
|
@@ -9,13 +10,18 @@ export function quotaSubjectUniverseFromConfig() {
|
|
|
9
10
|
const global = loadConfig(noProjectRepoRoot()).global;
|
|
10
11
|
const profiles = global.credential_profiles;
|
|
11
12
|
const subjects = [];
|
|
13
|
+
const migrated = readAccountsMigrationFile();
|
|
12
14
|
for (const harness of quotaRefreshDemandHarnesses()) {
|
|
13
15
|
const settings = global.harnesses[harness];
|
|
14
16
|
if (settings?.enabled === false)
|
|
15
17
|
continue;
|
|
16
18
|
// agy has no unprofiled default subject (PLAN Л-4): its universe is
|
|
17
19
|
// profiles-only, so a null-subject default is never expected of it.
|
|
20
|
+
// A MIGRATED harness has no null subject either (unified account model):
|
|
21
|
+
// its former default store IS the auto-registered row, which the profile
|
|
22
|
+
// loop below already covers — emitting both would double-probe one store.
|
|
18
23
|
if (harnessHasDefaultCredentialStore(harness) &&
|
|
24
|
+
migrated[harness] === undefined &&
|
|
19
25
|
settings?.native_credentials_enabled !== false) {
|
|
20
26
|
subjects.push({
|
|
21
27
|
harness,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quota-subject-universe.js","sourceRoot":"","sources":["../src/quota-subject-universe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EACL,gCAAgC,EAChC,2BAA2B,GAE5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"quota-subject-universe.js","sourceRoot":"","sources":["../src/quota-subject-universe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EACL,gCAAgC,EAChC,2BAA2B,GAE5B,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,yBAAyB,EAAE,MAAM,iCAAiC,CAAC;AAE5E;;;4CAG4C;AAC5C,MAAM,UAAU,8BAA8B;IAC5C,MAAM,MAAM,GAAG,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,MAAM,CAAC;IACtD,MAAM,QAAQ,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAC5C,MAAM,QAAQ,GAAmB,EAAE,CAAC;IACpC,MAAM,QAAQ,GAAG,yBAAyB,EAAE,CAAC;IAC7C,KAAK,MAAM,OAAO,IAAI,2BAA2B,EAAE,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE,OAAO,KAAK,KAAK;YAAE,SAAS;QAC1C,oEAAoE;QACpE,oEAAoE;QACpE,yEAAyE;QACzE,yEAAyE;QACzE,0EAA0E;QAC1E,IACE,gCAAgC,CAAC,OAAO,CAAC;YACzC,QAAQ,CAAC,OAAO,CAAC,KAAK,SAAS;YAC/B,QAAQ,EAAE,0BAA0B,KAAK,KAAK,EAC9C,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC;gBACZ,OAAO;gBACP,gBAAgB,EAAE,eAAe;gBACjC,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,IAAI;aACjB,CAAC,CAAC;QACL,CAAC;QACD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO;gBAAE,SAAS;YACjE,IAAI,OAAO,CAAC,eAAe,KAAK,kBAAkB;gBAAE,SAAS;YAC7D,QAAQ,CAAC,IAAI,CAAC;gBACZ,OAAO;gBACP,gBAAgB,EAAE,eAAe;gBACjC,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,OAAO,CAAC,UAAU;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ONE construction owner for the daemon's per-run Orchestrator, hoisted from
|
|
3
|
+
* `claudexord` so the credential-evidence wiring (A7) lives beside the quota
|
|
4
|
+
* wiring it siblings: the same event stream that feeds the quota registry
|
|
5
|
+
* feeds the unusable-credential ledger's success-clearing, and the same deps
|
|
6
|
+
* boundary that injects quota snapshots injects the ledger's observations.
|
|
7
|
+
*/
|
|
8
|
+
import { CredentialUnusableLedger, type QuotaRegistry } from "@claudexor/daemon";
|
|
9
|
+
import { Orchestrator } from "@claudexor/orchestrator";
|
|
10
|
+
import type { normalizeRunStartRequest } from "@claudexor/control-api";
|
|
11
|
+
/**
|
|
12
|
+
* Daemon-lifetime typed `credential_unusable` evidence (A7): in-memory and
|
|
13
|
+
* bounded by design — the poller re-derives vendor rejections within a cycle
|
|
14
|
+
* after a restart, and a restart usually follows the re-login that heals a
|
|
15
|
+
* dead credential. `claudexord` clears it on credential-generation changes.
|
|
16
|
+
*/
|
|
17
|
+
export declare const credentialUnusableLedger: CredentialUnusableLedger;
|
|
18
|
+
type OrchestratorDeps = ConstructorParameters<typeof Orchestrator>[0];
|
|
19
|
+
export declare function buildRunOrchestrator(args: {
|
|
20
|
+
p: ReturnType<typeof normalizeRunStartRequest>;
|
|
21
|
+
delegationBudgetAuthority: OrchestratorDeps["delegationBudgetAuthority"];
|
|
22
|
+
quotaStore: () => QuotaRegistry;
|
|
23
|
+
/** Typed per-harness refusal while a unified-accounts migration is
|
|
24
|
+
* incomplete (a crash between phases) — other harnesses keep working. */
|
|
25
|
+
accountsMigrationGate?: OrchestratorDeps["accountsMigrationGate"];
|
|
26
|
+
}): Orchestrator;
|
|
27
|
+
export {};
|
|
28
|
+
//# sourceMappingURL=run-orchestrator.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-orchestrator.d.ts","sourceRoot":"","sources":["../src/run-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,wBAAwB,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAGvE;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,0BAAiC,CAAC;AAEvE,KAAK,gBAAgB,GAAG,qBAAqB,CAAC,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IACzC,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAC/C,yBAAyB,EAAE,gBAAgB,CAAC,2BAA2B,CAAC,CAAC;IACzE,UAAU,EAAE,MAAM,aAAa,CAAC;IAChC;6EACyE;IACzE,qBAAqB,CAAC,EAAE,gBAAgB,CAAC,uBAAuB,CAAC,CAAC;CACnE,GAAG,YAAY,CA0Bf"}
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* ONE construction owner for the daemon's per-run Orchestrator, hoisted from
|
|
3
|
+
* `claudexord` so the credential-evidence wiring (A7) lives beside the quota
|
|
4
|
+
* wiring it siblings: the same event stream that feeds the quota registry
|
|
5
|
+
* feeds the unusable-credential ledger's success-clearing, and the same deps
|
|
6
|
+
* boundary that injects quota snapshots injects the ledger's observations.
|
|
7
|
+
*/
|
|
8
|
+
import { CredentialUnusableLedger } from "@claudexor/daemon";
|
|
9
|
+
import { Orchestrator } from "@claudexor/orchestrator";
|
|
10
|
+
import { buildRegistry } from "./registry.js";
|
|
11
|
+
/**
|
|
12
|
+
* Daemon-lifetime typed `credential_unusable` evidence (A7): in-memory and
|
|
13
|
+
* bounded by design — the poller re-derives vendor rejections within a cycle
|
|
14
|
+
* after a restart, and a restart usually follows the re-login that heals a
|
|
15
|
+
* dead credential. `claudexord` clears it on credential-generation changes.
|
|
16
|
+
*/
|
|
17
|
+
export const credentialUnusableLedger = new CredentialUnusableLedger();
|
|
18
|
+
export function buildRunOrchestrator(args) {
|
|
19
|
+
const { p, quotaStore } = args;
|
|
20
|
+
return new Orchestrator({
|
|
21
|
+
registry: buildRegistry(),
|
|
22
|
+
delegationBudgetAuthority: args.delegationBudgetAuthority,
|
|
23
|
+
accountsMigrationGate: args.accountsMigrationGate,
|
|
24
|
+
routingGoal: p.routingGoal,
|
|
25
|
+
quotaSnapshots: () => quotaStore().read().snapshots,
|
|
26
|
+
// The absence half of the SAME projection: `auth_revoked` is how the
|
|
27
|
+
// poller reports a vendor rejecting a profile's credential, and run
|
|
28
|
+
// admission is the surface that has to act on it.
|
|
29
|
+
quotaAbsences: () => quotaStore().read().absences,
|
|
30
|
+
quotaEventSink: (harnessId, event) => {
|
|
31
|
+
quotaStore().ingest(harnessId, event);
|
|
32
|
+
// The same stream is the ledger's success telemetry: served tokens on a
|
|
33
|
+
// subject clear its stale dead-credential verdicts (clearing contract).
|
|
34
|
+
credentialUnusableLedger.observeEvent(harnessId, event);
|
|
35
|
+
},
|
|
36
|
+
credentialUnusable: () => credentialUnusableLedger.live(),
|
|
37
|
+
recordCredentialUnusable: (obs) => credentialUnusableLedger.record(obs),
|
|
38
|
+
reviewerPanel: p.reviewerPanel,
|
|
39
|
+
reviewerModels: p.reviewerModels && typeof p.reviewerModels === "object" ? p.reviewerModels : undefined,
|
|
40
|
+
reviewerEfforts: p.reviewerEfforts && typeof p.reviewerEfforts === "object" ? p.reviewerEfforts : undefined,
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
//# sourceMappingURL=run-orchestrator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"run-orchestrator.js","sourceRoot":"","sources":["../src/run-orchestrator.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAAE,wBAAwB,EAAsB,MAAM,mBAAmB,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;GAKG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC;AAIvE,MAAM,UAAU,oBAAoB,CAAC,IAOpC;IACC,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAC/B,OAAO,IAAI,YAAY,CAAC;QACtB,QAAQ,EAAE,aAAa,EAAE;QACzB,yBAAyB,EAAE,IAAI,CAAC,yBAAyB;QACzD,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;QACjD,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,cAAc,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,SAAS;QACnD,qEAAqE;QACrE,oEAAoE;QACpE,kDAAkD;QAClD,aAAa,EAAE,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC,QAAQ;QACjD,cAAc,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,EAAE;YACnC,UAAU,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;YACtC,wEAAwE;YACxE,wEAAwE;YACxE,wBAAwB,CAAC,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;QACD,kBAAkB,EAAE,GAAG,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE;QACzD,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,CAAC,GAAG,CAAC;QACvE,aAAa,EAAE,CAAC,CAAC,aAAa;QAC9B,cAAc,EACZ,CAAC,CAAC,cAAc,IAAI,OAAO,CAAC,CAAC,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;QACzF,eAAe,EACb,CAAC,CAAC,eAAe,IAAI,OAAO,CAAC,CAAC,eAAe,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS;KAC7F,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -56,7 +56,7 @@ export declare function settingsSnapshot(repoRoot: string): {
|
|
|
56
56
|
fallbackModel: string | null;
|
|
57
57
|
web: "auto" | "cached" | "live" | "off";
|
|
58
58
|
authPreference: "api_key" | "auto" | "subscription";
|
|
59
|
-
profileLimitAction: "ask" | "fail" | "rotate";
|
|
59
|
+
profileLimitAction: "ask" | "auto" | "fail" | "rotate";
|
|
60
60
|
};
|
|
61
61
|
};
|
|
62
62
|
};
|
package/dist/settings-service.js
CHANGED
|
@@ -336,9 +336,9 @@ export function applyHarnessSettingsPatches(current, patches) {
|
|
|
336
336
|
fallback_model: patch.fallbackModel === undefined ? base.fallback_model : patch.fallbackModel,
|
|
337
337
|
web: patch.web ?? base.web,
|
|
338
338
|
auth_preference: patch.authPreference ?? base.auth_preference,
|
|
339
|
-
// The app's auto-switch
|
|
340
|
-
//
|
|
341
|
-
// stored values.
|
|
339
|
+
// The app's auto-switch control (INV-135, tri-state since A6:
|
|
340
|
+
// auto | fail | rotate): only limit_action is patchable over the
|
|
341
|
+
// wire; rotation order and headroom keep their stored values.
|
|
342
342
|
profile_policy: patch.profileLimitAction === undefined
|
|
343
343
|
? base.profile_policy
|
|
344
344
|
: { ...base.profile_policy, limit_action: patch.profileLimitAction },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-service.js","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjC,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,sBAAsB;QACvD,OAAO,EAAE;YACP,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB;YACxD,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;YAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa;YAC9C,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa;SAC/C;QACD,MAAM,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;QACnE,OAAO,EAAE;YACP,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB;YACzD,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B;YAC5E,cAAc,EAAE;gBACd,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW;gBAC1D,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,gBAAgB;gBACnE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY;aAC5D;SACF;QACD,SAAS,EAAE,MAAM,CAAC,WAAW,CAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;YACpD,EAAE;YACF;gBACE,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,wBAAwB,EAAE,CAAC,CAAC,0BAA0B;gBACtD,YAAY,EAAE,CAAC,CAAC,aAAa;gBAC7B,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,QAAQ,EAAE,CAAC,CAAC,SAAS;gBACrB,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,UAAU,EAAE,CAAC,CAAC,WAAW;gBACzB,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,aAAa,EAAE,CAAC,CAAC,cAAc;gBAC/B,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,cAAc,EAAE,CAAC,CAAC,eAAe;gBACjC,kBAAkB,EAAE,CAAC,CAAC,cAAc,CAAC,YAAY;aAClD;SACF,CAAC,CACH;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;AACpF,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,OAAe;IAClC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;AACjF,CAAC;AAED;;8EAE8E;AAC9E,SAAS,qBAAqB,CAAC,KAAqB;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gCAAgC,CAAC,IAAiB,EAAE,KAAqB;IACvF,IAAI,IAAI,KAAK,SAAS,IAAI,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7D,WAAW,CACT,+JAA+J,CAChK,CAAC;IACJ,CAAC;AACH,CAAC;AAUD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,6BAA6B,CAC3C,SAAqC,EACrC,YAAqC;IAErC,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,IAAI,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,MAAM,KAAK,GAAG,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,SAAS;QACtC,UAAU,CACR,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,YAAY,EAAE,iDAAiD;YACjE,CAAC,CAAC,YAAY,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,4BAA4B,MAAM,kBAAkB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC/H,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,CAA+B,EAC/B,OAIC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAsC,CAAC;IACzE,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,UAAU,CACR,mBAAmB,CAAC,CAAC,cAAc,wDAAwD,QAAQ,GAAG,CACvG,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,iBAAiB,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,UAAU,CACR,4BAA4B,EAAE,wDAAwD,QAAQ,GAAG,CAClG,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBAChC,UAAU,CAAC,qBAAqB,MAAM,4BAA4B,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;gBACtF,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;gBACtE,MAAM,KAAK,GAAG,aAAa,CACzB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EACnC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAC5C,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI;oBACvB,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,KAAK,CAAC,KAAK,eAAe,CAAC,CAAC;gBACpE,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;gBACtE,gEAAgE;gBAChE,sEAAsE;gBACtE,sEAAsE;gBACtE,yEAAyE;gBACzE,kEAAkE;gBAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5F,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,UAAU,CACR,uBAAuB,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,KAAK,6BAA6B,KAAK,CAAC,MAAM,GAAG;wBAC7F,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAC3E,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5D,8DAA8D;QAC9D,uEAAuE;QACvE,oDAAoD;QACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,UAAU,CACR,yBAAyB,EAAE,0EAA0E,QAAQ,GAAG,CACjH,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,IAAI,KAAK,CAAC,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QAC1F,IAAI,KAAK,CAAC,aAAa;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;QAC7F,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3D,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,MAAM,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAG,aAAa,CACzB,KAAK,EACL,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAC7B,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAC5C,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;oBAC1B,UAAU,CACR,YAAY,EAAE,aAAa,KAAK,KAAK,KAAK,oBAAoB,KAAK,CAAC,MAAM,MAAM,KAAK,CAAC,OAAO,EAAE,CAChG,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,+EAA+E;QAC/E,2EAA2E;QAC3E,8EAA8E;QAC9E,oDAAoD;QACpD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC;gBACH,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACvF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uEAAuE;gBACvE,sEAAsE;gBACtE,UAAU,CACR,6BAA6B,EAAE,MAAM,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACxF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,6EAA6E;IAC7E,4EAA4E;IAC5E,4DAA4D;IAC5D,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAChC,6BAA6B,CAC3B,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,EAC3D,kBAAkB,CACnB,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,6EAA6E;IAC7E,8EAA8E;IAC9E,8EAA8E;IAC9E,4EAA4E;IAC5E,6EAA6E;IAC7E,8EAA8E;IAC9E,uEAAuE;IACvE,kCAAkC;IAClC,MAAM,aAAa,GAAG,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACpD,MAAM,cAAc,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAC9D,gCAAgC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAChE,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,mBAAmB,GAAG,CAC1B,KAAgC,EAChC,OAAsB,EACP,EAAE;IACjB,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAkB,EAClB,CAA+B;IAE/B,OAAO;QACL,GAAG,GAAG;QACN,sBAAsB,EACpB,CAAC,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB;QAC5F,OAAO,EAAE;YACP,GAAG,GAAG,CAAC,OAAO;YACd,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;YACnF,eAAe,EAAE,CAAC,CAAC,cAAc,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe;YAChE,kBAAkB,EAAE,CAAC,CAAC,iBAAiB,IAAI,GAAG,CAAC,OAAO,CAAC,kBAAkB;YACzE,eAAe,EAAE,CAAC,CAAC,cAAc,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe;YAChE,IAAI,EAAE,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI;YACvC,aAAa,EAAE,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa;YAC1D,aAAa,EAAE,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa;SAC3D;QACD,MAAM,EAAE;YACN,GAAG,GAAG,CAAC,MAAM;YACb,mBAAmB,EAAE,CAAC,CAAC,gBAAgB,IAAI,GAAG,CAAC,MAAM,CAAC,mBAAmB;SAC1E;QACD,SAAS,EAAE,2BAA2B,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;KACnE,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,CAA+B;IAE/B,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAClD,6EAA6E;IAC7E,wEAAwE;IACxE,oBAAoB;IACpB,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,CAAC,EAAE;QAC3D,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI;QAChC,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,aAAa;QACjD,SAAS,EAAE,aAAa,CAAC,SAAS;KACnC,CAAC,CAAC;IACH,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,mEAAmE;IACnE,2EAA2E;IAC3E,uBAAuB;IACvB,kBAAkB,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACxC,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAChF,6BAA6B,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CACzC,OAAmC,EACnC,OAAkD;IAElD,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IAC7B,sEAAsE;IACtE,wEAAwE;IACxE,+DAA+D;IAC/D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACtB,MAAM,MAAM,CAAC,MAAM,CACjB,IAAI,KAAK,CACP,uBAAuB,EAAE,uBAAuB,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACnF,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CACzC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,EAAE,CAAC,GAAG;YACT,GAAG,IAAI;YACP,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;YACtC,0BAA0B,EACxB,KAAK,CAAC,wBAAwB,KAAK,SAAS;gBAC1C,CAAC,CAAC,IAAI,CAAC,0BAA0B;gBACjC,CAAC,CAAC,KAAK,CAAC,wBAAwB;YACpC,aAAa,EAAE,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY;YACzF,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;YAC/D,SAAS,EAAE,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;YACzE,UAAU,EAAE,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;YAC7E,WAAW,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW;YACjD,UAAU,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;YAC9C,cAAc,EAAE,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa;YAC7F,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;YAC1B,eAAe,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,eAAe;YAC7D,+DAA+D;YAC/D,kEAAkE;YAClE,iBAAiB;YACjB,cAAc,EACZ,KAAK,CAAC,kBAAkB,KAAK,SAAS;gBACpC,CAAC,CAAC,IAAI,CAAC,cAAc;gBACrB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;SACzE,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
1
|
+
{"version":3,"file":"settings-service.js","sourceRoot":"","sources":["../src/settings-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D,MAAM,UAAU,gBAAgB,CAAC,QAAgB;IAC/C,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjC,OAAO;QACL,OAAO,EAAE,GAAG,CAAC,OAAO;QACpB,oBAAoB,EAAE,GAAG,CAAC,MAAM,CAAC,sBAAsB;QACvD,OAAO,EAAE;YACP,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB;YACxD,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe;YAClD,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI;YAC7B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa;YAC9C,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa;SAC/C;QACD,MAAM,EAAE,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,mBAAmB,EAAE;QACnE,OAAO,EAAE;YACP,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,mBAAmB;YACzD,0BAA0B,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B;YAC5E,cAAc,EAAE;gBACd,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,WAAW;gBAC1D,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,gBAAgB;gBACnE,UAAU,EAAE,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,YAAY;aAC5D;SACF;QACD,SAAS,EAAE,MAAM,CAAC,WAAW,CAC3B,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;YACpD,EAAE;YACF;gBACE,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,wBAAwB,EAAE,CAAC,CAAC,0BAA0B;gBACtD,YAAY,EAAE,CAAC,CAAC,aAAa;gBAC7B,MAAM,EAAE,CAAC,CAAC,MAAM;gBAChB,QAAQ,EAAE,CAAC,CAAC,SAAS;gBACrB,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,UAAU,EAAE,CAAC,CAAC,WAAW;gBACzB,SAAS,EAAE,CAAC,CAAC,UAAU;gBACvB,aAAa,EAAE,CAAC,CAAC,cAAc;gBAC/B,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,cAAc,EAAE,CAAC,CAAC,eAAe;gBACjC,kBAAkB,EAAE,CAAC,CAAC,cAAc,CAAC,YAAY;aAClD;SACF,CAAC,CACH;KACF,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,OAAe;IACjC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC;AACpF,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,WAAW,CAAC,OAAe;IAClC,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC;AACjF,CAAC;AAED;;8EAE8E;AAC9E,SAAS,qBAAqB,CAAC,KAAqB;IAClD,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAClF,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gCAAgC,CAAC,IAAiB,EAAE,KAAqB;IACvF,IAAI,IAAI,KAAK,SAAS,IAAI,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7D,WAAW,CACT,+JAA+J,CAChK,CAAC;IACJ,CAAC;AACH,CAAC;AAUD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,6BAA6B,CAC3C,SAAqC,EACrC,YAAqC;IAErC,KAAK,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QAC/B,MAAM,MAAM,GAAG,QAAQ,EAAE,MAAM,IAAI,IAAI,CAAC;QACxC,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,MAAM,KAAK,GAAG,QAAQ,EAAE,aAAa,IAAI,IAAI,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,SAAS;QACtC,UAAU,CACR,MAAM,CAAC,MAAM,KAAK,CAAC;YACjB,CAAC,CAAC,YAAY,EAAE,iDAAiD;YACjE,CAAC,CAAC,YAAY,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,WAAW,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,4BAA4B,MAAM,kBAAkB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC/H,CAAC;IACJ,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,CAA+B,EAC/B,OAIC;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAsC,CAAC;IACzE,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;QACrB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,UAAU,CACR,mBAAmB,CAAC,CAAC,cAAc,wDAAwD,QAAQ,GAAG,CACvG,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,iBAAiB,IAAI,EAAE,EAAE,CAAC;QAC3C,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,UAAU,CACR,4BAA4B,EAAE,wDAAwD,QAAQ,GAAG,CAClG,CAAC;QACJ,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC,EAAE,CAAC;QACnE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBAChC,UAAU,CAAC,qBAAqB,MAAM,4BAA4B,KAAK,CAAC,OAAO,GAAG,CAAC,CAAC;gBACtF,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;gBACtE,MAAM,KAAK,GAAG,aAAa,CACzB,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EACnC,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAC5C,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI;oBACvB,UAAU,CAAC,KAAK,CAAC,OAAO,IAAI,UAAU,KAAK,CAAC,KAAK,eAAe,CAAC,CAAC;gBACpE,MAAM,QAAQ,GAAG,MAAM,aAAa,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,CAAC;gBACtE,gEAAgE;gBAChE,sEAAsE;gBACtE,sEAAsE;gBACtE,yEAAyE;gBACzE,kEAAkE;gBAClE,MAAM,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC5F,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvC,UAAU,CACR,uBAAuB,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,KAAK,6BAA6B,KAAK,CAAC,MAAM,GAAG;wBAC7F,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,iBAAiB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAC3E,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5D,8DAA8D;QAC9D,uEAAuE;QACvE,oDAAoD;QACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACrB,UAAU,CACR,yBAAyB,EAAE,0EAA0E,QAAQ,GAAG,CACjH,CAAC;QACJ,CAAC;QACD,MAAM,MAAM,GAA4C,EAAE,CAAC;QAC3D,IAAI,KAAK,CAAC,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC;QAC1F,IAAI,KAAK,CAAC,aAAa;YAAE,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC;QAC7F,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,EAAE,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;YAC3D,KAAK,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,MAAM,EAAE,CAAC;gBACtC,MAAM,KAAK,GAAG,aAAa,CACzB,KAAK,EACL,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAC7B,KAAK,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAC5C,CAAC;gBACF,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;oBAC1B,UAAU,CACR,YAAY,EAAE,aAAa,KAAK,KAAK,KAAK,oBAAoB,KAAK,CAAC,MAAM,MAAM,KAAK,CAAC,OAAO,EAAE,CAChG,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,+EAA+E;QAC/E,2EAA2E;QAC3E,8EAA8E;QAC9E,oDAAoD;QACpD,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACnE,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC;gBACH,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;YACvF,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,uEAAuE;gBACvE,sEAAsE;gBACtE,UAAU,CACR,6BAA6B,EAAE,MAAM,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACxF,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,6EAA6E;IAC7E,4EAA4E;IAC5E,4DAA4D;IAC5D,IAAI,kBAAkB,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;QAChC,6BAA6B,CAC3B,2BAA2B,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,EAC3D,kBAAkB,CACnB,CAAC;IACJ,CAAC;IACD,2EAA2E;IAC3E,6EAA6E;IAC7E,8EAA8E;IAC9E,8EAA8E;IAC9E,4EAA4E;IAC5E,6EAA6E;IAC7E,8EAA8E;IAC9E,uEAAuE;IACvE,kCAAkC;IAClC,MAAM,aAAa,GAAG,CAAC,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACpD,MAAM,cAAc,GAAG,CAAC,CAAC,YAAY,IAAI,OAAO,CAAC,YAAY,CAAC;IAC9D,gCAAgC,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IAChE,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAED,MAAM,mBAAmB,GAAG,CAC1B,KAAgC,EAChC,OAAsB,EACP,EAAE;IACjB,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,OAAO,CAAC;IACxC,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAChC,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAkB,EAClB,CAA+B;IAE/B,OAAO;QACL,GAAG,GAAG;QACN,sBAAsB,EACpB,CAAC,CAAC,oBAAoB,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,CAAC,oBAAoB;QAC5F,OAAO,EAAE;YACP,GAAG,GAAG,CAAC,OAAO;YACd,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC,cAAc,EAAE,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC;YACnF,eAAe,EAAE,CAAC,CAAC,cAAc,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe;YAChE,kBAAkB,EAAE,CAAC,CAAC,iBAAiB,IAAI,GAAG,CAAC,OAAO,CAAC,kBAAkB;YACzE,eAAe,EAAE,CAAC,CAAC,cAAc,IAAI,GAAG,CAAC,OAAO,CAAC,eAAe;YAChE,IAAI,EAAE,CAAC,CAAC,WAAW,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI;YACvC,aAAa,EAAE,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa;YAC1D,aAAa,EAAE,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa;SAC3D;QACD,MAAM,EAAE;YACN,GAAG,GAAG,CAAC,MAAM;YACb,mBAAmB,EAAE,CAAC,CAAC,gBAAgB,IAAI,GAAG,CAAC,MAAM,CAAC,mBAAmB;SAC1E;QACD,SAAS,EAAE,2BAA2B,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC;KACnE,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,QAAgB,EAChB,CAA+B;IAE/B,MAAM,aAAa,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAClD,6EAA6E;IAC7E,wEAAwE;IACxE,oBAAoB;IACpB,MAAM,kBAAkB,GAAG,MAAM,wBAAwB,CAAC,CAAC,EAAE;QAC3D,IAAI,EAAE,aAAa,CAAC,OAAO,CAAC,IAAI;QAChC,YAAY,EAAE,aAAa,CAAC,OAAO,CAAC,aAAa;QACjD,SAAS,EAAE,aAAa,CAAC,SAAS;KACnC,CAAC,CAAC;IACH,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,mEAAmE;IACnE,2EAA2E;IAC3E,uBAAuB;IACvB,kBAAkB,CAAC,CAAC,GAAG,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,kBAAkB,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACxC,gCAAgC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAChF,6BAA6B,CAAC,IAAI,CAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CACzC,OAAmC,EACnC,OAAkD;IAElD,IAAI,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC;IAC7B,sEAAsE;IACtE,wEAAwE;IACxE,+DAA+D;IAC/D,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;YACtB,MAAM,MAAM,CAAC,MAAM,CACjB,IAAI,KAAK,CACP,uBAAuB,EAAE,uBAAuB,CAAC,GAAG,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CACnF,EACD,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,iBAAiB,EAAE,CACzC,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,SAAS,CAAC,aAAa,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC5F,IAAI,CAAC,EAAE,CAAC,GAAG;YACT,GAAG,IAAI;YACP,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO;YACtC,0BAA0B,EACxB,KAAK,CAAC,wBAAwB,KAAK,SAAS;gBAC1C,CAAC,CAAC,IAAI,CAAC,0BAA0B;gBACjC,CAAC,CAAC,KAAK,CAAC,wBAAwB;YACpC,aAAa,EAAE,KAAK,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY;YACzF,MAAM,EAAE,KAAK,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM;YAC/D,SAAS,EAAE,KAAK,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ;YACzE,UAAU,EAAE,KAAK,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS;YAC7E,WAAW,EAAE,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW;YACjD,UAAU,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,UAAU;YAC9C,cAAc,EAAE,KAAK,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa;YAC7F,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,GAAG;YAC1B,eAAe,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,eAAe;YAC7D,8DAA8D;YAC9D,iEAAiE;YACjE,8DAA8D;YAC9D,cAAc,EACZ,KAAK,CAAC,kBAAkB,KAAK,SAAS;gBACpC,CAAC,CAAC,IAAI,CAAC,cAAc;gBACrB,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,EAAE,KAAK,CAAC,kBAAkB,EAAE;SACzE,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -19,6 +19,23 @@ export declare function resolveProfileBinding(harness: ControlHarnessSetupHarnes
|
|
|
19
19
|
profileId: string;
|
|
20
20
|
configDir: string;
|
|
21
21
|
} | null;
|
|
22
|
+
/**
|
|
23
|
+
* The login-request binding under the unified account model (K.4): an explicit
|
|
24
|
+
* profileId resolves as before; a profile-less LOGIN request is the bootstrap
|
|
25
|
+
* sugar. Cursor has no default store (D-U3 — the host Keychain is never read),
|
|
26
|
+
* so its login auto-binds to the isolated `cursor-default` bootstrap row and
|
|
27
|
+
* the job response exposes the resolved profileId. Claude/codex keep the
|
|
28
|
+
* default-store job (its INV-060 capability smoke attests exactly the native
|
|
29
|
+
* dir the bootstrap row wraps), with the row ensured up front BEST-EFFORT so
|
|
30
|
+
* the account is visible — cold, with a Sign-in affordance — even when the
|
|
31
|
+
* login is later cancelled or fails (a registration failure, e.g. an
|
|
32
|
+
* env-overridden native home outside the owned root, never blocks the login;
|
|
33
|
+
* the startup migration registers the row after the login lands).
|
|
34
|
+
*/
|
|
35
|
+
export declare function resolveLoginProfileBinding(harness: ControlHarnessSetupHarness, action: string, requestedProfileId: string | undefined): {
|
|
36
|
+
profileId: string;
|
|
37
|
+
configDir: string;
|
|
38
|
+
} | null;
|
|
22
39
|
/**
|
|
23
40
|
* A harness with no default credential store (agy — owner decision Л-4) can
|
|
24
41
|
* only sign in INTO a named account. Refusing at CREATE time keeps the runner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-job-support.d.ts","sourceRoot":"","sources":["../src/setup-job-support.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACxB,MAAM,iBAAiB,CAAC;AAIzB,OAAO,EACL,0BAA0B,EAC1B,KAAK,eAAe,EACpB,KAAK,uBAAuB,
|
|
1
|
+
{"version":3,"file":"setup-job-support.d.ts","sourceRoot":"","sources":["../src/setup-job-support.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,8 +10,9 @@ import { parseProcessGroupHandle, } from "@claudexor/core";
|
|
|
10
10
|
import { loadConfig } from "@claudexor/config";
|
|
11
11
|
import { defaultNativeClaudeConfigDir } from "@claudexor/harness-claude";
|
|
12
12
|
import { defaultNativeCodexHome } from "@claudexor/harness-codex";
|
|
13
|
-
import { ControlHarnessSetupHarness, harnessHasDefaultCredentialStore, } from "@claudexor/schema";
|
|
13
|
+
import { ControlHarnessSetupHarness, harnessHasDefaultCredentialStore, harnessSupportsBootstrapLogin, } from "@claudexor/schema";
|
|
14
14
|
import { noProjectRepoRoot } from "@claudexor/util";
|
|
15
|
+
import { ensureBootstrapProfile } from "./profile-registration.js";
|
|
15
16
|
import { canonicalProfileLoginDir, configDirLoginHarnessList, isConfigDirLoginHarness, } from "./config-dir-login-harnesses.js";
|
|
16
17
|
import { ACTIVE_SETUP_STATES } from "./setup-job-store.js";
|
|
17
18
|
const NO_PROJECT_ROOT = noProjectRepoRoot();
|
|
@@ -68,6 +69,34 @@ export function resolveProfileBinding(harness, profileId) {
|
|
|
68
69
|
configDir: canonicalProfileLoginDir(harness, profile.isolation_locator ?? ""),
|
|
69
70
|
};
|
|
70
71
|
}
|
|
72
|
+
/**
|
|
73
|
+
* The login-request binding under the unified account model (K.4): an explicit
|
|
74
|
+
* profileId resolves as before; a profile-less LOGIN request is the bootstrap
|
|
75
|
+
* sugar. Cursor has no default store (D-U3 — the host Keychain is never read),
|
|
76
|
+
* so its login auto-binds to the isolated `cursor-default` bootstrap row and
|
|
77
|
+
* the job response exposes the resolved profileId. Claude/codex keep the
|
|
78
|
+
* default-store job (its INV-060 capability smoke attests exactly the native
|
|
79
|
+
* dir the bootstrap row wraps), with the row ensured up front BEST-EFFORT so
|
|
80
|
+
* the account is visible — cold, with a Sign-in affordance — even when the
|
|
81
|
+
* login is later cancelled or fails (a registration failure, e.g. an
|
|
82
|
+
* env-overridden native home outside the owned root, never blocks the login;
|
|
83
|
+
* the startup migration registers the row after the login lands).
|
|
84
|
+
*/
|
|
85
|
+
export function resolveLoginProfileBinding(harness, action, requestedProfileId) {
|
|
86
|
+
const explicit = resolveProfileBinding(harness, requestedProfileId);
|
|
87
|
+
if (explicit || action !== "login" || !harnessSupportsBootstrapLogin(harness))
|
|
88
|
+
return explicit;
|
|
89
|
+
if (!harnessHasDefaultCredentialStore(harness)) {
|
|
90
|
+
return resolveProfileBinding(harness, ensureBootstrapProfile(harness).profile_id);
|
|
91
|
+
}
|
|
92
|
+
try {
|
|
93
|
+
ensureBootstrapProfile(harness);
|
|
94
|
+
}
|
|
95
|
+
catch {
|
|
96
|
+
/* best-effort accounting only */
|
|
97
|
+
}
|
|
98
|
+
return null;
|
|
99
|
+
}
|
|
71
100
|
/**
|
|
72
101
|
* A harness with no default credential store (agy — owner decision Л-4) can
|
|
73
102
|
* only sign in INTO a named account. Refusing at CREATE time keeps the runner
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-job-support.js","sourceRoot":"","sources":["../src/setup-job-support.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,uBAAuB,GAGxB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EACL,0BAA0B,EAG1B,gCAAgC,
|
|
1
|
+
{"version":3,"file":"setup-job-support.js","sourceRoot":"","sources":["../src/setup-job-support.ts"],"names":[],"mappings":"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"}
|