bamboo-agents 0.1.4-dev.10 → 0.1.5-dev.11
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/VERSION +1 -1
- package/dist/index.js +115 -24
- package/dist/index.js.map +4 -4
- package/package.json +1 -1
package/dist/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.1.
|
|
1
|
+
0.1.5-dev.11
|
package/dist/index.js
CHANGED
|
@@ -3037,7 +3037,7 @@ var VERSION;
|
|
|
3037
3037
|
var init_version = __esm({
|
|
3038
3038
|
"src/version.ts"() {
|
|
3039
3039
|
"use strict";
|
|
3040
|
-
VERSION = "0.1.
|
|
3040
|
+
VERSION = "0.1.5-dev.11";
|
|
3041
3041
|
}
|
|
3042
3042
|
});
|
|
3043
3043
|
|
|
@@ -11547,9 +11547,20 @@ var init_credentials = __esm({
|
|
|
11547
11547
|
}
|
|
11548
11548
|
});
|
|
11549
11549
|
|
|
11550
|
+
// src/lib/util.ts
|
|
11551
|
+
function sleep(ms) {
|
|
11552
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
11553
|
+
}
|
|
11554
|
+
var init_util2 = __esm({
|
|
11555
|
+
"src/lib/util.ts"() {
|
|
11556
|
+
"use strict";
|
|
11557
|
+
}
|
|
11558
|
+
});
|
|
11559
|
+
|
|
11550
11560
|
// src/commands/login.ts
|
|
11551
11561
|
var login_exports = {};
|
|
11552
11562
|
__export(login_exports, {
|
|
11563
|
+
TOKEN_POLL: () => TOKEN_POLL,
|
|
11553
11564
|
handleMissingGithubToken: () => handleMissingGithubToken,
|
|
11554
11565
|
runLogin: () => runLogin,
|
|
11555
11566
|
startCallbackServer: () => startCallbackServer,
|
|
@@ -11564,24 +11575,50 @@ function verificationCode(state) {
|
|
|
11564
11575
|
return `${head.slice(0, 4)}-${head.slice(4, 8)}`;
|
|
11565
11576
|
}
|
|
11566
11577
|
async function handleMissingGithubToken(bambooSession) {
|
|
11578
|
+
let relinkUrl;
|
|
11567
11579
|
try {
|
|
11568
11580
|
const { relink_url } = await startGithubOAuthRelink(bambooSession);
|
|
11569
|
-
|
|
11570
|
-
console.log("");
|
|
11571
|
-
console.log(
|
|
11572
|
-
" After authorizing in your browser, re-run `bamboo-agents login`."
|
|
11573
|
-
);
|
|
11574
|
-
console.log("");
|
|
11575
|
-
return 0;
|
|
11581
|
+
relinkUrl = relink_url;
|
|
11576
11582
|
} catch {
|
|
11577
11583
|
console.log("");
|
|
11578
11584
|
console.log(
|
|
11579
|
-
` Couldn't start GitHub
|
|
11585
|
+
` Couldn't start GitHub auth automatically. Open this URL in your browser, then re-run \`bamboo-agents login\`:`
|
|
11580
11586
|
);
|
|
11581
11587
|
console.log(` ${FALLBACK_RELINK_URL}`);
|
|
11582
11588
|
console.log("");
|
|
11583
|
-
return
|
|
11589
|
+
return null;
|
|
11590
|
+
}
|
|
11591
|
+
await open_default(relinkUrl);
|
|
11592
|
+
const spinner = ora("Waiting for GitHub authorization in your browser\u2026").start();
|
|
11593
|
+
const start = Date.now();
|
|
11594
|
+
while (Date.now() - start < TOKEN_POLL.timeoutMs) {
|
|
11595
|
+
await sleep(TOKEN_POLL.intervalMs);
|
|
11596
|
+
try {
|
|
11597
|
+
const tokenResp = await getGithubToken(bambooSession);
|
|
11598
|
+
spinner.succeed("GitHub authorization complete");
|
|
11599
|
+
return tokenResp;
|
|
11600
|
+
} catch (err) {
|
|
11601
|
+
if (err instanceof ApiError) {
|
|
11602
|
+
if (err.status === 401) {
|
|
11603
|
+
spinner.fail(
|
|
11604
|
+
"Your Bamboo session expired. Re-run `bamboo-agents login`."
|
|
11605
|
+
);
|
|
11606
|
+
return null;
|
|
11607
|
+
}
|
|
11608
|
+
if (err.status === 410) {
|
|
11609
|
+
spinner.fail(
|
|
11610
|
+
"Your GitHub token expired. Sign in to Bamboo with GitHub again, then re-run."
|
|
11611
|
+
);
|
|
11612
|
+
return null;
|
|
11613
|
+
}
|
|
11614
|
+
}
|
|
11615
|
+
continue;
|
|
11616
|
+
}
|
|
11584
11617
|
}
|
|
11618
|
+
spinner.fail(
|
|
11619
|
+
`Timed out waiting for GitHub authorization. Re-run \`bamboo-agents login\` after authorizing in your browser.`
|
|
11620
|
+
);
|
|
11621
|
+
return null;
|
|
11585
11622
|
}
|
|
11586
11623
|
async function startCallbackServer(expectedState) {
|
|
11587
11624
|
let resolveSession;
|
|
@@ -11688,22 +11725,23 @@ async function runLogin() {
|
|
|
11688
11725
|
let tokenResp;
|
|
11689
11726
|
try {
|
|
11690
11727
|
tokenResp = await getGithubToken(bambooSession);
|
|
11728
|
+
tokenSpinner.succeed("GitHub token retrieved");
|
|
11691
11729
|
} catch (err) {
|
|
11692
11730
|
if (err instanceof ApiError && err.status === 404) {
|
|
11693
11731
|
tokenSpinner.warn(
|
|
11694
11732
|
"No GitHub token linked yet \u2014 opening browser to authorize Bamboo with GitHub\u2026"
|
|
11695
11733
|
);
|
|
11696
|
-
const
|
|
11697
|
-
process.exit(
|
|
11698
|
-
|
|
11699
|
-
if (err instanceof ApiError && err.status === 410) {
|
|
11734
|
+
const polled = await handleMissingGithubToken(bambooSession);
|
|
11735
|
+
if (!polled) process.exit(1);
|
|
11736
|
+
tokenResp = polled;
|
|
11737
|
+
} else if (err instanceof ApiError && err.status === 410) {
|
|
11700
11738
|
tokenSpinner.fail("Your GitHub token expired. Sign in to Bamboo with GitHub again, then re-run.");
|
|
11701
11739
|
process.exit(1);
|
|
11740
|
+
} else {
|
|
11741
|
+
tokenSpinner.fail(`Couldn't fetch GitHub token: ${err.message}`);
|
|
11742
|
+
process.exit(1);
|
|
11702
11743
|
}
|
|
11703
|
-
tokenSpinner.fail(`Couldn't fetch GitHub token: ${err.message}`);
|
|
11704
|
-
process.exit(1);
|
|
11705
11744
|
}
|
|
11706
|
-
tokenSpinner.succeed("GitHub token retrieved");
|
|
11707
11745
|
await writeCredentials({
|
|
11708
11746
|
bamboo_session: bambooSession,
|
|
11709
11747
|
github_token: tokenResp.access_token,
|
|
@@ -11718,7 +11756,7 @@ async function runLogin() {
|
|
|
11718
11756
|
console.log(" Next: `bamboo-agents init` to clone your workspace.");
|
|
11719
11757
|
console.log("");
|
|
11720
11758
|
}
|
|
11721
|
-
var FALLBACK_RELINK_URL, LOGIN_TIMEOUT_MS;
|
|
11759
|
+
var FALLBACK_RELINK_URL, LOGIN_TIMEOUT_MS, TOKEN_POLL;
|
|
11722
11760
|
var init_login = __esm({
|
|
11723
11761
|
"src/commands/login.ts"() {
|
|
11724
11762
|
"use strict";
|
|
@@ -11726,8 +11764,13 @@ var init_login = __esm({
|
|
|
11726
11764
|
init_ora();
|
|
11727
11765
|
init_api();
|
|
11728
11766
|
init_credentials();
|
|
11767
|
+
init_util2();
|
|
11729
11768
|
FALLBACK_RELINK_URL = "https://withbamboo.com/connect-github";
|
|
11730
11769
|
LOGIN_TIMEOUT_MS = 5 * 60 * 1e3;
|
|
11770
|
+
TOKEN_POLL = {
|
|
11771
|
+
intervalMs: 2e3,
|
|
11772
|
+
timeoutMs: 5 * 60 * 1e3
|
|
11773
|
+
};
|
|
11731
11774
|
}
|
|
11732
11775
|
});
|
|
11733
11776
|
|
|
@@ -11875,11 +11918,36 @@ var init_state = __esm({
|
|
|
11875
11918
|
// src/commands/init.ts
|
|
11876
11919
|
var init_exports = {};
|
|
11877
11920
|
__export(init_exports, {
|
|
11921
|
+
WORKSPACE_POLL: () => WORKSPACE_POLL,
|
|
11922
|
+
pollForWorkspaceReady: () => pollForWorkspaceReady,
|
|
11878
11923
|
runInit: () => runInit,
|
|
11879
11924
|
slugify: () => slugify
|
|
11880
11925
|
});
|
|
11881
11926
|
import { access } from "node:fs/promises";
|
|
11882
11927
|
import { resolve as pathResolve } from "node:path";
|
|
11928
|
+
async function pollForWorkspaceReady(bambooSession, initial) {
|
|
11929
|
+
if (initial.workspace_ready && initial.org.workspace_repo) {
|
|
11930
|
+
return { ok: true, membership: initial };
|
|
11931
|
+
}
|
|
11932
|
+
const start = Date.now();
|
|
11933
|
+
while (Date.now() - start < WORKSPACE_POLL.timeoutMs) {
|
|
11934
|
+
await sleep(WORKSPACE_POLL.intervalMs);
|
|
11935
|
+
let fresh;
|
|
11936
|
+
try {
|
|
11937
|
+
fresh = await getCliAuthStatus(bambooSession);
|
|
11938
|
+
} catch (err) {
|
|
11939
|
+
if (err instanceof ApiError && err.status === 401) {
|
|
11940
|
+
return { ok: false, reason: "session_expired" };
|
|
11941
|
+
}
|
|
11942
|
+
continue;
|
|
11943
|
+
}
|
|
11944
|
+
const m = fresh.memberships[0];
|
|
11945
|
+
if (m?.workspace_ready && m.org.workspace_repo) {
|
|
11946
|
+
return { ok: true, membership: m };
|
|
11947
|
+
}
|
|
11948
|
+
}
|
|
11949
|
+
return { ok: false, reason: "timeout" };
|
|
11950
|
+
}
|
|
11883
11951
|
function slugify(input) {
|
|
11884
11952
|
return input.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
|
|
11885
11953
|
}
|
|
@@ -11921,12 +11989,29 @@ async function runInit() {
|
|
|
11921
11989
|
console.error(`Orgs: ${status.memberships.map((m) => m.org.name).join(", ")}`);
|
|
11922
11990
|
process.exit(2);
|
|
11923
11991
|
}
|
|
11924
|
-
const
|
|
11925
|
-
|
|
11926
|
-
|
|
11927
|
-
|
|
11928
|
-
|
|
11929
|
-
|
|
11992
|
+
const initialMembership = status.memberships[0];
|
|
11993
|
+
let membership;
|
|
11994
|
+
if (initialMembership.workspace_ready && initialMembership.org.workspace_repo) {
|
|
11995
|
+
membership = initialMembership;
|
|
11996
|
+
} else {
|
|
11997
|
+
const pollSpinner = ora(
|
|
11998
|
+
`Waiting for ${initialMembership.org.name}'s workspace to be ready\u2026`
|
|
11999
|
+
).start();
|
|
12000
|
+
const result = await pollForWorkspaceReady(creds.bamboo_session, initialMembership);
|
|
12001
|
+
if (!result.ok) {
|
|
12002
|
+
if (result.reason === "session_expired") {
|
|
12003
|
+
pollSpinner.fail(
|
|
12004
|
+
"Your Bamboo session expired. Run `bamboo-agents login` again."
|
|
12005
|
+
);
|
|
12006
|
+
process.exit(1);
|
|
12007
|
+
}
|
|
12008
|
+
pollSpinner.fail(
|
|
12009
|
+
`Timed out waiting for ${initialMembership.org.name}'s workspace. If you just connected GitHub, give it another moment and re-run \`bamboo-agents init\`. If you're a brand-new org with no agents yet, create one at https://withbamboo.com first.`
|
|
12010
|
+
);
|
|
12011
|
+
process.exit(2);
|
|
12012
|
+
}
|
|
12013
|
+
membership = result.membership;
|
|
12014
|
+
pollSpinner.succeed(`Workspace ready: ${membership.org.workspace_repo}`);
|
|
11930
12015
|
}
|
|
11931
12016
|
const gitSpinner = ora("Checking git\u2026").start();
|
|
11932
12017
|
const version = await gitVersion();
|
|
@@ -12001,6 +12086,7 @@ async function runInit() {
|
|
|
12001
12086
|
console.log(" Next: `bamboo-agents open` to launch Claude Code there.");
|
|
12002
12087
|
console.log("");
|
|
12003
12088
|
}
|
|
12089
|
+
var WORKSPACE_POLL;
|
|
12004
12090
|
var init_init = __esm({
|
|
12005
12091
|
"src/commands/init.ts"() {
|
|
12006
12092
|
"use strict";
|
|
@@ -12009,6 +12095,11 @@ var init_init = __esm({
|
|
|
12009
12095
|
init_credentials();
|
|
12010
12096
|
init_git();
|
|
12011
12097
|
init_state();
|
|
12098
|
+
init_util2();
|
|
12099
|
+
WORKSPACE_POLL = {
|
|
12100
|
+
intervalMs: 2e3,
|
|
12101
|
+
timeoutMs: 5 * 60 * 1e3
|
|
12102
|
+
};
|
|
12012
12103
|
}
|
|
12013
12104
|
});
|
|
12014
12105
|
|