@on-par/factory-cli 0.9.7-next.8 → 0.9.7

package/dist/cli/index.js

@@ -8,7 +8,7 @@ import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:pat
 import { promisify, styleText } from 'node:util';
 import { INVALID_BRANCH_PREFIX_MESSAGE, resolveBranchPrefixOption } from './branch-prefix.js';
 import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, estimateTrailingSpend, fetchDefectSources, fetchHumanEventSources, fetchSubscriptionUsage, formatUsageReport, getConstitutionsDir, getFactoryPaths, GITHUB_ISSUE_SOURCE, hasUnresolvedPark, InvalidArtifactsDirError, InvalidWorkRequestInputError, InvalidWorkspaceError, isCommandAvailable, isProxyRunning, kpiBranchPrefixes, kpisToHistoryRecord, laneBaseUrl, laneEnv, laneHostLabel, loadFactoryConfigForRepo, loadModelsConfig, loadRepoConfig, loadRoutesConfig, LOCAL_BRIEF_SOURCE, joinClassifierOutcomes, mergeClassifierOutcomes, parseClassifierOutcomes, summarizeClassifierOutcomes, formatClassifierReport, mergedPrRefs, ModelRegistry, ModelRouter, parkReasonFor, parseKpiHistory, parseQueue, planPhase, readEvents, readPortLeases, readQueue, readUsage, reapOrphanProcesses, reconstructKpiEvents, recordLeasePgid, releasePortLease, renderKpiReport, renderKpiTrend, resolveDefectWindowDays, parseSizeGateMode, parseMaxSlices, SIZE_GATE_MODES, resolveEffectiveModelPins, resolveEnvironmentProxy, resolveArtifactsDir, resolveLocalOnlyPolicy, resolveMergePolicy, resolveSandboxPolicy, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, writeProxyState, } from '@on-par/factory-core';
-import { acquirePidFile, createCheckResumeStore, findSlicePlanComment, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, readCosts, readGithubQueueSnapshot, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, worktreeSandboxFor, resolveExperimental, resolveLocalOnly, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, normalizeTriageQueue, parseTriageCandidates, recordLocalAuthFailure, } from '@on-par/factory-core/internal';
+import { acquirePidFile, createCheckResumeStore, findSlicePlanComment, upsertSlicePlanComment, withSliceState, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, worktreeSandboxFor, resolveExperimental, resolveLocalOnly, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, normalizeTriageQueue, parseTriageCandidates, recordLocalAuthFailure, } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
 import { admissionStateReaderFor, runQueueReconcile } from './admission.js';
 import { cmdClassifierBacktest, ClassifierBacktestInputError, } from './classifier-backtest.js';
@@ -25,7 +25,7 @@ import { buildProgram } from './program.js';
 import { buildCostJson } from './cost-json.js';
 import { buildQueueAddJson } from './queue-add-json.js';
 import { buildQueueListJson } from './queue-list.js';
-import { runUnpark, UnparkError } from './unpark.js';
+import { appendUnparkEvent, runUnpark, UnparkError } from './unpark.js';
 import { buildRunsJson, parseRunsLimit } from './runs.js';
 import { buildRunDiffstatJson, NoRunError, parseDiffstatIssue } from './runs-diffstat.js';
 import { formatUpdateStartupLine, initialUpdateState, readUpdateState, updateStatePath, writeUpdateState, } from './update-state.js';
@@ -97,6 +97,7 @@ const DEFAULT_INTERNAL_OPS = {
     readCosts,
     sweepWorktrees,
     releaseStaleClaims,
+    pollBlockedParks,
     findUnmergedGreenPrs,
     listOrphanContainers,
     reapOrphanContainers,
@@ -114,6 +115,7 @@ function resolveInternalOps(overrides, base = internalOps) {
         readCosts: overrides.readCosts ?? base.readCosts,
         sweepWorktrees: overrides.sweepWorktrees ?? base.sweepWorktrees,
         releaseStaleClaims: overrides.releaseStaleClaims ?? base.releaseStaleClaims,
+        pollBlockedParks: overrides.pollBlockedParks ?? base.pollBlockedParks,
         findUnmergedGreenPrs: overrides.findUnmergedGreenPrs ?? base.findUnmergedGreenPrs,
         listOrphanContainers: overrides.listOrphanContainers ?? base.listOrphanContainers,
         reapOrphanContainers: overrides.reapOrphanContainers ?? base.reapOrphanContainers,
@@ -554,13 +556,13 @@ export class CliExitError extends Error {
         this.name = 'CliExitError';
     }
 }
-/** Parse a CLI <issue> argument. Throws CliExitError(2) before any git/GitHub work runs. */
+/** Parse a CLI <issue> argument; rejects unsafe integers (#2836), also used by reset. Throws CliExitError(2) before any git/GitHub work runs. */
 export function parseIssueArg(raw) {
-    const trimmed = raw.trim();
-    if (!/^\d+$/.test(trimmed) || Number(trimmed) < 1) {
+    const n = /^\d+$/.test(raw.trim()) ? Number(raw) : NaN;
+    if (!Number.isSafeInteger(n) || n < 1) {
         throw new CliExitError(`factory: invalid issue argument '${raw}' — expected a positive integer issue number`, 2);
     }
-    return Number(trimmed);
+    return n;
 }
 /** Run `factory feedback` and print the filed issue; validation errors become exit-2 CliExitErrors. */
 export async function runFeedbackCommand(prUrl, opts, deps, log = console.log) {
@@ -1898,7 +1900,7 @@ export async function cmdWorktreeGc(opts) {
 export async function cmdReset(issues, opts) {
     let nums;
     try {
-        nums = parseResetIssues(issues);
+        nums = parseResetIssues(issues.map((raw) => String(parseIssueArg(raw))));
     }
     catch (err) {
         throw new CliExitError(err.message, 2);
@@ -2147,16 +2149,6 @@ async function recordQueueAdded(lane, results) {
         console.error(styleText('yellow', `factory: queue add event not recorded — ${errorDetail(err)}`));
     }
 }
-/** Append one `issue_unparked` event; the silent sink keeps stdout untouched. */
-async function recordIssueUnparked(result) {
-    try {
-        const eventsFile = getFactoryPaths(await getRepoRoot()).events;
-        createLogger(eventsFile, { lane: result.lane, issue: result.issue }, { out: { write: () => true } }).info('issue_unparked', `#${result.issue} unparked → ${result.lane} (order ${result.order})`);
-    }
-    catch (err) {
-        console.error(styleText('yellow', `factory: unpark event not recorded — ${errorDetail(err)}`));
-    }
-}
 export async function cmdUnpark(issueArg, opts = {}) {
     const issue = parseIssueArg(issueArg);
     let result;
@@ -2174,7 +2166,12 @@ export async function cmdUnpark(issueArg, opts = {}) {
         const code = err instanceof UnparkError ? err.code : 'unpark-failed';
         throw new CliExitError(`factory: unpark #${issue} [${code}] — ${errorDetail(err)}`, 1);
     }
-    await recordIssueUnparked(result);
+    try {
+        appendUnparkEvent(result, getFactoryPaths(await getRepoRoot()).events);
+    }
+    catch (err) {
+        console.error(styleText('yellow', `factory: unpark event not recorded — ${errorDetail(err)}`));
+    }
     if (opts.json) {
         console.log(JSON.stringify(result));
         return;