nightralph 0.0.15 → 0.0.17

package/README.md

@@ -214,17 +214,29 @@ This is expected to run for a long time, like overnight.
 
 ### Mac OS
 
-#### Claude
+Use `caffeinate` to prevent your machine from sleeping. These examples will
+keep the machine awake, but the display can still go dark.
+
+#### Claude Opus 4.6
 
 ```sh
 caffeinate -i npx nightralph claude -m claude-opus-4-6
 ```
 
-##### Run with `pi` and an OpenRouter model
+#### Claude Sonnet 5
+
+```sh
+caffeinate -i npx nightralph claude -m claude-sonnet-5
+```
+
+#### `pi` + OpenRouter model
 
 ```sh
 caffeinate -i npx nightralph pi -m openrouter/z-ai/glm-5.3-flash
 ```
 
-That command will prevent your machine from sleeping, but the display can still
-go dark.
+#### `codex` + Luna
+
+```sh
+caffeinate -i npx nightralph codex -m gpt-5.6-luna
+```

package/dist/display.js

@@ -70,6 +70,7 @@ class StatusDisplay {
   }
   wave = null;
   progress = null;
+  remaining = [];
   messages = [];
   renderedLines = 0;
   config;
@@ -88,7 +89,7 @@ class StatusDisplay {
     const available = termHeight - overhead;
     return Math.max(1, available);
   }
-  startWave(waveNum, totalWaves, tickets, progress) {
+  startWave(waveNum, totalWaves, tickets, progress, remaining) {
     this.wave = {
       waveNum,
       totalWaves,
@@ -97,6 +98,10 @@ class StatusDisplay {
         status: "pending"
       }))
     };
+    this.remaining = (remaining ?? []).map((t) => ({
+      ...t,
+      status: "pending"
+    }));
     this.progress = progress ?? null;
     this.messages = [];
     this.viewportStart = 0;
@@ -181,7 +186,10 @@ class StatusDisplay {
     output += `Wave ${this.wave.waveNum}/${this.wave.totalWaves} - ${pct}% complete
 `;
     const availableRows = this.getAvailableRows();
-    const tickets = this.wave.tickets;
+    const tickets = [
+      ...this.wave.tickets,
+      ...this.remaining
+    ];
     let renderedTicketCount = 0;
     if (tickets.length <= availableRows) {
       for (const ticket of tickets) {
@@ -262,7 +270,7 @@ class PlainDisplay {
   static {
     __name(this, "PlainDisplay");
   }
-  startWave(waveNum, _totalWaves, tickets, progress) {
+  startWave(waveNum, _totalWaves, tickets, progress, _remaining) {
     const pct = progress && progress.total > 0 ? ` (${progress.completed}/${progress.total} done)` : "";
     console.log(
       `

package/dist/display.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/display.ts"],
-  "sourcesContent": ["export type TicketStatus =\n    | 'pending'\n    | 'in-progress'\n    | 'done'\n    | 'failed'\n\nexport type DisplayTicket = {\n    readonly num:number\n    readonly filename:string\n    status:TicketStatus\n}\n\nexport type WaveState = {\n    readonly waveNum:number\n    readonly totalWaves:number\n    readonly tickets:Array<DisplayTicket>\n}\n\nexport type DisplayConfig = {\n    readonly messageLines:number\n    readonly stream:NodeJS.WriteStream\n}\n\n/**\n * Progress across the whole run, not just the current wave.\n * `completed` counts tickets done before the wave started;\n * tickets that finish during the wave are added on top.\n */\nexport type RunProgress = {\n    readonly completed:number\n    readonly total:number\n}\n\nexport type Display = {\n    startWave(\n        waveNum:number,\n        totalWaves:number,\n        tickets:ReadonlyArray<{\n            num:number\n            filename:string\n        }>,\n        progress?:RunProgress\n    ):void\n    setTicketStatus(num:number, status:TicketStatus):void\n    log(message:string):void\n    cleanup():void\n}\n\nconst ESC = '\\x1b['\n\nexport const ansi = {\n    cursorUp (n:number):string {\n        return `${ESC}${n}A`\n    },\n    cursorTo (col:number):string {\n        return `${ESC}${col}G`\n    },\n    eraseLine ():string {\n        return `${ESC}2K`\n    },\n    eraseLines (n:number):string {\n        let out = ''\n        for (let i = 0; i < n; i++) {\n            out += ansi.eraseLine()\n            if (i < n - 1) out += ansi.cursorUp(1)\n        }\n        return out\n    },\n    cursorHide ():string {\n        return `${ESC}?25l`\n    },\n    cursorShow ():string {\n        return `${ESC}?25h`\n    },\n} as const\n\nexport const color = {\n    green (text:string):string {\n        return `${ESC}32m${text}${ESC}0m`\n    },\n    yellow (text:string):string {\n        return `${ESC}33m${text}${ESC}0m`\n    },\n    red (text:string):string {\n        return `${ESC}31m${text}${ESC}0m`\n    },\n    dim (text:string):string {\n        return `${ESC}2m${text}${ESC}0m`\n    },\n} as const\n\nconst FILLED_DOT = '\u25CF'\nconst EMPTY_DOT = '\u25CB'\nconst SEPARATOR_WIDTH = 50\nconst DEFAULT_COLUMNS = 80\n\n// eslint-disable-next-line no-control-regex\nconst ANSI_RE = /\\x1b\\[[0-9;?]*[A-Za-z]/g\n\n/**\n * Clamp a line to `width` visible columns so it can never wrap.\n * A wrapped line occupies more terminal rows than `render`\n * counts, which leaves stale rows behind on the next erase.\n */\nexport function fitLine (line:string, width:number):string {\n    const visible = line.replace(ANSI_RE, '')\n    if (visible.length <= width) return line\n    return visible.slice(0, width)\n}\n\nexport function renderDot (status:TicketStatus):string {\n    switch (status) {\n        case 'pending':\n            return color.dim(EMPTY_DOT)\n        case 'in-progress':\n            return color.yellow(FILLED_DOT)\n        case 'done':\n            return color.green(FILLED_DOT)\n        case 'failed':\n            return color.red(FILLED_DOT)\n    }\n}\n\nexport class StatusDisplay implements Display {\n    private wave:WaveState|null = null\n    private progress:RunProgress|null = null\n    private messages:Array<string> = []\n    private renderedLines:number = 0\n    private config:DisplayConfig\n    private viewportStart:number = 0\n    private resizeListener:(() => void)|null = null\n    private signalHandler:(() => void)|null = null\n\n    constructor (config?:Readonly<Partial<DisplayConfig>>) {\n        this.config = {\n            messageLines:config?.messageLines ?? 10,\n            stream:config?.stream ?? process.stdout,\n        }\n    }\n\n    private getAvailableRows ():number {\n        const termHeight = this.config.stream.rows ?? 24\n        const overhead = 2 + this.config.messageLines\n        const available = termHeight - overhead\n        return Math.max(1, available)\n    }\n\n    startWave (\n        waveNum:number,\n        totalWaves:number,\n        tickets:Array<Readonly<{ num:number; filename:string }>>,\n        progress?:RunProgress,\n    ):void {\n        this.wave = {\n            waveNum,\n            totalWaves,\n            tickets:tickets.map(t => ({\n                ...t,\n                status:'pending' as const,\n            })),\n        }\n        this.progress = progress ?? null\n        this.messages = []\n        this.viewportStart = 0\n        this.config.stream.write(ansi.cursorHide())\n\n        if (this.config.stream.isTTY) {\n            if (this.resizeListener) {\n                this.config.stream.removeListener(\n                    'resize', this.resizeListener,\n                )\n            }\n            this.resizeListener = () => this.render()\n            this.config.stream.on(\n                'resize', this.resizeListener,\n            )\n        }\n\n        // Register signal handler to restore cursor on interruption\n        if (this.signalHandler) {\n            process.removeListener('SIGINT', this.signalHandler)\n            process.removeListener('SIGTERM', this.signalHandler)\n        }\n        this.signalHandler = () => this.cleanup()\n        process.on('SIGINT', this.signalHandler)\n        process.on('SIGTERM', this.signalHandler)\n\n        this.render()\n    }\n\n    setTicketStatus (num:number, status:TicketStatus):void {\n        if (!this.wave) return\n\n        const ticket = this.wave.tickets.find(t => t.num === num)\n        if (ticket) {\n            ticket.status = status\n\n            if (status === 'in-progress') {\n                const ticketIndex = this.wave.tickets.indexOf(ticket)\n                const availableRows = this.getAvailableRows()\n                const totalTickets = this.wave.tickets.length\n\n                if (ticketIndex < this.viewportStart) {\n                    this.viewportStart = ticketIndex\n                } else if (ticketIndex >= this.viewportStart + availableRows) {\n                    // offset by 3 to keep context visible below\n                    // the active ticket\n                    this.viewportStart = ticketIndex - availableRows + 3\n                }\n                this.viewportStart = Math.max(\n                    0,\n                    Math.min(this.viewportStart, totalTickets - 1),\n                )\n            }\n\n            this.render()\n        }\n    }\n\n    log (message:string):void {\n        this.messages.push(message)\n        if (this.messages.length > this.config.messageLines) {\n            this.messages.shift()\n        }\n        this.render()\n    }\n\n    cleanup ():void {\n        // Remove resize listener if it exists\n        if (this.resizeListener && this.config.stream.isTTY) {\n            this.config.stream.removeListener('resize', this.resizeListener)\n        }\n        // Remove signal handlers\n        if (this.signalHandler) {\n            process.removeListener('SIGINT', this.signalHandler)\n            process.removeListener('SIGTERM', this.signalHandler)\n        }\n        this.config.stream.write(ansi.cursorShow())\n    }\n\n    private render ():void {\n        if (!this.wave) return\n\n        let output = ''\n\n        if (this.renderedLines > 0) {\n            output += ansi.eraseLines(this.renderedLines + 1)\n        }\n\n        const doneInWave = this.wave.tickets.filter(\n            t => t.status === 'done',\n        ).length\n        const completed = doneInWave + (this.progress?.completed ?? 0)\n        const total = this.progress?.total ?? this.wave.tickets.length\n        const pct = total === 0 ? 0 : Math.round((completed / total) * 100)\n        const width = Math.max(\n            1,\n            (this.config.stream.columns ?? DEFAULT_COLUMNS) - 1,\n        )\n\n        output += `Wave ${this.wave.waveNum}/` +\n            `${this.wave.totalWaves} - ` +\n            `${pct}% complete\\n`\n\n        // Pagination logic\n        const availableRows = this.getAvailableRows()\n        const tickets = this.wave.tickets\n        let renderedTicketCount = 0\n\n        if (tickets.length <= availableRows) {\n            // All tickets fit, no pagination\n            for (const ticket of tickets) {\n                const dot = renderDot(ticket.status)\n                const name = fitLine(ticket.filename, width - 2)\n                output += `${dot} ${name}\\n`\n            }\n            renderedTicketCount = tickets.length\n        } else {\n            // Need pagination -- iterative clamp\n            this.viewportStart = Math.max(\n                0,\n                Math.min(\n                    this.viewportStart,\n                    tickets.length - 1,\n                ),\n            )\n\n            let hasMoreAbove = this.viewportStart > 0\n            let tentativeCount =\n                availableRows - (hasMoreAbove ? 1 : 0)\n            let hasMoreBelow =\n                this.viewportStart + tentativeCount <\n                tickets.length\n            let ticketsToShow = Math.max(\n                0,\n                tentativeCount - (hasMoreBelow ? 1 : 0),\n            )\n\n            const maxStart = Math.max(\n                0,\n                tickets.length - Math.max(1, ticketsToShow),\n            )\n            if (this.viewportStart > maxStart) {\n                this.viewportStart = maxStart\n                hasMoreAbove = this.viewportStart > 0\n                tentativeCount = availableRows - (hasMoreAbove ? 1 : 0)\n                hasMoreBelow = (\n                    this.viewportStart +\n                    tentativeCount < tickets.length\n                )\n                ticketsToShow = Math.max(\n                    0,\n                    tentativeCount - (hasMoreBelow ? 1 : 0)\n                )\n            }\n\n            // Show \"more above\" indicator if needed\n            if (hasMoreAbove) {\n                const moreCount = this.viewportStart\n                output += `  ... ${moreCount} more above\\n`\n            }\n\n            // Get visible tickets and render them\n            const visibleTickets = tickets.slice(\n                this.viewportStart,\n                this.viewportStart + ticketsToShow,\n            )\n\n            for (const ticket of visibleTickets) {\n                const dot = renderDot(ticket.status)\n                const name = fitLine(ticket.filename, width - 2)\n                output += `${dot} ${name}\\n`\n            }\n\n            // Show \"more below\" indicator if needed\n            if (hasMoreBelow) {\n                const moreCount = (\n                    tickets.length -\n                    (this.viewportStart + ticketsToShow)\n                )\n                output += `  ... ${moreCount} more below\\n`\n            }\n\n            renderedTicketCount = (hasMoreAbove ? 1 : 0) +\n                visibleTickets.length +\n                (hasMoreBelow ? 1 : 0)\n        }\n\n        output += '-'.repeat(Math.min(SEPARATOR_WIDTH, width)) + '\\n'\n\n        const msgLines = Math.max(\n            0,\n            this.config.messageLines - this.messages.length,\n        )\n        for (const msg of this.messages) {\n            output += `${fitLine(msg, width)}\\n`\n        }\n        for (let i = 0; i < msgLines; i++) {\n            output += '\\n'\n        }\n\n        this.renderedLines = 2 + renderedTicketCount + this.config.messageLines\n        this.config.stream.write(output)\n    }\n}\n\nexport class PlainDisplay implements Display {\n    startWave (\n        waveNum:number,\n        _totalWaves:number,\n        tickets:ReadonlyArray<{ num:number; filename:string }>,\n        progress?:RunProgress,\n    ):void {\n        const pct = progress && progress.total > 0 ?\n            ` (${progress.completed}/${progress.total} done)` :\n            ''\n        console.log(\n            `\\nWave ${waveNum}${pct}: ` +\n            tickets.map(t => t.filename).join(', ')\n        )\n    }\n\n    setTicketStatus (_num:number, _status:TicketStatus):void {\n        // no-op: plain mode reports via log()\n    }\n\n    log (message:string):void {\n        console.log(message)\n    }\n\n    cleanup ():void {\n        // no-op\n    }\n}\n\nexport function createDisplay (stream?:NodeJS.WriteStream):Display {\n    const s = stream ?? process.stdout\n    if (s.isTTY) {\n        return new StatusDisplay({ stream:s })\n    }\n\n    return new PlainDisplay()\n}\n"],
-  "mappings": "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",
+  "sourcesContent": ["export type TicketStatus =\n    | 'pending'\n    | 'in-progress'\n    | 'done'\n    | 'failed'\n\nexport type DisplayTicket = {\n    readonly num:number\n    readonly filename:string\n    status:TicketStatus\n}\n\nexport type WaveState = {\n    readonly waveNum:number\n    readonly totalWaves:number\n    readonly tickets:Array<DisplayTicket>\n}\n\nexport type DisplayConfig = {\n    readonly messageLines:number\n    readonly stream:NodeJS.WriteStream\n}\n\n/**\n * Progress across the whole run, not just the current wave.\n * `completed` counts tickets done before the wave started;\n * tickets that finish during the wave are added on top.\n */\nexport type RunProgress = {\n    readonly completed:number\n    readonly total:number\n}\n\nexport type Display = {\n    startWave(\n        waveNum:number,\n        totalWaves:number,\n        tickets:ReadonlyArray<{\n            num:number\n            filename:string\n        }>,\n        progress?:RunProgress,\n        remaining?:ReadonlyArray<{\n            num:number\n            filename:string\n        }>,\n    ):void\n    setTicketStatus(num:number, status:TicketStatus):void\n    log(message:string):void\n    cleanup():void\n}\n\nconst ESC = '\\x1b['\n\nexport const ansi = {\n    cursorUp (n:number):string {\n        return `${ESC}${n}A`\n    },\n    cursorTo (col:number):string {\n        return `${ESC}${col}G`\n    },\n    eraseLine ():string {\n        return `${ESC}2K`\n    },\n    eraseLines (n:number):string {\n        let out = ''\n        for (let i = 0; i < n; i++) {\n            out += ansi.eraseLine()\n            if (i < n - 1) out += ansi.cursorUp(1)\n        }\n        return out\n    },\n    cursorHide ():string {\n        return `${ESC}?25l`\n    },\n    cursorShow ():string {\n        return `${ESC}?25h`\n    },\n} as const\n\nexport const color = {\n    green (text:string):string {\n        return `${ESC}32m${text}${ESC}0m`\n    },\n    yellow (text:string):string {\n        return `${ESC}33m${text}${ESC}0m`\n    },\n    red (text:string):string {\n        return `${ESC}31m${text}${ESC}0m`\n    },\n    dim (text:string):string {\n        return `${ESC}2m${text}${ESC}0m`\n    },\n} as const\n\nconst FILLED_DOT = '\u25CF'\nconst EMPTY_DOT = '\u25CB'\nconst SEPARATOR_WIDTH = 50\nconst DEFAULT_COLUMNS = 80\n\n// eslint-disable-next-line no-control-regex\nconst ANSI_RE = /\\x1b\\[[0-9;?]*[A-Za-z]/g\n\n/**\n * Clamp a line to `width` visible columns so it can never wrap.\n * A wrapped line occupies more terminal rows than `render`\n * counts, which leaves stale rows behind on the next erase.\n */\nexport function fitLine (line:string, width:number):string {\n    const visible = line.replace(ANSI_RE, '')\n    if (visible.length <= width) return line\n    return visible.slice(0, width)\n}\n\nexport function renderDot (status:TicketStatus):string {\n    switch (status) {\n        case 'pending':\n            return color.dim(EMPTY_DOT)\n        case 'in-progress':\n            return color.yellow(FILLED_DOT)\n        case 'done':\n            return color.green(FILLED_DOT)\n        case 'failed':\n            return color.red(FILLED_DOT)\n    }\n}\n\nexport class StatusDisplay implements Display {\n    private wave:WaveState|null = null\n    private progress:RunProgress|null = null\n    private remaining:Array<DisplayTicket> = []\n    private messages:Array<string> = []\n    private renderedLines:number = 0\n    private config:DisplayConfig\n    private viewportStart:number = 0\n    private resizeListener:(() => void)|null = null\n    private signalHandler:(() => void)|null = null\n\n    constructor (config?:Readonly<Partial<DisplayConfig>>) {\n        this.config = {\n            messageLines:config?.messageLines ?? 10,\n            stream:config?.stream ?? process.stdout,\n        }\n    }\n\n    private getAvailableRows ():number {\n        const termHeight = this.config.stream.rows ?? 24\n        const overhead = 2 + this.config.messageLines\n        const available = termHeight - overhead\n        return Math.max(1, available)\n    }\n\n    startWave (\n        waveNum:number,\n        totalWaves:number,\n        tickets:Array<Readonly<{ num:number; filename:string }>>,\n        progress?:RunProgress,\n        remaining?:ReadonlyArray<{\n            num:number\n            filename:string\n        }>,\n    ):void {\n        this.wave = {\n            waveNum,\n            totalWaves,\n            tickets:tickets.map(t => ({\n                ...t,\n                status:'pending' as const,\n            })),\n        }\n        this.remaining = (remaining ?? []).map(t => ({\n            ...t,\n            status:'pending' as const,\n        }))\n        this.progress = progress ?? null\n        this.messages = []\n        this.viewportStart = 0\n        this.config.stream.write(ansi.cursorHide())\n\n        if (this.config.stream.isTTY) {\n            if (this.resizeListener) {\n                this.config.stream.removeListener(\n                    'resize', this.resizeListener,\n                )\n            }\n            this.resizeListener = () => this.render()\n            this.config.stream.on(\n                'resize', this.resizeListener,\n            )\n        }\n\n        // Register signal handler to restore cursor on interruption\n        if (this.signalHandler) {\n            process.removeListener('SIGINT', this.signalHandler)\n            process.removeListener('SIGTERM', this.signalHandler)\n        }\n        this.signalHandler = () => this.cleanup()\n        process.on('SIGINT', this.signalHandler)\n        process.on('SIGTERM', this.signalHandler)\n\n        this.render()\n    }\n\n    setTicketStatus (num:number, status:TicketStatus):void {\n        if (!this.wave) return\n\n        const ticket = this.wave.tickets.find(t => t.num === num)\n        if (ticket) {\n            ticket.status = status\n\n            if (status === 'in-progress') {\n                const ticketIndex = this.wave.tickets.indexOf(ticket)\n                const availableRows = this.getAvailableRows()\n                const totalTickets = this.wave.tickets.length\n\n                if (ticketIndex < this.viewportStart) {\n                    this.viewportStart = ticketIndex\n                } else if (ticketIndex >= this.viewportStart + availableRows) {\n                    // offset by 3 to keep context visible below\n                    // the active ticket\n                    this.viewportStart = ticketIndex - availableRows + 3\n                }\n                this.viewportStart = Math.max(\n                    0,\n                    Math.min(this.viewportStart, totalTickets - 1),\n                )\n            }\n\n            this.render()\n        }\n    }\n\n    log (message:string):void {\n        this.messages.push(message)\n        if (this.messages.length > this.config.messageLines) {\n            this.messages.shift()\n        }\n        this.render()\n    }\n\n    cleanup ():void {\n        // Remove resize listener if it exists\n        if (this.resizeListener && this.config.stream.isTTY) {\n            this.config.stream.removeListener('resize', this.resizeListener)\n        }\n        // Remove signal handlers\n        if (this.signalHandler) {\n            process.removeListener('SIGINT', this.signalHandler)\n            process.removeListener('SIGTERM', this.signalHandler)\n        }\n        this.config.stream.write(ansi.cursorShow())\n    }\n\n    private render ():void {\n        if (!this.wave) return\n\n        let output = ''\n\n        if (this.renderedLines > 0) {\n            output += ansi.eraseLines(this.renderedLines + 1)\n        }\n\n        const doneInWave = this.wave.tickets.filter(\n            t => t.status === 'done',\n        ).length\n        const completed = doneInWave + (this.progress?.completed ?? 0)\n        const total = this.progress?.total ?? this.wave.tickets.length\n        const pct = total === 0 ? 0 : Math.round((completed / total) * 100)\n        const width = Math.max(\n            1,\n            (this.config.stream.columns ?? DEFAULT_COLUMNS) - 1,\n        )\n\n        output += `Wave ${this.wave.waveNum}/` +\n            `${this.wave.totalWaves} - ` +\n            `${pct}% complete\\n`\n\n        // Pagination logic\n        const availableRows = this.getAvailableRows()\n        const tickets:ReadonlyArray<DisplayTicket> = [\n            ...this.wave.tickets,\n            ...this.remaining,\n        ]\n        let renderedTicketCount = 0\n\n        if (tickets.length <= availableRows) {\n            // All tickets fit, no pagination\n            for (const ticket of tickets) {\n                const dot = renderDot(ticket.status)\n                const name = fitLine(ticket.filename, width - 2)\n                output += `${dot} ${name}\\n`\n            }\n            renderedTicketCount = tickets.length\n        } else {\n            // Need pagination -- iterative clamp\n            this.viewportStart = Math.max(\n                0,\n                Math.min(\n                    this.viewportStart,\n                    tickets.length - 1,\n                ),\n            )\n\n            let hasMoreAbove = this.viewportStart > 0\n            let tentativeCount =\n                availableRows - (hasMoreAbove ? 1 : 0)\n            let hasMoreBelow =\n                this.viewportStart + tentativeCount <\n                tickets.length\n            let ticketsToShow = Math.max(\n                0,\n                tentativeCount - (hasMoreBelow ? 1 : 0),\n            )\n\n            const maxStart = Math.max(\n                0,\n                tickets.length - Math.max(1, ticketsToShow),\n            )\n            if (this.viewportStart > maxStart) {\n                this.viewportStart = maxStart\n                hasMoreAbove = this.viewportStart > 0\n                tentativeCount = availableRows - (hasMoreAbove ? 1 : 0)\n                hasMoreBelow = (\n                    this.viewportStart +\n                    tentativeCount < tickets.length\n                )\n                ticketsToShow = Math.max(\n                    0,\n                    tentativeCount - (hasMoreBelow ? 1 : 0)\n                )\n            }\n\n            // Show \"more above\" indicator if needed\n            if (hasMoreAbove) {\n                const moreCount = this.viewportStart\n                output += `  ... ${moreCount} more above\\n`\n            }\n\n            // Get visible tickets and render them\n            const visibleTickets = tickets.slice(\n                this.viewportStart,\n                this.viewportStart + ticketsToShow,\n            )\n\n            for (const ticket of visibleTickets) {\n                const dot = renderDot(ticket.status)\n                const name = fitLine(ticket.filename, width - 2)\n                output += `${dot} ${name}\\n`\n            }\n\n            // Show \"more below\" indicator if needed\n            if (hasMoreBelow) {\n                const moreCount = (\n                    tickets.length -\n                    (this.viewportStart + ticketsToShow)\n                )\n                output += `  ... ${moreCount} more below\\n`\n            }\n\n            renderedTicketCount = (hasMoreAbove ? 1 : 0) +\n                visibleTickets.length +\n                (hasMoreBelow ? 1 : 0)\n        }\n\n        output += '-'.repeat(Math.min(SEPARATOR_WIDTH, width)) + '\\n'\n\n        const msgLines = Math.max(\n            0,\n            this.config.messageLines - this.messages.length,\n        )\n        for (const msg of this.messages) {\n            output += `${fitLine(msg, width)}\\n`\n        }\n        for (let i = 0; i < msgLines; i++) {\n            output += '\\n'\n        }\n\n        this.renderedLines = 2 + renderedTicketCount + this.config.messageLines\n        this.config.stream.write(output)\n    }\n}\n\nexport class PlainDisplay implements Display {\n    startWave (\n        waveNum:number,\n        _totalWaves:number,\n        tickets:ReadonlyArray<{ num:number; filename:string }>,\n        progress?:RunProgress,\n        _remaining?:ReadonlyArray<{\n            num:number\n            filename:string\n        }>,\n    ):void {\n        const pct = progress && progress.total > 0 ?\n            ` (${progress.completed}/${progress.total} done)` :\n            ''\n        console.log(\n            `\\nWave ${waveNum}${pct}: ` +\n            tickets.map(t => t.filename).join(', ')\n        )\n    }\n\n    setTicketStatus (_num:number, _status:TicketStatus):void {\n        // no-op: plain mode reports via log()\n    }\n\n    log (message:string):void {\n        console.log(message)\n    }\n\n    cleanup ():void {\n        // no-op\n    }\n}\n\nexport function createDisplay (stream?:NodeJS.WriteStream):Display {\n    const s = stream ?? process.stdout\n    if (s.isTTY) {\n        return new StatusDisplay({ stream:s })\n    }\n\n    return new PlainDisplay()\n}\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/index.js

@@ -507,8 +507,10 @@ async function mergeBranch(repoRoot, branch) {
       ["merge", branch, "--no-edit"],
       { cwd: repoRoot }
     );
-    return true;
-  } catch {
+    return { success: true };
+  } catch (err) {
+    const execErr = err;
+    const stderr = execErr.stderr || execErr.stdout;
     try {
       await execFileAsync3(
         "git",
@@ -517,7 +519,7 @@ async function mergeBranch(repoRoot, branch) {
       );
     } catch {
     }
-    return false;
+    return { success: false, stderr };
   }
 }
 __name(mergeBranch, "mergeBranch");
@@ -538,8 +540,10 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
         ["rebase", onto],
         { cwd: worktreePath }
       );
-      return true;
-    } catch {
+      return { success: true };
+    } catch (err) {
+      const execErr = err;
+      const stderr = execErr.stderr || execErr.stdout;
       try {
         await execFileAsync3(
           "git",
@@ -548,7 +552,7 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
         );
       } catch {
       }
-      return false;
+      return { success: false, stderr };
     }
   }
   try {
@@ -567,8 +571,9 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
       ["checkout", onto],
       { cwd: repoRoot }
     );
-    return true;
-  } catch {
+    return { success: true };
+  } catch (err) {
+    const stderr = err.stderr;
     try {
       await execFileAsync3(
         "git",
@@ -585,7 +590,7 @@ async function rebaseBranch(repoRoot, branch, onto, worktreePath) {
       );
     } catch {
     }
-    return false;
+    return { success: false, stderr };
   }
 }
 __name(rebaseBranch, "rebaseBranch");
@@ -619,13 +624,16 @@ async function mergeWave(opts) {
       conflicted: false
     };
     if (i === 0) {
-      const success = await mergeBranch(
+      const result = await mergeBranch(
         repoRoot,
         branch
       );
-      mergingResult.merged = success;
-      mergingResult.conflicted = !success;
-      if (!success) {
+      mergingResult.merged = result.success;
+      mergingResult.conflicted = !result.success;
+      if (!result.success) {
+        mergingResult.stderr = result.stderr;
+      }
+      if (!result.success) {
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -635,14 +643,15 @@ async function mergeWave(opts) {
         continue;
       }
     } else {
-      const rebaseSuccess = await rebaseBranch(
+      const rebaseResult = await rebaseBranch(
         repoRoot,
         branch,
         baseBranch,
         worktreePath
       );
-      if (!rebaseSuccess) {
+      if (!rebaseResult.success) {
         mergingResult.conflicted = true;
+        mergingResult.stderr = rebaseResult.stderr;
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -652,13 +661,16 @@ async function mergeWave(opts) {
           continue;
         }
       }
-      const mergeSuccess = await mergeBranch(
+      const mergeResult = await mergeBranch(
         repoRoot,
         branch
       );
-      mergingResult.merged = mergeSuccess;
-      mergingResult.conflicted = !mergeSuccess;
-      if (!mergeSuccess) {
+      mergingResult.merged = mergeResult.success;
+      mergingResult.conflicted = !mergeResult.success;
+      if (!mergeResult.success) {
+        mergingResult.stderr = mergeResult.stderr;
+      }
+      if (!mergeResult.success) {
         if (strategy === "stop") {
           stoppedAt = mergingResult;
           merged.push(mergingResult);
@@ -748,6 +760,7 @@ var StatusDisplay = class {
   }
   wave = null;
   progress = null;
+  remaining = [];
   messages = [];
   renderedLines = 0;
   config;
@@ -766,7 +779,7 @@ var StatusDisplay = class {
     const available = termHeight - overhead;
     return Math.max(1, available);
   }
-  startWave(waveNum, totalWaves, tickets, progress) {
+  startWave(waveNum, totalWaves, tickets, progress, remaining) {
     this.wave = {
       waveNum,
       totalWaves,
@@ -775,6 +788,10 @@ var StatusDisplay = class {
         status: "pending"
       }))
     };
+    this.remaining = (remaining ?? []).map((t) => ({
+      ...t,
+      status: "pending"
+    }));
     this.progress = progress ?? null;
     this.messages = [];
     this.viewportStart = 0;
@@ -859,7 +876,10 @@ var StatusDisplay = class {
     output += `Wave ${this.wave.waveNum}/${this.wave.totalWaves} - ${pct}% complete
 `;
     const availableRows = this.getAvailableRows();
-    const tickets = this.wave.tickets;
+    const tickets = [
+      ...this.wave.tickets,
+      ...this.remaining
+    ];
     let renderedTicketCount = 0;
     if (tickets.length <= availableRows) {
       for (const ticket of tickets) {
@@ -940,7 +960,7 @@ var PlainDisplay = class {
   static {
     __name(this, "PlainDisplay");
   }
-  startWave(waveNum, _totalWaves, tickets, progress) {
+  startWave(waveNum, _totalWaves, tickets, progress, _remaining) {
     const pct = progress && progress.total > 0 ? ` (${progress.completed}/${progress.total} done)` : "";
     console.log(
       `
@@ -1081,6 +1101,29 @@ function renderPrompt(specBody, ticket) {
   ].join("\n");
 }
 __name(renderPrompt, "renderPrompt");
+function renderMergePrompt(specBody, ticket) {
+  return [
+    "---- SPEC CONTEXT ----",
+    specBody,
+    "",
+    "---- TICKET ----",
+    ticket.filename,
+    ticket.body,
+    "",
+    "---- AGENT INSTRUCTIONS ----",
+    "You are an autonomous coding agent resolving a merge conflict.",
+    "",
+    "Another agent already implemented this ticket on a feature branch. The branch was then merged with the base branch, but conflicts arose. The working tree may contain conflict markers that need resolution.",
+    "",
+    "Your task:",
+    "1. Find and resolve all conflict markers (<<<<<<< / ======= / >>>>>>>).",
+    "2. Make sure the code compiles and tests pass.",
+    "3. Commit the resolved files.",
+    "",
+    "Do NOT re-implement the ticket from scratch."
+  ].join("\n");
+}
+__name(renderMergePrompt, "renderMergePrompt");
 function listTickets(tickets) {
   console.log("\nTickets:");
   for (const t of tickets) {
@@ -1490,7 +1533,10 @@ async function respawnAndRetryMerge(opts) {
   } else {
     console.log(msg1);
   }
-  const prompt = renderPrompt(opts.specBody, opts.ticket);
+  const prompt = renderMergePrompt(
+    opts.specBody,
+    opts.ticket
+  );
   const logPath = join3(
     opts.logsDir,
     opts.ticket.filename.replace(/\.md$/, ".respawn.log")
@@ -1518,19 +1564,27 @@ async function respawnAndRetryMerge(opts) {
     }
     return false;
   }
-  const merged = await mergeBranch(
+  const mergeResult = await mergeBranch(
     opts.repoRoot,
     opts.branch
   );
-  if (!merged) {
+  if (!mergeResult.success) {
     const msg3 = `  ${opts.ticket.filename}: merge still conflicted after respawn`;
     if (opts.onLine) {
       opts.onLine(msg3);
     } else {
       console.log(msg3);
     }
+    if (mergeResult.stderr) {
+      const stderrMsg = `  git: ${mergeResult.stderr.trim()}`;
+      if (opts.onLine) {
+        opts.onLine(stderrMsg);
+      } else {
+        console.log(stderrMsg);
+      }
+    }
   }
-  return merged;
+  return mergeResult.success;
 }
 __name(respawnAndRetryMerge, "respawnAndRetryMerge");
 function runProgress(tickets) {
@@ -1551,6 +1605,10 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
     const ready = findReadyTickets(tickets);
     if (ready.length === 0) break;
     waveNum++;
+    const readyNums = new Set(ready.map((t) => t.num));
+    const remaining2 = tickets.filter(
+      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+    );
     d.startWave(
       waveNum,
       totalWaves,
@@ -1558,7 +1616,11 @@ async function runWaves(tickets, specBody, agentCmd, model, timeout, logsDir, di
         num: t.num,
         filename: t.filename
       })),
-      runProgress(tickets)
+      runProgress(tickets),
+      remaining2.map((t) => ({
+        num: t.num,
+        filename: t.filename
+      }))
     );
     const results = await Promise.allSettled(
       ready.map(async (t) => {
@@ -1631,6 +1693,11 @@ async function runWavesIsolated(opts) {
   const repoRoot = getRepoRoot();
   const repoName = getRepoName();
   const baseBranch = getCurrentBranch();
+  if (isDirty(repoRoot)) {
+    throw new Error(
+      "Working tree is dirty; commit or stash changes before running"
+    );
+  }
   const progressPath = join3(
     dirname(opts.logsDir),
     "progress.md"
@@ -1651,6 +1718,10 @@ async function runWavesIsolated(opts) {
     const ready = findReadyTickets(opts.tickets);
     if (ready.length === 0) break;
     waveNum++;
+    const readyNums = new Set(ready.map((t) => t.num));
+    const remaining2 = opts.tickets.filter(
+      (t) => t.status === "ready-for-agent" && !readyNums.has(t.num)
+    );
     d.startWave(
       waveNum,
       totalWaves,
@@ -1658,7 +1729,11 @@ async function runWavesIsolated(opts) {
         num: t.num,
         filename: t.filename
       })),
-      runProgress(opts.tickets)
+      runProgress(opts.tickets),
+      remaining2.map((t) => ({
+        num: t.num,
+        filename: t.filename
+      }))
     );
     const worktreeSettled = await Promise.allSettled(
       ready.map((t) => createWorktree({
@@ -1871,6 +1946,22 @@ async function runWavesIsolated(opts) {
             d.log(
               `  ${ticket.filename}: merge failed, staying ready-for-agent`
             );
+            if (branchResult.stderr) {
+              d.log(
+                "  git: " + branchResult.stderr.trim()
+              );
+            }
+            checkTicket(progress, ticket.num, {
+              branch: branchResult.branch,
+              exitCode: 0,
+              done: false
+            });
+            writeProgress(progressPath, progress);
+            await commitProgress(
+              repoRoot,
+              progressPath,
+              `nightralph: ${ticket.filename} merge failed`
+            );
           }
         }
       }