hilos-agent 0.1.4 → 0.1.6

package/README.md

@@ -4,21 +4,24 @@ Run **your own** coding agent — Claude Code, Codex, Cursor, or any command —
 an autonomous teammate inside a [hilos](https://hilos.sh) channel.
 
 It connects to hilos over MCP, watches for `@mentions` of your agent in a
-git-linked channel, runs your coding agent in a **local** checkout, and posts the
-proposed diff as a report card. **Nothing is pushed until a human approves in
-hilos.** Your code and your git/`gh` credentials never leave your machine — hilos
-only relays messages.
+git-linked channel (including thread replies), runs your coding agent in a
+**local** checkout, and — by default — **opens a PR for review**. Your code and
+your git/`gh` credentials never leave your machine — hilos only relays messages.
 
 ```
 hilos channel  ──MCP/HTTPS──▶  hilos-agent (your laptop)
   human: "@scout fix the navbar overflow"
-  agent: branches, runs your coding CLI, captures the diff
-  agent: posts a proposal card (NOT pushed)
-  human: Approve  ▶  agent: git push + gh pr create  ▶  posts the PR link
-         Reject   ▶  agent: discards the branch
-         Changes  ▶  agent: re-runs with your note, proposes again
+  agent: branches, runs your coding CLI, commits + pushes, opens a PR
+  agent: posts a report card with the PR link
+  human: Approve  ▶  hilos merges the PR
+         Reject   ▶  hilos closes the PR
+         Changes  ▶  agent re-works with your note
 ```
 
+Prefer **approve-before-push**? Set `"gate": true` — the agent then posts the
+proposed diff as a card and pushes only after you Approve (nothing leaves your
+machine until then).
+
 ## Quick start
 
 In hilos: open your agent's profile → **Connect** → copy the
@@ -39,9 +42,9 @@ Running from elsewhere, or want to map several repos explicitly? Use a config:
   "url": "https://hilos.sh/api/mcp",
   "token": "mgo_…",
   "repos": { "your-org/your-repo": "/Users/you/code/your-repo" },
-  "codingCmd": "claude -p",   // or "codex exec", "cursor-agent", any shell command
+  "codingCmd": "claude -p --permission-mode acceptEdits",  // or "codex exec", "cursor-agent", any command
   "defaultBranch": "main",
-  "gate": true                 // false = propose only, never push
+  "gate": false                // default: open a PR directly. true = approve-before-push
 }
 ```
 
@@ -57,18 +60,21 @@ hilos-agent --channel <id>   # scope to one channel
   `repos`. No mapping → the agent says so and stops.
 - **Run** — it branches off `defaultBranch` (refuses a dirty tree), runs
   `codingCmd` with the task, and stages the result.
-- **Propose** — the staged diff is posted as a report card. The agent then polls
-  for your decision.
-- **Approve / Reject / Request changes** — approve pushes with *your* `git`/`gh`
-  and opens a PR; reject discards the branch; request-changes re-runs with your
-  note (bounded rounds).
+- **Open a PR** (default) — it commits, pushes with *your* `git`/`gh`, opens a PR,
+  and posts a report card with the link. Review on the card: **Approve** merges,
+  **Reject** closes, **Request changes** re-works.
+- **Approve-before-push** (`gate:true`) — instead, it posts the staged diff as a
+  card and polls for your decision; **Approve** pushes + opens the PR, **Reject**
+  discards the branch, **Request changes** re-runs with your note (bounded rounds).
 
 ## Security
 
 The daemon runs a coding agent that can execute code in your repo — exactly as if
-you ran it in your terminal. hilos can only send text; **push is gated on a human
-approval recorded in hilos**, and uses your local credentials. Keep your token in
-the config file or `HILOS_TOKEN`, never in shared shell history.
+you ran it in your terminal — and uses *your* local `git`/`gh` to push. By default
+it opens a PR (nothing is force-merged; you review the PR, and merge/close run via
+hilos's GitHub App only for workspace owners/admins). Want a human checkpoint
+before anything is pushed? Set `"gate": true`. Keep your token in the config file
+or `HILOS_TOKEN`, never in shared shell history.
 
 ## Flags
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "hilos-agent",
-  "version": "0.1.4",
-  "description": "Run your own coding agent (Claude Code / Codex / Cursor) as an autonomous teammate in a hilos channel. Picks up @mentions, proposes a diff, and pushes only after a human approves — your code and credentials never leave your machine.",
+  "version": "0.1.6",
+  "description": "Run your own coding agent (Claude Code / Codex / Cursor) as an autonomous teammate in a hilos channel. Picks up @mentions in channels and threads, makes the change, and opens a PR for review — your code and credentials never leave your machine. (Approve-before-push is available via gate:true.)",
   "type": "module",
   "bin": {
     "hilos-agent": "bin/hilos-agent.mjs"

package/src/cli.mjs

@@ -0,0 +1,106 @@
+// Async CLI runner with a heartbeat. The coding CLI (`claude -p`, `codex`, …)
+// runs for minutes and — with the default output format — buffers everything
+// until it exits. The old blocking `spawnSync` froze the event loop, so the
+// terminal sat dead-silent the whole time and people assumed it had hung and
+// hit Ctrl+C (losing the run). This spawns asynchronously, captures output, and
+// logs a periodic "still working…" heartbeat so the run visibly stays alive.
+
+import { spawn } from "node:child_process";
+
+/** Human-readable elapsed time: "45s", "2m 3s". */
+export function fmtElapsed(ms) {
+  const total = Math.max(0, Math.round(ms / 1000));
+  const m = Math.floor(total / 60);
+  const s = total % 60;
+  return m > 0 ? `${m}m ${s}s` : `${s}s`;
+}
+
+// Guard against a pathological run flooding memory; the CLI's result is small.
+const MAX_CAPTURE_BYTES = 50 * 1024 * 1024;
+
+/**
+ * @typedef {Object} RunCliOptions
+ * @property {string} cmd - command to run
+ * @property {string[]} [args] - arguments
+ * @property {string} [cwd] - working directory
+ * @property {number} [timeoutMs] - kill the child after this long (0 = no timeout)
+ * @property {string} [label] - verb shown in the heartbeat ("coding"/"thinking")
+ * @property {number} [heartbeatMs] - heartbeat interval (0 = no heartbeat)
+ * @property {() => number} [now] - clock, injectable for tests
+ * @property {{ log: (m: string) => void }} [log] - logger, injectable for tests
+ */
+
+/**
+ * Run `cmd args` to completion without blocking the event loop.
+ *
+ * Returns a spawnSync-shaped result so callers can swap it in directly:
+ *   { status: number|null, stdout: string, stderr: string, error: Error|null }
+ * `status` is the exit code, or null if the process failed to start or was
+ * killed (timeout). On timeout the child is SIGKILLed and `error` is set.
+ *
+ * @param {RunCliOptions} opts
+ */
+export function runCli(opts) {
+  const {
+    cmd,
+    args = [],
+    cwd,
+    timeoutMs = 0,
+    label = "working",
+    heartbeatMs = 15000,
+    now = Date.now,
+    log = console,
+  } = opts || {};
+  return new Promise((resolve) => {
+    let child;
+    try {
+      child = spawn(cmd, args, { cwd });
+    } catch (error) {
+      resolve({ status: null, stdout: "", stderr: "", error });
+      return;
+    }
+
+    let stdout = "";
+    let stderr = "";
+    // Decode at the stream level so a multibyte char split across chunks isn't
+    // corrupted (the chat path posts stdout verbatim). Matches spawnSync's utf8.
+    child.stdout?.setEncoding("utf8");
+    child.stderr?.setEncoding("utf8");
+    const append = (buf, chunk) =>
+      buf.length >= MAX_CAPTURE_BYTES ? buf : buf + chunk;
+    child.stdout?.on("data", (c) => (stdout = append(stdout, c)));
+    child.stderr?.on("data", (c) => (stderr = append(stderr, c)));
+
+    const start = now();
+    const beat =
+      heartbeatMs > 0
+        ? setInterval(() => {
+            log.log(`  … still ${label} (${fmtElapsed(now() - start)}) — Ctrl+C to cancel`);
+          }, heartbeatMs)
+        : null;
+    if (beat?.unref) beat.unref();
+
+    let timedOut = false;
+    const timer =
+      timeoutMs > 0
+        ? setTimeout(() => {
+            timedOut = true;
+            child.kill("SIGKILL");
+          }, timeoutMs)
+        : null;
+    if (timer?.unref) timer.unref();
+
+    const finish = (status, error) => {
+      if (beat) clearInterval(beat);
+      if (timer) clearTimeout(timer);
+      resolve({
+        status,
+        stdout,
+        stderr,
+        error: error || (timedOut ? new Error(`timed out after ${fmtElapsed(timeoutMs)}`) : null),
+      });
+    };
+    child.on("error", (error) => finish(null, error));
+    child.on("close", (code) => finish(code, null));
+  });
+}

package/src/config.mjs

@@ -43,9 +43,14 @@ const DEFAULTS = {
   token: "",
   channelId: "", // when set, watch only this channel (the per-channel override)
   repos: {},
-  codingCmd: "claude -p",
+  // acceptEdits lets the CLI make file edits without prompting (bias to action);
+  // it still won't run arbitrary commands. Override in hilos-agent.json if you
+  // want a stricter (or `--dangerously-skip-permissions`) command.
+  codingCmd: "claude -p --permission-mode acceptEdits",
   defaultBranch: "main",
-  gate: true,
+  // Bias to action: open a PR directly for review (approve = merge on the card).
+  // Set gate:true for the older approve-before-push flow (propose a diff, wait).
+  gate: false,
   maxRounds: 3,
   pollMs: 5000,
   runTimeoutMs: 600000,
@@ -89,7 +94,8 @@ export function writeStarterConfig(path, partial = {}) {
     repos: partial.repos || { "owner/name": "/absolute/path/to/checkout" },
     codingCmd: partial.codingCmd || DEFAULTS.codingCmd,
     defaultBranch: DEFAULTS.defaultBranch,
-    gate: true,
+    // false = open a PR directly (bias to action); true = approve-before-push.
+    gate: false,
   };
   writeFileSync(target, JSON.stringify(starter, null, 2) + "\n");
   return target;

package/src/daemon.mjs

@@ -72,7 +72,11 @@ export function buildProposalReport(o) {
     o.diffText +
     (o.truncated ? `\n… (+${o.omittedLines} more lines)` : "") +
     "\n```";
-  const summary = `Proposed changes for: ${firstLine}\n\n${statLine}\n\n${diffBlock}`;
+  // Tag whoever asked so the proposal lands in their notifications, not just
+  // the channel. Handle matches the server's @-mention format (kebab of name).
+  const handle = mentionHandle(o.requester);
+  const lead = handle ? `@${handle} — proposed changes for: ${firstLine}` : `Proposed changes for: ${firstLine}`;
+  const summary = `${lead}\n\n${statLine}\n\n${diffBlock}`;
   const caveats = ["Not pushed yet — approve to push + open a PR, or reject to discard."];
   if (o.runFailed) caveats.push("The coding agent exited non-zero; review the diff carefully.");
   return { title: `Proposal: ${firstLine}`, summary, caveats, todos: [] };

package/src/handler.mjs

@@ -13,7 +13,15 @@ import {
   decisionKind,
   commitMessage,
   prTitleBody,
+  mentionHandle,
 } from "./daemon.mjs";
+import { runCli } from "./cli.mjs";
+
+/** `@handle` for the person who asked, so the report tags them. */
+function requesterTag(author) {
+  const handle = mentionHandle(author);
+  return handle ? `@${handle}` : "";
+}
 
 function defaultDeps() {
   return {
@@ -33,7 +41,7 @@ function defaultDeps() {
   };
 }
 
-async function awaitDecision({ tool, channelId, reportMessageId, cfg, deps }) {
+async function awaitDecision({ tool, channelId, reportMessageId, cfg, deps, parentId }) {
   if (!reportMessageId) return { kind: "timeout" };
   const deadline = deps.now() + cfg.decisionTimeoutMs;
   while (deps.now() < deadline) {
@@ -41,10 +49,20 @@ async function awaitDecision({ tool, channelId, reportMessageId, cfg, deps }) {
     const gr = await tool("get_report", { messageId: reportMessageId }).catch(() => null);
     if (gr && gr.found && gr.report) report = gr.report;
     if (!report) {
-      const { messages = [] } = await tool("read_channel", { channelId, limit: 200 }).catch(
-        () => ({ messages: [] }),
-      );
-      const m = messages.find((x) => x.id === reportMessageId);
+      // Fallback for servers without get_report. In a thread the report lives
+      // under the thread root (read_channel only returns top-level), so scan the
+      // thread there; otherwise scan the channel tail.
+      let candidates = [];
+      if (parentId) {
+        const t = await tool("get_thread", { parentId }).catch(() => null);
+        candidates = t && t.found ? [t.root, ...(t.replies ?? [])].filter(Boolean) : [];
+      } else {
+        const { messages = [] } = await tool("read_channel", { channelId, limit: 200 }).catch(
+          () => ({ messages: [] }),
+        );
+        candidates = messages;
+      }
+      const m = candidates.find((x) => x.id === reportMessageId);
       report = m && m.report ? m.report : null;
     }
     const kind = report ? decisionKind(report) : null;
@@ -54,12 +72,23 @@ async function awaitDecision({ tool, channelId, reportMessageId, cfg, deps }) {
   return { kind: "timeout" };
 }
 
-async function applyDecision({ decision, repoPath, branch, task, cfg, tool, channelId, deps }) {
+/** Attach a just-opened PR to the channel (best-effort) so its live pill shows. */
+async function linkPrFromUrl({ tool, channelId, url }) {
+  if (!url) return;
+  const m = /github\.com\/([^/]+\/[^/]+)\/pull\/(\d+)/.exec(url);
+  if (!m) return;
+  await tool("link_pr", { channelId, repoFullName: m[1], prNumber: Number(m[2]) }).catch(() => {});
+}
+
+async function applyDecision({ decision, repoPath, branch, task, requester, cfg, tool, channelId, deps, parentId }) {
+  const tag = requesterTag(requester);
+  const lead = tag ? `${tag} — ` : "";
   if (decision.kind === "approved") {
     // Guard: nothing staged → don't push an empty branch and falsely report "shipped".
     if (deps.git(repoPath, ["diff", "--cached", "--quiet"]).status === 0) {
       await tool("post_message", {
         channelId,
+        parentId,
         body: `Approved, but there are no staged changes to commit on \`${branch}\`.`,
       });
       return { status: "nothing-staged", branch };
@@ -68,6 +97,7 @@ async function applyDecision({ decision, repoPath, branch, task, cfg, tool, chan
     if (commit.status !== 0) {
       await tool("post_message", {
         channelId,
+        parentId,
         body: `Approved, but the commit failed: ${(commit.stderr || "").trim().slice(0, 300)}`,
       });
       return { status: "commit-failed", branch };
@@ -76,6 +106,7 @@ async function applyDecision({ decision, repoPath, branch, task, cfg, tool, chan
     if (push.status !== 0) {
       await tool("post_message", {
         channelId,
+        parentId,
         body: `Approved, but the push failed: ${(push.stderr || "").trim().slice(0, 300)}`,
       });
       return { status: "push-failed", branch };
@@ -84,14 +115,17 @@ async function applyDecision({ decision, repoPath, branch, task, cfg, tool, chan
     const pr = deps.openPR(repoPath, { title, body, branch, base: cfg.defaultBranch });
     await tool("post_report", {
       channelId,
+      parentId,
       title: `Shipped: ${title}`,
       summary:
         pr.ok && pr.url
-          ? `Pushed \`${branch}\` and opened a pull request.`
-          : `Pushed \`${branch}\`. Open a PR manually — \`gh\` failed.`,
+          ? `${lead}pushed \`${branch}\` and opened a pull request.`
+          : `${lead}pushed \`${branch}\`. Open a PR manually — \`gh\` failed.`,
       prUrl: pr.ok && pr.url ? pr.url : undefined,
       caveats: pr.ok ? [] : [`gh pr create failed: ${(pr.stderr || "").trim().slice(0, 200)}`],
     });
+    // Work produced a PR → attach it to the channel so its live pill shows up.
+    await linkPrFromUrl({ tool, channelId, url: pr.ok ? pr.url : null });
     return { status: "pushed", branch, prUrl: pr.ok ? pr.url : null };
   }
 
@@ -100,13 +134,14 @@ async function applyDecision({ decision, repoPath, branch, task, cfg, tool, chan
     deps.git(repoPath, ["clean", "-fd"]);
     deps.git(repoPath, ["switch", "-"]);
     deps.git(repoPath, ["branch", "-D", branch]);
-    await tool("post_message", { channelId, body: `Rejected — discarded \`${branch}\`.` });
+    await tool("post_message", { channelId, parentId, body: `Rejected — discarded \`${branch}\`.` });
     return { status: "discarded", branch };
   }
 
   if (decision.kind === "changes") {
     await tool("post_message", {
       channelId,
+      parentId,
       body: `Got it${decision.note ? `: ${decision.note}` : ""}. Leaving \`${branch}\` for a follow-up.`,
     });
     return { status: "changes", branch, note: decision.note };
@@ -114,6 +149,7 @@ async function applyDecision({ decision, repoPath, branch, task, cfg, tool, chan
 
   await tool("post_message", {
     channelId,
+    parentId,
     body: `Still awaiting review on \`${branch}\`. Re-mention me once you've decided.`,
   });
   return { status: "timeout", branch };
@@ -153,34 +189,47 @@ export function normalizeRemote(url) {
 }
 
 /** Run the configured CLI to produce a chat reply, using recent channel context. */
-async function respondConversationally({ message, channelId, tool, me, cfg }) {
+async function respondConversationally({ message, channelId, tool, me, cfg, repoLink, parentId }) {
   void message;
-  const { messages = [] } = await tool("read_channel", { channelId, limit: 20 }).catch(() => ({
-    messages: [],
-  }));
-  const transcript = messages
-    .map((m) => `${m.author}: ${m.body}`)
-    .join("\n")
-    .slice(-6000);
+  // In a thread, use the thread's own messages as context (and reply there);
+  // otherwise the recent channel tail. Threads are where conversations live, so
+  // the agent must follow the thread it was pinged in, not the whole channel.
+  let transcript;
+  if (parentId) {
+    const t = await tool("get_thread", { parentId }).catch(() => null);
+    const rows = t && t.found ? [t.root, ...(t.replies ?? [])].filter(Boolean) : [];
+    transcript = rows.map((m) => `${m.author}: ${m.body}`).join("\n").slice(-6000);
+  } else {
+    const { messages = [] } = await tool("read_channel", { channelId, limit: 20 }).catch(() => ({
+      messages: [],
+    }));
+    transcript = messages.map((m) => `${m.author}: ${m.body}`).join("\n").slice(-6000);
+  }
   const name = me?.agentName || "an assistant";
+  // Tell the agent what the room is connected to so it doesn't ask "which repo?".
+  const repoLine = repoLink
+    ? `This channel is connected to the repository ${repoLink.repo_full_name}; assume that repo for any code work — don't ask which one.`
+    : `If asked to change code, note that a repo isn't linked to this channel yet.`;
   const prompt =
     `You are ${name}, a teammate in a team chat (hilos). Reply to the latest message ` +
     `concisely and directly as a single chat message — no preamble, no headings. ` +
-    `If asked to change code, note that a repo isn't linked to this channel yet.\n\n` +
+    `${repoLine}\n\n` +
     `Conversation so far:\n${transcript}`;
 
   const parts = cfg.codingCmd.split(" ").filter(Boolean);
-  console.log(`  chat → running \`${cfg.codingCmd}\`…`);
-  const run = spawnSync(parts[0], [...parts.slice(1), prompt], {
-    encoding: "utf8",
-    timeout: cfg.runTimeoutMs,
-    maxBuffer: 50 * 1024 * 1024,
+  console.log(`  chat → running \`${cfg.codingCmd}\` (output appears when it finishes)…`);
+  const run = await runCli({
+    cmd: parts[0],
+    args: [...parts.slice(1), prompt],
+    timeoutMs: cfg.runTimeoutMs,
+    label: "thinking",
   });
   const reply = (run.stdout || "").trim();
   if (run.error) console.log(`  ! ${parts[0]} failed to start: ${run.error.message}`);
   console.log(`  chat → ${reply ? `replied (${reply.length} chars)` : "no output"}; posting`);
   await tool("post_message", {
     channelId,
+    parentId: parentId ?? null,
     body: reply || `(my CLI returned nothing — is \`${cfg.codingCmd}\` installed and on PATH?)`,
   });
 }
@@ -189,13 +238,15 @@ async function respondConversationally({ message, channelId, tool, me, cfg }) {
 export async function handleTask({ message, channelId, tool, me }, cfg, depsOverride) {
   const deps = depsOverride || defaultDeps();
   const git = deps.git;
+  // When the mention was a thread reply, keep the whole exchange in that thread.
+  const parentId = message.parentId ?? null;
 
   const { links = [] } = await tool("get_links", { channelId }).catch(() => ({ links: [] }));
   const repoLink = links.find((l) => l.repo_full_name);
   // Chat (no repo linked, OR a greeting/question even in a repo channel) →
   // reply via the CLI. Only an actual code request runs the branch/diff/PR flow.
   if (!repoLink || !looksLikeCodeTask(message.body)) {
-    await respondConversationally({ message, channelId, tool, me, cfg });
+    await respondConversationally({ message, channelId, tool, me, cfg, repoLink, parentId });
     return { status: "chat" };
   }
   const repoFullName = repoLink.repo_full_name;
@@ -213,6 +264,7 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
   if (!repoPath) {
     await tool("post_message", {
       channelId,
+      parentId,
       body:
         `I don't have a local checkout of ${repoFullName}. Either run me from inside that ` +
         `repo, or add it to your hilos-agent.json: "repos": { "${repoFullName}": "/abs/path" }.`,
@@ -222,12 +274,13 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
 
   const status = git(repoPath, ["status", "--porcelain"]);
   if (status.status !== 0) {
-    await tool("post_message", { channelId, body: `Can't read git status in ${repoPath}.` });
+    await tool("post_message", { channelId, parentId, body: `Can't read git status in ${repoPath}.` });
     return { status: "git-error" };
   }
   if (status.stdout.trim()) {
     await tool("post_message", {
       channelId,
+      parentId,
       body: `Working tree at ${repoPath} is dirty — commit or stash first.`,
     });
     return { status: "dirty" };
@@ -239,6 +292,7 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
   if (co.status !== 0) {
     await tool("post_message", {
       channelId,
+      parentId,
       body: `Couldn't create branch \`${branch}\`: ${co.stderr.trim()}`,
     });
     return { status: "branch-error" };
@@ -246,17 +300,22 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
 
   await tool("post_message", {
     channelId,
+    parentId,
     body: `On it — working in ${repoFullName} on \`${branch}\`.`,
   });
 
   const parts = cfg.codingCmd.split(" ").filter(Boolean);
-  const proposeRound = async (promptText) => {
-    console.log(`  code → running \`${cfg.codingCmd}\` in ${repoPath}…`);
-    const run = spawnSync(parts[0], [...parts.slice(1), promptText], {
+  // Run the CLI and stage everything it changed; return the diff stats (no post).
+  const runAndStage = async (promptText) => {
+    console.log(
+      `  code → running \`${cfg.codingCmd}\` in ${repoPath} (this can take a few minutes; output appears when it finishes)…`,
+    );
+    const run = await runCli({
+      cmd: parts[0],
+      args: [...parts.slice(1), promptText],
       cwd: repoPath,
-      encoding: "utf8",
-      timeout: cfg.runTimeoutMs,
-      maxBuffer: 50 * 1024 * 1024,
+      timeoutMs: cfg.runTimeoutMs,
+      label: "coding",
     });
     if (run.error) console.log(`  ! ${parts[0]} failed to start: ${run.error.message}`);
     git(repoPath, ["add", "-A"]);
@@ -265,27 +324,34 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
       console.log("  code → no changes produced");
       return { empty: true };
     }
-    console.log("  code → diff captured; posting proposal");
+    console.log("  code → diff captured");
     const stat = parseShortstat(git(repoPath, ["diff", "--cached", "--shortstat"]).stdout);
     const { text: diffText, truncated, omittedLines } = truncateDiff(diff);
+    return { empty: false, diffText, truncated, omittedLines, stat, runFailed: run.status !== 0 };
+  };
+
+  // Post a proposal card (approve-before-push mode) from a staged change.
+  const postProposal = async (staged) => {
     const report = buildProposalReport({
       task: message.body,
+      requester: message.author,
       repoFullName,
       branch,
-      diffText,
-      truncated,
-      omittedLines,
-      stat,
-      runFailed: run.status !== 0,
+      diffText: staged.diffText,
+      truncated: staged.truncated,
+      omittedLines: staged.omittedLines,
+      stat: staged.stat,
+      runFailed: staged.runFailed,
     });
-    const res = await tool("post_report", { channelId, ...report });
-    return { reportMessageId: res?.messageId ?? null, stat };
+    const res = await tool("post_report", { channelId, parentId, ...report });
+    return { reportMessageId: res?.messageId ?? null, stat: staged.stat };
   };
 
-  let proposal = await proposeRound(message.body);
-  if (proposal.empty) {
+  const staged = await runAndStage(message.body);
+  if (staged.empty) {
     await tool("post_message", {
       channelId,
+      parentId,
       body: `No changes were produced. Cleaning up \`${branch}\`.`,
     });
     git(repoPath, ["switch", "-"]);
@@ -293,30 +359,48 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
     return { status: "no-changes" };
   }
 
+  // Bias to action (default): commit, push, and open a PR for review now — the
+  // report card's Approve merges it. `gate:true` keeps the older
+  // propose-a-diff-and-wait flow for users who want approve-before-push.
   if (!cfg.gate) {
-    return { status: "proposed", branch, reportMessageId: proposal.reportMessageId, stat: proposal.stat };
+    const result = await applyDecision({
+      decision: { kind: "approved" },
+      repoPath,
+      branch,
+      task: message.body,
+      requester: message.author,
+      cfg,
+      tool,
+      channelId,
+      deps,
+      parentId,
+    });
+    return { ...result, stat: staged.stat };
   }
 
-  let decision = await awaitDecision({ tool, channelId, reportMessageId: proposal.reportMessageId, cfg, deps });
+  let proposal = await postProposal(staged);
+  let decision = await awaitDecision({ tool, channelId, reportMessageId: proposal.reportMessageId, cfg, deps, parentId });
   const maxRounds = cfg.maxRounds || 3;
   let round = 1;
   while (decision.kind === "changes" && round < maxRounds) {
     await tool("post_message", {
       channelId,
+      parentId,
       body: `Revising with your feedback${decision.note ? `: ${decision.note}` : ""} (round ${round + 1}/${maxRounds}).`,
     });
-    const refined = await proposeRound(
+    const refined = await runAndStage(
       `${message.body}\n\nReviewer feedback to address: ${decision.note || "(see the channel)"}`,
     );
     if (refined.empty) {
       await tool("post_message", {
         channelId,
+        parentId,
         body: `That feedback produced no further changes — leaving \`${branch}\` as proposed.`,
       });
       break;
     }
-    proposal = refined;
-    decision = await awaitDecision({ tool, channelId, reportMessageId: proposal.reportMessageId, cfg, deps });
+    proposal = await postProposal(refined);
+    decision = await awaitDecision({ tool, channelId, reportMessageId: proposal.reportMessageId, cfg, deps, parentId });
     round += 1;
   }
 
@@ -325,10 +409,12 @@ export async function handleTask({ message, channelId, tool, me }, cfg, depsOver
     repoPath,
     branch,
     task: message.body,
+    requester: message.author,
     cfg,
     tool,
     channelId,
     deps,
+    parentId,
   });
   return { ...result, reportMessageId: proposal.reportMessageId, stat: proposal.stat, rounds: round };
 }

package/src/mcp.mjs

@@ -1,5 +1,15 @@
 // Minimal MCP-over-HTTP client (JSON-RPC 2.0). Dependency-free: uses global
 // fetch (Node >= 18). One bearer token, one endpoint.
+import os from "node:os";
+
+// Best-effort host label so hilos can show "whose machine" this daemon runs on.
+const CLIENT = (() => {
+  try {
+    return `${os.userInfo().username}@${os.hostname()}`;
+  } catch {
+    return os.hostname?.() || "";
+  }
+})();
 
 export function makeClient({ url, token }) {
   let id = 0;
@@ -7,7 +17,11 @@ export function makeClient({ url, token }) {
   async function rpc(method, params) {
     const res = await fetch(url, {
       method: "POST",
-      headers: { "content-type": "application/json", authorization: `Bearer ${token}` },
+      headers: {
+        "content-type": "application/json",
+        authorization: `Bearer ${token}`,
+        ...(CLIENT ? { "x-hilos-client": CLIENT } : {}),
+      },
       body: JSON.stringify({ jsonrpc: "2.0", id: ++id, method, params }),
     });
     if (!res.ok) {