@on-par/factory-cli 0.9.17-next.1 → 0.9.17-next.11

package/dist/cli/index.js

@@ -8,11 +8,11 @@ import { basename, dirname, isAbsolute, join, relative, resolve } from 'node:pat
 import { promisify, styleText } from 'node:util';
 import { LaneEnvironmentPauseError } from './lane-environment-pause-error.js';
 import { INVALID_BRANCH_PREFIX_MESSAGE, resolveBranchPrefixOption } from './branch-prefix.js';
-import { sweepLaneClaims, warnQueueDiagnostics } from './queue-startup.js';
+import { startupSweeps, warnQueueDiagnostics } from './queue-startup.js';
 import { proposeTriageQueue } from './triage-open-prs.js';
 import { makeQueuePreflightOps, preflightQueuedIssue, } from './queue-preflight.js';
 import { acquirePortLease, aggregateCosts, appendKpiHistoryLine, applyRepoConfig, buildPhase, checkPhase, clearProxyState, computeHealthKpis, ConstitutionLoader, createDefaultWorkSourceRegistry, createLogger, createLaneProxy, defaultFindPortListeners, describeEffectiveConfig, detectPostMergeDefects, diagnoseModels, probeDeclaredHarnesses, estimateTrailingSpend, fetchDefectSources, 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, resolveSkipCI, resolveTimeouts, resolveUsageCap, resolveWatchdogPolicy, runAutoIngest, shipPhase, formatCostTotal, validateQueue, watchUsage, writeLocalRunReport, writeProxyState, } from '@on-par/factory-core';
-import { acquirePidFile, createCheckResumeStore, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, readRepoConfigFile, rewriteRepoConfigFile, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, fetchHumanEventSourcesCached, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, listStatelessLaneIssues, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapCleanShipWorktree, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, resolveExperimental, resolveLocalOnly, describeDraftPrPolicy, resolveDraftPrPolicy, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, parseTriageCandidates, recordLocalAuthFailure, laneSlug, formatStopMarker, readStopMarker, } from '@on-par/factory-core/internal';
+import { acquirePidFile, createCheckResumeStore, DEFAULT_GARDEN_MAX_CLUSTERS, DEFAULT_GARDEN_SINCE, capGardenClusters, clusterGarden, dedupGardenClusters, filterGardenOnlyNew, filterGardenWindow, markGardenTrackingUnknown, parseGardenDuration, readHarvestEvents, renderGardenJson, renderGardenReport, laneWorktreePath, migrateRepoConfigToYaml, readRepoConfigFile, rewriteRepoConfigFile, REPO_CONFIG_YAML_HEADER, claudeConfigDirOverride, claudeKeychainService, cleanupWorktree, createDaemonLogSink, factoryBranchIssue, factoryBranchPrefixes, createFactorydServer, createRunRuntime, createShipExecutor, createGithubQueue, createLocalSmallDryRun, createOctokitFilingClient, createOctokitGreenPrClient, createOctokitQueueClient, daemonRuntimePaths, defaultRegistryPath, ensureDir, fetchHumanEventSourcesCached, FACTORY_RUNTIME_CONFIG_KEYS, findUnmergedGreenPrs, listStatelessLaneIssues, formatGcReport, gitFetch, listMicroVms, listOrphanContainers, logCost, logEvent, planQueueMigration, pollBlockedParks, readCosts, readGithubQueueSnapshot, reapCleanShipWorktree, reapLaneWorktree, reapOrphanContainers, reapOrphanMicroVm, releaseRuntimeFiles, releaseStaleClaims, resolveBranchPrefix, resolveEffectiveConfig, resolveExperimental, resolveLocalOnly, describeDraftPrPolicy, resolveDraftPrPolicy, resolvePrClassifierPolicy, resolveReviewFloorRules, RunLockHeldError, runOvernightQueue, parseRemoteSlug, setupWorktree, shellEscape, listBuiltInCheckers, sweepWorktrees, watchChecks, withFileLock, withGitLock, withRunLock, writePortFile, buildTriagePrompt, parseTriageCandidates, laneSlug, formatStopMarker, readStopMarker, detectClaudePlan, } from '@on-par/factory-core/internal';
 import { formatSteerabilityReport } from '@on-par/factory-core/internal';
 import { runTui } from '@on-par/factory-tui';
 import { clearSelfUpdateStop } from './self-update-stop.js';
@@ -42,7 +42,7 @@ import { buildRunsJson, parseRunsLimit } from './runs.js';
 import { buildRunDiffstatJson, NoRunError, parseDiffstatIssue } from './runs-diffstat.js';
 import { formatUpdateStartupLine, initialUpdateState, readUpdateState, updateStatePath, writeUpdateState, } from './update-state.js';
 import { buildStopResumeJson } from './stop-resume-json.js';
-import { buildUsageJson } from './usage-json.js';
+import { collectUsageJson } from './usage-json.js';
 import { parseResetIssues, runReset } from './reset.js';
 import { cmdDaemonLogs, cmdDaemonStart, cmdDaemonStatus, cmdDaemonStop, createAutoUpdateDeps, DaemonCtlError, detectInstall, loadDaemonFileConfig, recoverStaleDrain, resolveFactorydConfig, runAutoUpdateLoop, } from './daemon.js';
 import { checkForUpdate, cmdSelfUpdateCheck } from './self-update.js';
@@ -56,12 +56,12 @@ import { cmdRisk } from './risk.js';
 import { buildFeedbackDeps, resolveFeedbackRepo, runFeedback } from './feedback.js';
 import { ensureFactoryExcluded, writeSampleQueue } from './init-files.js';
 import { detectChecksForInit } from './detect-checks.js';
-import { newRepoRouter } from './repo-router.js';
+import { applyRouterGuards, newRepoRouter } from './repo-router.js';
 import { cmdLogs } from './logs.js';
 import { mergeScopeNotice } from './merge-scope.js';
 import { selectOctokit } from './github-stub.js';
 import { createFactoryOctokit } from './octokit.js';
-import { DeepCheckError, createDeepModelRunner, runIssueCheck } from './ready-check.js';
+import { checkErrorExit, checkReportExit, createDeepModelRunner, runIssueCheck } from './ready-check.js';
 import { childRunSucceeded, formatChildRunSummary, runChildrenInOrder } from './run-children.js';
 import { readRunFlagOverrides, recordDraftPrFlag } from './run-flags.js';
 import { runStalenessGuard } from './staleness.js';
@@ -175,6 +175,7 @@ const DEFAULT_CORE_OPS = {
     formatUsageReport,
     watchUsage,
     fetchSubscriptionUsage,
+    detectClaudePlan,
     diagnoseModels,
     probeDeclaredHarnesses,
     writeLocalRunReport,
@@ -194,6 +195,7 @@ function resolveCoreOps(overrides, base = coreOps) {
         formatUsageReport: overrides.formatUsageReport ?? base.formatUsageReport,
         watchUsage: overrides.watchUsage ?? base.watchUsage,
         fetchSubscriptionUsage: overrides.fetchSubscriptionUsage ?? base.fetchSubscriptionUsage,
+        detectClaudePlan: overrides.detectClaudePlan ?? base.detectClaudePlan,
         diagnoseModels: overrides.diagnoseModels ?? base.diagnoseModels,
         probeDeclaredHarnesses: overrides.probeDeclaredHarnesses ?? base.probeDeclaredHarnesses,
         writeLocalRunReport: overrides.writeLocalRunReport ?? base.writeLocalRunReport,
@@ -979,20 +981,19 @@ async function cmdCost(opts = {}) {
 }
 async function cmdCheck(issueRaw, opts) {
     const issueNum = parseIssueArg(issueRaw);
-    const ghRepo = await getGitHubRepo();
-    const [owner, repoName] = ghRepo.split('/');
-    let runModel;
-    if (opts.deep) {
-        const repoRoot = await getRepoRoot();
-        runModel = createDeepModelRunner(newRepoRouter(repoRoot, configLoaders, coreOps.ModelRouter), repoRoot);
-    }
+    const [owner, repoName] = (await getGitHubRepo()).split('/');
+    const repoRoot = await getRepoRoot();
+    const runModel = opts.judge !== false || opts.deep
+        ? createDeepModelRunner(newRepoRouter(repoRoot, configLoaders, coreOps.ModelRouter), repoRoot)
+        : undefined;
     let report;
     try {
         report = await runIssueCheck(issueNum, opts, {
             runModel,
+            readinessCacheDir: getFactoryPaths(repoRoot).readinessCache,
             getIssue: async (n) => {
                 const { data } = await getOctokit().rest.issues.get({ owner, repo: repoName, issue_number: n });
-                return { title: data.title, body: data.body ?? null };
+                return { title: data.title, body: data.body ?? null, labels: data.labels };
             },
             getIssueState: async (n) => {
                 const { data } = await getOctokit().rest.issues.get({ owner, repo: repoName, issue_number: n });
@@ -1002,16 +1003,14 @@ async function cmdCheck(issueRaw, opts) {
         });
     }
     catch (err) {
-        if (err instanceof DeepCheckError)
-            throw new CliExitError(`factory: --deep failed — ${err.message}`, 2);
+        const exit = checkErrorExit(err);
+        if (exit)
+            throw new CliExitError(exit.message, exit.code);
         throw err;
     }
-    if (report.exitCode === 1) {
-        throw new CliExitError(`factory: issue #${issueNum} is not factory-ready — ${report.reasons.join('; ')}`, 1);
-    }
-    if (report.exitCode === 3) {
-        throw new CliExitError(`factory: issue #${issueNum} would split — ${report.size.reason}`, 3);
-    }
+    const exit = checkReportExit(report);
+    if (exit)
+        throw new CliExitError(exit.message, exit.code);
 }
 async function currentCommitSha() {
     try {
@@ -1111,7 +1110,7 @@ async function cmdClassifierBacktestEntry(opts) {
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(applyRepoConfig(configLoaders.loadModelsConfig(), repoConfig), configLoaders.loadRoutesConfig(), false, undefined, effective.allowExperimental, effective.localOnly);
     router.setCodexFullAccessTasks?.(configLoaders.loadFactoryConfigForRepo(paths.config).sandbox.codexFullAccessTasks);
-    router.setLocalAuthSink?.(recordLocalAuthFailure);
+    applyRouterGuards(router);
     try {
         await cmdClassifierBacktest({ ...opts, branchPrefix }, {
             repoRoot,
@@ -1202,7 +1201,7 @@ async function cmdKpis(opts = {}) {
     const branchPrefix = branchPrefixOrExit(opts.branchPrefix);
     const repoRoot = await getRepoRoot();
     const paths = getFactoryPaths(repoRoot);
-    const events = existsSync(paths.events) ? readEvents(paths.events) : [];
+    const events = readEvents(paths.events, { includeSegments: true });
     const costs = existsSync(paths.costs) ? internalOps.readCosts(paths.costs) : [];
     const recon = await reconstructHumanEventsForKpis(events, branchPrefix);
     let allEvents = recon.events;
@@ -1289,16 +1288,7 @@ export async function cmdUsage(deps = {}, opts = {}) {
         throw new CliExitError(`factory: ${err.message}`, 2);
     }
     if (opts.json) {
-        const subscription = await ops.fetchSubscriptionUsage();
-        let estimate;
-        try {
-            const spend = ops.estimateTrailingSpend();
-            estimate = Number.isFinite(spend) ? spend : null;
-        }
-        catch {
-            estimate = null;
-        }
-        console.log(JSON.stringify(buildUsageJson(subscription, estimate, knobs.cap)));
+        console.log(JSON.stringify(await collectUsageJson(ops, knobs.cap)));
         return;
     }
     const subscriptionPromise = ops.fetchSubscriptionUsage();
@@ -1371,7 +1361,7 @@ async function cmdTui(opts = {}, runTuiImpl = runTui) {
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(modelsConfig, routesConfig, false, undefined, effective.allowExperimental, effective.localOnly);
     router.setCodexFullAccessTasks?.(configLoaders.loadFactoryConfigForRepo(paths.config).sandbox.codexFullAccessTasks);
-    router.setLocalAuthSink?.(recordLocalAuthFailure);
+    applyRouterGuards(router);
     const effectiveConfigLines = describeEffectiveConfig({
         router,
         repo: repoConfig,
@@ -1505,7 +1495,7 @@ export function resolveEnvironmentAcquirer(opts) {
         };
     };
 }
-const sweepStaleLaneClaims = (paths, ghRepo) => sweepLaneClaims(paths, ghRepo, () => (hasGitHubToken() ? getOctokit() : undefined));
+const { sweepStaleLaneClaims, sweepOrphanDrafts } = startupSweeps(() => (hasGitHubToken() ? getOctokit() : undefined));
 /** The autoGcOnRun-gated worktree sweep every pipeline entry point runs before shipping
  *  (`factory run`, and since #1756 the one-shot `factory ship` / `factory run-issue`). Never
  *  throws — a GC failure is a warn, never a reason to abort the command. */
@@ -2085,7 +2075,7 @@ async function cmdTriage(opts) {
     const effective = resolveEffectiveConfig(repoConfig);
     const router = new coreOps.ModelRouter(modelsConfig, routesConfig, false, undefined, effective.allowExperimental, effective.localOnly);
     router.setCodexFullAccessTasks?.(configLoaders.loadFactoryConfigForRepo(paths.config).sandbox.codexFullAccessTasks);
-    router.setLocalAuthSink?.(recordLocalAuthFailure);
+    applyRouterGuards(router);
     router.skipMissingHarnessClis(coreOps.isCommandAvailable);
     router.setCostSink((entry) => logCost(paths.costs, { ...entry, issue: '-' }));
     let plannerError;
@@ -3090,6 +3080,7 @@ function runRun(opts = {}) {
         withRepoRunLock,
         runAutoWorktreeGc,
         sweepStaleLaneClaims,
+        sweepOrphanDrafts,
         planRunLanes,
         preflightQueuedIssue,
         createQueuePreflightOps,