@boxes-dev/dvb-runtime 1.0.1067 → 1.0.1069
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/bin/dvb.mjs +385 -341
- package/dist/bin/dvbd.mjs +6 -6
- package/dist/product-docs/references/desktop-workbench.md +10 -0
- package/dist/product-docs/references/files-git-and-review.md +4 -1
- package/dist/product-docs/references/onbox-agent-tools.md +11 -1
- package/dist/product-docs/references/project-setup.md +8 -3
- package/dist/product-docs/references/team-template.md +2 -0
- package/dist/product-docs/references/threads-and-agents.md +22 -23
- package/dist/product-docs/references/troubleshooting.md +26 -0
- package/package.json +2 -2
package/dist/bin/dvb.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
|
|
3
|
-
!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="
|
|
3
|
+
!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof self?self:{},n=(new e.Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="f9b05d56-bcfd-5306-9e59-f832431ece07")}catch(e){}}();
|
|
4
4
|
import { createRequire as __dvbCreateRequire } from "node:module";
|
|
5
5
|
import { dirname as __dvbDirname } from "node:path";
|
|
6
6
|
import { fileURLToPath as __dvbFileURLToPath } from "node:url";
|
|
@@ -5897,7 +5897,11 @@ var init_profiles = __esm({
|
|
|
5897
5897
|
agentVersion: MANAGED_CODEX_MCP_OAUTH_VERSION,
|
|
5898
5898
|
profileVersion: "codex-0.144.0",
|
|
5899
5899
|
callbackHostname: "127.0.0.1",
|
|
5900
|
-
|
|
5900
|
+
// Native Codex's Auto registration mode (codex-rs/rmcp-client
|
|
5901
|
+
// oauth_client_registration.rs) offers OpenAI's per-callback client metadata
|
|
5902
|
+
// document to servers that accept public clients. The SDK uses it only when
|
|
5903
|
+
// the server also advertises client metadata documents.
|
|
5904
|
+
resolveClientMetadataUrl: (serverUrl, authorizationServerMetadata) => authorizationServerMetadata?.token_endpoint_auth_methods_supported?.includes("none") ? `https://chatgpt.com/oauth/codex/${buildCodexCallbackId(serverUrl)}/client.json` : null,
|
|
5901
5905
|
buildCallbackPath: (serverUrl) => `/callback/${buildCodexCallbackId(serverUrl)}`,
|
|
5902
5906
|
buildClientMetadata: (_serverName, redirectUri) => buildPublicClientMetadata("Codex", redirectUri)
|
|
5903
5907
|
};
|
|
@@ -5907,7 +5911,7 @@ var init_profiles = __esm({
|
|
|
5907
5911
|
profileVersion: "claude-2.1.220",
|
|
5908
5912
|
// Anthropic permits both hosts; some servers allow varying ports only for IP loopback.
|
|
5909
5913
|
callbackHostname: "127.0.0.1",
|
|
5910
|
-
|
|
5914
|
+
resolveClientMetadataUrl: () => CLAUDE_CODE_CLIENT_METADATA_URL,
|
|
5911
5915
|
buildCallbackPath: () => "/callback",
|
|
5912
5916
|
buildClientMetadata: (serverName, redirectUri) => buildPublicClientMetadata(`Claude Code (${serverName})`, redirectUri)
|
|
5913
5917
|
};
|
|
@@ -26274,17 +26278,16 @@ var init_companion = __esm({
|
|
|
26274
26278
|
redirectUrl;
|
|
26275
26279
|
clientMetadataUrl;
|
|
26276
26280
|
clientMetadata;
|
|
26281
|
+
resolveClientMetadataUrl;
|
|
26277
26282
|
expectedState;
|
|
26278
26283
|
openAuthorizationUrl;
|
|
26279
26284
|
codeVerifierValue;
|
|
26280
26285
|
clientInformationValue;
|
|
26281
26286
|
tokensValue;
|
|
26282
26287
|
discoveryStateValue;
|
|
26283
|
-
constructor({
|
|
26288
|
+
constructor({ resolveClientMetadataUrl, clientMetadata, expectedState, openAuthorizationUrl, redirectUrl }) {
|
|
26284
26289
|
this.redirectUrl = redirectUrl;
|
|
26285
|
-
|
|
26286
|
-
this.clientMetadataUrl = clientMetadataUrl;
|
|
26287
|
-
}
|
|
26290
|
+
this.resolveClientMetadataUrl = resolveClientMetadataUrl;
|
|
26288
26291
|
this.clientMetadata = clientMetadata;
|
|
26289
26292
|
this.expectedState = expectedState;
|
|
26290
26293
|
this.openAuthorizationUrl = openAuthorizationUrl;
|
|
@@ -26343,6 +26346,12 @@ var init_companion = __esm({
|
|
|
26343
26346
|
}
|
|
26344
26347
|
saveDiscoveryState(state) {
|
|
26345
26348
|
this.discoveryStateValue = state;
|
|
26349
|
+
const clientMetadataUrl = this.resolveClientMetadataUrl(state.authorizationServerMetadata);
|
|
26350
|
+
if (clientMetadataUrl === null) {
|
|
26351
|
+
delete this.clientMetadataUrl;
|
|
26352
|
+
} else {
|
|
26353
|
+
this.clientMetadataUrl = clientMetadataUrl;
|
|
26354
|
+
}
|
|
26346
26355
|
}
|
|
26347
26356
|
discoveryState() {
|
|
26348
26357
|
return this.discoveryStateValue;
|
|
@@ -26437,7 +26446,7 @@ var init_companion = __esm({
|
|
|
26437
26446
|
errorCode: null
|
|
26438
26447
|
});
|
|
26439
26448
|
provider = new TransientMcpOAuthProvider({
|
|
26440
|
-
|
|
26449
|
+
resolveClientMetadataUrl: (authorizationServerMetadata) => profile.resolveClientMetadataUrl(serverUrl, authorizationServerMetadata),
|
|
26441
26450
|
clientMetadata: profile.buildClientMetadata(serverName, callbackListener.redirectUri),
|
|
26442
26451
|
expectedState: state,
|
|
26443
26452
|
openAuthorizationUrl: async (authorizationUrl) => {
|
|
@@ -69717,9 +69726,9 @@ var init_sentry = __esm({
|
|
|
69717
69726
|
uncaughtExceptionMonitorInstalled = false;
|
|
69718
69727
|
currentDevboxSentryUser = null;
|
|
69719
69728
|
readBuildMetadata = () => {
|
|
69720
|
-
const rawPackageVersion = "1.0.
|
|
69721
|
-
const rawGitSha = "
|
|
69722
|
-
const rawSentryRelease = "boxes-dev-dvb@1.0.
|
|
69729
|
+
const rawPackageVersion = "1.0.1069";
|
|
69730
|
+
const rawGitSha = "19c32c6ebe376d63e7f7685fd04b993d07427552";
|
|
69731
|
+
const rawSentryRelease = "boxes-dev-dvb@1.0.1069+19c32c6ebe376d63e7f7685fd04b993d07427552";
|
|
69723
69732
|
const packageVersion = typeof rawPackageVersion === "string" ? rawPackageVersion : void 0;
|
|
69724
69733
|
const gitSha = typeof rawGitSha === "string" ? rawGitSha : void 0;
|
|
69725
69734
|
const sentryRelease = typeof rawSentryRelease === "string" ? rawSentryRelease : void 0;
|
|
@@ -75103,7 +75112,7 @@ var init_packageVersion = __esm({
|
|
|
75103
75112
|
return path18.join(process.cwd(), "dvb");
|
|
75104
75113
|
};
|
|
75105
75114
|
readEmbeddedPackageVersion = () => {
|
|
75106
|
-
const raw = "1.0.
|
|
75115
|
+
const raw = "1.0.1069";
|
|
75107
75116
|
return trimVersion(raw);
|
|
75108
75117
|
};
|
|
75109
75118
|
readNearestPackageMetadata = (basePath) => {
|
|
@@ -75416,6 +75425,35 @@ var init_devboxCore = __esm({
|
|
|
75416
75425
|
}
|
|
75417
75426
|
});
|
|
75418
75427
|
|
|
75428
|
+
// src/devbox/authErrors.ts
|
|
75429
|
+
var LOGIN_REQUIRED_MESSAGES, ControlPlaneLoginRequiredError, ControlPlaneAuthUnavailableError;
|
|
75430
|
+
var init_authErrors = __esm({
|
|
75431
|
+
"src/devbox/authErrors.ts"() {
|
|
75432
|
+
"use strict";
|
|
75433
|
+
LOGIN_REQUIRED_MESSAGES = {
|
|
75434
|
+
signed_out: "Not logged in to boxes.dev. Run `dvb setup` in an interactive terminal first.",
|
|
75435
|
+
session_invalid: "Your saved boxes.dev login is no longer valid. Run `dvb setup` in an interactive terminal to log in again."
|
|
75436
|
+
};
|
|
75437
|
+
ControlPlaneLoginRequiredError = class extends Error {
|
|
75438
|
+
reason;
|
|
75439
|
+
constructor(reason, options) {
|
|
75440
|
+
super(options?.message ?? LOGIN_REQUIRED_MESSAGES[reason], options);
|
|
75441
|
+
this.name = "ControlPlaneLoginRequiredError";
|
|
75442
|
+
this.reason = reason;
|
|
75443
|
+
}
|
|
75444
|
+
};
|
|
75445
|
+
ControlPlaneAuthUnavailableError = class extends Error {
|
|
75446
|
+
constructor(options) {
|
|
75447
|
+
super(
|
|
75448
|
+
"Couldn't check your boxes.dev login. Check your network connection, or try again in a few minutes.",
|
|
75449
|
+
options
|
|
75450
|
+
);
|
|
75451
|
+
this.name = "ControlPlaneAuthUnavailableError";
|
|
75452
|
+
}
|
|
75453
|
+
};
|
|
75454
|
+
}
|
|
75455
|
+
});
|
|
75456
|
+
|
|
75419
75457
|
// src/devbox/daemonWorkingDirectory.ts
|
|
75420
75458
|
import fs13 from "node:fs";
|
|
75421
75459
|
import path19 from "node:path";
|
|
@@ -90116,7 +90154,7 @@ var init_index_node2 = __esm({
|
|
|
90116
90154
|
// src/devbox/controlPlane.ts
|
|
90117
90155
|
import http7 from "node:http";
|
|
90118
90156
|
import { randomUUID as randomUUID5 } from "node:crypto";
|
|
90119
|
-
var MANAGED_DAEMON_NOT_READY_CODE, CONVEX_INFLIGHT_ACTION_DISCONNECTED_MESSAGE, CONTROL_PLANE_ACTION_RETRY_MAX_ATTEMPTS, CONTROL_PLANE_ACTION_RETRY_BASE_DELAY_MS, MANAGED_DAEMON_RECOVERY_WAKING_TIMEOUT_MS, CONTROL_PLANE_CHECKPOINT_RECOVERY_MAX_ATTEMPTS, CONTROL_PLANE_CHECKPOINT_RECOVERY_POLL_MS, ManagedDaemonNotReadyError, isManagedDaemonNotReadyError, isManagedDaemonSleepingError, sleep2, isRetryableTransientConvexActionError, buildTransientConvexActionRetryMessage, announceTransientConvexActionRetry, retryTransientConvexAction, normalizeStringRecord, E2B_DEVBOX_ALIAS_EXISTS_CODE, isRecord3, maybeMapE2bProvisionControlPlaneError, mapE2bProvisionControlPlaneError, LOGIN_CODE_REJECTIONS, resolveControlPlaneUrl, resolveConvexUrl, escapeHtml2, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, CONTROL_PLANE_REQUEST_UNAVAILABLE_CODE, ControlPlaneRequestUnavailableError, isControlPlaneRequestUnavailableError, requestJson, ControlPlaneRequestError, isControlPlaneAuthRejectionError, isControlPlaneSessionRefreshRejectionError, startCallbackServer, getControlPlaneUrl, getConvexUrl, createDefaultBrowserSignInDeps, signInWithBrowser, claudeTokenGet, claudeTokenSet, claudeLoginSave, claudeTokenClear, agentAuthCredentialsList, fetchAgentCredentialRows, codexAuthCacheGet, codexAuthCacheSet, codexAuthCacheClear, claudeTokenReportRuntimeAuthFailureForViewer, claudeTokenReportRuntimeValidatedForViewer, e2bTokenResolvedGet, userSettingsGet, userSettingsSet, projectInstanceTypeOptionsGet, e2bDevboxRemove, e2bDevboxGet, e2bDevboxStatusesList, e2bDevboxDestroy, e2bDevboxProvision, e2bDevboxPause, e2bDevboxEnsureActive, e2bDevboxKeepAlive, e2bDevboxReset, e2bDevboxIssueBootstrapConnectInfo, e2bDevboxBootstrapDaemon, managedDevboxIssueDaemonConnectInfo, managedDaemonRecoverForInstance, managedDaemonControlGrantIssueForViewer, managedDevboxCreateCheckpoint, managedDevboxListRemoteStates, clientThreadsListForPrimaryInstance, threadTitleGenerationStatesListForPrimaryInstance, spriteDaemonSessionsList, clientThreadsUpsertRemoteInitCodexThread, clientThreadsDiscardRemoteInitCodexThread, projectInitJobsGetActiveForProject, agentInitProgressReportCliStep, instancesList, helloViewerGet, billingSummaryGet, convexBrowserModulePromise, loadConvexBrowserModule, buildConvexClientOptions, configureAuthenticatedConvexClient, createAuthenticatedConvexClient, withConvexClient, resolveInstanceIdForAlias, resolveManagedDaemonControlTargetWithClient, issueManagedDaemonControlGrantWithClient, resolveSpriteInstanceId, fetchClaudeTokenStatus, fetchResolvedE2bCredentials, fetchViewerIdentity, BILLING_ACTIVATION_STATES, readBillingActivationBoolean, parseBillingActivationDecision, parseBillingActivationSummary, fetchTeamBillingActivationForViewer, fetchActiveDesktopInitJobForProject, AGENT_INIT_STEP_REPORT_TIMEOUT_MS, reportAgentInitStep, fetchViewerCodingAgentPreference, fetchProjectInstanceTypeOptionsForViewer, storeViewerCodingAgentPreference, storeClaudeCodeOauthToken, storeClaudeLogin, clearClaudeCodeOauthToken, reportClaudeRuntimeAuthFailureForViewer, reportClaudeRuntimeValidatedForViewer, fetchCodexAuthCacheStatus, storeCodexAuthCache, clearCodexAuthCache, normalizeE2bDevboxRecord, fetchE2bDevboxLifecycle, listE2bDevboxStatuses, destroyE2bDevbox, provisionE2bDevbox, pauseE2bDevbox, ensureE2bDevboxActive, keepAliveE2bDevbox, resetE2bDevbox, bootstrapE2bDaemon, throwManagedDaemonNotReady, normalizeOptionalString2, normalizeAliasForLookup, validateManagedDaemonRecoveryResponse, normalizeManagedCheckpointResponse, buildRecoveredManagedCheckpointResponse, readManagedCheckpointRecoveryState, recoverManagedCheckpointAfterDisconnect, buildManagedDaemonConnectInfoResponseSummary, buildManagedDaemonConnectInfoUnexpectedMessage, buildManagedDaemonConnectInfoSleepingMessage, buildManagedDaemonConnectInfoWakingMessage, readWakingRetryAfterMs, logManagedDaemonConnectInfoResponse, fetchManagedDaemonConnectInfoWithAction, requestManagedDaemonConnectInfo, fetchManagedDaemonConnectInfo, recoverManagedDaemonForInit, recoverManagedDaemonControlTargetWithClient, fetchE2bBootstrapConnectInfo, createManagedCheckpoint, listManagedRemoteStates, listViewerInstances, listSpriteDaemonSessions, upsertRemoteInitCodexThread, discardRemoteInitCodexThread, signOutControlPlane, refreshControlPlaneSession, readLoginCodeRejection, exchangeLoginCode, createCliInitResponsesRelayTokenForViewer;
|
|
90157
|
+
var MANAGED_DAEMON_NOT_READY_CODE, CONVEX_INFLIGHT_ACTION_DISCONNECTED_MESSAGE, CONTROL_PLANE_ACTION_RETRY_MAX_ATTEMPTS, CONTROL_PLANE_ACTION_RETRY_BASE_DELAY_MS, MANAGED_DAEMON_RECOVERY_WAKING_TIMEOUT_MS, CONTROL_PLANE_CHECKPOINT_RECOVERY_MAX_ATTEMPTS, CONTROL_PLANE_CHECKPOINT_RECOVERY_POLL_MS, ManagedDaemonNotReadyError, isManagedDaemonNotReadyError, isManagedDaemonSleepingError, sleep2, isRetryableTransientConvexActionError, buildTransientConvexActionRetryMessage, announceTransientConvexActionRetry, retryTransientConvexAction, normalizeStringRecord, E2B_DEVBOX_ALIAS_EXISTS_CODE, isRecord3, maybeMapE2bProvisionControlPlaneError, mapE2bProvisionControlPlaneError, LOGIN_CODE_REJECTIONS, resolveControlPlaneUrl, resolveConvexUrl, escapeHtml2, CALLBACK_LOGO_MARK, CALLBACK_FULL_LOGO, renderCallbackPage, CONTROL_PLANE_REQUEST_UNAVAILABLE_CODE, ControlPlaneRequestUnavailableError, isControlPlaneRequestUnavailableError, requestJson, ControlPlaneRequestError, isControlPlaneAuthRejectionError, isControlPlaneSessionRefreshRejectionError, startCallbackServer, getControlPlaneUrl, getConvexUrl, createDefaultBrowserSignInDeps, signInWithBrowser, claudeTokenGet, claudeTokenSet, claudeLoginSave, claudeTokenClear, agentAuthCredentialsList, fetchAgentCredentialRows, codexAuthCacheGet, codexAuthCacheSet, codexAuthCacheClear, claudeTokenReportRuntimeAuthFailureForViewer, claudeTokenReportRuntimeValidatedForViewer, e2bTokenResolvedGet, userSettingsGet, userSettingsSet, projectInstanceTypeOptionsGet, e2bDevboxRemove, e2bDevboxGet, e2bDevboxStatusesList, e2bDevboxDestroy, e2bDevboxProvision, e2bDevboxPause, e2bDevboxEnsureActive, e2bDevboxKeepAlive, e2bDevboxReset, e2bDevboxIssueBootstrapConnectInfo, e2bDevboxBootstrapDaemon, managedDevboxIssueDaemonConnectInfo, managedDaemonRecoverForInstance, managedDaemonControlGrantIssueForViewer, managedDevboxCreateCheckpoint, managedDevboxListRemoteStates, clientThreadsListForPrimaryInstance, threadTitleGenerationStatesListForPrimaryInstance, spriteDaemonSessionsList, clientThreadsUpsertRemoteInitCodexThread, clientThreadsDiscardRemoteInitCodexThread, projectInitJobsGetActiveForProject, agentInitProgressReportCliStep, instancesList, helloViewerGet, billingSummaryGet, convexBrowserModulePromise, loadConvexBrowserModule, buildConvexClientOptions, configureAuthenticatedConvexClient, createAuthenticatedConvexClient, withConvexClient, resolveInstanceIdForAlias, resolveManagedDaemonControlTargetWithClient, issueManagedDaemonControlGrantWithClient, resolveSpriteInstanceId, fetchClaudeTokenStatus, fetchResolvedE2bCredentials, VIEWER_LOOKUP_TIMEOUT_MS, fetchViewerIdentity, BILLING_ACTIVATION_STATES, readBillingActivationBoolean, parseBillingActivationDecision, parseBillingActivationSummary, fetchTeamBillingActivationForViewer, fetchActiveDesktopInitJobForProject, AGENT_INIT_STEP_REPORT_TIMEOUT_MS, reportAgentInitStep, fetchViewerCodingAgentPreference, fetchProjectInstanceTypeOptionsForViewer, storeViewerCodingAgentPreference, storeClaudeCodeOauthToken, storeClaudeLogin, clearClaudeCodeOauthToken, reportClaudeRuntimeAuthFailureForViewer, reportClaudeRuntimeValidatedForViewer, fetchCodexAuthCacheStatus, storeCodexAuthCache, clearCodexAuthCache, normalizeE2bDevboxRecord, fetchE2bDevboxLifecycle, listE2bDevboxStatuses, destroyE2bDevbox, provisionE2bDevbox, pauseE2bDevbox, ensureE2bDevboxActive, keepAliveE2bDevbox, resetE2bDevbox, bootstrapE2bDaemon, throwManagedDaemonNotReady, normalizeOptionalString2, normalizeAliasForLookup, validateManagedDaemonRecoveryResponse, normalizeManagedCheckpointResponse, buildRecoveredManagedCheckpointResponse, readManagedCheckpointRecoveryState, recoverManagedCheckpointAfterDisconnect, buildManagedDaemonConnectInfoResponseSummary, buildManagedDaemonConnectInfoUnexpectedMessage, buildManagedDaemonConnectInfoSleepingMessage, buildManagedDaemonConnectInfoWakingMessage, readWakingRetryAfterMs, logManagedDaemonConnectInfoResponse, fetchManagedDaemonConnectInfoWithAction, requestManagedDaemonConnectInfo, fetchManagedDaemonConnectInfo, recoverManagedDaemonForInit, recoverManagedDaemonControlTargetWithClient, fetchE2bBootstrapConnectInfo, createManagedCheckpoint, listManagedRemoteStates, listViewerInstances, listSpriteDaemonSessions, upsertRemoteInitCodexThread, discardRemoteInitCodexThread, signOutControlPlane, REFRESH_SESSION_TIMEOUT_MS, refreshControlPlaneSession, readLoginCodeRejection, exchangeLoginCode, createCliInitResponsesRelayTokenForViewer;
|
|
90120
90158
|
var init_controlPlane = __esm({
|
|
90121
90159
|
"src/devbox/controlPlane.ts"() {
|
|
90122
90160
|
"use strict";
|
|
@@ -90124,6 +90162,7 @@ var init_controlPlane = __esm({
|
|
|
90124
90162
|
init_devboxCore();
|
|
90125
90163
|
init_server();
|
|
90126
90164
|
init_wrapper2();
|
|
90165
|
+
init_authErrors();
|
|
90127
90166
|
init_browser();
|
|
90128
90167
|
init_logger3();
|
|
90129
90168
|
init_copyableUrl();
|
|
@@ -90442,7 +90481,7 @@ var init_controlPlane = __esm({
|
|
|
90442
90481
|
}
|
|
90443
90482
|
};
|
|
90444
90483
|
isControlPlaneRequestUnavailableError = (error55) => error55 instanceof ControlPlaneRequestUnavailableError || !!error55 && typeof error55 === "object" && error55.code === CONTROL_PLANE_REQUEST_UNAVAILABLE_CODE;
|
|
90445
|
-
requestJson = async (baseUrl, method, path104, body, token) => {
|
|
90484
|
+
requestJson = async (baseUrl, method, path104, body, token, signal) => {
|
|
90446
90485
|
const requestId2 = randomUUID5();
|
|
90447
90486
|
const url3 = new URL(path104, baseUrl);
|
|
90448
90487
|
const headers = {
|
|
@@ -90464,10 +90503,10 @@ var init_controlPlane = __esm({
|
|
|
90464
90503
|
if (body) {
|
|
90465
90504
|
init3.body = JSON.stringify(body);
|
|
90466
90505
|
}
|
|
90467
|
-
|
|
90468
|
-
|
|
90469
|
-
|
|
90470
|
-
|
|
90506
|
+
if (signal) {
|
|
90507
|
+
init3.signal = signal;
|
|
90508
|
+
}
|
|
90509
|
+
const unavailable = (error55) => {
|
|
90471
90510
|
logger2.warn("control_plane_request_failed", {
|
|
90472
90511
|
requestId: requestId2,
|
|
90473
90512
|
method,
|
|
@@ -90475,12 +90514,18 @@ var init_controlPlane = __esm({
|
|
|
90475
90514
|
status: "unavailable",
|
|
90476
90515
|
error: error55 instanceof Error ? error55.message : String(error55)
|
|
90477
90516
|
});
|
|
90478
|
-
|
|
90517
|
+
return new ControlPlaneRequestUnavailableError({
|
|
90479
90518
|
requestId: requestId2,
|
|
90480
90519
|
method,
|
|
90481
90520
|
path: url3.pathname,
|
|
90482
90521
|
cause: error55
|
|
90483
90522
|
});
|
|
90523
|
+
};
|
|
90524
|
+
let response;
|
|
90525
|
+
try {
|
|
90526
|
+
response = await fetch(url3, init3);
|
|
90527
|
+
} catch (error55) {
|
|
90528
|
+
throw unavailable(error55);
|
|
90484
90529
|
}
|
|
90485
90530
|
logger2.info("control_plane_response", {
|
|
90486
90531
|
requestId: requestId2,
|
|
@@ -90488,18 +90533,22 @@ var init_controlPlane = __esm({
|
|
|
90488
90533
|
path: url3.pathname,
|
|
90489
90534
|
status: response.status
|
|
90490
90535
|
});
|
|
90536
|
+
let text;
|
|
90537
|
+
try {
|
|
90538
|
+
text = await response.text();
|
|
90539
|
+
} catch (error55) {
|
|
90540
|
+
throw unavailable(error55);
|
|
90541
|
+
}
|
|
90491
90542
|
if (!response.ok) {
|
|
90492
|
-
const
|
|
90493
|
-
const upgradeRequired = parseUpgradeRequiredResponseBody(message, {
|
|
90543
|
+
const upgradeRequired = parseUpgradeRequiredResponseBody(text, {
|
|
90494
90544
|
source: "control_plane",
|
|
90495
90545
|
statusCode: response.status
|
|
90496
90546
|
});
|
|
90497
90547
|
if (upgradeRequired) {
|
|
90498
90548
|
throw upgradeRequired;
|
|
90499
90549
|
}
|
|
90500
|
-
throw new ControlPlaneRequestError(response.status,
|
|
90550
|
+
throw new ControlPlaneRequestError(response.status, text);
|
|
90501
90551
|
}
|
|
90502
|
-
const text = await response.text();
|
|
90503
90552
|
if (!text) return {};
|
|
90504
90553
|
return JSON.parse(text);
|
|
90505
90554
|
};
|
|
@@ -90858,9 +90907,29 @@ var init_controlPlane = __esm({
|
|
|
90858
90907
|
return { apiKey, source };
|
|
90859
90908
|
});
|
|
90860
90909
|
};
|
|
90910
|
+
VIEWER_LOOKUP_TIMEOUT_MS = 15e3;
|
|
90861
90911
|
fetchViewerIdentity = async (token) => {
|
|
90862
90912
|
return await withConvexClient(token, async (client) => {
|
|
90863
|
-
|
|
90913
|
+
let timeout;
|
|
90914
|
+
const timedOut = new Promise((_resolve, reject) => {
|
|
90915
|
+
timeout = setTimeout(() => {
|
|
90916
|
+
logger2.warn("control_plane_viewer_lookup_timed_out", {
|
|
90917
|
+
timeoutMs: VIEWER_LOOKUP_TIMEOUT_MS
|
|
90918
|
+
});
|
|
90919
|
+
reject(
|
|
90920
|
+
new ControlPlaneAuthUnavailableError({
|
|
90921
|
+
cause: new Error(
|
|
90922
|
+
`hello:getViewer did not answer within ${VIEWER_LOOKUP_TIMEOUT_MS} ms.`
|
|
90923
|
+
)
|
|
90924
|
+
})
|
|
90925
|
+
);
|
|
90926
|
+
}, VIEWER_LOOKUP_TIMEOUT_MS);
|
|
90927
|
+
});
|
|
90928
|
+
try {
|
|
90929
|
+
return await Promise.race([client.query(helloViewerGet, {}), timedOut]);
|
|
90930
|
+
} finally {
|
|
90931
|
+
clearTimeout(timeout);
|
|
90932
|
+
}
|
|
90864
90933
|
});
|
|
90865
90934
|
};
|
|
90866
90935
|
BILLING_ACTIVATION_STATES = /* @__PURE__ */ new Set([
|
|
@@ -91887,6 +91956,7 @@ var init_controlPlane = __esm({
|
|
|
91887
91956
|
}
|
|
91888
91957
|
await requestJson(baseUrl, "POST", "/auth/signout", void 0, token);
|
|
91889
91958
|
};
|
|
91959
|
+
REFRESH_SESSION_TIMEOUT_MS = 15e3;
|
|
91890
91960
|
refreshControlPlaneSession = async (refreshToken) => {
|
|
91891
91961
|
const baseUrl = resolveControlPlaneUrl();
|
|
91892
91962
|
if (!baseUrl) {
|
|
@@ -91898,7 +91968,9 @@ var init_controlPlane = __esm({
|
|
|
91898
91968
|
baseUrl,
|
|
91899
91969
|
"POST",
|
|
91900
91970
|
"/auth/refresh",
|
|
91901
|
-
{ refresh_token: refreshToken }
|
|
91971
|
+
{ refresh_token: refreshToken },
|
|
91972
|
+
void 0,
|
|
91973
|
+
AbortSignal.timeout(REFRESH_SESSION_TIMEOUT_MS)
|
|
91902
91974
|
);
|
|
91903
91975
|
if (!response.token) {
|
|
91904
91976
|
throw new Error("Could not refresh boxes.dev login.");
|
|
@@ -95650,11 +95722,12 @@ var init_src = __esm({
|
|
|
95650
95722
|
});
|
|
95651
95723
|
|
|
95652
95724
|
// src/devbox/auth.ts
|
|
95653
|
-
var CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE, CONTROL_PLANE_AUTH_REFRESH_ERROR_CODE, ControlPlaneAuthRefreshError, isControlPlaneAuthRefreshError, TOKEN_REFRESH_BUFFER_MS2, CONTROL_PLANE_AUTH_REFRESH_RETRY_DELAYS_MS, defaultControlPlaneAuthApi, waitForControlPlaneAuthRefreshRetry, createRetryingControlPlaneTokenProvider, decodeJwtPayload4, parseTokenExpiresAt2, isTokenExpired, shouldRefreshToken2, clearControlPlaneAccessToken2, clearControlPlaneSession, updateControlPlaneSession, refreshControlPlaneToken, refreshLongLivedControlPlaneToken, createLongLivedControlPlaneTokenProvider,
|
|
95725
|
+
var CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE, CONTROL_PLANE_AUTH_REFRESH_ERROR_CODE, ControlPlaneAuthRefreshError, isControlPlaneAuthRefreshError, TOKEN_REFRESH_BUFFER_MS2, CONTROL_PLANE_AUTH_REFRESH_RETRY_DELAYS_MS, defaultControlPlaneAuthApi, waitForControlPlaneAuthRefreshRetry, createRetryingControlPlaneTokenProvider, decodeJwtPayload4, parseTokenExpiresAt2, isTokenExpired, shouldRefreshToken2, clearControlPlaneAccessToken2, clearControlPlaneSession, updateControlPlaneSession, refreshControlPlaneToken, refreshLongLivedControlPlaneToken, createLongLivedControlPlaneTokenProvider, lookupControlPlaneViewer, refreshStoredControlPlaneToken, resolveStoredControlPlaneSession, resolveStoredControlPlaneToken, ensureControlPlaneSession, ensureControlPlaneToken, readUnexpiredControlPlaneToken, ensureExistingControlPlaneToken;
|
|
95654
95726
|
var init_auth = __esm({
|
|
95655
95727
|
"src/devbox/auth.ts"() {
|
|
95656
95728
|
"use strict";
|
|
95657
95729
|
init_devboxCore();
|
|
95730
|
+
init_authErrors();
|
|
95658
95731
|
init_logger3();
|
|
95659
95732
|
init_controlPlane();
|
|
95660
95733
|
CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE = "Opening browser to sign in";
|
|
@@ -95832,30 +95905,37 @@ var init_auth = __esm({
|
|
|
95832
95905
|
wait: waitForControlPlaneAuthRefreshRetry,
|
|
95833
95906
|
retryDelaysMs: CONTROL_PLANE_AUTH_REFRESH_RETRY_DELAYS_MS
|
|
95834
95907
|
});
|
|
95835
|
-
|
|
95908
|
+
lookupControlPlaneViewer = async (token, authApi, stage) => {
|
|
95836
95909
|
stage?.("Checking boxes.dev login");
|
|
95837
|
-
|
|
95838
|
-
|
|
95839
|
-
if (viewer) {
|
|
95840
|
-
syncDevboxSentryUserFromViewerIdentity(viewer);
|
|
95841
|
-
return { status: "valid" };
|
|
95842
|
-
}
|
|
95910
|
+
const viewer = await authApi.fetchViewerIdentity(token);
|
|
95911
|
+
if (!viewer) {
|
|
95843
95912
|
logger2.warn("control_plane_viewer_missing");
|
|
95913
|
+
return null;
|
|
95914
|
+
}
|
|
95915
|
+
syncDevboxSentryUserFromViewerIdentity(viewer);
|
|
95916
|
+
return viewer;
|
|
95917
|
+
};
|
|
95918
|
+
refreshStoredControlPlaneToken = async (store, authApi, stage) => {
|
|
95919
|
+
try {
|
|
95920
|
+
return await refreshControlPlaneToken(store, authApi, stage);
|
|
95844
95921
|
} catch (error55) {
|
|
95845
|
-
if (
|
|
95846
|
-
logger2.warn("
|
|
95922
|
+
if (isControlPlaneSessionRefreshRejectionError(error55)) {
|
|
95923
|
+
logger2.warn("control_plane_refresh_rejected", { error: String(error55) });
|
|
95924
|
+
await clearControlPlaneSession(store);
|
|
95925
|
+
throw new ControlPlaneLoginRequiredError("session_invalid", {
|
|
95926
|
+
cause: error55
|
|
95927
|
+
});
|
|
95928
|
+
}
|
|
95929
|
+
if (isControlPlaneRequestUnavailableError(error55) || error55 instanceof ControlPlaneRequestError && (error55.statusCode === 429 || error55.statusCode >= 500)) {
|
|
95930
|
+
logger2.warn("control_plane_refresh_unavailable", {
|
|
95847
95931
|
error: String(error55)
|
|
95848
95932
|
});
|
|
95849
|
-
|
|
95933
|
+
throw new ControlPlaneAuthUnavailableError({ cause: error55 });
|
|
95850
95934
|
}
|
|
95851
|
-
|
|
95852
|
-
error: String(error55)
|
|
95853
|
-
});
|
|
95935
|
+
throw error55;
|
|
95854
95936
|
}
|
|
95855
|
-
await clearControlPlaneAccessToken2(store);
|
|
95856
|
-
return { status: "rejected" };
|
|
95857
95937
|
};
|
|
95858
|
-
|
|
95938
|
+
resolveStoredControlPlaneSession = async (store, stage, authApi = defaultControlPlaneAuthApi) => {
|
|
95859
95939
|
const controlPlaneUrl = getControlPlaneUrl();
|
|
95860
95940
|
const convexUrl = getConvexUrl();
|
|
95861
95941
|
if (!controlPlaneUrl) {
|
|
@@ -95868,89 +95948,79 @@ var init_auth = __esm({
|
|
|
95868
95948
|
"This dvb build is missing its backend URL. Reinstall dvb, then retry."
|
|
95869
95949
|
);
|
|
95870
95950
|
}
|
|
95871
|
-
let
|
|
95872
|
-
|
|
95873
|
-
const
|
|
95874
|
-
|
|
95875
|
-
const refreshed2 = await refreshControlPlaneToken(store, authApi, stage);
|
|
95876
|
-
if (refreshed2) {
|
|
95877
|
-
const validation = await validateControlPlaneToken(
|
|
95878
|
-
store,
|
|
95879
|
-
refreshed2,
|
|
95880
|
-
authApi,
|
|
95881
|
-
stage
|
|
95882
|
-
);
|
|
95883
|
-
if (validation.status === "valid") {
|
|
95884
|
-
return refreshed2;
|
|
95885
|
-
}
|
|
95886
|
-
if (validation.status === "unavailable") {
|
|
95887
|
-
throw validation.error;
|
|
95888
|
-
}
|
|
95889
|
-
}
|
|
95890
|
-
} catch (error55) {
|
|
95891
|
-
logger2.warn("control_plane_refresh_failed", { error: String(error55) });
|
|
95892
|
-
}
|
|
95893
|
-
return null;
|
|
95894
|
-
};
|
|
95895
|
-
if (existing && isTokenExpired(existing)) {
|
|
95951
|
+
let token = await store.getControlPlaneToken();
|
|
95952
|
+
const expiresAt = await store.getControlPlaneTokenExpiresAt();
|
|
95953
|
+
const hadStoredLogin = token !== null || await store.getControlPlaneRefreshToken() !== null;
|
|
95954
|
+
if (token && isTokenExpired(token)) {
|
|
95896
95955
|
await clearControlPlaneAccessToken2(store);
|
|
95897
|
-
|
|
95898
|
-
expiresAt = null;
|
|
95956
|
+
token = null;
|
|
95899
95957
|
}
|
|
95900
|
-
if (
|
|
95901
|
-
const
|
|
95902
|
-
|
|
95903
|
-
|
|
95904
|
-
authApi,
|
|
95905
|
-
stage
|
|
95906
|
-
);
|
|
95907
|
-
if (validation.status === "valid") {
|
|
95908
|
-
return existing;
|
|
95909
|
-
}
|
|
95910
|
-
if (validation.status === "unavailable") {
|
|
95911
|
-
throw validation.error;
|
|
95958
|
+
if (token && !shouldRefreshToken2(expiresAt)) {
|
|
95959
|
+
const viewer = await lookupControlPlaneViewer(token, authApi, stage);
|
|
95960
|
+
if (viewer) {
|
|
95961
|
+
return { token, viewer };
|
|
95912
95962
|
}
|
|
95913
|
-
|
|
95963
|
+
await clearControlPlaneAccessToken2(store);
|
|
95964
|
+
token = null;
|
|
95914
95965
|
}
|
|
95915
|
-
|
|
95916
|
-
|
|
95917
|
-
|
|
95918
|
-
|
|
95919
|
-
|
|
95920
|
-
|
|
95921
|
-
store,
|
|
95922
|
-
existing,
|
|
95923
|
-
authApi,
|
|
95924
|
-
stage
|
|
95925
|
-
);
|
|
95926
|
-
if (validation.status === "valid") {
|
|
95927
|
-
return existing;
|
|
95966
|
+
let refreshed;
|
|
95967
|
+
try {
|
|
95968
|
+
refreshed = await refreshStoredControlPlaneToken(store, authApi, stage);
|
|
95969
|
+
} catch (error55) {
|
|
95970
|
+
if (!token || !(error55 instanceof ControlPlaneAuthUnavailableError)) {
|
|
95971
|
+
throw error55;
|
|
95928
95972
|
}
|
|
95929
|
-
|
|
95930
|
-
|
|
95973
|
+
const viewer = await lookupControlPlaneViewer(token, authApi, stage);
|
|
95974
|
+
if (viewer) {
|
|
95975
|
+
return { token, viewer };
|
|
95931
95976
|
}
|
|
95932
|
-
|
|
95977
|
+
throw error55;
|
|
95933
95978
|
}
|
|
95934
|
-
const
|
|
95935
|
-
if (
|
|
95936
|
-
|
|
95979
|
+
const candidate = refreshed ?? token;
|
|
95980
|
+
if (candidate) {
|
|
95981
|
+
const viewer = await lookupControlPlaneViewer(candidate, authApi, stage);
|
|
95982
|
+
if (viewer) {
|
|
95983
|
+
return { token: candidate, viewer };
|
|
95984
|
+
}
|
|
95937
95985
|
}
|
|
95938
95986
|
await clearControlPlaneSession(store);
|
|
95939
|
-
|
|
95987
|
+
throw new ControlPlaneLoginRequiredError(
|
|
95988
|
+
hadStoredLogin ? "session_invalid" : "signed_out"
|
|
95989
|
+
);
|
|
95940
95990
|
};
|
|
95941
|
-
|
|
95942
|
-
|
|
95943
|
-
|
|
95944
|
-
|
|
95991
|
+
resolveStoredControlPlaneToken = async (store, stage, authApi = defaultControlPlaneAuthApi) => {
|
|
95992
|
+
try {
|
|
95993
|
+
return (await resolveStoredControlPlaneSession(store, stage, authApi)).token;
|
|
95994
|
+
} catch (error55) {
|
|
95995
|
+
if (error55 instanceof ControlPlaneLoginRequiredError) {
|
|
95996
|
+
return null;
|
|
95997
|
+
}
|
|
95998
|
+
throw error55;
|
|
95945
95999
|
}
|
|
95946
|
-
|
|
95947
|
-
|
|
96000
|
+
};
|
|
96001
|
+
ensureControlPlaneSession = async (store, stage, authApi = defaultControlPlaneAuthApi) => {
|
|
96002
|
+
try {
|
|
96003
|
+
return await resolveStoredControlPlaneSession(store, stage, authApi);
|
|
96004
|
+
} catch (error55) {
|
|
96005
|
+
if (!(error55 instanceof ControlPlaneLoginRequiredError) || !process.stdin.isTTY) {
|
|
96006
|
+
throw error55;
|
|
96007
|
+
}
|
|
95948
96008
|
}
|
|
95949
96009
|
stage?.(CONTROL_PLANE_INTERACTIVE_SIGNIN_STAGE);
|
|
95950
96010
|
const tokens = await authApi.signInWithBrowser();
|
|
95951
96011
|
await updateControlPlaneSession(store, tokens.token, tokens.refreshToken);
|
|
95952
96012
|
logger2.info("control_plane_signed_in");
|
|
95953
|
-
return
|
|
96013
|
+
return await resolveStoredControlPlaneSession(store, stage, authApi);
|
|
96014
|
+
};
|
|
96015
|
+
ensureControlPlaneToken = async (store, stage, authApi = defaultControlPlaneAuthApi) => {
|
|
96016
|
+
try {
|
|
96017
|
+
return (await ensureControlPlaneSession(store, stage, authApi)).token;
|
|
96018
|
+
} catch (error55) {
|
|
96019
|
+
if (error55 instanceof ControlPlaneLoginRequiredError) {
|
|
96020
|
+
return null;
|
|
96021
|
+
}
|
|
96022
|
+
throw error55;
|
|
96023
|
+
}
|
|
95954
96024
|
};
|
|
95955
96025
|
readUnexpiredControlPlaneToken = async (store) => {
|
|
95956
96026
|
const token = await store.getControlPlaneToken();
|
|
@@ -97043,45 +97113,46 @@ var init_version2 = __esm({
|
|
|
97043
97113
|
// src/devbox/accountScope.ts
|
|
97044
97114
|
import fs16 from "node:fs/promises";
|
|
97045
97115
|
import path22 from "node:path";
|
|
97046
|
-
var
|
|
97116
|
+
var buildCliAccountScope, resolveCliAccountScope, readCliActiveConvexTarget, findNearestActiveConvexTargetRoot, readCliActiveConvexTargetFromCwd, resolveCliAccountScopeFromLocalAuth, tryResolveCliAccountScopeFromLocalAuth;
|
|
97047
97117
|
var init_accountScope2 = __esm({
|
|
97048
97118
|
"src/devbox/accountScope.ts"() {
|
|
97049
97119
|
"use strict";
|
|
97050
97120
|
init_devboxCore();
|
|
97051
97121
|
init_auth();
|
|
97122
|
+
init_authErrors();
|
|
97052
97123
|
init_controlPlane();
|
|
97053
|
-
|
|
97054
|
-
const userId = viewer?.userId.trim() ?? "";
|
|
97055
|
-
if (!userId) {
|
|
97056
|
-
throw new Error(
|
|
97057
|
-
"Could not resolve the signed-in boxes.dev account. Log in again with `dvb setup`, then retry."
|
|
97058
|
-
);
|
|
97059
|
-
}
|
|
97060
|
-
return userId;
|
|
97061
|
-
};
|
|
97062
|
-
resolveCliAccountScope = async ({
|
|
97124
|
+
buildCliAccountScope = async ({
|
|
97063
97125
|
activeConvexTarget = null,
|
|
97064
|
-
|
|
97065
|
-
|
|
97066
|
-
homeDir: homeDir2
|
|
97126
|
+
homeDir: homeDir2,
|
|
97127
|
+
viewer
|
|
97067
97128
|
}) => {
|
|
97068
|
-
const viewer = await fetchViewerIdentityFn(controlPlaneToken);
|
|
97069
|
-
const userId = normalizeViewerUserId2(viewer);
|
|
97070
97129
|
const accountScope = createDevboxAccountScope({
|
|
97071
|
-
viewerUserId: userId,
|
|
97072
|
-
email: viewer
|
|
97130
|
+
viewerUserId: viewer.userId,
|
|
97131
|
+
email: viewer.email ?? null,
|
|
97073
97132
|
activeConvexTarget
|
|
97074
97133
|
});
|
|
97075
97134
|
await writeDevboxAccountMetadata({ accountScope, homeDir: homeDir2 });
|
|
97076
97135
|
return {
|
|
97077
97136
|
accountScope,
|
|
97078
97137
|
viewer: {
|
|
97079
|
-
userId,
|
|
97080
|
-
email: viewer
|
|
97081
|
-
isAdmin: viewer
|
|
97138
|
+
userId: viewer.userId,
|
|
97139
|
+
email: viewer.email ?? null,
|
|
97140
|
+
isAdmin: viewer.isAdmin === true
|
|
97082
97141
|
}
|
|
97083
97142
|
};
|
|
97084
97143
|
};
|
|
97144
|
+
resolveCliAccountScope = async ({
|
|
97145
|
+
activeConvexTarget = null,
|
|
97146
|
+
controlPlaneToken,
|
|
97147
|
+
fetchViewerIdentityFn = fetchViewerIdentity,
|
|
97148
|
+
homeDir: homeDir2
|
|
97149
|
+
}) => {
|
|
97150
|
+
const viewer = await fetchViewerIdentityFn(controlPlaneToken);
|
|
97151
|
+
if (!viewer) {
|
|
97152
|
+
throw new ControlPlaneLoginRequiredError("session_invalid");
|
|
97153
|
+
}
|
|
97154
|
+
return await buildCliAccountScope({ activeConvexTarget, homeDir: homeDir2, viewer });
|
|
97155
|
+
};
|
|
97085
97156
|
readCliActiveConvexTarget = async ({
|
|
97086
97157
|
repoRoot
|
|
97087
97158
|
}) => await readDevboxAccountActiveConvexTarget({ repoRoot }) ?? await readDevboxAccountActiveConvexTargetFromEnv();
|
|
@@ -97118,16 +97189,11 @@ var init_accountScope2 = __esm({
|
|
|
97118
97189
|
config5?.tokenStore,
|
|
97119
97190
|
homeDir2 ? { homeDir: homeDir2 } : void 0
|
|
97120
97191
|
);
|
|
97121
|
-
const
|
|
97122
|
-
|
|
97123
|
-
throw new Error(
|
|
97124
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
97125
|
-
);
|
|
97126
|
-
}
|
|
97127
|
-
return await resolveCliAccountScope({
|
|
97192
|
+
const { viewer } = await ensureControlPlaneSession(store, onAuthStage);
|
|
97193
|
+
return await buildCliAccountScope({
|
|
97128
97194
|
activeConvexTarget: resolvedActiveConvexTarget,
|
|
97129
|
-
|
|
97130
|
-
|
|
97195
|
+
homeDir: homeDir2,
|
|
97196
|
+
viewer
|
|
97131
97197
|
});
|
|
97132
97198
|
};
|
|
97133
97199
|
tryResolveCliAccountScopeFromLocalAuth = async (options = {}) => {
|
|
@@ -137070,6 +137136,7 @@ var init_e2bCommandContext = __esm({
|
|
|
137070
137136
|
"use strict";
|
|
137071
137137
|
init_devboxCore();
|
|
137072
137138
|
init_auth();
|
|
137139
|
+
init_authErrors();
|
|
137073
137140
|
resolveE2bCommandContext = async (options = {}) => {
|
|
137074
137141
|
const config5 = await loadConfig(
|
|
137075
137142
|
process.env.HOME ? { homeDir: process.env.HOME } : void 0
|
|
@@ -137081,9 +137148,9 @@ var init_e2bCommandContext = __esm({
|
|
|
137081
137148
|
const controlPlaneToken = await ensureControlPlaneToken(store, options.stage);
|
|
137082
137149
|
const trimmedControlPlaneToken = controlPlaneToken?.trim() ?? "";
|
|
137083
137150
|
if (!trimmedControlPlaneToken) {
|
|
137084
|
-
throw new
|
|
137085
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev before managing this machine."
|
|
137086
|
-
);
|
|
137151
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
137152
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev before managing this machine."
|
|
137153
|
+
});
|
|
137087
137154
|
}
|
|
137088
137155
|
return {
|
|
137089
137156
|
controlPlaneToken: trimmedControlPlaneToken
|
|
@@ -140300,6 +140367,7 @@ var init_destroy = __esm({
|
|
|
140300
140367
|
init_devboxCore();
|
|
140301
140368
|
init_daemonClient();
|
|
140302
140369
|
init_auth();
|
|
140370
|
+
init_authErrors();
|
|
140303
140371
|
init_controlPlane();
|
|
140304
140372
|
init_logger3();
|
|
140305
140373
|
init_statusLine();
|
|
@@ -140441,9 +140509,9 @@ var init_destroy = __esm({
|
|
|
140441
140509
|
(message) => status.stage(message)
|
|
140442
140510
|
);
|
|
140443
140511
|
if (!controlPlaneToken) {
|
|
140444
|
-
throw new
|
|
140445
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev before destroying this machine."
|
|
140446
|
-
);
|
|
140512
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
140513
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev before destroying this machine."
|
|
140514
|
+
});
|
|
140447
140515
|
}
|
|
140448
140516
|
const managedDestroyResult = await destroyE2bDevbox2({
|
|
140449
140517
|
alias,
|
|
@@ -142575,96 +142643,6 @@ var init_threadInventory = __esm({
|
|
|
142575
142643
|
}
|
|
142576
142644
|
});
|
|
142577
142645
|
|
|
142578
|
-
// src/devbox/resourceApi/errors.ts
|
|
142579
|
-
var CLI_AGENT_TOOL_FAILURE_CODES, readConvexApplicationError, CliAgentToolError, normalizeCliAgentToolError;
|
|
142580
|
-
var init_errors5 = __esm({
|
|
142581
|
-
"src/devbox/resourceApi/errors.ts"() {
|
|
142582
|
-
"use strict";
|
|
142583
|
-
init_values();
|
|
142584
|
-
CLI_AGENT_TOOL_FAILURE_CODES = /* @__PURE__ */ new Set([
|
|
142585
|
-
"not_authenticated",
|
|
142586
|
-
"project_not_found",
|
|
142587
|
-
"ambiguous_project",
|
|
142588
|
-
"devbox_not_found",
|
|
142589
|
-
"devbox_has_threads",
|
|
142590
|
-
"thread_not_found",
|
|
142591
|
-
"contract_version_unsupported",
|
|
142592
|
-
"invalid_request",
|
|
142593
|
-
"operation_in_progress",
|
|
142594
|
-
"idempotency_key_reused",
|
|
142595
|
-
"daemon_unavailable",
|
|
142596
|
-
"unsupported_capability",
|
|
142597
|
-
"operation_canceled",
|
|
142598
|
-
"billing_blocked",
|
|
142599
|
-
"capacity_blocked",
|
|
142600
|
-
"thread_busy",
|
|
142601
|
-
"thread_controlled_elsewhere",
|
|
142602
|
-
"turn_not_active",
|
|
142603
|
-
"turn_changed",
|
|
142604
|
-
"not_found",
|
|
142605
|
-
"name_conflict",
|
|
142606
|
-
"project_url_limit_reached",
|
|
142607
|
-
"configuration_conflict",
|
|
142608
|
-
"invalid_configuration",
|
|
142609
|
-
"template_maintenance_unavailable",
|
|
142610
|
-
"watch_removal_confirmation_required",
|
|
142611
|
-
"github_connection_required",
|
|
142612
|
-
"github_repository_access_required",
|
|
142613
|
-
"service_update_required",
|
|
142614
|
-
"invalid_delivery_policy",
|
|
142615
|
-
"port_not_eligible",
|
|
142616
|
-
"infrastructure_unavailable",
|
|
142617
|
-
"command_failed",
|
|
142618
|
-
"internal_error"
|
|
142619
|
-
]);
|
|
142620
|
-
readConvexApplicationError = (error55) => {
|
|
142621
|
-
if (!(error55 instanceof ConvexError)) return null;
|
|
142622
|
-
const data = error55.data;
|
|
142623
|
-
if (!data || typeof data !== "object" || Array.isArray(data)) return null;
|
|
142624
|
-
const record3 = data;
|
|
142625
|
-
if (typeof record3.code !== "string" || !CLI_AGENT_TOOL_FAILURE_CODES.has(
|
|
142626
|
-
record3.code
|
|
142627
|
-
) || typeof record3.message !== "string") {
|
|
142628
|
-
return null;
|
|
142629
|
-
}
|
|
142630
|
-
return {
|
|
142631
|
-
code: record3.code,
|
|
142632
|
-
message: record3.message,
|
|
142633
|
-
retryable: typeof record3.retryable === "boolean" ? record3.retryable : false
|
|
142634
|
-
};
|
|
142635
|
-
};
|
|
142636
|
-
CliAgentToolError = class extends Error {
|
|
142637
|
-
code;
|
|
142638
|
-
retryable;
|
|
142639
|
-
constructor({
|
|
142640
|
-
code: code2,
|
|
142641
|
-
message,
|
|
142642
|
-
retryable = false,
|
|
142643
|
-
cause
|
|
142644
|
-
}) {
|
|
142645
|
-
super(message, { cause });
|
|
142646
|
-
this.name = "CliAgentToolError";
|
|
142647
|
-
this.code = code2;
|
|
142648
|
-
this.retryable = retryable;
|
|
142649
|
-
}
|
|
142650
|
-
};
|
|
142651
|
-
normalizeCliAgentToolError = (error55) => {
|
|
142652
|
-
if (error55 instanceof CliAgentToolError) {
|
|
142653
|
-
return error55;
|
|
142654
|
-
}
|
|
142655
|
-
const applicationError = readConvexApplicationError(error55);
|
|
142656
|
-
if (applicationError) {
|
|
142657
|
-
return new CliAgentToolError({ ...applicationError, cause: error55 });
|
|
142658
|
-
}
|
|
142659
|
-
return new CliAgentToolError({
|
|
142660
|
-
code: "internal_error",
|
|
142661
|
-
message: error55 instanceof Error ? error55.message : String(error55),
|
|
142662
|
-
cause: error55
|
|
142663
|
-
});
|
|
142664
|
-
};
|
|
142665
|
-
}
|
|
142666
|
-
});
|
|
142667
|
-
|
|
142668
142646
|
// src/devbox/resourceApi/context.ts
|
|
142669
142647
|
import { randomUUID as randomUUID14 } from "node:crypto";
|
|
142670
142648
|
var createCliControlPlaneTokenContext, createCliAgentToolRequestId, createCliAgentResourceContext;
|
|
@@ -142675,37 +142653,19 @@ var init_context2 = __esm({
|
|
|
142675
142653
|
init_auth();
|
|
142676
142654
|
init_controlPlane();
|
|
142677
142655
|
init_accountScope2();
|
|
142678
|
-
init_errors5();
|
|
142679
142656
|
createCliControlPlaneTokenContext = async ({
|
|
142680
142657
|
allowInteractiveLogin,
|
|
142681
|
-
missingLoginMessage,
|
|
142682
142658
|
tokenProviderMode
|
|
142683
142659
|
}) => {
|
|
142684
142660
|
const config5 = await loadConfig();
|
|
142685
142661
|
const store = await createSecretStore(config5?.tokenStore);
|
|
142686
|
-
|
|
142687
|
-
|
|
142688
|
-
const token = allowInteractiveLogin ? await ensureControlPlaneToken(store) : await ensureExistingControlPlaneToken(store);
|
|
142689
|
-
if (!token) {
|
|
142690
|
-
throw new Error(missingLoginMessage);
|
|
142691
|
-
}
|
|
142692
|
-
initialToken = token;
|
|
142693
|
-
} catch (error55) {
|
|
142694
|
-
if (allowInteractiveLogin) {
|
|
142695
|
-
throw error55;
|
|
142696
|
-
}
|
|
142697
|
-
throw new CliAgentToolError({
|
|
142698
|
-
code: "not_authenticated",
|
|
142699
|
-
message: missingLoginMessage,
|
|
142700
|
-
cause: error55
|
|
142701
|
-
});
|
|
142702
|
-
}
|
|
142703
|
-
let seededToken = initialToken;
|
|
142662
|
+
const session = allowInteractiveLogin ? await ensureControlPlaneSession(store) : await resolveStoredControlPlaneSession(store);
|
|
142663
|
+
let seededToken = session.token;
|
|
142704
142664
|
const longLivedTokenProvider = tokenProviderMode === "long_lived" ? createLongLivedControlPlaneTokenProvider(store) : null;
|
|
142705
142665
|
const activeConvexTarget = await readCliActiveConvexTargetFromCwd();
|
|
142706
|
-
const { accountScope, viewer } = await
|
|
142666
|
+
const { accountScope, viewer } = await buildCliAccountScope({
|
|
142707
142667
|
activeConvexTarget,
|
|
142708
|
-
|
|
142668
|
+
viewer: session.viewer
|
|
142709
142669
|
});
|
|
142710
142670
|
return {
|
|
142711
142671
|
accountScope,
|
|
@@ -142728,7 +142688,6 @@ var init_context2 = __esm({
|
|
|
142728
142688
|
createCliAgentResourceContext = async () => {
|
|
142729
142689
|
const tokenContext = await createCliControlPlaneTokenContext({
|
|
142730
142690
|
allowInteractiveLogin: false,
|
|
142731
|
-
missingLoginMessage: "Not logged in to boxes.dev. Run `dvb setup` in an interactive terminal first.",
|
|
142732
142691
|
tokenProviderMode: "bounded"
|
|
142733
142692
|
});
|
|
142734
142693
|
const client = await createAuthenticatedConvexClient(tokenContext.getToken);
|
|
@@ -142899,10 +142858,9 @@ var init_commandContext = __esm({
|
|
|
142899
142858
|
});
|
|
142900
142859
|
return Ct(answer) ? null : String(answer);
|
|
142901
142860
|
};
|
|
142902
|
-
createAgentViewCommandTokenContext = async (
|
|
142861
|
+
createAgentViewCommandTokenContext = async () => {
|
|
142903
142862
|
const context34 = await createCliControlPlaneTokenContext({
|
|
142904
142863
|
allowInteractiveLogin: true,
|
|
142905
|
-
missingLoginMessage: `Not logged in to boxes.dev. Rerun \`dvb ${command}\` in an interactive terminal to log in.`,
|
|
142906
142864
|
tokenProviderMode: "long_lived"
|
|
142907
142865
|
});
|
|
142908
142866
|
return {
|
|
@@ -142951,6 +142909,112 @@ var init_commandContext = __esm({
|
|
|
142951
142909
|
}
|
|
142952
142910
|
});
|
|
142953
142911
|
|
|
142912
|
+
// src/devbox/resourceApi/errors.ts
|
|
142913
|
+
var CLI_AGENT_TOOL_FAILURE_CODES, readConvexApplicationError, CliAgentToolError, normalizeCliAgentToolError;
|
|
142914
|
+
var init_errors5 = __esm({
|
|
142915
|
+
"src/devbox/resourceApi/errors.ts"() {
|
|
142916
|
+
"use strict";
|
|
142917
|
+
init_values();
|
|
142918
|
+
init_authErrors();
|
|
142919
|
+
CLI_AGENT_TOOL_FAILURE_CODES = /* @__PURE__ */ new Set([
|
|
142920
|
+
"not_authenticated",
|
|
142921
|
+
"project_not_found",
|
|
142922
|
+
"ambiguous_project",
|
|
142923
|
+
"devbox_not_found",
|
|
142924
|
+
"devbox_has_threads",
|
|
142925
|
+
"thread_not_found",
|
|
142926
|
+
"contract_version_unsupported",
|
|
142927
|
+
"invalid_request",
|
|
142928
|
+
"operation_in_progress",
|
|
142929
|
+
"idempotency_key_reused",
|
|
142930
|
+
"daemon_unavailable",
|
|
142931
|
+
"unsupported_capability",
|
|
142932
|
+
"operation_canceled",
|
|
142933
|
+
"billing_blocked",
|
|
142934
|
+
"capacity_blocked",
|
|
142935
|
+
"thread_busy",
|
|
142936
|
+
"thread_controlled_elsewhere",
|
|
142937
|
+
"turn_not_active",
|
|
142938
|
+
"turn_changed",
|
|
142939
|
+
"not_found",
|
|
142940
|
+
"name_conflict",
|
|
142941
|
+
"project_url_limit_reached",
|
|
142942
|
+
"configuration_conflict",
|
|
142943
|
+
"invalid_configuration",
|
|
142944
|
+
"template_maintenance_unavailable",
|
|
142945
|
+
"watch_removal_confirmation_required",
|
|
142946
|
+
"github_connection_required",
|
|
142947
|
+
"github_repository_access_required",
|
|
142948
|
+
"service_update_required",
|
|
142949
|
+
"invalid_delivery_policy",
|
|
142950
|
+
"port_not_eligible",
|
|
142951
|
+
"infrastructure_unavailable",
|
|
142952
|
+
"command_failed",
|
|
142953
|
+
"internal_error"
|
|
142954
|
+
]);
|
|
142955
|
+
readConvexApplicationError = (error55) => {
|
|
142956
|
+
if (!(error55 instanceof ConvexError)) return null;
|
|
142957
|
+
const data = error55.data;
|
|
142958
|
+
if (!data || typeof data !== "object" || Array.isArray(data)) return null;
|
|
142959
|
+
const record3 = data;
|
|
142960
|
+
if (typeof record3.code !== "string" || !CLI_AGENT_TOOL_FAILURE_CODES.has(
|
|
142961
|
+
record3.code
|
|
142962
|
+
) || typeof record3.message !== "string") {
|
|
142963
|
+
return null;
|
|
142964
|
+
}
|
|
142965
|
+
return {
|
|
142966
|
+
code: record3.code,
|
|
142967
|
+
message: record3.message,
|
|
142968
|
+
retryable: typeof record3.retryable === "boolean" ? record3.retryable : false
|
|
142969
|
+
};
|
|
142970
|
+
};
|
|
142971
|
+
CliAgentToolError = class extends Error {
|
|
142972
|
+
code;
|
|
142973
|
+
retryable;
|
|
142974
|
+
constructor({
|
|
142975
|
+
code: code2,
|
|
142976
|
+
message,
|
|
142977
|
+
retryable = false,
|
|
142978
|
+
cause
|
|
142979
|
+
}) {
|
|
142980
|
+
super(message, { cause });
|
|
142981
|
+
this.name = "CliAgentToolError";
|
|
142982
|
+
this.code = code2;
|
|
142983
|
+
this.retryable = retryable;
|
|
142984
|
+
}
|
|
142985
|
+
};
|
|
142986
|
+
normalizeCliAgentToolError = (error55) => {
|
|
142987
|
+
if (error55 instanceof CliAgentToolError) {
|
|
142988
|
+
return error55;
|
|
142989
|
+
}
|
|
142990
|
+
if (error55 instanceof ControlPlaneLoginRequiredError) {
|
|
142991
|
+
return new CliAgentToolError({
|
|
142992
|
+
code: "not_authenticated",
|
|
142993
|
+
message: error55.message,
|
|
142994
|
+
cause: error55
|
|
142995
|
+
});
|
|
142996
|
+
}
|
|
142997
|
+
if (error55 instanceof ControlPlaneAuthUnavailableError) {
|
|
142998
|
+
return new CliAgentToolError({
|
|
142999
|
+
code: "infrastructure_unavailable",
|
|
143000
|
+
message: error55.message,
|
|
143001
|
+
retryable: true,
|
|
143002
|
+
cause: error55
|
|
143003
|
+
});
|
|
143004
|
+
}
|
|
143005
|
+
const applicationError = readConvexApplicationError(error55);
|
|
143006
|
+
if (applicationError) {
|
|
143007
|
+
return new CliAgentToolError({ ...applicationError, cause: error55 });
|
|
143008
|
+
}
|
|
143009
|
+
return new CliAgentToolError({
|
|
143010
|
+
code: "internal_error",
|
|
143011
|
+
message: error55 instanceof Error ? error55.message : String(error55),
|
|
143012
|
+
cause: error55
|
|
143013
|
+
});
|
|
143014
|
+
};
|
|
143015
|
+
}
|
|
143016
|
+
});
|
|
143017
|
+
|
|
142954
143018
|
// src/devbox/resourceApi/identifiers.ts
|
|
142955
143019
|
var resolveCliAgentToolProject, resolveCliAgentToolDevbox;
|
|
142956
143020
|
var init_identifiers = __esm({
|
|
@@ -168201,7 +168265,7 @@ var init_agentDirectThread = __esm({
|
|
|
168201
168265
|
`\`dvb ${backend}\` requires an interactive terminal. Rerun it directly in your terminal.`
|
|
168202
168266
|
);
|
|
168203
168267
|
}
|
|
168204
|
-
const { accountScope, getToken } = await dependencies.createTokenContext(
|
|
168268
|
+
const { accountScope, getToken } = await dependencies.createTokenContext();
|
|
168205
168269
|
const client = await dependencies.createClient(getToken);
|
|
168206
168270
|
try {
|
|
168207
168271
|
const selection = await dependencies.selectProject({
|
|
@@ -168662,7 +168726,7 @@ var init_agentDirectResume = __esm({
|
|
|
168662
168726
|
`\`dvb ${backend} --resume\` requires an interactive terminal. Rerun it directly in your terminal.`
|
|
168663
168727
|
);
|
|
168664
168728
|
}
|
|
168665
|
-
const { accountScope, getToken } = await dependencies.createTokenContext(
|
|
168729
|
+
const { accountScope, getToken } = await dependencies.createTokenContext();
|
|
168666
168730
|
const client = await dependencies.createClient(getToken);
|
|
168667
168731
|
try {
|
|
168668
168732
|
const selection = await dependencies.selectProject({
|
|
@@ -230422,7 +230486,7 @@ var init_runAgentWorkspaceDetail = __esm({
|
|
|
230422
230486
|
error: error55 instanceof Error ? error55.message : String(error55)
|
|
230423
230487
|
});
|
|
230424
230488
|
});
|
|
230425
|
-
const { accountScope, getToken, isAdmin } = await createAgentViewCommandTokenContext(
|
|
230489
|
+
const { accountScope, getToken, isAdmin } = await createAgentViewCommandTokenContext();
|
|
230426
230490
|
const memoryDiagnostics = await startAgentViewMemoryDiagnostics({
|
|
230427
230491
|
localDiagnosticsEnabled: isAdmin,
|
|
230428
230492
|
role: "workspace_detail",
|
|
@@ -231311,7 +231375,7 @@ var init_agents = __esm({
|
|
|
231311
231375
|
init_threads();
|
|
231312
231376
|
init_resourceOutput();
|
|
231313
231377
|
init_threads2();
|
|
231314
|
-
createAgentViewTokenProvider = async () => await createAgentViewCommandTokenContext(
|
|
231378
|
+
createAgentViewTokenProvider = async () => await createAgentViewCommandTokenContext();
|
|
231315
231379
|
defaultDependencies7 = {
|
|
231316
231380
|
stdinIsTTY: () => process.stdin.isTTY === true,
|
|
231317
231381
|
stdoutIsTTY: () => process.stdout.isTTY === true,
|
|
@@ -249818,6 +249882,7 @@ var init_service = __esm({
|
|
|
249818
249882
|
init_initPrep();
|
|
249819
249883
|
init_accountScope2();
|
|
249820
249884
|
init_auth();
|
|
249885
|
+
init_authErrors();
|
|
249821
249886
|
init_databaseDumpTools2();
|
|
249822
249887
|
init_siteUrl();
|
|
249823
249888
|
init_controlPlane2();
|
|
@@ -249846,7 +249911,9 @@ var init_service = __esm({
|
|
|
249846
249911
|
const store = await openAgentInitSecretStore(homeDir2);
|
|
249847
249912
|
const controlPlaneToken = await ensureControlPlaneToken(store);
|
|
249848
249913
|
if (!controlPlaneToken) {
|
|
249849
|
-
throw new
|
|
249914
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
249915
|
+
message: buildAgentInitLoginRequiredMessage()
|
|
249916
|
+
});
|
|
249850
249917
|
}
|
|
249851
249918
|
const activeConvexTarget = await readCliActiveConvexTargetFromCwd({ cwd: cwd2 });
|
|
249852
249919
|
const { accountScope, viewer } = await resolveCliAccountScope({
|
|
@@ -249980,6 +250047,7 @@ var init_failureReport = __esm({
|
|
|
249980
250047
|
"use strict";
|
|
249981
250048
|
init_devboxCore();
|
|
249982
250049
|
init_auth();
|
|
250050
|
+
init_authErrors();
|
|
249983
250051
|
init_billingActivationGate();
|
|
249984
250052
|
init_errors4();
|
|
249985
250053
|
init_progressReport();
|
|
@@ -250013,7 +250081,7 @@ var init_failureReport = __esm({
|
|
|
250013
250081
|
report = reportAgentInitStepBestEffort
|
|
250014
250082
|
}) => {
|
|
250015
250083
|
const progress = readProgressCommand(args);
|
|
250016
|
-
if (progress === null || isCommandUsageError(error55) || error55 instanceof UpgradeRequiredError || isBillingActivationRequiredError(error55)) {
|
|
250084
|
+
if (progress === null || isCommandUsageError(error55) || error55 instanceof UpgradeRequiredError || isBillingActivationRequiredError(error55) || error55 instanceof ControlPlaneLoginRequiredError || error55 instanceof ControlPlaneAuthUnavailableError) {
|
|
250017
250085
|
return;
|
|
250018
250086
|
}
|
|
250019
250087
|
printError(
|
|
@@ -251323,6 +251391,7 @@ var init_accounts = __esm({
|
|
|
251323
251391
|
init_progressReport();
|
|
251324
251392
|
init_remoteSession();
|
|
251325
251393
|
init_auth();
|
|
251394
|
+
init_authErrors();
|
|
251326
251395
|
init_browser();
|
|
251327
251396
|
init_errors4();
|
|
251328
251397
|
init_codingAgents2();
|
|
@@ -251440,7 +251509,9 @@ var init_accounts = __esm({
|
|
|
251440
251509
|
const store = await openAgentInitSecretStore();
|
|
251441
251510
|
const controlPlaneToken = await resolveStoredControlPlaneToken(store);
|
|
251442
251511
|
if (!controlPlaneToken) {
|
|
251443
|
-
throw new
|
|
251512
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
251513
|
+
message: buildAgentInitLoginRequiredMessage()
|
|
251514
|
+
});
|
|
251444
251515
|
}
|
|
251445
251516
|
const { accountScope, viewer } = await resolveCliAccountScope({
|
|
251446
251517
|
activeConvexTarget: await readCliActiveConvexTargetFromCwd(),
|
|
@@ -280938,6 +281009,7 @@ var init_setupAgents = __esm({
|
|
|
280938
281009
|
init_dist5();
|
|
280939
281010
|
init_devboxCore();
|
|
280940
281011
|
init_auth();
|
|
281012
|
+
init_authErrors();
|
|
280941
281013
|
init_accountScope2();
|
|
280942
281014
|
init_controlPlane();
|
|
280943
281015
|
init_managedCodexAuth();
|
|
@@ -281064,9 +281136,9 @@ var init_setupAgents = __esm({
|
|
|
281064
281136
|
onStatusStage?.("Checking boxes.dev login");
|
|
281065
281137
|
const ensured = await ensureControlPlaneTokenFn(store, onStatusStage);
|
|
281066
281138
|
if (!ensured) {
|
|
281067
|
-
throw new
|
|
281068
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
281069
|
-
);
|
|
281139
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
281140
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
281141
|
+
});
|
|
281070
281142
|
}
|
|
281071
281143
|
controlPlaneToken = ensured;
|
|
281072
281144
|
return ensured;
|
|
@@ -281236,6 +281308,7 @@ var init_setup = __esm({
|
|
|
281236
281308
|
init_dist5();
|
|
281237
281309
|
init_devboxCore();
|
|
281238
281310
|
init_auth();
|
|
281311
|
+
init_authErrors();
|
|
281239
281312
|
init_args();
|
|
281240
281313
|
init_errors4();
|
|
281241
281314
|
init_controlPlane();
|
|
@@ -281799,9 +281872,9 @@ var init_setup = __esm({
|
|
|
281799
281872
|
};
|
|
281800
281873
|
let controlPlaneToken = await ensureControlPlaneToken(store, authStage);
|
|
281801
281874
|
if (!controlPlaneToken) {
|
|
281802
|
-
throw new
|
|
281803
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
281804
|
-
);
|
|
281875
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
281876
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
281877
|
+
});
|
|
281805
281878
|
}
|
|
281806
281879
|
await ensureCliBillingActivated({
|
|
281807
281880
|
controlPlaneToken,
|
|
@@ -288883,6 +288956,7 @@ var init_init = __esm({
|
|
|
288883
288956
|
init_devboxCore();
|
|
288884
288957
|
init_daemonClient();
|
|
288885
288958
|
init_auth();
|
|
288959
|
+
init_authErrors();
|
|
288886
288960
|
init_accountScope2();
|
|
288887
288961
|
init_billingActivationGate();
|
|
288888
288962
|
init_controlPlane();
|
|
@@ -289225,9 +289299,9 @@ var init_init = __esm({
|
|
|
289225
289299
|
(message) => status.stage(message)
|
|
289226
289300
|
);
|
|
289227
289301
|
if (!controlPlaneToken) {
|
|
289228
|
-
throw new
|
|
289229
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
289230
|
-
);
|
|
289302
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
289303
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev, then retry."
|
|
289304
|
+
});
|
|
289231
289305
|
}
|
|
289232
289306
|
return {
|
|
289233
289307
|
config: config5,
|
|
@@ -290850,7 +290924,6 @@ var init_mcp = __esm({
|
|
|
290850
290924
|
createDefaultSession = async () => {
|
|
290851
290925
|
const tokenContext = await createCliControlPlaneTokenContext({
|
|
290852
290926
|
allowInteractiveLogin: process.stdin.isTTY === true,
|
|
290853
|
-
missingLoginMessage: "Not logged in to boxes.dev. Run `dvb setup` in an interactive terminal first.",
|
|
290854
290927
|
tokenProviderMode: "bounded"
|
|
290855
290928
|
});
|
|
290856
290929
|
const client = await createAuthenticatedConvexClient(
|
|
@@ -292295,6 +292368,7 @@ var init_reset = __esm({
|
|
|
292295
292368
|
"use strict";
|
|
292296
292369
|
init_devboxCore();
|
|
292297
292370
|
init_auth();
|
|
292371
|
+
init_authErrors();
|
|
292298
292372
|
init_controlPlane();
|
|
292299
292373
|
init_args();
|
|
292300
292374
|
init_errors4();
|
|
@@ -292386,9 +292460,9 @@ var init_reset = __esm({
|
|
|
292386
292460
|
(message) => status.stage(message)
|
|
292387
292461
|
);
|
|
292388
292462
|
if (!controlPlaneToken) {
|
|
292389
|
-
throw new
|
|
292390
|
-
"Not logged in. Run `dvb setup` to log in to boxes.dev before resetting this machine."
|
|
292391
|
-
);
|
|
292463
|
+
throw new ControlPlaneLoginRequiredError("signed_out", {
|
|
292464
|
+
message: "Not logged in. Run `dvb setup` to log in to boxes.dev before resetting this machine."
|
|
292465
|
+
});
|
|
292392
292466
|
}
|
|
292393
292467
|
status.stage("Resolving machine");
|
|
292394
292468
|
const instances2 = await dependencies.listViewerInstances(controlPlaneToken);
|
|
@@ -294820,14 +294894,15 @@ var init_upgrade = __esm({
|
|
|
294820
294894
|
});
|
|
294821
294895
|
|
|
294822
294896
|
// src/devbox/commands/whoami.ts
|
|
294823
|
-
var parseWhoamiArgs,
|
|
294897
|
+
var parseWhoamiArgs, runWhoami;
|
|
294824
294898
|
var init_whoami = __esm({
|
|
294825
294899
|
"src/devbox/commands/whoami.ts"() {
|
|
294826
294900
|
"use strict";
|
|
294827
294901
|
init_devboxCore();
|
|
294828
294902
|
init_args();
|
|
294829
294903
|
init_errors4();
|
|
294830
|
-
|
|
294904
|
+
init_auth();
|
|
294905
|
+
init_authErrors();
|
|
294831
294906
|
parseWhoamiArgs = (args) => {
|
|
294832
294907
|
const { flags, positionals } = parseCommandArgs({
|
|
294833
294908
|
args,
|
|
@@ -294840,32 +294915,6 @@ var init_whoami = __esm({
|
|
|
294840
294915
|
}
|
|
294841
294916
|
return { json: readBooleanFlag(flags, "json") };
|
|
294842
294917
|
};
|
|
294843
|
-
TOKEN_REFRESH_BUFFER_MS3 = 5 * 60 * 1e3;
|
|
294844
|
-
decodeJwtPayload6 = (token) => {
|
|
294845
|
-
const parts = token.split(".");
|
|
294846
|
-
if (parts.length < 2) return null;
|
|
294847
|
-
const payload = parts[1];
|
|
294848
|
-
if (!payload) return null;
|
|
294849
|
-
const normalized = payload.replace(/-/g, "+").replace(/_/g, "/");
|
|
294850
|
-
const pad = normalized.length % 4;
|
|
294851
|
-
const padded = pad === 0 ? normalized : `${normalized}${"=".repeat(4 - pad)}`;
|
|
294852
|
-
try {
|
|
294853
|
-
const decoded = Buffer.from(padded, "base64").toString("utf8");
|
|
294854
|
-
return JSON.parse(decoded);
|
|
294855
|
-
} catch {
|
|
294856
|
-
return null;
|
|
294857
|
-
}
|
|
294858
|
-
};
|
|
294859
|
-
parseTokenExpiresAt3 = (token) => {
|
|
294860
|
-
const payload = decodeJwtPayload6(token);
|
|
294861
|
-
const exp = payload?.exp;
|
|
294862
|
-
if (typeof exp !== "number") return null;
|
|
294863
|
-
return Math.floor(exp * 1e3);
|
|
294864
|
-
};
|
|
294865
|
-
shouldRefreshToken3 = (expiresAt) => {
|
|
294866
|
-
if (!expiresAt) return false;
|
|
294867
|
-
return Date.now() + TOKEN_REFRESH_BUFFER_MS3 >= expiresAt;
|
|
294868
|
-
};
|
|
294869
294918
|
runWhoami = async (args) => {
|
|
294870
294919
|
const parsed = parseWhoamiArgs(args);
|
|
294871
294920
|
const homeDir2 = process.env.HOME?.trim();
|
|
@@ -294874,44 +294923,33 @@ var init_whoami = __esm({
|
|
|
294874
294923
|
config5?.tokenStore,
|
|
294875
294924
|
homeDir2 ? { homeDir: homeDir2 } : void 0
|
|
294876
294925
|
);
|
|
294877
|
-
let
|
|
294878
|
-
|
|
294879
|
-
|
|
294880
|
-
|
|
294881
|
-
if (
|
|
294882
|
-
const refreshed = await refreshControlPlaneSession(refreshToken);
|
|
294883
|
-
token = refreshed.token;
|
|
294884
|
-
const nextExpiresAt = parseTokenExpiresAt3(refreshed.token);
|
|
294885
|
-
await store.setControlPlaneSession({
|
|
294886
|
-
token: refreshed.token,
|
|
294887
|
-
...refreshed.refreshToken ? { refreshToken: refreshed.refreshToken } : {},
|
|
294888
|
-
expiresAt: nextExpiresAt
|
|
294889
|
-
});
|
|
294890
|
-
return true;
|
|
294891
|
-
};
|
|
294892
|
-
if (!token) {
|
|
294893
|
-
await refreshIfPossible().catch(() => false);
|
|
294894
|
-
} else if (shouldRefreshToken3(expiresAt)) {
|
|
294895
|
-
await refreshIfPossible().catch(() => false);
|
|
294896
|
-
}
|
|
294897
|
-
if (!token) {
|
|
294898
|
-
if (parsed.json) {
|
|
294899
|
-
console.log(JSON.stringify({ ok: true, authenticated: false }, null, 2));
|
|
294900
|
-
return;
|
|
294901
|
-
}
|
|
294902
|
-
console.log("Not signed in.");
|
|
294903
|
-
return;
|
|
294904
|
-
}
|
|
294905
|
-
const viewer = await fetchViewerIdentity(token);
|
|
294906
|
-
if (!viewer) {
|
|
294907
|
-
if (parsed.json) {
|
|
294926
|
+
let viewer;
|
|
294927
|
+
try {
|
|
294928
|
+
({ viewer } = await resolveStoredControlPlaneSession(store));
|
|
294929
|
+
} catch (error55) {
|
|
294930
|
+
if (parsed.json && error55 instanceof ControlPlaneAuthUnavailableError) {
|
|
294908
294931
|
console.log(
|
|
294909
294932
|
JSON.stringify(
|
|
294910
|
-
{
|
|
294933
|
+
{
|
|
294934
|
+
ok: false,
|
|
294935
|
+
error: {
|
|
294936
|
+
code: "infrastructure_unavailable",
|
|
294937
|
+
message: error55.message,
|
|
294938
|
+
retryable: true
|
|
294939
|
+
}
|
|
294940
|
+
},
|
|
294911
294941
|
null,
|
|
294912
294942
|
2
|
|
294913
294943
|
)
|
|
294914
294944
|
);
|
|
294945
|
+
process.exitCode = 1;
|
|
294946
|
+
return;
|
|
294947
|
+
}
|
|
294948
|
+
if (!(error55 instanceof ControlPlaneLoginRequiredError)) {
|
|
294949
|
+
throw error55;
|
|
294950
|
+
}
|
|
294951
|
+
if (parsed.json) {
|
|
294952
|
+
console.log(JSON.stringify({ ok: true, authenticated: false }, null, 2));
|
|
294915
294953
|
return;
|
|
294916
294954
|
}
|
|
294917
294955
|
console.log("Not signed in.");
|
|
@@ -297023,6 +297061,7 @@ var init_cli = __esm({
|
|
|
297023
297061
|
|
|
297024
297062
|
// src/bin/dvb.ts
|
|
297025
297063
|
init_devboxCore();
|
|
297064
|
+
init_authErrors();
|
|
297026
297065
|
init_daemonWorkingDirectory();
|
|
297027
297066
|
init_billingActivationGate();
|
|
297028
297067
|
import fsp from "node:fs/promises";
|
|
@@ -297142,6 +297181,11 @@ run().catch(async (error55) => {
|
|
|
297142
297181
|
await flushDevboxSentry();
|
|
297143
297182
|
process.exit(1);
|
|
297144
297183
|
}
|
|
297184
|
+
if (error55 instanceof ControlPlaneLoginRequiredError || error55 instanceof ControlPlaneAuthUnavailableError) {
|
|
297185
|
+
console.error(error55.message);
|
|
297186
|
+
await flushDevboxSentry();
|
|
297187
|
+
process.exit(1);
|
|
297188
|
+
}
|
|
297145
297189
|
const command = args[0] ?? "none";
|
|
297146
297190
|
captureDevboxException(error55, {
|
|
297147
297191
|
tags: {
|
|
@@ -297355,4 +297399,4 @@ react/cjs/react-jsx-runtime.development.js:
|
|
|
297355
297399
|
*)
|
|
297356
297400
|
*/
|
|
297357
297401
|
|
|
297358
|
-
//# debugId=
|
|
297402
|
+
//# debugId=f9b05d56-bcfd-5306-9e59-f832431ece07
|