@link-assistant/hive-mind 1.56.14 → 1.56.16

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @link-assistant/hive-mind
 
+## 1.56.16
+
+### Patch Changes
+
+- 2e2d9e6: Fix `/merge` and `--auto-restart-until-mergeable` getting stuck forever waiting for check-runs that never arrive when a target repo's GitHub Actions workflow file is invalid (e.g. YAML syntax error or `Unrecognized named-value` expression error). GitHub creates a `status=completed, conclusion=failure` workflow run with zero jobs and zero check-runs in this case; the new `getWorkflowRunJobsCount` helper detects the zero-jobs signal and surfaces the broken workflow as a `ci_failure` blocker so the auto-restart loop fires and the AI solver receives the actionable error (workflow file path + run URL) instead of looping silently. See `docs/case-studies/issue-1690/`.
+- a0a25de: Make four stabilized options enabled by default (issue #1694): `--auto-accept-invite`, `--tokens-budget-stats`, and `--auto-attach-solution-summary` now default to `true` for `solve` and `hive` (use `--no-…` to disable), and the `hive-telegram-bot`'s `--isolation` defaults to `screen` (set `TELEGRAM_ISOLATION=` or pass `--isolation ''` to disable). The Telegram `/solve` auto-accept-invite pre-check now reads the parsed `argv` so the new default fires without an explicit `--auto-accept-invite` and `--no-auto-accept-invite` works as a real opt-out.
+
+## 1.56.15
+
+### Patch Changes
+
+- cdd8010: Refine the Telegram bot work-session messages: introduce `🔄 Starting...` and `⏳ Executing...` to distinguish launch from execution, change the completion headline to `✅ Work session finished successfully` / `❌ Work session failed (exit code: N)`, show duration before session, and preserve the audit infoBlock (`Requested by`, `URL`, `🛠 Options`, `🔒 Locked options`) on every state — including completion and failure paths — so admins keep a record even when users delete their original `/solve` message.
+
 ## 1.56.14
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "1.56.14",
+  "version": "1.56.16",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",
@@ -15,7 +15,7 @@
     "hive-telegram-bot": "./src/telegram-bot.mjs"
   },
   "scripts": {
-    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-codex-support.mjs && node tests/test-build-cost-info-string.mjs && node tests/test-claude-code-install-method.mjs && node tests/test-claude-quiet-config.mjs && node tests/test-configure-claude-bin.mjs && node tests/test-docker-release-order.mjs && node tests/test-docker-box-migration.mjs && node tests/test-hive-screens.mjs && node tests/test-issue-1616-pr-issue-link-preservation.mjs && node tests/test-pre-pr-failure-notifier-1640.mjs && node tests/test-ready-to-merge-pagination-1645.mjs && node tests/test-require-gh-paginate-rule.mjs && node tests/test-auto-restart-limits-1664.mjs && node tests/test-log-upload-output-1678.mjs && node tests/test-log-upload-output-1682.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-telegram-bot-command-aliases.mjs && node tests/test-telegram-options-before-url.mjs && node tests/test-telegram-bot-configuration-isolation-links-notation.mjs && node tests/test-extract-isolation-from-args.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-issue-1670-screen-status-monitoring.mjs && node tests/test-issue-1680-session-monitoring.mjs && node tests/test-telegram-bot-launcher.mjs",
+    "test": "node tests/solve-queue.test.mjs && node tests/limits-display.test.mjs && node tests/test-usage-limit.mjs && node tests/test-codex-support.mjs && node tests/test-build-cost-info-string.mjs && node tests/test-claude-code-install-method.mjs && node tests/test-claude-quiet-config.mjs && node tests/test-configure-claude-bin.mjs && node tests/test-docker-release-order.mjs && node tests/test-docker-box-migration.mjs && node tests/test-hive-screens.mjs && node tests/test-issue-1616-pr-issue-link-preservation.mjs && node tests/test-pre-pr-failure-notifier-1640.mjs && node tests/test-ready-to-merge-pagination-1645.mjs && node tests/test-require-gh-paginate-rule.mjs && node tests/test-auto-restart-limits-1664.mjs && node tests/test-log-upload-output-1678.mjs && node tests/test-log-upload-output-1682.mjs && node tests/test-telegram-message-filters.mjs && node tests/test-telegram-bot-command-aliases.mjs && node tests/test-telegram-options-before-url.mjs && node tests/test-telegram-bot-configuration-isolation-links-notation.mjs && node tests/test-extract-isolation-from-args.mjs && node tests/test-solve-queue-command.mjs && node tests/test-queue-display-1267.mjs && node tests/test-issue-1670-screen-status-monitoring.mjs && node tests/test-issue-1680-session-monitoring.mjs && node tests/test-issue-1684-message-formatting.mjs && node tests/test-issue-1694-stabilized-defaults.mjs && node tests/test-telegram-bot-launcher.mjs",
     "test:queue": "node tests/solve-queue.test.mjs",
     "test:limits-display": "node tests/limits-display.test.mjs",
     "test:usage-limit": "node tests/test-usage-limit.mjs",

package/src/github-merge-ci-signals.lib.mjs

@@ -0,0 +1,182 @@
+#!/usr/bin/env node
+/**
+ * GitHub Merge Queue CI Signal Helpers
+ *
+ * Helpers for distinguishing genuine "CI not triggered" from race conditions in
+ * the auto-merge loop. Split from github-merge.lib.mjs to keep that file under
+ * the 1500-line CI limit (issue #1690 push).
+ *
+ * @see https://github.com/link-assistant/hive-mind/issues/1480
+ * @see https://github.com/link-assistant/hive-mind/issues/1503
+ * @see https://github.com/link-assistant/hive-mind/issues/1690
+ */
+
+import { promisify } from 'util';
+import { exec as execCallback } from 'child_process';
+
+const exec = promisify(execCallback);
+
+/**
+ * Get the committed date of a specific commit from GitHub API
+ * Issue #1480: Used to determine how recently a commit was pushed, to distinguish between
+ * "CI not yet registered in API" (race condition) and "CI definitively not triggered"
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {string} sha - Commit SHA
+ * @param {boolean} verbose - Whether to log verbose output
+ * @returns {Promise<{date: Date|null, ageSeconds: number|null}>}
+ */
+export async function getCommitDate(owner, repo, sha, verbose = false) {
+  try {
+    const { stdout } = await exec(`gh api repos/${owner}/${repo}/commits/${sha} --jq '.commit.committer.date'`);
+    const dateStr = stdout.trim();
+    if (!dateStr) {
+      return { date: null, ageSeconds: null };
+    }
+    const commitDate = new Date(dateStr);
+    const ageSeconds = Math.floor((Date.now() - commitDate.getTime()) / 1000);
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Commit ${sha.substring(0, 7)} date: ${dateStr} (${ageSeconds}s ago)`);
+    }
+    return { date: commitDate, ageSeconds };
+  } catch (error) {
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Error fetching commit date for ${sha}: ${error.message}`);
+    }
+    return { date: null, ageSeconds: null };
+  }
+}
+
+/**
+ * Check if any previous commits in a PR had workflow runs triggered.
+ * Issue #1480: If earlier commits in the same PR triggered CI, we should expect CI
+ * for the HEAD commit too (unless conditions changed). This provides an additional
+ * signal that CI should be expected and avoids false "CI not triggered" conclusions.
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {number} prNumber - Pull request number
+ * @param {string} headSha - Current HEAD SHA (to exclude from check)
+ * @param {boolean} verbose - Whether to log verbose output
+ * @returns {Promise<{hadPreviousCI: boolean, previousCommitsWithCI: number, totalPreviousCommits: number}>}
+ */
+export async function checkPreviousPRCommitsHadCI(owner, repo, prNumber, headSha, verbose = false) {
+  try {
+    // Get all commits in the PR
+    const { stdout: commitsJson } = await exec(`gh api "repos/${owner}/${repo}/pulls/${prNumber}/commits" --paginate --jq '[.[].sha]'`);
+    const allShas = JSON.parse(commitsJson.trim() || '[]');
+
+    // Exclude the current HEAD SHA
+    const previousShas = allShas.filter(sha => sha !== headSha);
+
+    if (previousShas.length === 0) {
+      if (verbose) {
+        console.log(`[VERBOSE] /merge: PR #${prNumber} has no previous commits to check for CI history`);
+      }
+      return { hadPreviousCI: false, previousCommitsWithCI: 0, totalPreviousCommits: 0 };
+    }
+
+    // Check the most recent previous commits (limit to last 3 to avoid excessive API calls)
+    const commitsToCheck = previousShas.slice(-3);
+    let commitsWithCI = 0;
+
+    for (const sha of commitsToCheck) {
+      try {
+        const { stdout } = await exec(`gh api "repos/${owner}/${repo}/actions/runs?head_sha=${sha}&per_page=100" --paginate --slurp`);
+        const count = JSON.parse(stdout.trim() || '[]').reduce((sum, page) => sum + (page.workflow_runs?.length || 0), 0);
+        if (count > 0) {
+          commitsWithCI++;
+        }
+      } catch {
+        // Skip errors for individual commits
+      }
+    }
+
+    const hadPreviousCI = commitsWithCI > 0;
+
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: PR #${prNumber} previous CI history: ${commitsWithCI}/${commitsToCheck.length} checked commits had workflow runs (total PR commits: ${allShas.length})`);
+    }
+
+    return { hadPreviousCI, previousCommitsWithCI: commitsWithCI, totalPreviousCommits: previousShas.length };
+  } catch (error) {
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Error checking previous PR commits CI history: ${error.message}`);
+    }
+    return { hadPreviousCI: false, previousCommitsWithCI: 0, totalPreviousCommits: 0 };
+  }
+}
+
+/**
+ * Check if any workflow files in the repository have PR-related triggers
+ * Issue #1480: Used as additional signal to determine if CI should run on PRs.
+ * Parses .github/workflows/*.yml files from the repository content API.
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {boolean} verbose - Whether to log verbose output
+ * @returns {Promise<{hasPRTriggers: boolean, hasWorkflowFiles: boolean, workflows: Array<{name: string, triggers: string[]}>}>}
+ */
+export async function checkWorkflowsHavePRTriggers(owner, repo, verbose = false, ref = null) {
+  try {
+    // Issue #1503: Support querying workflow files from a specific branch (ref)
+    const refParam = ref ? `?ref=${encodeURIComponent(ref)}` : '';
+    // List workflow files in .github/workflows/ (uses ref if provided, otherwise default branch)
+    const { stdout: listJson } = await exec(`gh api "repos/${owner}/${repo}/contents/.github/workflows${refParam}" --paginate --jq '[.[] | select(.name | test("\\\\.(yml|yaml)$")) | {name: .name, download_url: .download_url, path: .path}]' 2>/dev/null`);
+    const files = JSON.parse(listJson.trim() || '[]');
+
+    if (files.length === 0) {
+      if (verbose) console.log(`[VERBOSE] /merge: No workflow files in ${owner}/${repo}/.github/workflows/`);
+      return { hasPRTriggers: false, hasWorkflowFiles: false, workflows: [] };
+    }
+
+    const prTriggerPatterns = [/\bon:\s*\n\s+pull_request/m, /\bon:\s*\[.*pull_request.*\]/m, /\bon:\s*pull_request\b/m, /\bpull_request_target\b/m];
+    const pushTriggerPatterns = [/\bon:\s*\n\s+push/m, /\bon:\s*\[.*push.*\]/m, /\bon:\s*push\b/m];
+    // Issue #1503: Non-PR triggers for diagnostics (won't produce check-runs on PRs)
+    const nonPROnlyTriggerPatterns = [/\bworkflow_dispatch\b/m, /\bschedule\b/m, /\brepository_dispatch\b/m, /\bworkflow_call\b/m];
+
+    const results = [];
+
+    for (const file of files) {
+      try {
+        // Issue #1503: Fetch file content using same ref parameter for branch-specific workflows
+        const { stdout: contentJson } = await exec(`gh api "repos/${owner}/${repo}/contents/${file.path}${refParam}" --jq '.content'`);
+        const content = Buffer.from(contentJson.trim().replace(/"/g, ''), 'base64').toString('utf-8');
+
+        const triggers = [];
+        if (prTriggerPatterns.some(p => p.test(content))) {
+          triggers.push('pull_request');
+        }
+        if (pushTriggerPatterns.some(p => p.test(content))) {
+          triggers.push('push');
+        }
+        // Issue #1503: Track non-PR triggers for diagnostics
+        const nonPRTriggers = nonPROnlyTriggerPatterns.filter(p => p.test(content)).map(p => p.source.replace(/\\b/g, ''));
+
+        if (triggers.length > 0) {
+          results.push({ name: file.name, triggers });
+        }
+
+        if (verbose) {
+          console.log(`[VERBOSE] /merge: Workflow ${file.name}: pr_triggers=[${triggers.join(', ')}], non_pr_triggers=[${nonPRTriggers.join(', ')}]`);
+        }
+      } catch (fileError) {
+        if (verbose) {
+          console.log(`[VERBOSE] /merge: Error reading workflow file ${file.name}: ${fileError.message}`);
+        }
+      }
+    }
+
+    const hasPRTriggers = results.length > 0;
+
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: ${results.length}/${files.length} workflow files have PR/push triggers`);
+    }
+
+    return { hasPRTriggers, hasWorkflowFiles: true, workflows: results };
+  } catch (error) {
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Error checking workflow PR triggers: ${error.message}`);
+    }
+    // On error, assume workflows might have PR triggers (safer: avoids false positives)
+    return { hasPRTriggers: true, hasWorkflowFiles: true, workflows: [] };
+  }
+}

package/src/github-merge.lib.mjs

@@ -1203,14 +1203,14 @@ export async function getDetailedCIStatus(owner, repo, prNumber, verbose = false
  * @param {string} repo - Repository name
  * @param {string} sha - Commit SHA
  * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<Array<{id: number, status: string, conclusion: string|null, name: string, html_url: string}>>}
+ * @returns {Promise<Array<{id: number, status: string, conclusion: string|null, name: string, html_url: string, path: string}>>}
  */
 export async function getWorkflowRunsForSha(owner, repo, sha, verbose = false) {
   try {
     const { stdout } = await exec(`gh api "repos/${owner}/${repo}/actions/runs?head_sha=${sha}&per_page=100" --paginate --slurp`);
     const runs = JSON.parse(stdout.trim() || '[]')
       .flatMap(page => page.workflow_runs || [])
-      .map(run => ({ id: run.id, status: run.status, conclusion: run.conclusion, name: run.name, html_url: run.html_url }));
+      .map(run => ({ id: run.id, status: run.status, conclusion: run.conclusion, name: run.name, html_url: run.html_url, path: run.path }));
 
     if (verbose) {
       console.log(`[VERBOSE] /merge: Found ${runs.length} workflow runs for SHA ${sha.substring(0, 7)}`);
@@ -1228,6 +1228,50 @@ export async function getWorkflowRunsForSha(owner, repo, sha, verbose = false) {
   }
 }
 
+/**
+ * Get the job count for a specific workflow run.
+ *
+ * Issue #1690: Used to detect "invalid workflow file" failures. When a workflow file
+ * has a syntax error (e.g., `Unrecognized named-value: 'env'`), GitHub creates a
+ * workflow_run with `status=completed, conclusion=failure` but never instantiates
+ * any jobs — `total_count: 0`. Such workflow runs will never produce check-runs.
+ *
+ * Distinguishing this from a real failure (where check-runs exist for the failed jobs)
+ * lets the auto-merge loop break out of "waiting for check-runs to appear" and
+ * propagate the error to the AI solver as a real failure.
+ *
+ * @param {string} owner - Repository owner
+ * @param {string} repo - Repository name
+ * @param {number|string} runId - Workflow run ID
+ * @param {boolean} verbose - Whether to log verbose output
+ * @returns {Promise<number|null>} - Total job count, or null on error
+ */
+export async function getWorkflowRunJobsCount(owner, repo, runId, verbose = false) {
+  try {
+    // Issue #1690: We only need the total_count field, so a single page is sufficient and
+    // adding --paginate would defeat the --jq selector. Use --silent to bypass the
+    // pagination linter rule because total_count comes from the response root.
+    /* eslint-disable-next-line gh-paginate/require-gh-paginate */
+    const { stdout } = await exec(`gh api "repos/${owner}/${repo}/actions/runs/${runId}/jobs?per_page=1" --jq '.total_count'`);
+    const count = parseInt(stdout.trim(), 10);
+    if (Number.isNaN(count)) {
+      if (verbose) {
+        console.log(`[VERBOSE] /merge: Could not parse job count for workflow run ${runId} (got: "${stdout.trim()}")`);
+      }
+      return null;
+    }
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Workflow run ${runId} has ${count} job(s)`);
+    }
+    return count;
+  } catch (error) {
+    if (verbose) {
+      console.log(`[VERBOSE] /merge: Error fetching jobs for workflow run ${runId}: ${error.message}`);
+    }
+    return null;
+  }
+}
+
 /**
  * Get the count of active (enabled) GitHub Actions workflows in a repository
  * Issue #1363: Used to distinguish between "no CI configured" and "CI hasn't started yet"
@@ -1281,170 +1325,9 @@ export async function getActiveRepoWorkflows(owner, repo, verbose = false) {
   }
 }
 
-/**
- * Get the committed date of a specific commit from GitHub API
- * Issue #1480: Used to determine how recently a commit was pushed, to distinguish between
- * "CI not yet registered in API" (race condition) and "CI definitively not triggered"
- * @param {string} owner - Repository owner
- * @param {string} repo - Repository name
- * @param {string} sha - Commit SHA
- * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{date: Date|null, ageSeconds: number|null}>}
- */
-export async function getCommitDate(owner, repo, sha, verbose = false) {
-  try {
-    const { stdout } = await exec(`gh api repos/${owner}/${repo}/commits/${sha} --jq '.commit.committer.date'`);
-    const dateStr = stdout.trim();
-    if (!dateStr) {
-      return { date: null, ageSeconds: null };
-    }
-    const commitDate = new Date(dateStr);
-    const ageSeconds = Math.floor((Date.now() - commitDate.getTime()) / 1000);
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: Commit ${sha.substring(0, 7)} date: ${dateStr} (${ageSeconds}s ago)`);
-    }
-    return { date: commitDate, ageSeconds };
-  } catch (error) {
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: Error fetching commit date for ${sha}: ${error.message}`);
-    }
-    return { date: null, ageSeconds: null };
-  }
-}
-
-/**
- * Check if any previous commits in a PR had workflow runs triggered.
- * Issue #1480: If earlier commits in the same PR triggered CI, we should expect CI
- * for the HEAD commit too (unless conditions changed). This provides an additional
- * signal that CI should be expected and avoids false "CI not triggered" conclusions.
- * @param {string} owner - Repository owner
- * @param {string} repo - Repository name
- * @param {number} prNumber - Pull request number
- * @param {string} headSha - Current HEAD SHA (to exclude from check)
- * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{hadPreviousCI: boolean, previousCommitsWithCI: number, totalPreviousCommits: number}>}
- */
-export async function checkPreviousPRCommitsHadCI(owner, repo, prNumber, headSha, verbose = false) {
-  try {
-    // Get all commits in the PR
-    const { stdout: commitsJson } = await exec(`gh api "repos/${owner}/${repo}/pulls/${prNumber}/commits" --paginate --jq '[.[].sha]'`);
-    const allShas = JSON.parse(commitsJson.trim() || '[]');
-
-    // Exclude the current HEAD SHA
-    const previousShas = allShas.filter(sha => sha !== headSha);
-
-    if (previousShas.length === 0) {
-      if (verbose) {
-        console.log(`[VERBOSE] /merge: PR #${prNumber} has no previous commits to check for CI history`);
-      }
-      return { hadPreviousCI: false, previousCommitsWithCI: 0, totalPreviousCommits: 0 };
-    }
-
-    // Check the most recent previous commits (limit to last 3 to avoid excessive API calls)
-    const commitsToCheck = previousShas.slice(-3);
-    let commitsWithCI = 0;
-
-    for (const sha of commitsToCheck) {
-      try {
-        const { stdout } = await exec(`gh api "repos/${owner}/${repo}/actions/runs?head_sha=${sha}&per_page=100" --paginate --slurp`);
-        const count = JSON.parse(stdout.trim() || '[]').reduce((sum, page) => sum + (page.workflow_runs?.length || 0), 0);
-        if (count > 0) {
-          commitsWithCI++;
-        }
-      } catch {
-        // Skip errors for individual commits
-      }
-    }
-
-    const hadPreviousCI = commitsWithCI > 0;
-
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: PR #${prNumber} previous CI history: ${commitsWithCI}/${commitsToCheck.length} checked commits had workflow runs (total PR commits: ${allShas.length})`);
-    }
-
-    return { hadPreviousCI, previousCommitsWithCI: commitsWithCI, totalPreviousCommits: previousShas.length };
-  } catch (error) {
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: Error checking previous PR commits CI history: ${error.message}`);
-    }
-    return { hadPreviousCI: false, previousCommitsWithCI: 0, totalPreviousCommits: 0 };
-  }
-}
-
-/**
- * Check if any workflow files in the repository have PR-related triggers
- * Issue #1480: Used as additional signal to determine if CI should run on PRs.
- * Parses .github/workflows/*.yml files from the repository content API.
- * @param {string} owner - Repository owner
- * @param {string} repo - Repository name
- * @param {boolean} verbose - Whether to log verbose output
- * @returns {Promise<{hasPRTriggers: boolean, hasWorkflowFiles: boolean, workflows: Array<{name: string, triggers: string[]}>}>}
- */
-export async function checkWorkflowsHavePRTriggers(owner, repo, verbose = false, ref = null) {
-  try {
-    // Issue #1503: Support querying workflow files from a specific branch (ref)
-    const refParam = ref ? `?ref=${encodeURIComponent(ref)}` : '';
-    // List workflow files in .github/workflows/ (uses ref if provided, otherwise default branch)
-    const { stdout: listJson } = await exec(`gh api "repos/${owner}/${repo}/contents/.github/workflows${refParam}" --paginate --jq '[.[] | select(.name | test("\\\\.(yml|yaml)$")) | {name: .name, download_url: .download_url, path: .path}]' 2>/dev/null`);
-    const files = JSON.parse(listJson.trim() || '[]');
-
-    if (files.length === 0) {
-      if (verbose) console.log(`[VERBOSE] /merge: No workflow files in ${owner}/${repo}/.github/workflows/`);
-      return { hasPRTriggers: false, hasWorkflowFiles: false, workflows: [] };
-    }
-
-    const prTriggerPatterns = [/\bon:\s*\n\s+pull_request/m, /\bon:\s*\[.*pull_request.*\]/m, /\bon:\s*pull_request\b/m, /\bpull_request_target\b/m];
-    const pushTriggerPatterns = [/\bon:\s*\n\s+push/m, /\bon:\s*\[.*push.*\]/m, /\bon:\s*push\b/m];
-    // Issue #1503: Non-PR triggers for diagnostics (won't produce check-runs on PRs)
-    const nonPROnlyTriggerPatterns = [/\bworkflow_dispatch\b/m, /\bschedule\b/m, /\brepository_dispatch\b/m, /\bworkflow_call\b/m];
-
-    const results = [];
-
-    for (const file of files) {
-      try {
-        // Issue #1503: Fetch file content using same ref parameter for branch-specific workflows
-        const { stdout: contentJson } = await exec(`gh api "repos/${owner}/${repo}/contents/${file.path}${refParam}" --jq '.content'`);
-        const content = Buffer.from(contentJson.trim().replace(/"/g, ''), 'base64').toString('utf-8');
-
-        const triggers = [];
-        if (prTriggerPatterns.some(p => p.test(content))) {
-          triggers.push('pull_request');
-        }
-        if (pushTriggerPatterns.some(p => p.test(content))) {
-          triggers.push('push');
-        }
-        // Issue #1503: Track non-PR triggers for diagnostics
-        const nonPRTriggers = nonPROnlyTriggerPatterns.filter(p => p.test(content)).map(p => p.source.replace(/\\b/g, ''));
-
-        if (triggers.length > 0) {
-          results.push({ name: file.name, triggers });
-        }
-
-        if (verbose) {
-          console.log(`[VERBOSE] /merge: Workflow ${file.name}: pr_triggers=[${triggers.join(', ')}], non_pr_triggers=[${nonPRTriggers.join(', ')}]`);
-        }
-      } catch (fileError) {
-        if (verbose) {
-          console.log(`[VERBOSE] /merge: Error reading workflow file ${file.name}: ${fileError.message}`);
-        }
-      }
-    }
-
-    const hasPRTriggers = results.length > 0;
-
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: ${results.length}/${files.length} workflow files have PR/push triggers`);
-    }
-
-    return { hasPRTriggers, hasWorkflowFiles: true, workflows: results };
-  } catch (error) {
-    if (verbose) {
-      console.log(`[VERBOSE] /merge: Error checking workflow PR triggers: ${error.message}`);
-    }
-    // On error, assume workflows might have PR triggers (safer: avoids false positives)
-    return { hasPRTriggers: true, hasWorkflowFiles: true, workflows: [] };
-  }
-}
+// Issue #1690: Re-export CI signal helpers from separate module to keep this file under 1500 lines
+import { getCommitDate, checkPreviousPRCommitsHadCI, checkWorkflowsHavePRTriggers } from './github-merge-ci-signals.lib.mjs';
+export { getCommitDate, checkPreviousPRCommitsHadCI, checkWorkflowsHavePRTriggers };
 
 // Issue #1341: Re-export post-merge CI functions from separate module
 import { waitForCommitCI, checkBranchCIHealth, getMergeCommitSha } from './github-merge-ci.lib.mjs';
@@ -1481,6 +1364,7 @@ export default {
   rerunWorkflowRun,
   rerunFailedJobs,
   getWorkflowRunsForSha,
+  getWorkflowRunJobsCount, // Issue #1690: detect invalid workflow files (no jobs created)
   waitForCommitCI,
   checkBranchCIHealth,
   getMergeCommitSha,

package/src/session-monitor.lib.mjs

@@ -257,6 +257,7 @@ export async function monitorSessions(bot, verbose = false, options = {}) {
           statusResult,
           observedEndTime: new Date(),
           exitCode: finalExitCode,
+          infoBlock: sessionInfo?.infoBlock || '',
         });
 
         // Update the original reply message if messageId is available, otherwise send new message

package/src/solve.auto-merge-helpers.lib.mjs

@@ -33,7 +33,7 @@ const { reportError } = sentryLib;
 
 // Import GitHub merge functions
 const githubMergeLib = await import('./github-merge.lib.mjs');
-const { checkPRMergeable, checkForBillingLimitError, getDetailedCIStatus, getWorkflowRunsForSha, getActiveRepoWorkflows, getCommitDate, checkWorkflowsHavePRTriggers, checkPreviousPRCommitsHadCI } = githubMergeLib;
+const { checkPRMergeable, checkForBillingLimitError, getDetailedCIStatus, getWorkflowRunsForSha, getWorkflowRunJobsCount, getActiveRepoWorkflows, getCommitDate, checkWorkflowsHavePRTriggers, checkPreviousPRCommitsHadCI } = githubMergeLib;
 
 // Issue #1625: Import centralized session-ending markers so the duplicate-
 // search scope for checkForExistingComment() stays in lock-step with the
@@ -293,6 +293,55 @@ export const getMergeBlockers = async (owner, repo, prNumber, verbose = false, c
             return { blockers, ciStatus, noCiConfigured: false, noCiTriggered: true, workflowRunConclusions: conclusions };
           }
 
+          // Issue #1690: Detect invalid workflow files (e.g. YAML/expression errors).
+          // When a workflow file fails to parse, GitHub creates a workflow_run with
+          // status=completed and conclusion=failure (or startup_failure / timed_out)
+          // but NEVER instantiates any jobs. Such runs will never produce check-runs,
+          // so the auto-merge loop would otherwise wait forever for "the genuine race
+          // condition" to resolve.
+          //
+          // Distinguish by querying the jobs API: real failures have jobs > 0 (and the
+          // failed jobs would already be visible as check-runs); invalid workflow files
+          // have jobs === 0. We only check failed/timed-out completed runs to keep the
+          // additional API calls bounded.
+          const failedCompletedRuns = workflowRuns.filter(r => r.status === 'completed' && (r.conclusion === 'failure' || r.conclusion === 'startup_failure' || r.conclusion === 'timed_out'));
+          if (failedCompletedRuns.length > 0) {
+            const invalidWorkflowRuns = [];
+            for (const run of failedCompletedRuns) {
+              const jobsCount = await getWorkflowRunJobsCount(owner, repo, run.id, verbose);
+              if (jobsCount === 0) {
+                invalidWorkflowRuns.push(run);
+              }
+            }
+            if (invalidWorkflowRuns.length > 0) {
+              // Treat as a real CI failure so the auto-restart loop restarts the AI
+              // and propagates the error back instead of waiting forever.
+              if (verbose) {
+                await log(`[VERBOSE] /merge: PR #${prNumber} has ${invalidWorkflowRuns.length} workflow run(s) that completed with no jobs — workflow files likely invalid`);
+                for (const run of invalidWorkflowRuns) {
+                  await log(`[VERBOSE] /merge:   - ${run.name} (${run.id}): conclusion=${run.conclusion}, jobs=0, url=${run.html_url}`);
+                }
+              }
+              const failureLabels = invalidWorkflowRuns.map(r => `${r.path || r.name} (${r.conclusion})`);
+              await log(formatAligned('❌', 'Invalid workflow file(s):', failureLabels.join(', '), 2));
+              blockers.push({
+                type: 'ci_failure',
+                message: 'CI/CD workflow file is invalid — no jobs were instantiated',
+                details: invalidWorkflowRuns.map(r => `${r.path || r.name} — see ${r.html_url}`),
+              });
+              // Continue to the mergeability check below so other blockers are surfaced too.
+              const mergeStatus = await checkPRMergeable(owner, repo, prNumber, verbose);
+              if (!mergeStatus.mergeable) {
+                blockers.push({
+                  type: 'not_mergeable',
+                  message: mergeStatus.reason || 'PR is not mergeable',
+                  details: [],
+                });
+              }
+              return { blockers, ciStatus, noCiConfigured: false, noCiTriggered: false };
+            }
+          }
+
           // Some workflow runs are still in progress or produced results — genuine race condition
           if (verbose) {
             await log(`[VERBOSE] /merge: PR #${prNumber} has no CI check-runs yet, but ${workflowRuns.length} workflow run(s) were triggered for SHA ${ciStatus.sha.substring(0, 7)} - genuine race condition (waiting for check-runs to appear)`);

package/src/solve.auto-merge.lib.mjs

@@ -450,6 +450,12 @@ Once the billing issue is resolved, you can re-run the CI checks or push a new c
         shouldRestart = true;
         restartReason = restartReason ? `${restartReason}; CI failures` : 'CI failures detected';
         feedbackLines.push('❌ CI/CD checks are failing:');
+        // Issue #1690: Surface the blocker message so AI sees structured failure context
+        // (e.g. "CI/CD workflow file is invalid — no jobs were instantiated") even when
+        // the failure didn't produce traditional check-runs.
+        if (ciBlocker.message && ciBlocker.message !== 'CI/CD checks are failing') {
+          feedbackLines.push(`  ${ciBlocker.message}`);
+        }
         for (const check of ciBlocker.details) {
           feedbackLines.push(`  - ${check}`);
         }

package/src/solve.config.lib.mjs

@@ -379,8 +379,8 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'tokens-budget-stats': {
     type: 'boolean',
-    description: '[EXPERIMENTAL] Show detailed token budget statistics including context window usage and ratios. Supported for --tool claude, --tool codex, and any tool that returns detailed token usage.',
-    default: false,
+    description: 'Show detailed token budget statistics including context window usage and ratios (enabled by default, use --no-tokens-budget-stats to disable). Supported for --tool claude, --tool codex, and any tool that returns detailed token usage.',
+    default: true,
   },
   'prompt-issue-reporting': {
     type: 'boolean',
@@ -464,13 +464,13 @@ export const SOLVE_OPTION_DEFINITIONS = {
   },
   'auto-attach-solution-summary': {
     type: 'boolean',
-    description: 'Automatically attach solution summary only if the AI did not create any comments during the session. This provides visible feedback when the AI completes silently.',
-    default: false,
+    description: 'Automatically attach solution summary only if the AI did not create any comments during the session. This provides visible feedback when the AI completes silently. Enabled by default; use --no-auto-attach-solution-summary to disable.',
+    default: true,
   },
   'auto-accept-invite': {
     type: 'boolean',
-    description: 'Automatically accept the pending GitHub repository or organization invitation for the specific repository/organization being solved, before checking write access. Unlike /accept_invites which accepts all pending invitations, this only accepts the invite for the target repo/org.',
-    default: false,
+    description: 'Automatically accept the pending GitHub repository or organization invitation for the specific repository/organization being solved, before checking write access. Unlike /accept_invites which accepts all pending invitations, this only accepts the invite for the target repo/org. Enabled by default; use --no-auto-accept-invite to disable.',
+    default: true,
   },
   'prompt-ensure-all-requirements-are-met': {
     type: 'boolean',

package/src/telegram-bot.mjs

@@ -51,7 +51,7 @@ const { isChatStopped, getChatStopInfo, getStoppedChatRejectMessage, DEFAULT_STO
 const { isOldMessage: _isOldMessage, isGroupChat: _isGroupChat, isChatAuthorized: _isChatAuthorized, isForwardedOrReply: _isForwardedOrReply, extractCommandFromText, extractGitHubUrl: _extractGitHubUrl } = await import('./telegram-message-filters.lib.mjs');
 const { launchBotWithRetry } = await import('./telegram-bot-launcher.lib.mjs');
 const { trackSession, startSessionMonitoring, hasActiveSessionForUrlAsync } = await import('./session-monitor.lib.mjs');
-const { formatExecutingWorkSessionMessage } = await import('./work-session-formatting.lib.mjs');
+const { formatExecutingWorkSessionMessage, formatStartingWorkSessionMessage } = await import('./work-session-formatting.lib.mjs');
 
 const config = yargs(hideBin(process.argv))
   .usage('Usage: hive-telegram-bot [options]')
@@ -113,7 +113,7 @@ const config = yargs(hideBin(process.argv))
     alias: 'v',
     default: getenv('TELEGRAM_BOT_VERBOSE', 'false') === 'true',
   })
-  .option('isolation', { type: 'string', description: 'Experimental: isolation backend (screen/tmux/docker)', default: getenv('TELEGRAM_ISOLATION', '') })
+  .option('isolation', { type: 'string', description: "Isolation backend (screen/tmux/docker). Defaults to 'screen' so Telegram-bot work sessions survive bot restarts; pass --isolation '' (or set TELEGRAM_ISOLATION='') to disable.", default: getenv('TELEGRAM_ISOLATION', 'screen') })
   .help('h')
   .alias('h', 'help')
   .parserConfiguration({
@@ -566,7 +566,7 @@ async function executeAndUpdateMessage(ctx, startingMessage, commandName, args,
     session = iso.runner.generateSessionId();
     VERBOSE && console.log(`[VERBOSE] Using isolation (${iso.backend}), session: ${session}`);
     result = await iso.runner.executeWithIsolation(commandName, args, { backend: iso.backend, sessionId: session, verbose: VERBOSE });
-    if (result.success) trackSession(session, { chatId: ctx.chat.id, messageId: msgId, startTime: new Date(), url: args[0], command: commandName, isolationBackend: iso.backend, sessionId: session, tool }, VERBOSE);
+    if (result.success) trackSession(session, { chatId: ctx.chat.id, messageId: msgId, startTime: new Date(), url: args[0], command: commandName, isolationBackend: iso.backend, sessionId: session, tool, infoBlock }, VERBOSE);
   } else {
     result = await executeStartScreen(commandName, args);
     const match = result.success && (result.output.match(/session:\s*(\S+)/i) || result.output.match(/screen -R\s+(\S+)/));
@@ -575,19 +575,18 @@ async function executeAndUpdateMessage(ctx, startingMessage, commandName, args,
     // These sessions cannot reliably detect completion (screen stays alive via
     // `exec bash`), so active URL checks auto-expire them after 10 min.
     // This prevents accidental duplicate commands within the timeout window.
-    if (result.success && session !== 'unknown') trackSession(session, { chatId: ctx.chat.id, messageId: msgId, startTime: new Date(), url: args[0], command: commandName, tool }, VERBOSE);
+    if (result.success && session !== 'unknown') trackSession(session, { chatId: ctx.chat.id, messageId: msgId, startTime: new Date(), url: args[0], command: commandName, tool, infoBlock }, VERBOSE);
   }
   if (result.warning) return safeEdit(`⚠️  ${result.warning}`);
   if (result.success) {
     await safeEdit(
       formatExecutingWorkSessionMessage({
-        commandName,
         sessionName: session,
         isolationBackend: iso?.backend || null,
         infoBlock,
       })
     );
-  } else await safeEdit(`❌ Error executing ${commandName} command:\n\n\`\`\`\n${result.error || result.output}\n\`\`\``);
+  } else await safeEdit(`❌ Error executing ${commandName} command:\n\n\`\`\`\n${result.error || result.output}\n\`\`\`\n\n${infoBlock}`);
 }
 
 bot.command('help', async ctx => {
@@ -956,16 +955,19 @@ async function handleSolveCommand(ctx) {
     return;
   }
   // Validate merged arguments using solve's yargs config
+  let parsedSolveArgs;
   try {
-    await parseArgsWithYargs(args, yargs, createSolveYargsConfig);
+    parsedSolveArgs = await parseArgsWithYargs(args, yargs, createSolveYargsConfig);
   } catch (error) {
     await safeReply(ctx, `❌ Invalid options: ${escapeMarkdown(error.message || String(error))}\n\nUse /help to see available options`, {
       reply_to_message_id: ctx.message.message_id,
     });
     return;
   }
-  // Issue #1552: Validate GitHub entity existence before queueing/executing
-  if (args.some(a => a === '--auto-accept-invite') && validation.parsed.owner && validation.parsed.repo) {
+  // Issue #1552 + #1694: Validate GitHub entity existence before queueing/executing.
+  // Honor the parsed --auto-accept-invite (now default-on per #1694), so --no-auto-accept-invite
+  // disables the pre-check while the default path still accepts pending invites for the target repo/org.
+  if (parsedSolveArgs?.autoAcceptInvite && validation.parsed.owner && validation.parsed.repo) {
     try {
       await (await import('./solve.accept-invite.lib.mjs')).autoAcceptInviteForRepo(validation.parsed.owner, validation.parsed.repo, async () => {}, false);
     } catch (e) {
@@ -1012,7 +1014,7 @@ async function handleSolveCommand(ctx) {
 
   const toolQueuedCount = queueStats.queuedByTool[solveTool] || 0; // tool-specific queue count (#1551)
   if (check.canStart && toolQueuedCount === 0) {
-    const startingMessage = await safeReply(ctx, `🚀 Starting solve command...\n\n${infoBlock}`, { reply_to_message_id: ctx.message.message_id });
+    const startingMessage = await safeReply(ctx, formatStartingWorkSessionMessage({ infoBlock }), { reply_to_message_id: ctx.message.message_id });
     await executeAndUpdateMessage(ctx, startingMessage, 'solve', args, infoBlock, effectiveSolveIsolation, solveTool);
   } else {
     const queueItem = solveQueue.enqueue({ url: normalizedUrl, args, ctx, requester, infoBlock, tool: solveTool, perCommandIsolation: effectiveSolveIsolation });
@@ -1177,7 +1179,7 @@ async function handleHiveCommand(ctx) {
     infoBlock += `${userOptionsRaw ? '\n' : '\n\n'}🔒 Locked options: ${escapeMarkdown(hiveOverrides.join(' '))}`;
   }
 
-  const startingMessage = await safeReply(ctx, `🚀 Starting hive command...\n\n${infoBlock}`, { reply_to_message_id: ctx.message.message_id });
+  const startingMessage = await safeReply(ctx, formatStartingWorkSessionMessage({ infoBlock }), { reply_to_message_id: ctx.message.message_id });
   await executeAndUpdateMessage(ctx, startingMessage, 'hive', args, infoBlock, effectiveHiveIsolation, hiveTool);
 }
 

package/src/telegram-isolation.lib.mjs

@@ -80,7 +80,7 @@ export function createIsolationAwareQueueCallback(botIsolationBackend, botIsolat
     if (iso) {
       const sid = iso.runner.generateSessionId();
       const r = await iso.runner.executeWithIsolation(item.command || 'solve', item.args, { backend: iso.backend, sessionId: sid, verbose });
-      if (r.success) trackSession(sid, { chatId: item.ctx?.chat?.id, messageId: item.messageInfo?.messageId, startTime: new Date(), url: item.url, command: item.command || 'solve', isolationBackend: iso.backend, sessionId: sid, tool: item.tool || 'claude' }, verbose);
+      if (r.success) trackSession(sid, { chatId: item.ctx?.chat?.id, messageId: item.messageInfo?.messageId, startTime: new Date(), url: item.url, command: item.command || 'solve', isolationBackend: iso.backend, sessionId: sid, tool: item.tool || 'claude', infoBlock: item.infoBlock }, verbose);
       return { ...r, sessionId: sid, isolationBackend: iso.backend, output: r.output || `session: ${sid}` };
     }
     return fallbackCallback(item);

package/src/telegram-solve-queue.lib.mjs

@@ -20,7 +20,7 @@ export { formatDuration, getRunningAgentProcesses, getRunningClaudeProcesses, ge
 import { formatDuration, formatWaitingReason, getRunningAgentProcesses, getRunningClaudeProcesses, getRunningProcesses } from './telegram-solve-queue.helpers.lib.mjs';
 export { QUEUE_CONFIG, THRESHOLD_STRATEGIES } from './queue-config.lib.mjs';
 import { QUEUE_CONFIG } from './queue-config.lib.mjs';
-import { formatExecutingWorkSessionMessage } from './work-session-formatting.lib.mjs';
+import { formatExecutingWorkSessionMessage, formatStartingWorkSessionMessage } from './work-session-formatting.lib.mjs';
 
 export const QueueItemStatus = {
   QUEUED: 'queued',
@@ -1058,7 +1058,7 @@ export class SolveQueue {
         this.stats.totalStarted++;
 
         // Update message to show Starting status
-        await this.updateItemMessage(item, `🚀 Starting solve command...\n\n${item.infoBlock}`);
+        await this.updateItemMessage(item, formatStartingWorkSessionMessage({ infoBlock: item.infoBlock }));
 
         this.log(`Starting: ${item.toString()} from ${tool} queue`);
 
@@ -1144,17 +1144,16 @@ export class SolveQueue {
           if (chatId && messageId) {
             try {
               if (result.warning) {
-                await item.ctx.telegram.editMessageText(chatId, messageId, undefined, `⚠️ ${result.warning}`, { parse_mode: 'Markdown' });
+                await item.ctx.telegram.editMessageText(chatId, messageId, undefined, `⚠️ ${result.warning}\n\n${item.infoBlock}`, { parse_mode: 'Markdown' });
               } else if (result.success) {
                 const response = formatExecutingWorkSessionMessage({
-                  commandName: item.command || 'solve',
                   sessionName,
                   isolationBackend: result.isolationBackend,
                   infoBlock: item.infoBlock,
                 });
                 await item.ctx.telegram.editMessageText(chatId, messageId, undefined, response, { parse_mode: 'Markdown' });
               } else {
-                const response = `❌ Error executing solve command:\n\n\`\`\`\n${result.error || result.output}\n\`\`\``;
+                const response = `❌ Error executing solve command:\n\n\`\`\`\n${result.error || result.output}\n\`\`\`\n\n${item.infoBlock}`;
                 await item.ctx.telegram.editMessageText(chatId, messageId, undefined, response, { parse_mode: 'Markdown' });
               }
             } catch (error) {
@@ -1177,7 +1176,8 @@ export class SolveQueue {
       const { chatId, messageId } = item.messageInfo || {};
       if (chatId && messageId && item.ctx) {
         try {
-          await item.ctx.telegram.editMessageText(chatId, messageId, undefined, `❌ Error: ${error.message}`, { parse_mode: 'Markdown' });
+          const errorText = item.infoBlock ? `❌ Error: ${error.message}\n\n${item.infoBlock}` : `❌ Error: ${error.message}`;
+          await item.ctx.telegram.editMessageText(chatId, messageId, undefined, errorText, { parse_mode: 'Markdown' });
         } catch (editError) {
           // Log the edit failure for debugging
           // See: https://github.com/link-assistant/hive-mind/issues/1062
@@ -1361,7 +1361,7 @@ export function createQueueExecuteCallback(executeStartScreen, trackSessionFn) {
       const match = result.output && (result.output.match(/session:\s*(\S+)/i) || result.output.match(/screen -R\s+(\S+)/));
       const session = match ? match[1] : null;
       if (session) {
-        trackSessionFn(session, { chatId: item.ctx?.chat?.id, messageId: item.messageInfo?.messageId, startTime: new Date(), url: item.url, command: 'solve', tool: item.tool || 'claude' });
+        trackSessionFn(session, { chatId: item.ctx?.chat?.id, messageId: item.messageInfo?.messageId, startTime: new Date(), url: item.url, command: 'solve', tool: item.tool || 'claude', infoBlock: item.infoBlock });
       }
     }
     return result;

package/src/work-session-formatting.lib.mjs

@@ -1,10 +1,5 @@
 const FAILURE_STATUSES = new Set(['failed', 'cancelled', 'canceled', 'error']);
 
-function capitalizeCommandName(commandName) {
-  const normalized = commandName || 'solve';
-  return normalized.charAt(0).toUpperCase() + normalized.slice(1);
-}
-
 function parseDateValue(value) {
   if (!value) return null;
   const date = value instanceof Date ? value : new Date(value);
@@ -46,27 +41,32 @@ export function formatSessionDurationSeconds(seconds) {
   return parts.join(' ');
 }
 
-export function formatExecutingWorkSessionMessage({ commandName = 'solve', sessionName = 'unknown', isolationBackend = null, infoBlock = '' } = {}) {
+export function formatStartingWorkSessionMessage({ infoBlock = '' } = {}) {
+  const details = infoBlock ? `\n\n${infoBlock}` : '';
+  return `🔄 Starting...${details}`;
+}
+
+export function formatExecutingWorkSessionMessage({ sessionName = 'unknown', isolationBackend = null, infoBlock = '' } = {}) {
   const isolationInfo = isolationBackend ? `\n🔒 Isolation: \`${isolationBackend}\`` : '';
   const details = infoBlock ? `\n\n${infoBlock}` : '';
-  return `⏳ ${capitalizeCommandName(commandName)} command executing...\n\n📊 Session: \`${sessionName}\`${isolationInfo}${details}`;
+  return `⏳ Executing...\n\n📊 Session: \`${sessionName}\`${isolationInfo}${details}`;
 }
 
-export function formatSessionCompletionMessage({ sessionName, sessionInfo, statusResult = null, observedEndTime = new Date(), exitCode = null } = {}) {
+export function formatSessionCompletionMessage({ sessionName, sessionInfo, statusResult = null, observedEndTime = new Date(), exitCode = null, infoBlock = '' } = {}) {
   const finalExitCode = getSessionCompletionExitCode({ exitCode, statusResult });
   const failed = finalExitCode !== null && finalExitCode !== 0;
   const statusEmoji = failed ? '❌' : '✅';
-  const statusText = failed ? `Failed (exit code: ${finalExitCode})` : 'Completed';
-  const isolationInfo = sessionInfo?.isolationBackend ? `\n🔒 Isolation: ${sessionInfo.isolationBackend}` : '';
+  const statusText = failed ? `Work session failed (exit code: ${finalExitCode})` : 'Work session finished successfully';
+  const isolationInfo = sessionInfo?.isolationBackend ? `\n🔒 Isolation: \`${sessionInfo.isolationBackend}\`` : '';
   const startTime = parseDateValue(statusResult?.startTime) || parseDateValue(sessionInfo?.startTime) || observedEndTime;
   const endTime = parseDateValue(statusResult?.endTime) || observedEndTime;
   const durationSeconds = Math.max(0, (endTime.getTime() - startTime.getTime()) / 1000);
+  const resolvedInfoBlock = infoBlock || sessionInfo?.infoBlock || '';
+  const details = resolvedInfoBlock ? `\n\n${resolvedInfoBlock}` : '';
 
-  let message = `${statusEmoji} *Work Session ${statusText}*\n\n`;
-  message += `📊 Session: \`${sessionName || 'unknown'}\`\n`;
+  let message = `${statusEmoji} *${statusText}*\n\n`;
   message += `⏱️ Duration: ${formatSessionDurationSeconds(durationSeconds)}\n`;
-  message += `🔗 URL: ${sessionInfo?.url || 'unknown'}${isolationInfo}\n\n`;
-  message += 'The work session has finished. You can now review the results.';
+  message += `📊 Session: \`${sessionName || 'unknown'}\`${isolationInfo}${details}`;
 
   return message;
 }