@aria_asi/cli 0.2.31 → 0.2.33

package/src/setup-wizard.ts

@@ -33,6 +33,22 @@ const HARNESS_URL =
 const HARNESS_TOKEN = process.env.ARIA_HARNESS_TOKEN || '';
 const ARIA_DIR = join(homedir(), '.aria');
 const LICENSE_PATH = join(ARIA_DIR, 'license.json');
+const ONBOARDING_FALLBACK_URLS = [
+  process.env.ARIA_ONBOARDING_URL || '',
+  HARNESS_URL,
+  process.env.ARIA_SOUL_URL || '',
+  process.env.ARIAS_SOUL_URL || '',
+  process.env.ARIA_SOUL_BASE_URL || '',
+  'https://api.ariasos.com',
+  'https://arias-soul-6zp3gtk2ca-uc.a.run.app',
+  'https://harness.ariasos.com',
+]
+  .flatMap((entry) => String(entry || '').split(','))
+  .map((entry) => entry.trim().replace(/\/+$/, ''))
+  .filter(Boolean)
+  .filter((entry, index, list) => list.indexOf(entry) === index);
+
+let activeOnboardingBaseUrl = ONBOARDING_FALLBACK_URLS[0] || HARNESS_URL.replace(/\/+$/, '');
 
 type ConfigWrite =
   | { kind: 'persona_update'; updates: Record<string, unknown> }
@@ -57,7 +73,7 @@ interface DepthOption {
 interface ConverseResponse {
   ok: boolean;
   sessionId: string;
-  topic: 'identity' | 'codebase' | 'persona' | 'done';
+  topic: 'identity' | 'codebase' | 'persona' | 'workforce' | 'harness_setup' | 'done';
   ariaPrompt: string;
   depthOptions: DepthOption[];
   freeTextAllowed: boolean;
@@ -69,17 +85,32 @@ interface ConverseResponse {
 
 export async function runSetupWizard(): Promise<void> {
   const rl = createInterface({ input: process.stdin, output: process.stdout });
+  let readlineClosed = false;
+  rl.on('close', () => { readlineClosed = true; });
   const ask = (q: string): Promise<string> =>
-    new Promise((resolve) => rl.question(q, (a) => resolve(a)));
+    new Promise((resolve) => {
+      if (readlineClosed) {
+        resolve('__ARIA_ONBOARDING_EOF__');
+        return;
+      }
+      rl.question(q, (a) => resolve(a));
+    });
 
   const sessionId = `onboard_${Date.now()}_${randomBytes(4).toString('hex')}`;
   let userMessage: string | undefined;
   let action: 'start' | 'answer' = 'start';
+  let turnCount = 0;
 
   console.log('\n💬 Aria: starting onboarding…\n');
 
   try {
     while (true) {
+      turnCount += 1;
+      if (turnCount > 40) {
+        console.error('\n❌ Onboarding stopped after too many turns. Please run `aria` again to resume.');
+        return;
+      }
+
       const resp = await callConverse({ sessionId, action, userMessage });
       if (!resp.ok) {
         console.error(`\n❌ Onboarding error: ${resp.error || 'unknown'}`);
@@ -100,6 +131,10 @@ export async function runSetupWizard(): Promise<void> {
       }
 
       userMessage = (await ask('> ')).trim();
+      if (userMessage === '__ARIA_ONBOARDING_EOF__') {
+        console.error('\n❌ Onboarding input ended before setup completed. Run `aria` again to resume.');
+        return;
+      }
       action = 'answer';
       if (!userMessage) userMessage = resp.depthOptions[0]?.signal ?? 'next';
     }
@@ -117,18 +152,8 @@ async function callConverse(body: {
   action: 'start' | 'answer';
   userMessage?: string;
 }): Promise<ConverseResponse> {
-  try {
-    const res = await fetch(`${HARNESS_URL}/api/onboarding/converse`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        ...(HARNESS_TOKEN ? { Authorization: `Bearer ${HARNESS_TOKEN}` } : {}),
-      },
-      body: JSON.stringify(body),
-    });
-    return (await res.json()) as ConverseResponse;
-  } catch (err) {
-    return {
+  return requestOnboardingJson<ConverseResponse>('/api/onboarding/converse', body, {
+    fallback: {
       ok: false,
       sessionId: body.sessionId,
       topic: 'identity',
@@ -137,9 +162,69 @@ async function callConverse(body: {
       freeTextAllowed: false,
       isComplete: false,
       progressPct: 0,
-      error: err instanceof Error ? err.message : String(err),
-    };
+    },
+  });
+}
+
+async function requestOnboardingJson<T extends { ok?: boolean; error?: string }>(
+  pathname: string,
+  body: Record<string, unknown>,
+  options: { fallback: T },
+): Promise<T> {
+  const failures: string[] = [];
+  const baseUrls = [
+    activeOnboardingBaseUrl,
+    ...ONBOARDING_FALLBACK_URLS,
+  ].filter((entry, index, list) => entry && list.indexOf(entry) === index);
+
+  for (const baseUrl of baseUrls) {
+    try {
+      const res = await fetch(`${baseUrl}${pathname}`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+          ...(HARNESS_TOKEN ? { Authorization: `Bearer ${HARNESS_TOKEN}` } : {}),
+        },
+        body: JSON.stringify(body),
+      });
+      const text = await res.text();
+      const contentType = res.headers.get('content-type') || '';
+      const looksJson = /^\s*[\[{]/.test(text);
+
+      if (!contentType.includes('application/json') && !looksJson) {
+        failures.push(`${baseUrl}${pathname} returned HTTP ${res.status} ${contentType || 'without content-type'}`);
+        continue;
+      }
+
+      let data: T;
+      try {
+        data = JSON.parse(text || '{}') as T;
+      } catch (err) {
+        failures.push(`${baseUrl}${pathname} returned invalid JSON: ${err instanceof Error ? err.message : String(err)}`);
+        continue;
+      }
+
+      if (!res.ok) {
+        failures.push(`${baseUrl}${pathname} returned HTTP ${res.status}: ${data.error || 'no error message'}`);
+        continue;
+      }
+
+      activeOnboardingBaseUrl = baseUrl;
+      return data;
+    } catch (err) {
+      failures.push(`${baseUrl}${pathname} transport failed: ${err instanceof Error ? err.message : String(err)}`);
+    }
   }
+
+  return {
+    ...options.fallback,
+    ok: false,
+    error:
+      'Onboarding API is unavailable or not returning JSON. ' +
+      failures.slice(0, 4).join(' | ') +
+      (failures.length > 4 ? ` | ${failures.length - 4} more endpoint(s) failed` : ''),
+  };
 }
 
 async function maybeOfferGitHubConnect(ask: (q: string) => Promise<string>): Promise<void> {
@@ -207,19 +292,14 @@ async function applyConfigWrites(writes: ConfigWrite[]): Promise<void> {
         const provider = claims.provider || '';
         const apiKey = claims.apiKey || '';
         try {
-          const resp = await fetch(`${HARNESS_URL}/api/onboarding/self-issue`, {
-            method: 'POST',
-            headers: { 'Content-Type': 'application/json' },
-            body: JSON.stringify({ email, provider, llm_key: apiKey }),
-          });
-          const data = await resp.json() as {
+          const data = await requestOnboardingJson<{
             ok?: boolean;
             license?: { token: string; jti: string; tier: string; expires_at: string };
             claims?: Record<string, unknown>;
             error?: string;
-          };
-          if (!resp.ok || !data.ok || !data.license) {
-            console.warn(`     ⚠ I couldn't issue your license: ${data.error || `HTTP ${resp.status}`}`);
+          }>('/api/onboarding/self-issue', { email, provider, llm_key: apiKey }, { fallback: { ok: false } });
+          if (!data.ok || !data.license) {
+            console.warn(`     ⚠ I couldn't issue your license: ${data.error || 'license endpoint did not return a license'}`);
             continue;
           }
           if (!existsSync(ARIA_DIR)) mkdirSync(ARIA_DIR, { recursive: true, mode: 0o700 });