trantor 0.18.111 → 0.18.112

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.111",
+  "version": "0.18.112",
   "description": "Trantor — the hub-world for AI agent crews: live message bus, presence, project Kanban/flow board + crew orchestration for independent AI coding agents (Claude, Codex, Gemini, Kimi, DeepSeek)",
   "mcpServers": {
     "relay": {

package/hub/notifier.mjs

@@ -9,6 +9,14 @@ const APNS_HOSTS = {
 const JWT_REUSE_MS = 50 * 60 * 1000;
 const text = (value, max = 300) => String(value || "").slice(0, max);
 
+// #12137: ask alerts are keyed by a tool id string, but the APNs payload's id field is numeric —
+// a stable FNV-1a hash bridges the two, and the toolId string rides along so the phone can match.
+function hashId(s) {
+  let h = 0x811c9dc5;
+  for (let i = 0; i < s.length; i++) { h ^= s.charCodeAt(i); h = Math.imul(h, 0x01000193) >>> 0; }
+  return h >>> 0;
+}
+
 function apnsTransport({ host, path, headers, body }) {
   return new Promise((resolve, reject) => {
     const session = http2.connect(`https://${host}`);
@@ -40,6 +48,10 @@ function apnsTransport({ host, path, headers, body }) {
 
 function clearFor(event) {
   // Whatever ends the item clears the phone's alert: decided, resolved, expired or withdrawn.
+  if (event.type === "ask.answered" && event.toolId) {
+    const toolId = text(event.toolId, 200);
+    return { kind: "ask", id: hashId(toolId), toolId, collapse: `ask-${toolId}`, project: text(event.project, 80), silent: true };
+  }
   const match = /^(hold|verify\.gate|proposal)\.(?:decided|resolved|closed|expired|withdrawn)$/.exec(event.type || "");
   if (!match) return null;
   const kind = match[1] === "verify.gate" ? "gate" : match[1];
@@ -62,6 +74,11 @@ function alertFor(event, state) {
     return { ...base, kind: "proposal", id: Number(event.proposalId), category: "PROPOSAL",
       title: `Proposal #${Number(event.proposalId)}`, body: text(event.scope) };
   }
+  if (event.type === "ask.opened" && event.toolId) {
+    const toolId = text(event.toolId, 200);
+    return { ...base, kind: "ask", id: hashId(toolId), toolId, collapse: `ask-${toolId}`,
+      title: `${base.project} asks`, body: text(event.question) };
+  }
   if (event.type === "message" && Number(event.msgId)) {
     return { ...base, kind: "message", id: Number(event.msgId), direct: true,
       title: `Message from ${text(event.by, 120)}`, body: text(event.text) };
@@ -116,9 +133,11 @@ export function createNotifier({ state, markDirty, canRead, transport = apnsTran
       ? { "content-available": 1 }
       : { alert: { title: delivery.title, body: delivery.body }, sound: "default" };
     if (delivery.category) aps.category = delivery.category;
-    const payload = JSON.stringify({ aps, kind: delivery.kind, id: delivery.id, project: delivery.project });
-    // kind in the id: hold #5 and gate #5 are different alerts
-    const collapseId = `${delivery.kind}-${delivery.id}`;
+    const body = { aps, kind: delivery.kind, id: delivery.id, project: delivery.project };
+    if (delivery.toolId) body.toolId = delivery.toolId;
+    const payload = JSON.stringify(body);
+    // kind in the id: hold #5 and gate #5 are different alerts; an ask collapses on its tool id
+    const collapseId = delivery.collapse || `${delivery.kind}-${delivery.id}`;
     try {
       const result = await transport({
         host: APNS_HOSTS[device.env] || APNS_HOSTS.production,

package/hub/routes/session.mjs

@@ -12,9 +12,11 @@ const EVENT_TEXT_MAX = 500;
 const PROMPT_TTL_MS = Number(process.env.RELAY_PROMPT_TTL_MS || 120000);
 const PROMPT_SWEEP_MS = Number(process.env.RELAY_PROMPT_SWEEP_MS || 30000);
 const EXPIRED_REASON = "No Mac is relaying this project. Is the Trantor app open?";
-const ACK_OUTCOMES = new Set(["delivered", "blocked", "not_ready", "stalled", "no_agent"]);
+const ACK_OUTCOMES = new Set(["delivered", "blocked", "not_ready", "stalled", "no_agent", "stale"]);
+const ANSWER_PICKS_MAX = 10;
+const ANSWER_OTHER_MAX = 2000;
 
-export function createSessionRuntime({ state, markDirty, appendEvent, pushEventToStreams }) {
+export function createSessionRuntime({ state, markDirty, appendEvent, pushEventToStreams, notifier }) {
   const now = () => Date.now();
   const mirrors = new Map();     // project -> { session, total, turns: Map(idx->turn), have, meta, updatedAt, host }
   state.sessionPrompts ||= [];
@@ -51,6 +53,7 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
     if (!m || m.session !== session) {
       m = { session, total: 0, turns: new Map(), have: 0, meta: {}, updatedAt: 0, host: "" };
       mirrors.set(project, m);
+      asked.delete(project);   // a session switch orphans the old asks; its alerts go stale on the phone
     }
     // The last turn grows while the assistant writes, so the desktop resends from the lowest
     // changed idx and the hub REPLACES by idx — re-sends are idempotent by construction.
@@ -81,16 +84,83 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
     m.updatedAt = now();
     m.host = String(b.host || auth?.identity?.name || "").slice(0, 120);
     pushEventToStreams({ ts: m.updatedAt, type: "chat.updated", project, total: m.total, working: m.meta.working });
+    scanAsks(m, project);
     return { code: 200, body: { ok: true, have: m.have } };
   }
 
+  // #12137: an unanswered AskUserQuestion block in the mirror raises ONE push per tool id
+  // ("<project> asks: <question>"); when the desktop republishes the block with its answer, the
+  // phone's alert is silently cleared. Dedupe is in-memory like the mirror itself, and ask events
+  // never touch the audit log — the prompt queue already carries the durable record.
+  const asked = new Map();     // project -> Set(toolId) alerted and still unanswered
+  function askNotify(event) {
+    try { notifier?.notify(event)?.catch?.(() => {}); } catch {}
+  }
+  function firstQuestion(blk) {
+    const a = blk?.ask;
+    if (Array.isArray(a) && a.length) return String(a[0]?.question ?? a[0] ?? "").slice(0, 300);
+    return String(blk?.text || "").slice(0, 300);
+  }
+  function scanAsks(m, project) {
+    if (!notifier) return;
+    for (const t of m.turns.values()) {
+      for (const blk of t.blocks) {
+        if (!blk || (blk.kind !== "ask" && !blk.ask)) continue;
+        const toolId = String(blk.toolId || blk.tool_id || "").slice(0, 200);
+        if (!toolId) continue;
+        let seen = asked.get(project);
+        if (blk.answer) {
+          if (seen?.has(toolId)) {
+            seen.delete(toolId);
+            askNotify({ type: "ask.answered", project, by: m.host, toolId });
+          }
+        } else if (!seen?.has(toolId)) {
+          if (!seen) { seen = new Set(); asked.set(project, seen); }
+          seen.add(toolId);
+          askNotify({ type: "ask.opened", project, by: m.host, toolId, question: firstQuestion(blk) });
+        }
+      }
+    }
+  }
+
   async function route({ req, res, q, P, auth, ctx }) {
     const isChat = P === "/session/chat";
     const isPrompts = P === "/session/prompts";
     const isPrompt = P === "/session/prompt" || P === "/session/prompt/claim" || P === "/session/prompt/ack";
-    if (!isChat && !isPrompts && !isPrompt) return false;
+    const isAnswer = P === "/session/answer";
+    if (!isChat && !isPrompts && !isPrompt && !isAnswer) return false;
     const { body, json, canon } = ctx;
 
+    // #12137: the phone's answer to an AskUserQuestion joins the SAME queue as a plain prompt,
+    // as kind "answer" — same claim, ack, expiry and audit trail; the desktop relay maps the
+    // picks to keystrokes and types them, or acks "stale" when the ask is gone.
+    if (req.method === "POST" && isAnswer) {
+      const b = await body(req);
+      const project = canon(String(b.project || "").slice(0, 80));
+      const session = String(b.session || "").slice(0, 200);
+      const toolId = String(b.toolId || "").slice(0, 200);
+      if (!project) return json(res, 400, { error: "project required" });
+      if (!session) return json(res, 400, { error: "session required" });
+      if (!toolId) return json(res, 400, { error: "toolId required" });
+      const picks = (Array.isArray(b.picks) ? b.picks : []).map(Number).filter(Number.isInteger).slice(0, ANSWER_PICKS_MAX);
+      const other = String(b.other || "").slice(0, ANSWER_OTHER_MAX);
+      if (!picks.length && !other.trim()) return json(res, 400, { error: "picks or other required" });
+      expireQueued();
+      state.sessionPromptSeq += 1;
+      const text = other.trim() ? other : `picks ${picks.join(", ")}`;
+      const p = { id: state.sessionPromptSeq, project, kind: "answer", session, toolId, picks, other,
+        text, by: String(auth?.identity?.name || "").slice(0, 120), ts: now(), status: "queued" };
+      state.sessionPrompts.push(p);
+      while (state.sessionPrompts.length > PROMPT_CAP) {
+        const ti = state.sessionPrompts.findIndex(x => x.status !== "queued" && x.status !== "claimed");
+        state.sessionPrompts.splice(ti >= 0 ? ti : 0, 1);
+      }
+      markDirty();
+      appendEvent("chat.prompt.queued", project, p.by, { promptId: p.id, kind: "answer", toolId, text: text.slice(0, EVENT_TEXT_MAX) });
+      pushEventToStreams({ ts: p.ts, type: "chat.prompt", id: p.id, project });
+      return json(res, 200, { id: p.id, status: "queued" });
+    }
+
     if (req.method === "POST" && isChat) {
       const b = await body(req);
       // the same canon the GET reads with, or a publish and a read could name two mirrors
@@ -130,13 +200,24 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
       return json(res, 200, { id: p.id, status: "queued" });
     }
 
+    // The public view of a queue row: plain prompts are kind "prompt"; answers carry their
+    // session, toolId, picks and other so the claiming desktop has everything it needs.
+    const promptView = (p) => {
+      const view = { id: p.id, project: p.project, text: p.text, by: p.by, ts: p.ts, status: p.status, kind: p.kind || "prompt" };
+      if (p.kind === "answer") {
+        view.session = p.session; view.toolId = p.toolId; view.picks = p.picks;
+        if (p.other && p.other.trim()) view.other = p.other;   // absent, never "", when nothing was typed
+      }
+      return view;
+    };
+
     if (req.method === "GET" && isPrompts) {
       expireQueued();
       const project = canon(String(q.project || "").slice(0, 80));
       const status = String(q.status || "").slice(0, 40);
       const prompts = state.sessionPrompts
         .filter(p => (!project || p.project === project) && (!status || p.status === status))
-        .map(p => ({ id: p.id, project: p.project, text: p.text, by: p.by, ts: p.ts, status: p.status }));
+        .map(promptView);
       return json(res, 200, { prompts });
     }
 
@@ -150,7 +231,7 @@ export function createSessionRuntime({ state, markDirty, appendEvent, pushEventT
       p.status = "claimed"; p.host = String(b.host || "").slice(0, 120); p.claimedAt = now();
       markDirty();
       // The full text goes only to the claimer.
-      return json(res, 200, { ok: true, prompt: { id: p.id, project: p.project, text: p.text, by: p.by, ts: p.ts } });
+      return json(res, 200, { ok: true, prompt: promptView(p) });
     }
 
     if (req.method === "POST" && P === "/session/prompt/ack") {

package/hub.mjs

@@ -128,7 +128,7 @@ const context = {
 };
 const sessionChat = createSessionRuntime({
   state: store.state, markDirty: store.markDirty,
-  appendEvent: events.appendEvent, pushEventToStreams: events.pushEventToStreams,
+  appendEvent: events.appendEvent, pushEventToStreams: events.pushEventToStreams, notifier,
 });
 const routes = [routeDevices, routeAdmin, routeCards, routeInsights, routeMessages, sessionChat.route];
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trantor",
-  "version": "0.18.111",
+  "version": "0.18.112",
   "type": "module",
   "bin": {
     "trantor": "bin/cli.mjs"