@link-assistant/hive-mind 2.10.5 → 2.11.1

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @link-assistant/hive-mind
 
+## 2.11.1
+
+### Patch Changes
+
+- aea5fe1: Put the pull request back into draft whenever a working session starts, restarts or resumes (issue #2123). Draft/ready transitions now live in one shared module (`src/pr-draft-state.lib.mjs`) that is called from `startWorkSession()` for every continue-mode session — the previous `--watch`/`--auto-continue` gate is gone — and from `executeToolIteration()`, which covers watch mode, temporary auto-restart on uncommitted changes, auto-restart-until-mergeable, escalate, keep-working and auto-ensure-requirements. Limit-reset auto-resume/auto-restart now also forwards `--auto-continue` so the resumed process re-attaches to the existing PR instead of running detached from it. The helper is a no-op for PRs that are already in the target state, merged or closed, and logs the observed `isDraft`/`state` under `--verbose`.
+
+## 2.11.0
+
+### Minor Changes
+
+- 3613953: Add `/task --ci-cd <repository>` as a CI/CD remediation issue-only fallback for `/fix`.
+
 ## 2.10.5
 
 ### Patch Changes

package/README.hi.md

@@ -566,6 +566,11 @@ Examples:
 `--no-solve` का उपयोग करें। विवरण के लिए
 [स्वचालित CI/CD सुधार](docs/CI-CD-BEST-PRACTICES.md#automatic-cicd-remediation) देखें।
 
+यदि पूरा `/fix` workflow उपलब्ध न हो, तो `/task --ci-cd <repository>` केवल वही CI/CD
+issue-generation चरण चलाता है। यह बनाए गए issue का URL लौटाता है; सामान्य solve workflow
+से remediation जारी रखने के लिए `/solve --development-log --deep-analysis --auto-merge`
+से reply करें।
+
 #### `/limits` - उपयोग सीमाएँ दिखाएँ
 
 ```

package/README.md

@@ -585,6 +585,11 @@ does not consume itself (e.g. `--tool`, `--model`, `--think`) is forwarded to
 [Automatic CI/CD Remediation](docs/CI-CD-BEST-PRACTICES.md#automatic-cicd-remediation)
 for details.
 
+If the full `/fix` workflow is unavailable, `/task --ci-cd <repository>` runs
+only the same CI/CD issue-generation step. It returns the created issue URL;
+reply with `/solve --development-log --deep-analysis --auto-merge` to continue
+the remediation through the normal solve workflow.
+
 #### `/limits` - Show Usage Limits
 
 ```

package/README.ru.md

@@ -566,6 +566,11 @@ Examples:
 `/solve`. Подробнее см.
 [Автоматическое исправление CI/CD](docs/CI-CD-BEST-PRACTICES.md#automatic-cicd-remediation).
 
+Если полный процесс `/fix` недоступен, `/task --ci-cd <repository>` выполняет
+только тот же этап создания issue для CI/CD. Команда возвращает URL созданного
+issue; ответьте `/solve --development-log --deep-analysis --auto-merge`, чтобы
+продолжить исправление обычным процессом solve.
+
 #### `/limits` — Показать лимиты использования
 
 ```

package/README.zh.md

@@ -560,6 +560,10 @@ issue 交给 `/solve --development-log --deep-analysis --auto-merge` 处理。
 issue 的情况下预览，使用 `--no-solve` 可只创建 issue 而不启动 `/solve`。详见
 [自动 CI/CD 修复](docs/CI-CD-BEST-PRACTICES.md#automatic-cicd-remediation)。
 
+如果完整的 `/fix` 流程不可用，`/task --ci-cd <repository>` 只执行相同的 CI/CD issue
+生成步骤。该命令会返回新建 issue 的 URL；回复
+`/solve --development-log --deep-analysis --auto-merge` 即可通过常规 solve 流程继续修复。
+
 #### `/limits` - 显示用量限制
 
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@link-assistant/hive-mind",
-  "version": "2.10.5",
+  "version": "2.11.1",
   "description": "AI-powered issue solver and hive mind for collaborative problem solving",
   "main": "src/hive.mjs",
   "type": "module",

package/src/fix.ci-cd-issue.lib.mjs

@@ -0,0 +1,137 @@
+/**
+ * Shared GitHub-backed CI/CD issue generation for `/fix --ci-cd` and
+ * `/task --ci-cd` (issues #1733 and #2121).
+ */
+
+import { spawn } from 'child_process';
+import { CI_CD_ISSUE_LABELS, CI_CD_ISSUE_TYPE, buildCiCdIssueBody, buildCiCdIssueTitle } from './fix.ci-cd.lib.mjs';
+import { createTaskIssue } from './task.issue-creation.lib.mjs';
+
+function runCommand(command, args, options = {}) {
+  return new Promise(resolve => {
+    const child = spawn(command, args, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: process.env,
+      ...options,
+    });
+    let stdout = '';
+    let stderr = '';
+    child.stdout.on('data', data => {
+      stdout += data.toString();
+    });
+    child.stderr.on('data', data => {
+      stderr += data.toString();
+    });
+    child.on('error', error => {
+      resolve({ code: 1, stdout, stderr: stderr || error.message });
+    });
+    child.on('close', code => {
+      resolve({ code, stdout, stderr });
+    });
+  });
+}
+
+async function commandOutput(run, command, args) {
+  const result = await run(command, args);
+  if (result.code !== 0) {
+    const output = `${result.stderr || ''}${result.stdout || ''}`.trim();
+    throw new Error(output || `${command} exited with code ${result.code}`);
+  }
+  return result.stdout.trim();
+}
+
+async function detectLanguages(repository, run, warn) {
+  try {
+    const json = await commandOutput(run, 'gh', ['api', `repos/${repository.fullName}/languages`]);
+    return JSON.parse(json);
+  } catch (error) {
+    warn(`⚠️  Could not detect languages: ${error.message}`);
+    return {};
+  }
+}
+
+async function getDefaultBranch(repository, run, warn) {
+  try {
+    return await commandOutput(run, 'gh', ['api', `repos/${repository.fullName}`, '--jq', '.default_branch']);
+  } catch (error) {
+    warn(`⚠️  Could not determine default branch: ${error.message}`);
+    return null;
+  }
+}
+
+async function getLatestCommit(repository, branch, run, warn) {
+  if (!branch) return null;
+  try {
+    const json = await commandOutput(run, 'gh', ['api', `repos/${repository.fullName}/commits/${branch}`, '--jq', '{sha: .sha, message: .commit.message, url: .html_url}']);
+    return JSON.parse(json);
+  } catch (error) {
+    warn(`⚠️  Could not fetch latest commit: ${error.message}`);
+    return null;
+  }
+}
+
+const RUNS_JQ = '[.workflow_runs[] | {name: .name, status: .status, conclusion: .conclusion, html_url: .html_url, head_sha: .head_sha}]';
+
+async function getRunsForCommit(repository, sha, run, warn) {
+  if (!sha) return [];
+  try {
+    const json = await commandOutput(run, 'gh', ['api', `repos/${repository.fullName}/actions/runs?head_sha=${sha}&per_page=100`, '--jq', RUNS_JQ]);
+    const parsed = JSON.parse(json);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (error) {
+    warn(`⚠️  Could not fetch CI/CD runs: ${error.message}`);
+    return [];
+  }
+}
+
+async function getRecentBranchRuns(repository, branch, run, warn) {
+  if (!branch) return [];
+  try {
+    const json = await commandOutput(run, 'gh', ['api', `repos/${repository.fullName}/actions/runs?branch=${encodeURIComponent(branch)}&per_page=20`, '--jq', RUNS_JQ]);
+    const parsed = JSON.parse(json);
+    return Array.isArray(parsed) ? parsed : [];
+  } catch (error) {
+    warn(`⚠️  Could not fetch recent CI/CD runs for branch ${branch}: ${error.message}`);
+    return [];
+  }
+}
+
+export async function prepareCiCdIssue({ repository, run = runCommand, warn = message => console.warn(message) }) {
+  const [languages, defaultBranch] = await Promise.all([detectLanguages(repository, run, warn), getDefaultBranch(repository, run, warn)]);
+  const commit = await getLatestCommit(repository, defaultBranch, run, warn);
+  let runs = await getRunsForCommit(repository, commit?.sha, run, warn);
+  let runsSource = 'commit';
+
+  if (runs.length === 0) {
+    const branchRuns = await getRecentBranchRuns(repository, defaultBranch, run, warn);
+    if (branchRuns.length > 0) {
+      runs = branchRuns;
+      runsSource = 'branch';
+    }
+  }
+
+  return {
+    repository,
+    defaultBranch,
+    commit,
+    runs,
+    languages,
+    runsSource,
+    title: buildCiCdIssueTitle(),
+    body: buildCiCdIssueBody({ repository, defaultBranch, commit, runs, languages, runsSource }),
+  };
+}
+
+export async function createCiCdIssue({ repository, prepared = null, run = runCommand, log = null, warn = message => console.warn(message) }) {
+  const issueDraft = prepared || (await prepareCiCdIssue({ repository, run, warn }));
+  const issue = await createTaskIssue({
+    repository,
+    title: issueDraft.title,
+    body: issueDraft.body,
+    issueType: CI_CD_ISSUE_TYPE,
+    labels: [...CI_CD_ISSUE_LABELS],
+    run,
+    log,
+  });
+  return { ...issue, prepared: issueDraft };
+}

package/src/fix.mjs

@@ -16,7 +16,8 @@
 import path from 'path';
 import { spawn } from 'child_process';
 import { fileURLToPath } from 'url';
-import { CI_CD_ISSUE_LABELS, CI_CD_ISSUE_TYPE, buildCiCdIssueBody, buildCiCdIssueTitle, buildSolveArgs, partitionFixArgs, summarizeRunFailures } from './fix.ci-cd.lib.mjs';
+import { buildSolveArgs, partitionFixArgs, summarizeRunFailures } from './fix.ci-cd.lib.mjs';
+import { createCiCdIssue, prepareCiCdIssue } from './fix.ci-cd-issue.lib.mjs';
 import { setupStdioLogInterceptor } from './lib.mjs';
 
 setupStdioLogInterceptor();
@@ -44,95 +45,6 @@ Examples:
   fix.mjs owner/repo --ci-cd --think max --no-solve`);
 }
 
-function runCommand(command, args, options = {}) {
-  return new Promise(resolve => {
-    const child = spawn(command, args, {
-      stdio: ['ignore', 'pipe', 'pipe'],
-      env: process.env,
-      ...options,
-    });
-    let stdout = '';
-    let stderr = '';
-    child.stdout.on('data', data => {
-      stdout += data.toString();
-    });
-    child.stderr.on('data', data => {
-      stderr += data.toString();
-    });
-    child.on('error', error => {
-      resolve({ code: 1, stdout, stderr: stderr || error.message });
-    });
-    child.on('close', code => {
-      resolve({ code, stdout, stderr });
-    });
-  });
-}
-
-async function commandOutput(command, args) {
-  const result = await runCommand(command, args);
-  if (result.code !== 0) {
-    const output = `${result.stderr || ''}${result.stdout || ''}`.trim();
-    throw new Error(output || `${command} exited with code ${result.code}`);
-  }
-  return result.stdout.trim();
-}
-
-async function detectLanguages(repository) {
-  try {
-    const json = await commandOutput('gh', ['api', `repos/${repository.fullName}/languages`]);
-    return JSON.parse(json);
-  } catch (error) {
-    console.warn(`⚠️  Could not detect languages: ${error.message}`);
-    return {};
-  }
-}
-
-async function getDefaultBranch(repository) {
-  try {
-    return await commandOutput('gh', ['api', `repos/${repository.fullName}`, '--jq', '.default_branch']);
-  } catch (error) {
-    console.warn(`⚠️  Could not determine default branch: ${error.message}`);
-    return null;
-  }
-}
-
-async function getLatestCommit(repository, branch) {
-  if (!branch) return null;
-  try {
-    const json = await commandOutput('gh', ['api', `repos/${repository.fullName}/commits/${branch}`, '--jq', '{sha: .sha, message: .commit.message, url: .html_url}']);
-    return JSON.parse(json);
-  } catch (error) {
-    console.warn(`⚠️  Could not fetch latest commit: ${error.message}`);
-    return null;
-  }
-}
-
-const RUNS_JQ = '[.workflow_runs[] | {name: .name, status: .status, conclusion: .conclusion, html_url: .html_url, head_sha: .head_sha}]';
-
-async function getRunsForCommit(repository, sha) {
-  if (!sha) return [];
-  try {
-    const json = await commandOutput('gh', ['api', `repos/${repository.fullName}/actions/runs?head_sha=${sha}&per_page=100`, '--jq', RUNS_JQ]);
-    const parsed = JSON.parse(json);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch (error) {
-    console.warn(`⚠️  Could not fetch CI/CD runs: ${error.message}`);
-    return [];
-  }
-}
-
-async function getRecentBranchRuns(repository, branch) {
-  if (!branch) return [];
-  try {
-    const json = await commandOutput('gh', ['api', `repos/${repository.fullName}/actions/runs?branch=${encodeURIComponent(branch)}&per_page=20`, '--jq', RUNS_JQ]);
-    const parsed = JSON.parse(json);
-    return Array.isArray(parsed) ? parsed : [];
-  } catch (error) {
-    console.warn(`⚠️  Could not fetch recent CI/CD runs for branch ${branch}: ${error.message}`);
-    return [];
-  }
-}
-
 function resolveSolveCommand() {
   return path.join(__dirname, 'solve.mjs');
 }
@@ -171,29 +83,14 @@ async function main() {
   const repository = parsed.repository;
   console.log(`🔧 /fix --ci-cd for ${repository.fullName}`);
 
-  const [languages, defaultBranch] = await Promise.all([detectLanguages(repository), getDefaultBranch(repository)]);
-  const commit = await getLatestCommit(repository, defaultBranch);
-  let runs = await getRunsForCommit(repository, commit?.sha);
-  let runsSource = 'commit';
-
-  // Release/tag commits frequently produce no runs of their own. Fall back to
-  // the most recent runs on the default branch so the issue stays actionable.
-  if (runs.length === 0) {
-    const branchRuns = await getRecentBranchRuns(repository, defaultBranch);
-    if (branchRuns.length > 0) {
-      runs = branchRuns;
-      runsSource = 'branch';
-    }
-  }
+  const prepared = await prepareCiCdIssue({ repository });
+  const { defaultBranch, commit, runs, runsSource, title, body } = prepared;
 
   const { total, failing } = summarizeRunFailures(runs);
   console.log(`   Default branch: ${defaultBranch || 'unknown'}`);
   console.log(`   Latest commit:  ${commit?.sha ? commit.sha.slice(0, 7) : 'unknown'}`);
   console.log(`   CI/CD runs:     ${total} (${failing} not passing)${runsSource === 'branch' ? ' [recent branch runs]' : ''}`);
 
-  const title = buildCiCdIssueTitle();
-  const body = buildCiCdIssueBody({ repository, defaultBranch, commit, runs, languages, runsSource });
-
   if (parsed.dryRun) {
     console.log('\n--- DRY RUN: issue that would be created ---\n');
     console.log(`Title: ${title}\n`);
@@ -202,16 +99,9 @@ async function main() {
   }
 
   console.log('\n📝 Creating remediation issue...');
-  const { createTaskIssue } = await import('./task.issue-creation.lib.mjs');
-  const issue = await createTaskIssue({
+  const issue = await createCiCdIssue({
     repository,
-    title,
-    body,
-    // The Bug type is what makes /solve --deep-analysis emit the root-cause
-    // instructions this body omits (issue #1733).
-    issueType: CI_CD_ISSUE_TYPE,
-    labels: [...CI_CD_ISSUE_LABELS],
-    run: runCommand,
+    prepared,
     log: message => console.log(message),
   });
   console.log(`✅ Created issue: ${issue.url}`);

package/src/locales/en.lino

@@ -556,9 +556,9 @@ en
       locked
         options "🔒 Locked options: `{{options}}`"
       task
-        enabled "*/task* - Create a GitHub issue from a repository link and issue text"
-        usage "Usage: `/task <github-repository-url>` followed by issue text, or reply with `/task`"
-        example "Example: `/task https://github.com/owner/repo` then the issue text on following lines"
+        enabled "*/task* - Create a GitHub issue from text or CI/CD context"
+        usage "Usage: `/task <github-repository-url>` followed by issue text, or `/task --ci-cd <github-repository-url>`"
+        example "Example: `/task --ci-cd https://github.com/owner/repo` creates only the CI/CD remediation issue"
         disabled "*/task* / */split* - ❌ Disabled"
       split
         enabled "*/split* - Split a GitHub issue into smaller issues"

package/src/locales/hi.lino

@@ -556,9 +556,9 @@ hi
       locked
         options "🔒 लॉक किए गए विकल्प: `{{options}}`"
       task
-        enabled "*/task* - repository लिंक और issue text से GitHub issue बनाएँ"
-        usage "उपयोग: `/task <github-repository-url>` के बाद issue text, या `/task` से reply करें"
-        example "उदाहरण: `/task https://github.com/owner/repo`, फिर अगली पंक्तियों में issue text"
+        enabled "*/task* - text या CI/CD context से GitHub issue बनाएँ"
+        usage "उपयोग: `/task <github-repository-url>` के बाद issue text, या `/task --ci-cd <github-repository-url>`"
+        example "उदाहरण: `/task --ci-cd https://github.com/owner/repo` केवल CI/CD remediation issue बनाता है"
         disabled "*/task* / */split* - ❌ अक्षम"
       split
         enabled "*/split* - GitHub issue को छोटे issues में बाँटें"

package/src/locales/ru.lino

@@ -556,9 +556,9 @@ ru
       locked
         options "🔒 Заблокированные опции: `{{options}}`"
       task
-        enabled "*/task* - Создать задачу GitHub из ссылки на репозиторий и текста задачи"
-        usage "Использование: `/task <github-repository-url>` с текстом задачи после команды или ответом `/task`"
-        example "Пример: `/task https://github.com/owner/repo`, затем текст задачи на следующих строках"
+        enabled "*/task* - Создать issue GitHub из текста или контекста CI/CD"
+        usage "Использование: `/task <github-repository-url>` с текстом или `/task --ci-cd <github-repository-url>`"
+        example "Пример: `/task --ci-cd https://github.com/owner/repo` создаёт только issue для исправления CI/CD"
         disabled "*/task* / */split* - ❌ Отключено"
       split
         enabled "*/split* - Разделить задачу GitHub на меньшие задачи"

package/src/locales/zh.lino

@@ -556,9 +556,9 @@ zh
       locked
         options "🔒 锁定选项：`{{options}}`"
       task
-        enabled "*/task* - 根据仓库链接和 issue 文本创建 GitHub issue"
-        usage "用法：`/task <github-repository-url>` 后接 issue 文本，或回复 `/task`"
-        example "示例：`/task https://github.com/owner/repo`，然后在后续行写 issue 文本"
+        enabled "*/task* - 根据文本或 CI/CD 上下文创建 GitHub issue"
+        usage "用法：`/task <github-repository-url>` 后接 issue 文本，或 `/task --ci-cd <github-repository-url>`"
+        example "示例：`/task --ci-cd https://github.com/owner/repo` 只创建 CI/CD 修复 issue"
         disabled "*/task* / */split* - ❌ 已禁用"
       split
         enabled "*/split* - 将 GitHub issue 拆分为更小的 issue"

package/src/pr-draft-state.lib.mjs

@@ -0,0 +1,137 @@
+/**
+ * Single source of truth for pull request draft/ready state transitions.
+ *
+ * Issue #2123: every place that starts, restarts or resumes a working session must
+ * put the pull request back into draft mode (if it is not already a draft), and every
+ * place that ends a working session must convert it back to ready for review.
+ *
+ * Before this module the logic was duplicated inline in solve.session.lib.mjs and was
+ * gated behind `argv.watch || argv.autoContinue`, so auto-restart / auto-resume
+ * sessions (temporary watch mode, auto-restart-until-mergeable, escalate,
+ * keep-working, auto-ensure, PR-placeholder restart) kept the PR marked as
+ * "ready for review" while the AI was actively working on it.
+ *
+ * @see https://github.com/link-assistant/hive-mind/issues/2123
+ */
+
+// rate-limit marker (#1726): callers pass in a `$` already wrapped by wrapDollarWithGhRetry.
+import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs';
+
+const noopLog = async () => {};
+
+/**
+ * Fetch the draft/open state of a pull request.
+ *
+ * @param {Object} options
+ * @param {string} options.owner - Repository owner
+ * @param {string} options.repo - Repository name
+ * @param {number|string} options.prNumber - Pull request number
+ * @param {Function} options.$ - command-stream style tagged template executor
+ * @param {Function} [options.log] - Logger
+ * @returns {Promise<{ok: boolean, isDraft: (boolean|null), state: (string|null), merged: boolean, error: (string|null)}>}
+ */
+export const getPullRequestDraftState = async ({ owner, repo, prNumber, $, log = noopLog }) => {
+  try {
+    const result = await $`gh pr view ${prNumber} --repo ${owner}/${repo} --json isDraft,state`;
+    if (result.code !== 0) {
+      const stderr = result.stderr ? result.stderr.toString().trim() : '';
+      return { ok: false, isDraft: null, state: null, merged: false, error: stderr || `gh exited with code ${result.code}` };
+    }
+
+    const raw = result.stdout.toString().trim();
+    let parsed;
+    try {
+      parsed = JSON.parse(raw);
+    } catch {
+      return { ok: false, isDraft: null, state: null, merged: false, error: `Could not parse gh output: ${raw.slice(0, 200)}` };
+    }
+
+    const state = typeof parsed.state === 'string' ? parsed.state.toUpperCase() : null;
+    await log(`   🔍 PR #${prNumber} draft state: isDraft=${parsed.isDraft}, state=${state}`, { verbose: true });
+
+    return { ok: true, isDraft: parsed.isDraft === true, state, merged: state === 'MERGED', error: null };
+  } catch (error) {
+    return { ok: false, isDraft: null, state: null, merged: false, error: error.message };
+  }
+};
+
+/**
+ * Internal helper shared by ensurePullRequestIsDraft/ensurePullRequestIsReady.
+ *
+ * @param {Object} options
+ * @param {'draft'|'ready'} options.target - Desired state
+ * @returns {Promise<{ok: boolean, changed: boolean, skipped: boolean, reason: (string|null), error: (string|null)}>}
+ */
+const setPullRequestDraftState = async ({ target, owner, repo, prNumber, $, log = noopLog, formatAligned = null, indent = 2, reason = null, reportError = null }) => {
+  const wantDraft = target === 'draft';
+  const label = wantDraft ? 'draft mode' : 'ready for review';
+  const write = async (icon, key, value) => {
+    await log(formatAligned ? formatAligned(icon, key, value, indent) : `${icon} ${key} ${value}`);
+  };
+
+  if (!owner || !repo || !prNumber) {
+    return { ok: false, changed: false, skipped: true, reason: 'missing_pr_context', error: null };
+  }
+
+  try {
+    const status = await getPullRequestDraftState({ owner, repo, prNumber, $, log });
+
+    if (!status.ok) {
+      await log(`Warning: Could not check PR #${prNumber} draft status: ${status.error}`, { level: 'warning' });
+      return { ok: false, changed: false, skipped: false, reason: 'status_check_failed', error: status.error };
+    }
+
+    // A merged or closed pull request cannot change its draft state; GitHub rejects it.
+    if (status.state && status.state !== 'OPEN') {
+      await write('ℹ️', 'PR status:', `${status.state.toLowerCase()} - skipping ${label} conversion`);
+      return { ok: true, changed: false, skipped: true, reason: `pr_${status.state.toLowerCase()}`, error: null };
+    }
+
+    if (status.isDraft === wantDraft) {
+      await write('✅', 'PR status:', `Already in ${label}`);
+      return { ok: true, changed: false, skipped: true, reason: 'already_in_target_state', error: null };
+    }
+
+    await write('📝', 'Converting PR:', `To ${label}${reason ? ` (${reason})` : ''}...`);
+    const convertResult = wantDraft ? await $`gh pr ready ${prNumber} --repo ${owner}/${repo} --undo` : await $`gh pr ready ${prNumber} --repo ${owner}/${repo}`;
+
+    if (convertResult.code === 0) {
+      await write('✅', 'PR converted:', `Now in ${label}`);
+      return { ok: true, changed: true, skipped: false, reason: null, error: null };
+    }
+
+    const stderr = convertResult.stderr ? convertResult.stderr.toString().trim() : '';
+    await log(`Warning: Could not convert PR #${prNumber} to ${label}${stderr ? `: ${stderr}` : ''}`, { level: 'warning' });
+    return { ok: false, changed: false, skipped: false, reason: 'conversion_failed', error: stderr || `gh exited with code ${convertResult.code}` };
+  } catch (error) {
+    if (typeof reportError === 'function') {
+      reportError(error, {
+        context: wantDraft ? 'convert_pr_to_draft' : 'convert_pr_to_ready',
+        prNumber,
+        owner,
+        repo,
+        operation: 'pr_status_change',
+      });
+    }
+    await log(`Warning: Could not check/convert PR #${prNumber} draft status: ${error.message}`, { level: 'warning' });
+    return { ok: false, changed: false, skipped: false, reason: 'exception', error: error.message };
+  }
+};
+
+/**
+ * Put a pull request into draft mode when a working session starts/restarts/resumes.
+ * No-op when the PR is already a draft, merged, or closed.
+ */
+export const ensurePullRequestIsDraft = async options => setPullRequestDraftState({ ...options, target: 'draft' });
+
+/**
+ * Put a pull request back to "ready for review" when a working session ends.
+ * No-op when the PR is already ready, merged, or closed.
+ */
+export const ensurePullRequestIsReady = async options => setPullRequestDraftState({ ...options, target: 'ready' });
+
+export default {
+  getPullRequestDraftState,
+  ensurePullRequestIsDraft,
+  ensurePullRequestIsReady,
+};

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

@@ -162,6 +162,14 @@ export const autoContinueWhenLimitResets = async (issueUrl, sessionId, argv, sho
       await log(`🔄 Session will be RESTARTED (fresh start without previous context)`);
     }
 
+    // Issue #2123: the resumed/restarted process is launched with the ISSUE url, so without
+    // --auto-continue it would not enter continue mode, would not find the existing PR, and
+    // therefore would never convert that PR back to draft (nor post the auto-resume/auto-restart
+    // session comment). Preserve the flag so the new session attaches to the same PR.
+    if (argv.autoContinue) {
+      resumeArgs.push('--auto-continue');
+    }
+
     // Preserve auto-resume/auto-restart flag for subsequent limit hits
     if (argv.autoResumeOnLimitReset) {
       resumeArgs.push('--auto-resume-on-limit-reset');

package/src/solve.restart-shared.lib.mjs

@@ -33,6 +33,8 @@ const lib = await import('./lib.mjs');
 const { log, formatAligned, extractToolErrorCore } = lib;
 const { ensurePullRequestBaseBranch } = await import('./solve.pr-base-guard.lib.mjs');
 const { RESOURCE_PHASE_RESTART_AFTER, RESOURCE_PHASE_RESTART_BEFORE, recordResourceSnapshot } = await import('./solve.resource-diagnostics.lib.mjs');
+// Issue #2123: shared draft/ready transitions for working sessions.
+const { ensurePullRequestIsDraft } = await import('./pr-draft-state.lib.mjs');
 
 // Import Sentry integration
 const sentryLib = await import('./sentry.lib.mjs');
@@ -185,6 +187,23 @@ export const executeToolIteration = async params => {
     label: 'before AI restart iteration',
   });
 
+  // Issue #2123: every restart/resume iteration is a new working session, so the PR must be
+  // put back into draft before the AI starts changing it. This single call covers watch mode,
+  // temporary auto-restart, auto-restart-until-mergeable, escalate, keep-working,
+  // auto-ensure-requirements and the PR-placeholder restart, which all funnel through here.
+  if (prNumber) {
+    await ensurePullRequestIsDraft({
+      owner,
+      repo,
+      prNumber,
+      $,
+      log,
+      formatAligned,
+      reason: 'restart iteration',
+      reportError,
+    });
+  }
+
   // Import necessary modules for tool execution
   const memoryCheck = await import('./memory-check.mjs');
   const { getResourceSnapshot } = memoryCheck;

package/src/solve.session.lib.mjs

@@ -9,6 +9,10 @@
 import { AI_WORK_SESSION_STARTED_MARKER, AI_WORK_SESSION_COMPLETED_MARKER, AI_WORK_SESSION_RESUMED_MARKER, AUTO_RESUME_ON_LIMIT_RESET_MARKER, AUTO_RESTART_ON_LIMIT_RESET_MARKER, postTrackedComment } from './tool-comments.lib.mjs';
 
 import { wrapDollarWithGhRetry as _wrapDollarWithGhRetry } from './github-rate-limit.lib.mjs'; // rate-limit marker (#1726): gh API calls flow through $ wrapped by caller
+
+// Issue #2123: draft/ready transitions live in one shared module so every session
+// start/restart/resume path behaves identically.
+import { ensurePullRequestIsDraft, ensurePullRequestIsReady } from './pr-draft-state.lib.mjs';
 /**
  * Session type definitions for different work session contexts
  * See: https://github.com/link-assistant/hive-mind/issues/1152
@@ -70,39 +74,30 @@ function getSessionCommentContent(sessionType, timestamp) {
  * @param {string} [options.sessionType='new'] - One of SESSION_TYPES values
  */
 export async function startWorkSession({ isContinueMode, prNumber, argv, log, formatAligned, $, sessionType = SESSION_TYPES.NEW }) {
-  // Record work start time and convert PR to draft if in continue/watch mode
+  // Record work start time and convert PR to draft.
+  //
+  // Issue #2123: the draft conversion used to be gated behind `argv.watch || argv.autoContinue`,
+  // so plain `--resume`/continue-mode sessions left the PR marked "ready for review" while the
+  // AI was still working on it. Any continue-mode session with a PR now converts it to draft.
   const workStartTime = new Date();
-  if (isContinueMode && prNumber && (argv.watch || argv.autoContinue)) {
+  const shouldPostSessionComment = argv.watch || argv.autoContinue;
+  if (isContinueMode && prNumber) {
     await log(`\n${formatAligned('🚀', 'Starting work session:', workStartTime.toISOString())}`);
 
-    // Convert PR back to draft if not already
-    try {
-      const prStatusResult = await $`gh pr view ${prNumber} --repo ${global.owner}/${global.repo} --json isDraft --jq .isDraft`;
-      if (prStatusResult.code === 0) {
-        const isDraft = prStatusResult.stdout.toString().trim() === 'true';
-        if (!isDraft) {
-          await log(formatAligned('📝', 'Converting PR:', 'Back to draft mode...', 2));
-          const convertResult = await $`gh pr ready ${prNumber} --repo ${global.owner}/${global.repo} --undo`;
-          if (convertResult.code === 0) {
-            await log(formatAligned('✅', 'PR converted:', 'Now in draft mode', 2));
-          } else {
-            await log('Warning: Could not convert PR to draft', { level: 'warning' });
-          }
-        } else {
-          await log(formatAligned('✅', 'PR status:', 'Already in draft mode', 2));
-        }
-      }
-    } catch (error) {
-      const sentryLib = await import('./sentry.lib.mjs');
-      const { reportError } = sentryLib;
-      reportError(error, {
-        context: 'convert_pr_to_draft',
-        prNumber,
-        operation: 'pr_status_change',
-      });
-      await log('Warning: Could not check/convert PR draft status', { level: 'warning' });
-    }
+    const { reportError } = await import('./sentry.lib.mjs');
+    await ensurePullRequestIsDraft({
+      owner: global.owner,
+      repo: global.repo,
+      prNumber,
+      $,
+      log,
+      formatAligned,
+      reason: `session start: ${sessionType}`,
+      reportError,
+    });
+  }
 
+  if (isContinueMode && prNumber && shouldPostSessionComment) {
     // Post a comment marking the start of work session with appropriate header based on session type.
     // Issue #1625: Use postTrackedComment so the comment ID is registered in-memory and can be
     // excluded from the "did the AI post anything?" check in checkForAiCreatedComments().
@@ -131,14 +126,17 @@ export async function startWorkSession({ isContinueMode, prNumber, argv, log, fo
 }
 
 export async function endWorkSession({ isContinueMode, prNumber, argv, log, formatAligned, $, logsAttached = false }) {
-  // Post end work session comment and convert PR back to ready if in continue mode
-  if (isContinueMode && prNumber && (argv.watch || argv.autoContinue)) {
+  // Post end work session comment and convert PR back to ready if in continue mode.
+  // Issue #2123: the ready conversion mirrors startWorkSession's draft conversion, so it must
+  // run for every continue-mode session, not only for --watch/--auto-continue ones.
+  if (isContinueMode && prNumber) {
     const workEndTime = new Date();
+    const shouldPostSessionComment = argv.watch || argv.autoContinue;
     await log(`\n${formatAligned('🏁', 'Ending work session:', workEndTime.toISOString())}`);
 
     // Only post end comment if logs were NOT already attached
     // The attachLogToGitHub comment already serves as finishing status with "Now working session is ended" text
-    if (!logsAttached) {
+    if (shouldPostSessionComment && !logsAttached) {
       // Post a comment marking the end of work session.
       // Issue #1625: Track the comment ID so it won't be mistaken for AI-authored content.
       try {
@@ -159,36 +157,21 @@ export async function endWorkSession({ isContinueMode, prNumber, argv, log, form
         });
         await log('Warning: Could not post work end comment', { level: 'warning' });
       }
-    } else {
+    } else if (shouldPostSessionComment) {
       await log(formatAligned('ℹ️', 'Skipping:', 'End comment (logs already attached with session end message)', 2));
     }
 
-    // Convert PR back to ready for review
-    try {
-      const prStatusResult = await $`gh pr view ${prNumber} --repo ${global.owner}/${global.repo} --json isDraft --jq .isDraft`;
-      if (prStatusResult.code === 0) {
-        const isDraft = prStatusResult.stdout.toString().trim() === 'true';
-        if (isDraft) {
-          await log(formatAligned('🔀', 'Converting PR:', 'Back to ready for review...', 2));
-          const convertResult = await $`gh pr ready ${prNumber} --repo ${global.owner}/${global.repo}`;
-          if (convertResult.code === 0) {
-            await log(formatAligned('✅', 'PR converted:', 'Ready for review', 2));
-          } else {
-            await log('Warning: Could not convert PR to ready', { level: 'warning' });
-          }
-        } else {
-          await log(formatAligned('✅', 'PR status:', 'Already ready for review', 2));
-        }
-      }
-    } catch (error) {
-      const sentryLib = await import('./sentry.lib.mjs');
-      const { reportError } = sentryLib;
-      reportError(error, {
-        context: 'convert_pr_to_ready',
-        prNumber,
-        operation: 'pr_status_change',
-      });
-      await log('Warning: Could not convert PR to ready status', { level: 'warning' });
-    }
+    // Convert PR back to ready for review (issue #2123: shared implementation)
+    const { reportError } = await import('./sentry.lib.mjs');
+    await ensurePullRequestIsReady({
+      owner: global.owner,
+      repo: global.repo,
+      prNumber,
+      $,
+      log,
+      formatAligned,
+      reason: 'session end',
+      reportError,
+    });
   }
 }

package/src/telegram-task-command.lib.mjs

@@ -2,6 +2,8 @@ import { buildUserMention } from './buildUserMention.lib.mjs';
 import { validateModelName } from './models/index.mjs';
 import { getLinoYargsFactory } from './cli-arguments.lib.mjs';
 import { createYargsConfig as createTaskYargsConfig } from './task.config.lib.mjs';
+import { createCiCdIssue } from './fix.ci-cd-issue.lib.mjs';
+import { parseFixRepository } from './fix.ci-cd.lib.mjs';
 import { createTaskIssue, parseTaskIssueCreationInput, resolveTaskIssueCreationInput } from './task.issue-creation.lib.mjs';
 import { parseTaskIssueUrl } from './task.split.lib.mjs';
 import { escapeMarkdown } from './telegram-markdown.lib.mjs';
@@ -23,6 +25,10 @@ export function hasTaskSplitFlag(args) {
   return args.includes('--split') || args.some(arg => arg.startsWith('--split='));
 }
 
+export function hasTaskCiCdFlag(args) {
+  return args.includes('--ci-cd');
+}
+
 export function applyTaskCommandDefaults(args, commandName = 'task') {
   if (commandName !== 'split') return args;
   const hasSplit = args.includes('--split') || args.some(arg => arg.startsWith('--split='));
@@ -66,6 +72,16 @@ export function buildTaskCommandArgs(text) {
   };
 }
 
+export function buildTaskCiCdCommandArgs(text) {
+  const args = parseCommandArgs(text);
+  const repositoryRaw = args.find(arg => !arg.startsWith('-') && parseFixRepository(arg)) || null;
+  return {
+    args,
+    repositoryRaw,
+    repository: repositoryRaw ? parseFixRepository(repositoryRaw) : null,
+  };
+}
+
 function getReplyText(message) {
   const reply = message?.reply_to_message;
   if (!reply || reply.forum_topic_created) return '';
@@ -97,7 +113,7 @@ function injectLanguageIfMissing(args, locale) {
 }
 
 export function registerTaskCommands(bot, options) {
-  const { VERBOSE, taskEnabled, addBreadcrumb, isOldMessage, isForwarded, isGroupChat, isTopicAuthorized, buildAuthErrorMessage, isChatStopped, getStoppedChatRejectMessage, safeReply, executeAndUpdateMessage, createTaskIssue: createTaskIssueFn = createTaskIssue, resolveLocale = null } = options;
+  const { VERBOSE, taskEnabled, addBreadcrumb, isOldMessage, isForwarded, isGroupChat, isTopicAuthorized, buildAuthErrorMessage, isChatStopped, getStoppedChatRejectMessage, safeReply, executeAndUpdateMessage, createTaskIssue: createTaskIssueFn = createTaskIssue, createCiCdIssue: createCiCdIssueFn = createCiCdIssue, resolveLocale = null } = options;
 
   async function handleTaskCommand(ctx) {
     const commandName = getTaskCommandNameFromText(ctx.message?.text) || 'task';
@@ -138,6 +154,36 @@ export function registerTaskCommands(bot, options) {
 
     const parsedArgs = parseCommandArgs(ctx.message.text);
     const splitMode = commandName === 'split' || hasTaskSplitFlag(parsedArgs);
+    const ciCdMode = commandName === 'task' && hasTaskCiCdFlag(parsedArgs);
+
+    if (splitMode && ciCdMode) {
+      await safeReply(ctx, '❌ `--ci-cd` and `--split` cannot be used together.', { reply_to_message_id: ctx.message.message_id });
+      return;
+    }
+
+    if (ciCdMode) {
+      const built = buildTaskCiCdCommandArgs(ctx.message.text);
+      if (!built.repository) {
+        await safeReply(ctx, `❌ Missing GitHub repository URL. Usage: \`${commandDisplay} --ci-cd <github-repository-url>\`\n\nExample: \`${commandDisplay} --ci-cd https://github.com/owner/repo\``, { reply_to_message_id: ctx.message.message_id });
+        return;
+      }
+
+      const statusMessage = await ctx.reply(`Collecting CI/CD context and creating a GitHub issue in ${built.repository.fullName}...`, {
+        reply_to_message_id: ctx.message.message_id,
+        disable_web_page_preview: true,
+      });
+
+      try {
+        const createdIssue = await createCiCdIssueFn({
+          repository: built.repository,
+          log: message => VERBOSE && console.log(`[VERBOSE] ${message}`),
+        });
+        await editTelegramMessage(ctx, statusMessage, `Created GitHub issue:\n${createdIssue.url}\n\nReply to this message with /solve --development-log --deep-analysis --auto-merge to continue the full CI/CD remediation workflow.`);
+      } catch (error) {
+        await editTelegramMessage(ctx, statusMessage, `Error creating CI/CD issue:\n${error.message || String(error)}`);
+      }
+      return;
+    }
 
     if (!splitMode) {
       const replyText = getReplyText(ctx.message);