@serviceme/devtools-core 0.2.0 → 0.2.1

package/dist/index.mjs

@@ -842,6 +842,11 @@ var DEFAULT_DEVICE_CODE_URL = "https://github.com/login/device/code";
 var DEFAULT_TOKEN_URL = "https://github.com/login/oauth/access_token";
 var DEFAULT_USER_URL = "https://api.github.com/user";
 var DEFAULT_SCOPE = "read:user user:email";
+var DEVICE_CODE_MAX_ATTEMPTS = 3;
+var DEFAULT_DEVICE_CODE_RETRY_BASE_DELAY_MS = 500;
+function isTransientNetworkError(error) {
+  return error instanceof TypeError;
+}
 var GitHubAuthProvider = class {
   constructor(config) {
     this.providerId = "github";
@@ -857,7 +862,8 @@ var GitHubAuthProvider = class {
       minPollIntervalMs: config.minPollIntervalMs ?? 1e3,
       maxPollIntervalMs: config.maxPollIntervalMs ?? 15e3,
       maxWaitMs: config.maxWaitMs,
-      fetchImpl: config.fetchImpl ?? fetch
+      fetchImpl: config.fetchImpl ?? fetch,
+      deviceCodeRetryBaseDelayMs: config.deviceCodeRetryBaseDelayMs ?? DEFAULT_DEVICE_CODE_RETRY_BASE_DELAY_MS
     };
   }
   async requestDeviceFlow(opts) {
@@ -865,29 +871,45 @@ var GitHubAuthProvider = class {
       client_id: this.cfg.clientId,
       scope: opts?.scope ?? this.cfg.scope
     });
-    const resp = await this.cfg.fetchImpl(this.cfg.deviceCodeUrl, {
-      method: "POST",
-      headers: {
-        Accept: "application/json",
-        "Content-Type": "application/json",
-        "User-Agent": "serviceme-core"
-      },
-      body
-    });
-    if (!resp.ok) {
-      throw new Error(`GitHub device-code request failed: HTTP ${resp.status}`);
-    }
-    const data = await resp.json();
-    if (!data.device_code || !data.user_code || !data.verification_uri) {
-      throw new Error("GitHub device-code response missing required fields");
+    let lastNetworkError;
+    for (let attempt = 1; attempt <= DEVICE_CODE_MAX_ATTEMPTS; attempt++) {
+      let resp;
+      try {
+        resp = await this.cfg.fetchImpl(this.cfg.deviceCodeUrl, {
+          method: "POST",
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+            "User-Agent": "serviceme-core"
+          },
+          body
+        });
+      } catch (error) {
+        if (!isTransientNetworkError(error) || attempt === DEVICE_CODE_MAX_ATTEMPTS) {
+          throw error;
+        }
+        lastNetworkError = error;
+        await sleep(this.cfg.deviceCodeRetryBaseDelayMs * 2 ** (attempt - 1));
+        continue;
+      }
+      if (!resp.ok) {
+        throw new Error(
+          `GitHub device-code request failed: HTTP ${resp.status}`
+        );
+      }
+      const data = await resp.json();
+      if (!data.device_code || !data.user_code || !data.verification_uri) {
+        throw new Error("GitHub device-code response missing required fields");
+      }
+      return {
+        provider: this.providerId,
+        userCode: data.user_code,
+        verificationUrl: data.verification_uri,
+        expiresAt: Date.now() + data.expires_in * 1e3,
+        message: `Open ${data.verification_uri} and enter ${data.user_code}`
+      };
     }
-    return {
-      provider: this.providerId,
-      userCode: data.user_code,
-      verificationUrl: data.verification_uri,
-      expiresAt: Date.now() + data.expires_in * 1e3,
-      message: `Open ${data.verification_uri} and enter ${data.user_code}`
-    };
+    throw lastNetworkError ?? new Error("GitHub device-code request failed");
   }
   async completeDeviceFlow(deviceCode, shouldContinue) {
     const start = Date.now();
@@ -905,21 +927,36 @@ var GitHubAuthProvider = class {
       if (shouldContinue && !shouldContinue()) {
         throw new Error("GitHub device flow cancelled by caller");
       }
-      const resp = await this.cfg.fetchImpl(this.cfg.tokenUrl, {
-        method: "POST",
-        headers: {
-          Accept: "application/json",
-          "Content-Type": "application/json",
-          "User-Agent": "serviceme-core"
-        },
-        body: JSON.stringify({
-          client_id: this.cfg.clientId,
-          device_code: deviceCode,
-          grant_type: "urn:ietf:params:oauth:grant-type:device_code"
-        })
-      });
+      let resp;
+      try {
+        resp = await this.cfg.fetchImpl(this.cfg.tokenUrl, {
+          method: "POST",
+          headers: {
+            Accept: "application/json",
+            "Content-Type": "application/json",
+            "User-Agent": "serviceme-core"
+          },
+          body: JSON.stringify({
+            client_id: this.cfg.clientId,
+            device_code: deviceCode,
+            grant_type: "urn:ietf:params:oauth:grant-type:device_code"
+          })
+        });
+      } catch (error) {
+        if (!isTransientNetworkError(error)) {
+          throw error;
+        }
+        pollIntervalMs = Math.min(
+          Math.round(pollIntervalMs * 1.5),
+          this.cfg.maxPollIntervalMs
+        );
+        continue;
+      }
       if (!resp.ok) {
-        pollIntervalMs = Math.min(Math.round(pollIntervalMs * 1.5), this.cfg.maxPollIntervalMs);
+        pollIntervalMs = Math.min(
+          Math.round(pollIntervalMs * 1.5),
+          this.cfg.maxPollIntervalMs
+        );
         continue;
       }
       const data = await resp.json();
@@ -945,7 +982,9 @@ var GitHubAuthProvider = class {
       if (data.error === "slow_down") {
         consecutiveSlowDown++;
         pollIntervalMs = Math.min(
-          Math.round(pollIntervalMs * 1.5 + Math.min(consecutiveSlowDown * 500, 2e3)),
+          Math.round(
+            pollIntervalMs * 1.5 + Math.min(consecutiveSlowDown * 500, 2e3)
+          ),
           this.cfg.maxPollIntervalMs
         );
         continue;
@@ -981,7 +1020,9 @@ var GitHubAuthProvider = class {
     }
     const data = await resp.json();
     if (!data.access_token) {
-      throw new Error(`GitHub refresh failed: ${data.error ?? "no_access_token"}`);
+      throw new Error(
+        `GitHub refresh failed: ${data.error ?? "no_access_token"}`
+      );
     }
     const rawUser = await this.fetchGitHubUser(data.access_token);
     const email = await this.resolveEmail(data.access_token, rawUser);
@@ -1051,13 +1092,16 @@ var GitHubAuthProvider = class {
    */
   async resolveEmail(token, user) {
     if (user.email) return user.email;
-    const emailsResp = await this.cfg.fetchImpl("https://api.github.com/user/emails", {
-      headers: {
-        Accept: "application/vnd.github+json",
-        Authorization: `Bearer ${token}`,
-        "User-Agent": "serviceme-core"
+    const emailsResp = await this.cfg.fetchImpl(
+      "https://api.github.com/user/emails",
+      {
+        headers: {
+          Accept: "application/vnd.github+json",
+          Authorization: `Bearer ${token}`,
+          "User-Agent": "serviceme-core"
+        }
       }
-    });
+    );
     if (!emailsResp.ok) {
       return null;
     }
@@ -2098,14 +2142,7 @@ function extractFrontmatter(raw) {
   }
   return { data, body };
 }
-var SKIP_DIRS = /* @__PURE__ */ new Set([
-  ".git",
-  "node_modules",
-  ".vscode",
-  "dist",
-  "build",
-  "out"
-]);
+var SKIP_DIRS = /* @__PURE__ */ new Set([".git", "node_modules", ".vscode", "dist", "build", "out"]);
 var SKIP_TOP_LEVEL_SCAN_DIRS = /* @__PURE__ */ new Set([...SKIP_DIRS, "plugins"]);
 
 // src/drafts/index.ts
@@ -3376,7 +3413,9 @@ function idFromUrl(url) {
   const last = trimmed.split("/").pop() ?? "";
   const safe = last.replace(/[^a-zA-Z0-9_-]/g, "-").toLowerCase();
   if (!SAFE_REPO_ID_PATTERN.test(safe)) {
-    throw new InvalidRepoUrlError(`cannot derive a valid repo id from url: ${url}`);
+    throw new InvalidRepoUrlError(
+      `cannot derive a valid repo id from url: ${url}`
+    );
   }
   return safe;
 }
@@ -3418,7 +3457,10 @@ var RepoManager = class {
       if (!repo.enabled) continue;
       const localPath = getRepoDir(repo.id);
       const exists = await this.pathExists(localPath);
-      if (exists) continue;
+      if (exists) {
+        if (await this.isValidGitRepo(localPath)) continue;
+        await fs8.rm(localPath, { recursive: true, force: true });
+      }
       try {
         if (!this.skipClone) {
           await fs8.mkdir(path11.dirname(localPath), { recursive: true });
@@ -3453,7 +3495,10 @@ var RepoManager = class {
     if (!repo) throw new RepoNotInStoreError(repoId);
     const localPath = getRepoDir(repoId);
     const exists = await this.pathExists(localPath);
-    if (!exists) {
+    if (exists && !await this.isValidGitRepo(localPath)) {
+      await fs8.rm(localPath, { recursive: true, force: true });
+    }
+    if (!exists || !await this.pathExists(localPath)) {
       await fs8.mkdir(path11.dirname(localPath), { recursive: true });
       if (!this.skipClone) {
         await this.git.clone(repoId, repo.url, localPath);
@@ -3519,7 +3564,9 @@ var RepoManager = class {
   async addUserRepo(input) {
     const url = input.url.trim();
     if (!/^https?:\/\//.test(url) && !url.startsWith("git@")) {
-      throw new InvalidRepoUrlError(`expected https:// or git@ URL, got: ${url}`);
+      throw new InvalidRepoUrlError(
+        `expected https:// or git@ URL, got: ${url}`
+      );
     }
     const id = idFromUrl(url);
     assertSafeRepoId(id);
@@ -3601,6 +3648,14 @@ var RepoManager = class {
   async ensureHome() {
     await fs8.mkdir(getServicemeHome(), { recursive: true });
   }
+  /**
+   * Returns `true` when `p` contains a `.git` entry — i.e. it is an
+   * initialised git repository and safe to `pull`. Empty directories
+   * (e.g. from an interrupted clone) return `false`.
+   */
+  async isValidGitRepo(p) {
+    return this.pathExists(path11.join(p, ".git"));
+  }
   async pathExists(p) {
     try {
       await fs8.stat(p);
@@ -5779,7 +5834,10 @@ function readV1Config(v1Path) {
   try {
     raw = fs19.readFileSync(v1Path, "utf-8");
   } catch (err) {
-    return { ok: false, error: `read failed: ${err instanceof Error ? err.message : String(err)}` };
+    return {
+      ok: false,
+      error: `read failed: ${err instanceof Error ? err.message : String(err)}`
+    };
   }
   let parsed;
   try {
@@ -5834,79 +5892,77 @@ function disambiguateName(task, existingNames, workspaceName) {
   existingNames.add(candidate);
   return { ...task, name: candidate };
 }
-var MigrateToGlobal = class {
-  /**
-   * Run the migration. Idempotent: each v1 file is deleted after processing,
-   * so re-running this method on a partially-migrated state is safe (the
-   * already-migrated files no longer exist; only the remainder is processed).
-   */
-  static async run(options) {
-    const globalConfigPath = options.globalConfigPath ?? getScheduledTasksConfigPath();
-    const migrationFailuresPath = options.migrationFailuresPath ?? getMigrationFailuresPath();
-    const probe = options.probe ?? defaultProbe;
-    const existing = readJsonFile(globalConfigPath);
-    const baseConfig = existing && existing.version === 2 ? existing : { version: 2, tasks: [] };
-    const existingNames = new Set(baseConfig.tasks.map((t) => t.name));
-    const priorFailures = readJsonFile(migrationFailuresPath) ?? [];
-    const failures = [...priorFailures];
-    let migrated = 0;
-    const conflicts = [];
-    const issues = [];
-    for (const workspacePath of options.workspacePaths) {
-      const v1Path = path20.join(workspacePath, WORKSPACE_DIR, V1_FILENAME);
-      if (!fs19.existsSync(v1Path)) continue;
-      const v1 = readV1Config(v1Path);
-      if (!v1.ok) {
-        failures.push({
-          workspacePath,
-          v1Path,
-          error: v1.error,
-          at: (/* @__PURE__ */ new Date()).toISOString()
-        });
-        safeDelete(v1Path);
-        continue;
-      }
-      let workspaceRef;
-      try {
-        workspaceRef = await probe(workspacePath);
-      } catch (err) {
-        failures.push({
-          workspacePath,
-          v1Path,
-          error: `probe failed: ${err instanceof Error ? err.message : String(err)}`,
-          at: (/* @__PURE__ */ new Date()).toISOString()
-        });
-        safeDelete(v1Path);
-        continue;
-      }
-      const { config, issues: taskIssues } = migrateV1ToV22(v1.config, workspaceRef);
-      issues.push(...taskIssues);
-      const newTasks = config.tasks.map((t) => {
-        if (existingNames.has(t.name)) {
-          conflicts.push(t.name);
-          return disambiguateName(t, existingNames, workspaceRef.name);
-        }
-        existingNames.add(t.name);
-        return t;
+async function migrateToGlobal(options) {
+  const globalConfigPath = options.globalConfigPath ?? getScheduledTasksConfigPath();
+  const migrationFailuresPath = options.migrationFailuresPath ?? getMigrationFailuresPath();
+  const probe = options.probe ?? defaultProbe;
+  const existing = readJsonFile(globalConfigPath);
+  const baseConfig = existing && existing.version === 2 ? existing : { version: 2, tasks: [] };
+  const existingNames = new Set(baseConfig.tasks.map((t) => t.name));
+  const priorFailures = readJsonFile(migrationFailuresPath) ?? [];
+  const failures = [...priorFailures];
+  let migrated = 0;
+  const conflicts = [];
+  const issues = [];
+  for (const workspacePath of options.workspacePaths) {
+    const v1Path = path20.join(workspacePath, WORKSPACE_DIR, V1_FILENAME);
+    if (!fs19.existsSync(v1Path)) continue;
+    const v1 = readV1Config(v1Path);
+    if (!v1.ok) {
+      failures.push({
+        workspacePath,
+        v1Path,
+        error: v1.error,
+        at: (/* @__PURE__ */ new Date()).toISOString()
       });
-      baseConfig.tasks.push(...newTasks);
-      migrated += 1;
       safeDelete(v1Path);
+      continue;
     }
-    if (migrated > 0) {
-      ensureDir(globalConfigPath);
-      const tmp = `${globalConfigPath}.tmp`;
-      fs19.writeFileSync(tmp, JSON.stringify(baseConfig, null, "	"), "utf-8");
-      fs19.renameSync(tmp, globalConfigPath);
-    }
-    if (failures.length > priorFailures.length) {
-      writeJsonFile(migrationFailuresPath, failures);
-    } else if (failures.length === 0 && priorFailures.length > 0) {
-      safeDelete(migrationFailuresPath);
+    let workspaceRef;
+    try {
+      workspaceRef = await probe(workspacePath);
+    } catch (err) {
+      failures.push({
+        workspacePath,
+        v1Path,
+        error: `probe failed: ${err instanceof Error ? err.message : String(err)}`,
+        at: (/* @__PURE__ */ new Date()).toISOString()
+      });
+      safeDelete(v1Path);
+      continue;
     }
-    return { migrated, failed: failures.length - priorFailures.length, conflicts, issues };
+    const { config, issues: taskIssues } = migrateV1ToV22(v1.config, workspaceRef);
+    issues.push(...taskIssues);
+    const newTasks = config.tasks.map((t) => {
+      if (existingNames.has(t.name)) {
+        conflicts.push(t.name);
+        return disambiguateName(t, existingNames, workspaceRef.name);
+      }
+      existingNames.add(t.name);
+      return t;
+    });
+    baseConfig.tasks.push(...newTasks);
+    migrated += 1;
+    safeDelete(v1Path);
   }
-};
+  if (migrated > 0) {
+    ensureDir(globalConfigPath);
+    const tmp = `${globalConfigPath}.tmp`;
+    fs19.writeFileSync(tmp, JSON.stringify(baseConfig, null, "	"), "utf-8");
+    fs19.renameSync(tmp, globalConfigPath);
+  }
+  if (failures.length > priorFailures.length) {
+    writeJsonFile(migrationFailuresPath, failures);
+  } else if (failures.length === 0 && priorFailures.length > 0) {
+    safeDelete(migrationFailuresPath);
+  }
+  return {
+    migrated,
+    failed: failures.length - priorFailures.length,
+    conflicts,
+    issues
+  };
+}
 
 // src/scheduled-tasks/workspace-probe/WorkspaceProbe.ts
 import { spawn as spawn5 } from "child_process";
@@ -6808,7 +6864,6 @@ export {
   MIGRATION_FAILURES_FILENAME,
   MicrosoftAuthProvider,
   MicrosoftProviderNotHostedError,
-  MigrateToGlobal,
   NodeGitSpawner,
   PROFILES_JSON_FILENAME,
   PidManager,
@@ -6907,6 +6962,7 @@ export {
   isUserRepo,
   matchesCron,
   mergeWithDefaults,
+  migrateToGlobal,
   moveFiles,
   narrowRepoConfig,
   noopLogger,