@autohq/cli 0.1.165 → 0.1.166

package/dist/agent-bridge.js

@@ -22806,6 +22806,21 @@ var SetupOnboardingPullRequestSchema = external_exports.object({
 var SetupOnboardingPullRequestCreateResponseSchema = external_exports.object({
   pullRequest: SetupOnboardingPullRequestSchema
 });
+var SetupOnboardingPullRequestStatusRequestSchema = external_exports.object({
+  githubConnection: external_exports.string().trim().min(1).optional(),
+  repo: GithubSyncRepositoryFullNameSchema,
+  pullRequestNumber: external_exports.coerce.number().int().positive()
+});
+var SetupOnboardingPullRequestStatusResponseSchema = external_exports.object({
+  pullRequest: external_exports.object({
+    merged: external_exports.boolean(),
+    state: external_exports.string().trim().min(1)
+  }),
+  apply: external_exports.object({
+    applied: external_exports.boolean()
+  }),
+  ready: external_exports.boolean()
+});
 
 // ../../packages/schemas/src/runtimes.ts
 var RuntimeRecordSchema = external_exports.object({
@@ -26467,7 +26482,7 @@ Object.assign(lookup, {
 // package.json
 var package_default = {
   name: "@autohq/cli",
-  version: "0.1.165",
+  version: "0.1.166",
   license: "SEE LICENSE IN README.md",
   publishConfig: {
     access: "public"

package/dist/index.js

@@ -19589,7 +19589,7 @@ var init_session_commands = __esm({
 });
 
 // ../../packages/schemas/src/setup.ts
-var SetupOnboardingPullRequestCreateRequestSchema, SetupOnboardingPullRequestSchema, SetupOnboardingPullRequestCreateResponseSchema;
+var SetupOnboardingPullRequestCreateRequestSchema, SetupOnboardingPullRequestSchema, SetupOnboardingPullRequestCreateResponseSchema, SetupOnboardingPullRequestStatusRequestSchema, SetupOnboardingPullRequestStatusResponseSchema;
 var init_setup = __esm({
   "../../packages/schemas/src/setup.ts"() {
     "use strict";
@@ -19611,6 +19611,21 @@ var init_setup = __esm({
     SetupOnboardingPullRequestCreateResponseSchema = external_exports.object({
       pullRequest: SetupOnboardingPullRequestSchema
     });
+    SetupOnboardingPullRequestStatusRequestSchema = external_exports.object({
+      githubConnection: external_exports.string().trim().min(1).optional(),
+      repo: GithubSyncRepositoryFullNameSchema,
+      pullRequestNumber: external_exports.coerce.number().int().positive()
+    });
+    SetupOnboardingPullRequestStatusResponseSchema = external_exports.object({
+      pullRequest: external_exports.object({
+        merged: external_exports.boolean(),
+        state: external_exports.string().trim().min(1)
+      }),
+      apply: external_exports.object({
+        applied: external_exports.boolean()
+      }),
+      ready: external_exports.boolean()
+    });
   }
 });
 
@@ -21005,6 +21020,23 @@ function createApiClient(input) {
         }
       );
     },
+    async getSetupOnboardingPullRequestStatus(request, options = {}) {
+      const project = await activeProject();
+      const searchParams = [
+        ["repo", request.repo],
+        ["pullRequestNumber", String(request.pullRequestNumber)]
+      ];
+      if (request.githubConnection) {
+        searchParams.push(["githubConnection", request.githubConnection]);
+      }
+      return requestJson(
+        projectApiPath(project, "/setup/onboarding-pr"),
+        {
+          apiBaseUrl: options.apiBaseUrl,
+          searchParams
+        }
+      );
+    },
     ...createResourceApi({
       activeProject,
       apiUrl,
@@ -21549,7 +21581,7 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@autohq/cli",
-      version: "0.1.165",
+      version: "0.1.166",
       license: "SEE LICENSE IN README.md",
       publishConfig: {
         access: "public"
@@ -35462,8 +35494,12 @@ function registerSessionCommands(program, context) {
 }
 
 // src/commands/setup/actions.ts
+init_browser();
 init_file();
 init_login();
+var SETUP_STATUS_POLL_INTERVAL_MS = 5e3;
+var SETUP_STATUS_HINT_EVERY_POLLS = 12;
+var SETUP_STATUS_MAX_CONSECUTIVE_ERRORS = 12;
 async function setupAction(context, options) {
   const apiBaseUrl = apiUrlFromOptions(context, options);
   const client = createContextApiClient(context);
@@ -35494,15 +35530,26 @@ async function setupAction(context, options) {
   context.writeOutput("");
   context.writeOutput(`Opened PR #${response.pullRequest.number}.`);
   if (response.pullRequest.url) {
+    if (options.browser !== false) {
+      (options.openBrowser ?? openBrowser)(response.pullRequest.url);
+    }
     context.writeOutput(response.pullRequest.url);
   }
   context.writeOutput("");
-  context.writeOutput("Next steps:");
-  context.writeOutput("1. Review and merge the PR.");
   context.writeOutput(
-    "2. Wait for GitHub Sync to apply the merged `.auto` directory."
+    "Review and merge the PR. Auto will wait here and detect when the onboarding agent has been applied."
   );
-  context.writeOutput("3. Tag `@auto.onboarding` in Slack to begin.");
+  await waitForOnboardingReady(context, client, {
+    apiBaseUrl,
+    githubConnection: github.name,
+    repo,
+    pullRequestNumber: response.pullRequest.number,
+    pollIntervalMs: options.statusPollIntervalMs,
+    sleep: options.sleep
+  });
+  context.writeOutput("");
+  context.writeOutput("Onboarding is ready.");
+  context.writeOutput("Tag `@auto.onboarding` in Slack to begin.");
 }
 async function showPitchAndWait(context) {
   context.writeOutput(setupPitchText());
@@ -35797,6 +35844,68 @@ async function askRequired(context, question) {
     readline.close();
   }
 }
+async function waitForOnboardingReady(context, client, input) {
+  const sleep4 = input.sleep ?? defaultSleep;
+  const pollIntervalMs = input.pollIntervalMs ?? SETUP_STATUS_POLL_INTERVAL_MS;
+  let reportedMerged = false;
+  let reportedApplied = false;
+  let pollCount = 0;
+  let consecutiveStatusErrors = 0;
+  for (; ; ) {
+    pollCount += 1;
+    const status = await client.getSetupOnboardingPullRequestStatus(
+      {
+        githubConnection: input.githubConnection,
+        repo: input.repo,
+        pullRequestNumber: input.pullRequestNumber
+      },
+      { apiBaseUrl: input.apiBaseUrl }
+    ).catch((error51) => {
+      consecutiveStatusErrors += 1;
+      if (consecutiveStatusErrors === 1) {
+        context.writeOutput(
+          "Status check failed; retrying while the onboarding PR remains open."
+        );
+      }
+      if (consecutiveStatusErrors >= SETUP_STATUS_MAX_CONSECUTIVE_ERRORS) {
+        throw error51;
+      }
+      return void 0;
+    });
+    if (!status) {
+      await sleep4(pollIntervalMs);
+      continue;
+    }
+    consecutiveStatusErrors = 0;
+    if (!status.pullRequest.merged && status.pullRequest.state === "closed") {
+      throw new Error(
+        "The onboarding PR was closed without being merged. Re-run `auto setup` to open it again."
+      );
+    }
+    if (!status.pullRequest.merged && status.pullRequest.state !== "open") {
+      throw new Error(
+        `The onboarding PR is in unexpected state "${status.pullRequest.state}". Check the PR, then rerun \`auto setup\` if needed.`
+      );
+    }
+    if (status.pullRequest.merged && !reportedMerged) {
+      context.writeOutput("Detected PR merge.");
+      reportedMerged = true;
+    }
+    if (status.apply.applied && !reportedApplied) {
+      context.writeOutput("Detected GitHub Sync apply.");
+      reportedApplied = true;
+    }
+    if (status.ready) {
+      return;
+    }
+    if (pollCount % SETUP_STATUS_HINT_EVERY_POLLS === 0) {
+      context.writeOutput(
+        status.pullRequest.merged ? "Still waiting for GitHub Sync to apply the onboarding agent..." : "Still waiting for the onboarding PR to be merged..."
+      );
+    }
+    await sleep4(pollIntervalMs);
+  }
+}
 function organizationLabel(organization) {
   return `${organization.organizationName} (${organization.organizationSlug})`;
 }
@@ -35806,6 +35915,9 @@ function isRecord3(value) {
 function isDefined(value) {
   return value !== void 0;
 }
+function defaultSleep(delayMs) {
+  return new Promise((resolve3) => setTimeout(resolve3, delayMs));
+}
 
 // src/commands/setup/commands.ts
 function registerSetupCommands(program, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autohq/cli",
-  "version": "0.1.165",
+  "version": "0.1.166",
   "license": "SEE LICENSE IN README.md",
   "publishConfig": {
     "access": "public"