ai-foreman 1.7.10 → 1.7.12

package/README.md

@@ -15,9 +15,9 @@ Loop Claude Code or Codex through tickets.
 - **Rich ticket system** — tickets carry acceptance criteria, required tests, dependencies, priority, size, and risk level. The agent reads the full context before starting each step.
 - **Future work tracking** — when the builder discovers out-of-scope work during a run, `ai-foreman tickets discover` captures it without derailing the current ticket. Discovered items live in a separate inbox until you promote them.
 - **QA that actually gates** — QA runs after every completed ticket and checks code quality, test passing, and regression protection. The ticket only closes after QA passes. QA turns do not count against `--steps`.
-- **Visible long-running work** — one elapsed-time activity line identifies provider, phase, tools, retries, and quiet periods; redirected output receives timestamped heartbeats instead of ANSI animation.
+- **Visible long-running work** — semantic activity rows identify provider, phase, tools, retries, and quiet periods; cursor-capable terminals update changing counters in place, while record-oriented terminals coalesce them.
 
-Provider-managed retries are reported immediately as durable lines. A quiet-provider warning appears after 60 seconds without a signal, but Foreman does not add retries, abort the provider, or change provider retry limits. Non-TTY output receives a heartbeat every 30 seconds while work remains pending.
+Provider-managed retries are reported immediately as durable lines. A quiet-provider warning appears after 60 seconds without a signal, but Foreman does not add retries, abort the provider, or change provider retry limits. Non-TTY output receives a heartbeat every 30 seconds while work remains pending. TTY rendering defaults to automatic detection: Codex, CI, and `TERM=dumb` use newline records and suppress spinner- or number-only repeats; other terminals redraw those changes in place and retain a row when the textual status changes. Use `RAFI_ACTIVITY_RENDER_MODE=auto|cursor|records` to override detection.
 
 ## Install
 
@@ -146,7 +146,7 @@ Saved `tickets.build` defaults in `rafi-config.yaml` can enable branch-per-ticke
 
 With the saved `current` strategy, Foreman works in the active branch while the user owns Git. It may edit, test, run QA, and update tracker/recovery state, but all branch/worktree, commit, push, merge, rebase, and review lifecycle commands are fenced. An unexpected active ref or worktree change pauses the run. Explicit isolated flags are reported as run overrides.
 
-The active terminal line always includes the current role/provider, activity, truthful context state, successful compaction count, and handoff generation. At the Builder threshold, Foreman settles the in-flight action, verifies native compaction plus a fresh provider usage sample, and resumes the frozen action. The configured maximum defaults to ten successful compactions per location-scoped provider session; the next crossing uses a validated fresh handoff instead of exceeding it. Disposable QA snapshots never reuse a prior QA conversation in a new `/tmp/rafi-qa-*` worktree; they transfer cumulative state through an accepted handoff.
+The current terminal status includes the role/provider, activity, truthful context state, successful compaction count, and handoff generation. At the Builder threshold, Foreman settles the in-flight action, verifies native compaction plus a fresh provider usage sample, and resumes the frozen action. The configured maximum defaults to ten successful compactions per location-scoped provider session; the next crossing uses a validated fresh handoff instead of exceeding it. Disposable QA snapshots never reuse a prior QA conversation in a new `/tmp/rafi-qa-*` worktree; they transfer cumulative state through an accepted handoff.
 
 ### GitHub PR Failure Recovery
 

package/dist/activity.d.ts

@@ -11,7 +11,10 @@ export interface ActivityReporterOptions {
     tickMs?: number;
     heartbeatMs?: number;
     quietWarningMs?: number;
+    /** Override automatic TTY capability detection for tests or embedding hosts. */
+    ttyMode?: ActivityTtyMode;
 }
+export type ActivityTtyMode = "auto" | "cursor" | "records";
 /** One process-local live view shared by nested RAFI operations. */
 export declare class ActivityReporter {
     readonly command: string;
@@ -21,6 +24,7 @@ export declare class ActivityReporter {
     private readonly tickMs;
     private readonly heartbeatMs;
     private readonly quietWarningMs;
+    private readonly ttyMode;
     private readonly commandStartedAt;
     private readonly phases;
     private nextPhaseId;
@@ -33,6 +37,7 @@ export declare class ActivityReporter {
     private quietWarningPrinted;
     private lastHeartbeatAt;
     private lineVisible;
+    private lastSemanticKey?;
     private paused;
     private agentStatusLine?;
     constructor(command: string, options?: ActivityReporterOptions);
@@ -45,7 +50,7 @@ export declare class ActivityReporter {
     pulse(detail?: string): void;
     note(message: string): void;
     writePersistent(text: string): void;
-    /** Keep role/provider/context state in the single bottom-most TTY line. */
+    /** Keep role/provider/context state attached to the current activity status. */
     setAgentStatus(line: string | undefined): void;
     pause(): () => void;
     dispose(): void;

package/dist/activity.js

@@ -10,6 +10,7 @@ export class ActivityReporter {
     tickMs;
     heartbeatMs;
     quietWarningMs;
+    ttyMode;
     commandStartedAt;
     phases = new Map();
     nextPhaseId = 1;
@@ -22,6 +23,7 @@ export class ActivityReporter {
     quietWarningPrinted = false;
     lastHeartbeatAt = 0;
     lineVisible = false;
+    lastSemanticKey;
     paused = 0;
     agentStatusLine;
     constructor(command, options = {}) {
@@ -35,6 +37,7 @@ export class ActivityReporter {
         this.tickMs = options.tickMs ?? 1_000;
         this.heartbeatMs = options.heartbeatMs ?? 30_000;
         this.quietWarningMs = options.quietWarningMs ?? 60_000;
+        this.ttyMode = resolveTtyMode(options.ttyMode);
         this.commandStartedAt = this.now();
     }
     begin(label) {
@@ -91,7 +94,7 @@ export class ActivityReporter {
             this.output.write("\n");
         this.render(true);
     }
-    /** Keep role/provider/context state in the single bottom-most TTY line. */
+    /** Keep role/provider/context state attached to the current activity status. */
     setAgentStatus(line) {
         this.agentStatusLine = line ? clean(line, 500) : undefined;
         if (this.agentStatusLine && !this.timer) {
@@ -130,7 +133,6 @@ export class ActivityReporter {
     }
     idle() {
         if (this.agentStatusLine) {
-            this.clearLine();
             this.detail = undefined;
             this.provider = undefined;
             this.model = undefined;
@@ -145,6 +147,7 @@ export class ActivityReporter {
         this.provider = undefined;
         this.model = undefined;
         this.agentStatusLine = undefined;
+        this.lastSemanticKey = undefined;
     }
     currentPhase() {
         return [...this.phases.values()].at(-1);
@@ -168,8 +171,21 @@ export class ActivityReporter {
         const body = [phase?.label, provider || undefined, phase ? quiet : undefined, this.agentStatusLine].filter(Boolean).join(" — ");
         if (this.output.isTTY) {
             const line = `${FRAMES[this.frame++ % FRAMES.length]} RAFI working: ${body} (${formatDuration(now - this.commandStartedAt)})`;
+            const semanticKey = semanticStatusKey(body);
+            if (this.ttyMode === "records") {
+                if (semanticKey === this.lastSemanticKey)
+                    return;
+                this.output.write(`${line}\n`);
+                this.lastSemanticKey = semanticKey;
+                return;
+            }
+            if (this.lineVisible && semanticKey !== this.lastSemanticKey) {
+                this.output.write("\n");
+                this.lineVisible = false;
+            }
             this.output.write(`\r\x1b[2K${line}`);
             this.lineVisible = true;
+            this.lastSemanticKey = semanticKey;
             return;
         }
         if (force || now - this.lastHeartbeatAt >= this.heartbeatMs) {
@@ -260,6 +276,27 @@ function briefInput(input) {
 function clean(value, maximum) {
     return value.replace(/[\r\n\t]+/g, " ").replace(/\s+/g, " ").trim().slice(0, maximum);
 }
+function semanticStatusKey(body) {
+    return body.replace(/\p{Number}+(?:[.,]\p{Number}+)*/gu, "#");
+}
+function resolveTtyMode(requested) {
+    const configured = requested ?? configuredTtyMode(process.env.RAFI_ACTIVITY_RENDER_MODE);
+    if (configured === "cursor" || configured === "records")
+        return configured;
+    return truthyEnvironmentValue(process.env.CODEX_CI)
+        || truthyEnvironmentValue(process.env.CI)
+        || process.env.TERM?.toLowerCase() === "dumb"
+        ? "records"
+        : "cursor";
+}
+function configuredTtyMode(value) {
+    return value === "cursor" || value === "records" || value === "auto" ? value : "auto";
+}
+function truthyEnvironmentValue(value) {
+    if (value === undefined)
+        return false;
+    return !["", "0", "false"].includes(value.trim().toLowerCase());
+}
 function formatDuration(milliseconds) {
     const seconds = Math.max(0, Math.floor(milliseconds / 1_000));
     if (seconds < 60)

package/dist/agentRun.js

@@ -293,7 +293,7 @@ export async function runRoleInstruction(opts) {
     const { builder, effort, roleBundle, skills } = roleBuilder;
     const viewer = printEvents(builder.events());
     const config = loadConfig(join(opts.projectDir, "foreman.yaml"));
-    const foreman = new Foreman(builder, log, config.notifications.enabled, false, 3, opts.projectDir);
+    const foreman = new Foreman(builder, log, { desktop: config.notifications.enabled, terminalBell: config.notifications.terminal_bell }, false, 3, opts.projectDir);
     try {
         const turn = await foreman.runInstruction(opts.instruction);
         await builder.close();

package/dist/branch/runner.d.ts

@@ -25,6 +25,7 @@ export interface BranchRunnerOptions {
     effort?: EffortLevel;
     fast?: boolean;
     notificationsEnabled: boolean;
+    terminalBellEnabled?: boolean;
     qaEnabled: boolean;
     createPr: boolean;
     completionMode?: CompletionMode;

package/dist/branch/runner.js

@@ -2,7 +2,7 @@ import { buildDurableQaFixHandoff, compactWithRetry, runIsolatedQa } from "../qa
 import { changeManifestAsync } from "../qaSnapshot.js";
 import { Foreman, MARKER_SPEC, parseStepStatus } from "../foreman.js";
 import { fireNotification } from "../notify.js";
-import { cmdBlock, cmdComplete, cmdUpdate } from "../tickets/commands.js";
+import { cmdBlock, cmdComplete, cmdUnblock, cmdUpdate } from "../tickets/commands.js";
 import { commitAll, createTicketWorktree, findWorktreeForBranch, currentWorktreeBranch, deleteLocalBranch, ensureCleanBaseWorktree, ensureForemanExcluded, hasTrackerChanges, hasWorktreeChanges, headCommitIfAhead, removeTicketWorktree, mergeBranchToLocalBase, } from "./git.js";
 import { checkGitHubPrMerged, createOrReusePr, enableGitHubAutoMerge, pushBranchForPr } from "./github.js";
 import { checkGitLabMrMerged, createOrReuseMr, enableGitLabAutoMerge, pushBranchForMr } from "./gitlab.js";
@@ -143,10 +143,14 @@ export async function runBranchPlan(opts) {
                     sessionRef: resumeSession.sessionRef,
                 });
             }
-            journalTracker(opts.projectDir, opts.runId, `${opts.runId}:tracker-update:${node.ticket.id}:in-progress`, { ticket: node.ticket.id, status: "in_progress" }, () => cmdUpdate(opts.projectDir, node.ticket.id, {
-                status: "in_progress", actor: "foreman",
-                summary: resumeSession ? `Resuming branch ${node.branch}` : `Starting branch ${node.branch}`,
-            }));
+            journalTracker(opts.projectDir, opts.runId, `${opts.runId}:tracker-update:${node.ticket.id}:in-progress`, { ticket: node.ticket.id, status: "in_progress" }, () => {
+                if (resumeSession)
+                    cmdUnblock(opts.projectDir, node.ticket.id, { actor: "foreman", summary: `Reopened by explicit branch recovery for ${node.branch}` });
+                cmdUpdate(opts.projectDir, node.ticket.id, {
+                    status: "in_progress", actor: "foreman",
+                    summary: resumeSession ? `Resuming branch ${node.branch}` : `Starting branch ${node.branch}`,
+                });
+            });
             const ticketInstruction = resumeSession ? buildBranchTicketResumeInstruction(node, opts.trackerPaths) : buildBranchTicketInstruction(node, opts.trackerPaths);
             // Reattach the predecessor even for a `fresh` strategy so the host can
             // publish and validate a cumulative handoff before creating its successor.
@@ -173,7 +177,7 @@ export async function runBranchPlan(opts) {
             }
             builderWorkSessions += 1;
             viewer = opts.observeBuilder?.(builder);
-            const foreman = new Foreman(builder, opts.log, opts.notificationsEnabled, opts.qaEnabled, 3, undefined, undefined, undefined, opts.qaSessionStrategy ?? "compact", undefined, opts.builderSessionStrategy ?? "compact", undefined, opts.beforeBuilderTurn ? (adapter, action) => opts.beforeBuilderTurn(adapter, action, worktreePath) : undefined, undefined, undefined, async (adapter) => opts.observeBuilderNativeCompactions?.(adapter, worktreePath));
+            const foreman = new Foreman(builder, opts.log, { desktop: opts.notificationsEnabled, terminalBell: opts.terminalBellEnabled ?? true }, opts.qaEnabled, 3, undefined, undefined, undefined, opts.qaSessionStrategy ?? "compact", undefined, opts.builderSessionStrategy ?? "compact", undefined, opts.beforeBuilderTurn ? (adapter, action) => opts.beforeBuilderTurn(adapter, action, worktreePath) : undefined, undefined, undefined, undefined, async (adapter) => opts.observeBuilderNativeCompactions?.(adapter, worktreePath));
             const { result, status } = await foreman.runInstruction(ticketInstruction);
             builder = foreman.builderAdapter();
             workflowCheckpoint(opts.projectDir, opts.runId, "builder-after", node.ticket.id, { status: status.kind, sessionId: builder.sessionId(), worktree: worktreePath });
@@ -243,6 +247,7 @@ export async function runBranchPlan(opts) {
                     qaStrategy: opts.qaSessionStrategy ?? "compact", state: qaStream, createQa: opts.createQa, maxCycles: 3,
                     sessionBoundary: opts.qaSessionBoundary,
                     observeNativeCompactions: opts.observeQaNativeCompactions,
+                    resolveBlocked: (adapter, reason) => foreman.resolveBlocker(adapter, reason),
                     evidence: (entry) => opts.log.write("qa-evidence", { ticket: node.ticket.id, ...entry }),
                     fix: async (issues) => {
                         if (!builder)
@@ -267,8 +272,13 @@ export async function runBranchPlan(opts) {
                         }
                         if (opts.beforeBuilderTurn)
                             builder = await opts.beforeBuilderTurn(builder, fixInstruction, worktreePath);
-                        const fixed = await builder.sendTurn(fixInstruction);
-                        const fixedStatus = parseStepStatus(fixed.text);
+                        let fixed = await builder.sendTurn(fixInstruction);
+                        let fixedStatus = parseStepStatus(fixed.text);
+                        if (!fixed.isError && fixedStatus.kind === "blocked") {
+                            const resolved = await foreman.resolveBlocker(builder, fixedStatus.reason ?? "Builder QA fix reported an unspecified blocker");
+                            fixed = resolved.result;
+                            fixedStatus = resolved.status;
+                        }
                         const fixedSessionId = builder.sessionId();
                         const fixedSessionRef = builder.sessionRef?.();
                         if (fixedSessionId)