@tritard/waterbrother 0.16.63 → 0.16.65

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tritard/waterbrother",
-  "version": "0.16.63",
+  "version": "0.16.65",
   "description": "Waterbrother: bring-your-own-model coding CLI with local tools, sessions, operator modes, and approval controls",
   "type": "module",
   "bin": {

package/src/gateway-state.js

@@ -18,11 +18,24 @@ function gatewayBridgePath(serviceId) {
 }
 
 function normalizeGatewayState(parsed = {}) {
+  const continuations = parsed?.continuations && typeof parsed.continuations === "object" ? parsed.continuations : {};
   return {
     offset: Number.isFinite(Number(parsed?.offset)) ? Math.max(0, Math.floor(Number(parsed.offset))) : 0,
     peers: parsed?.peers && typeof parsed.peers === "object" ? parsed.peers : {},
     pendingPairings: parsed?.pendingPairings && typeof parsed.pendingPairings === "object" ? parsed.pendingPairings : {},
-    continuations: parsed?.continuations && typeof parsed.continuations === "object" ? parsed.continuations : {}
+    continuations: Object.fromEntries(
+      Object.entries(continuations).map(([key, item]) => [
+        key,
+        {
+          chatId: String(item?.chatId || "").trim(),
+          userId: String(item?.userId || "").trim(),
+          lastPrompt: String(item?.lastPrompt || "").trim(),
+          kind: String(item?.kind || "follow-up").trim() || "follow-up",
+          source: String(item?.source || "assistant-question").trim() || "assistant-question",
+          expiresAt: String(item?.expiresAt || "").trim()
+        }
+      ])
+    )
   };
 }
 

package/src/gateway.js

@@ -754,6 +754,16 @@ function classifyTelegramGroupIntent(text = "") {
   return { kind: "chat", reason: "default non-execution" };
 }
 
+function buildContinuationPrompt(text = "", continuation = null) {
+  const body = String(text || "").trim();
+  if (!continuation?.lastPrompt) return body;
+  return [
+    `Continue the active Telegram follow-up.`,
+    `Your last question/request to this user was: ${continuation.lastPrompt}`,
+    `User reply: ${body}`
+  ].join("\n");
+}
+
 function suggestTaskText(text = "") {
   return String(text || "")
     .replace(/^@[\w_]+\s*/g, "")
@@ -991,6 +1001,15 @@ class TelegramGateway {
     return Number.isFinite(expiresAtMs) && expiresAtMs > Date.now();
   }
 
+  getPendingContinuation(message) {
+    const key = continuationKey(message?.chat?.id, message?.from?.id);
+    const item = this.state?.continuations?.[key];
+    if (!item) return null;
+    const expiresAtMs = Date.parse(String(item.expiresAt || ""));
+    if (!Number.isFinite(expiresAtMs) || expiresAtMs <= Date.now()) return null;
+    return item;
+  }
+
   clearContinuation(message) {
     const key = continuationKey(message?.chat?.id, message?.from?.id);
     if (this.state?.continuations?.[key]) {
@@ -1010,6 +1029,8 @@ class TelegramGateway {
       chatId: String(message?.chat?.id || "").trim(),
       userId: String(message?.from?.id || "").trim(),
       lastPrompt: body.slice(0, 400),
+      kind: "follow-up",
+      source: "assistant-question",
       expiresAt: new Date(Date.now() + TELEGRAM_CONTINUATION_TTL_MS).toISOString()
     };
     await this.persistState();
@@ -1102,7 +1123,8 @@ class TelegramGateway {
       project.activeOperator?.id
         ? `active operator: <code>${escapeTelegramHtml(project.activeOperator.name || project.activeOperator.id)}</code>`
         : "active operator: <code>none</code>",
-      "Ask naturally here.",
+      "As observer, you can ask questions, discuss plans, and review work here.",
+      "An owner can promote you to editor or owner conversationally.",
       "Examples: <code>what project is this chat bound to?</code>, <code>who is in the room?</code>, <code>what can I do here?</code>"
     ].join("\n");
   }
@@ -1985,9 +2007,10 @@ class TelegramGateway {
     if (trustedOnboarding) {
       await this.sendMarkup(message.chat.id, this.buildTrustedRoomIntroMarkup(trustedOnboarding), message.message_id);
     }
-    this.clearContinuation(message);
 
     const text = this.normalizeTelegramCommandText(String(message.text || "").trim());
+    const continuation = this.getPendingContinuation(message);
+    this.clearContinuation(message);
     const userId = String(message.from.id);
 
     if (text === "/help" || text === "/start") {
@@ -2706,9 +2729,14 @@ Ask them to run <code>/whoami</code> and then <code>/accept-invite ${escapeTeleg
     }
 
     const isExplicitRun = text.startsWith("/run ");
-    const promptText = this.stripBotMention(isExplicitRun ? text.replace("/run", "").trim() : text);
+    const rawPromptText = this.stripBotMention(isExplicitRun ? text.replace("/run", "").trim() : text);
+    const promptText = continuation ? buildContinuationPrompt(rawPromptText, continuation) : rawPromptText;
     const groupIntent = this.isGroupChat(message)
-      ? (isExplicitRun ? { kind: "execution", reason: "explicit /run" } : classifyTelegramGroupIntent(promptText))
+      ? (isExplicitRun
+          ? { kind: "execution", reason: "explicit /run" }
+          : continuation
+            ? { kind: "execution", reason: "follow-up continuation" }
+            : classifyTelegramGroupIntent(rawPromptText))
       : { kind: "execution", reason: "private chat" };
     const shouldExecutePrompt = !this.isGroupChat(message) || groupIntent.kind === "execution";
     const sharedBinding = await this.bindSharedRoomForMessage(message, sessionId);

package/src/shared-project.js

@@ -7,6 +7,8 @@ const SHARED_FILE = path.join(".waterbrother", "shared.json");
 const ROUNDTABLE_FILE = "ROUNDTABLE.md";
 const TASK_STATES = ["open", "active", "blocked", "done"];
 const RECENT_EVENT_LIMIT = 24;
+const PARTICIPANT_ROLES = ["owner", "editor", "observer"];
+const AGENT_ROLES = ["executor", "reviewer", "standby", "coordinator"];
 
 function makeId(prefix = "id") {
   return `${prefix}_${crypto.randomBytes(3).toString("hex")}`;
@@ -16,11 +18,117 @@ function normalizeMember(member = {}) {
   return {
     id: String(member.id || "").trim(),
     name: String(member.name || "").trim(),
-    role: ["owner", "editor", "observer"].includes(String(member.role || "").trim()) ? String(member.role).trim() : "editor",
+    role: PARTICIPANT_ROLES.includes(String(member.role || "").trim()) ? String(member.role).trim() : "editor",
     paired: member.paired !== false
   };
 }
 
+function inferParticipantChannels(memberId = "", participant = {}) {
+  const channels = participant?.channels && typeof participant.channels === "object" ? { ...participant.channels } : {};
+  const normalizedId = String(memberId || "").trim();
+  if (!normalizedId) return channels;
+  if (/^\d+$/.test(normalizedId)) {
+    channels.telegram = channels.telegram && typeof channels.telegram === "object"
+      ? { ...channels.telegram, userId: normalizedId }
+      : { userId: normalizedId };
+  } else if (normalizedId.startsWith("local:")) {
+    const localName = normalizedId.slice("local:".length).trim();
+    channels.local = channels.local && typeof channels.local === "object"
+      ? { ...channels.local, userId: normalizedId, username: channels.local.username || localName }
+      : { userId: normalizedId, username: localName };
+  }
+  return channels;
+}
+
+function normalizeParticipant(participant = {}) {
+  return {
+    id: String(participant.id || participant.memberId || "").trim(),
+    memberId: String(participant.memberId || participant.id || "").trim(),
+    kind: "human",
+    displayName: String(participant.displayName || participant.name || "").trim(),
+    role: PARTICIPANT_ROLES.includes(String(participant.role || "").trim()) ? String(participant.role).trim() : "editor",
+    trusted: participant.trusted !== false,
+    channels: participant.channels && typeof participant.channels === "object" ? { ...participant.channels } : {},
+    joinedAt: String(participant.joinedAt || new Date().toISOString()).trim()
+  };
+}
+
+function normalizeAgent(agent = {}) {
+  return {
+    id: String(agent.id || "").trim(),
+    ownerId: String(agent.ownerId || "").trim(),
+    label: String(agent.label || agent.name || "").trim(),
+    surface: String(agent.surface || "").trim(),
+    role: AGENT_ROLES.includes(String(agent.role || "").trim()) ? String(agent.role).trim() : "standby",
+    provider: String(agent.provider || "").trim(),
+    model: String(agent.model || "").trim(),
+    runtimeProfile: String(agent.runtimeProfile || "").trim(),
+    sessionId: String(agent.sessionId || "").trim(),
+    updatedAt: String(agent.updatedAt || new Date().toISOString()).trim()
+  };
+}
+
+function buildProjectParticipants(project = {}) {
+  const members = Array.isArray(project.members) ? project.members.map(normalizeMember).filter((item) => item.id) : [];
+  const memberIds = new Set(members.map((member) => member.id));
+  const existing = new Map(
+    (Array.isArray(project.participants) ? project.participants : [])
+      .map((participant) => normalizeParticipant(participant))
+      .filter((participant) => participant.id)
+      .map((participant) => [participant.id, participant])
+  );
+  const next = members.map((member) => {
+    const prior = existing.get(member.id) || {};
+    return normalizeParticipant({
+      ...prior,
+      id: member.id,
+      memberId: member.id,
+      displayName: prior.displayName || member.name || member.id,
+      role: member.role,
+      trusted: prior.trusted !== false && member.paired !== false,
+      channels: inferParticipantChannels(member.id, prior),
+      joinedAt: prior.joinedAt || project.createdAt || new Date().toISOString()
+    });
+  });
+  for (const participant of existing.values()) {
+    if (!participant.id) continue;
+    if (participant.memberId && !memberIds.has(participant.memberId)) continue;
+    if (next.some((item) => item.id === participant.id)) continue;
+    next.push(normalizeParticipant(participant));
+  }
+  return next;
+}
+
+function buildProjectAgents(project = {}) {
+  const existing = new Map(
+    (Array.isArray(project.agents) ? project.agents : [])
+      .map((agent) => normalizeAgent(agent))
+      .filter((agent) => agent.id)
+      .map((agent) => [agent.id, agent])
+  );
+  const next = [];
+  const activeOperatorId = String(project.activeOperator?.id || "").trim();
+  if (activeOperatorId) {
+    const inferredId = `agent:operator:${activeOperatorId}`;
+    const prior = existing.get(inferredId) || {};
+    next.push(normalizeAgent({
+      ...prior,
+      id: inferredId,
+      ownerId: activeOperatorId,
+      label: prior.label || `${project.activeOperator?.name || activeOperatorId} terminal`,
+      surface: prior.surface || (activeOperatorId.startsWith("local:") ? "local-tui" : String(project.room?.provider || "remote").trim() || "remote"),
+      role: "executor",
+      updatedAt: new Date().toISOString()
+    }));
+  }
+  for (const agent of existing.values()) {
+    if (!agent.id) continue;
+    if (next.some((item) => item.id === agent.id)) continue;
+    next.push(normalizeAgent(agent));
+  }
+  return next;
+}
+
 function memberRoleWeight(role = "") {
   const normalized = String(role || "").trim().toLowerCase();
   if (normalized === "owner") return 3;
@@ -54,6 +162,8 @@ function normalizeSharedProject(project = {}, cwd = process.cwd()) {
         claimedAt: String(project.activeOperator.claimedAt || "").trim()
       }
     : null;
+  const participants = buildProjectParticipants({ ...project, members });
+  const agents = buildProjectAgents({ ...project, members, activeOperator });
 
   return {
     version: 1,
@@ -72,6 +182,8 @@ function normalizeSharedProject(project = {}, cwd = process.cwd()) {
       : "chat",
     runtimeProfile: String(project.runtimeProfile || "").trim(),
     members,
+    participants,
+    agents,
     tasks,
     pendingInvites,
     recentEvents,
@@ -899,6 +1011,8 @@ export function formatSharedProjectStatus(project) {
     approvalPolicy: project.approvalPolicy,
     activeOperator: project.activeOperator,
     members: project.members,
+    participants: project.participants,
+    agents: project.agents,
     pendingInvites: project.pendingInvites,
     tasks: project.tasks,
     recentEvents: project.recentEvents