heyio 4.2.2 → 4.2.4

package/dist/daemon/cli.js

@@ -75,23 +75,23 @@ var init_api = __esm({
 });
 
 // packages/shared/dist/constants.js
-var APP_NAME, APP_VERSION, API_PORT, API_HOST, DEFAULT_MODEL, SESSION_RESET_THRESHOLD, SCHEDULER_INTERVAL_MS, QA_MAX_REVISIONS, MANDATORY_ROLES, EVENT_NAMES;
+var APP_NAME, APP_VERSION, API_PORT, API_HOST, DEFAULT_MODEL, SESSION_RESET_THRESHOLD, SCHEDULER_INTERVAL_MS, QA_MAX_REVISIONS, EVENT_NAMES;
 var init_constants = __esm({
   "packages/shared/dist/constants.js"() {
     "use strict";
     APP_NAME = "io";
-    APP_VERSION = "4.2.2";
+    APP_VERSION = "4.2.4";
     API_PORT = 7777;
     API_HOST = "0.0.0.0";
     DEFAULT_MODEL = "gpt-4o";
     SESSION_RESET_THRESHOLD = 50;
     SCHEDULER_INTERVAL_MS = 6e4;
     QA_MAX_REVISIONS = 3;
-    MANDATORY_ROLES = ["team-lead", "qa"];
     EVENT_NAMES = {
       SQUAD_CREATED: "squad.created",
       SQUAD_DELETED: "squad.deleted",
       SQUAD_UPDATED: "squad.updated",
+      SQUAD_MEMBER_UPDATED: "squad.member_updated",
       INSTANCE_CREATED: "instance.created",
       INSTANCE_STARTED: "instance.started",
       INSTANCE_COMPLETED: "instance.completed",
@@ -2310,6 +2310,10 @@ async function updateMember(memberId, data, db) {
   const database = db ?? await getDatabase();
   const sets = [];
   const args = [];
+  if (data.role !== void 0) {
+    sets.push("role = ?");
+    args.push(data.role);
+  }
   if (data.systemPrompt !== void 0) {
     sets.push("system_prompt = ?");
     args.push(data.systemPrompt);
@@ -11914,8 +11918,8 @@ async function recordUsage(data, db) {
     createdAt: data.createdAt ?? nowIso()
   };
   await database.execute({
-    sql: `INSERT INTO token_usage (id, squad_id, agent_id, model, input_tokens, output_tokens, cost, premium_request_cost, token_unit_cost, squad_name, agent_name, created_at)
-		      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+    sql: `INSERT INTO token_usage (id, squad_id, agent_id, model, input_tokens, output_tokens, cost, squad_name, agent_name, created_at)
+		      VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
     args: [
       usage.id,
       usage.squadId,
@@ -11924,8 +11928,6 @@ async function recordUsage(data, db) {
       usage.inputTokens,
       usage.outputTokens,
       usage.cost,
-      data.premiumRequestCost ?? null,
-      data.tokenUnitCost ?? null,
       data.squadName ?? null,
       data.agentName ?? null,
       usage.createdAt
@@ -52870,11 +52872,16 @@ var init_squads2 = __esm({
           res.status(404).json({ error: "Member not found" });
           return;
         }
-        const { systemPrompt, model } = req.body;
+        const { role, systemPrompt, model } = req.body;
         const updated = await updateMember(member.id, {
+          role,
           systemPrompt,
           model: model === "" ? null : model
         });
+        eventBus.emit(EVENT_NAMES.SQUAD_MEMBER_UPDATED, {
+          squadId: member.squadId,
+          member: updated
+        });
         res.status(200).json(updated);
       } catch (error51) {
         res.status(500).json({
@@ -68325,10 +68332,19 @@ async function getModelPricing(modelId) {
     sql: "SELECT * FROM model_pricing WHERE id = ?",
     args: [modelId]
   });
-  if (result.rows.length === 0) {
-    return null;
+  if (result.rows.length > 0) {
+    return rowToModelPricing(result.rows[0]);
+  }
+  const allModels = await db.execute(
+    "SELECT * FROM model_pricing WHERE token_input_multiplier IS NOT NULL ORDER BY length(id) DESC"
+  );
+  for (const row of allModels.rows) {
+    const storedId = asString(row.id);
+    if (modelId.startsWith(storedId) || storedId.startsWith(modelId)) {
+      return rowToModelPricing(row);
+    }
   }
-  return rowToModelPricing(result.rows[0]);
+  return null;
 }
 function calculateTokenUnitCost(inputTokens, outputTokens, inputMultiplier, outputMultiplier) {
   if (inputMultiplier === null || outputMultiplier === null) {
@@ -68424,9 +68440,10 @@ function buildSystemPrompt(options2) {
   const sections = [
     "You are Io, a helpful AI orchestrator companion for IO v4.",
     "You coordinate work across squads, wiki knowledge, installed skills, and direct execution tools.",
-    "When a user asks about a project that has a squad, delegate to that squad. When no squad exists, you can do the work directly.",
+    "When a user asks about a project that has a squad, delegate to that squad. When no squad exists, you can do the work directly or create a squad for ongoing project work.",
     "Be practical, concise, and execution-oriented. Use tools when they help you produce a more accurate or durable result.",
-    "## Delegation Rules\n- Prefer delegation for project-specific work when a matching squad exists.\n- If no squad exists for the target repository or project, use direct coding and knowledge tools yourself.\n- Use the wiki to remember important information and recover prior context.\n- Use installed skills when they are relevant to the current request.",
+    "## Delegation Rules\n- Prefer delegation for project-specific work when a matching squad exists.\n- If no squad exists for the target repository or project, use direct coding and knowledge tools yourself for one-off tasks.\n- For ongoing project work where no squad exists, create one with `create_squad` and then add members with `add_squad_member`.\n- Use the wiki to remember important information and recover prior context.\n- Use installed skills when they are relevant to the current request.",
+    "## Squad Creation Guidelines\n- Use `analyze_repo` first to understand the repository's tech stack and structure.\n- Always add a `team-lead` member (coordinates planning, task assignment, and technical review) and a `qa` member (validates diffs, tests, and objective completion).\n- Add additional role-specific members based on the repository analysis (e.g. senior-frontend-engineer, senior-backend-engineer, senior-platform-engineer).\n- Write detailed system prompts for each member that define their expertise, responsibilities, and behavioral guidelines.\n- Use `remove_squad_member` and `add_squad_member` to restructure existing squads when the user requests changes.",
     `## Squad Roster
 ${formatSquadRoster(options2.squads)}`,
     formatOptionalSection("## Conversation Summary", options2.conversationSummary ?? ""),
@@ -69492,8 +69509,7 @@ async function persistUsage(member, usageEvents, squadName) {
   for (const usage of usageEvents) {
     const model = usage.model;
     const pricing = await getModelPricing(model);
-    const premiumRequestCost = pricing?.premiumMultiplier ?? 0;
-    const tokenUnitCost = pricing ? calculateTokenUnitCost(
+    const cost = pricing ? calculateTokenUnitCost(
       usage.inputTokens ?? 0,
       usage.outputTokens ?? 0,
       pricing.tokenInputMultiplier,
@@ -69507,9 +69523,7 @@ async function persistUsage(member, usageEvents, squadName) {
       model,
       inputTokens: usage.inputTokens ?? 0,
       outputTokens: usage.outputTokens ?? 0,
-      cost: tokenUnitCost,
-      premiumRequestCost,
-      tokenUnitCost
+      cost
     });
   }
 }
@@ -69828,22 +69842,7 @@ var init_instance_context = __esm({
 });
 
 // packages/daemon/src/squad/roles.ts
-function generateRolePrompt(role, repoContext) {
-  const normalizedRole = role.trim() || "specialist";
-  return `You are the ${normalizedRole} for the IO v4 daemon squad system.
-
-${ROLE_GUIDELINES}
-
-Role expectations:
-- Own work that naturally fits the ${normalizedRole} discipline.
-- Make changes that align with the repository's existing architecture, conventions, and tooling.
-- Collaborate with the Team Lead and QA by leaving behind clear implementation notes and validation evidence.
-- Escalate blockers or missing context early.
-
-Repository context:
-${repoContext}`;
-}
-var ROLE_GUIDELINES, TEAM_LEAD_PROMPT, QA_PROMPT, ROLE_GENERATION_PROMPT;
+var ROLE_GUIDELINES, TEAM_LEAD_PROMPT, QA_PROMPT;
 var init_roles = __esm({
   "packages/daemon/src/squad/roles.ts"() {
     "use strict";
@@ -69889,28 +69888,6 @@ Review rules:
 - If approving, summarize why the work is acceptable.
 - If rejecting, include concrete fixes or follow-up actions.
 - Do not approve work that lacks evidence for important behavior changes.`;
-    ROLE_GENERATION_PROMPT = `You are staffing an autonomous software squad for a GitHub repository.
-
-Given repository analysis describing languages, frameworks, file structure, architectural patterns, and operational concerns, propose the smallest effective team that can deliver objectives safely.
-
-Requirements:
-- Mandatory roles Team Lead and QA must always exist.
-- Suggest only additional roles that are clearly justified by the repository analysis.
-- Prefer durable role names such as backend-engineer, frontend-engineer, test-automation-engineer, platform-engineer, data-engineer, security-engineer, documentation-engineer, or mobile-engineer.
-- Each role must have a short human-readable name and a concise description of responsibilities.
-- Avoid duplicate or overlapping roles.
-- Optimize for implementation, verification, and maintainability.
-
-Return strict JSON in this shape:
-{
-  "roles": [
-    {
-      "role": "frontend-engineer",
-      "name": "Frontend Engineer",
-      "description": "Owns UI implementation, client state, and browser-facing tests."
-    }
-  ]
-}`;
   }
 });
 
@@ -70717,8 +70694,19 @@ var init_runner = __esm({
   }
 });
 
-// packages/daemon/src/squad/hiring.ts
-import { CopilotClient as CopilotClient6, approveAll as approveAll6 } from "@github/copilot-sdk";
+// packages/daemon/src/orchestrator/tools/squad.ts
+import { exec as exec8 } from "node:child_process";
+import { mkdir as mkdir10, readFile as readFile9, readdir as readdir6, stat as stat4 } from "node:fs/promises";
+import { join as join15 } from "node:path";
+import { promisify as promisify8 } from "node:util";
+async function pathExists2(path) {
+  try {
+    await stat4(path);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function parseRepoUrl(repoUrl) {
   const trimmed = repoUrl.trim();
   const sshMatch = trimmed.match(/^git@[^:]+:([^/]+)\/([^/]+?)(?:\.git)?$/i);
@@ -70733,245 +70721,92 @@ function parseRepoUrl(repoUrl) {
   }
   return { owner: segments[0], name: segments[1] };
 }
-function slugifyRole(role) {
-  return role.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-}
 function titleCase(value) {
   return value.split(/[-_\s]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join(" ");
 }
-function extractJsonObject4(content) {
-  const fenced = content.match(/```(?:json)?\s*([\s\S]*?)```/i);
-  if (fenced?.[1]) {
-    return fenced[1].trim();
-  }
-  const start = content.indexOf("{");
-  const end = content.lastIndexOf("}");
-  return start >= 0 && end > start ? content.slice(start, end + 1) : null;
-}
-function detectRolesFromAnalysis(repoAnalysis) {
-  const analysis = repoAnalysis.toLowerCase();
-  const roles = [];
-  if (/(react|next|vue|angular|frontend|ui|xaml)/.test(analysis)) {
-    roles.push({
-      role: "frontend-engineer",
-      name: "Frontend Engineer",
-      description: "Implements user-facing experiences, UI state, and presentation-layer changes."
-    });
-  }
-  if (/(node|express|api|backend|server|daemon|database|sql|postgres|sqlite)/.test(analysis)) {
-    roles.push({
-      role: "backend-engineer",
-      name: "Backend Engineer",
-      description: "Implements server-side logic, data access, integrations, and execution flow changes."
-    });
-  }
-  if (/(infra|docker|kubernetes|deploy|ci|cd|workflow|github actions)/.test(analysis)) {
-    roles.push({
-      role: "platform-engineer",
-      name: "Platform Engineer",
-      description: "Owns automation, pipelines, environments, and operational tooling."
-    });
-  }
-  if (/(security|auth|oauth|secret|policy)/.test(analysis)) {
-    roles.push({
-      role: "security-engineer",
-      name: "Security Engineer",
-      description: "Reviews authentication, authorization, secrets handling, and security-sensitive changes."
-    });
-  }
-  return roles;
-}
-function dedupeRoles(roles) {
-  const seen = /* @__PURE__ */ new Set();
-  const output2 = [];
-  for (const role of roles) {
-    const normalizedRole = slugifyRole(role.role);
-    if (!normalizedRole || seen.has(normalizedRole) || MANDATORY_ROLES.includes(normalizedRole)) {
-      continue;
-    }
-    seen.add(normalizedRole);
-    output2.push({
-      role: normalizedRole,
-      name: role.name?.trim() || titleCase(normalizedRole),
-      description: role.description?.trim() || `${titleCase(normalizedRole)} responsibilities`
-    });
-  }
-  return output2;
-}
-function buildMandatoryRoles() {
-  return [
-    {
-      role: "team-lead",
-      name: "Team Lead",
-      description: "Coordinates planning, task assignment, sequencing, and final technical review."
-    },
-    {
-      role: "qa",
-      name: "QA Reviewer",
-      description: "Validates diffs, test evidence, and objective completion before delivery."
+async function readManifests(rootPath, rootLabel) {
+  const lines = [];
+  for (const manifest of MANIFEST_FILES) {
+    const fullPath = join15(rootPath, manifest);
+    try {
+      const fileStat = await stat4(fullPath);
+      if (fileStat.isFile()) {
+        const content = await readFile9(fullPath, "utf8");
+        lines.push(`
+--- ${rootLabel}${manifest} ---
+${content.slice(0, 3e3)}`);
+      } else if (fileStat.isDirectory()) {
+        const children = await readdir6(fullPath);
+        lines.push(`
+--- ${rootLabel}${manifest}/ ---
+${children.join(", ")}`);
+      }
+    } catch {
     }
-  ];
-}
-function modelForRole(role) {
-  const normalized = slugifyRole(role);
-  if (normalized === "team-lead") {
-    return DEFAULT_MODEL;
   }
-  return DEFAULT_MODEL;
+  return lines;
 }
-function systemPromptForRole(role, repoContext) {
-  const normalized = slugifyRole(role);
-  if (normalized === "team-lead") {
-    return `${TEAM_LEAD_PROMPT}
-
-Repository context:
-${repoContext}`;
-  }
-  if (normalized === "qa") {
-    return `${QA_PROMPT}
-
-Repository context:
-${repoContext}`;
-  }
-  return generateRolePrompt(normalized, repoContext);
-}
-async function proposeSquadComposition(repoUrl, repoAnalysis) {
-  const mandatory = buildMandatoryRoles();
-  const fallbackAdditional = dedupeRoles(detectRolesFromAnalysis(repoAnalysis));
-  const prompt = `Repository URL: ${repoUrl}
-
-Repository analysis:
-${repoAnalysis}
-
-${ROLE_GENERATION_PROMPT}`;
-  let client2 = null;
-  try {
-    client2 = new CopilotClient6();
-    await client2.start();
-    const session = await client2.createSession({
-      model: DEFAULT_MODEL,
-      onPermissionRequest: approveAll6,
-      systemMessage: {
-        content: ROLE_GENERATION_PROMPT
-      }
-    });
+async function scanSrcDirs(rootPath, rootLabel, dirs) {
+  const lines = [];
+  const srcDirs = dirs.filter((d) => SRC_DIR_NAMES.includes(d));
+  for (const srcDir of srcDirs) {
     try {
-      const response = await session.sendAndWait({ prompt }, 6e4);
-      const content = response?.data.content?.trim() ?? "";
-      const json2 = extractJsonObject4(content);
-      if (!json2) {
-        return { roles: [...mandatory, ...fallbackAdditional] };
-      }
-      const parsed = JSON.parse(json2);
-      return {
-        roles: [...mandatory, ...dedupeRoles(parsed.roles ?? fallbackAdditional)]
-      };
-    } finally {
-      await session.disconnect().catch(() => void 0);
-    }
-  } catch {
-    return { roles: [...mandatory, ...fallbackAdditional] };
-  } finally {
-    if (client2) {
-      await client2.stop().catch(() => []);
+      const srcEntries = await readdir6(join15(rootPath, srcDir), { withFileTypes: true });
+      const srcFiles = srcEntries.filter((e) => e.isFile()).map((e) => e.name);
+      const srcSubDirs = srcEntries.filter((e) => e.isDirectory()).map((e) => e.name);
+      lines.push(`
+--- ${rootLabel}${srcDir}/ ---`);
+      if (srcSubDirs.length) lines.push(`  Directories: ${srcSubDirs.join(", ")}`);
+      if (srcFiles.length) lines.push(`  Files: ${srcFiles.slice(0, 30).join(", ")}`);
+    } catch {
     }
   }
+  return lines;
 }
-async function hireSquad(repoUrl, composition, config2) {
-  const parsedRepo = parseRepoUrl(repoUrl);
-  const repoContext = `Repository: ${parsedRepo.owner}/${parsedRepo.name}
-Configured MCP servers: ${config2.mcpServers.join(", ") || "none"}
-QA max revisions: ${config2.maxRevisions || QA_MAX_REVISIONS}`;
-  const existingSquad = await getSquadByRepo(parsedRepo.owner, parsedRepo.name);
-  const normalizedConfig = {
-    prMode: config2.prMode,
-    mcpServers: [...config2.mcpServers],
-    maxRevisions: config2.maxRevisions || QA_MAX_REVISIONS
-  };
-  const desiredRoles = composition.roles.length > 0 ? composition.roles : buildMandatoryRoles();
-  const membersToCreate = desiredRoles.map((role) => ({
-    role: slugifyRole(role.role),
-    name: role.name?.trim() || titleCase(role.role),
-    description: role.description?.trim() || `${titleCase(role.role)} responsibilities`
-  }));
-  let squadId;
-  if (existingSquad) {
-    const updatedSquad = await updateSquad(existingSquad.id, {
-      name: `${titleCase(parsedRepo.name)} Squad`,
-      config: normalizedConfig,
-      status: existingSquad.status
-    });
-    if (!updatedSquad) {
-      throw new Error(`Unable to update existing squad for ${repoUrl}`);
+async function findReadme(rootPath, rootLabel) {
+  for (const readme of README_CANDIDATES2) {
+    try {
+      const content = await readFile9(join15(rootPath, readme), "utf8");
+      return `
+--- ${rootLabel}${readme} (excerpt) ---
+${content.slice(0, 1500)}`;
+    } catch {
     }
-    squadId = updatedSquad.id;
-    const existingMembers = await getMembers(updatedSquad.id);
-    await Promise.all(existingMembers.map((member) => removeMember(member.id)));
-  } else {
-    const squad = await createSquad({
-      name: `${titleCase(parsedRepo.name)} Squad`,
-      repoUrl,
-      repoOwner: parsedRepo.owner,
-      repoName: parsedRepo.name,
-      status: "active",
-      config: normalizedConfig
-    });
-    squadId = squad.id;
-  }
-  const members = [];
-  for (const memberDefinition of membersToCreate) {
-    const member = await addMember(squadId, {
-      role: memberDefinition.role,
-      name: memberDefinition.name,
-      systemPrompt: systemPromptForRole(
-        memberDefinition.role,
-        `${repoContext}
-Role: ${memberDefinition.description}`
-      ),
-      model: modelForRole(memberDefinition.role)
-    });
-    members.push(member);
   }
-  const fullSquad = await getSquad(squadId);
-  if (!fullSquad) {
-    throw new Error(`Unable to load squad ${squadId} after hiring`);
-  }
-  eventBus.emit(existingSquad ? EVENT_NAMES.SQUAD_UPDATED : EVENT_NAMES.SQUAD_CREATED, {
-    squad: fullSquad
-  });
-  return { squad: fullSquad, members: fullSquad.members };
+  return null;
 }
-var init_hiring = __esm({
-  "packages/daemon/src/squad/hiring.ts"() {
-    "use strict";
-    init_dist();
-    init_event_bus();
-    init_store2();
-    init_roles();
-  }
-});
-
-// packages/daemon/src/orchestrator/tools/squad.ts
-import { exec as exec8 } from "node:child_process";
-import { mkdir as mkdir10, readFile as readFile9, readdir as readdir6, stat as stat4 } from "node:fs/promises";
-import { join as join15 } from "node:path";
-import { promisify as promisify8 } from "node:util";
-async function pathExists2(path) {
+async function scanRoot(root) {
+  const lines = [];
+  const rootLabel = root.label ? `${root.label}/` : "";
+  const rootEntries = await readdir6(root.path, { withFileTypes: true });
+  const rootFiles = rootEntries.filter((e) => e.isFile()).map((e) => e.name);
+  const rootDirs = rootEntries.filter((e) => e.isDirectory() && e.name !== ".git").map((e) => e.name);
+  if (rootFiles.length) lines.push(`${rootLabel}Files: ${rootFiles.join(", ")}`);
+  if (rootDirs.length) lines.push(`${rootLabel}Directories: ${rootDirs.join(", ")}`);
+  lines.push(...await readManifests(root.path, rootLabel));
+  lines.push(...await scanSrcDirs(root.path, rootLabel, rootDirs));
+  const readme = await findReadme(root.path, rootLabel);
+  if (readme) lines.push(readme);
+  return lines;
+}
+async function cloneOrUpdateRepo(normalized, repoDir) {
   try {
-    await stat4(path);
+    await mkdir10(join15(DATA_DIR, "repos"), { recursive: true });
+    if (await pathExists2(join15(repoDir, ".git"))) {
+      await execAsync8("git pull --ff-only", { cwd: repoDir, timeout: 3e4 }).catch(
+        () => void 0
+      );
+    } else {
+      await execAsync8(`git clone --depth 50 ${normalized} "${repoDir}"`, {
+        timeout: 6e4
+      });
+    }
     return true;
   } catch {
     return false;
   }
 }
-function getDefaultSquadConfig(_config) {
-  return {
-    prMode: "draft-pr",
-    mcpServers: [],
-    maxRevisions: QA_MAX_REVISIONS
-  };
-}
-async function buildRepoAnalysis(repoUrl) {
+async function buildRepoAnalysis(repoUrl, scanPaths) {
   const normalized = repoUrl.trim();
   const segments = normalized.replace(/\.git$/i, "").split("/").filter(Boolean);
   const owner = segments.at(-2) ?? "";
@@ -70984,90 +70819,22 @@ async function buildRepoAnalysis(repoUrl) {
     return lines.join("\n");
   }
   const repoDir = join15(DATA_DIR, "repos", `${owner}--${name}`);
-  try {
-    await mkdir10(join15(DATA_DIR, "repos"), { recursive: true });
-    if (await pathExists2(join15(repoDir, ".git"))) {
-      await execAsync8("git pull --ff-only", { cwd: repoDir, timeout: 3e4 }).catch(
-        () => void 0
-      );
-    } else {
-      await execAsync8(`git clone --depth 50 ${normalized} "${repoDir}"`, {
-        timeout: 6e4
-      });
-    }
-  } catch {
+  const cloned = await cloneOrUpdateRepo(normalized, repoDir);
+  if (!cloned) {
     lines.push("Unable to clone repository locally; falling back to basic analysis.");
     lines.push("Based on the repository name, propose roles that match common project patterns.");
     return lines.join("\n");
   }
-  try {
-    const rootEntries = await readdir6(repoDir, { withFileTypes: true });
-    const rootFiles = rootEntries.filter((e) => e.isFile()).map((e) => e.name);
-    const rootDirs = rootEntries.filter((e) => e.isDirectory() && e.name !== ".git").map((e) => e.name);
-    if (rootFiles.length) lines.push(`Root files: ${rootFiles.join(", ")}`);
-    if (rootDirs.length) lines.push(`Root directories: ${rootDirs.join(", ")}`);
-    const manifestFiles = [
-      "package.json",
-      "Cargo.toml",
-      "go.mod",
-      "requirements.txt",
-      "pyproject.toml",
-      "Gemfile",
-      "pom.xml",
-      "build.gradle",
-      "composer.json",
-      "Makefile",
-      "Dockerfile",
-      "docker-compose.yml",
-      "docker-compose.yaml",
-      ".github/workflows"
-    ];
-    for (const manifest of manifestFiles) {
-      const fullPath = join15(repoDir, manifest);
-      try {
-        const fileStat = await stat4(fullPath);
-        if (fileStat.isFile()) {
-          const content = await readFile9(fullPath, "utf8");
-          lines.push(`
---- ${manifest} ---
-${content.slice(0, 3e3)}`);
-        } else if (fileStat.isDirectory()) {
-          const children = await readdir6(fullPath);
-          lines.push(`
---- ${manifest}/ ---
-${children.join(", ")}`);
-        }
-      } catch {
-      }
-    }
-    const srcDirs = rootDirs.filter(
-      (d) => ["src", "lib", "app", "packages", "crates", "cmd", "internal"].includes(d)
-    );
-    for (const srcDir of srcDirs) {
-      try {
-        const srcEntries = await readdir6(join15(repoDir, srcDir), { withFileTypes: true });
-        const srcFiles = srcEntries.filter((e) => e.isFile()).map((e) => e.name);
-        const srcSubDirs = srcEntries.filter((e) => e.isDirectory()).map((e) => e.name);
-        lines.push(`
---- ${srcDir}/ ---`);
-        if (srcSubDirs.length) lines.push(`  Directories: ${srcSubDirs.join(", ")}`);
-        if (srcFiles.length) lines.push(`  Files: ${srcFiles.slice(0, 30).join(", ")}`);
-      } catch {
-      }
-    }
-    const readmeCandidates = ["README.md", "README.rst", "README.txt", "README"];
-    for (const readme of readmeCandidates) {
-      try {
-        const content = await readFile9(join15(repoDir, readme), "utf8");
-        lines.push(`
---- ${readme} (excerpt) ---
-${content.slice(0, 1500)}`);
-        break;
-      } catch {
-      }
+  const scanRoots = scanPaths && scanPaths.length > 0 ? scanPaths.map((p) => ({ path: join15(repoDir, p), label: p })) : [{ path: repoDir, label: "" }];
+  if (scanPaths && scanPaths.length > 0) {
+    lines.push(`Focused scan paths: ${scanPaths.join(", ")}`);
+  }
+  for (const root of scanRoots) {
+    try {
+      lines.push(...await scanRoot(root));
+    } catch {
+      lines.push(`Filesystem scan failed for ${root.label || "repo root"}; skipping.`);
     }
-  } catch {
-    lines.push("Filesystem scan failed; using minimal info.");
   }
   lines.push(
     "\nBased on the above repository structure and contents, propose roles that match the project's actual technology stack and architecture."
@@ -71082,6 +70849,22 @@ function formatSquadList(squads) {
     (squad) => `${squad.id}: ${squad.name} (${squad.repoOwner}/${squad.repoName}) [${squad.status}]`
   ).join("\n");
 }
+async function processQueue2(squadId) {
+  try {
+    const running = await countRunningInstances(squadId);
+    const config2 = (await Promise.resolve().then(() => (init_config(), config_exports))).loadConfig();
+    if (running < config2.maxInstancesPerSquad) {
+      const next = await getNextQueued(squadId);
+      if (next) {
+        const freshSquad = await getSquad(squadId);
+        if (freshSquad) {
+          void startAndExecuteInstance(next.id, freshSquad, next.objectiveId);
+        }
+      }
+    }
+  } catch {
+  }
+}
 async function startAndExecuteInstance(instanceId, squad, objectiveId) {
   try {
     const repoPath = await resolveRepoPath(squad.repoUrl, squad.repoName);
@@ -71102,56 +70885,184 @@ async function startAndExecuteInstance(instanceId, squad, objectiveId) {
     await failInstance(instanceId, message2).catch(() => {
     });
   } finally {
-    try {
-      const running = await countRunningInstances(squad.id);
-      const config2 = (await Promise.resolve().then(() => (init_config(), config_exports))).loadConfig();
-      if (running < config2.maxInstancesPerSquad) {
-        const next = await getNextQueued(squad.id);
-        if (next) {
-          const freshSquad = await getSquad(squad.id);
-          if (freshSquad) {
-            void startAndExecuteInstance(next.id, freshSquad, next.objectiveId);
-          }
-        }
-      }
-    } catch {
-    }
+    await processQueue2(squad.id);
   }
 }
+async function handleCreateSquad(rawArgs) {
+  const { repoUrl, name, config: config2 } = createSquadSchema.parse(rawArgs);
+  const parsedRepo = parseRepoUrl(repoUrl);
+  const existingSquad = await getSquadByRepo(parsedRepo.owner, parsedRepo.name);
+  if (existingSquad) {
+    return {
+      message: `A squad already exists for ${parsedRepo.owner}/${parsedRepo.name}.`,
+      squad: existingSquad
+    };
+  }
+  const squadName = name || `${titleCase(parsedRepo.name)} Squad`;
+  const squadConfig = {
+    prMode: config2?.prMode ?? "draft-pr",
+    mcpServers: config2?.mcpServers ?? [],
+    maxRevisions: config2?.maxRevisions ?? QA_MAX_REVISIONS
+  };
+  const squad = await createSquad({
+    name: squadName,
+    repoUrl,
+    repoOwner: parsedRepo.owner,
+    repoName: parsedRepo.name,
+    status: "active",
+    config: squadConfig
+  });
+  eventBus.emit(EVENT_NAMES.SQUAD_CREATED, { squad });
+  return {
+    message: `Squad "${squad.name}" created for ${parsedRepo.owner}/${parsedRepo.name}. Add members with add_squad_member.`,
+    squad
+  };
+}
+async function handleAddSquadMember(rawArgs) {
+  const { squadId, role, name, systemPrompt, model } = addSquadMemberSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const member = await addMember(squadId, {
+    role,
+    name,
+    systemPrompt,
+    model: model ?? null
+  });
+  eventBus.emit(EVENT_NAMES.SQUAD_MEMBER_UPDATED, { squadId, member });
+  return {
+    message: `Added member "${member.name}" (${member.role}) to squad "${squad.name}".`,
+    member
+  };
+}
+async function handleRemoveSquadMember(rawArgs) {
+  const { squadId, memberId } = removeSquadMemberSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const member = await getMember(memberId);
+  if (!member || member.squadId !== squadId) {
+    throw new Error(`Member ${memberId} was not found in squad ${squadId}.`);
+  }
+  await removeMember(memberId);
+  eventBus.emit(EVENT_NAMES.SQUAD_UPDATED, { squad });
+  return {
+    message: `Removed member "${member.name}" (${member.role}) from squad "${squad.name}".`,
+    memberId
+  };
+}
+async function handleUpdateSquadConfig(rawArgs) {
+  const { squadId, config: config2 } = updateSquadConfigSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const mergedConfig = {
+    prMode: config2.prMode ?? squad.config.prMode,
+    mcpServers: config2.mcpServers ?? squad.config.mcpServers,
+    maxRevisions: config2.maxRevisions ?? squad.config.maxRevisions
+  };
+  const updated = await updateSquad(squadId, { config: mergedConfig });
+  if (!updated) {
+    throw new Error(`Failed to update squad ${squadId}.`);
+  }
+  eventBus.emit(EVENT_NAMES.SQUAD_UPDATED, { squad: updated });
+  return {
+    message: `Updated config for squad "${updated.name}".`,
+    squad: updated
+  };
+}
+async function handleAnalyzeRepo(rawArgs) {
+  const { repoUrl, scanPaths } = analyzeRepoSchema.parse(rawArgs);
+  const analysis = await buildRepoAnalysis(repoUrl, scanPaths);
+  return {
+    message: "Repository analysis complete.",
+    analysis
+  };
+}
+async function handleFireSquad(rawArgs) {
+  const { squadId } = squadIdSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const activeObjectives = await getActiveObjectives(squadId);
+  if (activeObjectives.length > 0) {
+    const updated = await updateSquad(squadId, { status: "inactive" });
+    return {
+      message: `Squad ${squadId} was deactivated because it still has active objectives.`,
+      squad: updated,
+      activeObjectives
+    };
+  }
+  await deleteSquad(squadId);
+  return { message: `Squad ${squadId} was deleted.`, squadId };
+}
+async function handleDelegateToSquad(rawArgs) {
+  const { squadId, objective } = delegateToSquadSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const createdObjective = await createObjective(squadId, objective);
+  const { instance, queued } = await spawnInstance({
+    squadId,
+    objectiveId: createdObjective.id
+  });
+  if (!queued) {
+    void startAndExecuteInstance(instance.id, squad, createdObjective.id);
+  }
+  return {
+    message: queued ? `Objective queued for squad ${squad.name} (at capacity). Instance ${instance.id} will start when a slot opens.` : `Delegated objective to squad ${squad.name}. Instance ${instance.id} started.`,
+    objective: createdObjective,
+    instanceId: instance.id,
+    queued
+  };
+}
+async function handleUpdateSquadMember(rawArgs) {
+  const { squadId, memberId, role, systemPrompt, model } = updateSquadMemberSchema.parse(rawArgs);
+  const squad = await getSquad(squadId);
+  if (!squad) {
+    throw new Error(`Squad ${squadId} was not found.`);
+  }
+  const member = await getMember(memberId);
+  if (!member || member.squadId !== squadId) {
+    throw new Error(`Member ${memberId} was not found in squad ${squadId}.`);
+  }
+  const updated = await updateMember(memberId, {
+    role,
+    systemPrompt,
+    model: model === "" ? null : model
+  });
+  if (!updated) {
+    throw new Error(`Failed to update member ${memberId}.`);
+  }
+  eventBus.emit(EVENT_NAMES.SQUAD_MEMBER_UPDATED, {
+    squadId,
+    member: updated
+  });
+  return {
+    message: `Updated member "${updated.name}" in squad "${squad.name}".`,
+    member: updated
+  };
+}
 function createSquadToolExecutor(config2) {
   return async (toolName, rawArgs) => {
     switch (toolName) {
-      case "hire_squad": {
-        const { repoUrl } = hireSquadSchema.parse(rawArgs);
-        const composition = await proposeSquadComposition(
-          repoUrl,
-          await buildRepoAnalysis(repoUrl)
-        );
-        const result = await hireSquad(repoUrl, composition, getDefaultSquadConfig(config2));
-        return {
-          message: `Squad ready for ${repoUrl}.`,
-          squad: result.squad,
-          members: result.members
-        };
-      }
-      case "fire_squad": {
-        const { squadId } = squadIdSchema.parse(rawArgs);
-        const squad = await getSquad(squadId);
-        if (!squad) {
-          throw new Error(`Squad ${squadId} was not found.`);
-        }
-        const activeObjectives = await getActiveObjectives(squadId);
-        if (activeObjectives.length > 0) {
-          const updated = await updateSquad(squadId, { status: "inactive" });
-          return {
-            message: `Squad ${squadId} was deactivated because it still has active objectives.`,
-            squad: updated,
-            activeObjectives
-          };
-        }
-        await deleteSquad(squadId);
-        return { message: `Squad ${squadId} was deleted.`, squadId };
-      }
+      case "create_squad":
+        return handleCreateSquad(rawArgs);
+      case "add_squad_member":
+        return handleAddSquadMember(rawArgs);
+      case "remove_squad_member":
+        return handleRemoveSquadMember(rawArgs);
+      case "update_squad_config":
+        return handleUpdateSquadConfig(rawArgs);
+      case "analyze_repo":
+        return handleAnalyzeRepo(rawArgs);
+      case "fire_squad":
+        return handleFireSquad(rawArgs);
       case "list_squads": {
         const squads = await listSquads();
         return {
@@ -71167,47 +71078,73 @@ function createSquadToolExecutor(config2) {
           ...status
         };
       }
-      case "delegate_to_squad": {
-        const { squadId, objective } = delegateToSquadSchema.parse(rawArgs);
-        const squad = await getSquad(squadId);
-        if (!squad) {
+      case "delegate_to_squad":
+        return handleDelegateToSquad(rawArgs);
+      case "rename_squad": {
+        const { squadId, name } = renameSquadSchema.parse(rawArgs);
+        const updated = await updateSquad(squadId, { name });
+        if (!updated) {
           throw new Error(`Squad ${squadId} was not found.`);
         }
-        const createdObjective = await createObjective(squadId, objective);
-        const { instance, queued } = await spawnInstance({
-          squadId,
-          objectiveId: createdObjective.id
-        });
-        if (!queued) {
-          void startAndExecuteInstance(instance.id, squad, createdObjective.id);
-        }
+        eventBus.emit(EVENT_NAMES.SQUAD_UPDATED, { squad: updated });
         return {
-          message: queued ? `Objective queued for squad ${squad.name} (at capacity). Instance ${instance.id} will start when a slot opens.` : `Delegated objective to squad ${squad.name}. Instance ${instance.id} started.`,
-          objective: createdObjective,
-          instanceId: instance.id,
-          queued
+          message: `Squad renamed to "${updated.name}".`,
+          squad: updated
         };
       }
+      case "update_squad_member":
+        return handleUpdateSquadMember(rawArgs);
       default:
         throw new Error(`Unsupported squad tool: ${toolName}`);
     }
   };
 }
-var execAsync8, hireSquadSchema, squadIdSchema, delegateToSquadSchema, squadToolDefinitions;
+var execAsync8, createSquadSchema, addSquadMemberSchema, removeSquadMemberSchema, updateSquadConfigSchema, analyzeRepoSchema, squadIdSchema, delegateToSquadSchema, renameSquadSchema, updateSquadMemberSchema, squadToolDefinitions, MANIFEST_FILES, SRC_DIR_NAMES, README_CANDIDATES2;
 var init_squad2 = __esm({
   "packages/daemon/src/orchestrator/tools/squad.ts"() {
     "use strict";
     init_dist();
     init_paths();
     init_zod();
+    init_event_bus();
     init_instances2();
     init_runner();
-    init_hiring();
     init_manager2();
     init_store2();
     execAsync8 = promisify8(exec8);
-    hireSquadSchema = external_exports.object({
-      repoUrl: external_exports.string().trim().min(1)
+    createSquadSchema = external_exports.object({
+      repoUrl: external_exports.string().trim().min(1).describe("The repository URL to create a squad for"),
+      name: external_exports.string().trim().optional().describe("Squad name. Defaults to '<RepoName> Squad' if not provided."),
+      config: external_exports.object({
+        prMode: external_exports.enum(["draft-pr", "branch-only", "ready-pr", "auto-merge"]).optional().describe("PR creation mode. Defaults to 'draft-pr'."),
+        mcpServers: external_exports.array(external_exports.string()).optional().describe("MCP server URLs to configure for the squad."),
+        maxRevisions: external_exports.number().optional().describe("Max QA revision cycles. Defaults to system default.")
+      }).optional().describe("Squad configuration. All fields are optional with sensible defaults.")
+    });
+    addSquadMemberSchema = external_exports.object({
+      squadId: external_exports.string().trim().min(1),
+      role: external_exports.string().trim().min(1).describe("Slug-style role identifier (e.g. 'senior-frontend-engineer', 'team-lead')"),
+      name: external_exports.string().trim().min(1).describe("Display name for the member (e.g. 'Senior Frontend Engineer')"),
+      systemPrompt: external_exports.string().min(1).describe("The system prompt defining this member's expertise, responsibilities, and behavior."),
+      model: external_exports.string().optional().describe("Model override for this member. Uses squad default if not provided.")
+    });
+    removeSquadMemberSchema = external_exports.object({
+      squadId: external_exports.string().trim().min(1),
+      memberId: external_exports.string().trim().min(1)
+    });
+    updateSquadConfigSchema = external_exports.object({
+      squadId: external_exports.string().trim().min(1),
+      config: external_exports.object({
+        prMode: external_exports.enum(["draft-pr", "branch-only", "ready-pr", "auto-merge"]).optional(),
+        mcpServers: external_exports.array(external_exports.string()).optional(),
+        maxRevisions: external_exports.number().optional()
+      }).describe("Partial config fields to update. Only provided fields are changed.")
+    });
+    analyzeRepoSchema = external_exports.object({
+      repoUrl: external_exports.string().trim().min(1).describe("The repository URL to analyze"),
+      scanPaths: external_exports.array(external_exports.string()).optional().describe(
+        "Relative paths within the repository to focus the analysis on. When provided, only these directories are scanned instead of the entire repo."
+      )
     });
     squadIdSchema = external_exports.object({
       squadId: external_exports.string().trim().min(1)
@@ -71216,11 +71153,46 @@ var init_squad2 = __esm({
       squadId: external_exports.string().trim().min(1),
       objective: external_exports.string().trim().min(1)
     });
+    renameSquadSchema = external_exports.object({
+      squadId: external_exports.string().trim().min(1),
+      name: external_exports.string().trim().min(1)
+    });
+    updateSquadMemberSchema = external_exports.object({
+      squadId: external_exports.string().trim().min(1),
+      memberId: external_exports.string().trim().min(1),
+      role: external_exports.string().trim().min(1).optional(),
+      systemPrompt: external_exports.string().optional(),
+      model: external_exports.string().optional()
+    });
     squadToolDefinitions = [
       {
-        name: "hire_squad",
-        description: "Hire or refresh a squad for a repository.",
-        parameters: hireSquadSchema,
+        name: "create_squad",
+        description: "Create a new squad for a repository. After creating, use add_squad_member to populate it with agents. Always include team-lead and qa roles.",
+        parameters: createSquadSchema,
+        skipPermission: true
+      },
+      {
+        name: "add_squad_member",
+        description: "Add a member (agent) to an existing squad. Provide a role slug, display name, and a detailed system prompt defining the agent's expertise and responsibilities.",
+        parameters: addSquadMemberSchema,
+        skipPermission: true
+      },
+      {
+        name: "remove_squad_member",
+        description: "Remove a member from a squad by their ID.",
+        parameters: removeSquadMemberSchema,
+        skipPermission: true
+      },
+      {
+        name: "update_squad_config",
+        description: "Update a squad's configuration (prMode, mcpServers, maxRevisions).",
+        parameters: updateSquadConfigSchema,
+        skipPermission: true
+      },
+      {
+        name: "analyze_repo",
+        description: "Analyze a repository's structure and tech stack. Returns information about frameworks, languages, directory layout, and config files. Use this before creating a squad to inform role decisions.",
+        parameters: analyzeRepoSchema,
         skipPermission: true
       },
       {
@@ -71246,8 +71218,38 @@ var init_squad2 = __esm({
         description: "Create an objective for a squad and start execution.",
         parameters: delegateToSquadSchema,
         skipPermission: true
+      },
+      {
+        name: "rename_squad",
+        description: "Rename a squad.",
+        parameters: renameSquadSchema,
+        skipPermission: true
+      },
+      {
+        name: "update_squad_member",
+        description: "Update a squad member's role, system prompt, and/or default model. All fields are optional; only provided fields are changed.",
+        parameters: updateSquadMemberSchema,
+        skipPermission: true
       }
     ];
+    MANIFEST_FILES = [
+      "package.json",
+      "Cargo.toml",
+      "go.mod",
+      "requirements.txt",
+      "pyproject.toml",
+      "Gemfile",
+      "pom.xml",
+      "build.gradle",
+      "composer.json",
+      "Makefile",
+      "Dockerfile",
+      "docker-compose.yml",
+      "docker-compose.yaml",
+      ".github/workflows"
+    ];
+    SRC_DIR_NAMES = ["src", "lib", "app", "packages", "crates", "cmd", "internal"];
+    README_CANDIDATES2 = ["README.md", "README.rst", "README.txt", "README"];
   }
 });
 
@@ -71258,6 +71260,30 @@ function buildMemoryPath(timestamp) {
   const time3 = iso.slice(11, 19).replace(/:/gu, "-");
   return `memory/${date5}/${time3}.md`;
 }
+async function handleWikiWrite(rawArgs) {
+  const { path, title, content, tags } = wikiWriteSchema.parse(rawArgs);
+  const existing = await getPage(path);
+  const page = existing ? await updatePage(path, { title, content, tags: tags ?? [] }) : await createPage(path, title, content, tags ?? []);
+  return {
+    message: `${existing ? "Updated" : "Created"} wiki page ${path}.`,
+    page
+  };
+}
+async function handleRecall(rawArgs) {
+  const { query } = recallSchema.parse(rawArgs);
+  const [matches, recents] = await Promise.all([searchPages(query, 1), getRecentPages(1)]);
+  const page = matches[0] ?? recents[0] ?? null;
+  if (!page) {
+    return { message: "No wiki content is available yet." };
+  }
+  return {
+    message: `Best match: ${page.title}`,
+    path: page.path,
+    title: page.title,
+    content: page.content,
+    tags: page.tags
+  };
+}
 var wikiReadSchema, wikiWriteSchema, wikiSearchSchema, rememberSchema, recallSchema, wikiToolDefinitions, executeWikiToolCall;
 var init_wiki4 = __esm({
   "packages/daemon/src/orchestrator/tools/wiki.ts"() {
@@ -71327,15 +71353,8 @@ var init_wiki4 = __esm({
           }
           return { page };
         }
-        case "wiki_write": {
-          const { path, title, content, tags } = wikiWriteSchema.parse(rawArgs);
-          const existing = await getPage(path);
-          const page = existing ? await updatePage(path, { title, content, tags: tags ?? [] }) : await createPage(path, title, content, tags ?? []);
-          return {
-            message: `${existing ? "Updated" : "Created"} wiki page ${path}.`,
-            page
-          };
-        }
+        case "wiki_write":
+          return handleWikiWrite(rawArgs);
         case "wiki_search": {
           const { query, limit } = wikiSearchSchema.parse(rawArgs);
           const pages = await searchPages(query, limit ?? 5);
@@ -71355,21 +71374,8 @@ var init_wiki4 = __esm({
             page
           };
         }
-        case "recall": {
-          const { query } = recallSchema.parse(rawArgs);
-          const [matches, recents] = await Promise.all([searchPages(query, 1), getRecentPages(1)]);
-          const page = matches[0] ?? recents[0] ?? null;
-          if (!page) {
-            return { message: "No wiki content is available yet." };
-          }
-          return {
-            message: `Best match: ${page.title}`,
-            path: page.path,
-            title: page.title,
-            content: page.content,
-            tags: page.tags
-          };
-        }
+        case "recall":
+          return handleRecall(rawArgs);
         default:
           throw new Error(`Unsupported wiki tool: ${toolName}`);
       }
@@ -71680,8 +71686,7 @@ var init_orchestrator = __esm({
         }
         const model = usage.model || this.activeModel || this.config.defaultModel;
         const pricing = await getModelPricing(model);
-        const premiumRequestCost = pricing?.premiumMultiplier ?? 0;
-        const tokenUnitCost = pricing ? calculateTokenUnitCost(
+        const cost = pricing ? calculateTokenUnitCost(
           usage.inputTokens,
           usage.outputTokens,
           pricing.tokenInputMultiplier,
@@ -71691,9 +71696,7 @@ var init_orchestrator = __esm({
           model,
           inputTokens: usage.inputTokens,
           outputTokens: usage.outputTokens,
-          cost: tokenUnitCost,
-          premiumRequestCost,
-          tokenUnitCost
+          cost
         });
       }
     };