@quiel/cli 0.5.2 → 0.5.3

package/dist/cli.js

@@ -1317,13 +1317,22 @@ var taskPayloadLeaseSchema = z23.object({
   resumeToken: z23.string().min(1),
   expiresAt: z23.string().datetime()
 });
+var taskPayloadContinueFromSchema = z23.object({
+  branchName: z23.string().min(1),
+  sha: z23.string().optional(),
+  /** Короткая записка прошлого исполнителя «что успел». */
+  note: z23.string().optional(),
+  savedAt: z23.string()
+});
 var taskPayloadSchema = z23.object({
   task: taskPayloadTaskSchema,
   project: taskPayloadProjectSchema,
   dependencies: z23.array(taskPayloadDependencySchema),
   openQuestions: z23.array(taskPayloadOpenQuestionSchema),
   trust: taskPayloadTrustSchema,
-  lease: taskPayloadLeaseSchema
+  lease: taskPayloadLeaseSchema,
+  /** Есть только у задач, которые уже начинали и прервали. */
+  continueFrom: taskPayloadContinueFromSchema.optional()
 });
 var taskClaimPayloadSchema = z23.object({
   /**
@@ -1440,7 +1449,21 @@ var contextPayloadSchema = z23.object({
 });
 var agentRateLimitedPayloadSchema = z23.object({
   retryAfterSec: z23.number().int().positive().optional(),
-  taskId: z23.string().min(1).optional()
+  taskId: z23.string().min(1).optional(),
+  /**
+   * Когда лимит сбросится (LIM-06) — разобрано клиентом из текста самой
+   * ошибки Claude Code («resets 3:45pm»).
+   *
+   * НЕ ПУТАТЬ С `retryAfterSec`. Тот — сколько секунд подождать, как
+   * посчитал сам Claude Code, и его часто нет вовсе. Этот — абсолютный
+   * момент, уже приведённый к UTC клиентом: в сообщении время местное и
+   * без пояса, и разобрать его может только тот, кто стоит на той же
+   * машине.
+   *
+   * Необязательное: формат сообщения может смениться, и тогда клиент
+   * честно ничего не присылает, а не гадает.
+   */
+  resetsAt: z23.string().datetime().optional()
 });
 var agentRateLimitedAckSchema = z23.object({
   ok: z23.boolean(),
@@ -1520,6 +1543,18 @@ var taskUsagePayloadSchema = z23.object({
   entries: z23.array(taskUsageEntrySchema).min(1).max(10)
 });
 var taskUsageAckSchema = z23.object({ ok: z23.boolean() });
+var taskWorkSavedPayloadSchema = z23.object({
+  taskId: z23.string().min(1),
+  /** Ветка, в которую ушла незаконченная работа. */
+  branchName: z23.string().min(1).max(255),
+  sha: z23.string().min(7).max(64).optional(),
+  /**
+   * Короткая записка «что успел» — её увидит следующий исполнитель.
+   * Потолок жёсткий: это подпись к ветке, а не отчёт о работе.
+   */
+  note: z23.string().max(500).optional()
+});
+var taskWorkSavedAckSchema = z23.object({ ok: z23.boolean() });
 var sessionLimitReachedPayloadSchema = z23.object({
   tasksCompletedInSession: z23.number().int().nonnegative()
 });
@@ -3423,7 +3458,22 @@ var CurrentTaskSchema = z30.object({
    * Необязательно: состояния, записанные прежними версиями клиента, поля
    * не имеют — тогда `submit_work` работает как раньше, в режиме DIRECT.
    */
-  gitMode: z30.enum([GitMode.DIRECT, GitMode.PR]).optional()
+  gitMode: z30.enum([GitMode.DIRECT, GitMode.PR]).optional(),
+  /**
+   * Имя ветки задачи и префикс сообщения коммита — как их посчитал
+   * СЕРВЕР (`project.branchName`, `project.commitPrefix`, §10.3 ТЗ).
+   *
+   * Добавлены для спасения незаконченной работы (LIM-01): когда агент
+   * упирается в лимит подписки, коммитить и отправлять надо уже без
+   * него — он в этот момент ничего не может. Значит и ветку, и префикс
+   * надо помнить заранее, а не спрашивать в момент прерывания.
+   *
+   * Необязательны: у состояний, записанных прежними версиями клиента,
+   * полей нет — тогда работа спасается только коммитом (без push) или
+   * не спасается вовсе, и об этом честно сообщается.
+   */
+  branchName: z30.string().min(1).optional(),
+  commitPrefix: z30.string().min(1).optional()
 });
 var TrustCacheSchema = z30.object({
   profileKey: z30.string().min(1),
@@ -4175,7 +4225,14 @@ var createSocket = (url, options) => io(url, {
 // src/hooks/audit-sender.ts
 var DEFAULT_CONNECT_TIMEOUT_MS = 3e3;
 var DEFAULT_FLUSH_GRACE_MS = 150;
-var WIRE_EVENTS = /* @__PURE__ */ new Set(["audit:command", "task:usage", "session-limit-reached"]);
+var WIRE_EVENTS = /* @__PURE__ */ new Set([
+  "audit:command",
+  "task:usage",
+  "session-limit-reached",
+  "agent:rate_limited",
+  // LIM-02: о спасённой ветке сервер узнаёт отсюда же.
+  "task:work_saved"
+]);
 function sendHookActions(actions, options = {}) {
   const wireActions = actions.filter((action) => WIRE_EVENTS.has(action.type));
   if (wireActions.length === 0) return;
@@ -4360,1297 +4417,1528 @@ function renderHookOutput(format, hook, output) {
   return { stdout: "{}", stderr: "", exitCode: 0 };
 }
 
-// src/socket/auth-reject.ts
-var AUTH_REJECT_REASONS = /* @__PURE__ */ new Set(["missing", "invalid"]);
-function isAuthRejection(error) {
-  const message = error instanceof Error ? error.message : String(error);
-  return AUTH_REJECT_REASONS.has(message.trim());
+// src/git/exec.ts
+import { execFile } from "child_process";
+var DEFAULT_TIMEOUT_MS = 12e4;
+var MAX_BUFFER_BYTES = 10 * 1024 * 1024;
+function runGit(args, options) {
+  return new Promise((resolvePromise) => {
+    execFile(
+      "git",
+      [...args],
+      {
+        cwd: options.cwd,
+        shell: false,
+        timeout: options.timeoutMs ?? DEFAULT_TIMEOUT_MS,
+        maxBuffer: MAX_BUFFER_BYTES,
+        env: {
+          ...process.env,
+          ...options.env,
+          // Без человека за терминалом: если git вдруг решит спросить
+          // логин/пароль, зависший prompt выглядел бы как неожиданное
+          // поведение (требование подзадачи: «любая неожиданность —
+          // понятный отказ, а не попробую починить»), а не как честный
+          // отказ команды с кодом возврата.
+          GIT_TERMINAL_PROMPT: "0"
+        }
+      },
+      (error, stdout, stderr) => {
+        if (!error) {
+          resolvePromise({ ok: true, code: 0, signal: null, stdout, stderr });
+          return;
+        }
+        const code = typeof error.code === "number" ? error.code : null;
+        resolvePromise({
+          ok: false,
+          code,
+          signal: error.signal ?? null,
+          stdout,
+          // Если git ничего не написал в stderr (например, сам процесс не
+          // запустился — ENOENT), берём текст ошибки Node, чтобы вызывающий
+          // код не остался с пустым сообщением.
+          stderr: stderr.length > 0 ? stderr : error.message
+        });
+      }
+    );
+  });
 }
-function describeAuthRejection(agentId) {
-  return `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u043B\u0430 \u0442\u043E\u043A\u0435\u043D \u0430\u0433\u0435\u043D\u0442\u0430 ${agentId}: \u043E\u043D \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D, \u043E\u0442\u043E\u0437\u0432\u0430\u043D \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u0440\u0447\u0435\u043D. \u041F\u0435\u0440\u0435\u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043D\u0435 \u043F\u043E\u043C\u043E\u0436\u0435\u0442 \u2014 \u0432\u044B\u043F\u0443\u0441\u0442\u0438 \u043D\u043E\u0432\u044B\u0439 \u0442\u043E\u043A\u0435\u043D \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0435 \u0430\u0433\u0435\u043D\u0442\u0430 \u0438 \u0437\u0430\u043F\u0443\u0441\u0442\u0438 "quiel init" \u0437\u0430\u043D\u043E\u0432\u043E.`;
+function describeGitFailure(commandLabel, result) {
+  const stderr = result.stderr.trim();
+  const codeText = result.code === null ? "" : ` (\u043A\u043E\u0434 ${result.code})`;
+  return stderr.length > 0 ? `${commandLabel}${codeText}: ${stderr}` : `${commandLabel} \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0430\u0441\u044C \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439${codeText}`;
 }
 
-// src/socket/backoff.ts
-function nextReconnectDelayMs(attempt, options = {}) {
-  const baseMs = options.baseMs ?? 1e3;
-  const maxMs = options.maxMs ?? 3e4;
-  const safeAttempt = Math.max(0, Math.trunc(attempt));
-  const exponent = Math.min(safeAttempt, 30);
-  const raw = baseMs * 2 ** exponent;
-  return Math.min(raw, maxMs);
+// src/git/result.ts
+function gitOk(data) {
+  return { ok: true, data };
 }
-
-// src/socket/client.ts
-import { EventEmitter } from "events";
-
-// src/socket/emit-with-timeout.ts
-function toError(raw, context) {
-  return raw instanceof Error ? raw : new Error(`${context}: ${String(raw)}`);
+function gitErr(message) {
+  return { ok: false, message };
 }
-async function emitWithAckTimeout(socket, event, payload, timeoutMs) {
-  return await new Promise((resolve4, reject) => {
-    const timer = setTimeout(() => {
-      reject(new Error(`${event}: \u043D\u0435\u0442 ack \u043E\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0437\u0430 ${timeoutMs} \u043C\u0441`));
-    }, timeoutMs);
-    if (typeof timer.unref === "function") timer.unref();
-    socket.emitWithAck(event, payload).then((value) => {
-      clearTimeout(timer);
-      resolve4(value);
-    }).catch((err) => {
-      clearTimeout(timer);
-      reject(toError(err, event));
-    });
+
+// src/git/repo.ts
+async function localBranchExists(repoRoot, branch) {
+  const result = await runGit(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], {
+    cwd: repoRoot
   });
+  return result.ok;
 }
-
-// src/socket/trust-cache.ts
-var UNKNOWN_TRUST_PROFILE_KEY = "unknown";
-function toTrustCache(rules, now = () => /* @__PURE__ */ new Date()) {
-  return {
-    profileKey: UNKNOWN_TRUST_PROFILE_KEY,
-    updatedAt: now().toISOString(),
-    rules
-  };
+async function getHeadSha(worktreeDir) {
+  const result = await runGit(["rev-parse", "HEAD"], { cwd: worktreeDir });
+  if (!result.ok) {
+    return gitErr(describeGitFailure("git rev-parse HEAD", result));
+  }
+  return gitOk(result.stdout.trim());
 }
-
-// src/socket/types.ts
-function isAckError(raw) {
-  return typeof raw === "object" && raw !== null && "error" in raw && typeof raw.error === "object";
+async function currentBranch(worktreeDir) {
+  const result = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: worktreeDir });
+  if (!result.ok) {
+    return gitErr(describeGitFailure("git rev-parse --abbrev-ref HEAD", result));
+  }
+  return gitOk(result.stdout.trim());
 }
 
-// src/socket/client.ts
-var DEFAULT_HEARTBEAT_INTERVAL_MS = 3e4;
-var DEFAULT_ACK_TIMEOUT_MS = 1e4;
-var DEFAULT_BACKOFF_BASE_MS = 1e3;
-var DEFAULT_BACKOFF_MAX_MS = 3e4;
-function toError2(raw, context) {
-  if (raw instanceof Error) return raw;
-  return new Error(`${context}: ${String(raw)}`);
+// src/git/status.ts
+var CONFLICT_CODES = /* @__PURE__ */ new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
+async function getWorktreeStatus(worktreeDir) {
+  const result = await runGit(["status", "--porcelain=v1", "--untracked-files=all"], {
+    cwd: worktreeDir
+  });
+  if (!result.ok) {
+    return gitErr(describeGitFailure("git status", result));
+  }
+  const changedPaths = [];
+  const conflictedPaths = [];
+  for (const line of result.stdout.split("\n")) {
+    if (line.length === 0) continue;
+    const code = line.slice(0, 2);
+    const rawPath = line.slice(3);
+    const arrowIndex = rawPath.indexOf(" -> ");
+    const path = arrowIndex >= 0 ? rawPath.slice(arrowIndex + 4) : rawPath;
+    changedPaths.push(path);
+    if (CONFLICT_CODES.has(code)) conflictedPaths.push(path);
+  }
+  return gitOk({ clean: changedPaths.length === 0, changedPaths, conflictedPaths });
 }
-function resolveOptions(options) {
-  return {
-    roleKeys: options.roleKeys,
-    cwd: options.cwd,
-    clientVersion: options.clientVersion,
-    agentVersion: options.agentVersion ?? "unknown",
-    agentKind: options.agentKind ?? DEFAULT_AGENT_KIND,
-    os: options.os ?? process.platform,
-    // По умолчанию — файл ИМЕННО этого агента (state/store.ts::getStateFilePath(agentId)),
-    // а не общий `state.json`: не трогаем src/state/**, но обязаны использовать
-    // его правильно (OQ-05 — состояние на агента, не на машину).
-    stateFilePath: options.stateFilePath ?? getStateFilePath(options.agentId),
-    heartbeatIntervalMs: options.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS,
-    ackTimeoutMs: options.ackTimeoutMs ?? DEFAULT_ACK_TIMEOUT_MS,
-    backoffBaseMs: options.backoffBaseMs ?? DEFAULT_BACKOFF_BASE_MS,
-    backoffMaxMs: options.backoffMaxMs ?? DEFAULT_BACKOFF_MAX_MS,
-    now: options.now ?? (() => /* @__PURE__ */ new Date())
-  };
+
+// src/git/commit.ts
+function buildCommitMessage(params) {
+  const subject = `${params.commitPrefix} ${params.title}`.trim();
+  return `${subject}
+
+${buildTaskTrailer(params.taskKey)}
+`;
 }
-var AgentSocketClient = class extends EventEmitter {
-  socket;
-  opts;
-  agentId;
-  stopped = true;
-  reconnectAttempt = 0;
-  reconnectTimer;
-  heartbeatTimer;
-  lastHelloAck;
-  paused = false;
-  pauseReasonText;
-  leaseLostTasks = /* @__PURE__ */ new Map();
-  constructor(options) {
-    super();
-    this.opts = resolveOptions(options);
-    this.agentId = options.agentId;
-    const factory = options.createSocket ?? createSocket;
-    this.socket = factory(`${trimTrailingSlash2(options.url)}/agent`, {
-      auth: { token: options.token },
-      autoConnect: false,
-      reconnection: false
-    });
-    this.registerSocketListeners();
-  }
-  // -- Публичное API -----------------------------------------------------
-  on(event, listener) {
-    return super.on(event, listener);
+async function commitAll(params) {
+  const addResult = await runGit(["add", "-A"], { cwd: params.worktreeDir });
+  if (!addResult.ok) {
+    return gitErr(describeGitFailure("git add -A", addResult));
   }
-  once(event, listener) {
-    return super.once(event, listener);
+  const status = await getWorktreeStatus(params.worktreeDir);
+  if (!status.ok) return status;
+  if (status.data.clean) {
+    return gitOk({ committed: false, sha: null });
   }
-  off(event, listener) {
-    return super.off(event, listener);
+  const message = buildCommitMessage(params);
+  const commitResult = await runGit(["commit", "-m", message], { cwd: params.worktreeDir });
+  if (!commitResult.ok) {
+    return gitErr(describeGitFailure("git commit", commitResult));
   }
-  emit(event, ...args) {
-    return super.emit(event, ...args);
+  const sha = await getHeadSha(params.worktreeDir);
+  return gitOk({ committed: true, sha: sha.ok ? sha.data : null });
+}
+
+// src/git/branch-name.ts
+var FORBIDDEN_CHARS = /[\s~^:?*[\\\x00-\x1f\x7f]/;
+function isValidGitBranchName(name) {
+  if (name.length === 0 || name.length > 255) return false;
+  if (name.startsWith("-")) return false;
+  if (name.startsWith("/") || name.endsWith("/")) return false;
+  if (name.endsWith(".")) return false;
+  if (name.includes("..")) return false;
+  if (name.includes("//")) return false;
+  if (name.includes("@{")) return false;
+  if (name === "@") return false;
+  if (FORBIDDEN_CHARS.test(name)) return false;
+  const segments = name.split("/");
+  for (const segment of segments) {
+    if (segment.length === 0) return false;
+    if (segment.startsWith(".")) return false;
+    if (segment.endsWith(".lock")) return false;
   }
-  /** Поднимает соединение и heartbeat-таймер. Идемпотентно — повторный вызов на уже запущенном клиенте не делает ничего. */
-  start() {
-    if (!this.stopped) return;
-    this.stopped = false;
-    this.reconnectAttempt = 0;
-    this.startHeartbeatTimer();
-    this.socket.connect();
-  }
-  /** Останавливает heartbeat, отменяет запланированное переподключение, закрывает сокет. После `stop()` клиент больше не переподключается сам. */
-  stop() {
-    this.stopped = true;
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = void 0;
-    }
-    this.stopHeartbeatTimer();
-    this.socket.disconnect();
+  return true;
+}
+function requireValidBranchName(name, label) {
+  if (!isValidGitBranchName(name)) {
+    return gitErr(
+      `${label} "${name}" \u043D\u0435 \u043F\u043E\u0445\u043E\u0436\u0435 \u043D\u0430 \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0435 \u0438\u043C\u044F git-\u0432\u0435\u0442\u043A\u0438 \u2014 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
+    );
   }
-  get connected() {
-    return this.socket.connected;
+  return gitOk(name);
+}
+
+// src/git/worktree.ts
+import { createHash as createHash2 } from "crypto";
+import { existsSync as existsSync9, mkdirSync as mkdirSync6, realpathSync } from "fs";
+import { dirname as dirname4, isAbsolute, join as join9, relative, resolve as resolve2 } from "path";
+var WORKTREES_RELATIVE_ROOT = join9(".claude", "worktrees");
+function getDefaultWorktreesRoot(repoRoot) {
+  return join9(repoRoot, WORKTREES_RELATIVE_ROOT);
+}
+function resolveWorktreeDir(worktreesRoot, repoRoot, branchName) {
+  if (isInsideRepo(worktreesRoot, repoRoot)) return join9(worktreesRoot, branchName);
+  const repoHash = createHash2("sha1").update(resolve2(repoRoot)).digest("hex").slice(0, 12);
+  return join9(worktreesRoot, repoHash, branchName);
+}
+function isInsideRepo(candidate, repoRoot) {
+  const rel = relative(resolve2(repoRoot), resolve2(candidate));
+  return rel.length > 0 && !rel.startsWith("..") && !isAbsolute(rel);
+}
+function canonicalPath(path) {
+  try {
+    return realpathSync(path);
+  } catch {
+    return resolve2(path);
   }
-  get lastHello() {
-    return this.lastHelloAck;
+}
+async function listWorktrees(repoRoot) {
+  const result = await runGit(["worktree", "list", "--porcelain"], { cwd: repoRoot });
+  if (!result.ok) {
+    return gitErr(describeGitFailure("git worktree list", result));
   }
-  get isPaused() {
-    return this.paused;
+  const entries = [];
+  let path;
+  let branch = null;
+  const flush = () => {
+    if (path) entries.push({ path, branch });
+    path = void 0;
+    branch = null;
+  };
+  for (const line of result.stdout.split("\n")) {
+    if (line.length === 0) {
+      flush();
+      continue;
+    }
+    if (line.startsWith("worktree ")) path = line.slice("worktree ".length);
+    else if (line.startsWith("branch refs/heads/")) branch = line.slice("branch refs/heads/".length);
   }
-  get pauseReason() {
-    return this.pauseReasonText;
+  flush();
+  return gitOk(entries);
+}
+async function ensureWorktree(params) {
+  const remote = params.remote ?? "origin";
+  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
+  if (!branchCheck.ok) return branchCheck;
+  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
+  if (!defaultBranchCheck.ok) return defaultBranchCheck;
+  const worktreesRoot = params.worktreesRoot ?? getDefaultWorktreesRoot(params.repoRoot);
+  const worktreeDir = resolveWorktreeDir(worktreesRoot, params.repoRoot, params.branchName);
+  const list = await listWorktrees(params.repoRoot);
+  if (!list.ok) return list;
+  const existing = list.data.find((wt) => canonicalPath(wt.path) === canonicalPath(worktreeDir));
+  if (existing) {
+    if (existing.branch === params.branchName) {
+      return gitOk({ worktreeDir, reused: true });
+    }
+    return gitErr(
+      `\u041F\u043E \u043F\u0443\u0442\u0438 ${worktreeDir} \u0443\u0436\u0435 \u0435\u0441\u0442\u044C git worktree \u043D\u0430 \u0432\u0435\u0442\u043A\u0435 "${existing.branch ?? "(\u043E\u0442\u0441\u043E\u0435\u0434\u0438\u043D\u0451\u043D\u043D\u044B\u0439 HEAD)"}", \u0430 \u043E\u0436\u0438\u0434\u0430\u043B\u0430\u0441\u044C "${params.branchName}". \u0420\u0430\u0437\u0431\u0435\u0440\u0438\u0441\u044C \u0440\u0443\u043A\u0430\u043C\u0438: "git -C ${params.repoRoot} worktree remove ${worktreeDir}" (\u0434\u043E\u0431\u0430\u0432\u044C "--force", \u0435\u0441\u043B\u0438 \u0442\u0430\u043C \u043D\u0435\u0442 \u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u043E\u0433\u043E \u0432\u0430\u0436\u043D\u043E\u0433\u043E), \u0437\u0430\u0442\u0435\u043C \u043F\u043E\u0432\u0442\u043E\u0440\u0438.`
+    );
   }
-  /** §11.2 ТЗ: «следующий вызов любого тула по этой задаче должен сообщить модели, что работу надо прекратить» — тулы (P2-12) сверяются с этим геттером. */
-  isLeaseLost(taskId) {
-    const reason = this.leaseLostTasks.get(taskId);
-    return reason === void 0 ? { lost: false } : { lost: true, reason };
+  if (existsSync9(worktreeDir)) {
+    return gitErr(
+      `\u041F\u0443\u0442\u044C ${worktreeDir} \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u043D\u043E git \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u0442 \u0435\u0433\u043E \u0441\u0432\u043E\u0435\u0439 worktree. \u0423\u0431\u0435\u0440\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0440\u0443\u043A\u0430\u043C\u0438 \u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0438 \u2014 \u0442\u0440\u043E\u0433\u0430\u0442\u044C \u0447\u0443\u0436\u043E\u0439 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043D\u0435\u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E.`
+    );
   }
-  /**
-   * Общий emit+ack поверх ЭТОГО ЖЕ постоянного сокета — тем же приёмом
-   * (`emitWithAckTimeout`), которым `sendHello`/`sendHeartbeat` уже
-   * пользуются внутри класса, но публично: MCP-тулы (P2-12/13,
-   * `../mcp/**`) шлют через него `task:claim`/`task:start`/`task:progress`/
-   * `task:get`/`task:report`/`task:release`/`context:get` (§11.1 ТЗ) — то
-   * есть ВСЁ, что не `agent:hello`/`agent:heartbeat`/`agent:mode` (у
-   * первых двух своя логика согласования состояния в этом классе, третий
-   * — короткоживущий отдельный сокет, см. `send-agent-mode.ts`). Нарочно
-   * НЕ отдельное соединение: `task:claim` — блокирующий долгий long-poll,
-   * и держать его на том же сокете, где уже идёт heartbeat/presence этого
-   * агента, а не поднимать вторую параллельную сессию — единственный
-   * вариант, не удваивающий presence на сервере.
-   */
-  callServer(event, payload, timeoutMs = this.opts.ackTimeoutMs) {
-    return emitWithAckTimeout(this.socket, event, payload, timeoutMs);
+  await runGit(["worktree", "prune"], { cwd: params.repoRoot });
+  const fetchResult = await runGit(["fetch", remote, params.defaultBranch], {
+    cwd: params.repoRoot
+  });
+  if (!fetchResult.ok) {
+    return gitErr(describeGitFailure(`git fetch ${remote} ${params.defaultBranch}`, fetchResult));
   }
-  /**
-   * Ждёт первого успешного `agent:hello` не дольше `timeoutMs` (по
-   * умолчанию 5 с — как раньше HTTP-пинг в `network.ts`). Таймаут НЕ
-   * останавливает клиент: переподключение по backoff продолжается в фоне,
-   * это только ограничение по времени для вызывающей стороны (`connect.ts`).
-   */
-  waitForFirstConnection(timeoutMs = 5e3) {
-    return new Promise((resolve4) => {
-      let settled = false;
-      const onConnected = (ack) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        this.off("connected", onConnected);
-        resolve4({ ok: true, ack });
-      };
-      const onAuthRejected = (message) => {
-        if (settled) return;
-        settled = true;
-        clearTimeout(timer);
-        this.off("connected", onConnected);
-        this.off("auth-rejected", onAuthRejected);
-        resolve4({ ok: false, message });
-      };
-      const timer = setTimeout(() => {
-        if (settled) return;
-        settled = true;
-        this.off("connected", onConnected);
-        this.off("auth-rejected", onAuthRejected);
-        resolve4({
-          ok: false,
-          message: `\u041D\u0435\u0442 \u043E\u0442\u0432\u0435\u0442\u0430 agent:hello \u0437\u0430 ${timeoutMs} \u043C\u0441 \u2014 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430. \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u043F\u043E\u043F\u044B\u0442\u043A\u0438 \u0432 \u0444\u043E\u043D\u0435 (backoff \xA711.4 \u0422\u0417).`
-        });
-      }, timeoutMs);
-      if (typeof timer.unref === "function") timer.unref();
-      this.on("connected", onConnected);
-      this.on("auth-rejected", onAuthRejected);
+  let startPoint = `${remote}/${params.defaultBranch}`;
+  if (params.continueFromBranch) {
+    const continued = await runGit(["fetch", remote, params.continueFromBranch], {
+      cwd: params.repoRoot
     });
+    if (continued.ok) startPoint = `${remote}/${params.continueFromBranch}`;
   }
-  // -- Подключение --------------------------------------------------------
-  registerSocketListeners() {
-    this.socket.on("connect", () => this.handleConnect());
-    this.socket.on("connect_error", (err) => this.handleConnectError(err));
-    this.socket.on("disconnect", (reason) => this.handleDisconnect(String(reason)));
-    this.socket.on("lease:lost", (raw) => this.handleLeaseLost(raw));
-    this.socket.on("mode:set", (raw) => this.handleModeSet(raw));
-    this.socket.on("agent:pause", (raw) => this.handleAgentPause(raw));
-    this.socket.on("trust:updated", (raw) => this.handleTrustUpdated(raw));
-    this.socket.on("task:updated", (raw) => this.handleTaskUpdated(raw));
-    this.socket.on("question:answered", (raw) => this.handleQuestionAnswered(raw));
-    this.socket.on("approval:decided", (raw) => this.handleApprovalDecided(raw));
+  mkdirSync6(dirname4(worktreeDir), { recursive: true });
+  const branchExists = await localBranchExists(params.repoRoot, params.branchName);
+  const addArgs = branchExists ? ["worktree", "add", worktreeDir, params.branchName] : ["worktree", "add", "-b", params.branchName, worktreeDir, startPoint];
+  const addResult = await runGit(addArgs, { cwd: params.repoRoot });
+  if (!addResult.ok) {
+    return gitErr(describeGitFailure("git worktree add", addResult));
   }
-  handleConnect() {
-    if (this.stopped) return;
-    this.reconnectAttempt = 0;
-    void this.sendHello();
+  return gitOk({ worktreeDir, reused: false });
+}
+async function removeWorktree(repoRoot, worktreeDir) {
+  const result = await runGit(["worktree", "remove", worktreeDir], { cwd: repoRoot });
+  if (!result.ok) {
+    return gitErr(describeGitFailure("git worktree remove", result));
   }
-  handleConnectError(err) {
-    if (isAuthRejection(err)) {
-      this.stop();
-      this.emit("auth-rejected", describeAuthRejection(this.agentId));
-      return;
-    }
-    this.emit("client-error", toError2(err, "connect_error"));
-    this.scheduleReconnect();
+  return gitOk(void 0);
+}
+
+// src/git/submit.ts
+async function rebaseOntoDefault(params) {
+  const remote = params.remote ?? "origin";
+  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
+  if (!defaultBranchCheck.ok) return defaultBranchCheck;
+  const fetchResult = await runGit(["fetch", remote, params.defaultBranch], {
+    cwd: params.worktreeDir
+  });
+  if (!fetchResult.ok) {
+    return gitErr(describeGitFailure(`git fetch ${remote} ${params.defaultBranch}`, fetchResult));
   }
-  handleDisconnect(reason) {
-    this.emit("disconnected", reason);
-    if (this.stopped) return;
-    this.scheduleReconnect();
+  const rebaseResult = await runGit(["rebase", `${remote}/${params.defaultBranch}`], {
+    cwd: params.worktreeDir
+  });
+  if (rebaseResult.ok) {
+    return gitOk({ outcome: "rebased", conflictedFiles: [] });
   }
-  scheduleReconnect() {
-    if (this.stopped || this.reconnectTimer) return;
-    const delayMs = nextReconnectDelayMs(this.reconnectAttempt, {
-      baseMs: this.opts.backoffBaseMs,
-      maxMs: this.opts.backoffMaxMs
-    });
-    this.reconnectAttempt += 1;
-    this.emit("reconnecting", { attempt: this.reconnectAttempt, delayMs });
-    this.reconnectTimer = setTimeout(() => {
-      this.reconnectTimer = void 0;
-      if (this.stopped) return;
-      this.socket.connect();
-    }, delayMs);
+  const status = await getWorktreeStatus(params.worktreeDir);
+  if (status.ok && status.data.conflictedPaths.length > 0) {
+    const conflictedFiles = status.data.conflictedPaths;
+    const abortResult = await runGit(["rebase", "--abort"], { cwd: params.worktreeDir });
+    if (!abortResult.ok) {
+      return gitErr(
+        `\u041A\u043E\u043D\u0444\u043B\u0438\u043A\u0442 \u043F\u0440\u0438 rebase (${conflictedFiles.join(", ")}), \u0438 "git rebase --abort" \u043D\u0435 \u0441\u0440\u0430\u0431\u043E\u0442\u0430\u043B: ${describeGitFailure("git rebase --abort", abortResult)}. Worktree \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D \u043A\u0430\u043A \u0435\u0441\u0442\u044C \u2014 \u043D\u0443\u0436\u043D\u043E \u0440\u0443\u0447\u043D\u043E\u0435 \u0432\u043C\u0435\u0448\u0430\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u043E.`
+      );
+    }
+    return gitOk({ outcome: "conflict", conflictedFiles });
   }
-  // -- agent:hello ---------------------------------------------------------
-  async sendHello() {
-    const state = readState(this.opts.stateFilePath);
-    const payload = agentHelloPayloadSchema.parse({
-      clientVersion: this.opts.clientVersion,
-      cwd: this.opts.cwd,
-      os: this.opts.os,
-      agentKind: this.opts.agentKind,
-      agentVersion: this.opts.agentVersion,
-      // `claudeVersion` шлётся ТОЛЬКО для Claude Code — и только чтобы
-      // клиент работал против ещё не обновлённого сервера, который знает
-      // одно это поле. Для Codex поле с таким именем было бы неправдой.
-      ...this.opts.agentKind === AgentKind.CLAUDE_CODE ? { claudeVersion: this.opts.agentVersion } : {},
-      roleKeys: [...this.opts.roleKeys],
-      ...state.currentTask?.resumeToken ? { resumeToken: state.currentTask.resumeToken } : {}
-    });
-    let raw;
-    try {
-      raw = await emitWithAckTimeout(this.socket, "agent:hello", payload, this.opts.ackTimeoutMs);
-    } catch (err) {
-      this.emit("client-error", toError2(err, "agent:hello"));
-      return;
-    }
-    if (this.stopped) return;
-    if (isAckError(raw)) {
-      this.emit("client-error", new Error(`agent:hello: ${raw.error.code}: ${raw.error.message}`));
-      return;
-    }
-    const parsed = agentHelloAckSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`agent:hello: \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}`)
-      );
-      return;
-    }
-    const ack = parsed.data;
-    this.lastHelloAck = ack;
-    this.paused = false;
-    this.pauseReasonText = void 0;
-    this.applyHelloAck(ack);
-    this.emit("connected", ack);
-  }
-  applyHelloAck(ack) {
-    const state = readState(this.opts.stateFilePath);
-    const patch = {
-      // OQ-06: сервер — источник правды, локальный режим перекрывается безусловно.
-      mode: ack.mode,
-      trust: toTrustCache(ack.trust, this.opts.now)
-    };
-    if (!ack.currentTask || ack.currentTask.id !== state.currentTask?.taskId) {
-      patch.currentTask = null;
-    }
-    updateState(patch, this.opts.stateFilePath);
+  return gitErr(describeGitFailure("git rebase", rebaseResult));
+}
+async function assertReadyToPush(params) {
+  const branch = await currentBranch(params.worktreeDir);
+  if (!branch.ok) return branch;
+  if (branch.data !== params.branchName) {
+    return gitErr(
+      `\u041E\u0442\u043A\u0430\u0437: worktree \u0441\u043C\u043E\u0442\u0440\u0438\u0442 \u043D\u0430 \u0432\u0435\u0442\u043A\u0443 "${branch.data}", \u0430 \u043E\u0436\u0438\u0434\u0430\u043B\u0430\u0441\u044C "${params.branchName}" \u2014 \u0440\u0430\u0431\u043E\u0447\u0435\u0435 \u0434\u0435\u0440\u0435\u0432\u043E "\u0443\u0448\u043B\u043E \u043D\u0435 \u0442\u0443\u0434\u0430", push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
+    );
   }
-  // -- agent:heartbeat -------------------------------------------------------
-  startHeartbeatTimer() {
-    if (this.heartbeatTimer) return;
-    this.heartbeatTimer = setInterval(() => {
-      void this.sendHeartbeat();
-    }, this.opts.heartbeatIntervalMs);
+  const status = await getWorktreeStatus(params.worktreeDir);
+  if (!status.ok) return status;
+  if (!status.data.clean) {
+    return gitErr(
+      `\u041E\u0442\u043A\u0430\u0437: \u0440\u0430\u0431\u043E\u0447\u0435\u0435 \u0434\u0435\u0440\u0435\u0432\u043E \u0433\u0440\u044F\u0437\u043D\u043E\u0435, \u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u044B\u0435 \u043F\u0443\u0442\u0438: ${status.data.changedPaths.join(", ")}. Push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
+    );
   }
-  stopHeartbeatTimer() {
-    if (!this.heartbeatTimer) return;
-    clearInterval(this.heartbeatTimer);
-    this.heartbeatTimer = void 0;
+  return gitOk(void 0);
+}
+async function pushFastForward(params) {
+  const remote = params.remote ?? "origin";
+  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
+  if (!branchCheck.ok) return branchCheck;
+  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
+  if (!defaultBranchCheck.ok) return defaultBranchCheck;
+  const ready = await assertReadyToPush(params);
+  if (!ready.ok) return ready;
+  const pushResult = await runGit(["push", remote, `HEAD:refs/heads/${params.defaultBranch}`], {
+    cwd: params.worktreeDir
+  });
+  if (!pushResult.ok) {
+    return gitErr(
+      describeGitFailure(`git push ${remote} HEAD:refs/heads/${params.defaultBranch}`, pushResult)
+    );
   }
-  async sendHeartbeat() {
-    if (!this.socket.connected) return;
-    const state = readState(this.opts.stateFilePath);
-    const payload = agentHeartbeatPayloadSchema.parse({
-      ...state.currentTask?.taskId ? { currentTaskId: state.currentTask.taskId } : {},
-      ...state.currentTask?.resumeToken ? { resumeToken: state.currentTask.resumeToken } : {},
-      status: state.currentTask ? AgentStatus.BUSY : AgentStatus.IDLE
+  return gitOk({ pushedTo: `${remote}/${params.defaultBranch}` });
+}
+async function submitDirectTask(params) {
+  const remote = params.remote ?? "origin";
+  let worktreeDir;
+  if (params.worktreeDir) {
+    worktreeDir = params.worktreeDir;
+  } else {
+    const worktree = await ensureWorktree({
+      repoRoot: params.repoRoot,
+      branchName: params.branchName,
+      defaultBranch: params.defaultBranch,
+      remote,
+      worktreesRoot: params.worktreesRoot
     });
-    let raw;
-    try {
-      raw = await emitWithAckTimeout(
-        this.socket,
-        "agent:heartbeat",
-        payload,
-        this.opts.ackTimeoutMs
-      );
-    } catch (err) {
-      this.emit("client-error", toError2(err, "agent:heartbeat"));
-      return;
-    }
-    if (isAckError(raw)) {
-      this.emit(
-        "client-error",
-        new Error(`agent:heartbeat: ${raw.error.code}: ${raw.error.message}`)
-      );
-      return;
-    }
-    const parsed = agentHeartbeatAckSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`agent:heartbeat: \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}`)
-      );
-      return;
-    }
-    this.emit("heartbeat", parsed.data);
-  }
-  // -- Пуш-события сервера (§11.2 ТЗ) --------------------------------------
-  handleLeaseLost(raw) {
-    const parsed = leaseLostPayloadSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`lease:lost: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
-      );
-      return;
-    }
-    const { taskId, reason } = parsed.data;
-    this.leaseLostTasks.set(taskId, reason);
-    const state = readState(this.opts.stateFilePath);
-    if (state.currentTask?.taskId === taskId) {
-      updateState({ currentTask: null }, this.opts.stateFilePath);
-    }
-    this.emit("lease:lost", parsed.data);
+    if (!worktree.ok) return { status: "refused", message: worktree.message };
+    worktreeDir = worktree.data.worktreeDir;
   }
-  handleModeSet(raw) {
-    const parsed = modeSetPayloadSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit("client-error", new Error(`mode:set: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`));
-      return;
-    }
-    updateState({ mode: parsed.data.mode }, this.opts.stateFilePath);
-    this.emit("mode:set", parsed.data);
+  const commit = await commitAll({
+    worktreeDir,
+    commitPrefix: params.commitPrefix,
+    title: params.taskTitle,
+    taskKey: params.taskKey
+  });
+  if (!commit.ok) return { status: "refused", worktreeDir, message: commit.message };
+  const rebase = await rebaseOntoDefault({
+    worktreeDir,
+    defaultBranch: params.defaultBranch,
+    remote
+  });
+  if (!rebase.ok) return { status: "refused", worktreeDir, message: rebase.message };
+  if (rebase.data.outcome === "conflict") {
+    const files = rebase.data.conflictedFiles;
+    return {
+      status: "conflict",
+      worktreeDir,
+      conflictedFiles: files,
+      message: `Rebase \u043D\u0430 ${remote}/${params.defaultBranch} \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u0435\u0442 \u0432 \u0444\u0430\u0439\u043B\u0430\u0445: ${files.join(", ")}. Rebase \u043E\u0442\u043C\u0435\u043D\u0451\u043D ("git rebase --abort"), \u0432\u0435\u0442\u043A\u0430 "${params.branchName}" \u0438 \u0435\u0451 worktree \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u044B \u043A\u0430\u043A \u0435\u0441\u0442\u044C \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A.`
+    };
   }
-  handleAgentPause(raw) {
-    const parsed = agentPausePayloadSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`agent:pause: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
-      );
-      return;
-    }
-    this.paused = true;
-    this.pauseReasonText = parsed.data.reason;
-    this.emit("pause", parsed.data);
+  if (params.requireTestsPassed && !params.testsPassed) {
+    return {
+      status: "refused",
+      worktreeDir,
+      message: "\u0414\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 requireTests=true, \u0430 testsPassed \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D (\u0438\u043B\u0438 false) \u2014 push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F."
+    };
   }
-  handleTrustUpdated(raw) {
-    const parsed = trustUpdatedPayloadSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`trust:updated: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
-      );
-      return;
+  const push = await pushFastForward({
+    worktreeDir,
+    branchName: params.branchName,
+    defaultBranch: params.defaultBranch,
+    remote
+  });
+  if (!push.ok) return { status: "refused", worktreeDir, message: push.message };
+  const sha = await getHeadSha(worktreeDir);
+  let worktreeRemoved = false;
+  if (params.removeWorktreeOnSuccess !== false) {
+    const removed = await removeWorktree(params.repoRoot, worktreeDir);
+    if (removed.ok) {
+      await runGit(["branch", "-D", params.branchName], { cwd: params.repoRoot });
+      worktreeRemoved = true;
     }
-    updateState({ trust: toTrustCache(parsed.data, this.opts.now) }, this.opts.stateFilePath);
-    this.emit("trust:updated", parsed.data);
-  }
-  handleTaskUpdated(raw) {
-    const parsed = taskUpdatedAgentPayloadSchema.safeParse(raw);
-    if (parsed.success) this.emit("task:updated", parsed.data);
   }
-  handleQuestionAnswered(raw) {
-    const parsed = questionAnsweredPayloadSchema.safeParse(raw);
-    if (parsed.success) this.emit("question:answered", parsed.data);
+  return {
+    status: "pushed",
+    worktreeDir,
+    commitSha: sha.ok ? sha.data : null,
+    pushedTo: push.data.pushedTo,
+    worktreeRemoved
+  };
+}
+
+// src/git/submit-pr.ts
+async function pushTaskBranch(params) {
+  const remote = params.remote ?? "origin";
+  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
+  if (!branchCheck.ok) return branchCheck;
+  const ready = await assertReadyToPush(params);
+  if (!ready.ok) return ready;
+  const pushResult = await runGit(
+    ["push", "--set-upstream", remote, `HEAD:refs/heads/${params.branchName}`],
+    { cwd: params.worktreeDir }
+  );
+  if (!pushResult.ok) {
+    return gitErr(
+      describeGitFailure(`git push ${remote} HEAD:refs/heads/${params.branchName}`, pushResult)
+    );
   }
-  /**
-   * §14.4 ТЗ, п.4-5 — асинхронный путь (в дополнение к синхронному в
-   * `mcp/request-approval.ts::settleApproval`, который срабатывает, когда
-   * решение приходит в рамках ОДНОГО вызова `request_approval`/
-   * `wait_approval`). Этот пуш ловит случай, когда решение пришло уже
-   * ПОСЛЕ того, как собственный long-poll тула истёк (вернул `PENDING`),
-   * а модель ещё не успела/не стала звать `wait_approval` снова — на
-   * постоянном соединении (`quiel mcp`, единственный держатель ЭТОГО
-   * класса) `approval:decided` долетит и без явного повторного вызова.
-   *
-   * `approvalDecidedPayloadSchema` несёт только `approvalId`+`status`+
-   * `oneTimeToken?` — НЕ `command`/`cwd` (провод их не отдаёт, см.
-   * `state/schema.ts::PendingApprovalSchema`), поэтому command+cwd берутся
-   * из `state.pendingApprovals[approvalId]`, куда их кладёт
-   * `request_approval` сразу после создания запроса. Если записи там нет
-   * (approval создан не этим клиентом/до перезапуска процесса, либо уже
-   * обработан) — писать пока нечего, `pendingApprovals` и так пуст.
-   */
-  handleApprovalDecided(raw) {
-    const parsed = approvalDecidedPayloadSchema.safeParse(raw);
-    if (!parsed.success) {
-      this.emit(
-        "client-error",
-        new Error(`approval:decided: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
-      );
-      return;
-    }
-    this.applyApprovalDecided(parsed.data);
-    this.emit("approval:decided", parsed.data);
+  return gitOk({ pushedTo: `${remote}/${params.branchName}` });
+}
+async function submitPullRequestTask(params) {
+  const remote = params.remote ?? "origin";
+  let worktreeDir;
+  if (params.worktreeDir) {
+    worktreeDir = params.worktreeDir;
+  } else {
+    const worktree = await ensureWorktree({
+      repoRoot: params.repoRoot,
+      branchName: params.branchName,
+      defaultBranch: params.defaultBranch,
+      remote,
+      worktreesRoot: params.worktreesRoot
+    });
+    if (!worktree.ok) return { status: "refused", message: worktree.message };
+    worktreeDir = worktree.data.worktreeDir;
   }
-  applyApprovalDecided(payload) {
-    const state = readState(this.opts.stateFilePath);
-    const pending = state.pendingApprovals[payload.approvalId];
-    if (!pending) return;
-    if (payload.status === ApprovalStatus.APPROVED && payload.oneTimeToken) {
-      const approvalTtlMin = state.trust?.rules.approvalTtlMin ?? 60;
-      const expiresAt = new Date(this.opts.now().getTime() + approvalTtlMin * 6e4).toISOString();
-      updateState(
-        {
-          ...storeApprovedCommand(
-            state,
-            { command: pending.command, cwd: pending.cwd, token: payload.oneTimeToken, expiresAt },
-            this.opts.now
-          ),
-          ...clearPendingApproval(state, payload.approvalId)
-        },
-        this.opts.stateFilePath
-      );
-      return;
+  const commit = await commitAll({
+    worktreeDir,
+    commitPrefix: params.commitPrefix,
+    title: params.taskTitle,
+    taskKey: params.taskKey
+  });
+  if (!commit.ok) return { status: "refused", worktreeDir, message: commit.message };
+  const rebase = await rebaseOntoDefault({
+    worktreeDir,
+    defaultBranch: params.defaultBranch,
+    remote
+  });
+  if (!rebase.ok) return { status: "refused", worktreeDir, message: rebase.message };
+  const conflicted = rebase.data.outcome === "conflict";
+  const push = await pushTaskBranch({ worktreeDir, branchName: params.branchName, remote });
+  if (!push.ok) return { status: "refused", worktreeDir, message: push.message };
+  const sha = await getHeadSha(worktreeDir);
+  let worktreeRemoved = false;
+  if (params.removeWorktreeOnSuccess !== false) {
+    const removed = await removeWorktree(params.repoRoot, worktreeDir);
+    if (removed.ok) {
+      await runGit(["branch", "-D", params.branchName], { cwd: params.repoRoot });
+      worktreeRemoved = true;
     }
-    updateState(clearPendingApproval(state, payload.approvalId), this.opts.stateFilePath);
   }
-};
-function trimTrailingSlash2(url) {
-  return url.endsWith("/") ? url.slice(0, -1) : url;
+  return {
+    status: "pushed",
+    worktreeDir,
+    branchName: params.branchName,
+    commitSha: sha.ok ? sha.data : null,
+    pushedTo: push.data.pushedTo,
+    conflicted,
+    conflictedFiles: rebase.data.conflictedFiles,
+    worktreeRemoved
+  };
 }
 
-// src/socket/send-agent-mode.ts
-var DEFAULT_TIMEOUT_MS = 8e3;
-function trimTrailingSlash3(url) {
-  return url.endsWith("/") ? url.slice(0, -1) : url;
-}
-async function sendAgentMode(options) {
-  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
-  const factory = options.createSocket ?? createSocket;
-  const socket = factory(`${trimTrailingSlash3(options.url)}/agent`, {
-    auth: { token: options.token },
-    autoConnect: false,
-    reconnection: false
+// src/git/rescue.ts
+var RescueReason = {
+  /** Модель упёрлась в лимит подписки (`StopFailure`, matcher `rate_limit`). */
+  RATE_LIMIT: "rate_limit",
+  /** Сервер забрал задачу: аренда истекла или её отдали другому. */
+  LEASE_LOST: "lease_lost"
+};
+var REASON_TEXT = {
+  [RescueReason.RATE_LIMIT]: "\u043F\u0440\u0435\u0440\u0432\u0430\u043D\u043E: \u0438\u0441\u0447\u0435\u0440\u043F\u0430\u043D \u043B\u0438\u043C\u0438\u0442 \u043F\u043E\u0434\u043F\u0438\u0441\u043A\u0438",
+  [RescueReason.LEASE_LOST]: "\u043F\u0440\u0435\u0440\u0432\u0430\u043D\u043E: \u0437\u0430\u0434\u0430\u0447\u0430 \u043E\u0442\u043E\u0437\u0432\u0430\u043D\u0430 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u043E\u0439"
+};
+async function rescueUnfinishedWork(params) {
+  const status = await getWorktreeStatus(params.worktreeDir);
+  if (!status.ok) return status;
+  if (status.data.clean) {
+    return gitOk({ committed: false, sha: null, pushedTo: null });
+  }
+  const what = params.title?.trim();
+  const commit = await commitAll({
+    worktreeDir: params.worktreeDir,
+    commitPrefix: params.commitPrefix,
+    title: what ? `${what} (${REASON_TEXT[params.reason]})` : REASON_TEXT[params.reason],
+    taskKey: params.taskKey
   });
-  try {
-    await connectOnce(socket, timeoutMs);
-    const payload = agentModePayloadSchema.parse({ mode: options.mode });
-    const raw = await emitWithAckTimeout(socket, "agent:mode", payload, timeoutMs);
-    if (isAckError(raw)) {
-      return { ok: false, message: `${raw.error.code}: ${raw.error.message}` };
-    }
-    const parsed = agentModeAckSchema.safeParse(raw);
-    if (!parsed.success) {
-      return { ok: false, message: `\u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}` };
-    }
-    if (!parsed.data.ok) {
-      return { ok: false, message: "\u0441\u0435\u0440\u0432\u0435\u0440 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u043B agent:mode (ok:false)" };
-    }
-    return { ok: true, mode: parsed.data.mode ?? options.mode };
-  } catch (err) {
-    return { ok: false, message: err instanceof Error ? err.message : String(err) };
-  } finally {
-    socket.disconnect();
+  if (!commit.ok) return commit;
+  if (!commit.data.committed) {
+    return gitOk({ committed: false, sha: null, pushedTo: null });
+  }
+  const push = await pushTaskBranch({
+    worktreeDir: params.worktreeDir,
+    branchName: params.branchName
+  });
+  if (!push.ok) {
+    return gitErr(
+      `\u0420\u0430\u0431\u043E\u0442\u0430 \u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u0430 \u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E (${commit.data.sha ?? "\u0431\u0435\u0437 sha"}), \u043D\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u0438\u0442\u044C \u0432\u0435\u0442\u043A\u0443 \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C: ${push.message}`
+    );
   }
+  return gitOk({
+    committed: true,
+    sha: commit.data.sha,
+    pushedTo: push.data.pushedTo
+  });
 }
 
-// src/mcp/helpers.ts
-function textResult(text) {
-  return { content: [{ type: "text", text }] };
-}
-function errorResult(text) {
-  return { content: [{ type: "text", text }], isError: true };
-}
-function leaseLostResult(taskLabel2, reason) {
-  return errorResult(
-    `\u0410\u0440\u0435\u043D\u0434\u0430 \u0437\u0430\u0434\u0430\u0447\u0438 ${taskLabel2} \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u0430: ${reason}. \u041F\u0440\u0435\u043A\u0440\u0430\u0442\u0438 \u0440\u0430\u0431\u043E\u0442\u0443 \u043D\u0430\u0434 \u043D\u0435\u0439 \u043D\u0435\u043C\u0435\u0434\u043B\u0435\u043D\u043D\u043E \u2014 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0441\u0434\u0430\u0432\u0430\u0442\u044C \u043D\u0435\u043A\u0443\u0434\u0430, \u0432\u044B\u0437\u043E\u0432\u0438 next_task \u0437\u0430 \u043D\u043E\u0432\u043E\u0439 \u0437\u0430\u0434\u0430\u0447\u0435\u0439.`
+// src/hooks/stop-failure.ts
+import { z as z37 } from "zod";
+
+// src/hooks/reset-time.ts
+var DAYS = ["sun", "mon", "tue", "wed", "thu", "fri", "sat"];
+function parseClock(hour, minute, meridiem) {
+  const lower = meridiem.toLowerCase();
+  let h = hour % 12;
+  if (lower === "pm") h += 12;
+  return { h, m: minute };
+}
+function parseResetAt(message, now) {
+  if (!message) return void 0;
+  const withDay = message.match(
+    /resets\s+(sun|mon|tue|wed|thu|fri|sat)[a-z]*\s+(\d{1,2}):(\d{2})\s*(am|pm)/i
   );
+  if (withDay) {
+    const [, dayRaw = "", hourRaw = "", minuteRaw = "", meridiem = ""] = withDay;
+    const targetDay = DAYS.indexOf(dayRaw.slice(0, 3).toLowerCase());
+    if (targetDay === -1) return void 0;
+    const { h, m } = parseClock(Number(hourRaw), Number(minuteRaw), meridiem);
+    const result = new Date(now);
+    result.setHours(h, m, 0, 0);
+    let shift = (targetDay - result.getDay() + 7) % 7;
+    if (shift === 0 && result.getTime() <= now.getTime()) shift = 7;
+    result.setDate(result.getDate() + shift);
+    return result;
+  }
+  const withTime = message.match(/resets\s+(\d{1,2}):(\d{2})\s*(am|pm)/i);
+  if (withTime) {
+    const [, hourRaw = "", minuteRaw = "", meridiem = ""] = withTime;
+    const { h, m } = parseClock(Number(hourRaw), Number(minuteRaw), meridiem);
+    const result = new Date(now);
+    result.setHours(h, m, 0, 0);
+    if (result.getTime() <= now.getTime()) result.setDate(result.getDate() + 1);
+    return result;
+  }
+  return void 0;
 }
-function describeZodIssues(error) {
-  return error.issues.map(
-    (issue) => issue.path.length > 0 ? `${issue.path.join(".")}: ${issue.message}` : issue.message
-  ).join("; ");
+
+// src/hooks/stop-failure.ts
+var StopFailureErrorTypeSchema = z37.enum([
+  "rate_limit",
+  "overloaded",
+  "authentication_failed",
+  "oauth_org_not_allowed",
+  "account_on_hold",
+  "billing_error",
+  "invalid_request",
+  "model_not_found",
+  "server_error",
+  "max_output_tokens",
+  // Добавлен 21 сентября 2026 по живой документации: его в нашем
+  // перечислении не было, и `StopFailureInputSchema` отклонила бы вход с
+  // ним целиком — хук отработал бы вхолостую, а сервер не узнал бы, что
+  // у агента что-то случилось.
+  "cloud_credential_error",
+  "unknown"
+]);
+var StopFailureInputSchema = z37.object({
+  hook_event_name: z37.literal("StopFailure"),
+  session_id: z37.string(),
+  cwd: z37.string(),
+  error: StopFailureErrorTypeSchema,
+  error_details: z37.unknown().optional(),
+  last_assistant_message: z37.string().optional()
+}).passthrough();
+function extractRetryAfterSec(errorDetails) {
+  if (typeof errorDetails === "number" && Number.isFinite(errorDetails) && errorDetails >= 0) {
+    return errorDetails;
+  }
+  if (errorDetails && typeof errorDetails === "object") {
+    const record = errorDetails;
+    for (const key of ["retryAfterSec", "retryAfter", "retry_after", "retry_after_seconds"]) {
+      const value = record[key];
+      if (typeof value === "number" && Number.isFinite(value) && value >= 0) return value;
+    }
+  }
+  if (typeof errorDetails === "string") {
+    const match = errorDetails.match(/retry[-_ ]?after[^0-9]{0,10}(\d+)/i);
+    if (match?.[1] !== void 0) return Number(match[1]);
+  }
+  return void 0;
 }
-function parseArgsOrError(schema, raw) {
-  const parsed = schema.safeParse(raw);
-  if (!parsed.success) {
-    return { ok: false, message: `\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B: ${describeZodIssues(parsed.error)}` };
+var RESCUE_WORK_ACTION = "rescue-work";
+function stopFailureHook(input, state) {
+  const retryAfterSec = extractRetryAfterSec(input.error_details);
+  const resetAt = parseResetAt(input.last_assistant_message, /* @__PURE__ */ new Date());
+  const actions = [
+    {
+      type: "agent:rate_limited",
+      payload: {
+        error: input.error,
+        ...retryAfterSec === void 0 ? {} : { retryAfterSec },
+        ...resetAt ? { resetsAt: resetAt.toISOString() } : {}
+      }
+    }
+  ];
+  const task = state.currentTask;
+  if (task?.worktreeDir && task.branchName && task.commitPrefix) {
+    actions.push({
+      type: RESCUE_WORK_ACTION,
+      payload: {
+        reason: "rate_limit",
+        taskId: task.taskId,
+        worktreeDir: task.worktreeDir,
+        branchName: task.branchName,
+        commitPrefix: task.commitPrefix,
+        taskKey: task.taskKey ?? task.taskId
+      }
+    });
   }
-  return { ok: true, data: parsed.data };
+  return { output: {}, serverActions: actions };
 }
-async function callServerOrError(client, event, payload, schema, timeoutMs) {
-  let raw;
-  try {
-    raw = await client.callServer(event, payload, timeoutMs);
-  } catch (err) {
-    return {
-      ok: false,
-      message: `\u041D\u0435\u0442 \u043E\u0442\u0432\u0435\u0442\u0430 \u043E\u0442 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u044B \u043D\u0430 ${event} (${err instanceof Error ? err.message : String(err)}). \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u043F\u0435\u0440\u0435\u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u0442\u0441\u044F \u0432 \u0444\u043E\u043D\u0435 \u2014 \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439 \u0435\u0449\u0451 \u0440\u0430\u0437 \u0447\u0443\u0442\u044C \u043F\u043E\u0437\u0436\u0435.`
-    };
+
+// src/hooks/rescue-runner.ts
+var NOTHING = {
+  attempted: false,
+  committed: false,
+  pushedTo: null,
+  problem: null,
+  report: null
+};
+function readParams(action) {
+  const p = action.payload ?? {};
+  const str = (key) => {
+    const value = p[key];
+    return typeof value === "string" && value.length > 0 ? value : null;
+  };
+  const worktreeDir = str("worktreeDir");
+  const branchName = str("branchName");
+  const commitPrefix = str("commitPrefix");
+  const taskKey = str("taskKey");
+  const taskId = str("taskId");
+  if (!worktreeDir || !branchName || !commitPrefix || !taskKey || !taskId) return null;
+  const reason = p.reason === RescueReason.LEASE_LOST ? RescueReason.LEASE_LOST : RescueReason.RATE_LIMIT;
+  return { worktreeDir, branchName, commitPrefix, taskKey, taskId, reason };
+}
+async function runRescueAction(actions) {
+  const action = actions.find((candidate) => candidate.type === RESCUE_WORK_ACTION);
+  if (!action) return NOTHING;
+  const params = readParams(action);
+  if (!params) {
+    return { ...NOTHING, attempted: true, problem: "\u043D\u0435 \u0445\u0432\u0430\u0442\u0430\u0435\u0442 \u0434\u0430\u043D\u043D\u044B\u0445 \u043E \u0437\u0430\u0434\u0430\u0447\u0435" };
   }
-  if (isAckError(raw)) {
+  try {
+    const result = await rescueUnfinishedWork(params);
+    if (!result.ok) {
+      return { ...NOTHING, attempted: true, problem: result.message };
+    }
+    const report = result.data.committed ? {
+      type: "task:work_saved",
+      payload: {
+        taskId: params.taskId,
+        branchName: params.branchName,
+        ...result.data.sha ? { sha: result.data.sha } : {}
+      }
+    } : null;
     return {
-      ok: false,
-      message: `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043E\u0442\u043A\u0430\u0437\u0430\u043B\u0430 \u043D\u0430 ${event}: ${raw.error.code}: ${raw.error.message}`
+      attempted: true,
+      committed: result.data.committed,
+      pushedTo: result.data.pushedTo,
+      problem: null,
+      report
     };
-  }
-  const parsed = schema.safeParse(raw);
-  if (!parsed.success) {
+  } catch (error) {
     return {
-      ok: false,
-      message: `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043F\u0440\u0438\u0441\u043B\u0430\u043B\u0430 \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u043E\u0442\u0432\u0435\u0442 \u043D\u0430 ${event}: ${parsed.error.message}`
+      ...NOTHING,
+      attempted: true,
+      problem: error instanceof Error ? error.message : String(error)
     };
   }
-  return { ok: true, data: parsed.data };
+}
+function describeRescue(result) {
+  if (!result.attempted) return null;
+  if (result.problem) return `Quiel: \u043D\u0435 \u0443\u0434\u0430\u043B\u043E\u0441\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C \u043D\u0435\u0437\u0430\u043A\u043E\u043D\u0447\u0435\u043D\u043D\u0443\u044E \u0440\u0430\u0431\u043E\u0442\u0443 \u2014 ${result.problem}`;
+  if (!result.committed) return null;
+  return `Quiel: \u043D\u0435\u0437\u0430\u043A\u043E\u043D\u0447\u0435\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0430${result.pushedTo ? ` \u0438 \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0430 \u0432 ${result.pushedTo}` : ""}`;
 }
 
-// src/mcp/ask.ts
-var askHumanInputShape = {
-  textMd: questionAskPayloadSchema.shape.textMd.describe(
-    "\u0422\u0435\u043A\u0441\u0442 \u0432\u043E\u043F\u0440\u043E\u0441\u0430 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443, Markdown. \u041F\u0438\u0448\u0438 \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E \u2014 \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043E\u0442\u0432\u0435\u0447\u0430\u0435\u0442 \u0431\u0435\u0437 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u0440\u0430\u0437\u0433\u043E\u0432\u043E\u0440\u0430 \u0441 \u043C\u043E\u0434\u0435\u043B\u044C\u044E."
-  ),
-  targetRole: questionAskPayloadSchema.shape.targetRole.describe(
-    '\u0420\u043E\u043B\u044C \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u0430 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, "owner") \u2014 \u0432\u043E\u043F\u0440\u043E\u0441 \u0443\u0432\u0438\u0434\u044F\u0442 \u0432\u0441\u0435 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0441 \u044D\u0442\u043E\u0439 \u0440\u043E\u043B\u044C\u044E, \u043E\u0442\u0432\u0435\u0442\u0438\u0442 \u043F\u0435\u0440\u0432\u044B\u0439. \u041D\u0443\u0436\u0435\u043D \u0420\u041E\u0412\u041D\u041E \u041E\u0414\u0418\u041D \u0430\u0434\u0440\u0435\u0441\u0430\u0442: targetRole \u0418\u041B\u0418 targetMemberId, \u043D\u0435 \u043E\u0431\u0430 \u0441\u0440\u0430\u0437\u0443 \u0438 \u043D\u0435 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E.'
-  ),
-  targetMemberId: questionAskPayloadSchema.shape.targetMemberId.describe(
-    "ID \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E\u0433\u043E \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u2014 \u0430\u0434\u0440\u0435\u0441\u0430\u0442 \u0432\u043E\u043F\u0440\u043E\u0441\u0430. \u041D\u0443\u0436\u0435\u043D \u0420\u041E\u0412\u041D\u041E \u041E\u0414\u0418\u041D \u0430\u0434\u0440\u0435\u0441\u0430\u0442: targetRole \u0418\u041B\u0418 targetMemberId, \u043D\u0435 \u043E\u0431\u0430 \u0441\u0440\u0430\u0437\u0443 \u0438 \u043D\u0435 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E."
-  ),
-  wantsFiles: questionAskPayloadSchema.shape.wantsFiles.describe(
-    "\u041F\u043E\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0438\u0442\u044C \u0444\u0430\u0439\u043B \u043A \u043E\u0442\u0432\u0435\u0442\u0443 (\u0441\u043A\u0440\u0438\u043D\u0448\u043E\u0442, \u043B\u043E\u0433, \u0432\u044B\u0433\u0440\u0443\u0437\u043A\u0443). \u0424\u043E\u0440\u043C\u0430 \u043E\u0442\u0432\u0435\u0442\u0430 \u043E\u0442\u043A\u0440\u043E\u0435\u0442\u0441\u044F \u0441\u0440\u0430\u0437\u0443 \u0441 \u0432\u044B\u0431\u043E\u0440\u043E\u043C \u0444\u0430\u0439\u043B\u0430. \u042D\u0442\u043E \u041F\u0420\u041E\u0421\u042C\u0411\u0410, \u0430 \u043D\u0435 \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u0435: \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u0432\u043F\u0440\u0430\u0432\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u0442\u044C \u0431\u0435\u0437 \u0444\u0430\u0439\u043B\u043E\u0432, \u0438 \u0442\u043E\u0433\u0434\u0430 `attachments` \u0432 \u043E\u0442\u0432\u0435\u0442\u0435 \u0431\u0443\u0434\u0435\u0442 \u043F\u0443\u0441\u0442\u044B\u043C."
-  ),
-  options: questionAskPayloadSchema.shape.options.describe(
-    "\u0412\u0430\u0440\u0438\u0430\u043D\u0442\u044B \u043E\u0442\u0432\u0435\u0442\u0430 (\u043F\u043E\u043A\u0430\u0436\u0443\u0442\u0441\u044F \u043A\u043D\u043E\u043F\u043A\u0430\u043C\u0438 \u0432 UI/Telegram). \u041D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0439 \u2014 \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043E\u0442\u0432\u0435\u0442\u0438\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u043C \u0442\u0435\u043A\u0441\u0442\u043E\u043C."
-  ),
-  blocking: questionAskPayloadSchema.shape.blocking.describe(
-    'true \u2014 \u0442\u0432\u043E\u044F \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u0443\u0445\u043E\u0434\u0438\u0442 \u0432 \u0441\u0442\u0430\u0442\u0443\u0441 WAITING_HUMAN, \u0438 \u044D\u0442\u043E\u0442 \u0432\u044B\u0437\u043E\u0432 \u0441\u0430\u043C \u0436\u0434\u0451\u0442 \u043E\u0442\u0432\u0435\u0442 \u0434\u043E 600 \u0441; \u0435\u0441\u043B\u0438 \u0437\u0430 \u044D\u0442\u043E \u0432\u0440\u0435\u043C\u044F \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435\u0442, \u0432\u044B\u0437\u043E\u0432 \u0432\u0435\u0440\u043D\u0451\u0442\u0441\u044F \u0441 \u043F\u043E\u043C\u0435\u0442\u043A\u043E\u0439 "pending" \u2014 \u0442\u043E\u0433\u0434\u0430 \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId \u0438\u0437 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0430, \u043D\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u0437\u0430\u0434\u0430\u0447\u0443 \u0431\u0435\u0437 \u043E\u0442\u0432\u0435\u0442\u0430. false \u2014 \u0432\u043E\u043F\u0440\u043E\u0441 \u043F\u0440\u043E\u0441\u0442\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442\u0441\u044F, \u0431\u0435\u0437 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F \u0438 \u0431\u0435\u0437 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0438 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 (\u0434\u043B\u044F \u043D\u0435 \u0441\u0440\u043E\u0447\u043D\u044B\u0445 \u0443\u0442\u043E\u0447\u043D\u0435\u043D\u0438\u0439).'
-  )
-};
-var BLOCKING_WAIT_SEC = 600;
-var ASK_ACK_BUFFER_MS = 15e3;
-async function askHumanHandler(args, runtime) {
-  const state = readState(runtime.stateFilePath);
-  const taskId = state.currentTask?.taskId;
-  const waitSec = args.blocking ? BLOCKING_WAIT_SEC : 0;
-  const parsedArgs = parseArgsOrError(questionAskPayloadSchema, {
-    ...taskId ? { taskId } : {},
-    textMd: args.textMd,
-    ...args.targetRole ? { targetRole: args.targetRole } : {},
-    ...args.targetMemberId ? { targetMemberId: args.targetMemberId } : {},
-    ...args.options && args.options.length > 0 ? { options: args.options } : {},
-    ...args.wantsFiles ? { wantsFiles: true } : {},
-    blocking: args.blocking,
-    waitSec
-  });
-  if (!parsedArgs.ok) return errorResult(parsedArgs.message);
-  if (taskId) {
-    const lease = runtime.client.isLeaseLost(taskId);
-    if (lease.lost) return leaseLostResult(state.currentTask?.taskKey ?? taskId, lease.reason);
-  }
-  const result = await callServerOrError(
-    runtime.client,
-    "question:ask",
-    parsedArgs.data,
-    questionAskAckSchema,
-    waitSec * 1e3 + ASK_ACK_BUFFER_MS
-  );
-  if (!result.ok) return errorResult(result.message);
-  const settled = describeSettledQuestion(result.data.question);
-  if (settled) return textResult(settled);
-  if (args.blocking) {
-    return textResult(
-      `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u0437\u0430\u0434\u0430\u043D, \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u0430 \u0432 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 (WAITING_HUMAN). \u041E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435 \u0431\u044B\u043B\u043E ${BLOCKING_WAIT_SEC} \u0441 (pending) \u2014 \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId="${result.data.question.id}", \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0436\u0434\u0430\u0442\u044C. \u041D\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u0440\u0430\u0431\u043E\u0442\u0443 \u043F\u043E \u0437\u0430\u0434\u0430\u0447\u0435, \u043F\u043E\u043A\u0430 \u043D\u0435 \u043F\u043E\u043B\u0443\u0447\u0438\u0448\u044C \u043E\u0442\u0432\u0435\u0442.`
-    );
-  }
-  return textResult(
-    `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D (\u043D\u0435 \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u0437\u0430\u0434\u0430\u0447\u0443). \u041E\u0442\u0432\u0435\u0442\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442 \u2014 \u0435\u0441\u043B\u0438 \u043E\u043D \u043D\u0443\u0436\u0435\u043D, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C, \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId="${result.data.question.id}".`
-  );
+// src/socket/auth-reject.ts
+var AUTH_REJECT_REASONS = /* @__PURE__ */ new Set(["missing", "invalid"]);
+function isAuthRejection(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  return AUTH_REJECT_REASONS.has(message.trim());
 }
-var waitAnswerInputShape = {
-  questionId: questionWaitPayloadSchema.shape.questionId.describe(
-    "ID \u0432\u043E\u043F\u0440\u043E\u0441\u0430 \u2014 \u0438\u0437 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0430 ask_human (question.id) \u0438\u043B\u0438 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0433\u043E \u0432\u044B\u0437\u043E\u0432\u0430 wait_answer."
-  ),
-  waitSec: questionWaitPayloadSchema.shape.waitSec.optional().describe("\u0421\u043A\u043E\u043B\u044C\u043A\u043E \u0441\u0435\u043A\u0443\u043D\u0434 \u0436\u0434\u0430\u0442\u044C \u043E\u0442\u0432\u0435\u0442 \u0432 \u044D\u0442\u043E\u043C \u0432\u044B\u0437\u043E\u0432\u0435, 0..600. \u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E 300.")
-};
-var DEFAULT_WAIT_ANSWER_SEC = 300;
-var WAIT_ANSWER_ACK_BUFFER_MS = 15e3;
-async function waitAnswerHandler(args, runtime) {
-  const waitSec = args.waitSec ?? DEFAULT_WAIT_ANSWER_SEC;
-  const parsedArgs = parseArgsOrError(questionWaitPayloadSchema, {
-    questionId: args.questionId,
-    waitSec
-  });
-  if (!parsedArgs.ok) return errorResult(parsedArgs.message);
-  const result = await callServerOrError(
-    runtime.client,
-    "question:wait",
-    parsedArgs.data,
-    questionWaitAckSchema,
-    waitSec * 1e3 + WAIT_ANSWER_ACK_BUFFER_MS
-  );
-  if (!result.ok) return errorResult(result.message);
-  const settled = describeSettledQuestion(result.data.question);
-  if (settled) return textResult(settled);
-  return textResult(
-    `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u0432\u0441\u0451 \u0435\u0449\u0451 \u0431\u0435\u0437 \u043E\u0442\u0432\u0435\u0442\u0430 (\u0436\u0434\u0430\u043B ${waitSec} \u0441). \u0412\u044B\u0437\u043E\u0432\u0438 wait_answer \u0435\u0449\u0451 \u0440\u0430\u0437 \u0441 \u0442\u0435\u043C \u0436\u0435 questionId, \u043A\u043E\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u043C\u0435\u0441\u0442\u043D\u043E.`
-  );
+function describeAuthRejection(agentId) {
+  return `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u043B\u0430 \u0442\u043E\u043A\u0435\u043D \u0430\u0433\u0435\u043D\u0442\u0430 ${agentId}: \u043E\u043D \u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u0435\u043D, \u043E\u0442\u043E\u0437\u0432\u0430\u043D \u0438\u043B\u0438 \u0438\u0441\u043F\u043E\u0440\u0447\u0435\u043D. \u041F\u0435\u0440\u0435\u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043D\u0435 \u043F\u043E\u043C\u043E\u0436\u0435\u0442 \u2014 \u0432\u044B\u043F\u0443\u0441\u0442\u0438 \u043D\u043E\u0432\u044B\u0439 \u0442\u043E\u043A\u0435\u043D \u043D\u0430 \u0441\u0442\u0440\u0430\u043D\u0438\u0446\u0435 \u0430\u0433\u0435\u043D\u0442\u0430 \u0438 \u0437\u0430\u043F\u0443\u0441\u0442\u0438 "quiel init" \u0437\u0430\u043D\u043E\u0432\u043E.`;
 }
-function describeAnswerAttachments(question) {
-  if (question.attachments.length === 0) return "";
-  const lines = question.attachments.map(
-    (file) => file.downloadUrl ? `- ${file.fileName} (${file.mimeType}) \u2014 \u0441\u043A\u0430\u0447\u0430\u0439: ${file.downloadUrl}` : `- ${file.fileName} (${file.mimeType}) \u2014 \u0441\u0441\u044B\u043B\u043A\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430, \u0445\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435 \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0435\u0442`
-  );
-  return `
 
-\u041A \u043E\u0442\u0432\u0435\u0442\u0443 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u044B \u0444\u0430\u0439\u043B\u044B (${question.attachments.length}). \u042D\u0442\u043E \u0447\u0430\u0441\u0442\u044C \u043E\u0442\u0432\u0435\u0442\u0430: \u0441\u043A\u0430\u0447\u0430\u0439 \u0438 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0439 \u041A\u0410\u0416\u0414\u042B\u0419, \u0441\u0441\u044B\u043B\u043A\u0438 \u0436\u0438\u0432\u0443\u0442 ${question.attachments[0]?.expiresInSeconds ?? 300} \u0441 \u2014 \u043D\u0435 \u043E\u0442\u043A\u043B\u0430\u0434\u044B\u0432\u0430\u0439.
-` + lines.join("\n");
-}
-function describeSettledQuestion(question) {
-  if (question.status === QuestionStatus.ANSWERED) {
-    return `\u0412\u043E\u043F\u0440\u043E\u0441 ${question.id} \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u043E\u0442\u0432\u0435\u0442:
-${question.answerMd ?? ""}${describeAnswerAttachments(question)}`;
-  }
-  if (question.status === QuestionStatus.DISMISSED) {
-    return `\u0412\u043E\u043F\u0440\u043E\u0441 ${question.id} \u043E\u0442\u043A\u043B\u043E\u043D\u0451\u043D (DISMISSED) \u2014 \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442. \u0420\u0435\u0448\u0438, \u043A\u0430\u043A \u0434\u0435\u0439\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C \u0434\u0430\u043B\u044C\u0448\u0435, \u0441\u0430\u043C, \u0438\u043B\u0438 \u0437\u0430\u0434\u0430\u0439 \u0432\u043E\u043F\u0440\u043E\u0441 \u0437\u0430\u043D\u043E\u0432\u043E.`;
-  }
-  return void 0;
+// src/socket/backoff.ts
+function nextReconnectDelayMs(attempt, options = {}) {
+  const baseMs = options.baseMs ?? 1e3;
+  const maxMs = options.maxMs ?? 3e4;
+  const safeAttempt = Math.max(0, Math.trunc(attempt));
+  const exponent = Math.min(safeAttempt, 30);
+  const raw = baseMs * 2 ** exponent;
+  return Math.min(raw, maxMs);
 }
 
-// package.json
-var package_default = {
-  name: "@quiel/cli",
-  version: "0.5.2",
-  description: "CLI \u0438 MCP-\u0441\u0435\u0440\u0432\u0435\u0440 Quiel: \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u0442 \u0430\u0433\u0435\u043D\u0442\u0430 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430 (Claude Code, Codex, Cursor, OpenCode) \u043A \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0435",
-  homepage: "https://quiel.app",
-  repository: {
-    type: "git",
-    url: "git+https://github.com/Quiel-App/quiel-cli.git"
-  },
-  bugs: {
-    url: "https://github.com/Quiel-App/quiel-cli/issues"
-  },
-  keywords: [
-    "quiel",
-    "claude-code",
-    "codex",
-    "cursor",
-    "opencode",
-    "mcp",
-    "mcp-server",
-    "ai-agents",
-    "task-tracker"
-  ],
-  license: "Apache-2.0",
-  type: "module",
-  bin: {
-    quiel: "dist/cli.js"
-  },
-  files: [
-    "dist",
-    "README.md",
-    "LICENSE"
-  ],
-  engines: {
-    node: ">=22"
-  },
-  publishConfig: {
-    access: "public"
-  },
-  scripts: {
-    build: "tsup",
-    dev: "tsup --watch",
-    lint: "biome check .",
-    typecheck: "tsc --noEmit",
-    test: "vitest run --passWithNoTests"
-  },
-  dependencies: {
-    "@modelcontextprotocol/sdk": "1.30.0",
-    commander: "15.0.0",
-    "socket.io-client": "4.8.3",
-    zod: "4.5.4"
-  },
-  devDependencies: {
-    "@quiel/config": "workspace:*",
-    "@quiel/shared": "workspace:*",
-    "@types/node": "20.19.43",
-    tsup: "8.5.1",
-    typescript: "7.0.2",
-    vitest: "5.0.0"
-  }
-};
-
-// src/version.ts
-var VERSION = package_default.version;
+// src/socket/client.ts
+import { EventEmitter } from "events";
 
-// src/mcp/constants.ts
-var MCP_SERVER_NAME = "quiel";
-var MCP_SERVER_VERSION = VERSION;
+// src/socket/emit-with-timeout.ts
+function toError(raw, context) {
+  return raw instanceof Error ? raw : new Error(`${context}: ${String(raw)}`);
+}
+async function emitWithAckTimeout(socket, event, payload, timeoutMs) {
+  return await new Promise((resolve4, reject) => {
+    const timer = setTimeout(() => {
+      reject(new Error(`${event}: \u043D\u0435\u0442 ack \u043E\u0442 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0437\u0430 ${timeoutMs} \u043C\u0441`));
+    }, timeoutMs);
+    if (typeof timer.unref === "function") timer.unref();
+    socket.emitWithAck(event, payload).then((value) => {
+      clearTimeout(timer);
+      resolve4(value);
+    }).catch((err) => {
+      clearTimeout(timer);
+      reject(toError(err, event));
+    });
+  });
+}
 
-// src/mcp/get-context.ts
-var ALL_CONTEXT_INCLUDES = [
-  "spec",
-  "decisions",
-  // ВСЕ документы проекта — по умолчанию, а не по особому запросу.
-  // `spec`/`decisions` покрывают два типа из пяти, и человек, положивший
-  // контекст под типом `DATA` или `PLAN`, вправе ожидать, что агент его
-  // увидит. 14 сентября 2026 ровно этого и не случилось.
-  "documents",
-  "related",
-  "repo"
-];
-var getContextInputShape = {
-  taskId: contextGetPayloadSchema.shape.taskId.describe(
-    "ID \u0437\u0430\u0434\u0430\u0447\u0438, \u0434\u043B\u044F \u043A\u043E\u0442\u043E\u0440\u043E\u0439 \u043D\u0443\u0436\u0435\u043D \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442. \u0415\u0441\u043B\u0438 \u043D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u043D \u2014 \u0431\u0435\u0440\u0451\u0442\u0441\u044F \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u0430\u0433\u0435\u043D\u0442\u0430 (\u0435\u0441\u043B\u0438 \u0435\u0441\u0442\u044C)."
-  ),
-  include: contextGetPayloadSchema.shape.include.optional().describe(
-    "\u0427\u0442\u043E \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C: spec | decisions | related | repo. \u041D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u043D \u0438\u043B\u0438 \u043F\u0443\u0441\u0442 \u2014 \u0432\u0435\u0440\u043D\u0451\u0442\u0441\u044F \u0432\u0441\u0451 \u0441\u0440\u0430\u0437\u0443."
-  )
-};
-async function getContextHandler(args, runtime) {
-  const state = readState(runtime.stateFilePath);
-  const taskId = args.taskId ?? state.currentTask?.taskId;
-  if (taskId) {
-    const lease = runtime.client.isLeaseLost(taskId);
-    if (lease.lost) return leaseLostResult(taskId, lease.reason);
-  }
-  const include = args.include && args.include.length > 0 ? args.include : [...ALL_CONTEXT_INCLUDES];
-  const payload = contextGetPayloadSchema.parse({ ...taskId ? { taskId } : {}, include });
-  const result = await callServerOrError(
-    runtime.client,
-    "context:get",
-    payload,
-    contextPayloadSchema
-  );
-  if (!result.ok) return errorResult(result.message);
-  return textResult(JSON.stringify(result.data, null, 2));
+// src/socket/trust-cache.ts
+var UNKNOWN_TRUST_PROFILE_KEY = "unknown";
+function toTrustCache(rules, now = () => /* @__PURE__ */ new Date()) {
+  return {
+    profileKey: UNKNOWN_TRUST_PROFILE_KEY,
+    updatedAt: now().toISOString(),
+    rules
+  };
 }
 
-// src/mcp/get-task.ts
-var getTaskInputShape = {
-  taskId: taskGetPayloadSchema.shape.taskId.describe("ID \u0437\u0430\u0434\u0430\u0447\u0438 (Task.id) \u2014 \u043D\u0435 \u043A\u043B\u044E\u0447 \u0432\u0438\u0434\u0430 REL-42")
-};
-async function getTaskHandler(args, runtime) {
-  const lease = runtime.client.isLeaseLost(args.taskId);
-  if (lease.lost) return leaseLostResult(args.taskId, lease.reason);
-  const payload = taskGetPayloadSchema.parse({ taskId: args.taskId });
-  const result = await callServerOrError(runtime.client, "task:get", payload, taskGetAckSchema);
-  if (!result.ok) return errorResult(result.message);
-  return textResult(JSON.stringify(result.data, null, 2));
+// src/socket/types.ts
+function isAckError(raw) {
+  return typeof raw === "object" && raw !== null && "error" in raw && typeof raw.error === "object";
 }
 
-// src/mcp/log.ts
-var logInputShape = {
-  message: taskProgressPayloadSchema.shape.note.describe("\u0421\u0442\u0440\u043E\u043A\u0430 \u0432 \u043B\u0435\u043D\u0442\u0443 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438"),
-  level: taskProgressPayloadSchema.shape.level.optional().describe("debug | info | warn | error, \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E info")
-};
-async function logHandler(args, runtime) {
-  const state = readState(runtime.stateFilePath);
-  if (!state.currentTask) {
-    return errorResult(
-      "\u041D\u0435\u0442 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u0437\u0430\u043F\u0438\u0441\u044B\u0432\u0430\u0442\u044C \u043D\u0435\u043A\u0443\u0434\u0430 \u0432 \u0435\u0451 \u043B\u0435\u043D\u0442\u0443. \u0421\u043D\u0430\u0447\u0430\u043B\u0430 \u0432\u044B\u0437\u043E\u0432\u0438 next_task."
-    );
-  }
-  const lease = runtime.client.isLeaseLost(state.currentTask.taskId);
-  if (lease.lost) {
-    return leaseLostResult(state.currentTask.taskKey ?? state.currentTask.taskId, lease.reason);
-  }
-  const payload = taskProgressPayloadSchema.parse({
-    taskId: state.currentTask.taskId,
-    note: args.message,
-    ...args.level ? { level: args.level } : {}
-  });
-  const result = await callServerOrError(
-    runtime.client,
-    "task:progress",
-    payload,
-    taskProgressAckSchema
-  );
-  if (!result.ok) return errorResult(result.message);
-  if (!result.data.ok) return errorResult("\u0421\u0435\u0440\u0432\u0435\u0440 \u043D\u0435 \u043F\u0440\u0438\u043D\u044F\u043B \u0437\u0430\u043F\u0438\u0441\u044C \u0432 \u043B\u0435\u043D\u0442\u0443 \u0437\u0430\u0434\u0430\u0447\u0438 (ok:false).");
-  return textResult("\u0417\u0430\u043F\u0438\u0441\u0430\u043D\u043E \u0432 \u043B\u0435\u043D\u0442\u0443 \u0437\u0430\u0434\u0430\u0447\u0438.");
-}
-
-// src/git/result.ts
-function gitOk(data) {
-  return { ok: true, data };
+// src/socket/client.ts
+var DEFAULT_HEARTBEAT_INTERVAL_MS = 3e4;
+var DEFAULT_ACK_TIMEOUT_MS = 1e4;
+var DEFAULT_BACKOFF_BASE_MS = 1e3;
+var DEFAULT_BACKOFF_MAX_MS = 3e4;
+function toError2(raw, context) {
+  if (raw instanceof Error) return raw;
+  return new Error(`${context}: ${String(raw)}`);
 }
-function gitErr(message) {
-  return { ok: false, message };
+function resolveOptions(options) {
+  return {
+    roleKeys: options.roleKeys,
+    cwd: options.cwd,
+    clientVersion: options.clientVersion,
+    agentVersion: options.agentVersion ?? "unknown",
+    agentKind: options.agentKind ?? DEFAULT_AGENT_KIND,
+    os: options.os ?? process.platform,
+    // По умолчанию — файл ИМЕННО этого агента (state/store.ts::getStateFilePath(agentId)),
+    // а не общий `state.json`: не трогаем src/state/**, но обязаны использовать
+    // его правильно (OQ-05 — состояние на агента, не на машину).
+    stateFilePath: options.stateFilePath ?? getStateFilePath(options.agentId),
+    heartbeatIntervalMs: options.heartbeatIntervalMs ?? DEFAULT_HEARTBEAT_INTERVAL_MS,
+    ackTimeoutMs: options.ackTimeoutMs ?? DEFAULT_ACK_TIMEOUT_MS,
+    backoffBaseMs: options.backoffBaseMs ?? DEFAULT_BACKOFF_BASE_MS,
+    backoffMaxMs: options.backoffMaxMs ?? DEFAULT_BACKOFF_MAX_MS,
+    now: options.now ?? (() => /* @__PURE__ */ new Date())
+  };
 }
-
-// src/git/branch-name.ts
-var FORBIDDEN_CHARS = /[\s~^:?*[\\\x00-\x1f\x7f]/;
-function isValidGitBranchName(name) {
-  if (name.length === 0 || name.length > 255) return false;
-  if (name.startsWith("-")) return false;
-  if (name.startsWith("/") || name.endsWith("/")) return false;
-  if (name.endsWith(".")) return false;
-  if (name.includes("..")) return false;
-  if (name.includes("//")) return false;
-  if (name.includes("@{")) return false;
-  if (name === "@") return false;
-  if (FORBIDDEN_CHARS.test(name)) return false;
-  const segments = name.split("/");
-  for (const segment of segments) {
-    if (segment.length === 0) return false;
-    if (segment.startsWith(".")) return false;
-    if (segment.endsWith(".lock")) return false;
+var AgentSocketClient = class extends EventEmitter {
+  socket;
+  opts;
+  agentId;
+  stopped = true;
+  reconnectAttempt = 0;
+  reconnectTimer;
+  heartbeatTimer;
+  lastHelloAck;
+  paused = false;
+  pauseReasonText;
+  leaseLostTasks = /* @__PURE__ */ new Map();
+  constructor(options) {
+    super();
+    this.opts = resolveOptions(options);
+    this.agentId = options.agentId;
+    const factory = options.createSocket ?? createSocket;
+    this.socket = factory(`${trimTrailingSlash2(options.url)}/agent`, {
+      auth: { token: options.token },
+      autoConnect: false,
+      reconnection: false
+    });
+    this.registerSocketListeners();
   }
-  return true;
-}
-function requireValidBranchName(name, label) {
-  if (!isValidGitBranchName(name)) {
-    return gitErr(
-      `${label} "${name}" \u043D\u0435 \u043F\u043E\u0445\u043E\u0436\u0435 \u043D\u0430 \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0435 \u0438\u043C\u044F git-\u0432\u0435\u0442\u043A\u0438 \u2014 \u043E\u043F\u0435\u0440\u0430\u0446\u0438\u044F \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
-    );
+  // -- Публичное API -----------------------------------------------------
+  on(event, listener) {
+    return super.on(event, listener);
   }
-  return gitOk(name);
-}
-
-// src/git/exec.ts
-import { execFile } from "child_process";
-var DEFAULT_TIMEOUT_MS2 = 12e4;
-var MAX_BUFFER_BYTES = 10 * 1024 * 1024;
-function runGit(args, options) {
-  return new Promise((resolvePromise) => {
-    execFile(
-      "git",
-      [...args],
-      {
-        cwd: options.cwd,
-        shell: false,
-        timeout: options.timeoutMs ?? DEFAULT_TIMEOUT_MS2,
-        maxBuffer: MAX_BUFFER_BYTES,
-        env: {
-          ...process.env,
-          ...options.env,
-          // Без человека за терминалом: если git вдруг решит спросить
-          // логин/пароль, зависший prompt выглядел бы как неожиданное
-          // поведение (требование подзадачи: «любая неожиданность —
-          // понятный отказ, а не попробую починить»), а не как честный
-          // отказ команды с кодом возврата.
-          GIT_TERMINAL_PROMPT: "0"
-        }
-      },
-      (error, stdout, stderr) => {
-        if (!error) {
-          resolvePromise({ ok: true, code: 0, signal: null, stdout, stderr });
-          return;
-        }
-        const code = typeof error.code === "number" ? error.code : null;
-        resolvePromise({
+  once(event, listener) {
+    return super.once(event, listener);
+  }
+  off(event, listener) {
+    return super.off(event, listener);
+  }
+  emit(event, ...args) {
+    return super.emit(event, ...args);
+  }
+  /** Поднимает соединение и heartbeat-таймер. Идемпотентно — повторный вызов на уже запущенном клиенте не делает ничего. */
+  start() {
+    if (!this.stopped) return;
+    this.stopped = false;
+    this.reconnectAttempt = 0;
+    this.startHeartbeatTimer();
+    this.socket.connect();
+  }
+  /** Останавливает heartbeat, отменяет запланированное переподключение, закрывает сокет. После `stop()` клиент больше не переподключается сам. */
+  stop() {
+    this.stopped = true;
+    if (this.reconnectTimer) {
+      clearTimeout(this.reconnectTimer);
+      this.reconnectTimer = void 0;
+    }
+    this.stopHeartbeatTimer();
+    this.socket.disconnect();
+  }
+  get connected() {
+    return this.socket.connected;
+  }
+  get lastHello() {
+    return this.lastHelloAck;
+  }
+  get isPaused() {
+    return this.paused;
+  }
+  get pauseReason() {
+    return this.pauseReasonText;
+  }
+  /** §11.2 ТЗ: «следующий вызов любого тула по этой задаче должен сообщить модели, что работу надо прекратить» — тулы (P2-12) сверяются с этим геттером. */
+  isLeaseLost(taskId) {
+    const reason = this.leaseLostTasks.get(taskId);
+    return reason === void 0 ? { lost: false } : { lost: true, reason };
+  }
+  /**
+   * Общий emit+ack поверх ЭТОГО ЖЕ постоянного сокета — тем же приёмом
+   * (`emitWithAckTimeout`), которым `sendHello`/`sendHeartbeat` уже
+   * пользуются внутри класса, но публично: MCP-тулы (P2-12/13,
+   * `../mcp/**`) шлют через него `task:claim`/`task:start`/`task:progress`/
+   * `task:get`/`task:report`/`task:release`/`context:get` (§11.1 ТЗ) — то
+   * есть ВСЁ, что не `agent:hello`/`agent:heartbeat`/`agent:mode` (у
+   * первых двух своя логика согласования состояния в этом классе, третий
+   * — короткоживущий отдельный сокет, см. `send-agent-mode.ts`). Нарочно
+   * НЕ отдельное соединение: `task:claim` — блокирующий долгий long-poll,
+   * и держать его на том же сокете, где уже идёт heartbeat/presence этого
+   * агента, а не поднимать вторую параллельную сессию — единственный
+   * вариант, не удваивающий presence на сервере.
+   */
+  callServer(event, payload, timeoutMs = this.opts.ackTimeoutMs) {
+    return emitWithAckTimeout(this.socket, event, payload, timeoutMs);
+  }
+  /**
+   * Ждёт первого успешного `agent:hello` не дольше `timeoutMs` (по
+   * умолчанию 5 с — как раньше HTTP-пинг в `network.ts`). Таймаут НЕ
+   * останавливает клиент: переподключение по backoff продолжается в фоне,
+   * это только ограничение по времени для вызывающей стороны (`connect.ts`).
+   */
+  waitForFirstConnection(timeoutMs = 5e3) {
+    return new Promise((resolve4) => {
+      let settled = false;
+      const onConnected = (ack) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        this.off("connected", onConnected);
+        resolve4({ ok: true, ack });
+      };
+      const onAuthRejected = (message) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timer);
+        this.off("connected", onConnected);
+        this.off("auth-rejected", onAuthRejected);
+        resolve4({ ok: false, message });
+      };
+      const timer = setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        this.off("connected", onConnected);
+        this.off("auth-rejected", onAuthRejected);
+        resolve4({
           ok: false,
-          code,
-          signal: error.signal ?? null,
-          stdout,
-          // Если git ничего не написал в stderr (например, сам процесс не
-          // запустился — ENOENT), берём текст ошибки Node, чтобы вызывающий
-          // код не остался с пустым сообщением.
-          stderr: stderr.length > 0 ? stderr : error.message
+          message: `\u041D\u0435\u0442 \u043E\u0442\u0432\u0435\u0442\u0430 agent:hello \u0437\u0430 ${timeoutMs} \u043C\u0441 \u2014 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430. \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0435\u0442 \u043F\u043E\u043F\u044B\u0442\u043A\u0438 \u0432 \u0444\u043E\u043D\u0435 (backoff \xA711.4 \u0422\u0417).`
         });
-      }
-    );
-  });
-}
-function describeGitFailure(commandLabel, result) {
-  const stderr = result.stderr.trim();
-  const codeText = result.code === null ? "" : ` (\u043A\u043E\u0434 ${result.code})`;
-  return stderr.length > 0 ? `${commandLabel}${codeText}: ${stderr}` : `${commandLabel} \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0430\u0441\u044C \u0441 \u043E\u0448\u0438\u0431\u043A\u043E\u0439${codeText}`;
-}
-
-// src/git/repo.ts
-async function localBranchExists(repoRoot, branch) {
-  const result = await runGit(["show-ref", "--verify", "--quiet", `refs/heads/${branch}`], {
-    cwd: repoRoot
-  });
-  return result.ok;
-}
-async function getHeadSha(worktreeDir) {
-  const result = await runGit(["rev-parse", "HEAD"], { cwd: worktreeDir });
-  if (!result.ok) {
-    return gitErr(describeGitFailure("git rev-parse HEAD", result));
+      }, timeoutMs);
+      if (typeof timer.unref === "function") timer.unref();
+      this.on("connected", onConnected);
+      this.on("auth-rejected", onAuthRejected);
+    });
+  }
+  // -- Подключение --------------------------------------------------------
+  registerSocketListeners() {
+    this.socket.on("connect", () => this.handleConnect());
+    this.socket.on("connect_error", (err) => this.handleConnectError(err));
+    this.socket.on("disconnect", (reason) => this.handleDisconnect(String(reason)));
+    this.socket.on("lease:lost", (raw) => this.handleLeaseLost(raw));
+    this.socket.on("mode:set", (raw) => this.handleModeSet(raw));
+    this.socket.on("agent:pause", (raw) => this.handleAgentPause(raw));
+    this.socket.on("trust:updated", (raw) => this.handleTrustUpdated(raw));
+    this.socket.on("task:updated", (raw) => this.handleTaskUpdated(raw));
+    this.socket.on("question:answered", (raw) => this.handleQuestionAnswered(raw));
+    this.socket.on("approval:decided", (raw) => this.handleApprovalDecided(raw));
+  }
+  handleConnect() {
+    if (this.stopped) return;
+    this.reconnectAttempt = 0;
+    void this.sendHello();
+  }
+  handleConnectError(err) {
+    if (isAuthRejection(err)) {
+      this.stop();
+      this.emit("auth-rejected", describeAuthRejection(this.agentId));
+      return;
+    }
+    this.emit("client-error", toError2(err, "connect_error"));
+    this.scheduleReconnect();
+  }
+  handleDisconnect(reason) {
+    this.emit("disconnected", reason);
+    if (this.stopped) return;
+    this.scheduleReconnect();
+  }
+  scheduleReconnect() {
+    if (this.stopped || this.reconnectTimer) return;
+    const delayMs = nextReconnectDelayMs(this.reconnectAttempt, {
+      baseMs: this.opts.backoffBaseMs,
+      maxMs: this.opts.backoffMaxMs
+    });
+    this.reconnectAttempt += 1;
+    this.emit("reconnecting", { attempt: this.reconnectAttempt, delayMs });
+    this.reconnectTimer = setTimeout(() => {
+      this.reconnectTimer = void 0;
+      if (this.stopped) return;
+      this.socket.connect();
+    }, delayMs);
+  }
+  // -- agent:hello ---------------------------------------------------------
+  async sendHello() {
+    const state = readState(this.opts.stateFilePath);
+    const payload = agentHelloPayloadSchema.parse({
+      clientVersion: this.opts.clientVersion,
+      cwd: this.opts.cwd,
+      os: this.opts.os,
+      agentKind: this.opts.agentKind,
+      agentVersion: this.opts.agentVersion,
+      // `claudeVersion` шлётся ТОЛЬКО для Claude Code — и только чтобы
+      // клиент работал против ещё не обновлённого сервера, который знает
+      // одно это поле. Для Codex поле с таким именем было бы неправдой.
+      ...this.opts.agentKind === AgentKind.CLAUDE_CODE ? { claudeVersion: this.opts.agentVersion } : {},
+      roleKeys: [...this.opts.roleKeys],
+      ...state.currentTask?.resumeToken ? { resumeToken: state.currentTask.resumeToken } : {}
+    });
+    let raw;
+    try {
+      raw = await emitWithAckTimeout(this.socket, "agent:hello", payload, this.opts.ackTimeoutMs);
+    } catch (err) {
+      this.emit("client-error", toError2(err, "agent:hello"));
+      return;
+    }
+    if (this.stopped) return;
+    if (isAckError(raw)) {
+      this.emit("client-error", new Error(`agent:hello: ${raw.error.code}: ${raw.error.message}`));
+      return;
+    }
+    const parsed = agentHelloAckSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`agent:hello: \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}`)
+      );
+      return;
+    }
+    const ack = parsed.data;
+    this.lastHelloAck = ack;
+    this.paused = false;
+    this.pauseReasonText = void 0;
+    this.applyHelloAck(ack);
+    this.emit("connected", ack);
+  }
+  applyHelloAck(ack) {
+    const state = readState(this.opts.stateFilePath);
+    const patch = {
+      // OQ-06: сервер — источник правды, локальный режим перекрывается безусловно.
+      mode: ack.mode,
+      trust: toTrustCache(ack.trust, this.opts.now)
+    };
+    if (!ack.currentTask || ack.currentTask.id !== state.currentTask?.taskId) {
+      patch.currentTask = null;
+    }
+    updateState(patch, this.opts.stateFilePath);
+  }
+  // -- agent:heartbeat -------------------------------------------------------
+  startHeartbeatTimer() {
+    if (this.heartbeatTimer) return;
+    this.heartbeatTimer = setInterval(() => {
+      void this.sendHeartbeat();
+    }, this.opts.heartbeatIntervalMs);
+  }
+  stopHeartbeatTimer() {
+    if (!this.heartbeatTimer) return;
+    clearInterval(this.heartbeatTimer);
+    this.heartbeatTimer = void 0;
+  }
+  async sendHeartbeat() {
+    if (!this.socket.connected) return;
+    const state = readState(this.opts.stateFilePath);
+    const payload = agentHeartbeatPayloadSchema.parse({
+      ...state.currentTask?.taskId ? { currentTaskId: state.currentTask.taskId } : {},
+      ...state.currentTask?.resumeToken ? { resumeToken: state.currentTask.resumeToken } : {},
+      status: state.currentTask ? AgentStatus.BUSY : AgentStatus.IDLE
+    });
+    let raw;
+    try {
+      raw = await emitWithAckTimeout(
+        this.socket,
+        "agent:heartbeat",
+        payload,
+        this.opts.ackTimeoutMs
+      );
+    } catch (err) {
+      this.emit("client-error", toError2(err, "agent:heartbeat"));
+      return;
+    }
+    if (isAckError(raw)) {
+      this.emit(
+        "client-error",
+        new Error(`agent:heartbeat: ${raw.error.code}: ${raw.error.message}`)
+      );
+      return;
+    }
+    const parsed = agentHeartbeatAckSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`agent:heartbeat: \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}`)
+      );
+      return;
+    }
+    this.emit("heartbeat", parsed.data);
+  }
+  // -- Пуш-события сервера (§11.2 ТЗ) --------------------------------------
+  handleLeaseLost(raw) {
+    const parsed = leaseLostPayloadSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`lease:lost: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
+      );
+      return;
+    }
+    const { taskId, reason } = parsed.data;
+    this.leaseLostTasks.set(taskId, reason);
+    const state = readState(this.opts.stateFilePath);
+    if (state.currentTask?.taskId === taskId) {
+      updateState({ currentTask: null }, this.opts.stateFilePath);
+    }
+    this.emit("lease:lost", parsed.data);
+  }
+  handleModeSet(raw) {
+    const parsed = modeSetPayloadSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit("client-error", new Error(`mode:set: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`));
+      return;
+    }
+    updateState({ mode: parsed.data.mode }, this.opts.stateFilePath);
+    this.emit("mode:set", parsed.data);
+  }
+  handleAgentPause(raw) {
+    const parsed = agentPausePayloadSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`agent:pause: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
+      );
+      return;
+    }
+    this.paused = true;
+    this.pauseReasonText = parsed.data.reason;
+    this.emit("pause", parsed.data);
+  }
+  handleTrustUpdated(raw) {
+    const parsed = trustUpdatedPayloadSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`trust:updated: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
+      );
+      return;
+    }
+    updateState({ trust: toTrustCache(parsed.data, this.opts.now) }, this.opts.stateFilePath);
+    this.emit("trust:updated", parsed.data);
+  }
+  handleTaskUpdated(raw) {
+    const parsed = taskUpdatedAgentPayloadSchema.safeParse(raw);
+    if (parsed.success) this.emit("task:updated", parsed.data);
   }
-  return gitOk(result.stdout.trim());
-}
-async function currentBranch(worktreeDir) {
-  const result = await runGit(["rev-parse", "--abbrev-ref", "HEAD"], { cwd: worktreeDir });
-  if (!result.ok) {
-    return gitErr(describeGitFailure("git rev-parse --abbrev-ref HEAD", result));
+  handleQuestionAnswered(raw) {
+    const parsed = questionAnsweredPayloadSchema.safeParse(raw);
+    if (parsed.success) this.emit("question:answered", parsed.data);
   }
-  return gitOk(result.stdout.trim());
-}
-
-// src/git/status.ts
-var CONFLICT_CODES = /* @__PURE__ */ new Set(["DD", "AU", "UD", "UA", "DU", "AA", "UU"]);
-async function getWorktreeStatus(worktreeDir) {
-  const result = await runGit(["status", "--porcelain=v1", "--untracked-files=all"], {
-    cwd: worktreeDir
-  });
-  if (!result.ok) {
-    return gitErr(describeGitFailure("git status", result));
+  /**
+   * §14.4 ТЗ, п.4-5 — асинхронный путь (в дополнение к синхронному в
+   * `mcp/request-approval.ts::settleApproval`, который срабатывает, когда
+   * решение приходит в рамках ОДНОГО вызова `request_approval`/
+   * `wait_approval`). Этот пуш ловит случай, когда решение пришло уже
+   * ПОСЛЕ того, как собственный long-poll тула истёк (вернул `PENDING`),
+   * а модель ещё не успела/не стала звать `wait_approval` снова — на
+   * постоянном соединении (`quiel mcp`, единственный держатель ЭТОГО
+   * класса) `approval:decided` долетит и без явного повторного вызова.
+   *
+   * `approvalDecidedPayloadSchema` несёт только `approvalId`+`status`+
+   * `oneTimeToken?` — НЕ `command`/`cwd` (провод их не отдаёт, см.
+   * `state/schema.ts::PendingApprovalSchema`), поэтому command+cwd берутся
+   * из `state.pendingApprovals[approvalId]`, куда их кладёт
+   * `request_approval` сразу после создания запроса. Если записи там нет
+   * (approval создан не этим клиентом/до перезапуска процесса, либо уже
+   * обработан) — писать пока нечего, `pendingApprovals` и так пуст.
+   */
+  handleApprovalDecided(raw) {
+    const parsed = approvalDecidedPayloadSchema.safeParse(raw);
+    if (!parsed.success) {
+      this.emit(
+        "client-error",
+        new Error(`approval:decided: \u043D\u0435\u0432\u0430\u043B\u0438\u0434\u043D\u044B\u0439 payload: ${parsed.error.message}`)
+      );
+      return;
+    }
+    this.applyApprovalDecided(parsed.data);
+    this.emit("approval:decided", parsed.data);
   }
-  const changedPaths = [];
-  const conflictedPaths = [];
-  for (const line of result.stdout.split("\n")) {
-    if (line.length === 0) continue;
-    const code = line.slice(0, 2);
-    const rawPath = line.slice(3);
-    const arrowIndex = rawPath.indexOf(" -> ");
-    const path = arrowIndex >= 0 ? rawPath.slice(arrowIndex + 4) : rawPath;
-    changedPaths.push(path);
-    if (CONFLICT_CODES.has(code)) conflictedPaths.push(path);
+  applyApprovalDecided(payload) {
+    const state = readState(this.opts.stateFilePath);
+    const pending = state.pendingApprovals[payload.approvalId];
+    if (!pending) return;
+    if (payload.status === ApprovalStatus.APPROVED && payload.oneTimeToken) {
+      const approvalTtlMin = state.trust?.rules.approvalTtlMin ?? 60;
+      const expiresAt = new Date(this.opts.now().getTime() + approvalTtlMin * 6e4).toISOString();
+      updateState(
+        {
+          ...storeApprovedCommand(
+            state,
+            { command: pending.command, cwd: pending.cwd, token: payload.oneTimeToken, expiresAt },
+            this.opts.now
+          ),
+          ...clearPendingApproval(state, payload.approvalId)
+        },
+        this.opts.stateFilePath
+      );
+      return;
+    }
+    updateState(clearPendingApproval(state, payload.approvalId), this.opts.stateFilePath);
   }
-  return gitOk({ clean: changedPaths.length === 0, changedPaths, conflictedPaths });
+};
+function trimTrailingSlash2(url) {
+  return url.endsWith("/") ? url.slice(0, -1) : url;
 }
 
-// src/git/commit.ts
-function buildCommitMessage(params) {
-  const subject = `${params.commitPrefix} ${params.title}`.trim();
-  return `${subject}
-
-${buildTaskTrailer(params.taskKey)}
-`;
+// src/socket/send-agent-mode.ts
+var DEFAULT_TIMEOUT_MS2 = 8e3;
+function trimTrailingSlash3(url) {
+  return url.endsWith("/") ? url.slice(0, -1) : url;
 }
-async function commitAll(params) {
-  const addResult = await runGit(["add", "-A"], { cwd: params.worktreeDir });
-  if (!addResult.ok) {
-    return gitErr(describeGitFailure("git add -A", addResult));
-  }
-  const status = await getWorktreeStatus(params.worktreeDir);
-  if (!status.ok) return status;
-  if (status.data.clean) {
-    return gitOk({ committed: false, sha: null });
-  }
-  const message = buildCommitMessage(params);
-  const commitResult = await runGit(["commit", "-m", message], { cwd: params.worktreeDir });
-  if (!commitResult.ok) {
-    return gitErr(describeGitFailure("git commit", commitResult));
+async function sendAgentMode(options) {
+  const timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS2;
+  const factory = options.createSocket ?? createSocket;
+  const socket = factory(`${trimTrailingSlash3(options.url)}/agent`, {
+    auth: { token: options.token },
+    autoConnect: false,
+    reconnection: false
+  });
+  try {
+    await connectOnce(socket, timeoutMs);
+    const payload = agentModePayloadSchema.parse({ mode: options.mode });
+    const raw = await emitWithAckTimeout(socket, "agent:mode", payload, timeoutMs);
+    if (isAckError(raw)) {
+      return { ok: false, message: `${raw.error.code}: ${raw.error.message}` };
+    }
+    const parsed = agentModeAckSchema.safeParse(raw);
+    if (!parsed.success) {
+      return { ok: false, message: `\u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u0444\u043E\u0440\u043C\u0430\u0442 ack: ${parsed.error.message}` };
+    }
+    if (!parsed.data.ok) {
+      return { ok: false, message: "\u0441\u0435\u0440\u0432\u0435\u0440 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u043B agent:mode (ok:false)" };
+    }
+    return { ok: true, mode: parsed.data.mode ?? options.mode };
+  } catch (err) {
+    return { ok: false, message: err instanceof Error ? err.message : String(err) };
+  } finally {
+    socket.disconnect();
   }
-  const sha = await getHeadSha(params.worktreeDir);
-  return gitOk({ committed: true, sha: sha.ok ? sha.data : null });
 }
 
-// src/git/worktree.ts
-import { createHash as createHash2 } from "crypto";
-import { existsSync as existsSync9, mkdirSync as mkdirSync6, realpathSync } from "fs";
-import { dirname as dirname4, isAbsolute, join as join9, relative, resolve as resolve2 } from "path";
-var WORKTREES_RELATIVE_ROOT = join9(".claude", "worktrees");
-function getDefaultWorktreesRoot(repoRoot) {
-  return join9(repoRoot, WORKTREES_RELATIVE_ROOT);
-}
-function resolveWorktreeDir(worktreesRoot, repoRoot, branchName) {
-  if (isInsideRepo(worktreesRoot, repoRoot)) return join9(worktreesRoot, branchName);
-  const repoHash = createHash2("sha1").update(resolve2(repoRoot)).digest("hex").slice(0, 12);
-  return join9(worktreesRoot, repoHash, branchName);
-}
-function isInsideRepo(candidate, repoRoot) {
-  const rel = relative(resolve2(repoRoot), resolve2(candidate));
-  return rel.length > 0 && !rel.startsWith("..") && !isAbsolute(rel);
+// src/mcp/helpers.ts
+function textResult(text) {
+  return { content: [{ type: "text", text }] };
 }
-function canonicalPath(path) {
-  try {
-    return realpathSync(path);
-  } catch {
-    return resolve2(path);
-  }
+function errorResult(text) {
+  return { content: [{ type: "text", text }], isError: true };
 }
-async function listWorktrees(repoRoot) {
-  const result = await runGit(["worktree", "list", "--porcelain"], { cwd: repoRoot });
-  if (!result.ok) {
-    return gitErr(describeGitFailure("git worktree list", result));
-  }
-  const entries = [];
-  let path;
-  let branch = null;
-  const flush = () => {
-    if (path) entries.push({ path, branch });
-    path = void 0;
-    branch = null;
-  };
-  for (const line of result.stdout.split("\n")) {
-    if (line.length === 0) {
-      flush();
-      continue;
-    }
-    if (line.startsWith("worktree ")) path = line.slice("worktree ".length);
-    else if (line.startsWith("branch refs/heads/")) branch = line.slice("branch refs/heads/".length);
-  }
-  flush();
-  return gitOk(entries);
+function leaseLostResult(taskLabel2, reason) {
+  return errorResult(
+    `\u0410\u0440\u0435\u043D\u0434\u0430 \u0437\u0430\u0434\u0430\u0447\u0438 ${taskLabel2} \u043F\u043E\u0442\u0435\u0440\u044F\u043D\u0430: ${reason}. \u041F\u0440\u0435\u043A\u0440\u0430\u0442\u0438 \u0440\u0430\u0431\u043E\u0442\u0443 \u043D\u0430\u0434 \u043D\u0435\u0439 \u043D\u0435\u043C\u0435\u0434\u043B\u0435\u043D\u043D\u043E \u2014 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0441\u0434\u0430\u0432\u0430\u0442\u044C \u043D\u0435\u043A\u0443\u0434\u0430, \u0432\u044B\u0437\u043E\u0432\u0438 next_task \u0437\u0430 \u043D\u043E\u0432\u043E\u0439 \u0437\u0430\u0434\u0430\u0447\u0435\u0439.`
+  );
 }
-async function ensureWorktree(params) {
-  const remote = params.remote ?? "origin";
-  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
-  if (!branchCheck.ok) return branchCheck;
-  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
-  if (!defaultBranchCheck.ok) return defaultBranchCheck;
-  const worktreesRoot = params.worktreesRoot ?? getDefaultWorktreesRoot(params.repoRoot);
-  const worktreeDir = resolveWorktreeDir(worktreesRoot, params.repoRoot, params.branchName);
-  const list = await listWorktrees(params.repoRoot);
-  if (!list.ok) return list;
-  const existing = list.data.find((wt) => canonicalPath(wt.path) === canonicalPath(worktreeDir));
-  if (existing) {
-    if (existing.branch === params.branchName) {
-      return gitOk({ worktreeDir, reused: true });
-    }
-    return gitErr(
-      `\u041F\u043E \u043F\u0443\u0442\u0438 ${worktreeDir} \u0443\u0436\u0435 \u0435\u0441\u0442\u044C git worktree \u043D\u0430 \u0432\u0435\u0442\u043A\u0435 "${existing.branch ?? "(\u043E\u0442\u0441\u043E\u0435\u0434\u0438\u043D\u0451\u043D\u043D\u044B\u0439 HEAD)"}", \u0430 \u043E\u0436\u0438\u0434\u0430\u043B\u0430\u0441\u044C "${params.branchName}". \u0420\u0430\u0437\u0431\u0435\u0440\u0438\u0441\u044C \u0440\u0443\u043A\u0430\u043C\u0438: "git -C ${params.repoRoot} worktree remove ${worktreeDir}" (\u0434\u043E\u0431\u0430\u0432\u044C "--force", \u0435\u0441\u043B\u0438 \u0442\u0430\u043C \u043D\u0435\u0442 \u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u043E\u0433\u043E \u0432\u0430\u0436\u043D\u043E\u0433\u043E), \u0437\u0430\u0442\u0435\u043C \u043F\u043E\u0432\u0442\u043E\u0440\u0438.`
-    );
-  }
-  if (existsSync9(worktreeDir)) {
-    return gitErr(
-      `\u041F\u0443\u0442\u044C ${worktreeDir} \u0443\u0436\u0435 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u0435\u0442, \u043D\u043E git \u043D\u0435 \u0441\u0447\u0438\u0442\u0430\u0435\u0442 \u0435\u0433\u043E \u0441\u0432\u043E\u0435\u0439 worktree. \u0423\u0431\u0435\u0440\u0438 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0440\u0443\u043A\u0430\u043C\u0438 \u0438 \u043F\u043E\u0432\u0442\u043E\u0440\u0438 \u2014 \u0442\u0440\u043E\u0433\u0430\u0442\u044C \u0447\u0443\u0436\u043E\u0439 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u0430\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0438 \u043D\u0435\u0431\u0435\u0437\u043E\u043F\u0430\u0441\u043D\u043E.`
-    );
-  }
-  await runGit(["worktree", "prune"], { cwd: params.repoRoot });
-  const fetchResult = await runGit(["fetch", remote, params.defaultBranch], {
-    cwd: params.repoRoot
-  });
-  if (!fetchResult.ok) {
-    return gitErr(describeGitFailure(`git fetch ${remote} ${params.defaultBranch}`, fetchResult));
-  }
-  mkdirSync6(dirname4(worktreeDir), { recursive: true });
-  const branchExists = await localBranchExists(params.repoRoot, params.branchName);
-  const addArgs = branchExists ? ["worktree", "add", worktreeDir, params.branchName] : ["worktree", "add", "-b", params.branchName, worktreeDir, `${remote}/${params.defaultBranch}`];
-  const addResult = await runGit(addArgs, { cwd: params.repoRoot });
-  if (!addResult.ok) {
-    return gitErr(describeGitFailure("git worktree add", addResult));
-  }
-  return gitOk({ worktreeDir, reused: false });
+function describeZodIssues(error) {
+  return error.issues.map(
+    (issue) => issue.path.length > 0 ? `${issue.path.join(".")}: ${issue.message}` : issue.message
+  ).join("; ");
 }
-async function removeWorktree(repoRoot, worktreeDir) {
-  const result = await runGit(["worktree", "remove", worktreeDir], { cwd: repoRoot });
-  if (!result.ok) {
-    return gitErr(describeGitFailure("git worktree remove", result));
+function parseArgsOrError(schema, raw) {
+  const parsed = schema.safeParse(raw);
+  if (!parsed.success) {
+    return { ok: false, message: `\u041D\u0435\u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u044B\u0435 \u0430\u0440\u0433\u0443\u043C\u0435\u043D\u0442\u044B: ${describeZodIssues(parsed.error)}` };
   }
-  return gitOk(void 0);
+  return { ok: true, data: parsed.data };
 }
-
-// src/git/submit.ts
-async function rebaseOntoDefault(params) {
-  const remote = params.remote ?? "origin";
-  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
-  if (!defaultBranchCheck.ok) return defaultBranchCheck;
-  const fetchResult = await runGit(["fetch", remote, params.defaultBranch], {
-    cwd: params.worktreeDir
-  });
-  if (!fetchResult.ok) {
-    return gitErr(describeGitFailure(`git fetch ${remote} ${params.defaultBranch}`, fetchResult));
+async function callServerOrError(client, event, payload, schema, timeoutMs) {
+  let raw;
+  try {
+    raw = await client.callServer(event, payload, timeoutMs);
+  } catch (err) {
+    return {
+      ok: false,
+      message: `\u041D\u0435\u0442 \u043E\u0442\u0432\u0435\u0442\u0430 \u043E\u0442 \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u044B \u043D\u0430 ${event} (${err instanceof Error ? err.message : String(err)}). \u0421\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u043F\u0435\u0440\u0435\u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u0442\u0441\u044F \u0432 \u0444\u043E\u043D\u0435 \u2014 \u043F\u043E\u043F\u0440\u043E\u0431\u0443\u0439 \u0435\u0449\u0451 \u0440\u0430\u0437 \u0447\u0443\u0442\u044C \u043F\u043E\u0437\u0436\u0435.`
+    };
   }
-  const rebaseResult = await runGit(["rebase", `${remote}/${params.defaultBranch}`], {
-    cwd: params.worktreeDir
-  });
-  if (rebaseResult.ok) {
-    return gitOk({ outcome: "rebased", conflictedFiles: [] });
+  if (isAckError(raw)) {
+    return {
+      ok: false,
+      message: `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043E\u0442\u043A\u0430\u0437\u0430\u043B\u0430 \u043D\u0430 ${event}: ${raw.error.code}: ${raw.error.message}`
+    };
   }
-  const status = await getWorktreeStatus(params.worktreeDir);
-  if (status.ok && status.data.conflictedPaths.length > 0) {
-    const conflictedFiles = status.data.conflictedPaths;
-    const abortResult = await runGit(["rebase", "--abort"], { cwd: params.worktreeDir });
-    if (!abortResult.ok) {
-      return gitErr(
-        `\u041A\u043E\u043D\u0444\u043B\u0438\u043A\u0442 \u043F\u0440\u0438 rebase (${conflictedFiles.join(", ")}), \u0438 "git rebase --abort" \u043D\u0435 \u0441\u0440\u0430\u0431\u043E\u0442\u0430\u043B: ${describeGitFailure("git rebase --abort", abortResult)}. Worktree \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D \u043A\u0430\u043A \u0435\u0441\u0442\u044C \u2014 \u043D\u0443\u0436\u043D\u043E \u0440\u0443\u0447\u043D\u043E\u0435 \u0432\u043C\u0435\u0448\u0430\u0442\u0435\u043B\u044C\u0441\u0442\u0432\u043E.`
-      );
-    }
-    return gitOk({ outcome: "conflict", conflictedFiles });
+  const parsed = schema.safeParse(raw);
+  if (!parsed.success) {
+    return {
+      ok: false,
+      message: `\u041F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0430 \u043F\u0440\u0438\u0441\u043B\u0430\u043B\u0430 \u043D\u0435\u043E\u0436\u0438\u0434\u0430\u043D\u043D\u044B\u0439 \u043E\u0442\u0432\u0435\u0442 \u043D\u0430 ${event}: ${parsed.error.message}`
+    };
   }
-  return gitErr(describeGitFailure("git rebase", rebaseResult));
+  return { ok: true, data: parsed.data };
 }
-async function assertReadyToPush(params) {
-  const branch = await currentBranch(params.worktreeDir);
-  if (!branch.ok) return branch;
-  if (branch.data !== params.branchName) {
-    return gitErr(
-      `\u041E\u0442\u043A\u0430\u0437: worktree \u0441\u043C\u043E\u0442\u0440\u0438\u0442 \u043D\u0430 \u0432\u0435\u0442\u043A\u0443 "${branch.data}", \u0430 \u043E\u0436\u0438\u0434\u0430\u043B\u0430\u0441\u044C "${params.branchName}" \u2014 \u0440\u0430\u0431\u043E\u0447\u0435\u0435 \u0434\u0435\u0440\u0435\u0432\u043E "\u0443\u0448\u043B\u043E \u043D\u0435 \u0442\u0443\u0434\u0430", push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
-    );
+
+// src/mcp/ask.ts
+var askHumanInputShape = {
+  textMd: questionAskPayloadSchema.shape.textMd.describe(
+    "\u0422\u0435\u043A\u0441\u0442 \u0432\u043E\u043F\u0440\u043E\u0441\u0430 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0443, Markdown. \u041F\u0438\u0448\u0438 \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E \u2014 \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043E\u0442\u0432\u0435\u0447\u0430\u0435\u0442 \u0431\u0435\u0437 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u0440\u0430\u0437\u0433\u043E\u0432\u043E\u0440\u0430 \u0441 \u043C\u043E\u0434\u0435\u043B\u044C\u044E."
+  ),
+  targetRole: questionAskPayloadSchema.shape.targetRole.describe(
+    '\u0420\u043E\u043B\u044C \u0430\u0434\u0440\u0435\u0441\u0430\u0442\u0430 (\u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440, "owner") \u2014 \u0432\u043E\u043F\u0440\u043E\u0441 \u0443\u0432\u0438\u0434\u044F\u0442 \u0432\u0441\u0435 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0438 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u0441 \u044D\u0442\u043E\u0439 \u0440\u043E\u043B\u044C\u044E, \u043E\u0442\u0432\u0435\u0442\u0438\u0442 \u043F\u0435\u0440\u0432\u044B\u0439. \u041D\u0443\u0436\u0435\u043D \u0420\u041E\u0412\u041D\u041E \u041E\u0414\u0418\u041D \u0430\u0434\u0440\u0435\u0441\u0430\u0442: targetRole \u0418\u041B\u0418 targetMemberId, \u043D\u0435 \u043E\u0431\u0430 \u0441\u0440\u0430\u0437\u0443 \u0438 \u043D\u0435 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E.'
+  ),
+  targetMemberId: questionAskPayloadSchema.shape.targetMemberId.describe(
+    "ID \u043A\u043E\u043D\u043A\u0440\u0435\u0442\u043D\u043E\u0433\u043E \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u2014 \u0430\u0434\u0440\u0435\u0441\u0430\u0442 \u0432\u043E\u043F\u0440\u043E\u0441\u0430. \u041D\u0443\u0436\u0435\u043D \u0420\u041E\u0412\u041D\u041E \u041E\u0414\u0418\u041D \u0430\u0434\u0440\u0435\u0441\u0430\u0442: targetRole \u0418\u041B\u0418 targetMemberId, \u043D\u0435 \u043E\u0431\u0430 \u0441\u0440\u0430\u0437\u0443 \u0438 \u043D\u0435 \u043D\u0438 \u043E\u0434\u043D\u043E\u0433\u043E."
+  ),
+  wantsFiles: questionAskPayloadSchema.shape.wantsFiles.describe(
+    "\u041F\u043E\u043F\u0440\u043E\u0441\u0438\u0442\u044C \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 \u043F\u0440\u0438\u043B\u043E\u0436\u0438\u0442\u044C \u0444\u0430\u0439\u043B \u043A \u043E\u0442\u0432\u0435\u0442\u0443 (\u0441\u043A\u0440\u0438\u043D\u0448\u043E\u0442, \u043B\u043E\u0433, \u0432\u044B\u0433\u0440\u0443\u0437\u043A\u0443). \u0424\u043E\u0440\u043C\u0430 \u043E\u0442\u0432\u0435\u0442\u0430 \u043E\u0442\u043A\u0440\u043E\u0435\u0442\u0441\u044F \u0441\u0440\u0430\u0437\u0443 \u0441 \u0432\u044B\u0431\u043E\u0440\u043E\u043C \u0444\u0430\u0439\u043B\u0430. \u042D\u0442\u043E \u041F\u0420\u041E\u0421\u042C\u0411\u0410, \u0430 \u043D\u0435 \u0442\u0440\u0435\u0431\u043E\u0432\u0430\u043D\u0438\u0435: \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u0432\u043F\u0440\u0430\u0432\u0435 \u043E\u0442\u0432\u0435\u0442\u0438\u0442\u044C \u0431\u0435\u0437 \u0444\u0430\u0439\u043B\u043E\u0432, \u0438 \u0442\u043E\u0433\u0434\u0430 `attachments` \u0432 \u043E\u0442\u0432\u0435\u0442\u0435 \u0431\u0443\u0434\u0435\u0442 \u043F\u0443\u0441\u0442\u044B\u043C."
+  ),
+  options: questionAskPayloadSchema.shape.options.describe(
+    "\u0412\u0430\u0440\u0438\u0430\u043D\u0442\u044B \u043E\u0442\u0432\u0435\u0442\u0430 (\u043F\u043E\u043A\u0430\u0436\u0443\u0442\u0441\u044F \u043A\u043D\u043E\u043F\u043A\u0430\u043C\u0438 \u0432 UI/Telegram). \u041D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u0432\u0430\u0439 \u2014 \u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043E\u0442\u0432\u0435\u0442\u0438\u0442 \u0441\u0432\u043E\u0431\u043E\u0434\u043D\u044B\u043C \u0442\u0435\u043A\u0441\u0442\u043E\u043C."
+  ),
+  blocking: questionAskPayloadSchema.shape.blocking.describe(
+    'true \u2014 \u0442\u0432\u043E\u044F \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u0443\u0445\u043E\u0434\u0438\u0442 \u0432 \u0441\u0442\u0430\u0442\u0443\u0441 WAITING_HUMAN, \u0438 \u044D\u0442\u043E\u0442 \u0432\u044B\u0437\u043E\u0432 \u0441\u0430\u043C \u0436\u0434\u0451\u0442 \u043E\u0442\u0432\u0435\u0442 \u0434\u043E 600 \u0441; \u0435\u0441\u043B\u0438 \u0437\u0430 \u044D\u0442\u043E \u0432\u0440\u0435\u043C\u044F \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435\u0442, \u0432\u044B\u0437\u043E\u0432 \u0432\u0435\u0440\u043D\u0451\u0442\u0441\u044F \u0441 \u043F\u043E\u043C\u0435\u0442\u043A\u043E\u0439 "pending" \u2014 \u0442\u043E\u0433\u0434\u0430 \u043E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId \u0438\u0437 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0430, \u043D\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u0437\u0430\u0434\u0430\u0447\u0443 \u0431\u0435\u0437 \u043E\u0442\u0432\u0435\u0442\u0430. false \u2014 \u0432\u043E\u043F\u0440\u043E\u0441 \u043F\u0440\u043E\u0441\u0442\u043E \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442\u0441\u044F, \u0431\u0435\u0437 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u044F \u0438 \u0431\u0435\u0437 \u0431\u043B\u043E\u043A\u0438\u0440\u043E\u0432\u043A\u0438 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 (\u0434\u043B\u044F \u043D\u0435 \u0441\u0440\u043E\u0447\u043D\u044B\u0445 \u0443\u0442\u043E\u0447\u043D\u0435\u043D\u0438\u0439).'
+  )
+};
+var BLOCKING_WAIT_SEC = 600;
+var ASK_ACK_BUFFER_MS = 15e3;
+async function askHumanHandler(args, runtime) {
+  const state = readState(runtime.stateFilePath);
+  const taskId = state.currentTask?.taskId;
+  const waitSec = args.blocking ? BLOCKING_WAIT_SEC : 0;
+  const parsedArgs = parseArgsOrError(questionAskPayloadSchema, {
+    ...taskId ? { taskId } : {},
+    textMd: args.textMd,
+    ...args.targetRole ? { targetRole: args.targetRole } : {},
+    ...args.targetMemberId ? { targetMemberId: args.targetMemberId } : {},
+    ...args.options && args.options.length > 0 ? { options: args.options } : {},
+    ...args.wantsFiles ? { wantsFiles: true } : {},
+    blocking: args.blocking,
+    waitSec
+  });
+  if (!parsedArgs.ok) return errorResult(parsedArgs.message);
+  if (taskId) {
+    const lease = runtime.client.isLeaseLost(taskId);
+    if (lease.lost) return leaseLostResult(state.currentTask?.taskKey ?? taskId, lease.reason);
   }
-  const status = await getWorktreeStatus(params.worktreeDir);
-  if (!status.ok) return status;
-  if (!status.data.clean) {
-    return gitErr(
-      `\u041E\u0442\u043A\u0430\u0437: \u0440\u0430\u0431\u043E\u0447\u0435\u0435 \u0434\u0435\u0440\u0435\u0432\u043E \u0433\u0440\u044F\u0437\u043D\u043E\u0435, \u043D\u0435\u0437\u0430\u043A\u043E\u043C\u043C\u0438\u0447\u0435\u043D\u043D\u044B\u0435 \u043F\u0443\u0442\u0438: ${status.data.changedPaths.join(", ")}. Push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F.`
+  const result = await callServerOrError(
+    runtime.client,
+    "question:ask",
+    parsedArgs.data,
+    questionAskAckSchema,
+    waitSec * 1e3 + ASK_ACK_BUFFER_MS
+  );
+  if (!result.ok) return errorResult(result.message);
+  const settled = describeSettledQuestion(result.data.question);
+  if (settled) return textResult(settled);
+  if (args.blocking) {
+    return textResult(
+      `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u0437\u0430\u0434\u0430\u043D, \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u043F\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043D\u0430 \u0432 \u043E\u0436\u0438\u0434\u0430\u043D\u0438\u0435 \u0447\u0435\u043B\u043E\u0432\u0435\u043A\u0430 (WAITING_HUMAN). \u041E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435 \u0431\u044B\u043B\u043E ${BLOCKING_WAIT_SEC} \u0441 (pending) \u2014 \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId="${result.data.question.id}", \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C \u0436\u0434\u0430\u0442\u044C. \u041D\u0435 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439 \u0440\u0430\u0431\u043E\u0442\u0443 \u043F\u043E \u0437\u0430\u0434\u0430\u0447\u0435, \u043F\u043E\u043A\u0430 \u043D\u0435 \u043F\u043E\u043B\u0443\u0447\u0438\u0448\u044C \u043E\u0442\u0432\u0435\u0442.`
     );
   }
-  return gitOk(void 0);
+  return textResult(
+    `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u043E\u0442\u043F\u0440\u0430\u0432\u043B\u0435\u043D (\u043D\u0435 \u0431\u043B\u043E\u043A\u0438\u0440\u0443\u0435\u0442 \u0442\u0435\u043A\u0443\u0449\u0443\u044E \u0437\u0430\u0434\u0430\u0447\u0443). \u041E\u0442\u0432\u0435\u0442\u0430 \u043F\u043E\u043A\u0430 \u043D\u0435\u0442 \u2014 \u0435\u0441\u043B\u0438 \u043E\u043D \u043D\u0443\u0436\u0435\u043D, \u0447\u0442\u043E\u0431\u044B \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0438\u0442\u044C, \u0432\u044B\u0437\u043E\u0432\u0438 wait_answer \u0441 questionId="${result.data.question.id}".`
+  );
 }
-async function pushFastForward(params) {
-  const remote = params.remote ?? "origin";
-  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
-  if (!branchCheck.ok) return branchCheck;
-  const defaultBranchCheck = requireValidBranchName(params.defaultBranch, "\u0418\u043C\u044F \u0431\u0430\u0437\u043E\u0432\u043E\u0439 \u0432\u0435\u0442\u043A\u0438");
-  if (!defaultBranchCheck.ok) return defaultBranchCheck;
-  const ready = await assertReadyToPush(params);
-  if (!ready.ok) return ready;
-  const pushResult = await runGit(["push", remote, `HEAD:refs/heads/${params.defaultBranch}`], {
-    cwd: params.worktreeDir
+var waitAnswerInputShape = {
+  questionId: questionWaitPayloadSchema.shape.questionId.describe(
+    "ID \u0432\u043E\u043F\u0440\u043E\u0441\u0430 \u2014 \u0438\u0437 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442\u0430 ask_human (question.id) \u0438\u043B\u0438 \u043F\u0440\u0435\u0434\u044B\u0434\u0443\u0449\u0435\u0433\u043E \u0432\u044B\u0437\u043E\u0432\u0430 wait_answer."
+  ),
+  waitSec: questionWaitPayloadSchema.shape.waitSec.optional().describe("\u0421\u043A\u043E\u043B\u044C\u043A\u043E \u0441\u0435\u043A\u0443\u043D\u0434 \u0436\u0434\u0430\u0442\u044C \u043E\u0442\u0432\u0435\u0442 \u0432 \u044D\u0442\u043E\u043C \u0432\u044B\u0437\u043E\u0432\u0435, 0..600. \u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E 300.")
+};
+var DEFAULT_WAIT_ANSWER_SEC = 300;
+var WAIT_ANSWER_ACK_BUFFER_MS = 15e3;
+async function waitAnswerHandler(args, runtime) {
+  const waitSec = args.waitSec ?? DEFAULT_WAIT_ANSWER_SEC;
+  const parsedArgs = parseArgsOrError(questionWaitPayloadSchema, {
+    questionId: args.questionId,
+    waitSec
   });
-  if (!pushResult.ok) {
-    return gitErr(
-      describeGitFailure(`git push ${remote} HEAD:refs/heads/${params.defaultBranch}`, pushResult)
-    );
-  }
-  return gitOk({ pushedTo: `${remote}/${params.defaultBranch}` });
+  if (!parsedArgs.ok) return errorResult(parsedArgs.message);
+  const result = await callServerOrError(
+    runtime.client,
+    "question:wait",
+    parsedArgs.data,
+    questionWaitAckSchema,
+    waitSec * 1e3 + WAIT_ANSWER_ACK_BUFFER_MS
+  );
+  if (!result.ok) return errorResult(result.message);
+  const settled = describeSettledQuestion(result.data.question);
+  if (settled) return textResult(settled);
+  return textResult(
+    `\u0412\u043E\u043F\u0440\u043E\u0441 ${result.data.question.id} \u0432\u0441\u0451 \u0435\u0449\u0451 \u0431\u0435\u0437 \u043E\u0442\u0432\u0435\u0442\u0430 (\u0436\u0434\u0430\u043B ${waitSec} \u0441). \u0412\u044B\u0437\u043E\u0432\u0438 wait_answer \u0435\u0449\u0451 \u0440\u0430\u0437 \u0441 \u0442\u0435\u043C \u0436\u0435 questionId, \u043A\u043E\u0433\u0434\u0430 \u0431\u0443\u0434\u0435\u0442 \u0443\u043C\u0435\u0441\u0442\u043D\u043E.`
+  );
 }
-async function submitDirectTask(params) {
-  const remote = params.remote ?? "origin";
-  let worktreeDir;
-  if (params.worktreeDir) {
-    worktreeDir = params.worktreeDir;
-  } else {
-    const worktree = await ensureWorktree({
-      repoRoot: params.repoRoot,
-      branchName: params.branchName,
-      defaultBranch: params.defaultBranch,
-      remote,
-      worktreesRoot: params.worktreesRoot
-    });
-    if (!worktree.ok) return { status: "refused", message: worktree.message };
-    worktreeDir = worktree.data.worktreeDir;
+function describeAnswerAttachments(question) {
+  if (question.attachments.length === 0) return "";
+  const lines = question.attachments.map(
+    (file) => file.downloadUrl ? `- ${file.fileName} (${file.mimeType}) \u2014 \u0441\u043A\u0430\u0447\u0430\u0439: ${file.downloadUrl}` : `- ${file.fileName} (${file.mimeType}) \u2014 \u0441\u0441\u044B\u043B\u043A\u0430 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u0430, \u0445\u0440\u0430\u043D\u0438\u043B\u0438\u0449\u0435 \u043D\u0435 \u043E\u0442\u0432\u0435\u0447\u0430\u0435\u0442`
+  );
+  return `
+
+\u041A \u043E\u0442\u0432\u0435\u0442\u0443 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u044B \u0444\u0430\u0439\u043B\u044B (${question.attachments.length}). \u042D\u0442\u043E \u0447\u0430\u0441\u0442\u044C \u043E\u0442\u0432\u0435\u0442\u0430: \u0441\u043A\u0430\u0447\u0430\u0439 \u0438 \u043F\u0440\u043E\u0447\u0438\u0442\u0430\u0439 \u041A\u0410\u0416\u0414\u042B\u0419, \u0441\u0441\u044B\u043B\u043A\u0438 \u0436\u0438\u0432\u0443\u0442 ${question.attachments[0]?.expiresInSeconds ?? 300} \u0441 \u2014 \u043D\u0435 \u043E\u0442\u043A\u043B\u0430\u0434\u044B\u0432\u0430\u0439.
+` + lines.join("\n");
+}
+function describeSettledQuestion(question) {
+  if (question.status === QuestionStatus.ANSWERED) {
+    return `\u0412\u043E\u043F\u0440\u043E\u0441 ${question.id} \u043F\u043E\u043B\u0443\u0447\u0438\u043B \u043E\u0442\u0432\u0435\u0442:
+${question.answerMd ?? ""}${describeAnswerAttachments(question)}`;
   }
-  const commit = await commitAll({
-    worktreeDir,
-    commitPrefix: params.commitPrefix,
-    title: params.taskTitle,
-    taskKey: params.taskKey
-  });
-  if (!commit.ok) return { status: "refused", worktreeDir, message: commit.message };
-  const rebase = await rebaseOntoDefault({
-    worktreeDir,
-    defaultBranch: params.defaultBranch,
-    remote
-  });
-  if (!rebase.ok) return { status: "refused", worktreeDir, message: rebase.message };
-  if (rebase.data.outcome === "conflict") {
-    const files = rebase.data.conflictedFiles;
-    return {
-      status: "conflict",
-      worktreeDir,
-      conflictedFiles: files,
-      message: `Rebase \u043D\u0430 ${remote}/${params.defaultBranch} \u043A\u043E\u043D\u0444\u043B\u0438\u043A\u0442\u0443\u0435\u0442 \u0432 \u0444\u0430\u0439\u043B\u0430\u0445: ${files.join(", ")}. Rebase \u043E\u0442\u043C\u0435\u043D\u0451\u043D ("git rebase --abort"), \u0432\u0435\u0442\u043A\u0430 "${params.branchName}" \u0438 \u0435\u0451 worktree \u043E\u0441\u0442\u0430\u0432\u043B\u0435\u043D\u044B \u043A\u0430\u043A \u0435\u0441\u0442\u044C \u2014 \u043D\u0443\u0436\u0435\u043D \u0447\u0435\u043B\u043E\u0432\u0435\u043A.`
-    };
+  if (question.status === QuestionStatus.DISMISSED) {
+    return `\u0412\u043E\u043F\u0440\u043E\u0441 ${question.id} \u043E\u0442\u043A\u043B\u043E\u043D\u0451\u043D (DISMISSED) \u2014 \u043E\u0442\u0432\u0435\u0442\u0430 \u043D\u0435 \u0431\u0443\u0434\u0435\u0442. \u0420\u0435\u0448\u0438, \u043A\u0430\u043A \u0434\u0435\u0439\u0441\u0442\u0432\u043E\u0432\u0430\u0442\u044C \u0434\u0430\u043B\u044C\u0448\u0435, \u0441\u0430\u043C, \u0438\u043B\u0438 \u0437\u0430\u0434\u0430\u0439 \u0432\u043E\u043F\u0440\u043E\u0441 \u0437\u0430\u043D\u043E\u0432\u043E.`;
   }
-  if (params.requireTestsPassed && !params.testsPassed) {
-    return {
-      status: "refused",
-      worktreeDir,
-      message: "\u0414\u043B\u044F \u044D\u0442\u043E\u0433\u043E \u043F\u0440\u043E\u0435\u043A\u0442\u0430 requireTests=true, \u0430 testsPassed \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D (\u0438\u043B\u0438 false) \u2014 push \u043D\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u044F\u0435\u0442\u0441\u044F."
-    };
+  return void 0;
+}
+
+// package.json
+var package_default = {
+  name: "@quiel/cli",
+  version: "0.5.3",
+  description: "CLI \u0438 MCP-\u0441\u0435\u0440\u0432\u0435\u0440 Quiel: \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0430\u0435\u0442 \u0430\u0433\u0435\u043D\u0442\u0430 \u0443\u0447\u0430\u0441\u0442\u043D\u0438\u043A\u0430 (Claude Code, Codex, Cursor, OpenCode) \u043A \u043F\u043B\u0430\u0442\u0444\u043E\u0440\u043C\u0435",
+  homepage: "https://quiel.app",
+  repository: {
+    type: "git",
+    url: "git+https://github.com/Quiel-App/quiel-cli.git"
+  },
+  bugs: {
+    url: "https://github.com/Quiel-App/quiel-cli/issues"
+  },
+  keywords: [
+    "quiel",
+    "claude-code",
+    "codex",
+    "cursor",
+    "opencode",
+    "mcp",
+    "mcp-server",
+    "ai-agents",
+    "task-tracker"
+  ],
+  license: "Apache-2.0",
+  type: "module",
+  bin: {
+    quiel: "dist/cli.js"
+  },
+  files: [
+    "dist",
+    "README.md",
+    "LICENSE"
+  ],
+  engines: {
+    node: ">=22"
+  },
+  publishConfig: {
+    access: "public"
+  },
+  scripts: {
+    build: "tsup",
+    dev: "tsup --watch",
+    lint: "biome check .",
+    typecheck: "tsc --noEmit",
+    test: "vitest run --passWithNoTests"
+  },
+  dependencies: {
+    "@modelcontextprotocol/sdk": "1.30.0",
+    commander: "15.0.0",
+    "socket.io-client": "4.8.3",
+    zod: "4.5.4"
+  },
+  devDependencies: {
+    "@quiel/config": "workspace:*",
+    "@quiel/shared": "workspace:*",
+    "@types/node": "20.19.43",
+    tsup: "8.5.1",
+    typescript: "7.0.2",
+    vitest: "5.0.0"
   }
-  const push = await pushFastForward({
-    worktreeDir,
-    branchName: params.branchName,
-    defaultBranch: params.defaultBranch,
-    remote
-  });
-  if (!push.ok) return { status: "refused", worktreeDir, message: push.message };
-  const sha = await getHeadSha(worktreeDir);
-  let worktreeRemoved = false;
-  if (params.removeWorktreeOnSuccess !== false) {
-    const removed = await removeWorktree(params.repoRoot, worktreeDir);
-    if (removed.ok) {
-      await runGit(["branch", "-D", params.branchName], { cwd: params.repoRoot });
-      worktreeRemoved = true;
-    }
+};
+
+// src/version.ts
+var VERSION = package_default.version;
+
+// src/mcp/constants.ts
+var MCP_SERVER_NAME = "quiel";
+var MCP_SERVER_VERSION = VERSION;
+
+// src/mcp/get-context.ts
+var ALL_CONTEXT_INCLUDES = [
+  "spec",
+  "decisions",
+  // ВСЕ документы проекта — по умолчанию, а не по особому запросу.
+  // `spec`/`decisions` покрывают два типа из пяти, и человек, положивший
+  // контекст под типом `DATA` или `PLAN`, вправе ожидать, что агент его
+  // увидит. 14 сентября 2026 ровно этого и не случилось.
+  "documents",
+  "related",
+  "repo"
+];
+var getContextInputShape = {
+  taskId: contextGetPayloadSchema.shape.taskId.describe(
+    "ID \u0437\u0430\u0434\u0430\u0447\u0438, \u0434\u043B\u044F \u043A\u043E\u0442\u043E\u0440\u043E\u0439 \u043D\u0443\u0436\u0435\u043D \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442. \u0415\u0441\u043B\u0438 \u043D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u043D \u2014 \u0431\u0435\u0440\u0451\u0442\u0441\u044F \u0442\u0435\u043A\u0443\u0449\u0430\u044F \u0437\u0430\u0434\u0430\u0447\u0430 \u0430\u0433\u0435\u043D\u0442\u0430 (\u0435\u0441\u043B\u0438 \u0435\u0441\u0442\u044C)."
+  ),
+  include: contextGetPayloadSchema.shape.include.optional().describe(
+    "\u0427\u0442\u043E \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C: spec | decisions | related | repo. \u041D\u0435 \u043F\u0435\u0440\u0435\u0434\u0430\u043D \u0438\u043B\u0438 \u043F\u0443\u0441\u0442 \u2014 \u0432\u0435\u0440\u043D\u0451\u0442\u0441\u044F \u0432\u0441\u0451 \u0441\u0440\u0430\u0437\u0443."
+  )
+};
+async function getContextHandler(args, runtime) {
+  const state = readState(runtime.stateFilePath);
+  const taskId = args.taskId ?? state.currentTask?.taskId;
+  if (taskId) {
+    const lease = runtime.client.isLeaseLost(taskId);
+    if (lease.lost) return leaseLostResult(taskId, lease.reason);
   }
-  return {
-    status: "pushed",
-    worktreeDir,
-    commitSha: sha.ok ? sha.data : null,
-    pushedTo: push.data.pushedTo,
-    worktreeRemoved
-  };
+  const include = args.include && args.include.length > 0 ? args.include : [...ALL_CONTEXT_INCLUDES];
+  const payload = contextGetPayloadSchema.parse({ ...taskId ? { taskId } : {}, include });
+  const result = await callServerOrError(
+    runtime.client,
+    "context:get",
+    payload,
+    contextPayloadSchema
+  );
+  if (!result.ok) return errorResult(result.message);
+  return textResult(JSON.stringify(result.data, null, 2));
 }
 
-// src/git/submit-pr.ts
-async function pushTaskBranch(params) {
-  const remote = params.remote ?? "origin";
-  const branchCheck = requireValidBranchName(params.branchName, "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438");
-  if (!branchCheck.ok) return branchCheck;
-  const ready = await assertReadyToPush(params);
-  if (!ready.ok) return ready;
-  const pushResult = await runGit(
-    ["push", "--set-upstream", remote, `HEAD:refs/heads/${params.branchName}`],
-    { cwd: params.worktreeDir }
-  );
-  if (!pushResult.ok) {
-    return gitErr(
-      describeGitFailure(`git push ${remote} HEAD:refs/heads/${params.branchName}`, pushResult)
+// src/mcp/get-task.ts
+var getTaskInputShape = {
+  taskId: taskGetPayloadSchema.shape.taskId.describe("ID \u0437\u0430\u0434\u0430\u0447\u0438 (Task.id) \u2014 \u043D\u0435 \u043A\u043B\u044E\u0447 \u0432\u0438\u0434\u0430 REL-42")
+};
+async function getTaskHandler(args, runtime) {
+  const lease = runtime.client.isLeaseLost(args.taskId);
+  if (lease.lost) return leaseLostResult(args.taskId, lease.reason);
+  const payload = taskGetPayloadSchema.parse({ taskId: args.taskId });
+  const result = await callServerOrError(runtime.client, "task:get", payload, taskGetAckSchema);
+  if (!result.ok) return errorResult(result.message);
+  return textResult(JSON.stringify(result.data, null, 2));
+}
+
+// src/mcp/log.ts
+var logInputShape = {
+  message: taskProgressPayloadSchema.shape.note.describe("\u0421\u0442\u0440\u043E\u043A\u0430 \u0432 \u043B\u0435\u043D\u0442\u0443 \u0442\u0435\u043A\u0443\u0449\u0435\u0439 \u0437\u0430\u0434\u0430\u0447\u0438"),
+  level: taskProgressPayloadSchema.shape.level.optional().describe("debug | info | warn | error, \u043F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E info")
+};
+async function logHandler(args, runtime) {
+  const state = readState(runtime.stateFilePath);
+  if (!state.currentTask) {
+    return errorResult(
+      "\u041D\u0435\u0442 \u0430\u043A\u0442\u0438\u0432\u043D\u043E\u0439 \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u0437\u0430\u043F\u0438\u0441\u044B\u0432\u0430\u0442\u044C \u043D\u0435\u043A\u0443\u0434\u0430 \u0432 \u0435\u0451 \u043B\u0435\u043D\u0442\u0443. \u0421\u043D\u0430\u0447\u0430\u043B\u0430 \u0432\u044B\u0437\u043E\u0432\u0438 next_task."
     );
   }
-  return gitOk({ pushedTo: `${remote}/${params.branchName}` });
-}
-async function submitPullRequestTask(params) {
-  const remote = params.remote ?? "origin";
-  let worktreeDir;
-  if (params.worktreeDir) {
-    worktreeDir = params.worktreeDir;
-  } else {
-    const worktree = await ensureWorktree({
-      repoRoot: params.repoRoot,
-      branchName: params.branchName,
-      defaultBranch: params.defaultBranch,
-      remote,
-      worktreesRoot: params.worktreesRoot
-    });
-    if (!worktree.ok) return { status: "refused", message: worktree.message };
-    worktreeDir = worktree.data.worktreeDir;
+  const lease = runtime.client.isLeaseLost(state.currentTask.taskId);
+  if (lease.lost) {
+    return leaseLostResult(state.currentTask.taskKey ?? state.currentTask.taskId, lease.reason);
   }
-  const commit = await commitAll({
-    worktreeDir,
-    commitPrefix: params.commitPrefix,
-    title: params.taskTitle,
-    taskKey: params.taskKey
-  });
-  if (!commit.ok) return { status: "refused", worktreeDir, message: commit.message };
-  const rebase = await rebaseOntoDefault({
-    worktreeDir,
-    defaultBranch: params.defaultBranch,
-    remote
+  const payload = taskProgressPayloadSchema.parse({
+    taskId: state.currentTask.taskId,
+    note: args.message,
+    ...args.level ? { level: args.level } : {}
   });
-  if (!rebase.ok) return { status: "refused", worktreeDir, message: rebase.message };
-  const conflicted = rebase.data.outcome === "conflict";
-  const push = await pushTaskBranch({ worktreeDir, branchName: params.branchName, remote });
-  if (!push.ok) return { status: "refused", worktreeDir, message: push.message };
-  const sha = await getHeadSha(worktreeDir);
-  let worktreeRemoved = false;
-  if (params.removeWorktreeOnSuccess !== false) {
-    const removed = await removeWorktree(params.repoRoot, worktreeDir);
-    if (removed.ok) {
-      await runGit(["branch", "-D", params.branchName], { cwd: params.repoRoot });
-      worktreeRemoved = true;
-    }
-  }
-  return {
-    status: "pushed",
-    worktreeDir,
-    branchName: params.branchName,
-    commitSha: sha.ok ? sha.data : null,
-    pushedTo: push.data.pushedTo,
-    conflicted,
-    conflictedFiles: rebase.data.conflictedFiles,
-    worktreeRemoved
-  };
+  const result = await callServerOrError(
+    runtime.client,
+    "task:progress",
+    payload,
+    taskProgressAckSchema
+  );
+  if (!result.ok) return errorResult(result.message);
+  if (!result.data.ok) return errorResult("\u0421\u0435\u0440\u0432\u0435\u0440 \u043D\u0435 \u043F\u0440\u0438\u043D\u044F\u043B \u0437\u0430\u043F\u0438\u0441\u044C \u0432 \u043B\u0435\u043D\u0442\u0443 \u0437\u0430\u0434\u0430\u0447\u0438 (ok:false).");
+  return textResult("\u0417\u0430\u043F\u0438\u0441\u0430\u043D\u043E \u0432 \u043B\u0435\u043D\u0442\u0443 \u0437\u0430\u0434\u0430\u0447\u0438.");
 }
 
 // src/mcp/task-worktree.ts
@@ -5725,7 +6013,9 @@ async function nextTaskHandler(args, runtime) {
         taskId: task.task.id,
         taskKey: task.task.key,
         resumeToken: task.lease.resumeToken,
-        gitMode: task.project.gitMode
+        gitMode: task.project.gitMode,
+        branchName: task.project.branchName,
+        commitPrefix: task.project.commitPrefix
       }
     },
     stateFilePath
@@ -5738,7 +6028,12 @@ async function nextTaskHandler(args, runtime) {
     const worktree = await ensureWorktree({
       repoRoot: runtime.cwd,
       branchName: plan.branchName,
-      defaultBranch: plan.defaultBranch
+      defaultBranch: plan.defaultBranch,
+      // LIM-03: задачу уже начинали и прервали — рабочее дерево заводим
+      // ОТ ТОЙ ВЕТКИ, а не от основной. Иначе спасённая работа осталась
+      // бы лежать на origin никем не прочитанной, и агент сделал бы её
+      // заново, потратив свой лимит подписки на чужую.
+      continueFromBranch: task.continueFrom?.branchName
     });
     if (worktree.ok) {
       updateState(
@@ -5748,6 +6043,8 @@ async function nextTaskHandler(args, runtime) {
             taskKey: task.task.key,
             resumeToken: task.lease.resumeToken,
             gitMode: task.project.gitMode,
+            branchName: task.project.branchName,
+            commitPrefix: task.project.commitPrefix,
             worktreeDir: worktree.data.worktreeDir
           }
         },
@@ -5766,11 +6063,14 @@ async function nextTaskHandler(args, runtime) {
   const warning = !started.ok ? `
 
 \u0412\u041D\u0418\u041C\u0410\u041D\u0418\u0415: task:start \u043D\u0435 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0451\u043D \u0441\u0435\u0440\u0432\u0435\u0440\u043E\u043C (${started.message}). \u0410\u0440\u0435\u043D\u0434\u0430 \u0442\u0432\u043E\u044F (\u0437\u0430\u0434\u0430\u0447\u0430 \u0432\u044B\u0434\u0430\u043D\u0430), \u043D\u043E \u0441\u0442\u0430\u0442\u0443\u0441 \u043D\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u043C\u043E\u0436\u0435\u0442 \u043E\u0441\u0442\u0430\u0442\u044C\u0441\u044F ASSIGNED \u0432\u043C\u0435\u0441\u0442\u043E IN_PROGRESS \u2014 \u0440\u0430\u0431\u043E\u0442\u0430\u0439 \u043A\u0430\u043A \u043E\u0431\u044B\u0447\u043D\u043E, report \u0432\u0441\u0451 \u0440\u0430\u0432\u043D\u043E \u0441\u0434\u0430\u0441\u0442 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442.` : !started.data.ok ? "\n\n\u0412\u041D\u0418\u041C\u0410\u041D\u0418\u0415: \u0441\u0435\u0440\u0432\u0435\u0440 \u043E\u0442\u043A\u043B\u043E\u043D\u0438\u043B task:start (ok:false). \u0410\u0440\u0435\u043D\u0434\u0430 \u0442\u0432\u043E\u044F, \u043D\u043E \u0441\u0442\u0430\u0442\u0443\u0441 \u043C\u043E\u0436\u0435\u0442 \u043D\u0435 \u0441\u043E\u0432\u043F\u0430\u0434\u0430\u0442\u044C \u2014 \u0443\u043F\u043E\u043C\u044F\u043D\u0438 \u044D\u0442\u043E \u0432 report." : "";
+  const continueNote = task.continueFrom ? `
+
+\u042D\u0422\u0423 \u0417\u0410\u0414\u0410\u0427\u0423 \u0423\u0416\u0415 \u041D\u0410\u0427\u0418\u041D\u0410\u041B\u0418. \u041D\u0435\u0437\u0430\u043A\u043E\u043D\u0447\u0435\u043D\u043D\u0430\u044F \u0440\u0430\u0431\u043E\u0442\u0430 \u043B\u0435\u0436\u0438\u0442 \u0432 \u0432\u0435\u0442\u043A\u0435 "${task.continueFrom.branchName}"${task.continueFrom.sha ? ` (\u043A\u043E\u043C\u043C\u0438\u0442 ${task.continueFrom.sha.slice(0, 8)})` : ""}${task.continueFrom.note ? `: ${task.continueFrom.note}` : ""}. \u0420\u0430\u0431\u043E\u0447\u0435\u0435 \u0434\u0435\u0440\u0435\u0432\u043E \u0437\u0430\u0432\u0435\u0434\u0435\u043D\u043E \u043E\u0442 \u043D\u0435\u0451 \u2014 \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0438, \u0447\u0442\u043E \u0443\u0436\u0435 \u0441\u0434\u0435\u043B\u0430\u043D\u043E, \u0438 \u043F\u0440\u043E\u0434\u043E\u043B\u0436\u0430\u0439, \u0430 \u043D\u0435 \u043D\u0430\u0447\u0438\u043D\u0430\u0439 \u0437\u0430\u043D\u043E\u0432\u043E. \u0420\u0435\u0448\u0438\u0448\u044C, \u0447\u0442\u043E \u043F\u0440\u043E\u0449\u0435 \u043F\u0435\u0440\u0435\u0434\u0435\u043B\u0430\u0442\u044C, \u2014 \u043F\u0435\u0440\u0435\u0434\u0435\u043B\u044B\u0432\u0430\u0439, \u043D\u043E \u0441\u043D\u0430\u0447\u0430\u043B\u0430 \u043F\u043E\u0441\u043C\u043E\u0442\u0440\u0438.` : "";
   return textResult(
     `\u0417\u0430\u0434\u0430\u0447\u0430 \u043F\u043E\u043B\u0443\u0447\u0435\u043D\u0430:
 ${JSON.stringify(task, null, 2)}
 
-${worktreeNote}${warning}`
+${worktreeNote}${continueNote}${warning}`
   );
 }
 
@@ -6010,7 +6310,7 @@ async function settleApproval(ack, commandCwd, runtime, waitSecUsed) {
 }
 
 // src/mcp/set-mode.ts
-import { z as z37 } from "zod";
+import { z as z38 } from "zod";
 
 // src/cli/mode.ts
 function parseModeArg(raw) {
@@ -6051,7 +6351,7 @@ async function requestModeChange(modeArg, options = {}) {
 
 // src/mcp/set-mode.ts
 var setModeInputShape = {
-  mode: z37.enum(["auto", "manual"]).describe("auto \u2014 \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0430\u0432\u0442\u043E\u043D\u043E\u043C\u043D\u044B\u0439 \u0440\u0435\u0436\u0438\u043C \u0430\u0433\u0435\u043D\u0442\u0430, manual \u2014 \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C (\xA710.2 \u0422\u0417)")
+  mode: z38.enum(["auto", "manual"]).describe("auto \u2014 \u0432\u043A\u043B\u044E\u0447\u0438\u0442\u044C \u0430\u0432\u0442\u043E\u043D\u043E\u043C\u043D\u044B\u0439 \u0440\u0435\u0436\u0438\u043C \u0430\u0433\u0435\u043D\u0442\u0430, manual \u2014 \u0432\u044B\u043A\u043B\u044E\u0447\u0438\u0442\u044C (\xA710.2 \u0422\u0417)")
 };
 async function setModeHandler(args, runtime) {
   const result = await requestModeChange(args.mode, {
@@ -6066,20 +6366,20 @@ async function setModeHandler(args, runtime) {
 }
 
 // src/mcp/submit-work.ts
-import { z as z38 } from "zod";
+import { z as z39 } from "zod";
 var submitWorkInputShape = {
-  branchName: z38.string().min(1).describe(
+  branchName: z39.string().min(1).describe(
     "\u0418\u043C\u044F \u0432\u0435\u0442\u043A\u0438 \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u0431\u0435\u0440\u0438 \u0440\u043E\u0432\u043D\u043E \u0438\u0437 project.branchName \u0432 TaskPayload, \u043A\u043E\u0442\u043E\u0440\u044B\u0439 \u0432\u0435\u0440\u043D\u0443\u043B next_task. \u041D\u0435 \u043F\u0440\u0438\u0434\u0443\u043C\u044B\u0432\u0430\u0439 \u0441\u0432\u043E\u0451."
   ),
-  defaultBranch: z38.string().min(1).describe("\u041E\u0441\u043D\u043E\u0432\u043D\u0430\u044F \u0432\u0435\u0442\u043A\u0430 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F \u2014 \u0438\u0437 project.repos[].defaultBranch."),
-  commitPrefix: z38.string().min(1).describe('\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u043A\u043E\u043C\u043C\u0438\u0442\u0430 \u2014 \u0438\u0437 project.commitPrefix, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 "ATL-42:".'),
-  taskKey: z38.string().min(1).describe("\u041A\u043B\u044E\u0447 \u0437\u0430\u0434\u0430\u0447\u0438, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 ATL-42 \u2014 \u0438\u0437 task.key."),
-  taskTitle: z38.string().min(1).describe("\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u0438\u0437 task.title."),
-  repoRoot: z38.string().min(1).optional().describe("\u041A\u043E\u0440\u0435\u043D\u044C git-\u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F. \u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u2014 \u0440\u0430\u0431\u043E\u0447\u0438\u0439 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u043F\u0440\u043E\u0435\u043A\u0442\u0430."),
-  testsPassed: z38.boolean().optional().describe(
+  defaultBranch: z39.string().min(1).describe("\u041E\u0441\u043D\u043E\u0432\u043D\u0430\u044F \u0432\u0435\u0442\u043A\u0430 \u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F \u2014 \u0438\u0437 project.repos[].defaultBranch."),
+  commitPrefix: z39.string().min(1).describe('\u041F\u0440\u0435\u0444\u0438\u043A\u0441 \u0441\u043E\u043E\u0431\u0449\u0435\u043D\u0438\u044F \u043A\u043E\u043C\u043C\u0438\u0442\u0430 \u2014 \u0438\u0437 project.commitPrefix, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 "ATL-42:".'),
+  taskKey: z39.string().min(1).describe("\u041A\u043B\u044E\u0447 \u0437\u0430\u0434\u0430\u0447\u0438, \u043D\u0430\u043F\u0440\u0438\u043C\u0435\u0440 ATL-42 \u2014 \u0438\u0437 task.key."),
+  taskTitle: z39.string().min(1).describe("\u0417\u0430\u0433\u043E\u043B\u043E\u0432\u043E\u043A \u0437\u0430\u0434\u0430\u0447\u0438 \u2014 \u0438\u0437 task.title."),
+  repoRoot: z39.string().min(1).optional().describe("\u041A\u043E\u0440\u0435\u043D\u044C git-\u0440\u0435\u043F\u043E\u0437\u0438\u0442\u043E\u0440\u0438\u044F. \u041F\u043E \u0443\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044E \u2014 \u0440\u0430\u0431\u043E\u0447\u0438\u0439 \u043A\u0430\u0442\u0430\u043B\u043E\u0433 \u043F\u0440\u043E\u0435\u043A\u0442\u0430."),
+  testsPassed: z39.boolean().optional().describe(
     "\u041F\u0440\u043E\u0448\u043B\u0438 \u043B\u0438 \u0442\u0435\u0441\u0442\u044B. \u0415\u0441\u043B\u0438 \u043F\u0440\u043E\u0435\u043A\u0442 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u0437\u0435\u043B\u0451\u043D\u044B\u0445 \u0442\u0435\u0441\u0442\u043E\u0432, \u0430 \u0437\u0434\u0435\u0441\u044C false \u2014 \u0441\u0434\u0430\u0447\u0430 \u043D\u0435 \u0441\u043E\u0441\u0442\u043E\u0438\u0442\u0441\u044F, \u0438 \u044D\u0442\u043E \u043F\u0440\u0430\u0432\u0438\u043B\u044C\u043D\u043E."
   ),
-  requireTestsPassed: z38.boolean().optional().describe("ProjectSettings.requireTests \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u2014 \u0438\u0437 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u0437\u0430\u0434\u0430\u0447\u0438.")
+  requireTestsPassed: z39.boolean().optional().describe("ProjectSettings.requireTests \u043F\u0440\u043E\u0435\u043A\u0442\u0430 \u2014 \u0438\u0437 \u043A\u043E\u043D\u0442\u0435\u043A\u0441\u0442\u0430 \u0437\u0430\u0434\u0430\u0447\u0438.")
 };
 async function submitWorkHandler(args, runtime) {
   const state = readState(runtime.stateFilePath);
@@ -6553,13 +6853,13 @@ function formatConnectResult(result) {
 }
 
 // src/hooks/pre-compact.ts
-import { z as z39 } from "zod";
-var PreCompactInputSchema = z39.object({
-  hook_event_name: z39.literal("PreCompact"),
-  session_id: z39.string(),
-  cwd: z39.string(),
-  trigger: z39.enum(["manual", "auto"]),
-  custom_instructions: z39.string().nullable()
+import { z as z40 } from "zod";
+var PreCompactInputSchema = z40.object({
+  hook_event_name: z40.literal("PreCompact"),
+  session_id: z40.string(),
+  cwd: z40.string(),
+  trigger: z40.enum(["manual", "auto"]),
+  custom_instructions: z40.string().nullable()
 }).passthrough();
 function preCompactHook(_input, state, now = () => (/* @__PURE__ */ new Date()).toISOString()) {
   const lastPreCompact = state.currentTask ? { ...state.currentTask, savedAt: now() } : null;
@@ -6568,14 +6868,14 @@ function preCompactHook(_input, state, now = () => (/* @__PURE__ */ new Date()).
 
 // src/hooks/pre-tool-use.ts
 import { isAbsolute as isAbsolute2, relative as relative2, resolve as resolve3 } from "path";
-import { z as z40 } from "zod";
-var PreToolUseInputSchema = z40.object({
-  hook_event_name: z40.literal("PreToolUse"),
-  session_id: z40.string(),
-  cwd: z40.string(),
-  tool_name: z40.string(),
-  tool_input: z40.record(z40.string(), z40.unknown()),
-  tool_use_id: z40.string()
+import { z as z41 } from "zod";
+var PreToolUseInputSchema = z41.object({
+  hook_event_name: z41.literal("PreToolUse"),
+  session_id: z41.string(),
+  cwd: z41.string(),
+  tool_name: z41.string(),
+  tool_input: z41.record(z41.string(), z41.unknown()),
+  tool_use_id: z41.string()
 }).passthrough();
 var NO_TRUST_CACHE_REASON = "\u041A\u044D\u0448 \u043F\u0440\u0430\u0432\u0438\u043B \u0434\u043E\u0432\u0435\u0440\u0438\u044F (TrustRules) \u043F\u0443\u0441\u0442 \u2014 \u043A\u043B\u0438\u0435\u043D\u0442 \u043D\u0438 \u0440\u0430\u0437\u0443 \u043D\u0435 \u043F\u043E\u043B\u0443\u0447\u0430\u043B \u0438\u0445 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 (\u043D\u0435\u0442 agent:hello/trust:updated). \u041E\u043F\u0440\u0435\u0434\u0435\u043B\u0438\u0442\u044C \u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044E\u0449\u0438\u0439 \u043F\u0440\u043E\u0444\u0438\u043B\u044C (full/guarded/approve-all) \u0431\u0435\u0437 \u043D\u0435\u0433\u043E \u043D\u0435\u043B\u044C\u0437\u044F, \u043F\u043E\u044D\u0442\u043E\u043C\u0443 \u043F\u043E \u043F\u0440\u0430\u0432\u0438\u043B\u0443 \u043F\u0440\u043E\u0435\u043A\u0442\u0430 (fail-closed \u043F\u0440\u0438 \u043D\u0435\u0434\u043E\u0441\u0442\u0443\u043F\u043D\u043E\u0441\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430, \xA710.4 \u0422\u0417) \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \u0442\u0440\u0435\u0431\u0443\u0435\u0442 \u043F\u043E\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043D\u0438\u044F. \u041F\u043E\u0434\u043D\u0438\u043C\u0438 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435: `quiel connect` (\u044D\u0442\u0430 \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0430 \u0438\u043C\u0435\u043D\u043D\u043E \u0434\u043B\u044F \u0442\u0430\u043A\u043E\u0433\u043E \u0441\u043B\u0443\u0447\u0430\u044F, \u0441\u043C. isBootstrapCommand) \u2014 \u043F\u043E\u0441\u043B\u0435 \u0440\u0443\u043A\u043E\u043F\u043E\u0436\u0430\u0442\u0438\u044F \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\u0440\u0438\u0434\u0443\u0442, \u0438 \u043A\u043E\u043C\u0430\u043D\u0434\u044B \u043D\u0430\u0447\u043D\u0443\u0442 \u043F\u0440\u043E\u0445\u043E\u0434\u0438\u0442\u044C. \u0415\u0441\u043B\u0438 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0443\u0436\u0435 \u0435\u0441\u0442\u044C, \u0432\u044B\u0437\u043E\u0432\u0438 request_approval.";
 var BOOTSTRAP_COMMAND_RE = /^quiel\s+(connect|status)\b/;
@@ -6807,13 +7107,13 @@ function readNewUsage(transcriptPath, offset) {
 }
 
 // src/hooks/session-start.ts
-import { z as z41 } from "zod";
-var SessionStartInputSchema = z41.object({
-  hook_event_name: z41.literal("SessionStart"),
-  session_id: z41.string(),
-  cwd: z41.string(),
-  source: z41.enum(["startup", "resume", "clear", "compact", "fork"]),
-  model: z41.string().optional()
+import { z as z42 } from "zod";
+var SessionStartInputSchema = z42.object({
+  hook_event_name: z42.literal("SessionStart"),
+  session_id: z42.string(),
+  cwd: z42.string(),
+  source: z42.enum(["startup", "resume", "clear", "compact", "fork"]),
+  model: z42.string().optional()
 }).passthrough();
 var SESSION_RESET_SOURCES = /* @__PURE__ */ new Set([
   "startup",
@@ -6852,13 +7152,13 @@ function sessionStartHook(input, state) {
 }
 
 // src/hooks/stop.ts
-import { z as z42 } from "zod";
-var StopInputSchema = z42.object({
-  hook_event_name: z42.literal("Stop"),
-  session_id: z42.string(),
-  cwd: z42.string(),
-  stop_hook_active: z42.boolean(),
-  last_assistant_message: z42.string().optional()
+import { z as z43 } from "zod";
+var StopInputSchema = z43.object({
+  hook_event_name: z43.literal("Stop"),
+  session_id: z43.string(),
+  cwd: z43.string(),
+  stop_hook_active: z43.boolean(),
+  last_assistant_message: z43.string().optional()
 }).passthrough();
 function taskLabel(state) {
   if (!state.currentTask) return "";
@@ -6901,55 +7201,6 @@ function stopHook(input, state) {
   };
 }
 
-// src/hooks/stop-failure.ts
-import { z as z43 } from "zod";
-var StopFailureErrorTypeSchema = z43.enum([
-  "rate_limit",
-  "overloaded",
-  "authentication_failed",
-  "oauth_org_not_allowed",
-  "account_on_hold",
-  "billing_error",
-  "invalid_request",
-  "model_not_found",
-  "server_error",
-  "max_output_tokens",
-  "unknown"
-]);
-var StopFailureInputSchema = z43.object({
-  hook_event_name: z43.literal("StopFailure"),
-  session_id: z43.string(),
-  cwd: z43.string(),
-  error: StopFailureErrorTypeSchema,
-  error_details: z43.unknown().optional(),
-  last_assistant_message: z43.string().optional()
-}).passthrough();
-function extractRetryAfterSec(errorDetails) {
-  if (typeof errorDetails === "number" && Number.isFinite(errorDetails) && errorDetails >= 0) {
-    return errorDetails;
-  }
-  if (errorDetails && typeof errorDetails === "object") {
-    const record = errorDetails;
-    for (const key of ["retryAfterSec", "retryAfter", "retry_after", "retry_after_seconds"]) {
-      const value = record[key];
-      if (typeof value === "number" && Number.isFinite(value) && value >= 0) return value;
-    }
-  }
-  if (typeof errorDetails === "string") {
-    const match = errorDetails.match(/retry[-_ ]?after[^0-9]{0,10}(\d+)/i);
-    if (match?.[1] !== void 0) return Number(match[1]);
-  }
-  return void 0;
-}
-function stopFailureHook(input, _state) {
-  const retryAfterSec = extractRetryAfterSec(input.error_details);
-  const action = {
-    type: "agent:rate_limited",
-    payload: retryAfterSec === void 0 ? { error: input.error } : { error: input.error, retryAfterSec }
-  };
-  return { output: {}, serverActions: [action] };
-}
-
 // src/hooks/run.ts
 var HookInputSchema = z44.discriminatedUnion("hook_event_name", [
   SessionStartInputSchema,
@@ -7453,13 +7704,26 @@ function createProgram() {
       if (result.stderr.length > 0) process.stderr.write(`${result.stderr}
 `);
       process.exitCode = result.exitCode;
-      if (result.execution) sendHookActions(result.execution.serverActions);
+      if (result.execution) {
+        const rescued = await runRescueAction(result.execution.serverActions);
+        const rescuedNote = describeRescue(rescued);
+        if (rescuedNote) process.stderr.write(`${rescuedNote}
+`);
+        sendHookActions(
+          rescued.report ? [...result.execution.serverActions, rescued.report] : result.execution.serverActions
+        );
+      }
       return;
     }
     const execution = runCliHook(raw);
     process.stdout.write(`${execution.stdout}
 `);
     process.exitCode = execution.exitCode;
+    const rescue = await runRescueAction(execution.serverActions);
+    const note = describeRescue(rescue);
+    if (note) process.stderr.write(`${note}
+`);
+    if (rescue.report) sendHookActions([rescue.report]);
     sendHookActions(execution.serverActions);
   });
   program.command("mcp").description(