bosun 0.36.0 → 0.36.2

package/stream-resilience.mjs

@@ -12,12 +12,60 @@
  *   • MAX_STREAM_RETRIES           — shared retry ceiling
  */
 
+import { loadConfig } from "./config.mjs";
+
+function readInternalExecutorStreamConfig() {
+  try {
+    const cfg = loadConfig();
+    const streamCfg = cfg?.internalExecutor?.stream;
+    return streamCfg && typeof streamCfg === "object" ? streamCfg : {};
+  } catch {
+    return {};
+  }
+}
+
+function parseNumericSetting({
+  envKey,
+  configValue,
+  fallback,
+  min,
+  max,
+  integer = true,
+}) {
+  const raw = process.env[envKey];
+  const candidate =
+    raw !== undefined && String(raw).trim() !== "" ? Number(raw) : Number(configValue);
+  const normalized = Number.isFinite(candidate) ? candidate : fallback;
+  const bounded = Math.min(Math.max(normalized, min), max);
+  return integer ? Math.trunc(bounded) : bounded;
+}
+
+const streamConfig = readInternalExecutorStreamConfig();
+
 /** Maximum number of stream-level retry attempts (not counting the first attempt). */
-export const MAX_STREAM_RETRIES = 5;
+export const MAX_STREAM_RETRIES = parseNumericSetting({
+  envKey: "INTERNAL_EXECUTOR_STREAM_MAX_RETRIES",
+  configValue: streamConfig.maxRetries,
+  fallback: 5,
+  min: 1,
+  max: 12,
+});
 
 /** Base backoff in ms.  Doubles per attempt: 2 s → 4 s → 8 s → 16 s → 32 s. */
-const STREAM_RETRY_BASE_MS = 2_000;
-const STREAM_RETRY_MAX_MS = 32_000;
+const STREAM_RETRY_BASE_MS = parseNumericSetting({
+  envKey: "INTERNAL_EXECUTOR_STREAM_RETRY_BASE_MS",
+  configValue: streamConfig.retryBaseMs,
+  fallback: 2_000,
+  min: 250,
+  max: 120_000,
+});
+const STREAM_RETRY_MAX_MS = parseNumericSetting({
+  envKey: "INTERNAL_EXECUTOR_STREAM_RETRY_MAX_MS",
+  configValue: streamConfig.retryMaxMs,
+  fallback: 32_000,
+  min: STREAM_RETRY_BASE_MS,
+  max: 300_000,
+});
 
 /**
  * Returns true for transient stream / network errors that are safe to retry
@@ -29,7 +77,13 @@ const STREAM_RETRY_MAX_MS = 32_000;
  * @returns {boolean}
  */
 export function isTransientStreamError(err) {
-  const msg = (err?.message || String(err || "")).toLowerCase();
+  const rawMessage =
+    typeof err?.message === "string"
+      ? err.message
+      : typeof err === "string"
+        ? err
+        : "";
+  const msg = rawMessage.toLowerCase();
   return (
     // ── Codex / Realtime API ────────────────────────────────────────────────
     msg.includes("stream disconnected") ||

package/sync-engine.mjs

@@ -811,7 +811,7 @@ export class SyncEngine {
         );
         void this
           .#notifyTelegram(
-            `⚠️ Sync engine: ${this.#consecutiveFailures} consecutive failures, backing off to 5 min interval`,
+            `:alert: Sync engine: ${this.#consecutiveFailures} consecutive failures, backing off to 5 min interval`,
           )
           .catch(() => {});
       }
@@ -1121,7 +1121,7 @@ export class SyncEngine {
       context,
       timestamp: new Date().toISOString(),
     };
-    void this.#notifyTelegram(`⚠️ ${message}`).catch(() => {});
+    void this.#notifyTelegram(`:alert: ${message}`).catch(() => {});
     if (typeof this.#onAlert === "function") {
       try {
         this.#onAlert(payload);

package/task-assessment.mjs

@@ -371,15 +371,15 @@ export async function assessTask(ctx, opts) {
     if (opts.onTelegram) {
       const emoji =
         {
-          merge: "✅",
-          reprompt_same: "💬",
-          reprompt_new_session: "🔄",
-          new_attempt: "🆕",
-          wait: "⏳",
-          manual_review: "👀",
-          close_and_replan: "🚫",
-          noop: "⚪",
-        }[decision.action] || "❓";
+          merge: ":check:",
+          reprompt_same: ":chat:",
+          reprompt_new_session: ":refresh:",
+          new_attempt: ":star:",
+          wait: ":clock:",
+          manual_review: ":eye:",
+          close_and_replan: ":ban:",
+          noop: ":dot:",
+        }[decision.action] || ":help:";
       opts.onTelegram(
         `${emoji} Assessment [${ctx.shortId}] ${ctx.trigger}: **${decision.action}**\n${decision.reason || ""}`.slice(
           0,

package/task-cli.mjs

@@ -658,7 +658,7 @@ async function cliPlan(args) {
         console.log(`    ${t.id?.slice(0, 8)} ${t.title}`);
       }
     } else {
-      console.log("  ⚠ Planner ran but no new tasks were created.");
+      console.log("  :alert: Planner ran but no new tasks were created.");
     }
     console.log("");
   } catch (err) {

package/task-complexity.mjs

@@ -2,7 +2,7 @@
  * task-complexity.mjs — Task complexity routing for bosun.
  *
  * Maps task size/complexity to appropriate AI models and reasoning effort
- * levels. Each executor type (CODEX, COPILOT/Claude) has its own model tier
+ * levels. Each executor type has its own model tier
  * ladder, so small tasks use cheaper/faster models while complex tasks get
  * the most capable models.
  *
@@ -89,6 +89,40 @@ export const DEFAULT_MODEL_PROFILES = Object.freeze({
       reasoningEffort: "high",
     },
   },
+  GEMINI: {
+    [COMPLEXITY_TIERS.LOW]: {
+      model: "gemini-2.5-flash",
+      variant: "GEMINI_2_5_FLASH",
+      reasoningEffort: "low",
+    },
+    [COMPLEXITY_TIERS.MEDIUM]: {
+      model: "gemini-2.5-pro",
+      variant: "DEFAULT",
+      reasoningEffort: "medium",
+    },
+    [COMPLEXITY_TIERS.HIGH]: {
+      model: "gemini-2.5-pro",
+      variant: "GEMINI_2_5_PRO",
+      reasoningEffort: "high",
+    },
+  },
+  OPENCODE: {
+    [COMPLEXITY_TIERS.LOW]: {
+      model: "gpt-5.1-codex-mini",
+      variant: "DEFAULT",
+      reasoningEffort: "low",
+    },
+    [COMPLEXITY_TIERS.MEDIUM]: {
+      model: "gpt-5.2-codex",
+      variant: "DEFAULT",
+      reasoningEffort: "medium",
+    },
+    [COMPLEXITY_TIERS.HIGH]: {
+      model: "gpt-5.3-codex",
+      variant: "DEFAULT",
+      reasoningEffort: "high",
+    },
+  },
 });
 
 /**
@@ -107,6 +141,12 @@ export const MODEL_ALIASES = Object.freeze({
   "sonnet-4.5": { executor: "COPILOT", variant: "CLAUDE_SONNET_4_5" },
   "haiku-4.5": { executor: "COPILOT", variant: "CLAUDE_HAIKU_4_5" },
   "claude-code": { executor: "COPILOT", variant: "CLAUDE_CODE" },
+  "gemini-2.5-flash": { executor: "GEMINI", variant: "GEMINI_2_5_FLASH" },
+  "gemini-2.5-pro": { executor: "GEMINI", variant: "DEFAULT" },
+  "gemini-2.0-flash": { executor: "GEMINI", variant: "GEMINI_2_0_FLASH" },
+  "gemini-1.5-pro": { executor: "GEMINI", variant: "GEMINI_1_5_PRO" },
+  "gemini-1.5-flash": { executor: "GEMINI", variant: "GEMINI_1_5_FLASH" },
+  "opencode-default": { executor: "OPENCODE", variant: "DEFAULT" },
 });
 
 export const EXECUTOR_MODEL_REGISTRY = Object.freeze({
@@ -134,6 +174,23 @@ export const EXECUTOR_MODEL_REGISTRY = Object.freeze({
     "claude-haiku-4.5",
     "claude-code",
   ]),
+  gemini: Object.freeze([
+    "gemini-2.5-pro",
+    "gemini-2.5-flash",
+    "gemini-2.0-flash",
+    "gemini-1.5-pro",
+    "gemini-1.5-flash",
+  ]),
+  opencode: Object.freeze([
+    "gpt-5.3-codex",
+    "gpt-5.2-codex",
+    "gpt-5.1-codex",
+    "gpt-5.1-codex-mini",
+    "claude-opus-4.6",
+    "claude-sonnet-4.6",
+    "gemini-2.5-pro",
+    "gemini-2.5-flash",
+  ]),
 });
 
 const EXECUTOR_KEY_ALIASES = Object.freeze({
@@ -148,9 +205,19 @@ const EXECUTOR_KEY_ALIASES = Object.freeze({
   "claude-code": "claude",
   "claudecode-sdk": "claude",
   "claudecode-cli": "claude",
+  gemini: "gemini",
+  "gemini-sdk": "gemini",
+  "gemini-cli": "gemini",
+  "google-gemini": "gemini",
+  opencode: "opencode",
+  "opencode-sdk": "opencode",
+  "opencode-cli": "opencode",
+  "open-code": "opencode",
   "CODEX": "codex",
   "COPILOT": "copilot",
   "CLAUDE": "claude",
+  "GEMINI": "gemini",
+  "OPENCODE": "opencode",
 });
 
 export function normalizeExecutorKey(executor) {
@@ -437,7 +504,7 @@ export function formatComplexityDecision(resolved) {
  */
 export function getComplexityMatrix(configOverrides) {
   const matrix = {};
-  for (const executorType of ["CODEX", "COPILOT"]) {
+  for (const executorType of Object.keys(DEFAULT_MODEL_PROFILES)) {
     matrix[executorType] = {};
     for (const tier of Object.values(COMPLEXITY_TIERS)) {
       matrix[executorType][tier] = getModelForComplexity(
@@ -658,5 +725,7 @@ export function executorToSdk(executorType) {
   const normalized = (executorType || "").toUpperCase();
   if (normalized === "CLAUDE") return "claude";
   if (normalized === "COPILOT") return "copilot";
+  if (normalized === "GEMINI") return "gemini";
+  if (normalized === "OPENCODE") return "opencode";
   return "codex";
 }

package/task-context.mjs

@@ -178,7 +178,7 @@ export function shouldAutoInstallGitHooks(options = {}) {
     options.mode ??
       env.BOSUN_AUTO_GIT_HOOKS_MODE ??
       env.BOSUN_GIT_HOOKS_MODE,
-    MODE_TASK,
+    MODE_ALWAYS,
   );
   if (mode === MODE_OFF) return false;
   if (mode === MODE_ALWAYS) return true;
@@ -197,4 +197,3 @@ export function shouldRunAgentHookBridge(env = process.env) {
   if (isEnvFlagEnabled(env.BOSUN_HOOKS_FORCE, false)) return true;
   return hasBosunTaskContext(env);
 }
-

package/task-executor.mjs

@@ -447,7 +447,11 @@ function normalizeSdkOverride(value) {
   if (raw === "codex-sdk") return "codex";
   if (raw === "copilot-sdk") return "copilot";
   if (raw === "claude-sdk") return "claude";
-  if (["codex", "copilot", "claude"].includes(raw)) return raw;
+  if (raw === "gemini-sdk") return "gemini";
+  if (raw === "opencode-sdk") return "opencode";
+  if (["codex", "copilot", "claude", "gemini", "opencode"].includes(raw)) {
+    return raw;
+  }
   return null;
 }
 
@@ -2804,7 +2808,7 @@ class TaskExecutor {
         if (progress.idleMs >= STREAM_STALLED_KILL_MS) {
           const elapsedMin = Math.round(elapsed / 60000);
           console.warn(
-            `${TAG} ⚠️ WATCHDOG: agent "${slot.taskTitle}" stalled for ` +
+            `${TAG} :alert: WATCHDOG: agent "${slot.taskTitle}" stalled for ` +
               `${Math.round(progress.idleMs / 60000)}min after ${continueCount} continues ` +
               `(total runtime: ${elapsedMin}min, events: ${progress.totalEvents}) — force-aborting`,
           );
@@ -2813,7 +2817,7 @@ class TaskExecutor {
           }
           this._taskCooldowns.set(taskId, now);
           this.sendTelegram?.(
-            `⚠️ Watchdog killed stalled agent: "${slot.taskTitle}" ` +
+            `:alert: Watchdog killed stalled agent: "${slot.taskTitle}" ` +
               `(idle ${Math.round(progress.idleMs / 60000)}min after ${continueCount} continues, ` +
               `total ${elapsedMin}min, ${progress.totalEvents} events)`,
           );
@@ -2826,7 +2830,7 @@ class TaskExecutor {
         const elapsedMin = Math.round(elapsed / 60000);
         const deadlineMin = Math.round(absoluteDeadline / 60000);
         console.warn(
-          `${TAG} ⚠️ WATCHDOG: absolute deadline exceeded for "${slot.taskTitle}" ` +
+          `${TAG} :alert: WATCHDOG: absolute deadline exceeded for "${slot.taskTitle}" ` +
             `(${elapsedMin}min > ${deadlineMin}min, events: ${progress.totalEvents}, ` +
             `edits: ${progress.hasEdits}, commits: ${progress.hasCommits}) — force-aborting`,
         );
@@ -2839,7 +2843,7 @@ class TaskExecutor {
         }
         this._taskCooldowns.set(taskId, now);
         this.sendTelegram?.(
-          `⚠️ Watchdog hard limit: "${slot.taskTitle}" (${elapsedMin}min > ${deadlineMin}min absolute limit)`,
+          `:alert: Watchdog hard limit: "${slot.taskTitle}" (${elapsedMin}min > ${deadlineMin}min absolute limit)`,
         );
       }
     }
@@ -3918,6 +3922,10 @@ class TaskExecutor {
         task?.meta?.repo ||
         "",
     );
+    // Multi-repo: task.repositories is an array of repo slugs/ids
+    const taskRepositories = Array.isArray(task?.repositories) && task.repositories.length > 0
+      ? task.repositories.map((r) => normalizeSelector(r)).filter(Boolean)
+      : taskRepository ? [taskRepository] : [];
 
     const repoCandidates = Array.isArray(this.repositories)
       ? this.repositories
@@ -3928,19 +3936,33 @@ class TaskExecutor {
         )
       : repoCandidates;
 
-    const selectedRepo =
-      scopedCandidates.find((repo) => normalizeSelector(repo.id) === taskRepository) ||
-      scopedCandidates.find((repo) => normalizeSelector(repo.name) === taskRepository) ||
-      scopedCandidates.find((repo) => normalizeSelector(repo.slug) === taskRepository) ||
-      scopedCandidates.find((repo) => Array.isArray(repo.aliases) && repo.aliases.includes(taskRepository)) ||
+    const resolveOne = (slug) =>
+      scopedCandidates.find((r) => normalizeSelector(r.id) === slug) ||
+      scopedCandidates.find((r) => normalizeSelector(r.name) === slug) ||
+      scopedCandidates.find((r) => normalizeSelector(r.slug) === slug) ||
+      scopedCandidates.find((r) => Array.isArray(r.aliases) && r.aliases.includes(slug)) ||
       null;
 
-    const fallbackRepo =
-      scopedCandidates.find((repo) => repo.primary) || scopedCandidates[0] || null;
-    const effectiveRepo = selectedRepo || fallbackRepo;
+    let resolvedRepos = taskRepositories.map(resolveOne).filter(Boolean);
+
+    // Fallback: if no explicit repos, use primary/first in workspace
+    if (resolvedRepos.length === 0) {
+      const fallbackRepo =
+        scopedCandidates.find((repo) => repo.primary) || scopedCandidates[0] || null;
+      if (fallbackRepo) resolvedRepos = [fallbackRepo];
+    }
+
+    const effectiveRepo = resolvedRepos[0] || null;
+    const isMultiRepo = resolvedRepos.length > 1;
+
+    // For multi-repo: spawn in workspace root (parent of repos) — not a git dir
+    // For single repo: spawn inside that repo directory (git commands work)
+    const repoRoot = isMultiRepo
+      ? (effectiveRepo?.path ? dirname(effectiveRepo.path) : this.repoRoot)
+      : (effectiveRepo?.path || this.repoRoot);
 
     return {
-      repoRoot: effectiveRepo?.path || this.repoRoot,
+      repoRoot,
       repoSlug: effectiveRepo?.slug || this.repoSlug || "",
       workspace:
         taskWorkspace ||
@@ -3950,6 +3972,8 @@ class TaskExecutor {
         taskRepository ||
         normalizeSelector(effectiveRepo?.id || effectiveRepo?.name || "") ||
         "",
+      resolvedRepos,
+      isMultiRepo,
     };
   }
 
@@ -4010,6 +4034,9 @@ class TaskExecutor {
     const taskRepoContext = this._resolveTaskRepoContext(task);
     const executionRepoRoot = taskRepoContext.repoRoot || this.repoRoot;
     const executionRepoSlug = taskRepoContext.repoSlug || this.repoSlug;
+    // Workspaces are plain folders; repos live inside them. Only run git/worktree
+    // operations when executionRepoRoot is actually a git repository.
+    const executionRepoIsGit = existsSync(resolve(executionRepoRoot, ".git"));
     const worktreeManager = this._getWorktreeManager(executionRepoRoot);
     let taskClaimToken = null;
     let attemptId = null;
@@ -4235,7 +4262,7 @@ class TaskExecutor {
             commentOnIssue(
               task,
               [
-                `## ⏭️ Task Deferred`,
+                `## :play: Task Deferred`,
                 ``,
                 `This task is currently claimed by another orchestrator instance.`,
                 ``,
@@ -4298,7 +4325,7 @@ class TaskExecutor {
       commentOnIssue(
         task,
         [
-          `## 🤖 Agent Started`,
+          `## :bot: Agent Started`,
           ``,
           `| Field | Value |`,
           `|-------|-------|`,
@@ -4320,8 +4347,14 @@ class TaskExecutor {
         /* best-effort */
       });
 
-      // 3. Acquire worktree
+      // 3. Acquire worktree (only when executionRepoRoot is a git repository;
+      //    plain workspace folders with repos inside skip worktree creation and
+      //    spawn the agent directly in the resolved directory).
       let wt;
+      if (!executionRepoIsGit) {
+        // Non-git workspace root — agent spawns directly here
+        wt = { path: executionRepoRoot, created: false, noGit: true };
+      } else {
       try {
         const taskBaseBranch = resolveTaskBaseBranch(
           task,
@@ -4393,6 +4426,7 @@ class TaskExecutor {
         this.onTaskFailed?.(task, wrappedError);
         return;
       }
+      } // end executionRepoIsGit
 
       slot.worktreePath = wt.path;
       this._upsertRuntimeSlot(slot);
@@ -4449,6 +4483,8 @@ class TaskExecutor {
         repoSlug: executionRepoSlug,
         workspace: taskRepoContext.workspace,
         repository: taskRepoContext.repository,
+        resolvedRepos: taskRepoContext.resolvedRepos,
+        isMultiRepo: taskRepoContext.isMultiRepo,
       });
 
       // 6b. Create per-task AbortController for watchdog integration
@@ -4475,7 +4511,7 @@ class TaskExecutor {
         "BOSUN_TASK_ID", "BOSUN_TASK_TITLE", "BOSUN_TASK_DESCRIPTION",
         "BOSUN_BRANCH_NAME", "BOSUN_WORKTREE_PATH", "BOSUN_SDK", "BOSUN_MANAGED",
         "BOSUN_REPO_ROOT", "BOSUN_REPO_SLUG", "BOSUN_WORKSPACE", "BOSUN_REPOSITORY",
-        "BOSUN_AGENT_REPO_ROOT",
+        "BOSUN_AGENT_REPO_ROOT", "BOSUN_REPOS",
       ];
       const _savedEnv = {};
       for (const k of _savedEnvKeys) _savedEnv[k] = process.env[k];
@@ -4508,6 +4544,16 @@ class TaskExecutor {
       // Enforce workspace isolation: agents must resolve repo root from the
       // workspace-scoped executionRepoRoot, NOT the developer's personal repo.
       process.env.BOSUN_AGENT_REPO_ROOT = executionRepoRoot;
+      // All resolved repos for this task (JSON array of {slug,name,path} objects)
+      process.env.BOSUN_REPOS = taskRepoContext.resolvedRepos?.length
+        ? JSON.stringify(
+            taskRepoContext.resolvedRepos.map((r) => ({
+              slug: r.slug || r.id || "",
+              name: r.name || "",
+              path: r.path || "",
+            })),
+          )
+        : "";
 
       attemptId = `${taskId}-${randomUUID()}`;
       const taskMeta = {
@@ -4779,10 +4825,12 @@ class TaskExecutor {
 
       // 8. Cleanup
       this._slotAbortControllers.delete(taskId);
-      try {
-        await worktreeManager.releaseWorktree(taskId);
-      } catch (err) {
-        console.warn(`${TAG} worktree release warning: ${err.message}`);
+      if (executionRepoIsGit) {
+        try {
+          await worktreeManager.releaseWorktree(taskId);
+        } catch (err) {
+          console.warn(`${TAG} worktree release warning: ${err.message}`);
+        }
       }
       await releaseTaskClaimLock();
       this._activeSlots.delete(taskId);
@@ -4806,10 +4854,12 @@ class TaskExecutor {
       } catch {
         /* best-effort */
       }
-      try {
-        await worktreeManager.releaseWorktree(taskId);
-      } catch {
-        /* best-effort */
+      if (executionRepoIsGit) {
+        try {
+          await worktreeManager.releaseWorktree(taskId);
+        } catch {
+          /* best-effort */
+        }
       }
       await releaseTaskClaimLock();
 
@@ -4837,7 +4887,7 @@ class TaskExecutor {
       }
       this.onTaskFailed?.(task, err);
       this.sendTelegram?.(
-        `❌ Task executor error: "${taskTitle}" — ${(err.message || "").slice(0, 200)}`,
+        `:close: Task executor error: "${taskTitle}" — ${(err.message || "").slice(0, 200)}`,
       );
     }
   }
@@ -4899,6 +4949,19 @@ class TaskExecutor {
       promptRepository ? `- Repository Name: ${promptRepository}` : "",
       `- Repo Root: ${promptRepoRoot}`,
       ``,
+    );
+
+    // For multi-repo tasks: tell the agent exactly where each repo lives
+    if (opts?.isMultiRepo && Array.isArray(opts?.resolvedRepos) && opts.resolvedRepos.length > 1) {
+      lines.push(
+        `## Workspace Repositories`,
+        `This task spans multiple repositories. Resolve all file paths relative to the repo roots below:`,
+        ...opts.resolvedRepos.map((r) => `- **${r.name || r.slug}**: \`${r.path}\``),
+        ``,
+      );
+    }
+
+    lines.push(
       `## Instructions`,
       `You are working autonomously on a software engineering task for this repository.`,
       `Autonomous mode is mandatory for this run — do not pause for approvals, confirmations, or user prompts.`,
@@ -5387,7 +5450,7 @@ class TaskExecutor {
                 ? ` Examples: ${verify.sampleTitles.join(", ")}`
                 : "";
             this.sendTelegram?.(
-              `✅ Planner task completed: "${task.title}" (${verify.createdCount} new task(s)).${sample}`,
+              `:check: Planner task completed: "${task.title}" (${verify.createdCount} new task(s)).${sample}`,
             );
             this.onTaskCompleted?.(task, result);
             return;
@@ -5432,7 +5495,7 @@ class TaskExecutor {
           `${tag} completed with no code changes (expected for preflight/diagnostic task)`,
         );
         this.sendTelegram?.(
-          `✅ Task completed with no code changes: "${task.title}"`,
+          `:check: Task completed with no code changes: "${task.title}"`,
         );
         this.onTaskCompleted?.(task, result);
         return;
@@ -5470,7 +5533,7 @@ class TaskExecutor {
               `${TAG} TaskComplete hook blocked PR lifecycle handoff: ${hookResult.reason || "unknown reason"}`,
             );
             this.sendTelegram?.(
-              `⚠️ TaskComplete hook blocked PR lifecycle handoff for "${task.title}": ${hookResult.reason || "hook validation failed"}`,
+              `:alert: TaskComplete hook blocked PR lifecycle handoff for "${task.title}": ${hookResult.reason || "hook validation failed"}`,
             );
           }
         } catch (hookErr) {
@@ -5515,7 +5578,7 @@ class TaskExecutor {
             /* best-effort */
           }
           this.sendTelegram?.(
-            `✅ Task completed: "${task.title}"\nLifecycle: ${pr.url || pr}`,
+            `:check: Task completed: "${task.title}"\nLifecycle: ${pr.url || pr}`,
           );
 
           // Fire PostPR hook
@@ -5551,7 +5614,7 @@ class TaskExecutor {
             /* best-effort */
           }
           this.sendTelegram?.(
-            `✅ Task completed: "${task.title}" (PR lifecycle handoff failed — manual review needed)`,
+            `:check: Task completed: "${task.title}" (PR lifecycle handoff failed — manual review needed)`,
           );
         }
       } else if (hasCommits) {
@@ -5584,7 +5647,7 @@ class TaskExecutor {
           /* best-effort */
         }
         this.sendTelegram?.(
-          `✅ Task completed: "${task.title}" (auto-PR disabled)`,
+          `:check: Task completed: "${task.title}" (auto-PR disabled)`,
         );
       } else {
         // No commits — agent completed without making changes.
@@ -5663,11 +5726,11 @@ class TaskExecutor {
             `${tag} task "${task.title}" blocked — ${MAX_NO_COMMIT_ATTEMPTS} consecutive no-commit completions. Skipping until anti-thrash state is cleared.`,
           );
           this.sendTelegram?.(
-            `🚫 Task blocked (${MAX_NO_COMMIT_ATTEMPTS}x no-commit): "${task.title}" — will not retry until anti-thrash state is cleared`,
+            `:ban: Task blocked (${MAX_NO_COMMIT_ATTEMPTS}x no-commit): "${task.title}" — will not retry until anti-thrash state is cleared`,
           );
         } else {
           this.sendTelegram?.(
-            `⚠️ Task completed but no commits (${noCommitCount}/${MAX_NO_COMMIT_ATTEMPTS}): "${task.title}" — cooldown ${cooldownMin}m`,
+            `:alert: Task completed but no commits (${noCommitCount}/${MAX_NO_COMMIT_ATTEMPTS}): "${task.title}" — cooldown ${cooldownMin}m`,
           );
         }
       }
@@ -5766,7 +5829,7 @@ class TaskExecutor {
           /* best-effort */
         }
         this.sendTelegram?.(
-          `❌ Task failed: "${task.title}" — ${(result.error || "").slice(0, 200)}`,
+          `:close: Task failed: "${task.title}" — ${(result.error || "").slice(0, 200)}`,
         );
       } else {
         console.log(
@@ -5876,7 +5939,7 @@ class TaskExecutor {
     }
     if (created.length > 0) {
       this.sendTelegram?.(
-        `♻️ Backlog replenished from "${task.title}": created ${created.length} prioritized follow-up task(s).`,
+        `:repeat: Backlog replenished from "${task.title}": created ${created.length} prioritized follow-up task(s).`,
       );
     }
   }
@@ -6294,7 +6357,7 @@ class TaskExecutor {
           },
         );
         if (directResult.status === 0) {
-          console.log(`${TAG} ✅ directly merged PR #${prNumber}`);
+          console.log(`${TAG} :check: directly merged PR #${prNumber}`);
           // PR merged → close the linked GitHub issue
           if (task) {
             this._closeIssueAfterMerge(task, prNumber).catch(() => {
@@ -6345,7 +6408,7 @@ class TaskExecutor {
     );
 
     const lines = [
-      `## 📝 Agent Completed — Commits & PR`,
+      `## :edit: Agent Completed — Commits & PR`,
       ``,
       `**PR:** ${pr.url || `#${pr.prNumber}`}`,
       `**Branch:** \`${pr.branch}\``,
@@ -6394,7 +6457,7 @@ class TaskExecutor {
     await commentOnIssue(
       task,
       [
-        `## ✅ Issue Resolved`,
+        `## :check: Issue Resolved`,
         ``,
         `PR #${prNumber} has been merged. Closing this issue.`,
         ``,
@@ -6485,7 +6548,7 @@ class TaskExecutor {
           `${TAG} branch safety guard blocked ${branch}: ${reason}`,
         );
         this.sendTelegram?.(
-          `🚨 Branch safety guard blocked push/PR lifecycle handoff for ${branch}: ${reason}`,
+          `:alert: Branch safety guard blocked push/PR lifecycle handoff for ${branch}: ${reason}`,
         );
         const err = new Error(
           `Branch safety guard blocked ${branch}: ${reason}`,