@gluecharm-lab/easyspecs-cli 0.0.22 → 0.0.24

package/dist/main.cjs

@@ -11012,6 +11012,228 @@ function assertAgentsDirExists(agentsDir) {
   }
 }
 
+// src/config/easyspecsConfigJson.ts
+var DEFAULT_MAX_CONCURRENT_AI = 45;
+var DEFAULT_CONTEXT_ANALYZED_STATUS_TIMEOUT_MS = 15e3;
+function mergeEasyspecsConfigDefaults(defaults, partial) {
+  if (!partial) {
+    return defaults;
+  }
+  const esInRaw = partial.easyspecs ?? {};
+  const legacyProjectId = esInRaw.applicationId;
+  const { applicationId: _omitLegacyApplicationIdKey, ...esIn } = esInRaw;
+  void _omitLegacyApplicationIdKey;
+  const defEs = defaults.easyspecs;
+  const factoryMerged = mergeEasyspecsFactoryBlock(defEs.factory, esIn.factory);
+  const workstationsMerged = mergeEasyspecsWorkstationsBlock(defEs.workstations, esIn.workstations);
+  const pipelinesMerged = mergeEasyspecsPipelinesBlock(defEs.pipelines, esIn.pipelines);
+  const mergedEs = {
+    ...defEs,
+    ...esIn,
+    deploymentEnvironment: esIn.deploymentEnvironment ?? defEs.deploymentEnvironment,
+    apiBaseUrl: esIn.apiBaseUrl ?? defEs.apiBaseUrl,
+    easyspecsProjectId: esIn.easyspecsProjectId !== void 0 ? esIn.easyspecsProjectId : legacyProjectId !== void 0 ? legacyProjectId : defEs.easyspecsProjectId,
+    defaultGitRemoteUrl: esIn.defaultGitRemoteUrl !== void 0 ? esIn.defaultGitRemoteUrl : defEs.defaultGitRemoteUrl,
+    cliSessionPath: esIn.cliSessionPath !== void 0 ? esIn.cliSessionPath : defEs.cliSessionPath,
+    openCode: { ...defEs.openCode, ...esIn.openCode },
+    analysis: mergeAnalysisBlock(
+      defEs.analysis ?? { promoteContextToWorkspace: true },
+      esIn.analysis
+    ),
+    orchestration: { ...defEs.orchestration, ...esIn.orchestration },
+    openCodeRuntime: mergeOpenCodeRuntime(defEs.openCodeRuntime, esIn.openCodeRuntime),
+    diagnose: mergeDiagnoseBlock(defEs.diagnose, esIn.diagnose),
+    upload: { ...defEs.upload, ...esIn.upload },
+    macro: { ...defEs.macro, ...esIn.macro },
+    ...factoryMerged ? { factory: factoryMerged } : {},
+    ...workstationsMerged ? { workstations: workstationsMerged } : {},
+    ...pipelinesMerged ? { pipelines: pipelinesMerged } : {},
+    cli: { ...defEs.cli, ...esIn.cli },
+    auth: mergeAuthBlock(defEs.auth, esIn.auth)
+  };
+  const easyspecs = {
+    ...mergedEs,
+    analysis: normalizeAnalysisWithFactoryCloud(mergedEs.analysis, mergedEs.factory)
+  };
+  return {
+    schemaVersion: partial.schemaVersion ?? defaults.schemaVersion,
+    easyspecs
+  };
+}
+function mergeDiagnoseBlock(base, over) {
+  if (!over) {
+    return { ...base };
+  }
+  const zBase = base.zeroReference ?? { maxPercentNonReferenced: null };
+  const zOver = over.zeroReference;
+  const cBase = base.coordinationDuplicates ?? { strict: true };
+  const cOver = over.coordinationDuplicates;
+  return {
+    zeroReference: {
+      maxPercentNonReferenced: zOver?.maxPercentNonReferenced !== void 0 ? zOver.maxPercentNonReferenced : zBase.maxPercentNonReferenced ?? null
+    },
+    coordinationDuplicates: {
+      strict: cOver?.strict !== void 0 ? cOver.strict : cBase.strict !== false
+    }
+  };
+}
+function mergeAuthBlock(base, over) {
+  if (!over) {
+    return { ...base };
+  }
+  return {
+    ciLogin: { ...base.ciLogin, ...over.ciLogin }
+  };
+}
+function mergeAnalysisBlock(base, over) {
+  if (!over || Object.keys(over).length === 0) {
+    return { ...base };
+  }
+  const merged = {
+    ...base,
+    ...over
+  };
+  if (base.ace || over.ace) {
+    merged.ace = { ...base.ace, ...over.ace };
+  }
+  return merged;
+}
+function mergeEasyspecsFactoryBlock(base, over) {
+  if (!base && !over) {
+    return void 0;
+  }
+  const b = base ?? {};
+  const o = over ?? {};
+  const updateContext = b.updateContext || o.updateContext ? { ...b.updateContext ?? {}, ...o.updateContext ?? {} } : void 0;
+  const out = {
+    ...b,
+    ...o,
+    backoff: { ...b.backoff ?? {}, ...o.backoff ?? {} },
+    ...updateContext ? { updateContext } : {}
+  };
+  const backoffKeys = Object.keys(out.backoff ?? {});
+  const topKeys = Object.keys(out).filter((k) => k !== "backoff");
+  if (topKeys.length === 0 && backoffKeys.length === 0) {
+    return void 0;
+  }
+  return out;
+}
+function mergeEasyspecsWorkstationsBlock(base, over) {
+  if (!base && !over) {
+    return void 0;
+  }
+  const out = { ...base ?? {}, ...over ?? {} };
+  return Object.keys(out).length > 0 ? out : void 0;
+}
+function mergeEasyspecsPipelinesBlock(base, over) {
+  if (!base && !over) {
+    return void 0;
+  }
+  const b = base ?? {};
+  const o = over ?? {};
+  const out = {
+    ...b,
+    ...o,
+    upload: { ...b.upload ?? {}, ...o.upload ?? {} }
+  };
+  const uploadKeys = Object.keys(out.upload ?? {});
+  const topKeys = Object.keys(out).filter((k) => k !== "upload");
+  if (topKeys.length === 0 && uploadKeys.length === 0) {
+    return void 0;
+  }
+  return out;
+}
+function normalizeAnalysisWithFactoryCloud(analysis, factory) {
+  if (!factory || factory.cloudContextAnalyzed === void 0 && factory.cloudContextAnalyzedAt === void 0) {
+    return analysis;
+  }
+  return mergeAnalysisBlock(analysis, {
+    ...factory.cloudContextAnalyzed !== void 0 ? { cloudContextAnalyzed: factory.cloudContextAnalyzed } : {},
+    ...factory.cloudContextAnalyzedAt !== void 0 ? { cloudContextAnalyzedAt: factory.cloudContextAnalyzedAt } : {}
+  });
+}
+function mergeOpenCodeRuntime(base, over) {
+  if (!over && !base) {
+    return void 0;
+  }
+  const b = base ?? {};
+  const o = over ?? {};
+  return {
+    ...b,
+    ...o,
+    executable: o.executable ?? b.executable,
+    skipCredentialsCheck: o.skipCredentialsCheck ?? b.skipCredentialsCheck,
+    credentialsPath: o.credentialsPath !== void 0 ? o.credentialsPath : b.credentialsPath,
+    providers: { ...b.providers, ...o.providers },
+    run: { ...b.run, ...o.run },
+    coordinationRepairs: { ...b.coordinationRepairs, ...o.coordinationRepairs },
+    pool: { ...b.pool, ...o.pool },
+    projectConfigOverlay: b.projectConfigOverlay || o.projectConfigOverlay ? { ...b.projectConfigOverlay ?? {}, ...o.projectConfigOverlay ?? {} } : void 0
+  };
+}
+function getDefaultEasyspecsConfig() {
+  const openCodeRuntime = {
+    executable: "opencode",
+    skipCredentialsCheck: false,
+    credentialsPath: ".opencode/auth.json",
+    providers: {},
+    run: {
+      argvTemplate: [
+        "run",
+        "--agent",
+        "{agentId}",
+        "Execute the task described in the attached EasySpecs prompt file.",
+        "-f",
+        "{promptFile}"
+      ],
+      timeoutMs: 6e5
+    },
+    coordinationRepairs: {
+      listJsonSchemaRepairAttempts: 1,
+      markdownEvidenceRepairAttempts: 2,
+      markdownOpenQuestionIterations: 5
+    },
+    /** Pool cap defaults in {@link mergeEasyspecsCliSettings} (`?? 30`); omit here so `workstations.maxConcurrentAi` is not overridden by merged `pool`. */
+    pool: {},
+    projectConfigOverlay: {}
+  };
+  return {
+    schemaVersion: 2,
+    easyspecs: {
+      deploymentEnvironment: "production",
+      apiBaseUrl: PRODUCTION_SYSTEM_MANAGER_URL,
+      easyspecsProjectId: "",
+      defaultGitRemoteUrl: "",
+      cliSessionPath: "",
+      openCode: {
+        executable: "opencode",
+        skipCredentialsCheck: false
+      },
+      workstations: {
+        maxConcurrentAi: DEFAULT_MAX_CONCURRENT_AI
+      },
+      analysis: {
+        promoteContextToWorkspace: true,
+        cloudContextAnalyzed: false,
+        cloudContextAnalyzedAt: null
+      },
+      orchestration: {},
+      openCodeRuntime,
+      diagnose: {
+        zeroReference: { maxPercentNonReferenced: null },
+        coordinationDuplicates: { strict: true }
+      },
+      upload: {
+        contextDirectory: "",
+        fetchContextAnalyzedInCloud: true
+      },
+      macro: { debug: false },
+      cli: { bundledResourcesRoot: "" },
+      auth: { ciLogin: {} }
+    }
+  };
+}
+
 // src/config/openCodeProviderEnv.ts
 var path3 = __toESM(require("node:path"));
 var PROVIDER_TO_ENV = {
@@ -11187,7 +11409,7 @@ function mergeEasyspecsCliSettings(cfg, overrides = {}) {
   const listJsonSchemaRepairAttempts = rt?.coordinationRepairs?.listJsonSchemaRepairAttempts ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.workstations.coordinationListRepairAttempts") ?? 1;
   const markdownEvidenceRepairAttempts = rt?.coordinationRepairs?.markdownEvidenceRepairAttempts ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.workstations.detailMarkdownRepairAttempts") ?? 2;
   const markdownOpenQuestionIterations = rt?.coordinationRepairs?.markdownOpenQuestionIterations ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.workstations.openQuestionIterations") ?? 5;
-  const maxConcurrentOpenCodeAgents = overrides.maxConcurrentOpenCodeAgents ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.workstations.maxConcurrentAi") ?? rt?.pool?.maxConcurrentAgents ?? 30;
+  const maxConcurrentOpenCodeAgents = overrides.maxConcurrentOpenCodeAgents ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.workstations.maxConcurrentAi") ?? rt?.pool?.maxConcurrentAgents ?? DEFAULT_MAX_CONCURRENT_AI;
   const promoteContextToWorkspace = overrides.promote === false ? false : overrides.promote === true ? true : analysis.promoteContextToWorkspace !== false;
   let maxOuter = overrides.maxOuterIterationsPerPhase ?? readEasyspecsMergedSetting(cfg.easyspecs, "easyspecs.factory.maxOuterIterationsPerPipeline") ?? orch.maxOuterIterationsPerPhase ?? 0;
   if (ci && maxOuter === 0) {
@@ -11315,224 +11537,6 @@ function readAceOfflineLearnAfterSameSessionTraceFromEasySpecsSettingsFile(works
   return typeof v === "boolean" ? v : void 0;
 }
 
-// src/config/easyspecsConfigJson.ts
-var DEFAULT_CONTEXT_ANALYZED_STATUS_TIMEOUT_MS = 15e3;
-function mergeEasyspecsConfigDefaults(defaults, partial) {
-  if (!partial) {
-    return defaults;
-  }
-  const esInRaw = partial.easyspecs ?? {};
-  const legacyProjectId = esInRaw.applicationId;
-  const { applicationId: _omitLegacyApplicationIdKey, ...esIn } = esInRaw;
-  void _omitLegacyApplicationIdKey;
-  const defEs = defaults.easyspecs;
-  const factoryMerged = mergeEasyspecsFactoryBlock(defEs.factory, esIn.factory);
-  const workstationsMerged = mergeEasyspecsWorkstationsBlock(defEs.workstations, esIn.workstations);
-  const pipelinesMerged = mergeEasyspecsPipelinesBlock(defEs.pipelines, esIn.pipelines);
-  const mergedEs = {
-    ...defEs,
-    ...esIn,
-    deploymentEnvironment: esIn.deploymentEnvironment ?? defEs.deploymentEnvironment,
-    apiBaseUrl: esIn.apiBaseUrl ?? defEs.apiBaseUrl,
-    easyspecsProjectId: esIn.easyspecsProjectId !== void 0 ? esIn.easyspecsProjectId : legacyProjectId !== void 0 ? legacyProjectId : defEs.easyspecsProjectId,
-    defaultGitRemoteUrl: esIn.defaultGitRemoteUrl !== void 0 ? esIn.defaultGitRemoteUrl : defEs.defaultGitRemoteUrl,
-    cliSessionPath: esIn.cliSessionPath !== void 0 ? esIn.cliSessionPath : defEs.cliSessionPath,
-    openCode: { ...defEs.openCode, ...esIn.openCode },
-    analysis: mergeAnalysisBlock(
-      defEs.analysis ?? { promoteContextToWorkspace: true },
-      esIn.analysis
-    ),
-    orchestration: { ...defEs.orchestration, ...esIn.orchestration },
-    openCodeRuntime: mergeOpenCodeRuntime(defEs.openCodeRuntime, esIn.openCodeRuntime),
-    diagnose: mergeDiagnoseBlock(defEs.diagnose, esIn.diagnose),
-    upload: { ...defEs.upload, ...esIn.upload },
-    macro: { ...defEs.macro, ...esIn.macro },
-    ...factoryMerged ? { factory: factoryMerged } : {},
-    ...workstationsMerged ? { workstations: workstationsMerged } : {},
-    ...pipelinesMerged ? { pipelines: pipelinesMerged } : {},
-    cli: { ...defEs.cli, ...esIn.cli },
-    auth: mergeAuthBlock(defEs.auth, esIn.auth)
-  };
-  const easyspecs = {
-    ...mergedEs,
-    analysis: normalizeAnalysisWithFactoryCloud(mergedEs.analysis, mergedEs.factory)
-  };
-  return {
-    schemaVersion: partial.schemaVersion ?? defaults.schemaVersion,
-    easyspecs
-  };
-}
-function mergeDiagnoseBlock(base, over) {
-  if (!over) {
-    return { ...base };
-  }
-  const zBase = base.zeroReference ?? { maxPercentNonReferenced: null };
-  const zOver = over.zeroReference;
-  const cBase = base.coordinationDuplicates ?? { strict: true };
-  const cOver = over.coordinationDuplicates;
-  return {
-    zeroReference: {
-      maxPercentNonReferenced: zOver?.maxPercentNonReferenced !== void 0 ? zOver.maxPercentNonReferenced : zBase.maxPercentNonReferenced ?? null
-    },
-    coordinationDuplicates: {
-      strict: cOver?.strict !== void 0 ? cOver.strict : cBase.strict !== false
-    }
-  };
-}
-function mergeAuthBlock(base, over) {
-  if (!over) {
-    return { ...base };
-  }
-  return {
-    ciLogin: { ...base.ciLogin, ...over.ciLogin }
-  };
-}
-function mergeAnalysisBlock(base, over) {
-  if (!over || Object.keys(over).length === 0) {
-    return { ...base };
-  }
-  const merged = {
-    ...base,
-    ...over
-  };
-  if (base.ace || over.ace) {
-    merged.ace = { ...base.ace, ...over.ace };
-  }
-  return merged;
-}
-function mergeEasyspecsFactoryBlock(base, over) {
-  if (!base && !over) {
-    return void 0;
-  }
-  const b = base ?? {};
-  const o = over ?? {};
-  const updateContext = b.updateContext || o.updateContext ? { ...b.updateContext ?? {}, ...o.updateContext ?? {} } : void 0;
-  const out = {
-    ...b,
-    ...o,
-    backoff: { ...b.backoff ?? {}, ...o.backoff ?? {} },
-    ...updateContext ? { updateContext } : {}
-  };
-  const backoffKeys = Object.keys(out.backoff ?? {});
-  const topKeys = Object.keys(out).filter((k) => k !== "backoff");
-  if (topKeys.length === 0 && backoffKeys.length === 0) {
-    return void 0;
-  }
-  return out;
-}
-function mergeEasyspecsWorkstationsBlock(base, over) {
-  if (!base && !over) {
-    return void 0;
-  }
-  const out = { ...base ?? {}, ...over ?? {} };
-  return Object.keys(out).length > 0 ? out : void 0;
-}
-function mergeEasyspecsPipelinesBlock(base, over) {
-  if (!base && !over) {
-    return void 0;
-  }
-  const b = base ?? {};
-  const o = over ?? {};
-  const out = {
-    ...b,
-    ...o,
-    upload: { ...b.upload ?? {}, ...o.upload ?? {} }
-  };
-  const uploadKeys = Object.keys(out.upload ?? {});
-  const topKeys = Object.keys(out).filter((k) => k !== "upload");
-  if (topKeys.length === 0 && uploadKeys.length === 0) {
-    return void 0;
-  }
-  return out;
-}
-function normalizeAnalysisWithFactoryCloud(analysis, factory) {
-  if (!factory || factory.cloudContextAnalyzed === void 0 && factory.cloudContextAnalyzedAt === void 0) {
-    return analysis;
-  }
-  return mergeAnalysisBlock(analysis, {
-    ...factory.cloudContextAnalyzed !== void 0 ? { cloudContextAnalyzed: factory.cloudContextAnalyzed } : {},
-    ...factory.cloudContextAnalyzedAt !== void 0 ? { cloudContextAnalyzedAt: factory.cloudContextAnalyzedAt } : {}
-  });
-}
-function mergeOpenCodeRuntime(base, over) {
-  if (!over && !base) {
-    return void 0;
-  }
-  const b = base ?? {};
-  const o = over ?? {};
-  return {
-    ...b,
-    ...o,
-    executable: o.executable ?? b.executable,
-    skipCredentialsCheck: o.skipCredentialsCheck ?? b.skipCredentialsCheck,
-    credentialsPath: o.credentialsPath !== void 0 ? o.credentialsPath : b.credentialsPath,
-    providers: { ...b.providers, ...o.providers },
-    run: { ...b.run, ...o.run },
-    coordinationRepairs: { ...b.coordinationRepairs, ...o.coordinationRepairs },
-    pool: { ...b.pool, ...o.pool },
-    projectConfigOverlay: b.projectConfigOverlay || o.projectConfigOverlay ? { ...b.projectConfigOverlay ?? {}, ...o.projectConfigOverlay ?? {} } : void 0
-  };
-}
-function getDefaultEasyspecsConfig() {
-  const openCodeRuntime = {
-    executable: "opencode",
-    skipCredentialsCheck: false,
-    credentialsPath: ".opencode/auth.json",
-    providers: {},
-    run: {
-      argvTemplate: [
-        "run",
-        "--agent",
-        "{agentId}",
-        "Execute the task described in the attached EasySpecs prompt file.",
-        "-f",
-        "{promptFile}"
-      ],
-      timeoutMs: 6e5
-    },
-    coordinationRepairs: {
-      listJsonSchemaRepairAttempts: 1,
-      markdownEvidenceRepairAttempts: 2,
-      markdownOpenQuestionIterations: 5
-    },
-    /** Pool cap defaults in {@link mergeEasyspecsCliSettings} (`?? 30`); omit here so `workstations.maxConcurrentAi` is not overridden by merged `pool`. */
-    pool: {},
-    projectConfigOverlay: {}
-  };
-  return {
-    schemaVersion: 2,
-    easyspecs: {
-      deploymentEnvironment: "production",
-      apiBaseUrl: PRODUCTION_SYSTEM_MANAGER_URL,
-      easyspecsProjectId: "",
-      defaultGitRemoteUrl: "",
-      cliSessionPath: "",
-      openCode: {
-        executable: "opencode",
-        skipCredentialsCheck: false
-      },
-      analysis: {
-        promoteContextToWorkspace: true,
-        cloudContextAnalyzed: false,
-        cloudContextAnalyzedAt: null
-      },
-      orchestration: {},
-      openCodeRuntime,
-      diagnose: {
-        zeroReference: { maxPercentNonReferenced: null },
-        coordinationDuplicates: { strict: true }
-      },
-      upload: {
-        contextDirectory: "",
-        fetchContextAnalyzedInCloud: true
-      },
-      macro: { debug: false },
-      cli: { bundledResourcesRoot: "" },
-      auth: { ciLogin: {} }
-    }
-  };
-}
-
 // src/config/validateEasyspecsConfigSrs46.ts
 var fs5 = __toESM(require("node:fs"));
 var path6 = __toESM(require("node:path"));
@@ -13847,6 +13851,7 @@ var path21 = __toESM(require("path"));
 
 // src/opencodeCli.ts
 var import_child_process = require("child_process");
+var import_node_events = require("node:events");
 
 // src/analysis/openCodeSessionStewardship.ts
 var TITLE_MAX_LEN = 80;
@@ -13971,6 +13976,7 @@ function logOpenCodeSessionFollowUpStart(diagnosticLog, p) {
 }
 
 // src/opencodeCli.ts
+var SHARED_OPEN_CODE_ABORT_LISTENER_BUDGET = 512;
 var USE_SHELL = process.platform === "win32";
 function resolveExecutable(executable) {
   const t = executable?.trim();
@@ -14171,6 +14177,9 @@ ${truncateForDiag(outBody, DIAG_STDOUT_MAX)}`);
       }
     };
     if (sig) {
+      if ((0, import_node_events.getMaxListeners)(sig) < SHARED_OPEN_CODE_ABORT_LISTENER_BUDGET) {
+        (0, import_node_events.setMaxListeners)(SHARED_OPEN_CODE_ABORT_LISTENER_BUDGET, sig);
+      }
       onAbort = () => {
         child.kill("SIGTERM");
         settle(
@@ -19940,7 +19949,7 @@ function slugOrFallback3(row2) {
 }
 function clampConcurrency(n) {
   if (!Number.isFinite(n)) {
-    return 30;
+    return DEFAULT_MAX_CONCURRENT_AI;
   }
   return Math.min(64, Math.max(1, Math.floor(n)));
 }
@@ -20563,11 +20572,13 @@ async function drainWorkstationPool(p) {
     void persist();
     pump();
   };
+  let poolAbortListenerRegistered = false;
   if (abortSignal) {
     if (abortSignal.aborted) {
       onPipelineAbort();
     } else {
-      abortSignal.addEventListener("abort", onPipelineAbort, { once: true });
+      abortSignal.addEventListener("abort", onPipelineAbort);
+      poolAbortListenerRegistered = true;
     }
   }
   const runOne = async (id) => {
@@ -20639,29 +20650,35 @@ async function drainWorkstationPool(p) {
     await p.onItemComplete?.(id);
     pump();
   };
-  while (true) {
-    while (fifo.length > 0 && active < maxC && !abortSignal?.aborted) {
-      const id = fifo.shift();
-      const it = byId.get(id);
-      if (!it || it.status !== "pending" || !parentsDone(it, byId)) {
-        continue;
+  try {
+    while (true) {
+      while (fifo.length > 0 && active < maxC && !abortSignal?.aborted) {
+        const id = fifo.shift();
+        const it = byId.get(id);
+        if (!it || it.status !== "pending" || !parentsDone(it, byId)) {
+          continue;
+        }
+        active += 1;
+        void runOne(id);
       }
-      active += 1;
-      void runOne(id);
-    }
-    const pendingOrRunning = active > 0 || [...byId.values()].some((v) => v.status === "pending") || fifo.length > 0;
-    if (!pendingOrRunning) {
-      break;
-    }
-    if (abortSignal?.aborted) {
-      if (active === 0) {
+      const pendingOrRunning = active > 0 || [...byId.values()].some((v) => v.status === "pending") || fifo.length > 0;
+      if (!pendingOrRunning) {
         break;
       }
-      await waitTurn();
-      continue;
+      if (abortSignal?.aborted) {
+        if (active === 0) {
+          break;
+        }
+        await waitTurn();
+        continue;
+      }
+      if (fifo.length === 0 || active >= maxC) {
+        await waitTurn();
+      }
     }
-    if (fifo.length === 0 || active >= maxC) {
-      await waitTurn();
+  } finally {
+    if (poolAbortListenerRegistered && abortSignal) {
+      abortSignal.removeEventListener("abort", onPipelineAbort);
     }
   }
   return { cancelled: abortSignal?.aborted === true, skippedWorkItemIds };
@@ -27045,7 +27062,7 @@ function listPendingAceTraceFiles(contextDir2, worktreeRoot) {
 var path58 = __toESM(require("path"));
 function clampConcurrency2(n) {
   if (!Number.isFinite(n)) {
-    return 30;
+    return DEFAULT_MAX_CONCURRENT_AI;
   }
   return Math.min(64, Math.max(1, Math.floor(n)));
 }
@@ -27070,11 +27087,13 @@ async function runAceAutoLearnPool(p) {
     fifo.length = 0;
     pump();
   };
+  let poolAbortListenerRegistered = false;
   if (abortSignal) {
     if (abortSignal.aborted) {
       onPipelineAbort();
     } else {
-      abortSignal.addEventListener("abort", onPipelineAbort, { once: true });
+      abortSignal.addEventListener("abort", onPipelineAbort);
+      poolAbortListenerRegistered = true;
     }
   }
   const traceRel = (abs) => path58.relative(contextDir2, abs).split(path58.sep).join("/");
@@ -27099,25 +27118,31 @@ async function runAceAutoLearnPool(p) {
     p.log?.(`[ace] ace auto-learn: finished ${rel} ok=${r.ok}`);
     pump();
   };
-  while (true) {
-    while (fifo.length > 0 && active < maxC && !abortSignal?.aborted) {
-      const traceAbs = fifo.shift();
-      active += 1;
-      void runOne(traceAbs);
-    }
-    const pendingOrRunning = active > 0 || fifo.length > 0;
-    if (!pendingOrRunning) {
-      break;
-    }
-    if (abortSignal?.aborted) {
-      if (active === 0) {
+  try {
+    while (true) {
+      while (fifo.length > 0 && active < maxC && !abortSignal?.aborted) {
+        const traceAbs = fifo.shift();
+        active += 1;
+        void runOne(traceAbs);
+      }
+      const pendingOrRunning = active > 0 || fifo.length > 0;
+      if (!pendingOrRunning) {
         break;
       }
-      await waitTurn();
-      continue;
+      if (abortSignal?.aborted) {
+        if (active === 0) {
+          break;
+        }
+        await waitTurn();
+        continue;
+      }
+      if (fifo.length === 0 || active >= maxC) {
+        await waitTurn();
+      }
     }
-    if (fifo.length === 0 || active >= maxC) {
-      await waitTurn();
+  } finally {
+    if (poolAbortListenerRegistered && abortSignal) {
+      abortSignal.removeEventListener("abort", onPipelineAbort);
     }
   }
   return { cancelled: abortSignal?.aborted === true, completed, failed };
@@ -27586,7 +27611,7 @@ function formatCliStderrLine(line, useAnsi) {
 }
 
 // src/cli/main.ts
-var PKG_VERSION = "0.0.22";
+var PKG_VERSION = "0.0.24";
 function isNonEmptyFactoryFailureArray(x) {
   if (!Array.isArray(x) || x.length === 0) {
     return false;