@serviceme/devtools-core 0.2.0 → 0.2.1

package/dist/index.d.ts

@@ -1318,6 +1318,12 @@ declare class RepoManager {
     hasLocalClone(repoId: string): Promise<boolean>;
     /** Force-create the SERVICEME home directory tree (idempotent). */
     ensureHome(): Promise<void>;
+    /**
+     * 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`.
+     */
+    private isValidGitRepo;
     private pathExists;
 }
 
@@ -1654,14 +1660,12 @@ interface MigrationResult {
     /** Soft issues surfaced by migrateV1ToV2 (e.g. unknown taskType). */
     issues: string[];
 }
-declare class MigrateToGlobal {
-    /**
-     * 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 run(options: MigrateToGlobalOptions): Promise<MigrationResult>;
-}
+/**
+ * Run the migration. Idempotent: each v1 file is deleted after processing,
+ * so re-running this on a partially-migrated state is safe (the
+ * already-migrated files no longer exist; only the remainder is processed).
+ */
+declare function migrateToGlobal(options: MigrateToGlobalOptions): Promise<MigrationResult>;
 
 interface TaskEventListener {
     onStarted(params: TaskStartedEventParams): void;
@@ -1816,4 +1820,4 @@ declare class SkillStore {
 declare const unzipFile: (zipPath: string, dest: string) => Promise<void>;
 declare const moveFiles: (sourceDir: string, destDir: string, overwrite?: boolean) => Promise<void>;
 
-export { AGENT_DRAFTS_SUBDIR, type AddUserRepoInput, type AddUserRepoResult, type AgentCatalog, AgentCatalogClient, type AgentCatalogClientOptions, type AgentDownloadFile, type AgentInstallScope, type AgentMutateResult, AgentReconciler, type AgentReconcilerDependencies, AgentStore, type AgentStoreFileSystem, type AgentStoreOptions, type AgentsStateFile, type AnyRepoConfig, type AppendLogInput, type BootstrapPhase5Result, CACHE_SUBDIR, CREDENTIALS_CONFIG_FILENAME, CannotRemoveDefaultRepoError, type CreateTaskInput, FIXED_ADDED_AT as DEFAULT_REPO_FIXED_ADDED_AT, DEFAULT_REPO_ID, DEVICE_JSON_FILENAME, DRAFTS_SUBDIR, DaemonLogger, type DefaultRepoConfig, type DraftDetail, DraftNotFoundError, type DraftSummary, DraftsError, DraftsStore, type EditTaskInput, EnvironmentInspector, type EnvironmentInspectorOptions, type ExecutorResult, type FsWatcherCallbacks, type FsWatcherHandle, GitClient, GithubCopilotCliExecutor, HttpRequestExecutor, ImageTools, type InstalledAgent, InvalidDraftError, InvalidRepoUrlError, type IsoTimestamp, type JsonTools, KNOWN_WORKSPACES_FILENAME, type LoadResult, MACHINE_ID_FILENAME, MIGRATION_FAILURES_FILENAME, MigrateToGlobal, type MigrateToGlobalOptions, type MigrationResult, type OutputEventCallback, PROFILES_JSON_FILENAME, PidManager, type ProbeError, type ProbeOptions, type ProbeResult, ProjectTools, REPOS_CONFIG_FILENAME, REPOS_SUBDIR, RepoAlreadyExistsError, RepoCloneConflictError, type RepoConfig, RepoManager, RepoManagerError, type RepoManagerOptions, RepoNotFoundError, RepoNotInStoreError, type RepoSource, type ReposFile, type ReposFileInput, ReposLoader, type ReposLoaderFileSystem, type ReposLoaderOptions, ReposStore, type ReposStoreChange, type ReposStoreFileSystem, type ReposStoreListener, type ReposStoreOptions, SAFE_REPO_ID_PATTERN, SCHEDULED_TASKS_CONFIG_FILENAME, SCHEDULED_TASKS_LOG_FILENAME, SCHEDULER_LOCK_FILENAME, SCHEDULER_LOG_FILENAME, SCHEDULER_PID_FILENAME, SERVICEME_DIR_NAME, SERVICEME_HOME_ENV, SKILL_DRAFTS_SUBDIR, type SaveDraftOptions, SchedulerDaemon, SchedulerDaemonV2, type SchedulerDaemonV2Options, type ServiceMeLogger, ShellExecutor, type SkillCatalog, SkillCatalogClient, type SkillCatalogClientOptions, type SkillDownloadFile, type SkillMutateResult, SkillReconciler, type SkillReconcilerDependencies, SkillStore, type SkillStoreFileSystem, type SkillStoreOptions, type StreamingExecutorHandle, type StreamingTaskExecutor, type SyncReport, type SyncStatus, TOOLBOX_JSON_FILENAME, TOOL_RISK_MAP, TaskConfigManager, type TaskEventListener, TaskExecutionEngine, type TaskExecutor, TaskLogManager, type UserRepoConfig, WorkspaceProbe, repoSchema as anyRepoConfigSchema, assertSafeRepoId, bootstrapDefaults, bootstrapPhase5Placeholders, buildDefaultReposFile, copilotDoctor, copilotPrompt, createConsoleLogger, createCopilotAuthRequiredError, createCopilotNotInstalledError, createImageTools, createJsonTools, createProjectTools, createReposStore, defaultRepoSchema as defaultRepoConfigSchema, ensureDefaultsInstalled, generateDraftId, getAgentDraftsDir, getAllDefaultRepoConfigs, getCacheDir, getCredentialsConfigPath, getDefaultRepoConfig, getDeviceJsonPath, getDraftsDir, getExecutor, getHomeDir, getHomePlatform, getKnownWorkspacesPath, getMachineIdPath, getMigrationFailuresPath, getProfilesJsonPath, getRepoCacheDir, getRepoDir, getReposConfigPath, getReposDir, getScheduledTasksConfigPath, getScheduledTasksLogPath, getSchedulerLockPath, getSchedulerLogPath, getSchedulerPidPath, getServicemeHome, getSkillDraftsDir, getToolboxJsonPath, isCopilotAuthenticated, isDefaultRepo, isStreamingTaskExecutor, isUserRepo, matchesCron, moveFiles, narrowRepoConfig, noopLogger, parseAgentToolPermissions, parseIntervalMs, reposFileSchema, resetUserHomeOverrides, resolveDraftDir, resolveTaskExecutionPayload, setUserHomeOverrides, unzipFile, userRepoSchema as userRepoConfigSchema, validateReposFile, validateTaskPayload };
+export { AGENT_DRAFTS_SUBDIR, type AddUserRepoInput, type AddUserRepoResult, type AgentCatalog, AgentCatalogClient, type AgentCatalogClientOptions, type AgentDownloadFile, type AgentInstallScope, type AgentMutateResult, AgentReconciler, type AgentReconcilerDependencies, AgentStore, type AgentStoreFileSystem, type AgentStoreOptions, type AgentsStateFile, type AnyRepoConfig, type AppendLogInput, type BootstrapPhase5Result, CACHE_SUBDIR, CREDENTIALS_CONFIG_FILENAME, CannotRemoveDefaultRepoError, type CreateTaskInput, FIXED_ADDED_AT as DEFAULT_REPO_FIXED_ADDED_AT, DEFAULT_REPO_ID, DEVICE_JSON_FILENAME, DRAFTS_SUBDIR, DaemonLogger, type DefaultRepoConfig, type DraftDetail, DraftNotFoundError, type DraftSummary, DraftsError, DraftsStore, type EditTaskInput, EnvironmentInspector, type EnvironmentInspectorOptions, type ExecutorResult, type FsWatcherCallbacks, type FsWatcherHandle, GitClient, GithubCopilotCliExecutor, HttpRequestExecutor, ImageTools, type InstalledAgent, InvalidDraftError, InvalidRepoUrlError, type IsoTimestamp, type JsonTools, KNOWN_WORKSPACES_FILENAME, type LoadResult, MACHINE_ID_FILENAME, MIGRATION_FAILURES_FILENAME, type MigrateToGlobalOptions, type MigrationResult, type OutputEventCallback, PROFILES_JSON_FILENAME, PidManager, type ProbeError, type ProbeOptions, type ProbeResult, ProjectTools, REPOS_CONFIG_FILENAME, REPOS_SUBDIR, RepoAlreadyExistsError, RepoCloneConflictError, type RepoConfig, RepoManager, RepoManagerError, type RepoManagerOptions, RepoNotFoundError, RepoNotInStoreError, type RepoSource, type ReposFile, type ReposFileInput, ReposLoader, type ReposLoaderFileSystem, type ReposLoaderOptions, ReposStore, type ReposStoreChange, type ReposStoreFileSystem, type ReposStoreListener, type ReposStoreOptions, SAFE_REPO_ID_PATTERN, SCHEDULED_TASKS_CONFIG_FILENAME, SCHEDULED_TASKS_LOG_FILENAME, SCHEDULER_LOCK_FILENAME, SCHEDULER_LOG_FILENAME, SCHEDULER_PID_FILENAME, SERVICEME_DIR_NAME, SERVICEME_HOME_ENV, SKILL_DRAFTS_SUBDIR, type SaveDraftOptions, SchedulerDaemon, SchedulerDaemonV2, type SchedulerDaemonV2Options, type ServiceMeLogger, ShellExecutor, type SkillCatalog, SkillCatalogClient, type SkillCatalogClientOptions, type SkillDownloadFile, type SkillMutateResult, SkillReconciler, type SkillReconcilerDependencies, SkillStore, type SkillStoreFileSystem, type SkillStoreOptions, type StreamingExecutorHandle, type StreamingTaskExecutor, type SyncReport, type SyncStatus, TOOLBOX_JSON_FILENAME, TOOL_RISK_MAP, TaskConfigManager, type TaskEventListener, TaskExecutionEngine, type TaskExecutor, TaskLogManager, type UserRepoConfig, WorkspaceProbe, repoSchema as anyRepoConfigSchema, assertSafeRepoId, bootstrapDefaults, bootstrapPhase5Placeholders, buildDefaultReposFile, copilotDoctor, copilotPrompt, createConsoleLogger, createCopilotAuthRequiredError, createCopilotNotInstalledError, createImageTools, createJsonTools, createProjectTools, createReposStore, defaultRepoSchema as defaultRepoConfigSchema, ensureDefaultsInstalled, generateDraftId, getAgentDraftsDir, getAllDefaultRepoConfigs, getCacheDir, getCredentialsConfigPath, getDefaultRepoConfig, getDeviceJsonPath, getDraftsDir, getExecutor, getHomeDir, getHomePlatform, getKnownWorkspacesPath, getMachineIdPath, getMigrationFailuresPath, getProfilesJsonPath, getRepoCacheDir, getRepoDir, getReposConfigPath, getReposDir, getScheduledTasksConfigPath, getScheduledTasksLogPath, getSchedulerLockPath, getSchedulerLogPath, getSchedulerPidPath, getServicemeHome, getSkillDraftsDir, getToolboxJsonPath, isCopilotAuthenticated, isDefaultRepo, isStreamingTaskExecutor, isUserRepo, matchesCron, migrateToGlobal, moveFiles, narrowRepoConfig, noopLogger, parseAgentToolPermissions, parseIntervalMs, reposFileSchema, resetUserHomeOverrides, resolveDraftDir, resolveTaskExecutionPayload, setUserHomeOverrides, unzipFile, userRepoSchema as userRepoConfigSchema, validateReposFile, validateTaskPayload };

package/dist/index.js

@@ -75,7 +75,6 @@ __export(src_exports, {
   MIGRATION_FAILURES_FILENAME: () => MIGRATION_FAILURES_FILENAME,
   MicrosoftAuthProvider: () => MicrosoftAuthProvider,
   MicrosoftProviderNotHostedError: () => MicrosoftProviderNotHostedError,
-  MigrateToGlobal: () => MigrateToGlobal,
   NodeGitSpawner: () => NodeGitSpawner,
   PROFILES_JSON_FILENAME: () => PROFILES_JSON_FILENAME,
   PidManager: () => PidManager,
@@ -174,6 +173,7 @@ __export(src_exports, {
   isUserRepo: () => isUserRepo,
   matchesCron: () => matchesCron,
   mergeWithDefaults: () => mergeWithDefaults,
+  migrateToGlobal: () => migrateToGlobal,
   moveFiles: () => moveFiles,
   narrowRepoConfig: () => narrowRepoConfig,
   noopLogger: () => noopLogger,
@@ -1035,6 +1035,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";
@@ -1050,7 +1055,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) {
@@ -1058,29 +1064,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();
@@ -1098,21 +1120,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();
@@ -1138,7 +1175,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;
@@ -1174,7 +1213,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);
@@ -1244,13 +1285,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;
     }
@@ -2284,14 +2328,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
@@ -3552,7 +3589,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;
 }
@@ -3594,7 +3633,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 });
@@ -3629,7 +3671,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);
@@ -3695,7 +3740,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);
@@ -3777,6 +3824,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);
@@ -5949,7 +6004,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 {
@@ -6004,79 +6062,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 } = (0, import_devtools_protocol9.migrateV1ToV2)(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 } = (0, import_devtools_protocol9.migrateV1ToV2)(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
 var import_node_child_process5 = require("child_process");
@@ -6979,7 +7035,6 @@ var ToolboxCore = class {
   MIGRATION_FAILURES_FILENAME,
   MicrosoftAuthProvider,
   MicrosoftProviderNotHostedError,
-  MigrateToGlobal,
   NodeGitSpawner,
   PROFILES_JSON_FILENAME,
   PidManager,
@@ -7078,6 +7133,7 @@ var ToolboxCore = class {
   isUserRepo,
   matchesCron,
   mergeWithDefaults,
+  migrateToGlobal,
   moveFiles,
   narrowRepoConfig,
   noopLogger,