opencode-swarm-plugin 0.26.1 → 0.27.2

package/src/swarm-decompose.ts

@@ -6,7 +6,7 @@
  *
  * Key responsibilities:
  * - Decomposition prompt generation
- * - BeadTree validation
+ * - CellTree validation
  * - File conflict detection
  * - Instruction conflict detection
  * - Delegation to planner subagents
@@ -14,7 +14,7 @@
 
 import { tool } from "@opencode-ai/plugin";
 import { z } from "zod";
-import { BeadTreeSchema } from "./schemas";
+import { CellTreeSchema } from "./schemas";
 import {
   POSITIVE_MARKERS,
   NEGATIVE_MARKERS,
@@ -29,7 +29,7 @@ import {
  * Prompt for decomposing a task into parallelizable subtasks.
  *
  * Used by swarm_decompose to instruct the agent on how to break down work.
- * The agent responds with a BeadTree that gets validated.
+ * The agent responds with a CellTree that gets validated.
  */
 const DECOMPOSITION_PROMPT = `You are decomposing a task into parallelizable subtasks for a swarm of agents.
 
@@ -44,9 +44,9 @@ const DECOMPOSITION_PROMPT = `You are decomposing a task into parallelizable sub
 
 After decomposition, the coordinator will:
 1. Create an epic bead for the overall task
-2. Create child beads for each subtask
+2. Create child cells for each subtask
 3. Track progress through bead status updates
-4. Close beads with summaries when complete
+4. Close cells with summaries when complete
 
 Agents MUST update their bead status as they work. No silent progress.
 
@@ -66,7 +66,7 @@ Respond with a JSON object matching this schema:
 \`\`\`typescript
 {
   epic: {
-    title: string,        // Epic title for the beads tracker
+    title: string,        // Epic title for the hive tracker
     description?: string  // Brief description of the overall goal
   },
   subtasks: [
@@ -121,9 +121,9 @@ const STRATEGY_DECOMPOSITION_PROMPT = `You are decomposing a task into paralleli
 
 After decomposition, the coordinator will:
 1. Create an epic bead for the overall task
-2. Create child beads for each subtask
+2. Create child cells for each subtask
 3. Track progress through bead status updates
-4. Close beads with summaries when complete
+4. Close cells with summaries when complete
 
 Agents MUST update their bead status as they work. No silent progress.
 
@@ -143,7 +143,7 @@ Respond with a JSON object matching this schema:
 \`\`\`typescript
 {
   epic: {
-    title: string,        // Epic title for the beads tracker
+    title: string,        // Epic title for the hive tracker
     description?: string  // Brief description of the overall goal
   },
   subtasks: [
@@ -425,7 +425,7 @@ function formatCassHistoryForPrompt(history: CassSearchResult): string {
  * Decompose a task into a bead tree
  *
  * This is a PROMPT tool - it returns a prompt for the agent to respond to.
- * The agent's response (JSON) should be validated with BeadTreeSchema.
+ * The agent's response (JSON) should be validated with CellTreeSchema.
  *
  * Optionally queries CASS for similar past tasks to inform decomposition.
  */
@@ -512,7 +512,7 @@ export const swarm_decompose = tool({
     return JSON.stringify(
       {
         prompt,
-        expected_schema: "BeadTree",
+        expected_schema: "CellTree",
         schema_hint: {
           epic: { title: "string", description: "string?" },
           subtasks: [
@@ -526,7 +526,7 @@ export const swarm_decompose = tool({
           ],
         },
         validation_note:
-          "Parse agent response as JSON and validate with BeadTreeSchema from schemas/bead.ts",
+          "Parse agent response as JSON and validate with CellTreeSchema from schemas/bead.ts",
         cass_history: cassResultInfo,
         // Add semantic-memory query instruction
         memory_query: formatMemoryQueryForDecomposition(args.task, 3),
@@ -543,16 +543,16 @@ export const swarm_decompose = tool({
  * Use this after the agent responds to swarm:decompose to validate the structure.
  */
 export const swarm_validate_decomposition = tool({
-  description: "Validate a decomposition response against BeadTreeSchema",
+  description: "Validate a decomposition response against CellTreeSchema",
   args: {
     response: tool.schema
       .string()
-      .describe("JSON response from agent (BeadTree format)"),
+      .describe("JSON response from agent (CellTree format)"),
   },
   async execute(args) {
     try {
       const parsed = JSON.parse(args.response);
-      const validated = BeadTreeSchema.parse(parsed);
+      const validated = CellTreeSchema.parse(parsed);
 
       // Additional validation: check for file conflicts
       const conflicts = detectFileConflicts(validated.subtasks);
@@ -608,7 +608,7 @@ export const swarm_validate_decomposition = tool({
       return JSON.stringify(
         {
           valid: true,
-          bead_tree: validated,
+          cell_tree: validated,
           stats: {
             subtask_count: validated.subtasks.length,
             total_files: new Set(validated.subtasks.flatMap((s) => s.files))
@@ -667,10 +667,10 @@ export const swarm_validate_decomposition = tool({
  * - CASS queries
  * - Skills discovery
  * - File analysis
- * - BeadTree generation
+ * - CellTree generation
  *
- * The planner returns ONLY structured BeadTree JSON, which the coordinator
- * validates and uses to create beads.
+ * The planner returns ONLY structured CellTree JSON, which the coordinator
+ * validates and uses to create cells.
  *
  * @example
  * ```typescript
@@ -815,7 +815,7 @@ export const swarm_delegate_planning = tool({
     const subagentInstructions = `
 ## CRITICAL: Output Format
 
-You are a planner subagent. Your ONLY output must be valid JSON matching the BeadTree schema.
+You are a planner subagent. Your ONLY output must be valid JSON matching the CellTree schema.
 
 DO NOT include:
 - Explanatory text before or after the JSON
@@ -849,7 +849,7 @@ OUTPUT ONLY the raw JSON object.
   ]
 }
 
-Now generate the BeadTree for the given task.`;
+Now generate the CellTree for the given task.`;
 
     const fullPrompt = `${planningPrompt}\n\n${subagentInstructions}`;
 
@@ -863,12 +863,12 @@ Now generate the BeadTree for the given task.`;
           selected: selectedStrategy,
           reasoning: strategyReasoning,
         },
-        expected_output: "BeadTree JSON (raw JSON, no markdown)",
+        expected_output: "CellTree JSON (raw JSON, no markdown)",
         next_steps: [
           "1. Spawn subagent with Task tool using returned prompt",
           "2. Parse subagent response as JSON",
           "3. Validate with swarm_validate_decomposition",
-          "4. Create beads with beads_create_epic",
+          "4. Create cells with hive_create_epic",
         ],
         cass_history: cassResultInfo,
         skills: skillsInfo,

package/src/swarm-orchestrate.ts

@@ -68,6 +68,14 @@ import {
   warnMissingTool,
 } from "./tool-availability";
 import { listSkills } from "./skills";
+import {
+  canUseWorktreeIsolation,
+  getStartCommit,
+} from "./swarm-worktree";
+import {
+  isReviewApproved,
+  getReviewStatus,
+} from "./swarm-review";
 
 // ============================================================================
 // Helper Functions
@@ -583,6 +591,13 @@ export const swarm_init = tool({
       .string()
       .optional()
       .describe("Project path (for Agent Mail init)"),
+    isolation: tool.schema
+      .enum(["worktree", "reservation"])
+      .optional()
+      .default("reservation")
+      .describe(
+        "Isolation mode: 'worktree' for git worktree isolation (requires clean git state), 'reservation' for file reservations (default)",
+      ),
   },
   async execute(args) {
     // Check all tools
@@ -647,9 +662,53 @@ export const swarm_init = tool({
         "No skills found. Add skills to .opencode/skills/ or .claude/skills/ for specialized guidance.";
     }
 
+    // Check isolation mode
+    const isolationMode = args.isolation ?? "reservation";
+    let isolationInfo: {
+      mode: "worktree" | "reservation";
+      available: boolean;
+      start_commit?: string;
+      reason?: string;
+    } = {
+      mode: isolationMode,
+      available: true,
+    };
+
+    if (isolationMode === "worktree" && args.project_path) {
+      const worktreeCheck = await canUseWorktreeIsolation(args.project_path);
+      if (worktreeCheck.canUse) {
+        const startCommit = await getStartCommit(args.project_path);
+        isolationInfo = {
+          mode: "worktree",
+          available: true,
+          start_commit: startCommit ?? undefined,
+        };
+      } else {
+        // Fall back to reservation mode
+        isolationInfo = {
+          mode: "reservation",
+          available: false,
+          reason: `Worktree mode unavailable: ${worktreeCheck.reason}. Falling back to reservation mode.`,
+        };
+        warnings.push(
+          `⚠️  Worktree isolation unavailable: ${worktreeCheck.reason}. Using file reservations instead.`,
+        );
+      }
+    } else if (isolationMode === "worktree" && !args.project_path) {
+      isolationInfo = {
+        mode: "reservation",
+        available: false,
+        reason: "Worktree mode requires project_path. Falling back to reservation mode.",
+      };
+      warnings.push(
+        "⚠️  Worktree isolation requires project_path. Using file reservations instead.",
+      );
+    }
+
     return JSON.stringify(
       {
         ready: true,
+        isolation: isolationInfo,
         tool_availability: Object.fromEntries(
           Array.from(availability.entries()).map(([k, v]) => [
             k,
@@ -671,6 +730,10 @@ export const swarm_init = tool({
           agent_mail: agentMailAvailable
             ? "✓ Use Agent Mail for coordination"
             : "Start Agent Mail: agent-mail serve",
+          isolation:
+            isolationInfo.mode === "worktree"
+              ? "✓ Using git worktree isolation"
+              : "✓ Using file reservation isolation",
         },
         report,
       },
@@ -708,7 +771,7 @@ export const swarm_status = tool({
     const agents: SpawnedAgent[] = [];
 
     for (const bead of subtasks) {
-      // Map bead status to agent status
+      // Map cell status to agent status
       let agentStatus: SpawnedAgent["status"] = "pending";
       switch (bead.status) {
         case "in_progress":
@@ -815,7 +878,7 @@ export const swarm_progress = tool({
     // Validate
     const validated = AgentProgressSchema.parse(progress);
 
-    // Update bead status if needed
+    // Update cell status if needed
     if (args.status === "blocked" || args.status === "in_progress") {
       const beadStatus = args.status === "blocked" ? "blocked" : "in_progress";
       await Bun.$`bd update ${args.bead_id} --status ${beadStatus} --json`
@@ -984,9 +1047,9 @@ export const swarm_broadcast = tool({
  * 2. RUN: Execute verification (UBS, typecheck, tests)
  * 3. READ: Check exit codes and output
  * 4. VERIFY: All checks must pass
- * 5. ONLY THEN: Close the bead
+ * 5. ONLY THEN: Close the cell
  *
- * Closes bead, releases reservations, notifies coordinator.
+ * Closes cell, releases reservations, notifies coordinator.
  */
 export const swarm_complete = tool({
   description:
@@ -1030,13 +1093,64 @@ export const swarm_complete = tool({
       .number()
       .optional()
       .describe("Number of retry attempts during task"),
+    skip_review: tool.schema
+      .boolean()
+      .optional()
+      .describe(
+        "Skip review gate check (default: false). Use only for tasks that don't require coordinator review.",
+      ),
   },
   async execute(args, _ctx) {
-    // Extract epic ID early for error notifications
+    // Extract epic ID early for error notifications and review gate
     const epicId = args.bead_id.includes(".")
       ? args.bead_id.split(".")[0]
       : args.bead_id;
 
+    // Check review gate (unless skipped) - BEFORE try block so errors are clear
+    if (!args.skip_review) {
+      const reviewStatusResult = getReviewStatus(args.bead_id);
+
+      if (!reviewStatusResult.approved) {
+        // Check if review was even attempted
+        if (!reviewStatusResult.reviewed) {
+          return JSON.stringify(
+            {
+              success: false,
+              error: "Review required before completion",
+              review_status: reviewStatusResult,
+              hint: `This task requires coordinator review before completion.
+
+**Next steps:**
+1. Request review with swarm_review(project_key="${args.project_key}", epic_id="${epicId}", task_id="${args.bead_id}", files_touched=[...])
+2. Wait for coordinator to review and approve with swarm_review_feedback
+3. Once approved, call swarm_complete again
+
+Or use skip_review=true to bypass (not recommended for production work).`,
+            },
+            null,
+            2,
+          );
+        }
+
+        // Review was attempted but not approved
+        return JSON.stringify(
+          {
+            success: false,
+            error: "Review not approved",
+            review_status: reviewStatusResult,
+            hint: `Task was reviewed but not approved. ${reviewStatusResult.remaining_attempts} attempt(s) remaining.
+
+**Next steps:**
+1. Address the feedback from the reviewer
+2. Request another review with swarm_review
+3. Once approved, call swarm_complete again`,
+          },
+          null,
+          2,
+        );
+      }
+    }
+
     try {
       // Verify agent is registered in swarm-mail
       // This catches agents who skipped swarmmail_init
@@ -1189,8 +1303,8 @@ Continuing with completion, but this should be fixed for future subtasks.`;
         }
       }
 
-      // Close the bead - use project_key as working directory to find correct .beads/
-      // This fixes the issue where bead ID prefix (e.g., "pdf-library-g84.2") doesn't match CWD
+      // Close the cell - use project_key as working directory to find correct .beads/
+      // This fixes the issue where cell ID prefix (e.g., "pdf-library-g84.2") doesn't match CWD
       const closeResult =
         await Bun.$`bd close ${args.bead_id} --reason ${args.summary} --json`
           .cwd(args.project_key)
@@ -1208,7 +1322,7 @@ Continuing with completion, but this should be fixed for future subtasks.`;
         return JSON.stringify(
           {
             success: false,
-            error: "Failed to close bead",
+            error: "Failed to close cell",
             failed_step: "bd close",
             details: stderrOutput || stdoutOutput || "Unknown error from bd close command",
             bead_id: args.bead_id,
@@ -1218,20 +1332,20 @@ Continuing with completion, but this should be fixed for future subtasks.`;
                 ? [
                     `1. Verify project_key is correct: "${args.project_key}"`,
                     `2. Check .beads/ exists in that directory`,
-                    `3. Bead ID prefix "${args.bead_id.split("-")[0]}" should match project`,
-                    `4. Try: beads_close(id="${args.bead_id}", reason="...")`,
+                    `3. Cell ID prefix "${args.bead_id.split("-")[0]}" should match project`,
+                    `4. Try: hive_close(id="${args.bead_id}", reason="...")`,
                   ]
                 : [
-                    `1. Check bead exists: bd show ${args.bead_id}`,
-                    `2. Check bead status (might already be closed): beads_query()`,
-                    `3. If bead is blocked, unblock first: beads_update(id="${args.bead_id}", status="in_progress")`,
-                    `4. Try closing directly: beads_close(id="${args.bead_id}", reason="...")`,
+                    `1. Check cell exists: bd show ${args.bead_id}`,
+                    `2. Check cell status (might already be closed): hive_query()`,
+                    `3. If cell is blocked, unblock first: hive_update(id="${args.bead_id}", status="in_progress")`,
+                    `4. Try closing directly: hive_close(id="${args.bead_id}", reason="...")`,
                   ],
               hint: isNoDatabaseError
                 ? `The project_key "${args.project_key}" doesn't have a .beads/ directory. Make sure you're using the correct project path.`
                 : isNotFoundError
-                  ? `Bead "${args.bead_id}" not found. It may have been closed already or the ID is incorrect.`
-                  : "If bead is in 'blocked' status, you must change it to 'in_progress' or 'open' before closing.",
+                  ? `Cell "${args.bead_id}" not found. It may have been closed already or the ID is incorrect.`
+                  : "If cell is in 'blocked' status, you must change it to 'in_progress' or 'open' before closing.",
             },
           },
           null,
@@ -1497,7 +1611,7 @@ Files touched: ${args.files_touched?.join(", ") || "none recorded"}`,
         "",
         `### Recovery Actions`,
         "1. Check error message for specific issue",
-        "2. Review failed step (UBS scan, typecheck, bead close, etc.)",
+        "2. Review failed step (UBS scan, typecheck, cell close, etc.)",
         "3. Fix underlying issue or use skip flags if appropriate",
         "4. Retry swarm_complete after fixing",
       ]
@@ -1553,7 +1667,7 @@ Files touched: ${args.files_touched?.join(", ") || "none recorded"}`,
             common_fixes: {
               "Verification Gate": "Use skip_verification=true to bypass (not recommended)",
               "UBS scan": "Use skip_ubs_scan=true to bypass",
-              "Bead close": "Check bead status with beads_query(), may need beads_update() first",
+              "Cell close": "Check cell status with hive_query(), may need hive_update() first",
               "Self-evaluation": "Check evaluation JSON format matches EvaluationSchema",
             },
           },
@@ -1738,7 +1852,7 @@ export const swarm_accumulate_error = tool({
   description:
     "Record an error during subtask execution. Errors feed into retry prompts.",
   args: {
-    bead_id: tool.schema.string().describe("Bead ID where error occurred"),
+    bead_id: tool.schema.string().describe("Cell ID where error occurred"),
     error_type: tool.schema
       .enum(["validation", "timeout", "conflict", "tool_failure", "unknown"])
       .describe("Category of error"),
@@ -1791,7 +1905,7 @@ export const swarm_get_error_context = tool({
   description:
     "Get accumulated errors for a bead. Returns formatted context for retry prompts.",
   args: {
-    bead_id: tool.schema.string().describe("Bead ID to get errors for"),
+    bead_id: tool.schema.string().describe("Cell ID to get errors for"),
     include_resolved: tool.schema
       .boolean()
       .optional()
@@ -1873,7 +1987,7 @@ export const swarm_check_strikes = tool({
   description:
     "Check 3-strike status for a bead. Records failures, detects architectural problems, generates architecture review prompts.",
   args: {
-    bead_id: tool.schema.string().describe("Bead ID to check"),
+    bead_id: tool.schema.string().describe("Cell ID to check"),
     action: tool.schema
       .enum(["check", "add_strike", "clear", "get_prompt"])
       .describe(

package/src/swarm-prompts.ts

@@ -22,7 +22,7 @@ import { tool } from "@opencode-ai/plugin";
  * Prompt for decomposing a task into parallelizable subtasks.
  *
  * Used by swarm_decompose to instruct the agent on how to break down work.
- * The agent responds with a BeadTree that gets validated.
+ * The agent responds with a CellTree that gets validated.
  */
 export const DECOMPOSITION_PROMPT = `You are decomposing a task into parallelizable subtasks for a swarm of agents.
 
@@ -31,17 +31,17 @@ export const DECOMPOSITION_PROMPT = `You are decomposing a task into paralleliza
 
 {context_section}
 
-## MANDATORY: Beads Issue Tracking
+## MANDATORY: Hive Issue Tracking
 
-**Every subtask MUST become a bead.** This is non-negotiable.
+**Every subtask MUST become a cell.** This is non-negotiable.
 
 After decomposition, the coordinator will:
-1. Create an epic bead for the overall task
-2. Create child beads for each subtask
-3. Track progress through bead status updates
-4. Close beads with summaries when complete
+1. Create an epic cell for the overall task
+2. Create child cells for each subtask
+3. Track progress through cell status updates
+4. Close cells with summaries when complete
 
-Agents MUST update their bead status as they work. No silent progress.
+Agents MUST update their cell status as they work. No silent progress.
 
 ## Requirements
 
@@ -59,7 +59,7 @@ Respond with a JSON object matching this schema:
 \`\`\`typescript
 {
   epic: {
-    title: string,        // Epic title for the beads tracker
+    title: string,        // Epic title for the hive tracker
     description?: string  // Brief description of the overall goal
   },
   subtasks: [
@@ -108,17 +108,17 @@ export const STRATEGY_DECOMPOSITION_PROMPT = `You are decomposing a task into pa
 
 {skills_context}
 
-## MANDATORY: Beads Issue Tracking
+## MANDATORY: Hive Issue Tracking
 
-**Every subtask MUST become a bead.** This is non-negotiable.
+**Every subtask MUST become a cell.** This is non-negotiable.
 
 After decomposition, the coordinator will:
-1. Create an epic bead for the overall task
-2. Create child beads for each subtask
-3. Track progress through bead status updates
-4. Close beads with summaries when complete
+1. Create an epic cell for the overall task
+2. Create child cells for each subtask
+3. Track progress through cell status updates
+4. Close cells with summaries when complete
 
-Agents MUST update their bead status as they work. No silent progress.
+Agents MUST update their cell status as they work. No silent progress.
 
 ## Requirements
 
@@ -136,7 +136,7 @@ Respond with a JSON object matching this schema:
 \`\`\`typescript
 {
   epic: {
-    title: string,        // Epic title for the beads tracker
+    title: string,        // Epic title for the hive tracker
     description?: string  // Brief description of the overall goal
   },
   subtasks: [
@@ -164,7 +164,7 @@ export const SUBTASK_PROMPT = `You are a swarm agent working on a subtask of a l
 
 ## Your Identity
 - **Agent Name**: {agent_name}
-- **Bead ID**: {bead_id}
+- **Cell ID**: {bead_id}
 - **Epic ID**: {epic_id}
 
 ## Your Subtask
@@ -182,16 +182,16 @@ send a message to the coordinator requesting the change.
 ## Shared Context
 {shared_context}
 
-## MANDATORY: Beads Tracking
+## MANDATORY: Hive Tracking
 
-You MUST keep your bead updated as you work:
+You MUST keep your cell updated as you work:
 
-1. **Your bead is already in_progress** - don't change this unless blocked
-2. **If blocked**: \`bd update {bead_id} --status blocked\` and message coordinator
-3. **When done**: Use \`swarm_complete\` - it closes your bead automatically
-4. **Discovered issues**: Create new beads with \`bd create "issue" -t bug\`
+1. **Your cell is already in_progress** - don't change this unless blocked
+2. **If blocked**: \`hive_update {bead_id} --status blocked\` and message coordinator
+3. **When done**: Use \`swarm_complete\` - it closes your cell automatically
+4. **Discovered issues**: Create new cells with \`hive_create "issue" -t bug\`
 
-**Never work silently.** Your bead status is how the swarm tracks progress.
+**Never work silently.** Your cell status is how the swarm tracks progress.
 
 ## MANDATORY: Swarm Mail Communication
 
@@ -214,11 +214,11 @@ swarmmail_send(
 
 ## Coordination Protocol
 
-1. **Start**: Your bead is already marked in_progress
+1. **Start**: Your cell is already marked in_progress
 2. **Progress**: Use swarm_progress to report status updates
 3. **Blocked**: Report immediately via Swarm Mail - don't spin
 4. **Complete**: Use swarm_complete when done - it handles:
-   - Closing your bead with a summary
+   - Closing your cell with a summary
    - Releasing file reservations
    - Notifying the coordinator
 
@@ -243,10 +243,10 @@ Before writing code:
 Begin work on your subtask now.`;
 
 /**
- * Streamlined subtask prompt (V2) - uses Swarm Mail and beads
+ * Streamlined subtask prompt (V2) - uses Swarm Mail and hive tracking
  *
  * This is a cleaner version of SUBTASK_PROMPT that's easier to parse.
- * Agents MUST use Swarm Mail for communication and beads for tracking.
+ * Agents MUST use Swarm Mail for communication and hive cells for tracking.
  *
  * Supports {error_context} placeholder for retry prompts.
  */
@@ -254,7 +254,7 @@ export const SUBTASK_PROMPT_V2 = `You are a swarm agent working on: **{subtask_t
 
 ## [IDENTITY]
 Agent: (assigned at spawn)
-Bead: {bead_id}
+Cell: {bead_id}
 Epic: {epic_id}
 
 ## [TASK]
@@ -398,7 +398,7 @@ swarm_complete(
 - Records learning signals
 - Notifies coordinator
 
-**DO NOT manually close the bead with beads_close.** Use swarm_complete.
+**DO NOT manually close the cell with hive_close.** Use swarm_complete.
 
 ## [SWARM MAIL COMMUNICATION]
 
@@ -417,7 +417,7 @@ swarmmail_send(
   importance="high",
   thread_id="{epic_id}"
 )
-beads_update(id="{bead_id}", status="blocked")
+hive_update(id="{bead_id}", status="blocked")
 \`\`\`
 
 ### Report Issues to Other Agents
@@ -438,15 +438,15 @@ swarmmail_release()  # Manually release reservations
 **Note:** \`swarm_complete\` automatically releases reservations. Only use manual release if aborting work.
 
 ## [OTHER TOOLS]
-### Beads - You Have Autonomy to File Issues
-You can create new beads against this epic when you discover:
+### Hive - You Have Autonomy to File Issues
+You can create new cells against this epic when you discover:
 - **Bugs**: Found a bug while working? File it.
 - **Tech debt**: Spotted something that needs cleanup? File it.
 - **Follow-up work**: Task needs more work than scoped? File a follow-up.
 - **Dependencies**: Need something from another agent? File and link it.
 
 \`\`\`
-beads_create(
+hive_create(
   title="<descriptive title>",
   type="bug",  # or "task", "chore"
   priority=2,
@@ -457,9 +457,9 @@ beads_create(
 
 **Don't silently ignore issues.** File them so they get tracked and addressed.
 
-Other bead operations:
-- beads_update(id, status) - Mark blocked if stuck
-- beads_query(status="open") - See what else needs work
+Other cell operations:
+- hive_update(id, status) - Mark blocked if stuck
+- hive_query(status="open") - See what else needs work
 
 ### Skills
 - skills_list() - Discover available skills
@@ -473,7 +473,7 @@ Other bead operations:
 2. Step 2 (semantic-memory_find) MUST happen before starting work
 3. Step 4 (swarmmail_reserve) - YOU reserve files, not coordinator
 4. Step 6 (swarm_progress) - Report at milestones, don't work silently
-5. Step 9 (swarm_complete) - Use this to close, NOT beads_close
+5. Step 9 (swarm_complete) - Use this to close, NOT hive_close
 
 **If you skip these steps:**
 - Your work won't be tracked (swarm_complete will fail)
@@ -492,7 +492,7 @@ Begin now.`;
 export const EVALUATION_PROMPT = `Evaluate the work completed for this subtask.
 
 ## Subtask
-**Bead ID**: {bead_id}
+**Cell ID**: {bead_id}
 **Title**: {subtask_title}
 
 ## Files Modified
@@ -691,12 +691,12 @@ export const swarm_subtask_prompt = tool({
 /**
  * Prepare a subtask for spawning with Task tool (V2 prompt)
  *
- * Generates a streamlined prompt that tells agents to USE Agent Mail and beads.
+ * Generates a streamlined prompt that tells agents to USE Agent Mail and hive tracking.
  * Returns JSON that can be directly used with Task tool.
  */
 export const swarm_spawn_subtask = tool({
   description:
-    "Prepare a subtask for spawning. Returns prompt with Agent Mail/beads instructions. IMPORTANT: Pass project_path for swarmmail_init.",
+    "Prepare a subtask for spawning. Returns prompt with Agent Mail/hive tracking instructions. IMPORTANT: Pass project_path for swarmmail_init.",
   args: {
     bead_id: tool.schema.string().describe("Subtask bead ID"),
     epic_id: tool.schema.string().describe("Parent epic bead ID"),
@@ -916,7 +916,7 @@ export const swarm_plan_prompt = tool({
             STRATEGIES[selectedStrategy as keyof typeof STRATEGIES]
               .antiPatterns,
         },
-        expected_schema: "BeadTree",
+        expected_schema: "CellTree",
         schema_hint: {
           epic: { title: "string", description: "string?" },
           subtasks: [