@higherdev/cli 0.21.0 → 0.23.0

package/dist/api.js

@@ -58,6 +58,9 @@ export async function queueTicket(key, config = loadConfig()) {
 export async function cancelTicket(key, config = loadConfig()) {
     return request(config, "POST", `/api/w/${config.slug}/tickets/${encodeURIComponent(key)}/cancel`);
 }
+export async function mergeTicket(key, reason, config = loadConfig()) {
+    return request(config, "POST", `/api/w/${config.slug}/tickets/${encodeURIComponent(key)}/merge`, { reason: reason ?? "", by: "owner" }, true);
+}
 export async function listTicketRunEvents(key, afterAt, afterId, config = loadConfig()) {
     const query = new URLSearchParams();
     if (afterAt)

package/dist/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { approveEpic, answerDecision, cancelTicket, createEpic, deleteAgent, deleteEpic, getStatus, getRoadmap, getWorkspace, listAgents, listEpics, listHostEnv, listMessages, listWorkspaceEnv, listTicketRunEvents, listTickets, listWorkspaces, postMessage, queueTicket, removeWorkspaceEnv, removeHostEnv, setPaused, setWorkspaceEnv, setHostEnv, showTicket, updateAgent, updateEpic, updateCaps, } from "./api.js";
+import { approveEpic, answerDecision, cancelTicket, mergeTicket, createEpic, deleteAgent, deleteEpic, getStatus, getRoadmap, getWorkspace, listAgents, listEpics, listHostEnv, listMessages, listWorkspaceEnv, listTicketRunEvents, listTickets, listWorkspaces, postMessage, queueTicket, removeWorkspaceEnv, removeHostEnv, setPaused, setWorkspaceEnv, setHostEnv, showTicket, updateAgent, updateEpic, updateCaps, } from "./api.js";
 import { formatDrainStatus, hostRoll, initHost, parseHostFlags, parseHostRollFlags } from "./host.js";
 import { login, parseLoginFlags } from "./login.js";
 import { loadConfig } from "./config.js";
@@ -139,7 +139,16 @@ async function cmdTicket(argv, deps = {}) {
         console.log(`${c.bold(ticket.key)}  ${statusChip(ticket.status)}`);
         return;
     }
-    fail("usage: hd ticket list | show KEY | new --title TITLE | queue KEY | cancel KEY");
+    if (action === "merge") {
+        const parsed = flags(rest);
+        const key = parsed.rest[0];
+        if (!key || parsed.rest.length !== 1)
+            fail("usage: hd ticket merge KEY [--reason TEXT]");
+        const { ticket } = await mergeTicket(key.toUpperCase(), parsed.opts.reason);
+        console.log(`${c.bold(ticket.key)}  ${statusChip(ticket.status)}`);
+        return;
+    }
+    fail("usage: hd ticket list | show KEY | new --title TITLE | queue KEY | cancel KEY | merge KEY");
 }
 async function cmdEpic(argv) {
     const [action, ...rest] = argv;

package/dist/out.js

@@ -64,7 +64,7 @@ export function usage() {
     return [
         c.bold("Usage"),
         `  ${c.blue("hd status")}                         workspace overview`,
-        `  ${c.blue("hd ticket list | show KEY [--json] | new [PATH] | queue | cancel")} ticket operations`,
+        `  ${c.blue("hd ticket list | show KEY [--json] | new [PATH] | queue | cancel | merge")} ticket operations`,
         `  ${c.blue("hd epic new PATH | list | approve | rm")} epic operations`,
         `  ${c.blue("hd roadmap [--json]")}               ordered workspace roadmap`,
         `  ${c.blue("hd plan")}                           use /architect in the TUI`,

package/dist/tui/App.js

@@ -24,7 +24,7 @@ import { alertOnce } from "./alert.js";
 import { bubbleRows } from "./height.js";
 import { planLayout, splitPanels } from "./layout.js";
 import { parseLine } from "./parse.js";
-import { configuredSlugs, acknowledgeInbox, approveEpic, cancelTicket, createEpicFromFile, decisionOptions, deleteAgent, deleteEpic, followChat, loadChatMessages, loadLiveEvents, listWorkspaceEnv, loadTicketDetail, POLL_MS, pollSnapshot, postAgentMessage, postTicketMessage, queueTicket, resolveDecision, selectDecision, setWorkspacePaused, switchWorkspace, updateAgent, updateProviderCap, updateWorkspace, } from "./data.js";
+import { configuredSlugs, acknowledgeInbox, approveEpic, cancelTicket, mergeTicket, createEpicFromFile, decisionOptions, deleteAgent, deleteEpic, followChat, loadChatMessages, loadLiveEvents, listWorkspaceEnv, loadTicketDetail, POLL_MS, pollSnapshot, postAgentMessage, postTicketMessage, queueTicket, resolveDecision, selectDecision, setWorkspacePaused, switchWorkspace, updateAgent, updateProviderCap, updateWorkspace, } from "./data.js";
 import { inputActive, NO_REPLY_NOTE, promptPlaceholder, REPLY_WAIT_MS } from "./chat-wait.js";
 import { answeredLine, decisionHeaderIndex, decisionIdAt, moveDecisionFocus, nextUnanswered, resolveDecisionAnswer, } from "./decide-nav.js";
 import { EARLIER_PAGE } from "./inbox.js";
@@ -693,6 +693,20 @@ export function App({ initial }) {
                     setBusy(false);
                 }
                 return;
+            case "merge":
+                setBusy(true);
+                try {
+                    const { ticket: merged } = await mergeTicket(config, action.key);
+                    say("system", `${merged.key} approved over review.`);
+                    await refresh();
+                }
+                catch (error) {
+                    setNotice(error instanceof Error ? error.message : String(error));
+                }
+                finally {
+                    setBusy(false);
+                }
+                return;
             case "agent-add":
                 setBusy(true);
                 try {

package/dist/tui/Help.js

@@ -11,6 +11,7 @@ export const COMMANDS = [
     { name: "/ticket", args: "HD-12 | new [PATH.md]", help: "open a full ticket view or create one" },
     { name: "/queue", args: "HD-12", help: "queue a complete ticket now" },
     { name: "/cancel", args: "HD-12", help: "cancel a ticket" },
+    { name: "/merge", args: "HD-12", help: "approve a reviewed PR over the reviewer's objections" },
     { name: "/msg", args: "HD-12 TEXT", help: "message a ticket's builder" },
     { name: "/logs", args: "[raw] [HD-12]", help: "filter activity; raw reveals event JSON" },
     { name: "/epic", args: "new PATH | approve ID | rm ID", help: "create, approve, or remove a draft epic" },

package/dist/tui/chat-view.js

@@ -1,5 +1,18 @@
 import { narrateEvents } from "./narrate.js";
 import { wrapLines } from "./ticket-view.js";
+export function chatInstructionEffects(body) {
+    const parts = [];
+    const answered = body.match(/Answered decision[^\n.;]*/i);
+    const queued = body.match(/HD-\d+ is queued/i);
+    const cap = body.match(/attempt cap is \d+/i);
+    if (answered)
+        parts.push(answered[0].trim().replace(/[.;]+$/, ""));
+    if (queued)
+        parts.push(queued[0].trim().replace(/[.;]+$/, ""));
+    if (cap)
+        parts.push(cap[0].trim().replace(/[.;]+$/, ""));
+    return parts.length ? parts.join("; ") : null;
+}
 /** Last 50 exchanges (a human turn and an agent turn) when rehydrating. */
 export const CHAT_EXCHANGE_LIMIT = 50;
 export const CHAT_MESSAGE_LIMIT = CHAT_EXCHANGE_LIMIT * 2;
@@ -96,6 +109,11 @@ export function chatViewLines(thread, width, label, now = Date.now()) {
                 lines.push({ key: `${turn.id}:body:${index}`, kind: "body", text });
             });
         }
+        if (turn.speaker !== "you") {
+            const effects = chatInstructionEffects(turn.body);
+            if (effects)
+                lines.push({ key: `${turn.id}:effects`, kind: "status", text: effects });
+        }
     }
     if (thread.pending) {
         const live = pendingActivity([], { started_at: thread.pending.startedAt, status: thread.pending.status }, label, now);

package/dist/tui/data.js

@@ -1,4 +1,4 @@
-import { approveEpic as approveEpicNow, answerDecision, cancelTicket as cancelTicketNow, createAgent as postAgent, createEpic as postEpic, deleteEpic as removeEpic, getStatus, getRoadmap, getRun, getWorkspace, listAgents, listFeed, listMessages, markMessagesDelivered, listWorkspaceEnv as getWorkspaceEnv, listTicketRunEvents, listTickets, listWorkspaces, postMessage as sendMessage, queueTicket as queueTicketNow, setPaused as setPausedNow, showTicket, updateAgent as patchAgent, updateCaps, updateWorkspace as patchWorkspace, deleteAgent as removeAgent, } from "../api.js";
+import { approveEpic as approveEpicNow, answerDecision, cancelTicket as cancelTicketNow, createAgent as postAgent, createEpic as postEpic, deleteEpic as removeEpic, getStatus, getRoadmap, getRun, getWorkspace, listAgents, listFeed, listMessages, markMessagesDelivered, listWorkspaceEnv as getWorkspaceEnv, listTicketRunEvents, listTickets, listWorkspaces, postMessage as sendMessage, mergeTicket as mergeTicketNow, queueTicket as queueTicketNow, setPaused as setPausedNow, showTicket, updateAgent as patchAgent, updateCaps, updateWorkspace as patchWorkspace, deleteAgent as removeAgent, } from "../api.js";
 import { loadConfig, switchWorkspace as selectWorkspace, } from "../config.js";
 import { readEpicSpec } from "../epics.js";
 import { EARLIER_PAGE } from "./inbox.js";
@@ -188,6 +188,9 @@ export async function queueTicket(config, key) {
 export async function cancelTicket(config, key) {
     return cancelTicketNow(key, config);
 }
+export async function mergeTicket(config, key, reason) {
+    return mergeTicketNow(key, reason, config);
+}
 export async function setWorkspacePaused(config, paused) {
     return setPausedNow(paused, config);
 }

package/dist/tui/parse.js

@@ -80,6 +80,9 @@ export function parseLine(raw) {
         case "cancel":
             return argument ? { kind: "cancel", key: argument.toUpperCase() }
                 : { kind: "unknown", command: "cancel needs a key" };
+        case "merge":
+            return argument ? { kind: "merge", key: argument.toUpperCase() }
+                : { kind: "unknown", command: "merge needs a key" };
         case "decide": {
             const dismiss = /(^|\s)--(skip|dismiss)(\s|$)/.test(argument);
             const words = argument.replace(/(^|\s)--(skip|dismiss)(\s|$)/g, " ").trim().split(/\s+/).filter(Boolean);

package/dist/tui/ticket-view.js

@@ -130,7 +130,7 @@ export function ticketViewLines(ticket, width, collapsed = []) {
             pushWrapped(lines, "timeline", "  ", event.headline, width);
             lines.push({
                 key: `${event.id}:meta`, kind: "line", section: "timeline",
-                text: `  ${event.outcome} · ${event.kind}/${event.provider} · ${elapsedLabel(event.elapsed_ms)}`,
+                text: `  ${event.outcome} · ${event.kind}/${event.provider ?? "owner"} · ${elapsedLabel(event.elapsed_ms)}`,
             });
             if (event.send_back_reason) {
                 pushWrapped(lines, "timeline", "  sent back because: ", event.send_back_reason, width);

package/package.json

@@ -1,7 +1,12 @@
 {
   "name": "@higherdev/cli",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "type": "module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/craig-higherops/hdx.git",
+    "directory": "apps/cli"
+  },
   "bin": {
     "hd": "dist/index.js"
   },