@toast-ninja/toast-cli 0.1.0 → 0.1.2

package/README.md

@@ -49,11 +49,12 @@ toast review-ci wait \
   --repo toast-ninja/backend \
   --pr 1177 \
   --head "$GITHUB_SHA" \
-  --timeout 20m \
-  --interval 10s
+  --timeout 20m
 ```
 
 `wait` exits `0` only when Toast returns `acknowledged` for the exact head SHA. It exits `1` for actionable non-green states and `2` for auth, network, argument, or timeout errors.
+It waits on Toast's server-side Review CI events through bounded requests, so a
+local polling interval is not needed.
 
 CI can also provide a token directly:
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@toast-ninja/toast-cli",
-	"version": "0.1.0",
+	"version": "0.1.2",
 	"description": "Toast CLI for agent CI workflows",
 	"bin": {
 		"toast": "bin/toast.js"

package/src/cli.js

@@ -11,7 +11,13 @@ const {
 const { requestJson } = require('./http')
 
 const DEFAULT_API_URL = 'https://api.toast.ninja'
-const WAIT_STATUSES = new Set(['pending', 'degraded:reconciliation_incomplete'])
+const DEFAULT_WAIT_REQUEST_SECONDS = 25
+const WAIT_REQUEST_GRACE_MS = 5000
+const WAIT_STATUSES = new Set([
+	'pending',
+	'degraded:reconciliation_incomplete',
+	'head_changed',
+])
 const REVIEW_CI_SKILL_PATH = path.join(
 	__dirname,
 	'..',
@@ -194,12 +200,25 @@ const openBrowserDefault = url =>
 		})
 	})
 
-const buildReviewStateUrl = ({ apiUrl, repo, pullNumber, head, endpoint }) =>
-	`${apiUrl}/api/review-ci/repos/${encodeURIComponent(
+const buildReviewStateUrl = ({
+	apiUrl,
+	repo,
+	pullNumber,
+	head,
+	endpoint,
+	query = {},
+}) => {
+	const params = new URLSearchParams({
+		head,
+		...query,
+	})
+
+	return `${apiUrl}/api/review-ci/repos/${encodeURIComponent(
 		repo.owner,
 	)}/${encodeURIComponent(repo.repo)}/pulls/${encodeURIComponent(
 		pullNumber,
-	)}/${endpoint}?head=${encodeURIComponent(head)}`
+	)}/${endpoint}?${params.toString()}`
+}
 
 const requestReviewState = async ({
 	options,
@@ -207,6 +226,8 @@ const requestReviewState = async ({
 	config,
 	request,
 	endpoint = 'status',
+	waitTimeoutSeconds,
+	timeoutMs,
 }) => {
 	const repo = parseRepo(requireOption(options, 'repo'))
 	const pullNumber = requireOption(options, 'pr')
@@ -219,13 +240,26 @@ const requestReviewState = async ({
 			'Missing Toast token. Run `toast review-ci auth` or set TOAST_TOKEN.',
 		)
 
-	const response = await request({
+	const requestOptions = {
 		method: 'GET',
-		url: buildReviewStateUrl({ apiUrl, repo, pullNumber, head, endpoint }),
+		url: buildReviewStateUrl({
+			apiUrl,
+			repo,
+			pullNumber,
+			head,
+			endpoint,
+			query: waitTimeoutSeconds
+				? { wait_timeout_seconds: String(waitTimeoutSeconds) }
+				: {},
+		}),
 		headers: {
 			Authorization: `Bearer ${token}`,
 		},
-	})
+	}
+
+	if (timeoutMs) requestOptions.timeoutMs = timeoutMs
+
+	const response = await request(requestOptions)
 
 	if (response.statusCode >= 400) {
 		throw new Error(`Review CI request failed with HTTP ${response.statusCode}`)
@@ -297,13 +331,28 @@ const handleWait = async context => {
 	const config = context.readConfig()
 	const { options } = parseArgs(getReviewStateArgs(context))
 	const timeoutMs = parseDurationMs(options.timeout || '20m')
-	const intervalMs = parseDurationMs(options.interval || '10s')
+	if (options.interval) parseDurationMs(options.interval)
 	const startedAt = toMillis(context.now())
-	let elapsedMs = 0
 
-	while (elapsedMs <= timeoutMs) {
+	while (true) {
+		const elapsedMs = toMillis(context.now()) - startedAt
+		const remainingMs = timeoutMs - elapsedMs
+
+		if (remainingMs <= 0) break
+
+		const waitTimeoutSeconds = Math.max(
+			1,
+			Math.min(DEFAULT_WAIT_REQUEST_SECONDS, Math.ceil(remainingMs / 1000)),
+		)
 		// eslint-disable-next-line no-await-in-loop
-		const state = await requestReviewState({ ...context, config, options })
+		const state = await requestReviewState({
+			...context,
+			config,
+			options,
+			endpoint: 'wait',
+			waitTimeoutSeconds,
+			timeoutMs: waitTimeoutSeconds * 1000 + WAIT_REQUEST_GRACE_MS,
+		})
 
 		if (state.status === 'acknowledged') {
 			writeReviewState({ state, stdout: context.stdout, asJson: options.json })
@@ -314,14 +363,6 @@ const handleWait = async context => {
 			writeReviewState({ state, stdout: context.stdout, asJson: options.json })
 			return 1
 		}
-
-		// eslint-disable-next-line no-await-in-loop
-		await context.sleep(intervalMs)
-		elapsedMs += intervalMs
-
-		if (toMillis(context.now()) - startedAt > timeoutMs) {
-			break
-		}
 	}
 
 	context.stderr.write('Timed out waiting for Review CI acknowledgement\n')