@haystackeditor/cli 0.14.4 → 0.14.5

package/dist/commands/setup.js

@@ -356,8 +356,17 @@ class GitHubWriteError extends Error {
  *  the file, and surfaces a real error if the write itself fails. */
 async function fetchFileSha(owner, repo, path, token) {
     const res = await fetch(`${GITHUB_PROXY}/repos/${owner}/${repo}/contents/${path}`, { headers: ghHeaders(token) });
-    if (!res.ok)
+    if (!res.ok) {
+        if (res.status !== 404) {
+            trackError('haystack_setup_fetch_file_sha_failed', {
+                owner,
+                repo,
+                path,
+                status: res.status,
+            });
+        }
         return null;
+    }
     const data = (await res.json());
     return data.sha ?? null;
 }
@@ -463,9 +472,11 @@ async function writeOnboardingFilesToRepo(owner, repo, files, autoMergeEnabled,
     for (const f of files) {
         shaByPath.set(f.path, await fetchFileSha(owner, repo, f.path, token));
     }
+    let successfulWrites = 0;
     try {
         for (const f of files) {
             await putFile(owner, repo, f.path, f.content, f.message, shaByPath.get(f.path) ?? null, token);
+            successfulWrites++;
         }
         return {};
     }
@@ -475,6 +486,9 @@ async function writeOnboardingFilesToRepo(owner, repo, files, autoMergeEnabled,
         const status = err instanceof GitHubWriteError ? err.status : 0;
         if (status !== 409 && status !== 422)
             throw err;
+        if (successfulWrites > 0) {
+            throw err;
+        }
         // Probe GitHub's *structured* protection signals to decide: protection
         // (→ PR fallback) vs. a genuine bad request / sha conflict (→ surface the
         // error). This replaces brittle error-message substring matching.
@@ -514,6 +528,8 @@ async function runUnifiedScan(repo, token) {
     if (!runId)
         throw new Error('Scan kickoff returned no runId');
     let lastProgressKey = '';
+    let loggedPollFetchError = false;
+    let loggedPollStatusError = false;
     // eslint-disable-next-line no-constant-condition
     while (true) {
         await new Promise((resolve) => setTimeout(resolve, SCAN_POLL_INTERVAL_MS));
@@ -523,14 +539,14 @@ async function runUnifiedScan(repo, token) {
         }
         catch (err) {
             // Transient network blip — the KV state is authoritative and won't vanish
-            // from one failed poll, so keep going. Record it (non-disruptive, no
-            // terminal noise) so a persistently-failing poll isn't invisible
-            // (PR001: no silent failure).
-            trackError('onboarding_scan_poll_network_error', {
-                repo,
-                run_id: runId,
-                error_message: err instanceof Error ? err.message : String(err),
-            });
+            // from one failed poll, so keep going.
+            if (!loggedPollFetchError) {
+                loggedPollFetchError = true;
+                trackError('haystack_setup_scan_status_poll_fetch_error', {
+                    repo,
+                    error: err instanceof Error ? err.message : String(err),
+                });
+            }
             continue;
         }
         if (statusResp.status === 404) {
@@ -540,6 +556,13 @@ async function runUnifiedScan(repo, token) {
         }
         if (!statusResp.ok) {
             // Transient (5xx etc.) — back off and retry on the next tick.
+            if (!loggedPollStatusError) {
+                loggedPollStatusError = true;
+                trackError('haystack_setup_scan_status_poll_non_ok', {
+                    repo,
+                    status: statusResp.status,
+                });
+            }
             continue;
         }
         const state = (await statusResp.json());

package/dist/utils/github-api.js

@@ -84,7 +84,7 @@ async function githubApiRequest(method, path, token, body) {
     // (e.g. the App isn't installed on this owner), fall back to the original
     // response so handleApiError surfaces GitHub's actual "org restricted" 403.
     const proxied = await fetch(`${GITHUB_PROXY_BASE}${path}`, init);
-    return proxied.ok ? proxied : direct;
+    return proxied.status === 403 ? direct : proxied;
 }
 /**
  * Handle API errors consistently

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haystackeditor/cli",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "description": "Set up Haystack for your project — automated PR review, triage, and merge queue",
   "type": "module",
   "bin": {