@kevin5251984/guild 0.2.18 → 0.2.20

package/src/store.ts

@@ -26,6 +26,11 @@ import { DEFAULT_BOTS } from "./catalog/default-bots.ts";
 import { CATALOG_SKILLS } from "./catalog/skills.ts";
 import { CATALOG_SUBAGENTS } from "./catalog/subagents.ts";
 import { parseAgentFile } from "./agent-file.ts";
+import {
+  parseMentionIds,
+  sanitizeMentionIds,
+  withoutDeferredIds,
+} from "./mention.ts";
 
 const MARKDOWN: Record<LibraryKind, string> = {
   souls: "SOUL.md",
@@ -39,6 +44,10 @@ const GENERAL_CHANNEL_ID = "channel-general";
 const NAV_PREVIEW_CAP = 120;
 /** Project channels (not #general). Reuse seats first; human adds specialists. */
 export const CHANNEL_ROSTER_CAP = 6;
+/** Parent → child → grandchild. Deeper than this hides in the sidebar. */
+export const BRANCH_DEPTH_CAP = 3;
+/** Messages copied from the parent, ending at the branched row. */
+export const BRANCH_CONTEXT_CAP = 20;
 
 export function isGeneralChannel(room: { id: string; name: string }): boolean {
   return room.id === GENERAL_CHANNEL_ID || room.name === "general";
@@ -384,6 +393,7 @@ export class GuildStore {
         steers?.delete(botId);
         if (live && live.size === 0) this.liveTurns.delete(roomId);
         if (steers && steers.size === 0) this.pendingSteers.delete(roomId);
+        this.spillTrajectoryIfIdle(roomId);
         return hadLive;
       }
       const group = this.turnGroups.get(controller.signal);
@@ -400,6 +410,7 @@ export class GuildStore {
       if (live && live.size === 0) this.liveTurns.delete(roomId);
       if (steers && steers.size === 0) this.pendingSteers.delete(roomId);
       if (!controller.signal.aborted) controller.abort();
+      this.spillTrajectoryIfIdle(roomId);
       return true;
     }
     const room = this.botAborts.get(roomId);
@@ -417,6 +428,7 @@ export class GuildStore {
         aborted = true;
       }
     }
+    this.spillTrajectoryIfIdle(roomId);
     return aborted || Boolean(room);
   }
 
@@ -435,10 +447,19 @@ export class GuildStore {
       if (room && room.size === 0) this.botAborts.delete(roomId);
       if (live && live.size === 0) this.liveTurns.delete(roomId);
       if (steers && steers.size === 0) this.pendingSteers.delete(roomId);
-      return;
+      if (!group.controller.signal.aborted) group.controller.abort();
+    } else {
+      this.botAborts.delete(roomId);
+      this.clearLiveTurn(roomId);
     }
-    this.botAborts.delete(roomId);
-    this.clearLiveTurn(roomId);
+    this.spillTrajectoryIfIdle(roomId);
+  }
+
+  /** Warehouse overflow once, after every bot in the room has stopped. */
+  private spillTrajectoryIfIdle(roomId: string): void {
+    if (this.botAborts.get(roomId)?.size) return;
+    if (this.liveTurns.get(roomId)?.size) return;
+    this.db.spillColdTrajectory(roomId);
   }
 
   pushSteer(roomId: string, text: string, botId?: string): void {
@@ -580,6 +601,9 @@ export class GuildStore {
     if (room.id === GENERAL_CHANNEL_ID || room.name === "general") {
       throw new StoreError(400, "cannot delete #general");
     }
+    for (const child of this.listChannels().filter((item) => item.parentId === id)) {
+      this.deleteChannel(child.id);
+    }
     this.removeRoomDir(room.id);
     return { ok: true, id: room.id };
   }
@@ -605,6 +629,7 @@ export class GuildStore {
       name?: string;
       handle?: string;
       oneLiner?: string;
+      portrait?: string | null;
       skillIds?: string[];
       soul?: { name: string; body: string };
       agent?: { name: string; body: string };
@@ -646,6 +671,9 @@ export class GuildStore {
       handle,
       skillIds,
       oneLiner: input.oneLiner?.trim() || bot.oneLiner,
+      portrait: Object.hasOwn(input, "portrait")
+        ? normalizePortrait(input.portrait)
+        : bot.portrait,
       model: Object.hasOwn(input, "model") ? input.model ?? null : bot.model,
     };
     this.writeBot(next);
@@ -789,6 +817,48 @@ export class GuildStore {
     return room;
   }
 
+  createBranch(parentId: string, messageId: string, name?: string): Room {
+    const parent = this.getRoom(parentId);
+    if (!parent) throw new StoreError(404, "channel not found");
+    if (parent.kind !== "channel") {
+      throw new StoreError(400, "can only branch a channel");
+    }
+    const source = this.listMessages(parentId).find((item) => item.id === messageId);
+    if (!source) throw new StoreError(404, "message not found");
+    if (branchDepth(this, parent) >= BRANCH_DEPTH_CAP) {
+      throw new StoreError(400, "too many nested branches");
+    }
+    const trimmed = String(name || "").replace(/^#/, "").trim() || clipBranchName(source.body);
+    if (trimmed === "general") {
+      throw new StoreError(400, "cannot create #general");
+    }
+    const taken = this.listChannels().map((room) => room.name);
+    const uniqueName = uniqueChannelName(trimmed, taken);
+    const existingIds = this.listChannels().map((room) => room.id);
+    const slug = slugify(uniqueName);
+    const baseId =
+      slug && slug !== "item" && slug !== "general"
+        ? `channel-${slug}`
+        : `channel-${randomUUID().slice(0, 8)}`;
+    const room: Room = {
+      id: uniqueSlug(baseId, existingIds),
+      kind: "channel",
+      name: uniqueName,
+      memberIds: [...parent.memberIds],
+      createdAt: new Date().toISOString(),
+      parentId: parent.id,
+      branchFromId: source.id,
+    };
+    this.writeRoom(room);
+    this.writeChannelMd(room.id, this.readChannelMd(parent.id));
+    const history = this.listMessages(parent.id);
+    const at = history.findIndex((item) => item.id === source.id);
+    const from = Math.max(0, at + 1 - BRANCH_CONTEXT_CAP);
+    const window = at < 0 ? [source] : history.slice(from, at + 1);
+    this.writeMessages(room.id, cloneBranchMessages(window, room.id));
+    return room;
+  }
+
   renameChannel(id: string, name: string): Room {
     const trimmed = String(name || "").trim();
     if (!trimmed) throw new StoreError(400, "channel name is required");
@@ -914,6 +984,7 @@ export class GuildStore {
     usage?: ChatUsage,
     steer?: boolean,
     steerBotId?: string,
+    mentions?: string[],
   ): ChatMessage {
     const room = this.getRoom(roomId);
     if (!room) throw new StoreError(404, "room not found");
@@ -921,6 +992,15 @@ export class GuildStore {
     if (!text) throw new StoreError(400, "message is required");
     const now = new Date().toISOString();
     const startedAt = author !== "you" ? usage?.startedAt : undefined;
+    const bots = this.listBots();
+    const mentionIds = withoutDeferredIds(
+      (mentions !== undefined
+        ? sanitizeMentionIds(mentions, bots)
+        : parseMentionIds(text, bots, author === "you" ? "user" : "bot")
+      ).filter((id) => id !== author),
+      text,
+      bots,
+    );
     const message: ChatMessage = {
       id: randomUUID(),
       roomId,
@@ -934,15 +1014,29 @@ export class GuildStore {
       ...(author !== "you" ? { finishedAt: now } : {}),
       ...(steer ? { steer: true } : {}),
       ...(steer && steerBotId ? { steerBotId } : {}),
+      mentions: mentionIds,
     };
     this.db.appendMessage(message);
     return message;
   }
 
-  updateMessage(roomId: string, messageId: string, body: string): ChatMessage {
+  updateMessage(
+    roomId: string,
+    messageId: string,
+    body: string,
+    mentions?: string[],
+  ): ChatMessage {
     const text = body.trim();
     if (!text) throw new StoreError(400, "message is required");
-    const next = this.db.updateMessageBody(roomId, messageId, text);
+    const bots = this.listBots();
+    const mentionIds = withoutDeferredIds(
+      mentions !== undefined
+        ? sanitizeMentionIds(mentions, bots)
+        : parseMentionIds(text, bots, "user"),
+      text,
+      bots,
+    );
+    const next = this.db.updateMessageBody(roomId, messageId, text, mentionIds);
     if (!next) throw new StoreError(404, "message not found");
     return next;
   }
@@ -957,12 +1051,18 @@ export class GuildStore {
     const text = body.trim();
     if (!text) throw new StoreError(400, "message is required");
     const now = new Date().toISOString();
+    const current = this.listMessages(roomId).find((item) => item.id === messageId);
+    const bots = this.listBots();
+    const mentionIds = parseMentionIds(text, bots, "bot").filter(
+      (id) => id !== current?.author,
+    );
     const next = this.db.replaceMessage(roomId, messageId, {
       body: text,
       parts: parts && parts.length ? parts : undefined,
       usage,
       createdAt: usage?.startedAt || now,
       finishedAt: now,
+      mentions: mentionIds,
     });
     if (!next) throw new StoreError(404, "message not found");
     return next;
@@ -1169,6 +1269,16 @@ export class GuildStore {
   }
 }
 
+function normalizePortrait(raw: string | null | undefined): string | undefined {
+  if (raw == null) return undefined;
+  const value = raw.trim();
+  if (!value) return undefined;
+  if (!/^\/generated\/[A-Za-z0-9._-]+$/.test(value)) {
+    throw new StoreError(400, "invalid portrait");
+  }
+  return value;
+}
+
 export class StoreError extends Error {
   constructor(
     readonly status: number,
@@ -1192,3 +1302,58 @@ function uniqueSlug(base: string, existing: string[]): string {
   if (!existing.includes(base)) return base;
   return `${base}-${randomUUID().slice(0, 8)}`;
 }
+
+function cloneBranchMessages(items: ChatMessage[], roomId: string): ChatMessage[] {
+  const idMap = new Map<string, string>();
+  return items.map((item) => {
+    const id = randomUUID();
+    idMap.set(item.id, id);
+    const next: ChatMessage = {
+      id,
+      roomId,
+      author: item.author,
+      body: item.body,
+      createdAt: item.createdAt,
+    };
+    if (item.parts?.length) next.parts = item.parts;
+    if (item.attachments?.length) next.attachments = item.attachments;
+    if (item.usage) next.usage = item.usage;
+    if (item.finishedAt) next.finishedAt = item.finishedAt;
+    if (item.mentions) next.mentions = item.mentions;
+    if (item.steer) next.steer = true;
+    if (item.steerBotId) next.steerBotId = item.steerBotId;
+    const replyTo = item.replyTo ? idMap.get(item.replyTo) : undefined;
+    if (replyTo) next.replyTo = replyTo;
+    return next;
+  });
+}
+
+function clipBranchName(body: string): string {
+  return String(body || "")
+    .replace(/\s+/g, " ")
+    .trim()
+    .slice(0, 28) || "branch";
+}
+
+function uniqueChannelName(name: string, taken: string[]): string {
+  if (!taken.includes(name)) return name;
+  for (let i = 2; i < 50; i++) {
+    const next = `${name} ${i}`;
+    if (!taken.includes(next)) return next;
+  }
+  return `${name} ${randomUUID().slice(0, 4)}`;
+}
+
+function branchDepth(store: GuildStore, room: Room): number {
+  let depth = 0;
+  let current: Room | null = room;
+  const seen = new Set<string>();
+  while (current?.parentId) {
+    if (seen.has(current.id)) break;
+    seen.add(current.id);
+    depth += 1;
+    current = store.getRoom(current.parentId);
+    if (depth > 16) break;
+  }
+  return depth;
+}

package/src/subagent.ts

@@ -1,8 +1,11 @@
+import { randomUUID } from "node:crypto";
 import { parseAgentFile } from "./agent-file.ts";
 import { listHostAgents, type HostAgent } from "./host-agents.ts";
 import type { LibraryItem } from "@guild/protocol";
+import { parseSandbox, type Sandbox } from "./harness.ts";
 import {
   hostContext,
+  type SpawnHandle,
   type SubAgentRef,
   type ToolContext,
   type ToolOutcome,
@@ -70,6 +73,23 @@ function agentKey(value: string): string {
   return value.trim().replace(/^\/+/, "").toLowerCase();
 }
 
+/**
+ * A child never outruns its parent, and a read-only agent never gets `run`
+ * back: a readOnly child is pinned to read_only even under a full_access
+ * parent (that used to be an escalation hole — CHILD_TOOLS_RO advertised run
+ * and gateTool let a full_access child through it).
+ */
+export function childSpawnPolicy(
+  parentSandbox: ToolContext["sandbox"],
+  agentReadOnly: boolean,
+): { sandbox: Sandbox; allowWrite: boolean } {
+  const parent = parseSandbox(parentSandbox);
+  if (parent === "read_only" || agentReadOnly) {
+    return { sandbox: "read_only", allowWrite: false };
+  }
+  return { sandbox: parent, allowWrite: true };
+}
+
 export function resolveSubagent(
   name: string,
   agents: SubAgentRef[],
@@ -89,11 +109,221 @@ export function resolveSubagent(
 
 const CHILD_TOOLS = `You ARE already running on the user's local computer (Guild).
 Tools: run, read, write, list, skill, image_gen. You cannot spawn subagents.
-Never say you cannot access this machine. Check [exit code: N] on every run.`;
+Never say you cannot access this machine. Check [exit code: N] on every run.
+Independent searches: emit multiple tool calls in one round; they run in parallel.`;
 
 const CHILD_TOOLS_RO = `You ARE already running on the user's local computer (Guild).
-Tools: run, read, list, skill. You cannot write files and cannot spawn subagents.
-Read-only. Never edit, patch, or create files. Check [exit code: N] on every run.`;
+Tools: read, list, skill. You cannot run shell commands, cannot write files, and cannot spawn subagents.
+Read-only. Never edit, patch, or create files.
+Independent searches: emit multiple tool calls in one round; they run in parallel.`;
+
+export const SPAWN_MAX_PARALLEL = 8;
+export const SPAWN_CONCURRENCY = 4;
+
+export type SpawnJob = {
+  prompt: string;
+  name: string;
+  description: string;
+};
+
+/** Devin luna-explore / Pi scout → Guild explorer. */
+export function spawnProfile(raw: string): string {
+  const key = raw.trim().toLowerCase();
+  if (!key) return "";
+  if (key === "luna-explore" || key === "explore" || key === "scout") {
+    return "explorer";
+  }
+  if (key === "luna-general" || key === "general") return "worker";
+  if (key === "luna-reviewer") return "reviewer";
+  return raw.trim();
+}
+
+function recordOf(value: unknown): Record<string, unknown> | null {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return null;
+  return value as Record<string, unknown>;
+}
+
+function flagTrue(value: unknown): boolean {
+  return value === true || value === "true";
+}
+
+function flagFalse(value: unknown): boolean {
+  return value === false || value === "false";
+}
+
+function oneJob(raw: Record<string, unknown>): SpawnJob {
+  const prompt = String(raw.prompt || raw.task || "").trim();
+  const name = spawnProfile(
+    String(raw.profile || raw.name || raw.agent || raw.subagent_type || ""),
+  );
+  const description = String(raw.title || raw.description || "").trim();
+  return { prompt, name, description };
+}
+
+function handlesOf(ctx: ToolContext) {
+  if (!ctx.spawnHandles) ctx.spawnHandles = new Map();
+  return ctx.spawnHandles;
+}
+
+function isAbortError(error: unknown): boolean {
+  return Boolean(
+    error &&
+      typeof error === "object" &&
+      "name" in error &&
+      (error as { name: string }).name === "AbortError",
+  );
+}
+
+function startBackground(job: SpawnJob, ctx: ToolContext) {
+  const id = randomUUID();
+  const title = job.description || job.name || "worker";
+  const profile = job.name || "worker";
+  const abort = new AbortController();
+  const parent = ctx.signal;
+  if (parent) {
+    if (parent.aborted) abort.abort();
+    else parent.addEventListener("abort", () => abort.abort(), { once: true });
+  }
+  const childCtx: ToolContext = {
+    ...ctx,
+    signal: abort.signal,
+    spawnHandles: undefined,
+  };
+  const handle: SpawnHandle = {
+    id,
+    title,
+    profile,
+    abort,
+    done: Promise.resolve({ text: "", isError: false }),
+  };
+  handle.done = spawnSubagent({ ...job, ctx: childCtx })
+    .then((outcome) => {
+      handle.outcome = outcome;
+      return outcome;
+    })
+    .catch((error: unknown) => {
+      const outcome: ToolOutcome = {
+        text:
+          isAbortError(error) || abort.signal.aborted
+            ? "aborted"
+            : error instanceof Error
+              ? error.message
+              : String(error),
+        isError: true,
+      };
+      handle.outcome = outcome;
+      return outcome;
+    });
+  handlesOf(ctx).set(id, handle);
+  return handle;
+}
+
+function ackBackground(
+  rows: { id: string; title: string; profile: string }[],
+): string {
+  return rows
+    .map(
+      (row) =>
+        `agent_id: ${row.id}\ntitle: ${row.title}\nprofile: ${row.profile}\nstatus: running\nCall read_spawn with this agent_id (block=true) before the final reply.`,
+    )
+    .join("\n\n");
+}
+
+/** Pi subagent: single {prompt|task, name|agent} or parallel tasks[]. */
+export function spawnJobs(args: Record<string, unknown>): SpawnJob[] {
+  if (Array.isArray(args.tasks) && args.tasks.length) {
+    return args.tasks.map((item) => oneJob(recordOf(item) || {}));
+  }
+  return [oneJob(args)];
+}
+
+async function mapWithConcurrency<T, R>(
+  items: T[],
+  concurrency: number,
+  fn: (item: T, index: number) => Promise<R>,
+): Promise<R[]> {
+  if (!items.length) return [];
+  const limit = Math.max(1, Math.min(concurrency, items.length));
+  const out: R[] = new Array(items.length);
+  let next = 0;
+  await Promise.all(
+    Array.from({ length: limit }, async () => {
+      while (true) {
+        const i = next++;
+        if (i >= items.length) return;
+        out[i] = await fn(items[i], i);
+      }
+    }),
+  );
+  return out;
+}
+
+export async function runSpawnJobs(
+  args: Record<string, unknown>,
+  ctx: ToolContext,
+): Promise<ToolOutcome> {
+  const jobs = spawnJobs(args);
+  if (!jobs.length || jobs.some((job) => !job.prompt)) {
+    return { text: "spawn needs a prompt or task", isError: true };
+  }
+  if (jobs.length > SPAWN_MAX_PARALLEL) {
+    return {
+      text: `Too many parallel tasks (${jobs.length}). Max is ${SPAWN_MAX_PARALLEL}.`,
+      isError: true,
+    };
+  }
+  const background = flagTrue(args.background) || flagTrue(args.is_background);
+  if (background) {
+    const started = jobs.map((job) => startBackground(job, ctx));
+    return { text: ackBackground(started), isError: false };
+  }
+  if (jobs.length === 1) {
+    return spawnSubagent({ ...jobs[0], ctx });
+  }
+  const results = await mapWithConcurrency(jobs, SPAWN_CONCURRENCY, (job) =>
+    spawnSubagent({ ...job, ctx }),
+  );
+  const failed = results.filter((row) => row.isError).length;
+  const body = results
+    .map((row, i) => {
+      const label = jobs[i].description || jobs[i].name || "worker";
+      const status = row.isError ? "failed" : "completed";
+      return `### [${label}] ${status}\n\n${row.text}`;
+    })
+    .join("\n\n---\n\n");
+  return {
+    text: `Parallel: ${results.length - failed}/${results.length} succeeded\n\n${body}`,
+    isError: failed === results.length,
+  };
+}
+
+export async function readSpawn(
+  args: Record<string, unknown>,
+  ctx: ToolContext,
+): Promise<ToolOutcome> {
+  const id = String(args.agent_id || args.id || "").trim();
+  if (!id) return { text: "read_spawn needs agent_id", isError: true };
+  const handle = handlesOf(ctx).get(id);
+  if (!handle) {
+    return {
+      text: `unknown agent_id ${id}. It must come from a background spawn in this turn.`,
+      isError: true,
+    };
+  }
+  if (flagFalse(args.block) && !handle.outcome) {
+    return {
+      text: `agent_id: ${handle.id}\ntitle: ${handle.title}\nprofile: ${handle.profile}\nstatus: running`,
+      isError: false,
+    };
+  }
+  const outcome = await handle.done;
+  return {
+    text: `# ${handle.title}\nagent_id: ${handle.id}\nprofile: ${handle.profile}\nstatus: ${
+      outcome.isError ? "failed" : "completed"
+    }\n\n${outcome.text}`,
+    isError: outcome.isError,
+  };
+}
 
 export async function spawnSubagent(input: {
   prompt: string;
@@ -115,12 +345,13 @@ export async function spawnSubagent(input: {
     ? input.ctx.subagents
     : listSpawnRefs([]);
   const agent = resolveSubagent(input.name || "worker", agents);
+  const child = childSpawnPolicy(input.ctx.sandbox, agent.readOnly);
   const { llmComplete } = await import("./llm.ts");
   const label = (input.description || agent.name).trim();
   const system = [
     agent.instructions,
     hostContext(),
-    agent.readOnly ? CHILD_TOOLS_RO : CHILD_TOOLS,
+    child.allowWrite ? CHILD_TOOLS : CHILD_TOOLS_RO,
   ]
     .filter(Boolean)
     .join("\n\n");
@@ -130,7 +361,7 @@ export async function spawnSubagent(input: {
     system,
     messages: [{ role: "user", content: prompt }],
     temperature: 0.3,
-    role: "chat",
+    role: "spawn",
     tools: true,
     skills: input.ctx.skills,
     toolCtx: {
@@ -139,10 +370,11 @@ export async function spawnSubagent(input: {
       dataDir,
       env: input.ctx.env,
       spawnDepth: 1,
-      allowWrite: !agent.readOnly,
-      sandbox: input.ctx.sandbox,
+      allowWrite: child.allowWrite,
+      sandbox: child.sandbox,
       workspace: input.ctx.workspace,
       dispatch: input.ctx.dispatch,
+      signal: input.ctx.signal,
     },
   });
   if (!result) {