@springbrand/cli 0.1.7-alpha.1 → 0.1.7-alpha.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +25 -12
- package/dist/commands/auth.d.ts.map +1 -1
- package/dist/commands/auth.js +156 -40
- package/dist/commands/auth.js.map +1 -1
- package/dist/commands/connect.d.ts +2 -0
- package/dist/commands/connect.d.ts.map +1 -1
- package/dist/commands/connect.js +36 -22
- package/dist/commands/connect.js.map +1 -1
- package/dist/commands/doctor.js +2 -2
- package/dist/commands/doctor.js.map +1 -1
- package/dist/lib/auth.d.ts +23 -12
- package/dist/lib/auth.d.ts.map +1 -1
- package/dist/lib/auth.js +243 -55
- package/dist/lib/auth.js.map +1 -1
- package/dist/lib/codex-plugin.d.ts +8 -0
- package/dist/lib/codex-plugin.d.ts.map +1 -1
- package/dist/lib/codex-plugin.js +191 -21
- package/dist/lib/codex-plugin.js.map +1 -1
- package/dist/lib/connect-all-uninstall.d.ts +2 -2
- package/dist/lib/connect-all-uninstall.d.ts.map +1 -1
- package/dist/lib/connect-all-uninstall.js +69 -31
- package/dist/lib/connect-all-uninstall.js.map +1 -1
- package/dist/lib/connect-all.d.ts +4 -0
- package/dist/lib/connect-all.d.ts.map +1 -1
- package/dist/lib/connect-all.js +12 -9
- package/dist/lib/connect-all.js.map +1 -1
- package/dist/lib/connect-auth.d.ts +4 -2
- package/dist/lib/connect-auth.d.ts.map +1 -1
- package/dist/lib/connect-auth.js +14 -9
- package/dist/lib/connect-auth.js.map +1 -1
- package/dist/lib/connect-clients.d.ts +1 -1
- package/dist/lib/connect-clients.d.ts.map +1 -1
- package/dist/lib/connect-clients.js +23 -14
- package/dist/lib/connect-clients.js.map +1 -1
- package/dist/lib/connect-fallback.d.ts.map +1 -1
- package/dist/lib/connect-fallback.js +13 -4
- package/dist/lib/connect-fallback.js.map +1 -1
- package/dist/lib/connect-generic.d.ts +12 -0
- package/dist/lib/connect-generic.d.ts.map +1 -0
- package/dist/lib/connect-generic.js +80 -0
- package/dist/lib/connect-generic.js.map +1 -0
- package/dist/lib/connect-preflight.d.ts +1 -0
- package/dist/lib/connect-preflight.d.ts.map +1 -1
- package/dist/lib/connect-preflight.js +31 -19
- package/dist/lib/connect-preflight.js.map +1 -1
- package/dist/lib/connect-result.d.ts +1 -1
- package/dist/lib/constants.d.ts +2 -0
- package/dist/lib/constants.d.ts.map +1 -1
- package/dist/lib/constants.js +4 -1
- package/dist/lib/constants.js.map +1 -1
- package/dist/lib/cursor-config.d.ts +2 -2
- package/dist/lib/cursor-config.d.ts.map +1 -1
- package/dist/lib/cursor-config.js +5 -5
- package/dist/lib/cursor-config.js.map +1 -1
- package/dist/lib/devin-config.d.ts +9 -0
- package/dist/lib/devin-config.d.ts.map +1 -0
- package/dist/lib/devin-config.js +32 -0
- package/dist/lib/devin-config.js.map +1 -0
- package/dist/lib/doctor-checks.d.ts +1 -1
- package/dist/lib/doctor-checks.d.ts.map +1 -1
- package/dist/lib/doctor-checks.js +7 -4
- package/dist/lib/doctor-checks.js.map +1 -1
- package/dist/lib/doctor-report.d.ts +2 -2
- package/dist/lib/install-report.d.ts +1 -1
- package/dist/lib/key-environment.d.ts +14 -0
- package/dist/lib/key-environment.d.ts.map +1 -0
- package/dist/lib/key-environment.js +8 -0
- package/dist/lib/key-environment.js.map +1 -0
- package/dist/lib/mcp-endpoint.d.ts +4 -1
- package/dist/lib/mcp-endpoint.d.ts.map +1 -1
- package/dist/lib/mcp-endpoint.js +5 -0
- package/dist/lib/mcp-endpoint.js.map +1 -1
- package/dist/lib/mcp-json-config.d.ts +2 -0
- package/dist/lib/mcp-json-config.d.ts.map +1 -1
- package/dist/lib/mcp-json-config.js +10 -4
- package/dist/lib/mcp-json-config.js.map +1 -1
- package/dist/lib/omp-config.d.ts +2 -2
- package/dist/lib/omp-config.d.ts.map +1 -1
- package/dist/lib/omp-config.js +5 -5
- package/dist/lib/omp-config.js.map +1 -1
- package/dist/lib/pi-config.d.ts +2 -2
- package/dist/lib/pi-config.d.ts.map +1 -1
- package/dist/lib/pi-config.js +5 -5
- package/dist/lib/pi-config.js.map +1 -1
- package/dist/lib/registration-detect.js +5 -5
- package/dist/lib/registration-detect.js.map +1 -1
- package/dist/lib/workbuddy-config.d.ts +1 -1
- package/dist/lib/workbuddy-config.d.ts.map +1 -1
- package/dist/lib/workbuddy-config.js +5 -5
- package/dist/lib/workbuddy-config.js.map +1 -1
- package/package.json +1 -1
- package/skill/springbrand-action-api/SKILL.md +20 -7
- package/skill/springbrand-action-api/references/action-discovery.md +20 -4
- package/skill/springbrand-connector/SKILL.md +3 -2
- package/skill/springbrand-gtm/SKILL.md +38 -5
- package/skill/springbrand-platform/SKILL.md +4 -2
- package/skill/springbrand-platform/references/plugin-discovery.md +5 -4
- package/skill/use-springbrand/SKILL.md +127 -18
package/dist/lib/connect-all.js
CHANGED
|
@@ -43,12 +43,12 @@ function settleWithoutConnect(detection, opts, base) {
|
|
|
43
43
|
// dryRun first: --dry-run --uninstall must plan, never reach removeCursorMcpServer().
|
|
44
44
|
if (opts.dryRun) {
|
|
45
45
|
const plan = opts.uninstall
|
|
46
|
-
? uninstallPlanText(harness)
|
|
47
|
-
: planText(harness, opts.mcpUrl, connectApiKey(opts.apiKey));
|
|
46
|
+
? uninstallPlanText(harness, opts.uninstallUrl)
|
|
47
|
+
: planText(harness, opts.mcpUrl, opts.oauth ? undefined : connectApiKey(opts.mcpUrl, opts.apiKey));
|
|
48
48
|
return { ...base, outcome: 'dry_run', fixCommand: plan };
|
|
49
49
|
}
|
|
50
50
|
if (opts.uninstall) {
|
|
51
|
-
return uninstallHarness(harness, configPath, opts.verbose ?? false, detection.binaryOnPath);
|
|
51
|
+
return uninstallHarness(harness, configPath, opts.verbose ?? false, detection.binaryOnPath, opts.uninstallUrl);
|
|
52
52
|
}
|
|
53
53
|
return undefined;
|
|
54
54
|
}
|
|
@@ -59,7 +59,7 @@ async function processHarness(detection, opts, prompt, oauthBudget, deferOutro)
|
|
|
59
59
|
if (settled)
|
|
60
60
|
return settled;
|
|
61
61
|
const isTTY = detectHumanInitiated();
|
|
62
|
-
const apiKey = connectApiKey(opts.apiKey);
|
|
62
|
+
const apiKey = opts.oauth ? undefined : connectApiKey(opts.mcpUrl, opts.apiKey);
|
|
63
63
|
// All harnesses carry a key; one that cannot fails harness_too_old.
|
|
64
64
|
const keyed = !!apiKey;
|
|
65
65
|
const fixCommand = `sp connect ${harness}`;
|
|
@@ -75,6 +75,7 @@ async function processHarness(detection, opts, prompt, oauthBudget, deferOutro)
|
|
|
75
75
|
// A keyed install too old for key auth fails, no browser.
|
|
76
76
|
authMode = await connectHarness(harness, {
|
|
77
77
|
apiKey: opts.apiKey,
|
|
78
|
+
oauth: opts.oauth,
|
|
78
79
|
mcpUrl: opts.mcpUrl,
|
|
79
80
|
launch: false,
|
|
80
81
|
verbose: opts.verbose,
|
|
@@ -274,7 +275,7 @@ async function finishRun(results, opts, isTTY) {
|
|
|
274
275
|
}
|
|
275
276
|
/** Neither path needs a live key, and neither writes a registration. */
|
|
276
277
|
function keyGateApplies(opts) {
|
|
277
|
-
return !opts.uninstall && !opts.dryRun;
|
|
278
|
+
return !opts.uninstall && !opts.dryRun && !opts.oauth;
|
|
278
279
|
}
|
|
279
280
|
async function blockedByKeyGate(opts) {
|
|
280
281
|
if (!keyGateApplies(opts))
|
|
@@ -287,6 +288,7 @@ async function blockedByKeyGate(opts) {
|
|
|
287
288
|
retryCommand: pick ? 'sp connect' : 'sp connect --all',
|
|
288
289
|
mode: pick ? 'pick' : 'all',
|
|
289
290
|
attemptId: opts.attemptId,
|
|
291
|
+
oauth: opts.oauth,
|
|
290
292
|
});
|
|
291
293
|
return gate === 'blocked';
|
|
292
294
|
}
|
|
@@ -351,10 +353,11 @@ export async function runConnectAll(opts) {
|
|
|
351
353
|
export const FIRST_TASK_PROMPT = 'My SpringBrand setup just finished — verify it with a real run. Use the MCP server named ' +
|
|
352
354
|
'`springbrand` for every SpringBrand tool call; if another SpringBrand server is also registered, still ' +
|
|
353
355
|
'use `springbrand` and do not ask me which. Call `search_tools` with an English query — finding ' +
|
|
354
|
-
"today's top Hacker News story is a good low-risk start —
|
|
355
|
-
'
|
|
356
|
-
'
|
|
357
|
-
'
|
|
356
|
+
"today's top Hacker News story is a good low-risk start — use `get_tool_schemas` for plausible chargeable candidates, " +
|
|
357
|
+
'estimate their Credits with the exact arguments, show me the candidates and estimates, and let me pick ' +
|
|
358
|
+
'one before executing it. If the operation needs an account I have not linked yet, use ' +
|
|
359
|
+
'`manage_connections` first and show me the authorization link unchanged. ' +
|
|
360
|
+
'Tell me the arguments and reservation requirement, and re-estimate when they change; wait for my confirmation before `execute_tools`; if the ' +
|
|
358
361
|
'result returns an execution ID, check its status with `get_execution`. Show which tools you call. ' +
|
|
359
362
|
'If a tool call comes back unconnected, blocked, or not approved, tell me which tool needs ' +
|
|
360
363
|
'approval or connection and how to grant it, then wait for me instead of abandoning, retrying, ' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-all.js","sourceRoot":"","sources":["../../src/lib/connect-all.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect-all.js","sourceRoot":"","sources":["../../src/lib/connect-all.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { type KeyEnvironment } from './key-environment.js';
|
|
1
2
|
export declare const SPRINGBRAND_CLI_NOT_FOUND_MESSAGE = "SpringBrand CLI installed but is not available on PATH. Open a new terminal and retry.";
|
|
2
|
-
/**
|
|
3
|
-
export declare function connectApiKey(explicit?: string): string | undefined;
|
|
3
|
+
/** Select the credential for this endpoint's environment. Never falls back across environments. */
|
|
4
|
+
export declare function connectApiKey(mcpUrl: string, explicit?: string): string | undefined;
|
|
4
5
|
/** Called only after preflight accepted this exact key. Never starts a browser. */
|
|
5
6
|
export declare function ensureCliAuthenticated(_source: string, apiKey?: string, _opts?: {
|
|
6
7
|
interactiveLogin?: boolean;
|
|
7
8
|
mcpUrl?: string;
|
|
9
|
+
environment?: KeyEnvironment;
|
|
8
10
|
}): void;
|
|
9
11
|
//# sourceMappingURL=connect-auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-auth.d.ts","sourceRoot":"","sources":["../../src/lib/connect-auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect-auth.d.ts","sourceRoot":"","sources":["../../src/lib/connect-auth.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAIzE,eAAO,MAAM,iCAAiC,2FAA2F,CAAC;AAE1I,mGAAmG;AACnG,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGnF;AAED,mFAAmF;AACnF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE;IAC7E,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,cAAc,CAAC;CAChC,GAAG,IAAI,CAUP"}
|
package/dist/lib/connect-auth.js
CHANGED
|
@@ -1,19 +1,24 @@
|
|
|
1
1
|
/** Credential selection for installation; OAuth never opens the CLI key manager. */
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { persistApiKeyToEnvironment, resolvedApiKey, validateKeyFormat, writeConfig } from './auth.js';
|
|
3
|
+
import { apiKeyEnvVar } from './key-environment.js';
|
|
4
|
+
import { environmentOf } from './mcp-endpoint.js';
|
|
4
5
|
import { ConnectStepError } from './connect-runtime.js';
|
|
5
6
|
export const SPRINGBRAND_CLI_NOT_FOUND_MESSAGE = 'SpringBrand CLI installed but is not available on PATH. Open a new terminal and retry.';
|
|
6
|
-
/**
|
|
7
|
-
export function connectApiKey(explicit) {
|
|
8
|
-
|
|
7
|
+
/** Select the credential for this endpoint's environment. Never falls back across environments. */
|
|
8
|
+
export function connectApiKey(mcpUrl, explicit) {
|
|
9
|
+
const environment = environmentOf(mcpUrl) ?? 'production';
|
|
10
|
+
return resolvedApiKey(explicit, environment);
|
|
9
11
|
}
|
|
10
12
|
/** Called only after preflight accepted this exact key. Never starts a browser. */
|
|
11
13
|
export function ensureCliAuthenticated(_source, apiKey, _opts) {
|
|
12
|
-
const
|
|
14
|
+
const environment = _opts?.environment ??
|
|
15
|
+
(_opts?.mcpUrl ? environmentOf(_opts.mcpUrl) : undefined) ??
|
|
16
|
+
'production';
|
|
17
|
+
const key = apiKey ?? resolvedApiKey(undefined, environment);
|
|
13
18
|
if (!key || !validateKeyFormat(key))
|
|
14
19
|
throw new ConnectStepError('Supply a valid API key for this key-only operation.', 'invalid_config');
|
|
15
|
-
persistApiKeyToEnvironment(key);
|
|
16
|
-
writeConfig(key);
|
|
17
|
-
process.env[
|
|
20
|
+
persistApiKeyToEnvironment(key, environment);
|
|
21
|
+
writeConfig(key, environment);
|
|
22
|
+
process.env[apiKeyEnvVar(environment)] = key;
|
|
18
23
|
}
|
|
19
24
|
//# sourceMappingURL=connect-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-auth.js","sourceRoot":"","sources":["../../src/lib/connect-auth.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"connect-auth.js","sourceRoot":"","sources":["../../src/lib/connect-auth.ts"],"names":[],"mappings":"AAAA,oFAAoF;AACpF,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACvG,OAAO,EAAE,YAAY,EAAuB,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,CAAC,MAAM,iCAAiC,GAAG,wFAAwF,CAAC;AAE1I,mGAAmG;AACnG,MAAM,UAAU,aAAa,CAAC,MAAc,EAAE,QAAiB;IAC3D,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC;IAC1D,OAAO,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;AACjD,CAAC;AAED,mFAAmF;AACnF,MAAM,UAAU,sBAAsB,CAAC,OAAe,EAAE,MAAe,EAAE,KAIxE;IACG,MAAM,WAAW,GAAG,KAAK,EAAE,WAAW;QAClC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,YAAY,CAAC;IACjB,MAAM,GAAG,GAAG,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC;QAC/B,MAAM,IAAI,gBAAgB,CAAC,qDAAqD,EAAE,gBAAgB,CAAC,CAAC;IACxG,0BAA0B,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC7C,WAAW,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC9B,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,GAAG,GAAG,CAAC;AACjD,CAAC"}
|
|
@@ -62,7 +62,7 @@ interface BaseMcpClient extends SupportedCommand, Pick<HarnessSpec, 'skillAgent'
|
|
|
62
62
|
/** Replaces `addArgs` when a stored key is available: key auth removes the OAuth hop. */
|
|
63
63
|
keyAuth?: {
|
|
64
64
|
/** Which variable the client reads the key from. */
|
|
65
|
-
envVar?: string;
|
|
65
|
+
envVar?: (mcpUrl: string) => string;
|
|
66
66
|
addArgs: (mcpUrl: string, apiKey: string) => string[];
|
|
67
67
|
/** Writes into the harness's store, so connect verifies the key first. */
|
|
68
68
|
seedKey?: (apiKey: string) => SeededInstall;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-clients.d.ts","sourceRoot":"","sources":["../../src/lib/connect-clients.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAE5E,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAC1E,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,KAAK,MAAM,aAAa,CAAC;AAgBhC,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAG9E;AACD,+EAA+E;AAC/E,wBAAgB,sBAAsB,IAAI;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,iFAAiF;IACjF,SAAS,EAAE,MAAM,CAAC;CACrB,CAeA;AACD,eAAO,MAAM,yBAAyB,EAAE,
|
|
1
|
+
{"version":3,"file":"connect-clients.d.ts","sourceRoot":"","sources":["../../src/lib/connect-clients.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ import { detectHumanInitiated } from './harness.js';
|
|
|
5
5
|
import { harnessConfigPath } from './harness-detect.js';
|
|
6
6
|
import { errLine, sanitizeLine, warnLine } from './output.js';
|
|
7
7
|
import { ConnectInterruptedError, ConnectStepError, spawnStepError, } from './connect-runtime.js';
|
|
8
|
-
import {
|
|
9
|
-
import { mcpServerName } from './mcp-endpoint.js';
|
|
8
|
+
import { apiKeyEnvVar } from './key-environment.js';
|
|
9
|
+
import { environmentOf, mcpServerName } from './mcp-endpoint.js';
|
|
10
10
|
import { HARNESS_SPECS, NATIVE_HARNESSES, harnessSpec, } from './harness-spec.js';
|
|
11
11
|
import { HERMES_KEY_VAR, captureHermesKeyRestore, hermesEnvPath, resolveHermesHome, writeHermesKey, } from './hermes-env.js';
|
|
12
12
|
import { hermesConfigPath, readHermesEntry } from './hermes-config.js';
|
|
@@ -40,16 +40,18 @@ export const DEFAULT_ONBOARDING_PROMPT = 'I just connected SpringBrand. Use the
|
|
|
40
40
|
'if another SpringBrand server is also registered, still use `springbrand` and do not ask me which. ' +
|
|
41
41
|
'Start by asking me which service and operation I want to try — sending a Gmail message or pulling ' +
|
|
42
42
|
'Search Console data, for example — and wait for my reply. Then call `search_tools` with an English ' +
|
|
43
|
-
'query,
|
|
44
|
-
'
|
|
43
|
+
'query, inspect plausible chargeable candidates with `get_tool_schemas`, estimate their Credits from their current schemas and ' +
|
|
44
|
+
'the exact arguments, show me the choices and estimates, and let me pick one before `execute_tools`. ' +
|
|
45
|
+
'Confirm the arguments with me before any chargeable execution. If the operation needs an account ' +
|
|
45
46
|
'I have not linked yet, use `manage_connections` first and show me the authorization link unchanged. ' +
|
|
46
47
|
'Ask for my input and wait for my reply before each SpringBrand tool call. If a tool call comes back ' +
|
|
47
48
|
'blocked or not approved, tell me which tool needs approval and how to grant it, then wait for ' +
|
|
48
49
|
'me instead of ending the walkthrough.';
|
|
49
50
|
export const OPENCLAW_ONBOARDING_PROMPT = 'I just installed the SpringBrand skill. Guide me through it interactively: first ask which service ' +
|
|
50
51
|
'and operation I want to try and wait for my reply, then call `search_tools` with an English query. ' +
|
|
51
|
-
'
|
|
52
|
-
'
|
|
52
|
+
'For chargeable candidates, use `get_tool_schemas` to inspect their current schemas and estimate Credits before showing me ' +
|
|
53
|
+
'the choices; ask which one I want only after those estimates. Confirm the arguments with me before ' +
|
|
54
|
+
'`execute_tools`, and use `manage_connections` first ' +
|
|
53
55
|
'if the operation needs an account I have not linked. Never skip ahead or choose for me.';
|
|
54
56
|
/** Cursor writes its own MCP config, so it has no descriptor to carry this. */
|
|
55
57
|
export const CURSOR_SKILL_TARGET = {
|
|
@@ -231,8 +233,12 @@ function specKeyAuth(spec) {
|
|
|
231
233
|
}
|
|
232
234
|
if (keyEnvFlag) {
|
|
233
235
|
return {
|
|
234
|
-
envVar:
|
|
235
|
-
addArgs: (mcpUrl) => [
|
|
236
|
+
envVar: (mcpUrl) => apiKeyEnvVar(environmentOf(mcpUrl) ?? 'production'),
|
|
237
|
+
addArgs: (mcpUrl) => [
|
|
238
|
+
...specAddArgs(spec, mcpUrl),
|
|
239
|
+
keyEnvFlag,
|
|
240
|
+
apiKeyEnvVar(environmentOf(mcpUrl) ?? 'production'),
|
|
241
|
+
],
|
|
236
242
|
};
|
|
237
243
|
}
|
|
238
244
|
if (keyAddFlags) {
|
|
@@ -243,12 +249,15 @@ function specKeyAuth(spec) {
|
|
|
243
249
|
const value = (apiKey) => `${header.name}${header.sep}${header.valuePrefix ?? ''}${apiKey}`;
|
|
244
250
|
if (header.viaEnv) {
|
|
245
251
|
return {
|
|
246
|
-
envVar:
|
|
247
|
-
addArgs: (mcpUrl) =>
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
+
envVar: (mcpUrl) => apiKeyEnvVar(environmentOf(mcpUrl) ?? 'production'),
|
|
253
|
+
addArgs: (mcpUrl) => {
|
|
254
|
+
const variable = apiKeyEnvVar(environmentOf(mcpUrl) ?? 'production');
|
|
255
|
+
return [
|
|
256
|
+
...specAddArgs(spec, mcpUrl),
|
|
257
|
+
'--header',
|
|
258
|
+
value(`\${${variable}}`),
|
|
259
|
+
];
|
|
260
|
+
},
|
|
252
261
|
};
|
|
253
262
|
}
|
|
254
263
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-clients.js","sourceRoot":"","sources":["../../src/lib/connect-clients.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect-clients.js","sourceRoot":"","sources":["../../src/lib/connect-clients.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-fallback.d.ts","sourceRoot":"","sources":["../../src/lib/connect-fallback.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAE9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-fallback.d.ts","sourceRoot":"","sources":["../../src/lib/connect-fallback.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAE9E,OAAO,KAAK,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AASvG,eAAO,MAAM,iBAAiB,4BAA4B,CAAC;AAI3D,eAAO,MAAM,yBAAyB,6GAA6G,CAAC;AACpJ,eAAO,MAAM,4BAA4B,oEAAoE,CAAC;AAK9G,MAAM,MAAM,MAAM,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAE3D,UAAU,gBAAgB;IACtB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,mBAAmB,KAAK,IAAI,CAAC;IACnD,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CACnD;AAED,MAAM,WAAW,kBAAkB;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,0DAA0D;IAC1D,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAC;IACrB,qEAAqE;IACrE,MAAM,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,IAAI,MAAM,CA4B1C;AAyDD,0EAA0E;AAC1E,wBAAsB,cAAc,CAAC,IAAI,EAAE,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAc1F"}
|
|
@@ -3,7 +3,8 @@ import * as readline from 'node:readline/promises';
|
|
|
3
3
|
import spawn from 'cross-spawn';
|
|
4
4
|
import { resolvedApiKey, validateKeyFormat } from './auth.js';
|
|
5
5
|
import { ensureCliAuthenticated, SPRINGBRAND_CLI_NOT_FOUND_MESSAGE } from './connect-auth.js';
|
|
6
|
-
import {
|
|
6
|
+
import { apiKeyEnvVar } from './key-environment.js';
|
|
7
|
+
import { environmentOf } from './mcp-endpoint.js';
|
|
7
8
|
import { commandNotFound, ConnectInterruptedError, ConnectStepError, throwIfInterrupted, } from './connect-runtime.js';
|
|
8
9
|
import { errLine, outLine } from './output.js';
|
|
9
10
|
export const AUTH_VERIFY_RETRY = 'sp auth status --verify';
|
|
@@ -12,6 +13,9 @@ const HEADLESS_VERIFY_TIMEOUT_MS = 90_000;
|
|
|
12
13
|
// An exported var must be unset, not re-logged-in.
|
|
13
14
|
export const MALFORMED_ENV_KEY_MESSAGE = 'SPRINGBRAND_API_KEY is set but malformed; it will override any stored key. Fix or unset it, then re-run.';
|
|
14
15
|
export const MALFORMED_STORED_KEY_MESSAGE = 'The stored SpringBrand API key is malformed. Run: sp auth login';
|
|
16
|
+
function malformedEnvKeyMessage(variable) {
|
|
17
|
+
return `${variable} is set but malformed; it will override any stored key. Fix or unset it, then re-run.`;
|
|
18
|
+
}
|
|
15
19
|
/** One readline per question; a held-open interface wedges raw-stdin children. */
|
|
16
20
|
export function createStdinPrompt() {
|
|
17
21
|
let stdinClosed = false;
|
|
@@ -44,10 +48,14 @@ export function createStdinPrompt() {
|
|
|
44
48
|
}
|
|
45
49
|
function authStep(opts) {
|
|
46
50
|
// Resolved raw: validatedApiKey collapses a malformed key into "no key".
|
|
47
|
-
const
|
|
51
|
+
const environment = environmentOf(opts.mcpUrl) ?? 'production';
|
|
52
|
+
const rawKey = resolvedApiKey(opts.apiKey, environment);
|
|
48
53
|
if (rawKey && !validateKeyFormat(rawKey)) {
|
|
49
54
|
// Terminal even in a TTY: login writes config; env shadows it.
|
|
50
|
-
|
|
55
|
+
const variable = apiKeyEnvVar(environment);
|
|
56
|
+
const exported = process.env[variable] ||
|
|
57
|
+
(environment === 'dev' && process.env[apiKeyEnvVar('production')]);
|
|
58
|
+
errLine(exported ? malformedEnvKeyMessage(variable) : MALFORMED_STORED_KEY_MESSAGE);
|
|
51
59
|
outLine(`Retry: ${opts.retryCommand}`);
|
|
52
60
|
return 'invalid_credentials';
|
|
53
61
|
}
|
|
@@ -58,9 +66,10 @@ function authStep(opts) {
|
|
|
58
66
|
try {
|
|
59
67
|
// Gate-only widening: a config-only key must not re-persist anywhere.
|
|
60
68
|
// Headless has no one to answer a login prompt; never inherit stdio there.
|
|
61
|
-
ensureCliAuthenticated('cli', opts.apiKey ??
|
|
69
|
+
ensureCliAuthenticated('cli', opts.apiKey ?? rawKey, {
|
|
62
70
|
interactiveLogin: !!opts.prompt,
|
|
63
71
|
mcpUrl: opts.mcpUrl,
|
|
72
|
+
environment,
|
|
64
73
|
});
|
|
65
74
|
return null;
|
|
66
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-fallback.js","sourceRoot":"","sources":["../../src/lib/connect-fallback.ts"],"names":[],"mappings":"AAAA,8EAA8E;AAG9E,OAAO,KAAK,QAAQ,MAAM,wBAAwB,CAAC;AACnD,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAC9F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"connect-fallback.js","sourceRoot":"","sources":["../../src/lib/connect-fallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/** Generic-agent connect: CLI-side install only; the Host adds its own MCP connector. */
|
|
2
|
+
export interface GenericConnectOptions {
|
|
3
|
+
apiKey?: string;
|
|
4
|
+
mcpUrl: string;
|
|
5
|
+
attemptId?: string;
|
|
6
|
+
/** Machine mode: the reading agent performs next_action. */
|
|
7
|
+
json: boolean;
|
|
8
|
+
verbose: boolean;
|
|
9
|
+
}
|
|
10
|
+
/** No Host config write: skills, CLI auth record, and the manual-add hand-off report. */
|
|
11
|
+
export declare function connectGenericClient(options: GenericConnectOptions): Promise<void>;
|
|
12
|
+
//# sourceMappingURL=connect-generic.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-generic.d.ts","sourceRoot":"","sources":["../../src/lib/connect-generic.ts"],"names":[],"mappings":"AAAA,yFAAyF;AAezF,MAAM,WAAW,qBAAqB;IAClC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;CACpB;AAyBD,yFAAyF;AACzF,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CA4CxF"}
|
|
@@ -0,0 +1,80 @@
|
|
|
1
|
+
/** Generic-agent connect: CLI-side install only; the Host adds its own MCP connector. */
|
|
2
|
+
import { createConnectTelemetry, runGuarded, settle } from './connect-runtime.js';
|
|
3
|
+
import { connectApiKey } from './connect-auth.js';
|
|
4
|
+
import { gateApiKey } from './connect-preflight.js';
|
|
5
|
+
import { installWebSkill } from './skill-install.js';
|
|
6
|
+
import { saveConnectContext, validateKeyFormat } from './auth.js';
|
|
7
|
+
import { AuthMode } from './harness-detect.js';
|
|
8
|
+
import { detectHumanInitiated } from './harness.js';
|
|
9
|
+
import { buildConnectResult } from './connect-result.js';
|
|
10
|
+
import { emitInstallResult, safeConnectError } from './install-report.js';
|
|
11
|
+
import { apiBaseFromMcpUrl } from './mcp-endpoint.js';
|
|
12
|
+
import { verifyMcpAuth, verifyMcpHealth } from './verify.js';
|
|
13
|
+
/** Machine mode is consumed by the landing agent; a human terminal acts itself. */
|
|
14
|
+
function nextActionActor(options) {
|
|
15
|
+
return options.json || !detectHumanInitiated() ? 'agent' : 'user';
|
|
16
|
+
}
|
|
17
|
+
async function genericConnectResult(options, actor, authMode, error) {
|
|
18
|
+
const health = await verifyMcpHealth(options.mcpUrl);
|
|
19
|
+
const key = connectApiKey(options.apiKey);
|
|
20
|
+
const auth = !error && authMode === AuthMode.ApiKey && key && validateKeyFormat(key)
|
|
21
|
+
? await verifyMcpAuth(key, apiBaseFromMcpUrl(options.mcpUrl))
|
|
22
|
+
: undefined;
|
|
23
|
+
return buildConnectResult({
|
|
24
|
+
host: 'generic',
|
|
25
|
+
mcpUrl: options.mcpUrl,
|
|
26
|
+
authMode,
|
|
27
|
+
installed: false,
|
|
28
|
+
health,
|
|
29
|
+
auth,
|
|
30
|
+
nextActionActor: actor,
|
|
31
|
+
...(error ? { error: safeConnectError(error) } : {}),
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
/** No Host config write: skills, CLI auth record, and the manual-add hand-off report. */
|
|
35
|
+
export async function connectGenericClient(options) {
|
|
36
|
+
const actor = nextActionActor(options);
|
|
37
|
+
let preflightFailure;
|
|
38
|
+
const gate = await gateApiKey({
|
|
39
|
+
onBlocked: failure => { preflightFailure = failure; },
|
|
40
|
+
apiKey: options.apiKey,
|
|
41
|
+
mcpUrl: options.mcpUrl,
|
|
42
|
+
retryCommand: 'sp connect generic',
|
|
43
|
+
mode: 'single',
|
|
44
|
+
attemptId: options.attemptId,
|
|
45
|
+
strict: options.json,
|
|
46
|
+
});
|
|
47
|
+
if (gate === 'blocked') {
|
|
48
|
+
emitInstallResult(buildConnectResult({
|
|
49
|
+
host: 'generic',
|
|
50
|
+
mcpUrl: options.mcpUrl,
|
|
51
|
+
authMode: AuthMode.ApiKey,
|
|
52
|
+
installed: false,
|
|
53
|
+
health: { depth: 'health', ok: false },
|
|
54
|
+
nextActionActor: actor,
|
|
55
|
+
error: { ...(preflightFailure ?? { code: 'key_verification_unavailable', message: 'API-key verification could not complete.' }), phase: 'authentication' },
|
|
56
|
+
}), options);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const telemetry = createConnectTelemetry(options.mcpUrl, 'generic', { attemptId: options.attemptId });
|
|
60
|
+
const state = { stage: 'prerequisite_check', settled: false };
|
|
61
|
+
try {
|
|
62
|
+
await runGuarded(state, telemetry, async () => {
|
|
63
|
+
telemetry.track('started');
|
|
64
|
+
const key = connectApiKey(options.apiKey);
|
|
65
|
+
const authMode = key ? AuthMode.ApiKey : AuthMode.OAuth;
|
|
66
|
+
state.stage = 'skill_install';
|
|
67
|
+
installWebSkill({ skillAgent: 'generic', displayName: 'your agent' }, { verbose: options.verbose });
|
|
68
|
+
telemetry.track('checkpoint', { phase: 'skill_installed' });
|
|
69
|
+
// Before the report: a failed verify must not lose the skill record.
|
|
70
|
+
saveConnectContext('generic', telemetry.attemptId, authMode, options.mcpUrl);
|
|
71
|
+
state.authMode = authMode;
|
|
72
|
+
settle(state, telemetry, 'completed', { authMode });
|
|
73
|
+
emitInstallResult(await genericConnectResult(options, actor, authMode), options);
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
catch (caught) {
|
|
77
|
+
emitInstallResult(await genericConnectResult(options, actor, state.authMode, caught), options);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
//# sourceMappingURL=connect-generic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-generic.js","sourceRoot":"","sources":["../../src/lib/connect-generic.ts"],"names":[],"mappings":"AAAA,yFAAyF;AAGzF,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAClF,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAsB,MAAM,qBAAqB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAW7D,mFAAmF;AACnF,SAAS,eAAe,CAAC,OAA8B;IACnD,OAAO,OAAO,CAAC,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AACtE,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,OAA8B,EAAE,KAAuB,EAAE,QAAqC,EAAE,KAAe;IAC/I,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1C,MAAM,IAAI,GAAG,CAAC,KAAK,IAAI,QAAQ,KAAK,QAAQ,CAAC,MAAM,IAAI,GAAG,IAAI,iBAAiB,CAAC,GAAG,CAAC;QAChF,CAAC,CAAC,MAAM,aAAa,CAAC,GAAG,EAAE,iBAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC7D,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,kBAAkB,CAAC;QACtB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,QAAQ;QACR,SAAS,EAAE,KAAK;QAChB,MAAM;QACN,IAAI;QACJ,eAAe,EAAE,KAAK;QACtB,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvD,CAAC,CAAC;AACP,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,OAA8B;IACrE,MAAM,KAAK,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IACvC,IAAI,gBAA+D,CAAC;IACpE,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC;QAC1B,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,gBAAgB,GAAG,OAAO,CAAC,CAAC,CAAC;QACrD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,oBAAoB;QAClC,IAAI,EAAE,QAAQ;QACd,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,MAAM,EAAE,OAAO,CAAC,IAAI;KACvB,CAAC,CAAC;IACH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACrB,iBAAiB,CAAC,kBAAkB,CAAC;YACjC,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,QAAQ,EAAE,QAAQ,CAAC,MAAM;YACzB,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE;YACtC,eAAe,EAAE,KAAK;YACtB,KAAK,EAAE,EAAE,GAAG,CAAC,gBAAgB,IAAI,EAAE,IAAI,EAAE,8BAA8B,EAAE,OAAO,EAAE,0CAA0C,EAAE,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE;SAC7J,CAAC,EAAE,OAAO,CAAC,CAAC;QACb,OAAO;IACX,CAAC;IACD,MAAM,SAAS,GAAG,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;IACtG,MAAM,KAAK,GAAoB,EAAE,KAAK,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC/E,IAAI,CAAC;QACD,MAAM,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE;YAC1C,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC3B,MAAM,GAAG,GAAG,aAAa,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1C,MAAM,QAAQ,GAAoB,GAAG,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC;YACzE,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC;YAC9B,eAAe,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACpG,SAAS,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC,CAAC;YAC5D,qEAAqE;YACrE,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;YAC7E,KAAK,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC1B,MAAM,CAAC,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;YACpD,iBAAiB,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;QACrF,CAAC,CAAC,CAAC;IACP,CAAC;IACD,OAAO,MAAM,EAAE,CAAC;QACZ,iBAAiB,CAAC,MAAM,oBAAoB,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IACnG,CAAC;AACL,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-preflight.d.ts","sourceRoot":"","sources":["../../src/lib/connect-preflight.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"connect-preflight.d.ts","sourceRoot":"","sources":["../../src/lib/connect-preflight.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAEhF,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AA4C/E;;;GAGG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0DrF;AAGD,MAAM,MAAM,gBAAgB,GAAG,IAAI,GAAG,SAAS,CAAC;AAEhD,UAAU,gBAAgB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,gBAAgB,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACpE"}
|