@on-par/factory-cli 0.9.0 → 0.9.2

package/README.md

@@ -1,21 +1,38 @@
 # @on-par/factory-cli
 
-The `factory` command: ships verified GitHub issues via boss-worker-checker orchestration.
+The `factory` command for On PAR Dev's Software Factory.
 
-Part of [Software Factory](https://github.com/on-par/software-factory), a multi-agent factory that ships verified work autonomously. Most users want the CLI, [`@on-par/factory-cli`](https://www.npmjs.com/package/@on-par/factory-cli); the other packages are its building blocks.
+On PAR Dev's Software Factory is a local CLI that takes a GitHub issue through plan, build and check with AI agents, then opens a ready-for-review PR. You decide what merges.
+
+Built in TypeScript. Routes work across Claude and Codex, with experimental local models through Ollama, and logs cost per task.
+
+![On PAR Dev's Software Factory running a Sound Buddy lane (sped up)](https://raw.githubusercontent.com/on-par/software-factory/main/docs/assets/factory-run.gif)
 
 ## Install
 
 ```bash
 npm install -g @on-par/factory-cli
-factory --help
+factory --version
+factory doctor
+```
+
+Requires Node.js >= 24, `git`, Claude Code (`claude`) installed and signed in, and the GitHub CLI signed in with `gh auth login`. The factory reads `GITHUB_TOKEN`, then `GH_TOKEN`, and falls back to `gh auth token`. `factory doctor` checks all of this and prints a fix for anything missing.
+
+## Safety
+
+Agents run with their permission prompts off (Claude Code with `--permission-mode bypassPermissions`, Codex with `approval_policy=never`) in a separate git worktree, with your permissions and your GitHub token. Only point the factory at repos and issues you trust. It never merges by default: `factory run` and `factory supervise` merge only if you turn auto-merge on (`FACTORY_MERGE=1`, `run.merge.auto: true`, or `--auto-merge`), and `factory land` merges when you run it. Details are in the [Safety section](https://github.com/on-par/software-factory#safety) and [SECURITY.md](https://github.com/on-par/software-factory/blob/main/SECURITY.md).
+
+## Updating
+
+```bash
+npm install -g @on-par/factory-cli@latest
 ```
 
-Requires Node.js >= 24, `git`, and an authenticated GitHub CLI (`gh`). See the [Quick Start](https://github.com/on-par/software-factory#quick-start-5-minutes) for model CLIs and first-run setup.
+Automatic updates are planned: [#2354](https://github.com/on-par/software-factory/issues/2354), [#2355](https://github.com/on-par/software-factory/issues/2355).
 
 ## Documentation
 
-- [README and Quick Start](https://github.com/on-par/software-factory#readme)
+- [README and quick start](https://github.com/on-par/software-factory#readme)
 - [Architecture and package graph](https://github.com/on-par/software-factory/blob/main/docs/architecture.md)
 - [Changelog](https://github.com/on-par/software-factory/blob/main/CHANGELOG.md)
 

package/dist/cli/base-hold.d.ts

@@ -0,0 +1,63 @@
+/** A base SHA found broken by an environment pause (ADR-0141). */
+export interface BaseHold {
+    /** `owner/name` of the repo the hold applies to. */
+    repo: string;
+    baseSha: string;
+    failingChecks: string[];
+    /** ISO-8601 time the hold was recorded. */
+    since: string;
+}
+export declare function writeBaseHold(file: string, hold: BaseHold): void;
+/** Fails soft: a missing, unreadable, non-JSON, non-object or wrongly-typed file is no hold (null). */
+export declare function readBaseHold(file: string): BaseHold | null;
+export declare function deleteBaseHold(file: string): void;
+/** Why a hold ended (#2350). */
+export type BaseHoldClearReason = 'sha-changed' | 'ci-green';
+export interface BaseHoldCleared {
+    hold: BaseHold;
+    reason: BaseHoldClearReason;
+    /** origin/main SHA seen on the clearing poll. */
+    currentSha: string;
+}
+/** Deletes the hold only if it is still on `baseSha`; true only when this call deleted it. Fully
+ *  synchronous, so concurrent lanes in one process cannot both get true. */
+export declare function clearBaseHold(file: string, baseSha: string): boolean;
+export declare function formatBaseHoldCleared(c: BaseHoldCleared): string;
+/** `factory status` lines for an active hold (#2351). */
+export declare function formatBaseHoldStatus(hold: BaseHold): string[];
+export type BaseHoldDecision = {
+    kind: 'claim';
+} | {
+    kind: 'hold';
+    hold: BaseHold;
+};
+export interface BaseHoldGateDeps {
+    /** Current origin/main SHA; null (or a throw) means unknown. */
+    currentBaseSha: () => Promise<string | null>;
+    /** True only when main's CI on `sha` is green. */
+    baseCiGreen: (sha: string) => Promise<boolean>;
+    /** Called once, only by the poll that actually deleted the hold. A throw is swallowed. */
+    onCleared?: (cleared: BaseHoldCleared) => void;
+}
+/** Decides whether a lane may claim: hold only while origin/main is still at the held SHA and
+ *  its CI is not green. Unknown origin/main fails open; a failed CI lookup counts as not green.
+ *  Clears the hold when origin/main moved or its CI is green (#2350). */
+export declare function evaluateBaseHold(file: string, repo: string, deps: BaseHoldGateDeps): Promise<BaseHoldDecision>;
+/** Green = at least one check run, all completed, all on the ADR-0014 passing allow-list. */
+export declare function isGreenCheckRunSet(runs: ReadonlyArray<{
+    status: string | null;
+    conclusion: string | null;
+}>): boolean;
+/** SHA from the first line of `git ls-remote` output, or null when absent or malformed. */
+export declare function parseLsRemoteSha(stdout: string): string | null;
+export declare function createBaseHoldGate(opts: {
+    file: string;
+    repo: string;
+    git: (cmd: string) => Promise<string>;
+    listCheckRuns: (ref: string) => Promise<Array<{
+        status: string | null;
+        conclusion: string | null;
+    }>>;
+    onCleared?: (cleared: BaseHoldCleared) => void;
+}): () => Promise<BaseHoldDecision>;
+//# sourceMappingURL=base-hold.d.ts.map

package/dist/cli/base-hold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-hold.d.ts","sourceRoot":"","sources":["../../src/cli/base-hold.ts"],"names":[],"mappings":"AAWA,kEAAkE;AAClE,MAAM,WAAW,QAAQ;IACvB,oDAAoD;IACpD,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,2CAA2C;IAC3C,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI,CAShE;AAED,uGAAuG;AACvG,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CAa1D;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAEjD;AAED,gCAAgC;AAChC,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,UAAU,CAAC;AAE7D,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,mBAAmB,CAAC;IAC5B,iDAAiD;IACjD,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;4EAC4E;AAC5E,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAKpE;AAED,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,CAMhE;AAED,yDAAyD;AACzD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CAG7D;AAED,MAAM,MAAM,gBAAgB,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,QAAQ,CAAA;CAAE,CAAC;AAEpF,MAAM,WAAW,gBAAgB;IAC/B,gEAAgE;IAChE,cAAc,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC7C,kDAAkD;IAClD,WAAW,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/C,0FAA0F;IAC1F,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;CAChD;AAED;;yEAEyE;AACzE,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA+BpH;AAED,6FAA6F;AAC7F,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,CAAC;IAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,CAAC,GAAG,OAAO,CAErH;AAED,2FAA2F;AAC3F,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI9D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE;IACvC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACtC,aAAa,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,KAAK,CAAC;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC,CAAC,CAAC;IACrG,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,eAAe,KAAK,IAAI,CAAC;CAChD,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAOlC"}

package/dist/cli/base-hold.js

@@ -0,0 +1,122 @@
+// packages/cli/src/cli/base-hold.ts — base hold persisted when a lane pauses on a broken
+// base SHA (#2348), so a restarted supervisor remembers the pause. #2349 reads it back as the
+// claim gate: no claiming while origin/main is still at the held SHA and its CI is not green.
+// #2350 clears the hold once origin/main moves or its CI goes green. #2351 reads it for
+// `factory status`.
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
+import { dirname } from 'node:path';
+import { isPassingConclusion } from '@on-par/factory-core/internal';
+export function writeBaseHold(file, hold) {
+    mkdirSync(dirname(file), { recursive: true });
+    const record = {
+        repo: hold.repo,
+        baseSha: hold.baseSha,
+        failingChecks: [...hold.failingChecks],
+        since: hold.since,
+    };
+    writeFileSync(file, `${JSON.stringify(record, null, 2)}\n`);
+}
+/** Fails soft: a missing, unreadable, non-JSON, non-object or wrongly-typed file is no hold (null). */
+export function readBaseHold(file) {
+    if (!existsSync(file))
+        return null;
+    let raw;
+    try {
+        raw = JSON.parse(readFileSync(file, 'utf-8'));
+    }
+    catch {
+        return null;
+    }
+    if (typeof raw !== 'object' || raw === null || Array.isArray(raw))
+        return null;
+    const { repo, baseSha, failingChecks, since } = raw;
+    if (typeof repo !== 'string' || typeof baseSha !== 'string' || typeof since !== 'string')
+        return null;
+    if (!Array.isArray(failingChecks) || !failingChecks.every((c) => typeof c === 'string'))
+        return null;
+    return { repo, baseSha, failingChecks: [...failingChecks], since };
+}
+export function deleteBaseHold(file) {
+    rmSync(file, { force: true });
+}
+/** Deletes the hold only if it is still on `baseSha`; true only when this call deleted it. Fully
+ *  synchronous, so concurrent lanes in one process cannot both get true. */
+export function clearBaseHold(file, baseSha) {
+    const current = readBaseHold(file);
+    if (current === null || current.baseSha !== baseSha)
+        return false;
+    deleteBaseHold(file);
+    return true;
+}
+export function formatBaseHoldCleared(c) {
+    const held = c.hold.baseSha.slice(0, 8);
+    const now = c.currentSha.slice(0, 8);
+    return c.reason === 'sha-changed'
+        ? `base hold on ${held} cleared (reason: sha-changed): origin/main moved to ${now}`
+        : `base hold on ${held} cleared (reason: ci-green): main CI on ${now} is green`;
+}
+/** `factory status` lines for an active hold (#2351). */
+export function formatBaseHoldStatus(hold) {
+    const checks = hold.failingChecks.length > 0 ? hold.failingChecks.join(', ') : '(none recorded)';
+    return [`  repo: ${hold.repo}`, `  baseSha: ${hold.baseSha}`, `  failingChecks: ${checks}`, `  since: ${hold.since}`];
+}
+/** Decides whether a lane may claim: hold only while origin/main is still at the held SHA and
+ *  its CI is not green. Unknown origin/main fails open; a failed CI lookup counts as not green.
+ *  Clears the hold when origin/main moved or its CI is green (#2350). */
+export async function evaluateBaseHold(file, repo, deps) {
+    const hold = readBaseHold(file);
+    if (hold === null || hold.repo !== repo)
+        return { kind: 'claim' };
+    let sha;
+    try {
+        sha = await deps.currentBaseSha();
+    }
+    catch {
+        sha = null;
+    }
+    if (sha === null)
+        return { kind: 'claim' };
+    const clear = (reason, currentSha) => {
+        if (!clearBaseHold(file, hold.baseSha))
+            return;
+        try {
+            deps.onCleared?.({ hold, reason, currentSha });
+        }
+        catch {
+            // an observer failure must not change the decision
+        }
+    };
+    if (sha !== hold.baseSha) {
+        clear('sha-changed', sha);
+        return { kind: 'claim' };
+    }
+    let green = false;
+    try {
+        green = await deps.baseCiGreen(sha);
+    }
+    catch {
+        green = false;
+    }
+    if (!green)
+        return { kind: 'hold', hold };
+    clear('ci-green', sha);
+    return { kind: 'claim' };
+}
+/** Green = at least one check run, all completed, all on the ADR-0014 passing allow-list. */
+export function isGreenCheckRunSet(runs) {
+    return runs.length > 0 && runs.every((r) => r.status === 'completed' && isPassingConclusion(r.conclusion));
+}
+/** SHA from the first line of `git ls-remote` output, or null when absent or malformed. */
+export function parseLsRemoteSha(stdout) {
+    const line = stdout.split('\n').find((l) => l.trim() !== '');
+    const field = line?.trim().split(/\s+/)[0] ?? '';
+    return /^[0-9a-f]{40}$/i.test(field) ? field : null;
+}
+export function createBaseHoldGate(opts) {
+    return () => evaluateBaseHold(opts.file, opts.repo, {
+        currentBaseSha: async () => parseLsRemoteSha(await opts.git('git ls-remote origin refs/heads/main')),
+        baseCiGreen: async (sha) => isGreenCheckRunSet(await opts.listCheckRuns(sha)),
+        onCleared: opts.onCleared,
+    });
+}
+//# sourceMappingURL=base-hold.js.map

package/dist/cli/base-hold.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"base-hold.js","sourceRoot":"","sources":["../../src/cli/base-hold.ts"],"names":[],"mappings":"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"}

package/dist/cli/daemon.d.ts

@@ -1,4 +1,5 @@
-import { type RepoState } from '@on-par/factory-core/internal';
+import { type RepoState, type RunRuntime } from '@on-par/factory-core/internal';
+import { type UpdateState } from './update-state.js';
 export declare const FACTORYD_LABEL = "com.onpar.factoryd";
 /** Expected daemon-control failure. index.ts's commander wrappers map it onto
  *  CliExitError (importing CliExitError here would be circular — index.ts
@@ -41,21 +42,70 @@ export declare function factorydFiles(home: string): {
     plistPath: string;
     logPath: string;
 };
+export declare const UPDATE_MODES: readonly ['manual', 'stable', 'prerelease'];
+export type UpdateMode = (typeof UPDATE_MODES)[number];
+export type UpdateChannel = 'latest' | 'next';
+/** The single mode → npm dist-tag mapping (#2246). */
+export declare function updateChannel(mode: UpdateMode): UpdateChannel | null;
+/** Exact, case-sensitive parse of an update mode. Throws DaemonCtlError (code 2). */
+export declare function parseUpdateMode(value: string, source: string): UpdateMode;
+export type InstallKind = 'npm-global' | 'source' | 'unknown';
+export interface InstallInfo {
+    kind: InstallKind;
+    prefix: string;
+    version: string;
+}
+export interface DetectInstallDeps {
+    execPath?: string;
+    cliPath?: string;
+    env?: NodeJS.ProcessEnv;
+    version?: string;
+    exists?: (p: string) => boolean;
+}
+/** Classifies the running cli.js as npm-global, source or unknown (#2246). Pure
+ *  apart from the injectable fs probe; never spawns npm or git. */
+export declare function detectInstall(deps?: DetectInstallDeps): InstallInfo;
+/** Optional daemon-scoped config file (<registry dir>/daemon.json). */
+export interface DaemonFileConfig {
+    autoUpdate?: {
+        mode?: string;
+        checkIntervalMinutes?: unknown;
+        drainTimeoutMinutes?: unknown;
+    };
+}
+/** Reads daemon.json. A missing file is `{}`; malformed structure throws DaemonCtlError (code 2). */
+export declare function loadDaemonFileConfig(file: string): DaemonFileConfig;
+export interface ResolvedAutoUpdate {
+    /** Effective mode (after the source/unknown downgrade). */
+    mode: UpdateMode;
+    /** Mode requested before the downgrade. */
+    requestedMode: UpdateMode;
+    channel: UpdateChannel | null;
+    checkIntervalMinutes: number;
+    drainTimeoutMinutes: number;
+}
 /** Resolved options for the foreground `factory daemon run` process. */
 export interface FactorydConfig {
     /** Registry file served (default ~/.factory/registry.json). */
     registryFile: string;
     /** Port to bind on 127.0.0.1 (default DEFAULT_FACTORYD_PORT). */
     port: number;
-    /** Opt-in auto-update (#2128). Off unless --auto-update was passed; nothing acts on it yet. */
-    autoUpdate: boolean;
+    /** Resolved self-update setting (#2246). runAutoUpdateLoop acts on it (#1939). */
+    autoUpdate: ResolvedAutoUpdate;
+    install: InstallInfo;
+    /** One-time startup notices (deprecation, downgrade); cmdFactoryd logs each once. */
+    notices: string[];
 }
 /** Resolves `factory daemon run` options into a FactorydConfig. Throws
- *  DaemonCtlError (code 2) on an invalid --port. */
+ *  DaemonCtlError (code 2) on an invalid --port, --update-mode or daemon.json value. */
 export declare function resolveFactorydConfig(opts: {
     port?: string;
     registry?: string;
+    updateMode?: string;
     autoUpdate?: boolean;
+}, deps?: {
+    install?: InstallInfo;
+    fileConfig?: DaemonFileConfig;
 }): FactorydConfig;
 /** Pure renderer for ~/Library/LaunchAgents/com.onpar.factoryd.plist. KeepAlive
  *  relaunches factoryd after any exit; RunAtLoad starts it at login/bootstrap;
@@ -110,4 +160,61 @@ export declare function cmdDaemonLogs(opts: {
     follow?: boolean;
     lines?: string;
 }, deps?: DaemonCtlDeps): Promise<void>;
+/** Exit code that makes launchd KeepAlive / systemd Restart=always relaunch factoryd. */
+export declare const AUTO_UPDATE_RESTART_EXIT_CODE = 75;
+/** `factory self-update` exit code for "a run is active, refusing to apply". */
+export declare const AUTO_UPDATE_BUSY_EXIT_CODE = 3;
+export interface AutoUpdateCheck {
+    candidate: string | null;
+    updateAvailable: boolean;
+    error: string | null;
+}
+export interface AutoUpdateApplyResult {
+    code: number;
+    rolledBack: boolean;
+    error: string | null;
+}
+export type AutoUpdateOutcome = 'manual' | 'check-error' | 'no-update' | 'skipped-failed-version' | 'drain-timeout' | 'busy' | 'failed' | 'updated';
+export interface AutoUpdateDeps {
+    stateFile: string;
+    check(): Promise<AutoUpdateCheck>;
+    apply(version: string): Promise<AutoUpdateApplyResult>;
+    /** Slugs/labels with an active run; empty = drained. */
+    activeRuns(): Promise<string[]>;
+    /** Exclusively creates STOP in every attached repo; returns only the paths it created. */
+    writeStops(): Promise<string[]>;
+    clearStops(files: string[]): Promise<void>;
+    /** Epoch ms. */
+    now(): number;
+    sleep(ms: number): Promise<void>;
+    log(line: string): void;
+    exit(code: number): Promise<void> | void;
+    /** Loop guard; default () => false. */
+    stopped?(): boolean;
+    /** Drain poll interval; default 30_000. */
+    drainPollMs?: number;
+}
+type AutoUpdateConfig = Pick<FactorydConfig, 'autoUpdate' | 'install'>;
+/** True only for an error-free, newer candidate; prereleases are ignored in stable mode. */
+export declare function isUpdateCandidate(check: AutoUpdateCheck, mode: UpdateMode, current: string): check is AutoUpdateCheck & {
+    candidate: string;
+};
+/** One check → drain → apply pass. Never throws; never applies while a run is active. */
+export declare function runAutoUpdateCycle(config: AutoUpdateConfig, deps: AutoUpdateDeps): Promise<AutoUpdateOutcome>;
+/** Sleeps the check interval, runs a cycle, and exits 75 after a successful update. */
+export declare function runAutoUpdateLoop(config: AutoUpdateConfig, deps: AutoUpdateDeps): Promise<void>;
+/** Removes STOP files a previous (crashed) drain left behind; returns the paths removed. */
+export declare function recoverStaleDrain(previous: UpdateState | null, removeStop: (file: string) => boolean): string[];
+/** Production deps: checks via the injected `check`, applies via `factory self-update --to`, detects activity from the run runtime and run locks. */
+export declare function createAutoUpdateDeps(opts: {
+    registryFile: string;
+    stateFile: string;
+    cliEntrypoint: string;
+    /** Registry check; cmdFactoryd passes `checkForUpdate` from self-update.ts (#2354). */
+    check: () => Promise<AutoUpdateCheck>;
+    runRuntime: Pick<RunRuntime, 'list'>;
+    log: (line: string) => void;
+    exit: (code: number) => Promise<void> | void;
+}): AutoUpdateDeps;
+export {};
 //# sourceMappingURL=daemon.d.ts.map

package/dist/cli/daemon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../src/cli/daemon.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../src/cli/daemon.ts"],"names":[],"mappings":"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"}