huddle-cli 0.1.0 → 0.1.1

package/dist/mcp/server.js

@@ -8,6 +8,8 @@
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { contextTools, toContent } from "./context-tools.js";
+import { packageInfo } from "../preflight.js";
 const ROOM = process.env.HUDDLE_ROOM_URL ?? "http://localhost:4737";
 const AGENT = process.env.HUDDLE_AGENT_ID ?? "unknown-agent";
 // Proves to the Room that this call comes from one of this session's own agents.
@@ -105,11 +107,11 @@ const TOOLS = [
     },
     {
         name: "huddle_remember",
-        description: "Write to SHARED MEMORY so other agents learn from you. kind = decision | fact | gotcha. Always include 'why' — teammates need the reasoning, not just the what.",
+        description: "Write to SHARED MEMORY so other agents learn from you. kind = decision | fact | gotcha | lesson. Always include 'why' — teammates need the reasoning, not just the what. kind=lesson is also kept for FUTURE runs in this repo: one short, general rule you'd want next time (e.g. 'run npm run typecheck too: npm test doesn't type-check').",
         inputSchema: {
             type: "object",
             properties: {
-                kind: { type: "string", enum: ["decision", "fact", "gotcha"] },
+                kind: { type: "string", enum: ["decision", "fact", "gotcha", "lesson"] },
                 body: { type: "string" },
                 why: { type: "string" },
             },
@@ -141,7 +143,7 @@ const TOOLS = [
     },
     {
         name: "huddle_send",
-        description: "Message a teammate agent directly: a heads-up ('I renamed X to Y'), an interface you're exposing, or an answer to their question (pass reply_to = the question's id). `to` = an agent id from huddle_peers, a task id, or \"all\" for everyone working now. They see it the next time they call any huddle tool.",
+        description: "Message a teammate agent directly: a heads-up ('I renamed X to Y'), an interface you're exposing, or an answer to their question (pass reply_to = the question's id). `to` = an agent id from huddle_peers, a task id, \"all\" for everyone working now, or \"huddle\" to answer Huddle itself. They see it the next time they call any huddle tool.",
         inputSchema: {
             type: "object",
             properties: {
@@ -154,10 +156,30 @@ const TOOLS = [
         handler: (a) => room("/send", "POST", { to: a.to, message: a.message, reply_to: a.reply_to }),
     },
     {
-        name: "huddle_inbox",
-        description: "Read messages and questions teammates sent you (marks them read). Any huddle tool result that says 'unread_messages' means: call this now. Answer questions with huddle_send(reply_to=…).",
+        name: "huddle_contract",
+        description: "Read the team's CONTRACT: the exact cross-task names everyone codes to (files and owners, function signatures, data fields, CLI flags, routes, error strings), its version, and every amendment since. Check it before you name anything another task uses.",
         inputSchema: { type: "object", properties: {} },
-        handler: () => room("/inbox", "GET"),
+        handler: () => room("/contract", "GET"),
+    },
+    {
+        name: "huddle_amend_contract",
+        description: "Change or add a name in the CONTRACT (a signature, a field, a file owner, an error string) when your task needs one that isn't there or is wrong. Bumps the version and messages every teammate working now. Never invent a name another task depends on without this.",
+        inputSchema: {
+            type: "object",
+            properties: {
+                section: { type: "string", description: "what part it changes, e.g. 'store.js exports' or 'error strings'" },
+                change: { type: "string", description: "the exact new name/signature/shape" },
+                why: { type: "string" },
+            },
+            required: ["section", "change", "why"],
+        },
+        handler: (a) => room("/amend_contract", "POST", { section: a.section, change: a.change, why: a.why }),
+    },
+    {
+        name: "huddle_inbox",
+        description: "Read messages and questions teammates sent you (marks them read). Huddle tool results already carry new ones (new_messages); call this for more, or with id for a message shown cut short. Answer questions with huddle_send(reply_to=…).",
+        inputSchema: { type: "object", properties: { id: { type: "string", description: "optional: one message's id" } } },
+        handler: (a) => room(a?.id ? `/inbox?id=${encodeURIComponent(String(a.id))}` : "/inbox", "GET"),
     },
     {
         name: "huddle_report_bug",
@@ -196,7 +218,9 @@ const TOOLS = [
     },
     {
         name: "huddle_done",
-        description: "Mark your task ready. This triggers the test-gate and, if green, the merge into main. Include a short summary of what you did.",
+        description: "Mark your task ready. This triggers the test-gate and, if green, the merge into main. Include a short summary of what you did. " +
+            "If a teammate's buddy note or a radar finding on your task has no answer yet, it is refused once with the list: fix each one, or reply " +
+            "huddle_send(to=<who sent it>, reply_to=<its id>, message=\"won't fix: <why>\"), then call huddle_done again.",
         inputSchema: {
             type: "object",
             properties: { task_id: { type: "string" }, summary: { type: "string" } },
@@ -204,6 +228,7 @@ const TOOLS = [
         },
         handler: (a) => room("/done", "POST", { task_id: a.task_id, summary: a.summary }),
     },
+    ...contextTools(room),
 ];
 /**
  * What an MCP host shows the model about the Plug as a whole: the verbs by
@@ -212,10 +237,12 @@ const TOOLS = [
  */
 export const PLUG_INSTRUCTIONS = `Huddle: you are one of several AI coding agents working on one repo at once, each in its own git worktree. These tools are how the team talks.
 - Start: huddle_board (the plan and who is doing what), huddle_recall (shared memory: decisions, contracts, the design council's notes: huddle_recall "council"), huddle_peers, huddle_inbox.
-- Before editing: huddle_announce_plan (what you will touch), huddle_check_overlap (is someone else in that file).
-- While working: huddle_progress (a short note; the reply shows the team's in-flight work), huddle_remember (a decision or contract others need), huddle_send (message one teammate), huddle_ask (ask a teammate or the brain a question), huddle_inbox (read replies).
+- Before editing: huddle_announce_plan (what you will touch), huddle_check_overlap (is someone else in that file), huddle_contract (the exact names tasks share).
+- Names other tasks use: code to the contract verbatim. Never invent one that isn't in it — huddle_amend_contract(section, change, why) first; it tells every teammate.
+- While working: huddle_progress (a short note; the reply shows the team's in-flight work), huddle_remember (a decision or contract others need; kind "lesson" is kept for future runs), huddle_send (message one teammate), huddle_ask (ask a teammate or the brain a question), huddle_inbox (read replies).
 - Sharing work: when huddle_offer_help reaches you, huddle_split hands part of your task to a free agent; huddle_take_backlog picks up the next task; huddle_claim takes a specific one.
 - QA rounds: huddle_report_bug files one reproducible bug in the merged build; it becomes a fix task for the file's author.
+- The shared screen (what the user pasted, dropped or uploaded — logs, docs, screenshots): huddle_context lists it, huddle_context_read opens one item in chunks (images/PDFs as a file path), huddle_context_search finds text in it, huddle_context_note pins a comment on an item for everyone.
 - Finish: huddle_done with a short summary. Huddle tests and merges it.`;
 /** The Plug's verb names, in the order listed to agents. */
 export const PLUG_VERBS = TOOLS.map((t) => t.name);
@@ -223,7 +250,7 @@ export async function runPlug() {
     // Attach mode (`huddle connect`): a session you started yourself, no scheduler.
     if (process.env.HUDDLE_LIVE)
         return (await import("../attach/plug.js")).runLivePlug();
-    const server = new Server({ name: "huddle", version: "0.1.0" }, { capabilities: { tools: {} }, instructions: PLUG_INSTRUCTIONS });
+    const server = new Server({ name: "huddle", version: packageInfo().version }, { capabilities: { tools: {} }, instructions: PLUG_INSTRUCTIONS });
     server.setRequestHandler(ListToolsRequestSchema, async () => ({
         tools: TOOLS.map((t) => ({ name: t.name, description: t.description, inputSchema: t.inputSchema })),
     }));
@@ -232,7 +259,7 @@ export async function runPlug() {
         if (!tool)
             throw new Error(`unknown tool: ${req.params.name}`);
         const result = await tool.handler((req.params.arguments ?? {}));
-        return { content: [{ type: "text", text: JSON.stringify(result, null, 2) }] };
+        return { content: toContent(result) };
     });
     const transport = new StdioServerTransport();
     await server.connect(transport);

package/dist/orchestrator/ask.js

@@ -1,11 +1,12 @@
 // One-shot, read-only questions to an agent: answering "where are we with
 // this project?" and planning a goal. Runs in the repo itself (no worktree),
 // with each vendor's read-only / plan mode, so nothing can be edited.
-import { spawn } from "node:child_process";
 import { randomUUID } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
+import { stopChild } from "./launcher.js";
+import { onFinished, spawnTool } from "../platform.js";
 /** Preference order for who answers questions and plans. */
 const ASK_ORDER = ["claude", "codex", "antigravity", "cursor", "gemini"];
 export function pickAsker(ready) {
@@ -16,21 +17,20 @@ export function askAgent(adapter, prompt, cwd, opts = {}) {
     const outFile = path.join(os.tmpdir(), `huddle-ask-${process.pid}-${Date.now()}-${randomUUID().slice(0, 8)}.txt`);
     const spec = adapter.ask({ prompt, cwd, outFile, model: opts.model, noTools: opts.noTools, quick: opts.quick });
     return new Promise((resolve) => {
-        const child = spawn(spec.cmd[0], spec.cmd.slice(1), { cwd: spec.cwd, stdio: ["ignore", "pipe", "pipe"] });
+        const child = spawnTool(spec.cmd, { cwd: spec.cwd, stdio: ["ignore", "pipe", "pipe"] }, { prompt, stdinPrompt: adapter.stdinPrompt });
         let out = "";
         let err = "";
         child.stdout.on("data", (d) => (out += d));
         child.stderr.on("data", (d) => (err += d));
         // SIGKILL after a grace period: a stalled CLI can ignore SIGTERM (seen live with cursor-agent).
-        const stop = () => {
-            if (child.exitCode !== null || child.signalCode !== null)
-                return;
-            child.kill("SIGTERM");
-            setTimeout(() => child.exitCode === null && child.signalCode === null && child.kill("SIGKILL"), 5000).unref();
-        };
+        const stop = () => stopChild(child);
         const timer = setTimeout(stop, opts.timeoutMs ?? 5 * 60_000);
         opts.signal?.addEventListener("abort", stop);
+        let over = false;
         const finish = (code) => {
+            if (over)
+                return;
+            over = true;
             clearTimeout(timer);
             let text = out;
             if (spec.usesOutFile) {
@@ -44,8 +44,11 @@ export function askAgent(adapter, prompt, cwd, opts = {}) {
             }
             resolve({ ok: code === 0 && text.trim().length > 0, text: text.trim() || err.trim() });
         };
-        child.on("exit", finish);
-        child.on("error", () => finish(-1));
+        // "exit" can arrive before the last of stdout has been read — when our event
+        // loop was busy (a merge's test run blocks it) the answer was lost and the
+        // review counted as timed out (found on CI). onFinished waits for the pipes
+        // to drain, but not forever: a CLI's leftover child can hold them open.
+        onFinished(child, finish);
     });
 }
 //# sourceMappingURL=ask.js.map

package/dist/orchestrator/brain.js

@@ -15,6 +15,8 @@ import fs from "node:fs";
 import path from "node:path";
 import { ADAPTERS } from "../adapters/index.js";
 import { askAgent } from "./ask.js";
+import { lessonsBrief } from "../room/lessons.js";
+import { screenForPlanner } from "../room/context.js";
 const OLLAMA = process.env.OLLAMA_HOST?.replace(/\/$/, "") || "http://127.0.0.1:11434";
 /** Models a local Ollama has pulled, or [] if Ollama isn't running. */
 export async function ollamaModels() {
@@ -100,8 +102,8 @@ export async function brainOptions(readyAgents) {
         out.push({ spec: "cursor:grok-4.7-low-fast", note: "cheap + fast, via your Cursor plan" });
     if (readyAgents.includes("claude")) {
         out.push({ spec: "claude:haiku", note: "smallest Claude — cheapest hosted option" });
-        out.push({ spec: "claude:sonnet", note: "default — plans in ~15s, a fraction of Opus's tokens" });
-        out.push({ spec: "claude", note: "Opus — strongest plans, most tokens" });
+        out.push({ spec: "claude:sonnet", note: "fast — plans in ~15s, a fraction of Opus's tokens" });
+        out.push({ spec: "claude:opus", note: "default — Opus, strongest plans, most tokens" });
     }
     if (readyAgents.includes("codex"))
         out.push({ spec: "codex", note: "your Codex default model" });
@@ -112,7 +114,7 @@ export async function brainOptions(readyAgents) {
  * manifest. ~a few thousand tokens; lets even a local model plan sensibly.
  */
 export function repoContext(cwd, maxFiles = 250) {
-    const files = (spawnSync("git", ["ls-files"], { cwd, encoding: "utf8" }).stdout ?? "").split("\n").filter(Boolean);
+    const files = (spawnSync("git", ["ls-files"], { cwd, encoding: "utf8" }).stdout ?? "").split(/\r?\n/).filter(Boolean);
     const head = (f, lines) => {
         try {
             return fs.readFileSync(path.join(cwd, f), "utf8").split("\n").slice(0, lines).join("\n");
@@ -159,6 +161,14 @@ export function repoContext(cwd, maxFiles = 250) {
             parts.push(`${f}:\n${body.trimEnd()}`);
         }
     }
+    // The planner and the council plan from this snapshot: what earlier runs taught goes with it.
+    const lessons = lessonsBrief({ repo: cwd }).trim();
+    if (lessons)
+        parts.push(lessons);
+    // What the user pasted / dropped: the index (+ small items), not N full copies.
+    const screen = screenForPlanner(cwd);
+    if (screen)
+        parts.push(screen);
     return parts.join("\n\n");
 }
 //# sourceMappingURL=brain.js.map