create-op-node 0.10.10 → 0.10.12

package/README.md

@@ -31,15 +31,20 @@ Configures macOS power settings, installs Homebrew + the CLI tool list, sets up
 ### Choosing the LLM model
 
 When you run `bootstrap` interactively (no `-y`, no `--llm-model` flag),
-you'll get a curated picker:
-
-- `qwen2.5:72b` — 72B, ~50 GB Ollama RAM. **Default**, recommended for
-  128 GB Studios. Best Spanish + multilingual quality.
-- `qwen2.5:32b` — 32B, ~22 GB Ollama RAM. Middle tier for 64 GB Studios.
-- `qwen3.5:9b` — 9B, ~8 GB Ollama RAM. Validation runs or smaller
-  Studios (36–48 GB).
+you'll get a curated picker that **pre-selects** a model based on the
+Studio's detected unified memory:
+
+- `qwen2.5:72b` — 72B, ~50 GB Ollama RAM. Pre-selected on 96 GB+ Studios.
+  Best Spanish + multilingual quality.
+- `qwen2.5:32b` — 32B, ~22 GB Ollama RAM. Pre-selected on 48–95 GB Studios
+  (e.g. 64 GB).
+- `qwen3.5:9b` — 9B, ~8 GB Ollama RAM. Pre-selected on smaller Studios
+  (< 48 GB), and the default for non-interactive `-y` runs (see below).
 - `Other…` — any Ollama model name you specify.
 
+(If memory detection fails, the picker falls back to pre-selecting
+`qwen2.5:72b`.)
+
 The picker is Qwen-only because the Opus Populi platform serves
 Spanish-speaking civic users and Qwen has the strongest Spanish (and
 broader multilingual) capability of the open-weight models in this

package/dist/cli.js

@@ -90,6 +90,17 @@ async function tunnelStatus(input) {
   }
 }
 
+// src/lib/constants.ts
+var PGSODIUM_KEY_RE = /^[a-f0-9]{64}$/;
+var TUNNEL_TOKEN_RE = /^[A-Za-z0-9_\-.=]+$/;
+var SAFE_PATH_RE = /^[A-Za-z0-9_\-./ ]+$/;
+var SAFE_LAUNCHCTL_VALUE_RE = /^[A-Za-z0-9+/=._-]+$/;
+var URL_SAFE_PASSWORD_RE = /^[A-Za-z0-9_-]+$/;
+var SAFE_URL_RE = /^[A-Za-z0-9:/_.-]+$/;
+var VERIFY_NETWORK_TIMEOUT_MS = 1e4;
+var API_REQUEST_TIMEOUT_MS = 15e3;
+var BODY_PREVIEW_MAX = 200;
+
 // src/lib/tfc.ts
 var TFC_API = "https://app.terraform.io/api/v2";
 var ORG_SLUG_RE = /^[A-Za-z0-9_-]{1,40}$/;
@@ -103,13 +114,24 @@ function authHeaders(token) {
   };
 }
 async function getJson(token, path) {
-  const res = await fetch(`${TFC_API}${path}`, { headers: authHeaders(token) });
-  let body = null;
+  const ctrl = new AbortController();
+  const timer = setTimeout(() => ctrl.abort(), API_REQUEST_TIMEOUT_MS);
   try {
-    body = await res.json();
+    const res = await fetch(`${TFC_API}${path}`, {
+      headers: authHeaders(token),
+      signal: ctrl.signal
+    });
+    let body = null;
+    try {
+      body = await res.json();
+    } catch {
+    }
+    return { status: res.status, body };
   } catch {
+    return { status: 0, body: null };
+  } finally {
+    clearTimeout(timer);
   }
-  return { status: res.status, body };
 }
 async function probeTfcToken(input) {
   const issues = [];
@@ -120,6 +142,12 @@ async function probeTfcToken(input) {
     return { ok: false, issues };
   }
   const account = await getJson(input.token, "/account/details");
+  if (account.status === 0) {
+    issues.push(
+      "Couldn't reach Terraform Cloud (network error or timeout). Check your connection and retry."
+    );
+    return { ok: false, issues };
+  }
   if (account.status !== 200) {
     issues.push(
       `TFC token invalid (HTTP ${account.status}). Regenerate at https://app.terraform.io/app/settings/tokens.`
@@ -131,7 +159,11 @@ async function probeTfcToken(input) {
     input.token,
     `/organizations/${encodeURIComponent(input.organization)}`
   );
-  if (org.status === 404) {
+  if (org.status === 0) {
+    issues.push(
+      "Couldn't reach Terraform Cloud while checking the organization (network error or timeout)."
+    );
+  } else if (org.status === 404) {
     issues.push(
       `TFC organization "${input.organization}" not found, or this token lacks access. Check the org slug at https://app.terraform.io.`
     );
@@ -582,16 +614,27 @@ async function waitForApply(input, budgets = DEFAULT_BUDGETS, deps = realDeps) {
   }
   return waitForRunOutput(input, budgets, deps, runId);
 }
+async function safePoll(fn, onRetry) {
+  try {
+    return await fn();
+  } catch {
+    onRetry?.();
+    return null;
+  }
+}
 async function discoverRunId(input, budgets, deps) {
   deps.onProgress?.("discovery");
   const discoveryStart = deps.now();
   while (deps.now() - discoveryStart < budgets.discoveryMs) {
     await deps.sleep(budgets.pollMs);
-    const ws = await deps.findWorkspace({
-      token: input.token,
-      organization: input.organization,
-      tags: input.workspaceTags
-    });
+    const ws = await safePoll(
+      () => deps.findWorkspace({
+        token: input.token,
+        organization: input.organization,
+        tags: input.workspaceTags
+      }),
+      () => deps.onProgress?.("retry")
+    );
     if (ws?.currentRunId) return ws.currentRunId;
   }
   return null;
@@ -600,17 +643,20 @@ async function waitForRunOutput(input, budgets, deps, runId) {
   deps.onProgress?.("run");
   const runStart = deps.now();
   while (deps.now() - runStart < budgets.runMs) {
-    const r = await deps.getRunStatus(
-      { token: input.token, organization: input.organization },
-      runId
+    const r = await safePoll(
+      () => deps.getRunStatus({ token: input.token, organization: input.organization }, runId),
+      () => deps.onProgress?.("retry")
     );
     if (r?.finished) {
       if (!r.succeeded) return { kind: "run-failed", status: r.status };
       deps.onProgress?.("fetching");
-      const value = await deps.fetchOutput(
-        { token: input.token, organization: input.organization },
-        input.workspaceId,
-        input.outputName
+      const value = await safePoll(
+        () => deps.fetchOutput(
+          { token: input.token, organization: input.organization },
+          input.workspaceId,
+          input.outputName
+        ),
+        () => deps.onProgress?.("retry")
       );
       return value !== null ? { kind: "success", value } : { kind: "output-missing" };
     }
@@ -1165,14 +1211,25 @@ function isoStampUtc(d) {
 async function waitForApplyAndFetchTunnelToken(input) {
   const spin = p3.spinner();
   spin.start("Waiting for terraform apply to finish (polling every 10s)\u2026");
-  const outcome = await waitForApply({
-    token: input.token,
-    organization: input.organization,
-    workspaceId: input.workspaceId,
-    runId: input.runId,
-    workspaceTags: ["opuspopuli", "cloudflare"],
-    outputName: "tunnel_token"
-  });
+  const outcome = await waitForApply(
+    {
+      token: input.token,
+      organization: input.organization,
+      workspaceId: input.workspaceId,
+      runId: input.runId,
+      workspaceTags: ["opuspopuli", "cloudflare"],
+      outputName: "tunnel_token"
+    },
+    void 0,
+    {
+      ...realDeps,
+      // Surface a transient network hiccup instead of silently re-polling, so
+      // a slow wait doesn't look like a hang.
+      onProgress: (phase) => {
+        if (phase === "retry") spin.message("Transient network error \u2014 retrying next poll\u2026");
+      }
+    }
+  );
   switch (outcome.kind) {
     case "success":
       spin.stop(pc2.green("\u2713 Tunnel token retrieved."));
@@ -1192,16 +1249,6 @@ async function waitForApplyAndFetchTunnelToken(input) {
   }
 }
 
-// src/lib/constants.ts
-var PGSODIUM_KEY_RE = /^[a-f0-9]{64}$/;
-var TUNNEL_TOKEN_RE = /^[A-Za-z0-9_\-.=]+$/;
-var SAFE_PATH_RE = /^[A-Za-z0-9_\-./ ]+$/;
-var SAFE_LAUNCHCTL_VALUE_RE = /^[A-Za-z0-9+/=._-]+$/;
-var URL_SAFE_PASSWORD_RE = /^[A-Za-z0-9_-]+$/;
-var SAFE_URL_RE = /^[A-Za-z0-9:/_.-]+$/;
-var VERIFY_NETWORK_TIMEOUT_MS = 1e4;
-var BODY_PREVIEW_MAX = 200;
-
 // src/lib/homebrew.ts
 var STUDIO_PACKAGES = [
   { name: "git", kind: "formula" },
@@ -2697,17 +2744,17 @@ var LLM_MODEL_CHOICES = [
   {
     value: "qwen2.5:72b",
     label: "qwen2.5:72b",
-    hint: "72B, ~50 GB Ollama RAM. Recommended for 128 GB Studios. Best Spanish + multilingual quality. Pull ~40 GB, 30\u201360 min."
+    hint: "72B, ~50 GB Ollama RAM. Pre-selected on 96 GB+ Studios. Best Spanish + multilingual quality. Pull ~40 GB, 30\u201360 min."
   },
   {
     value: "qwen2.5:32b",
     label: "qwen2.5:32b",
-    hint: "32B, ~22 GB Ollama RAM. Middle-tier for 64 GB Studios. Solid Spanish, faster than 72B. Pull ~20 GB, 15\u201330 min."
+    hint: "32B, ~22 GB Ollama RAM. Pre-selected on 48\u201395 GB Studios. Solid Spanish, faster than 72B. Pull ~20 GB, 15\u201330 min."
   },
   {
     value: "qwen3.5:9b",
     label: "qwen3.5:9b",
-    hint: "9B, ~8 GB Ollama RAM. Validation / smaller Studios (36\u201348 GB). Pull ~5 GB, 3\u20135 min."
+    hint: "9B, ~8 GB Ollama RAM. Pre-selected on smaller Studios (< 48 GB); also the -y / scripted default. Pull ~5 GB, 3\u20135 min."
   }
 ];
 var OTHER_SENTINEL = "__OTHER__";
@@ -4784,7 +4831,7 @@ async function looksLikeRegionsRepo(dir) {
 }
 
 // src/cli.ts
-var VERSION = "0.10.10";
+var VERSION = "0.10.12";
 var program = new Command();
 program.name("create-op-node").description(
   "Interactive bootstrap for an Opus Populi federation node.\nCloudflare infrastructure \u2192 Mac Studio \u2192 live public API."