openmausbot 0.1.75 → 0.1.76

package/dist/index.html

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/svg+xml" href="/app-icon.svg" />
     <title>OpenMausBot</title>
-    <script type="module" crossorigin src="/assets/index-CeMbvsgx.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-DH7Zax6L.css">
+    <script type="module" crossorigin src="/assets/index-fKXFpB_J.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BtT047dk.css">
   </head>
   <body>
     <div id="root"></div>

package/dist-server/companion/src/routes.js

@@ -140,12 +140,16 @@ const ALLOWED = [
     { method: "POST", path: /^\/api\/routines\/[\w-]+\/run$/ },
     { method: "POST", path: /^\/api\/routine-runs\/[\w-]+\/(?:cancel|seen)$/ },
     // Multi-account Composio management exposes opaque ids and aliases only.
-    // Revocation stays on the host: the account DELETE route is deliberately
-    // absent — a paired client can see and add accounts, never remove one.
+    // Account-level removal is allowed: the handler still proves the account
+    // belongs to the host's own user before revoking, and a paired client can
+    // already add accounts — connectable but not disconnectable is the bug
+    // being fixed here. The whole-service DELETE stays denied: it belongs to
+    // the host.
     { method: "GET", path: /^\/api\/connectors\/catalog$/ },
     { method: "GET", path: /^\/api\/connectors\/connected$/ },
     { method: "GET", path: /^\/api\/connectors$/ },
     { method: "POST", path: /^\/api\/connectors\/[\w-]+\/authorize$/ },
+    { method: "DELETE", path: /^\/api\/connectors\/[\w-]+\/accounts\/[\w-]+$/ },
     // Inline connector cards are scoped by bot, transcript message, and
     // thread. They expose the same opaque OAuth authorization already allowed
     // above, then only poll, resume, or dismiss that exact pending card.

package/dist-server/drivers/agents-proxy.js

@@ -41,6 +41,7 @@ function isCredentialTargetId(value) {
 // server/agent-tool-policy.ts
 var READ_ONLY_AGENT_TOOL_NAMES = /* @__PURE__ */ new Set([
   "list_bots",
+  "list_team_setup",
   "list_rooms",
   "list_threads",
   "check_delegation",
@@ -63,6 +64,25 @@ function agentToolAnnotations(name) {
   return isReadOnlyAgentTool(name) ? READ_ONLY_ANNOTATIONS : void 0;
 }
 
+// server/peer-roster.ts
+var ROSTER_NAME_MAX = 80;
+var oneLine = (value) => {
+  let flattened = "";
+  for (let i = 0; i < value.length; i += 1) {
+    const code = value.charCodeAt(i);
+    const breaksOut = code < 32 || code >= 127 && code <= 159 || code === 8232 || code === 8233;
+    flattened += breaksOut ? " " : value[i];
+  }
+  return flattened.replace(/\s+/g, " ").trim();
+};
+var clip = (value, max) => {
+  const flat = oneLine(value);
+  return flat.length > max ? `${flat.slice(0, max - 1)}\u2026` : flat;
+};
+function peerName(value) {
+  return clip(value.replace(/[[\]]/g, " "), ROSTER_NAME_MAX);
+}
+
 // server/drivers/agents-proxy.ts
 var HARNESS = process.env.OMB_HARNESS_URL ?? "http://127.0.0.1:8799";
 var BOT_ID = process.env.OMB_BOT_ID ?? "";
@@ -313,14 +333,30 @@ var ROUTINE_FIELDS_SCHEMA = {
   }
 };
 var TOOLS = [
+  {
+    name: "list_room_targets",
+    description: "Discover actual OpenMausBot teammates and rooms in your allowed teams. Works in a normal bot conversation too; no room is required. Returns bot and room IDs, roles and working folders, never other conversations' history. Use these bots, not native coding helpers with similar names, when the user asks their team to work together.",
+    inputSchema: { type: "object", properties: {}, additionalProperties: false }
+  },
+  {
+    name: "coordinate_bots",
+    description: "Ask existing OpenMausBot teammates for advice or assign concrete work. From normal chat each assignment gets a separate recipient conversation; from a room it defaults to this room. Use group_id from list_room_targets for a specific room. Name 1-4 bot_ids: they receive only your brief and use their own model, tools and permissions. Busy bots queue. They can consult their specialists; all results return here and resume you automatically. Include exact file paths, constraints and what must be verified. After sending all assignments, END your turn; do not poll or wait. On return, resolve tradeoffs, verify the requested outcome and request concrete corrections if necessary before giving one final answer. Do not send acknowledgements as new work.",
+    inputSchema: { type: "object", additionalProperties: false, properties: {
+      group_id: { type: "string", description: "Optional destination room. Omit for this room, or separate recipient tasks when chatting directly." },
+      bot_ids: { type: "array", items: { type: "string" }, minItems: 1, maxItems: 4, uniqueItems: true },
+      message: { type: "string", minLength: 1, maxLength: 4e3, description: "Self-contained question or task for these teammates. Send separate requests when responsibilities differ." },
+      request_key: { type: "string", description: "A short unique assignment key. Reuse for an identical retry." },
+      rework: { type: "boolean", description: "True only for concrete additional work from someone who already completed a request." }
+    }, required: ["bot_ids", "message", "request_key"] }
+  },
   {
     name: "list_bots",
-    description: "List the other bots (agents) in your OpenMausBot section, with their model and whether they're busy. Call this before delegate_bot or ask_bot to discover who's available. Use delegate_bot for assignments; use ask_bot only for a short consultation needed inline.",
+    description: "List the other bots (agents) you may contact in your own team and any additional teams the owner has explicitly allowed you to coordinate, with their team, model and current status. Call this to discover exact teammate IDs before assigning work or requesting advice through your available coordination tools.",
     inputSchema: { type: "object", properties: {} }
   },
   {
     name: "list_rooms",
-    description: "List the shared rooms (team channels) you belong to, with the other members of each. Call this before post_to_room \u2014 it is the only place room ids come from. One-to-one bot channels are never listed (reach a single bot with ask_bot or delegate_bot). A room you are in but cannot post into \u2014 one containing someone outside your section \u2014 is named without an id, together with the reason, so you can tell the user why.",
+    description: "List the shared rooms (team channels) you belong to, with the other members of each. Call this before post_to_room. One-to-one bot channels are never listed; discover individual teammates with list_bots. A room you are in but cannot post into is named without an id, together with the reason, so you can tell the user why.",
     inputSchema: { type: "object", additionalProperties: false, properties: {} }
   },
   {
@@ -373,12 +409,12 @@ var TOOLS = [
   },
   {
     name: "list_threads",
-    description: "See your own threads and the threads you opened on teammates, newest first: each with its bot, title, state (running, waiting on the person, queued, or idle), whether the person has unread there, and the delegation id if it was a handoff. Use it to check how the threads you started are going before reporting to the person; write a thread's title as #Title when you mention it. A teammate's other threads are never listed \u2014 only the ones you opened. This is a read: it starts nothing and changes nothing.",
+    description: "See your own threads and the threads you opened on teammates, newest first: each with its bot, title, state (running, waiting on the person, queued, idle, or closed), whether the person has unread there, and the delegation id if it was a handoff. Use it to check how the threads you started are going before reporting to the person; write a thread's title as #Title when you mention it. A teammate's other threads are never listed \u2014 only the ones you opened. This is a read: it starts nothing and changes nothing.",
     inputSchema: { type: "object", additionalProperties: false, properties: {} }
   },
   {
     name: "close_thread",
-    description: "Mark a thread you opened (or one of your own) as finished once you have read its result: it goes idle in the person's sidebar with a note saying you closed it. Nothing is deleted \u2014 deleting stays the person's decision \u2014 and a thread that is still running cannot be closed; wait for it or leave it. Use the thread id from list_threads or from the start_thread result. If a close is refused, do not retry it.",
+    description: "Mark a thread you opened (or one of your own) as finished once you have read its result: it leaves the person's default sidebar list (still under all threads, with a note saying you closed it) and list_threads reports it as closed. Nothing is deleted \u2014 deleting stays the person's decision \u2014 and a thread that is still running cannot be closed; wait for it or leave it. Use the thread id from list_threads or from the start_thread result. If a close is refused, do not retry it.",
     inputSchema: {
       type: "object",
       additionalProperties: false,
@@ -427,6 +463,54 @@ var TOOLS = [
       required: ["name", "role", "instructions"]
     }
   },
+  {
+    name: "list_team_setup",
+    description: "Chief of Staff only: list authorized teams, teammate IDs, and exact engine/model choices for team setup. Call before proposing configuration; never invent model IDs. Existing thread models are independent of bot defaults.",
+    inputSchema: { type: "object", additionalProperties: false, properties: {} }
+  },
+  {
+    name: "propose_team_setup",
+    description: "Chief of Staff only: propose all requested specialist creation, profile/model configuration, and authorized team moves in ONE combined review card. Nothing changes until the user applies it. Use exact catalog engine/model IDs from list_team_setup. Combine all fields for each bot; use the same create key or botId to coalesce repeated entries. New teams must be named explicitly in newTeams and have a specialist in this plan; the card also asks to authorize your access to just those new teams. Existing unauthorized teams cannot be included. Models change bot defaults for groups/new threads; existing threads and execution permissions stay unchanged. After proposing, end your turn. The decision and structured result automatically resume you once; do not ask again, poll, or repeat the proposal.",
+    inputSchema: {
+      type: "object",
+      additionalProperties: false,
+      properties: {
+        reason: { type: "string", minLength: 1, maxLength: 500 },
+        newTeams: { type: "array", maxItems: 8, items: { type: "string", minLength: 1, maxLength: 60 } },
+        operations: { type: "array", minItems: 1, maxItems: 24, items: {
+          type: "object",
+          additionalProperties: false,
+          properties: {
+            action: { type: "string", enum: ["create", "update"] },
+            key: { type: "string", description: "For create: your stable short name for this new bot in this plan." },
+            botId: { type: "string", description: "For update: exact existing bot ID from list_team_setup." },
+            fields: { type: "object", additionalProperties: false, properties: {
+              name: { type: "string", maxLength: 100 },
+              title: { type: "string", maxLength: 200 },
+              description: { type: "string", maxLength: 4e3 },
+              soul: { type: "string", description: "Standing instructions; required with name/title/modelSelection for every new bot." },
+              section: { type: "string", maxLength: 60, description: "Exact authorized existing team, or a team explicitly named in newTeams. Empty string means General." },
+              modelSelection: { type: "object", additionalProperties: false, properties: {
+                instanceId: { type: "string" },
+                model: { type: "string" },
+                effort: { type: "string" }
+              }, required: ["instanceId", "model"] }
+            } }
+          },
+          required: ["action", "fields"]
+        } }
+      },
+      required: ["reason", "operations"]
+    }
+  },
+  {
+    name: "propose_bot_deletion",
+    description: "Chief of Staff only: when the user explicitly asks to delete a named teammate, create a separate confirmation card for that exact bot. Deletion removes its conversations, memory, instructions and skills; generated project files remain. Running work and owned computers can block deletion. Never delete yourself, substitute an archive, or put deletion into a setup batch. End your turn after proposing; the decision and result resume you once.",
+    inputSchema: { type: "object", additionalProperties: false, properties: {
+      bot_id: { type: "string", minLength: 1 },
+      reason: { type: "string", minLength: 1, maxLength: 500 }
+    }, required: ["bot_id", "reason"] }
+  },
   {
     name: "create_room",
     description: "Create a room in your own section when the user asks for one (maximum four per turn). Chiefs only. Choose active peers from list_bots; you are included automatically as the default responder. This creates no turns or messages. Section moves stay with the user. If peer approval is enabled, ask the user to make the room change instead.",
@@ -665,7 +749,11 @@ var TOOLS = [
   return annotations ? { ...tool, annotations } : tool;
 });
 var SKILL_TOOL_NAMES = /* @__PURE__ */ new Set(["skills_list", "skill_manage"]);
-var AVAILABLE_TOOLS = SKILL_AUTHORING_ENABLED ? TOOLS : TOOLS.filter((tool) => !SKILL_TOOL_NAMES.has(tool.name));
+var AUTHORING_TOOLS = SKILL_AUTHORING_ENABLED ? TOOLS : TOOLS.filter((tool) => !SKILL_TOOL_NAMES.has(tool.name));
+var ROOM_ONLY_TOOLS = /* @__PURE__ */ new Set(["list_room_targets", "coordinate_bots"]);
+var ROOM_REPLACED_TOOLS = /* @__PURE__ */ new Set(["ask_bot", "delegate_bot", "check_delegation", "wait_delegation", "start_thread", "send_to_thread", "wait_thread"]);
+var COORDINATING = process.env.OMB_ROOM_TURN === "1";
+var AVAILABLE_TOOLS = COORDINATING ? AUTHORING_TOOLS.filter((tool) => !ROOM_REPLACED_TOOLS.has(tool.name)) : AUTHORING_TOOLS.filter((tool) => !ROOM_ONLY_TOOLS.has(tool.name));
 var send = (msg) => process.stdout.write(JSON.stringify(msg) + "\n");
 var ok = (id, result) => send({ jsonrpc: "2.0", id, result });
 var rpcErr = (id, code, message) => send({ jsonrpc: "2.0", id, error: { code, message } });
@@ -749,20 +837,36 @@ function recallSpeaker(hit) {
   return hit.role === "user" ? "user" : "you";
 }
 async function callTool(name, args) {
+  if (name === "list_room_targets") {
+    const r = await api("/api/internal/room-targets");
+    return { text: JSON.stringify(r), ...r.error ? { isError: true } : {} };
+  }
+  if (name === "coordinate_bots") {
+    const r = await api("/api/internal/coordinate-bots", { method: "POST", body: JSON.stringify({
+      groupId: args.group_id,
+      botIds: args.bot_ids,
+      message: args.message,
+      requestKey: args.request_key,
+      rework: args.rework
+    }) });
+    return { text: JSON.stringify(r), ...r.error ? { isError: true } : {} };
+  }
   if (name === "list_bots") {
     const r = await api(`/api/internal/agents?self=${encodeURIComponent(BOT_ID)}`);
     const bots = r.bots ?? [];
-    if (!bots.length) return { text: "No other bots in this section yet." };
+    if (!bots.length) return { text: "No other reachable bots yet." };
     const lines = bots.map((b) => {
       const role = b.title ? ` \u2014 ${b.title}` : "";
       const about = b.description ? ` (${String(b.description).slice(0, 120)})` : "";
-      return `- ${b.name}${role}${about} [id: ${b.id}, model: ${b.model}${b.busy ? ", busy" : ""}]`;
+      const state = typeof b.statusText === "string" ? b.status === "available" ? "" : b.statusText : b.busy ? "busy" : "";
+      const team = typeof b.section === "string" ? `, team: ${peerName(b.section) || "General"}` : "";
+      return `- ${b.name}${role}${about} [id: ${b.id}, model: ${b.model}${team}${state ? `, ${state}` : ""}]`;
     });
     return {
-      text: `Other bots in your section:
+      text: `Reachable teammates:
 ${lines.join("\n")}
 
-Assign work with delegate_bot. Use ask_bot only for a short answer you need inline.`
+${COORDINATING ? "Use coordinate_bots for advice or concrete work, then end your turn. Busy teammates queue and results resume you automatically." : "Assign work with delegate_bot. Use ask_bot only for a short answer you need inline."}`
     };
   }
   if (name === "list_rooms") {
@@ -880,7 +984,10 @@ ${r.text ?? "(no reply)"}` };
     if (r.status === "done") return { text: `${who} finished task ${taskId}:
 ${String(r.result || "(no reply text)")}` };
     if (r.status === "queued") {
-      return { text: `Task ${taskId} is still queued \u2014 ${who} hasn't picked it up yet${waitMs ? ` after ${timeout}s` : ""}. Keep working and check again later.` };
+      const why = r.targetStatus === "waiting-on-user" ? ` ${who} is waiting on the user, so it goes through after they answer.` : r.targetStatus === "working" ? ` ${who} is busy with other work.` : "";
+      const expiresInMs = Number(r.expiresInMs);
+      const expiry = !Number.isFinite(expiresInMs) ? "" : expiresInMs <= 0 ? " It is past its 24-hour limit and will expire the next time it cannot be delivered." : ` It expires if not picked up within ${Math.ceil(expiresInMs / 36e5)} hour${Math.ceil(expiresInMs / 36e5) === 1 ? "" : "s"}.`;
+      return { text: `Task ${taskId} is still queued \u2014 ${who} hasn't picked it up yet${waitMs ? ` after ${timeout}s` : ""}.${why}${expiry} Keep working and check again later.` };
     }
     if (r.status === "running") {
       const elapsedMs = Number.isFinite(r.elapsedMs) ? Number(r.elapsedMs) : 0;
@@ -962,6 +1069,21 @@ ${lines.join("\n")}` };
       text: `${opened}${timing}${approval} Its result will be delivered to this conversation automatically (delegation id: ${delegationId || "unknown"}). Acknowledge it, mention it to the person as #${threadTitle}, and finish your turn; do not check or wait for it in this turn.`
     };
   }
+  if (name === "list_team_setup") {
+    return { text: JSON.stringify(await api("/api/internal/team-setup-catalog")) };
+  }
+  if (name === "propose_team_setup" || name === "propose_bot_deletion") {
+    const deleting = name === "propose_bot_deletion";
+    const result = await api(deleting ? "/api/internal/bot-deletion-requests" : "/api/internal/team-setup-requests", {
+      method: "POST",
+      body: JSON.stringify({
+        fromBotId: BOT_ID,
+        fromThreadId: THREAD_ID,
+        ...deleting ? { targetBotId: args.bot_id, reason: args.reason } : { plan: args }
+      })
+    });
+    return { text: `One review card is visible: ${String(result.title)}. Nothing has been applied. End this turn; the decision and structured result resume you automatically once. Do not ask again, poll, or repeat this proposal.` };
+  }
   if (name === "create_bot") {
     const botName = String(args.name ?? "").trim();
     const role = String(args.role ?? "").trim();
@@ -984,7 +1106,7 @@ ${lines.join("\n")}` };
     });
     createdThisTurn += 1;
     return {
-      text: `Created @${r.name ?? botName} in ${r.section ?? "General"} [id: ${r.id}]. Assign work with delegate_bot.`
+      text: `Created @${r.name ?? botName} in ${r.section ?? "General"} [id: ${r.id}]. Assign work with ${COORDINATING ? "coordinate_bots" : "delegate_bot"}.`
     };
   }
   if (name === "create_room") {