@ordewell/core 0.4.9 → 0.4.10

package/dist/index.js

@@ -96,6 +96,11 @@ __export(index_exports, {
   SettingsService: () => SettingsService,
   StdioAgentAdapter: () => StdioAgentAdapter,
   TASK_OPS_ENVELOPE_KEY: () => TASK_OPS_ENVELOPE_KEY,
+  TASK_QUERY_ANSWER_OR_OPS: () => TASK_QUERY_ANSWER_OR_OPS,
+  TASK_QUERY_ENVELOPE_KEY: () => TASK_QUERY_ENVELOPE_KEY,
+  TASK_QUERY_FIELDS: () => TASK_QUERY_FIELDS,
+  TASK_QUERY_PROTOCOL: () => TASK_QUERY_PROTOCOL,
+  TASK_QUERY_REMINDER: () => TASK_QUERY_REMINDER,
   TRUNCATED_PLAN_REPAIR_INSTRUCTION: () => TRUNCATED_PLAN_REPAIR_INSTRUCTION,
   TaskOrchestrator: () => TaskOrchestrator,
   TmuxRunner: () => TmuxRunner,
@@ -216,6 +221,7 @@ __export(index_exports, {
   parsePartialPlan: () => parsePartialPlan,
   parsePlanJson: () => parsePlanJson,
   parseTaskOpsJson: () => parseTaskOpsJson,
+  parseTaskQueryJson: () => parseTaskQueryJson,
   pendingEditRulesBlock: () => pendingEditRulesBlock,
   planDirectLaunch: () => planDirectLaunch,
   planShellLaunch: () => planShellLaunch,
@@ -224,11 +230,13 @@ __export(index_exports, {
   providerForRunner: () => providerForRunner,
   reEmitPlanPrompt: () => reEmitPlanPrompt,
   reEmitTaskOpsPrompt: () => reEmitTaskOpsPrompt,
+  reEmitTaskQueryPrompt: () => reEmitTaskQueryPrompt,
   readDaemonToken: () => readDaemonToken,
   referencePattern: () => referencePattern,
   removeTaskFromPlan: () => removeTaskFromPlan,
   renderPlanMap: () => renderPlanMap,
   renderPriorOutputs: () => renderPriorOutputs,
+  renderTaskQueryAnswer: () => renderTaskQueryAnswer,
   renumberTasks: () => renumberTasks,
   repairLoop: () => repairLoop,
   researchShellWarning: () => researchShellWarning,
@@ -262,7 +270,9 @@ __export(index_exports, {
   summarizeOutput: () => summarizeOutput,
   summarizeToolCall: () => summarizeToolCall,
   taskOpsRejectedPrompt: () => taskOpsRejectedPrompt,
+  taskQuerySignature: () => taskQuerySignature,
   textHasTaskOps: () => textHasTaskOps,
+  textHasTaskQuery: () => textHasTaskQuery,
   tmuxSessionName: () => tmuxSessionName,
   tmuxSocketName: () => tmuxSocketName,
   tmuxWindowName: () => tmuxWindowName,
@@ -4237,7 +4247,7 @@ function formatError(err) {
 var defaultLogger = new ConsoleLogger();
 
 // src/services/BaseAiService.ts
-var import_uuid2 = require("uuid");
+var import_uuid3 = require("uuid");
 
 // src/services/ModeResolver.ts
 function runnerModesFrom(registry, runners) {
@@ -4360,6 +4370,321 @@ function modesFor(scope, modes) {
   return scoped;
 }
 
+// src/services/JsonExtractor.ts
+var PLAN_ENVELOPE_KEY = "tasks";
+var TASK_OPS_ENVELOPE_KEY = "taskOps";
+var TASK_QUERY_ENVELOPE_KEY = "taskQuery";
+var PlanParseError = class extends Error {
+  raw;
+  /**
+   * True when the reply was cut off mid-object (output-token limit) rather
+   * than malformed — the two need different repairs: a truncated emission will
+   * be cut at the same point again unless the retry frees context or asks for
+   * terser output.
+   */
+  truncated;
+  /**
+   * True when the JSON parsed fine and a *shape* rule rejected it. The generic
+   * "could not be parsed as JSON" corrective is a lie for these, so the model
+   * re-sends the same object; a semantic rejection must be repaired by naming
+   * the rule it broke.
+   */
+  semantic;
+  constructor(message, raw, opts) {
+    super(message);
+    this.name = "PlanParseError";
+    this.raw = raw;
+    this.truncated = opts?.truncated ?? false;
+    this.semantic = opts?.semantic ?? false;
+  }
+};
+function stripModelNoise(raw) {
+  return raw.replace(/<think>[\s\S]*?<\/think>/gi, "").replace(/```json\s*/gi, "").replace(/```\s*/g, "").trim();
+}
+function balancedObjectAt(text, start) {
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = start; i < text.length; i++) {
+    const ch = text[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') inString = true;
+    else if (ch === "{") depth++;
+    else if (ch === "}") {
+      depth--;
+      if (depth === 0) return { json: text.slice(start, i + 1), balanced: true };
+    }
+  }
+  return { json: text.slice(start), balanced: false };
+}
+function extractObjectsWithKey(raw, key) {
+  const stripped = stripModelNoise(raw);
+  const keyRe = new RegExp(`"${key}"\\s*:`);
+  const matches = [];
+  let firstObject = null;
+  let sawBrace = false;
+  let sawUnbalanced = false;
+  let inString = false;
+  let escaped = false;
+  for (let i = 0; i < stripped.length; i++) {
+    const ch = stripped[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      continue;
+    }
+    if (ch !== "{") continue;
+    sawBrace = true;
+    const obj = balancedObjectAt(stripped, i);
+    if (obj.balanced && keyRe.test(obj.json)) {
+      matches.push(obj.json);
+      i += obj.json.length - 1;
+      continue;
+    }
+    if (!obj.balanced) sawUnbalanced = true;
+    if (!firstObject && obj.balanced) firstObject = obj.json;
+  }
+  return {
+    matches,
+    fallback: firstObject !== null ? { json: firstObject, balanced: true } : { json: stripped, balanced: false },
+    sawBrace,
+    sawUnbalanced
+  };
+}
+function extractObjectWithBalance(raw) {
+  const { matches, fallback, sawBrace } = extractObjectsWithKey(raw, PLAN_ENVELOPE_KEY);
+  if (matches.length > 0) return { json: matches[0], balanced: true, sawBrace };
+  return { ...fallback, sawBrace };
+}
+function extractJsonObject(raw) {
+  return extractObjectWithBalance(raw).json;
+}
+function stripTrailingCommas(json) {
+  return json.replace(/,(\s*[}\]])/g, "$1");
+}
+function escapeControlCharsInStrings(json) {
+  let out = "";
+  let inString = false;
+  let escaped = false;
+  for (const ch of json) {
+    if (inString) {
+      if (escaped) {
+        out += ch;
+        escaped = false;
+        continue;
+      }
+      if (ch === "\\") {
+        out += ch;
+        escaped = true;
+        continue;
+      }
+      if (ch === '"') {
+        out += ch;
+        inString = false;
+        continue;
+      }
+      if (ch === "\n") {
+        out += "\\n";
+        continue;
+      }
+      if (ch === "\r") {
+        out += "\\r";
+        continue;
+      }
+      if (ch === "	") {
+        out += "\\t";
+        continue;
+      }
+      out += ch;
+      continue;
+    }
+    if (ch === '"') inString = true;
+    out += ch;
+  }
+  return out;
+}
+
+// src/services/TaskQuery.ts
+var TASK_QUERY_FIELDS = [
+  "description",
+  "prompt",
+  "userSteps",
+  "verdict",
+  "outputSummary",
+  "userStoriesCovered"
+];
+function textHasTaskQuery(text) {
+  return text.includes(`"${TASK_QUERY_ENVELOPE_KEY}"`);
+}
+function parseTaskQueryJson(text) {
+  const { matches, fallback } = extractObjectsWithKey(text, TASK_QUERY_ENVELOPE_KEY);
+  const candidates = matches.length > 0 ? [...matches].reverse() : [fallback.json];
+  let lastError = null;
+  for (const json of candidates) {
+    try {
+      return parseTaskQueryObject(json, text);
+    } catch (err) {
+      if (!(err instanceof PlanParseError)) throw err;
+      if (!lastError) lastError = err;
+    }
+  }
+  throw lastError ?? new PlanParseError("No JSON object found in task-query reply", text);
+}
+function parseTaskQueryObject(json, text) {
+  let parsed;
+  try {
+    parsed = JSON.parse(escapeControlCharsInStrings(stripTrailingCommas(json)));
+  } catch (err) {
+    throw new PlanParseError(`Task-query JSON is invalid: ${err instanceof Error ? err.message : String(err)}`, text);
+  }
+  const raw = parsed.taskQuery;
+  const body = Array.isArray(raw) ? { tasks: raw } : raw;
+  if (typeof body !== "object" || body === null) {
+    throw new PlanParseError('"taskQuery" must be an object (or an array of task references)', text);
+  }
+  const { tasks: rawTasks, fields: rawFields, catalog: rawCatalog } = body;
+  const tasks = [];
+  if (rawTasks !== void 0) {
+    if (!Array.isArray(rawTasks)) throw new PlanParseError('"tasks" in a taskQuery must be an array of task references', text);
+    for (const ref of rawTasks) {
+      if (typeof ref !== "string" && typeof ref !== "number") {
+        throw new PlanParseError(`Invalid task reference "${String(ref)}" in taskQuery`, text);
+      }
+      tasks.push(String(ref).trim());
+    }
+  }
+  let fields;
+  if (rawFields !== void 0) {
+    if (!Array.isArray(rawFields)) throw new PlanParseError('"fields" in a taskQuery must be an array of field names', text);
+    fields = [];
+    for (const f of rawFields) {
+      if (typeof f !== "string" || !TASK_QUERY_FIELDS.includes(f)) {
+        throw new PlanParseError(`Unknown taskQuery field "${String(f)}" \u2014 choose from ${TASK_QUERY_FIELDS.join(", ")}`, text);
+      }
+      fields.push(f);
+    }
+  }
+  const catalog = rawCatalog === true;
+  if (tasks.length === 0 && !catalog) {
+    throw new PlanParseError('A taskQuery must name at least one task or set "catalog": true', text);
+  }
+  return { tasks, fields, catalog };
+}
+function taskQuerySignature(query) {
+  return JSON.stringify([query.tasks, query.fields ?? null, query.catalog]);
+}
+var TASK_QUERY_ANSWER_OR_OPS = "You have now read everything you asked for. Do not send another taskQuery this turn: answer the user in prose, or emit the taskOps JSON for the change you came to make.";
+var TASK_QUERY_PROTOCOL = [
+  "READING A TASK BEFORE YOU EDIT IT:",
+  "The plan block you are shown each turn carries only short fields \u2014 it never contains a task's prompt, its user steps, or a completed task's verdict. Never rewrite a field you have not read. To read one, reply with ONLY this JSON object:",
+  `  {"${TASK_QUERY_ENVELOPE_KEY}":{"tasks":["<id or #order>", "..."],"fields":[${TASK_QUERY_FIELDS.map((f) => `"${f}"`).join(", ")}],"catalog":true}}`,
+  '- "tasks": one or more task references. Ask for everything you need in ONE query \u2014 each query costs a round-trip.',
+  '- "fields": optional. Omit it to get every field above.',
+  '- "catalog": optional. Set it to true for the full runner and model catalog \u2014 every model id with its label and thinking-effort variants, and every task mode with its description. It works before any task exists, and may be used on its own.',
+  "Ordewell answers immediately with the detail and changes nothing. Then reply again with your taskOps JSON, or with prose for the user.",
+  "Three queries per user message; after that every answer also tells you to land the turn. Do not ask the same question twice."
+];
+var TASK_QUERY_REMINDER = `- To READ a task in full (prompt, user steps, verdict, output, user stories) or the whole model/mode catalog before editing, reply with ONLY {"${TASK_QUERY_ENVELOPE_KEY}":{"tasks":["<id or #order>"],"catalog":true}} \u2014 it changes nothing, and you then reply again with your ops.`;
+function findTask(tasks, ref) {
+  const byId = tasks.find((t) => t.id === ref);
+  if (byId) return byId;
+  const orderStr = ref.startsWith("#") ? ref.slice(1) : ref;
+  if (/^\d+$/.test(orderStr)) {
+    const byOrder = tasks.filter((t) => t.order === Number(orderStr));
+    if (byOrder.length === 1) return byOrder[0];
+  }
+  return tasks.find((t) => t.title === ref);
+}
+function renderField(task, field) {
+  switch (field) {
+    case "description":
+      return [`description: ${task.description || "(none)"}`];
+    case "prompt":
+      return task.prompt ? ["prompt:", task.prompt] : ["prompt: (none)"];
+    case "userSteps": {
+      const steps = task.userSteps ?? [];
+      if (steps.length === 0) return ["userSteps: (none)"];
+      return ["userSteps:", ...steps.map((s) => `  ${s.order}. [${s.completed ? "x" : " "}] ${s.instruction}`)];
+    }
+    case "verdict": {
+      const v = task.verdict;
+      if (!v) return ["verdict: (none)"];
+      const checks = v.checks.map((c) => `${c.name}=${c.skipped ? "skipped" : c.passed ? "pass" : "fail"}`).join(", ");
+      return [`verdict: ${v.outcome.toUpperCase()} \u2014 ${v.reason}${checks ? ` [${checks}]` : ""}`];
+    }
+    case "outputSummary": {
+      const o = task.outputSummary;
+      if (!o) return ["outputSummary: (none)"];
+      return [`outputSummary: ${o.reviewReason}`, ...o.logTail ? ["log tail:", o.logTail] : []];
+    }
+    case "userStoriesCovered": {
+      const stories = task.userStoriesCovered ?? [];
+      if (stories.length === 0) return ["userStoriesCovered: (none)"];
+      return ["userStoriesCovered:", ...stories.map((s) => `  - ${s}`)];
+    }
+  }
+}
+function renderTask(task, fields) {
+  return [
+    `#${task.order} id=${task.id} "${task.title}" [${task.status}] type:${task.type === "user" ? "MAN" : "AI"}`,
+    ...fields.flatMap((f) => renderField(task, f)),
+    ""
+  ];
+}
+function renderCatalog(catalog) {
+  const lines = [];
+  for (const runner of catalog.runners) {
+    const models = catalog.models[runner] ?? [];
+    lines.push(`${runner} models:`);
+    if (models.length === 0) lines.push("  (none discovered)");
+    for (const m of models) {
+      const variants = m.variants?.length ? ` variants: ${m.variants.map((v) => `${v.id}${v.label && v.label !== v.id ? ` (${v.label})` : ""}`).join(", ")}` : " variants: none";
+      lines.push(`  - ${m.modelId} \u2014 ${m.modelLabel}${variants}`);
+    }
+    const modes = catalog.modes[runner] ?? [];
+    lines.push(`${runner} task modes:`);
+    if (modes.length === 0) lines.push("  (none declared)");
+    const defaultId = resolveDefaultMode(modes, catalog.autonomousDefault);
+    for (const mode of modes) {
+      lines.push(`  - ${mode.id} \u2014 ${mode.label}: ${mode.description}${mode.id === defaultId ? " (default)" : ""}`);
+    }
+  }
+  return lines;
+}
+function renderTaskQueryAnswer(query, tasks, catalog) {
+  const fields = query.fields ?? TASK_QUERY_FIELDS;
+  const blocks = [];
+  if (query.tasks.length > 0) {
+    const body = [];
+    for (const ref of query.tasks) {
+      const task = findTask(tasks, ref);
+      if (!task) {
+        body.push(`${ref}: no task matches this reference in the current plan.`, "");
+        continue;
+      }
+      body.push(...renderTask(task, fields));
+    }
+    blocks.push(["<task_detail>", ...body, "</task_detail>"].join("\n"));
+  }
+  if (query.catalog) {
+    blocks.push(["<runner_catalog>", ...renderCatalog(catalog), "</runner_catalog>"].join("\n"));
+  }
+  blocks.push(
+    "That is everything you asked for. Nothing has changed. Reply now with the taskOps JSON for the edit you intended, or answer the user in prose."
+  );
+  return blocks.join("\n\n");
+}
+
 // src/services/PlanPrompts.ts
 function buildResearchToolsPrompt(subagentsEnabled = false) {
   const lines = [
@@ -4449,7 +4774,8 @@ function researchPhaseBlock(harnessMode) {
   ];
   const toolSpecific = harnessMode ? [
     "- Explore the repository with your own tools until you understand its architecture",
-    "- You are planning, not implementing: do NOT edit, create, or delete any file, and do not run commands that change the workspace"
+    "- You are planning, not implementing: do NOT edit, create, or delete any file, and do not run commands that change the workspace",
+    "- If you delegate exploration to your own agents, WAIT for their results inside this reply. Do NOT launch them in the background or async and end your turn saying you will report back later: your turn ending is what hands the conversation back to the user, and anything you say after it never reaches them."
   ] : [
     "- Use list_dir with depth=2-3 for a tree overview",
     "- Use glob and grep to find relevant source files",
@@ -4614,6 +4940,11 @@ function buildConversationBody(goal, context, modelsJson, runners, modeGuide, mo
     "TASK MODE:",
     modeGuide,
     "",
+    // Shared by both variants on purpose: the read channel is a text envelope
+    // exactly so a harness planner, which Ordewell cannot hand tools to, speaks
+    // the same protocol as an API-backed one (ADR-0009).
+    ...TASK_QUERY_PROTOCOL,
+    "",
     context ? `PROJECT CONTEXT:
 ${context}
 ` : "",
@@ -4921,7 +5252,8 @@ function buildMergePrompt(taskIds, tasks) {
     "The merged task takes the union of their dependencies (excluding the merged tasks themselves) and preserves their user stories.",
     'Set "assignedRunner" and "assignedModel" on the merged task \u2014 use one of the runners and models listed in <available_models> above. Prefer the strongest model if the merged work is complex.',
     'Reply with ONLY a taskOps JSON object using a single "merge" op:',
-    `  {"taskOps":[{"op":"merge","taskIds":[${selected.map((t) => `"${t.id}"`).join(", ")}],"merged":{"title":"...","description":"...","prompt":"...","assignedRunner":"...","assignedModel":{"modelId":"...","modelLabel":"..."}}}]}`
+    `  {"taskOps":[{"op":"merge","taskIds":[${selected.map((t) => `"${t.id}"`).join(", ")}],"merged":{"title":"...","description":"...","prompt":"...","assignedRunner":"...","assignedModel":{"modelId":"...","modelLabel":"..."}}}]}`,
+    `If this merge needs a companion op in the same batch (e.g. an added task that should depend on the merge result), give the merge op a "handle" (any unused name) and reference it from the later op's taskId/dependencies.`
   ].join("\n");
 }
 function buildSplitPrompt(taskId, tasks) {
@@ -4933,153 +5265,11 @@ function buildSplitPrompt(taskId, tasks) {
     "The first part inherits the original task's dependencies. Each later part depends on the previous part. Tasks that depended on the original now depend on the LAST part.",
     'Set "assignedRunner" and "assignedModel" on each part \u2014 use the runners and models listed in <available_models> above. You may assign different models to different parts (e.g. a stronger model for a complex part, a faster one for a simple part).',
     'Reply with ONLY a taskOps JSON object using a single "split" op:',
-    `  {"taskOps":[{"op":"split","taskId":"${task.id}","parts":[{"title":"...","description":"...","prompt":"...","assignedRunner":"...","assignedModel":{"modelId":"...","modelLabel":"..."}},...]}]}`
+    `  {"taskOps":[{"op":"split","taskId":"${task.id}","parts":[{"title":"...","description":"...","prompt":"...","assignedRunner":"...","assignedModel":{"modelId":"...","modelLabel":"..."}},...]}]}`,
+    `If this split needs a companion op in the same batch (e.g. another task that should depend on the last part), give the split op a "handle" (any unused name) \u2014 it names the last part \u2014 and reference it from the later op's taskId/dependencies.`
   ].join("\n");
 }
 
-// src/services/JsonExtractor.ts
-var PLAN_ENVELOPE_KEY = "tasks";
-var TASK_OPS_ENVELOPE_KEY = "taskOps";
-var PlanParseError = class extends Error {
-  raw;
-  /**
-   * True when the reply was cut off mid-object (output-token limit) rather
-   * than malformed — the two need different repairs: a truncated emission will
-   * be cut at the same point again unless the retry frees context or asks for
-   * terser output.
-   */
-  truncated;
-  /**
-   * True when the JSON parsed fine and a *shape* rule rejected it. The generic
-   * "could not be parsed as JSON" corrective is a lie for these, so the model
-   * re-sends the same object; a semantic rejection must be repaired by naming
-   * the rule it broke.
-   */
-  semantic;
-  constructor(message, raw, opts) {
-    super(message);
-    this.name = "PlanParseError";
-    this.raw = raw;
-    this.truncated = opts?.truncated ?? false;
-    this.semantic = opts?.semantic ?? false;
-  }
-};
-function stripModelNoise(raw) {
-  return raw.replace(/<think>[\s\S]*?<\/think>/gi, "").replace(/```json\s*/gi, "").replace(/```\s*/g, "").trim();
-}
-function balancedObjectAt(text, start) {
-  let depth = 0;
-  let inString = false;
-  let escaped = false;
-  for (let i = start; i < text.length; i++) {
-    const ch = text[i];
-    if (inString) {
-      if (escaped) escaped = false;
-      else if (ch === "\\") escaped = true;
-      else if (ch === '"') inString = false;
-      continue;
-    }
-    if (ch === '"') inString = true;
-    else if (ch === "{") depth++;
-    else if (ch === "}") {
-      depth--;
-      if (depth === 0) return { json: text.slice(start, i + 1), balanced: true };
-    }
-  }
-  return { json: text.slice(start), balanced: false };
-}
-function extractObjectsWithKey(raw, key) {
-  const stripped = stripModelNoise(raw);
-  const keyRe = new RegExp(`"${key}"\\s*:`);
-  const matches = [];
-  let firstObject = null;
-  let sawBrace = false;
-  let sawUnbalanced = false;
-  let inString = false;
-  let escaped = false;
-  for (let i = 0; i < stripped.length; i++) {
-    const ch = stripped[i];
-    if (inString) {
-      if (escaped) escaped = false;
-      else if (ch === "\\") escaped = true;
-      else if (ch === '"') inString = false;
-      continue;
-    }
-    if (ch === '"') {
-      inString = true;
-      continue;
-    }
-    if (ch !== "{") continue;
-    sawBrace = true;
-    const obj = balancedObjectAt(stripped, i);
-    if (obj.balanced && keyRe.test(obj.json)) {
-      matches.push(obj.json);
-      i += obj.json.length - 1;
-      continue;
-    }
-    if (!obj.balanced) sawUnbalanced = true;
-    if (!firstObject && obj.balanced) firstObject = obj.json;
-  }
-  return {
-    matches,
-    fallback: firstObject !== null ? { json: firstObject, balanced: true } : { json: stripped, balanced: false },
-    sawBrace,
-    sawUnbalanced
-  };
-}
-function extractObjectWithBalance(raw) {
-  const { matches, fallback, sawBrace } = extractObjectsWithKey(raw, PLAN_ENVELOPE_KEY);
-  if (matches.length > 0) return { json: matches[0], balanced: true, sawBrace };
-  return { ...fallback, sawBrace };
-}
-function extractJsonObject(raw) {
-  return extractObjectWithBalance(raw).json;
-}
-function stripTrailingCommas(json) {
-  return json.replace(/,(\s*[}\]])/g, "$1");
-}
-function escapeControlCharsInStrings(json) {
-  let out = "";
-  let inString = false;
-  let escaped = false;
-  for (const ch of json) {
-    if (inString) {
-      if (escaped) {
-        out += ch;
-        escaped = false;
-        continue;
-      }
-      if (ch === "\\") {
-        out += ch;
-        escaped = true;
-        continue;
-      }
-      if (ch === '"') {
-        out += ch;
-        inString = false;
-        continue;
-      }
-      if (ch === "\n") {
-        out += "\\n";
-        continue;
-      }
-      if (ch === "\r") {
-        out += "\\r";
-        continue;
-      }
-      if (ch === "	") {
-        out += "\\t";
-        continue;
-      }
-      out += ch;
-      continue;
-    }
-    if (ch === '"') inString = true;
-    out += ch;
-  }
-  return out;
-}
-
 // src/services/PlanValidator.ts
 function parsePlanJson(raw, runners, runnerModes, autonomousDefault = true) {
   const { matches, fallback, sawUnbalanced } = extractObjectsWithKey(raw, PLAN_ENVELOPE_KEY);
@@ -5320,6 +5510,171 @@ function validatePlanModification(ctx) {
   return { valid: allErrors.length === 0, errors: allErrors };
 }
 
+// src/services/TaskOps.ts
+var import_uuid2 = require("uuid");
+
+// src/services/ModelAllowlistResolver.ts
+function effectiveAllowlist(allowlist, runner, modelsByRunner) {
+  if (!allowlist || allowlist.length === 0) return void 0;
+  if (!modelsByRunner) return allowlist;
+  const own = new Set((modelsByRunner[runner] ?? []).map((m) => m.modelId));
+  const elsewhere = /* @__PURE__ */ new Set();
+  for (const [other, models] of Object.entries(modelsByRunner)) {
+    if (other === runner) continue;
+    for (const m of models ?? []) elsewhere.add(m.modelId);
+  }
+  const kept = allowlist.filter((id) => own.has(id) || !elsewhere.has(id));
+  return kept.length > 0 ? kept : void 0;
+}
+function filterModelsForPrompt(modelsByRunner, perRunnerAllowlist) {
+  const result = {};
+  for (const [runner, models] of Object.entries(modelsByRunner)) {
+    if (!models) continue;
+    const allowed = effectiveAllowlist(perRunnerAllowlist[runner], runner, modelsByRunner);
+    if (!allowed) {
+      result[runner] = models;
+      continue;
+    }
+    const allowedSet = new Set(allowed);
+    const intersection = models.filter((m) => allowedSet.has(m.modelId));
+    const covered = new Set(intersection.map((m) => m.modelId));
+    const missing = allowed.filter((id) => !covered.has(id)).map((id) => ({ modelId: id, modelLabel: id.split("/").pop() || id, variants: [] }));
+    result[runner] = [...intersection, ...missing];
+  }
+  return result;
+}
+var EFFORT_LADDER = ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"];
+var EFFORT_ALIASES = { disabled: "none", adaptive: "medium" };
+function clampThinkingEffort(effort, variants) {
+  if (!effort) return void 0;
+  if (variants.length === 0) return void 0;
+  const ids = new Set(variants.map((v) => v.id));
+  if (ids.has(effort)) return effort;
+  const canon = EFFORT_ALIASES[effort] ?? effort;
+  if (ids.has(canon)) return canon;
+  const idx = EFFORT_LADDER.indexOf(canon);
+  if (idx < 0) return void 0;
+  for (let d = 1; d < EFFORT_LADDER.length; d++) {
+    const lower = EFFORT_LADDER[idx - d];
+    if (lower && ids.has(lower)) return lower;
+    const higher = EFFORT_LADDER[idx + d];
+    if (higher && ids.has(higher)) return higher;
+  }
+  return void 0;
+}
+function coerceAssignments(tasks, perRunnerAllowlist, allowedRunners, modelsByRunner) {
+  const clampVariant = (task) => {
+    if (!task.assignedModel || !modelsByRunner) return task;
+    const model = modelsByRunner[task.assignedRunner]?.find(
+      (m) => m.modelId === task.assignedModel.modelId
+    );
+    if (!model) return task;
+    const clamped = clampThinkingEffort(task.assignedModel.thinkingEffort, model.variants);
+    return {
+      ...task,
+      assignedModel: {
+        ...task.assignedModel,
+        thinkingEffort: clamped,
+        availableVariants: model.variants.map((v) => v.id)
+      }
+    };
+  };
+  const allowedFor = (runner) => effectiveAllowlist(perRunnerAllowlist[runner], runner, modelsByRunner);
+  const assignmentFor = (runner, modelId) => {
+    const known = modelsByRunner?.[runner]?.find((m) => m.modelId === modelId);
+    return {
+      modelId,
+      modelLabel: known?.modelLabel ?? modelId,
+      thinkingEffort: void 0,
+      ...known ? { availableVariants: known.variants.map((v) => v.id) } : {}
+    };
+  };
+  return tasks.map((task) => {
+    if (task.type === "user") return task;
+    if (allowedRunners && !allowedRunners.includes(task.assignedRunner)) {
+      const fallbackRunner = allowedRunners[0];
+      const fallbackModels = allowedFor(fallbackRunner);
+      const fallbackModel = fallbackModels?.length ? assignmentFor(fallbackRunner, fallbackModels[0]) : modelsByRunner?.[fallbackRunner]?.[0] ? assignmentFor(fallbackRunner, modelsByRunner[fallbackRunner][0].modelId) : task.assignedModel;
+      return clampVariant({
+        ...task,
+        assignedRunner: fallbackRunner,
+        assignedModel: fallbackModel
+      });
+    }
+    const allowlist = allowedFor(task.assignedRunner);
+    if (!task.assignedModel) {
+      if (allowlist && allowlist.length > 0) {
+        return clampVariant({ ...task, assignedModel: assignmentFor(task.assignedRunner, allowlist[0]) });
+      }
+      const discovered = modelsByRunner?.[task.assignedRunner]?.[0];
+      if (discovered) {
+        return clampVariant({ ...task, assignedModel: assignmentFor(task.assignedRunner, discovered.modelId) });
+      }
+      return task;
+    }
+    if (!allowlist || allowlist.length === 0) return clampVariant(task);
+    if (allowlist.includes(task.assignedModel.modelId)) return clampVariant(task);
+    return { ...task, assignedModel: assignmentFor(task.assignedRunner, allowlist[0]) };
+  });
+}
+
+// src/services/TaskEditValidator.ts
+var AI_ONLY_FIELDS = ["assignedModel", "thinkingEffort", "taskMode", "autonomy"];
+function checkModelAndModeValidity(runner, assignedModel, taskMode, catalog) {
+  if (!catalog) return { ok: true };
+  if (assignedModel) {
+    const models = catalog.modelsByRunner[runner];
+    if (models) {
+      const modelId = assignedModel.modelId;
+      if (!models.some((m) => m.modelId === modelId)) {
+        return { ok: false, error: `Runner "${runner}" does not offer model "${modelId}"` };
+      }
+      const allowed = effectiveAllowlist(catalog.perRunnerAllowlist?.[runner], runner, catalog.modelsByRunner);
+      if (allowed && !allowed.includes(modelId)) {
+        return { ok: false, error: `Model "${modelId}" is excluded by the allowlist for runner "${runner}"` };
+      }
+    }
+  }
+  if (taskMode !== void 0) {
+    const modes = catalog.runnerModes[runner];
+    if (modes && modes.length > 0 && !modes.some((m) => m.id === taskMode)) {
+      return { ok: false, error: `Runner "${runner}" has no task mode "${taskMode}" \u2014 valid modes: ${modes.map((m) => m.id).join(", ")}` };
+    }
+  }
+  return { ok: true };
+}
+function typeCoherenceCheck(target, changes) {
+  if (!changes.type || changes.type === target.type) return null;
+  if (changes.type === "user") {
+    if (!Array.isArray(changes.userSteps) || changes.userSteps.length === 0) {
+      return { ok: false, error: `"${target.title}" cannot become a manual task without user steps \u2014 include "userSteps" in this edit` };
+    }
+    return { ok: true, clear: AI_ONLY_FIELDS.filter((f) => target[f] !== void 0) };
+  }
+  if (!changes.prompt || !changes.prompt.trim()) {
+    return { ok: false, error: `"${target.title}" cannot become an AI task without a prompt \u2014 include "prompt" in this edit` };
+  }
+  return { ok: true, clear: target.userSteps && target.userSteps.length > 0 ? ["userSteps"] : [] };
+}
+function validateTaskEdit(actor, tasks, taskId, changes, catalog) {
+  const target = tasks.find((t) => t.id === taskId);
+  if (!target) return { ok: false, error: "Task not found" };
+  if (actor === "planner") {
+    if (target.status === "in_progress") return { ok: false, error: `"${target.title}" is running and cannot be modified` };
+    if (target.status === "completed") return { ok: false, error: `"${target.title}" is completed and cannot be modified` };
+  }
+  if (changes.dependencies) {
+    const depCheck = canSetDependencies(tasks, taskId, changes.dependencies);
+    if (!depCheck.ok) return depCheck;
+  }
+  const coherence = typeCoherenceCheck(target, changes);
+  if (coherence && !coherence.ok) return coherence;
+  const runner = changes.assignedRunner ?? target.assignedRunner;
+  const validity = checkModelAndModeValidity(runner, changes.assignedModel, changes.taskMode, catalog);
+  if (!validity.ok) return validity;
+  return coherence ?? { ok: true };
+}
+
 // src/services/TaskOps.ts
 var UPDATABLE_FIELDS = [
   "title",
@@ -5332,7 +5687,8 @@ var UPDATABLE_FIELDS = [
   "thinkingEffort",
   "type",
   "userSteps",
-  "autonomy"
+  "autonomy",
+  "sliceType"
 ];
 function textHasTaskOps(text) {
   return text.includes(`"${TASK_OPS_ENVELOPE_KEY}"`);
@@ -5369,18 +5725,41 @@ function parseTaskOpsObject(json, text) {
   }
   return ops;
 }
-function resolveRef(ref, tasks) {
-  if (typeof ref !== "string" && typeof ref !== "number") return void 0;
+function resolveRef(ref, originalScope, liveScope, handleOwner, handleId, opIndex) {
+  if (typeof ref !== "string" && typeof ref !== "number") return { error: `invalid reference "${String(ref)}"` };
   const s = String(ref).trim();
-  const byId = tasks.find((t) => t.id === s);
-  if (byId) return byId;
+  const ownerIdx = handleOwner.get(s);
+  if (ownerIdx !== void 0) {
+    if (ownerIdx >= opIndex) {
+      return { error: `handle "${s}" is defined later in this batch (op ${ownerIdx + 1}) and cannot be referenced yet` };
+    }
+    const id = handleId.get(s);
+    if (!id) return { error: `handle "${s}" was never resolved` };
+    return { id };
+  }
+  const byLiveId = liveScope.find((t) => t.id === s);
+  if (byLiveId) return { id: byLiveId.id };
   const orderStr = s.startsWith("#") ? s.slice(1) : s;
   if (/^\d+$/.test(orderStr)) {
     const order = Number(orderStr);
-    const byOrder = tasks.filter((t) => t.order === order);
-    if (byOrder.length === 1) return byOrder[0];
+    const byOrder = originalScope.filter((t) => t.order === order);
+    if (byOrder.length === 1) return { id: byOrder[0].id };
   }
-  return tasks.find((t) => t.title === s);
+  const byTitle = originalScope.find((t) => t.title === s);
+  if (byTitle) return { id: byTitle.id };
+  return { error: `task "${s}" not found` };
+}
+function refCollidesWithExisting(name, originalFlatAll) {
+  if (originalFlatAll.some((t) => t.id === name)) return true;
+  const orderStr = name.startsWith("#") ? name.slice(1) : name;
+  if (/^\d+$/.test(orderStr) && originalFlatAll.some((t) => t.order === Number(orderStr))) return true;
+  return originalFlatAll.some((t) => t.title === name);
+}
+function findInTasks(tasks, id) {
+  return flattenTasks(tasks).find((t) => t.id === id);
+}
+function findTopLevel(tasks, id) {
+  return tasks.find((t) => t.id === id);
 }
 function detectCycle(tasks) {
   const byId = new Map(tasks.map((t) => [t.id, t]));
@@ -5404,6 +5783,55 @@ function detectCycle(tasks) {
   }
   return null;
 }
+function isPinned(t) {
+  return t.status === "in_progress" || t.status === "completed";
+}
+function repairOrder(tasks) {
+  const byId = new Map(tasks.map((t) => [t.id, t]));
+  const placed = /* @__PURE__ */ new Set();
+  const movable = tasks.filter((t) => !isPinned(t));
+  const result = [];
+  const blockerOf = (t) => {
+    const id = t.dependencies.find((d) => byId.has(d) && !placed.has(d));
+    return id ? byId.get(id) : void 0;
+  };
+  const place = (t) => {
+    result.push(t);
+    placed.add(t.id);
+  };
+  for (const occupant of tasks) {
+    if (isPinned(occupant)) {
+      const blocker = blockerOf(occupant);
+      if (blocker) return { error: pinnedRefusal(blocker, occupant, "before") };
+      place(occupant);
+      continue;
+    }
+    const next = movable.findIndex((t) => !blockerOf(t));
+    if (next < 0) {
+      const [stuck, pin] = trailToPin(movable[0], blockerOf);
+      return { error: pinnedRefusal(stuck, pin, "after") };
+    }
+    place(movable.splice(next, 1)[0]);
+  }
+  return { tasks: result };
+}
+function trailToPin(task, blockerOf) {
+  let at = task;
+  for (; ; ) {
+    const blocker = blockerOf(at);
+    if (!blocker || isPinned(blocker)) return [at, blocker ?? at];
+    at = blocker;
+  }
+}
+function describeMoves(before, after) {
+  const wasAt = new Map(before.map((t, i) => [t.id, i + 1]));
+  const moved = after.map((t, i) => ({ t, from: wasAt.get(t.id), to: i + 1 })).filter((m) => m.from !== m.to);
+  return moved.length ? moved.map((m) => `"${m.t.title}" #${m.from}\u2192#${m.to}`).join(", ") : null;
+}
+function pinnedRefusal(other, pin, side) {
+  const word = pin.status === "in_progress" ? "running" : "completed";
+  return `"${other.title}" would have to run ${side} "${pin.title}", which is ${word} and cannot be moved`;
+}
 function canMergeTasks(tasks, selectedIds) {
   if (selectedIds.length < 2) return { ok: false, error: "Select at least two tasks to merge" };
   const idSet = new Set(selectedIds);
@@ -5420,15 +5848,6 @@ function canMergeTasks(tasks, selectedIds) {
   sim.push({ ...ordered[0], id: survivorId, title: "__merge_sim__", order: ordered[0].order, dependencies: unionDeps });
   const cycle = detectCycle(sim);
   if (cycle) return { ok: false, error: `Merging would create a dependency cycle involving "${cycle}"` };
-  const orderById = new Map(sim.map((t) => [t.id, t.order]));
-  for (const t of sim) {
-    for (const dep of t.dependencies) {
-      const depOrder = orderById.get(dep);
-      if (depOrder !== void 0 && depOrder >= t.order) {
-        return { ok: false, error: "Merging would break task ordering \u2014 a dependency of the merged set comes after it" };
-      }
-    }
-  }
   return { ok: true };
 }
 function dependentsOf(tasks, taskId) {
@@ -5460,17 +5879,46 @@ function canSplitTask(tasks, taskId) {
   if (target.status === "completed") return { ok: false, error: `"${target.title}" is completed and cannot be split` };
   return { ok: true };
 }
-function applyTaskOps(currentTasks, ops, runners) {
+function applyTaskOps(currentTasks, ops, runners, catalog) {
   let tasks = JSON.parse(JSON.stringify(currentTasks));
   const errors = [];
   const summary = [];
-  const resolveDeps = (deps) => {
+  const originalFlatAll = flattenTasks(currentTasks);
+  const handleOwner = /* @__PURE__ */ new Map();
+  const handleId = /* @__PURE__ */ new Map();
+  for (const [i, op] of ops.entries()) {
+    const handle = op.handle;
+    if (handle === void 0) continue;
+    if (typeof handle !== "string" || !handle.trim()) {
+      errors.push(`op ${i + 1} (${op.op}): handle must be a non-empty string`);
+      continue;
+    }
+    if (handleOwner.has(handle)) {
+      errors.push(`op ${i + 1} (${op.op}): handle "${handle}" is already used earlier in this batch`);
+      continue;
+    }
+    if (refCollidesWithExisting(handle, originalFlatAll)) {
+      errors.push(`op ${i + 1} (${op.op}): handle "${handle}" collides with an existing task reference`);
+      continue;
+    }
+    handleOwner.set(handle, i);
+  }
+  if (errors.length) return { ok: false, tasks: currentTasks, errors, summary: [] };
+  const resolveDeps = (deps, opIndex) => {
     const ids = [];
     const bad = [];
+    const liveFlat = flattenTasks(tasks);
     for (const d of Array.isArray(deps) ? deps : []) {
-      const t = resolveRef(d, flattenTasks(tasks));
-      if (t) ids.push(t.id);
-      else bad.push(String(d));
+      const r = resolveRef(d, originalFlatAll, liveFlat, handleOwner, handleId, opIndex);
+      if ("error" in r) {
+        bad.push(`${String(d)} (${r.error})`);
+        continue;
+      }
+      if (!liveFlat.some((t) => t.id === r.id)) {
+        bad.push(`${String(d)} (no longer exists in this batch)`);
+        continue;
+      }
+      ids.push(r.id);
     }
     return { ids, bad };
   };
@@ -5478,41 +5926,47 @@ function applyTaskOps(currentTasks, ops, runners) {
     const label = `op ${i + 1} (${op.op})`;
     switch (op.op) {
       case "update": {
-        const target = resolveRef(op.taskId, flattenTasks(tasks));
-        if (!target) {
-          errors.push(`${label}: task "${op.taskId}" not found`);
-          break;
-        }
-        if (target.status === "in_progress") {
-          errors.push(`${label}: "${target.title}" is running and cannot be modified`);
+        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
+        if ("error" in ref) {
+          errors.push(`${label}: ${ref.error}`);
           break;
         }
-        if (target.status === "completed") {
-          errors.push(`${label}: "${target.title}" is completed and cannot be modified`);
+        const target = findInTasks(tasks, ref.id);
+        if (!target) {
+          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
           break;
         }
         const changes = {};
         for (const key of UPDATABLE_FIELDS) {
           if (op.changes && key in op.changes) changes[key] = op.changes[key];
         }
+        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
+          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
+          break;
+        }
+        const changesForCheck = { ...changes };
+        delete changesForCheck.dependencies;
+        const check = validateTaskEdit("planner", flattenTasks(tasks), target.id, changesForCheck, catalog);
+        if (!check.ok) {
+          errors.push(`${label}: ${check.error}`);
+          break;
+        }
+        for (const field of check.clear ?? []) changes[field] = void 0;
         if ("dependencies" in changes) {
-          const { ids, bad } = resolveDeps(changes.dependencies);
+          const { ids, bad } = resolveDeps(changes.dependencies, i);
           if (bad.length) {
             errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
             break;
           }
           changes.dependencies = ids.filter((id) => id !== target.id);
         }
-        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
-          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
-          break;
-        }
         if (Object.keys(changes).length === 0) {
           errors.push(`${label}: no valid changes provided`);
           break;
         }
         tasks = updateTaskInPlan(tasks, target.id, changes);
-        summary.push(`Updated "${target.title}" (${Object.keys(changes).join(", ")})`);
+        const clearedNote = check.clear?.length ? `; cleared ${check.clear.join(", ")}` : "";
+        summary.push(`Updated "${target.title}" (${Object.keys(changes).join(", ")})${clearedNote}`);
         break;
       }
       case "add": {
@@ -5521,27 +5975,39 @@ function applyTaskOps(currentTasks, ops, runners) {
           errors.push(`${label}: new task needs a title`);
           break;
         }
-        const { ids, bad } = resolveDeps(spec.dependencies);
+        const { ids, bad } = resolveDeps(spec.dependencies, i);
         if (bad.length) {
           errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
           break;
         }
         const runner = spec.assignedRunner && runners.includes(spec.assignedRunner) ? spec.assignedRunner : runners[0];
+        const validity = checkModelAndModeValidity(runner, spec.assignedModel, spec.taskMode, catalog);
+        if (!validity.ok) {
+          errors.push(`${label}: ${validity.error}`);
+          break;
+        }
+        const newId = (0, import_uuid2.v4)();
         tasks = addTaskToPlan(tasks, {
           ...spec,
-          id: void 0,
+          id: newId,
           dependencies: ids,
           assignedRunner: runner,
           description: spec.description ?? spec.title,
           prompt: spec.prompt ?? spec.description ?? spec.title
         });
+        if (op.handle) handleId.set(op.handle, newId);
         summary.push(`Added "${spec.title}"`);
         break;
       }
       case "remove": {
-        const target = resolveRef(op.taskId, flattenTasks(tasks));
+        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
+        if ("error" in ref) {
+          errors.push(`${label}: ${ref.error}`);
+          break;
+        }
+        const target = findInTasks(tasks, ref.id);
         if (!target) {
-          errors.push(`${label}: task "${op.taskId}" not found`);
+          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
           break;
         }
         if (target.status === "in_progress") {
@@ -5557,7 +6023,13 @@ function applyTaskOps(currentTasks, ops, runners) {
         break;
       }
       case "reorder": {
-        const resolved = (op.taskIds ?? []).map((r) => resolveRef(r, tasks));
+        const refs = (op.taskIds ?? []).map((r) => resolveRef(r, currentTasks, tasks, handleOwner, handleId, i));
+        const badRef = refs.find((r) => "error" in r);
+        if (badRef) {
+          errors.push(`${label}: ${badRef.error}`);
+          break;
+        }
+        const resolved = refs.map((r) => findTopLevel(tasks, r.id));
         if (resolved.some((t) => !t)) {
           errors.push(`${label}: unknown task in reorder list`);
           break;
@@ -5573,9 +6045,15 @@ function applyTaskOps(currentTasks, ops, runners) {
         break;
       }
       case "merge": {
-        const resolved = (op.taskIds ?? []).map((r) => resolveRef(r, tasks));
+        const refs = (op.taskIds ?? []).map((r) => resolveRef(r, currentTasks, tasks, handleOwner, handleId, i));
+        const badRef = refs.find((r) => "error" in r);
+        if (badRef) {
+          errors.push(`${label}: ${badRef.error}`);
+          break;
+        }
+        const resolved = refs.map((r) => findTopLevel(tasks, r.id));
         if (resolved.some((t) => !t)) {
-          errors.push(`${label}: unknown task in merge list`);
+          errors.push(`${label}: unknown task in merge list (already removed, merged, or split by an earlier op)`);
           break;
         }
         const toMerge = resolved.map((t) => t).sort((a, b) => a.order - b.order);
@@ -5590,7 +6068,7 @@ function applyTaskOps(currentTasks, ops, runners) {
         }
         const idSet = new Set(toMerge.map((t) => t.id));
         const unionDepsRaw = [...new Set(toMerge.flatMap((t) => t.dependencies))].filter((d) => !idSet.has(d));
-        const { ids, bad } = resolveDeps(unionDepsRaw);
+        const { ids, bad } = resolveDeps(unionDepsRaw, i);
         if (bad.length) {
           errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
           break;
@@ -5631,11 +6109,17 @@ function applyTaskOps(currentTasks, ops, runners) {
         }
         if (!inserted) result.push(mergedTask);
         tasks = renumberTasks(result);
+        if (op.handle) handleId.set(op.handle, mergedId);
         summary.push(`Merged ${toMerge.length} tasks into "${spec.title}"`);
         break;
       }
       case "split": {
-        const target = resolveRef(op.taskId, tasks);
+        const ref = resolveRef(op.taskId, currentTasks, tasks, handleOwner, handleId, i);
+        if ("error" in ref) {
+          errors.push(`${label}: ${ref.error}`);
+          break;
+        }
+        const target = findTopLevel(tasks, ref.id);
         if (!target) {
           errors.push(`${label}: task "${op.taskId}" not found`);
           break;
@@ -5656,16 +6140,16 @@ function applyTaskOps(currentTasks, ops, runners) {
         const newTasks = [];
         let prevId;
         let buildError = false;
-        for (let i2 = 0; i2 < parts.length; i2++) {
-          const spec = parts[i2];
+        for (let p = 0; p < parts.length; p++) {
+          const spec = parts[p];
           if (!spec || !spec.title) {
-            errors.push(`${label}: split part ${i2 + 1} needs a title`);
+            errors.push(`${label}: split part ${p + 1} needs a title`);
             buildError = true;
             break;
           }
           let deps;
-          if (i2 === 0) {
-            const { ids, bad } = resolveDeps(target.dependencies);
+          if (p === 0) {
+            const { ids, bad } = resolveDeps(target.dependencies, i);
             if (bad.length) {
               errors.push(`${label}: split part 1 unknown dependencies: ${bad.join(", ")}`);
               buildError = true;
@@ -5703,9 +6187,60 @@ function applyTaskOps(currentTasks, ops, runners) {
           result.push({ ...t, dependencies: t.dependencies.map((d) => d === target.id ? tailId : d) });
         }
         tasks = renumberTasks(result);
+        if (op.handle) handleId.set(op.handle, tailId);
         summary.push(`Split "${target.title}" into ${newTasks.length} tasks`);
         break;
       }
+      case "rearm": {
+        const ref = resolveRef(op.taskId, originalFlatAll, flattenTasks(tasks), handleOwner, handleId, i);
+        if ("error" in ref) {
+          errors.push(`${label}: ${ref.error}`);
+          break;
+        }
+        const target = findInTasks(tasks, ref.id);
+        if (!target) {
+          errors.push(`${label}: task "${op.taskId}" no longer exists in this batch (removed, merged, or split by an earlier op)`);
+          break;
+        }
+        if (target.status === "in_progress") {
+          errors.push(`${label}: "${target.title}" is running and cannot be re-armed`);
+          break;
+        }
+        const changes = {};
+        for (const key of UPDATABLE_FIELDS) {
+          if (op.changes && key in op.changes) changes[key] = op.changes[key];
+        }
+        if (changes.assignedRunner && !runners.includes(changes.assignedRunner)) {
+          errors.push(`${label}: runner "${changes.assignedRunner}" is not in this plan's runner set [${runners.join(", ")}]`);
+          break;
+        }
+        const changesForCheck = { ...changes };
+        delete changesForCheck.dependencies;
+        const check = validateTaskEdit("direct", flattenTasks(tasks), target.id, changesForCheck, catalog);
+        if (!check.ok) {
+          errors.push(`${label}: ${check.error}`);
+          break;
+        }
+        for (const field of check.clear ?? []) changes[field] = void 0;
+        if ("dependencies" in changes) {
+          const { ids, bad } = resolveDeps(changes.dependencies, i);
+          if (bad.length) {
+            errors.push(`${label}: unknown dependencies: ${bad.join(", ")}`);
+            break;
+          }
+          changes.dependencies = ids.filter((id) => id !== target.id);
+        }
+        tasks = updateTaskInPlan(tasks, target.id, { ...changes, status: "pending", verdict: void 0, outputSummary: void 0 });
+        for (const dep of flattenTasks(tasks)) {
+          if (dep.status === "blocked" && dep.dependencies.includes(target.id)) {
+            tasks = updateTaskInPlan(tasks, dep.id, { status: "pending" });
+          }
+        }
+        const clearedNote = check.clear?.length ? `; cleared ${check.clear.join(", ")}` : "";
+        const changedNote = Object.keys(changes).length ? ` (${Object.keys(changes).join(", ")})` : "";
+        summary.push(`Re-armed "${target.title}"${changedNote}${clearedNote}`);
+        break;
+      }
       default:
         errors.push(`${label}: unknown op "${op.op}"`);
     }
@@ -5721,13 +6256,14 @@ function applyTaskOps(currentTasks, ops, runners) {
     }
     const cycleAt = detectCycle(flat);
     if (cycleAt) errors.push(`Dependency cycle detected involving "${cycleAt}"`);
-    const orderById = new Map(tasks.map((t) => [t.id, t.order]));
-    for (const t of tasks) {
-      for (const dep of t.dependencies) {
-        const depOrder = orderById.get(dep);
-        if (depOrder !== void 0 && depOrder >= t.order) {
-          errors.push(`"${t.title}" is ordered before its dependency; move the dependency earlier`);
-        }
+    if (!errors.length) {
+      const repaired = repairOrder(tasks);
+      if ("error" in repaired) {
+        errors.push(repaired.error);
+      } else {
+        const moves = describeMoves(tasks, repaired.tasks);
+        if (moves) summary.push(`Reordered to keep dependencies first: ${moves}`);
+        tasks = renumberTasks(repaired.tasks);
       }
     }
   }
@@ -5757,6 +6293,9 @@ function truncatedPlanReEmitPrompt(historyCompacted) {
 function reEmitTaskOpsPrompt(detail) {
   return `Your task edits could not be applied: ${detail}. Re-emit ONLY a corrected {"${TASK_OPS_ENVELOPE_KEY}":[...]} JSON object \u2014 no prose, no code fences \u2014 or reply in prose if you did not intend to edit tasks.`;
 }
+function reEmitTaskQueryPrompt(detail) {
+  return `Your task-detail request could not be read: ${detail}. Re-emit ONLY a corrected {"${TASK_QUERY_ENVELOPE_KEY}":{"tasks":["<id or #order>"],"fields"?:[...],"catalog"?:true}} JSON object \u2014 no prose, no code fences \u2014 or reply in prose if you did not mean to look anything up.`;
+}
 function taskOpsRejectedPrompt(errors) {
   return `Those task edits were rejected:
 - ${errors.join("\n- ")}
@@ -5783,6 +6322,16 @@ function classifyPlannerReply(text, opts) {
       }
     }
   }
+  if (textHasTaskQuery(text)) {
+    try {
+      return { kind: "task_query", query: parseTaskQueryJson(text) };
+    } catch (err) {
+      if (!(err instanceof PlanParseError)) throw err;
+      if (extractObjectsWithKey(text, TASK_QUERY_ENVELOPE_KEY).matches.length > 0) {
+        return { kind: "broken_task_query", error: err };
+      }
+    }
+  }
   if (text.includes(`"${PLAN_ENVELOPE_KEY}"`)) {
     try {
       return { kind: "plan", tasks: parsePlanJson(text, opts.runners, opts.runnerModes, opts.autonomousDefault) };
@@ -6426,7 +6975,7 @@ var BaseAiService = class _BaseAiService {
     const parallelIndexes = toolCalls.flatMap((tc, i) => PARALLEL_SAFE_TOOLS.has(tc.name) ? [i] : []);
     await Promise.all([
       spawnIndexes.length > 0 ? mapWithConcurrency(spawnIndexes, SUBAGENT_LIMITS.maxConcurrent, async (i) => {
-        const subagentId = (0, import_uuid2.v4)();
+        const subagentId = (0, import_uuid3.v4)();
         spawnSubagentIds.set(i, subagentId);
         onProgress({ type: "tool_call", tool: toolCalls[i].name, toolArgs: JSON.stringify(toolCalls[i].args), subagentId, toolCallId: toolCalls[i].id });
         precomputed.set(i, await this.executeSpawnAgent({ ...toolCalls[i].args }, fs10, onProgress, signal, subagentId));
@@ -6581,6 +7130,10 @@ ${llmOutput}
       switch (reply.kind) {
         case "task_ops":
           return { kind: "task_ops", ops: reply.ops, text: turn.text, researchLog };
+        // A read is settled by the Session (it owns the plan and the catalog),
+        // so it leaves this loop the same way a plan or an edit does.
+        case "task_query":
+          return { kind: "task_query", query: reply.query, text: turn.text, researchLog };
         case "plan":
           if (ctx.prdEnabled && !ctx.prdCaptured && !ctx.prdNudgeSent && !signal?.aborted) {
             ctx.prdNudgeSent = true;
@@ -6603,6 +7156,13 @@ ${llmOutput}
             continue;
           }
           break;
+        case "broken_task_query":
+          if (jsonRepairAttempts < MAX_JSON_REPAIRS2 && !signal?.aborted) {
+            jsonRepairAttempts++;
+            pending = reEmitTaskQueryPrompt(reply.error.message);
+            continue;
+          }
+          break;
         case "broken_plan":
           if (jsonRepairAttempts < MAX_JSON_REPAIRS2 && !signal?.aborted) {
             jsonRepairAttempts++;
@@ -8582,111 +9142,6 @@ ${output.slice(-3e3)}`);
   }
 };
 
-// src/services/ModelAllowlistResolver.ts
-function effectiveAllowlist(allowlist, runner, modelsByRunner) {
-  if (!allowlist || allowlist.length === 0) return void 0;
-  if (!modelsByRunner) return allowlist;
-  const own = new Set((modelsByRunner[runner] ?? []).map((m) => m.modelId));
-  const elsewhere = /* @__PURE__ */ new Set();
-  for (const [other, models] of Object.entries(modelsByRunner)) {
-    if (other === runner) continue;
-    for (const m of models ?? []) elsewhere.add(m.modelId);
-  }
-  const kept = allowlist.filter((id) => own.has(id) || !elsewhere.has(id));
-  return kept.length > 0 ? kept : void 0;
-}
-function filterModelsForPrompt(modelsByRunner, perRunnerAllowlist) {
-  const result = {};
-  for (const [runner, models] of Object.entries(modelsByRunner)) {
-    if (!models) continue;
-    const allowed = effectiveAllowlist(perRunnerAllowlist[runner], runner, modelsByRunner);
-    if (!allowed) {
-      result[runner] = models;
-      continue;
-    }
-    const allowedSet = new Set(allowed);
-    const intersection = models.filter((m) => allowedSet.has(m.modelId));
-    const covered = new Set(intersection.map((m) => m.modelId));
-    const missing = allowed.filter((id) => !covered.has(id)).map((id) => ({ modelId: id, modelLabel: id.split("/").pop() || id, variants: [] }));
-    result[runner] = [...intersection, ...missing];
-  }
-  return result;
-}
-var EFFORT_LADDER = ["none", "minimal", "low", "medium", "high", "xhigh", "max", "ultra"];
-var EFFORT_ALIASES = { disabled: "none", adaptive: "medium" };
-function clampThinkingEffort(effort, variants) {
-  if (!effort) return void 0;
-  if (variants.length === 0) return void 0;
-  const ids = new Set(variants.map((v) => v.id));
-  if (ids.has(effort)) return effort;
-  const canon = EFFORT_ALIASES[effort] ?? effort;
-  if (ids.has(canon)) return canon;
-  const idx = EFFORT_LADDER.indexOf(canon);
-  if (idx < 0) return void 0;
-  for (let d = 1; d < EFFORT_LADDER.length; d++) {
-    const lower = EFFORT_LADDER[idx - d];
-    if (lower && ids.has(lower)) return lower;
-    const higher = EFFORT_LADDER[idx + d];
-    if (higher && ids.has(higher)) return higher;
-  }
-  return void 0;
-}
-function coerceAssignments(tasks, perRunnerAllowlist, allowedRunners, modelsByRunner) {
-  const clampVariant = (task) => {
-    if (!task.assignedModel || !modelsByRunner) return task;
-    const model = modelsByRunner[task.assignedRunner]?.find(
-      (m) => m.modelId === task.assignedModel.modelId
-    );
-    if (!model) return task;
-    const clamped = clampThinkingEffort(task.assignedModel.thinkingEffort, model.variants);
-    return {
-      ...task,
-      assignedModel: {
-        ...task.assignedModel,
-        thinkingEffort: clamped,
-        availableVariants: model.variants.map((v) => v.id)
-      }
-    };
-  };
-  const allowedFor = (runner) => effectiveAllowlist(perRunnerAllowlist[runner], runner, modelsByRunner);
-  const assignmentFor = (runner, modelId) => {
-    const known = modelsByRunner?.[runner]?.find((m) => m.modelId === modelId);
-    return {
-      modelId,
-      modelLabel: known?.modelLabel ?? modelId,
-      thinkingEffort: void 0,
-      ...known ? { availableVariants: known.variants.map((v) => v.id) } : {}
-    };
-  };
-  return tasks.map((task) => {
-    if (task.type === "user") return task;
-    if (allowedRunners && !allowedRunners.includes(task.assignedRunner)) {
-      const fallbackRunner = allowedRunners[0];
-      const fallbackModels = allowedFor(fallbackRunner);
-      const fallbackModel = fallbackModels?.length ? assignmentFor(fallbackRunner, fallbackModels[0]) : modelsByRunner?.[fallbackRunner]?.[0] ? assignmentFor(fallbackRunner, modelsByRunner[fallbackRunner][0].modelId) : task.assignedModel;
-      return clampVariant({
-        ...task,
-        assignedRunner: fallbackRunner,
-        assignedModel: fallbackModel
-      });
-    }
-    const allowlist = allowedFor(task.assignedRunner);
-    if (!task.assignedModel) {
-      if (allowlist && allowlist.length > 0) {
-        return clampVariant({ ...task, assignedModel: assignmentFor(task.assignedRunner, allowlist[0]) });
-      }
-      const discovered = modelsByRunner?.[task.assignedRunner]?.[0];
-      if (discovered) {
-        return clampVariant({ ...task, assignedModel: assignmentFor(task.assignedRunner, discovered.modelId) });
-      }
-      return task;
-    }
-    if (!allowlist || allowlist.length === 0) return clampVariant(task);
-    if (allowlist.includes(task.assignedModel.modelId)) return clampVariant(task);
-    return { ...task, assignedModel: assignmentFor(task.assignedRunner, allowlist[0]) };
-  });
-}
-
 // src/services/Planner.ts
 function plannerModesWith(req) {
   const modes = req.modes ?? DEFAULT_PLANNER_MODES;
@@ -10398,12 +10853,19 @@ var StdioAgentAdapter = class {
   /** Set for the duration of a turn. Outside one, events are buffered rather than dropped. */
   turnEmit = null;
   /**
-   * Events the agent produced between turns — in practice the startup warnings
-   * that arrive during the handshake. Dropping them hid the one diagnostic
-   * that explains a planner which cannot read the workspace, so they are held
-   * until a turn exists to show them in.
+   * Events the agent produced before its first turn — in practice the startup
+   * warnings that arrive during the handshake. Dropping them hid the one
+   * diagnostic that explains a planner which cannot read the workspace, so they
+   * are held until a turn exists to show them in.
+   *
+   * Only before the *first* turn. Once one has run, anything arriving outside a
+   * turn is that closed turn's straggling work — a backgrounded subagent
+   * finishing, a late read — and replaying it into the next turn presents it as
+   * research done for the user's new message.
    */
   betweenTurns = [];
+  /** Set once a turn has ended: after that, out-of-turn events are stale, not startup. */
+  hadTurn = false;
   disposed = false;
   /** Resolves when the process ends, so a handshake can lose the race instead of waiting out its timeout. */
   processEnded;
@@ -10438,7 +10900,7 @@ var StdioAgentAdapter = class {
     this.process.stdout?.on("data", (chunk) => {
       this.stdout.push(chunk.toString(), (line) => this.handleLine(line, (event) => {
         if (this.turnEmit) this.turnEmit(event);
-        else if (!TURN_SCOPED_EVENTS.has(event.type) && this.betweenTurns.length < BETWEEN_TURN_EVENT_CAP) {
+        else if (!this.hadTurn && !TURN_SCOPED_EVENTS.has(event.type) && this.betweenTurns.length < BETWEEN_TURN_EVENT_CAP) {
           this.betweenTurns.push(event);
         }
       }));
@@ -10470,6 +10932,7 @@ ${err.message}`).slice(-STDERR_TAIL_CHARS);
         if (settled) return;
         settled = true;
         this.turnEmit = null;
+        this.hadTurn = true;
         signal?.removeEventListener("abort", onAbort);
         this.process?.removeListener("exit", onExit);
         this.process?.removeListener("error", onExit);
@@ -10548,6 +11011,7 @@ ${tail}` : ""}`;
 
 // src/services/harness/ClaudeCodeAdapter.ts
 var DISALLOWED_TOOLS = ["Edit", "Write", "MultiEdit", "NotebookEdit", "KillShell"];
+var ASYNC_LAUNCH_MARKER = "Async agent launched successfully";
 function flattenContent(content) {
   if (typeof content === "string") return content;
   if (Array.isArray(content)) {
@@ -10557,6 +11021,8 @@ function flattenContent(content) {
 }
 var ClaudeCodeAdapter = class extends StdioAgentAdapter {
   agentId = "claude-code";
+  /** Whether this turn has already emitted reply text — see {@link handleLine}. */
+  turnHasText = false;
   spawnSpec(opts) {
     const args = [
       "-p",
@@ -10581,6 +11047,7 @@ var ClaudeCodeAdapter = class extends StdioAgentAdapter {
     return { command: "claude", args };
   }
   turnPayload(message) {
+    this.turnHasText = false;
     return `${JSON.stringify({
       type: "user",
       message: { role: "user", content: [{ type: "text", text: message }] }
@@ -10591,6 +11058,7 @@ var ClaudeCodeAdapter = class extends StdioAgentAdapter {
     const msg = StdioAgentAdapter.parse(line);
     if (!msg) return;
     if (msg.session_id) this.sessionId = msg.session_id;
+    if (msg.parent_tool_use_id) return;
     switch (msg.type) {
       // The control channel: Claude asks whether a tool may run when its mode
       // cannot decide alone. A read-only planner answers "deny", every time —
@@ -10615,8 +11083,12 @@ var ClaudeCodeAdapter = class extends StdioAgentAdapter {
       }
       case "assistant":
         for (const block of Array.isArray(msg.message?.content) ? msg.message.content : []) {
-          if (block.type === "text" && block.text) emit({ type: "assistant_text", text: block.text });
-          else if (block.type === "thinking" && block.thinking) emit({ type: "thinking", text: block.thinking });
+          if (block.type === "text" && block.text) {
+            emit({ type: "assistant_text", text: this.turnHasText ? `
+
+${block.text}` : block.text });
+            this.turnHasText = true;
+          } else if (block.type === "thinking" && block.thinking) emit({ type: "thinking", text: block.thinking });
           else if (block.type === "tool_use" && block.name) {
             emit({ type: "tool_call", id: block.id ?? block.name, name: block.name, args: block.input ?? {} });
           }
@@ -10625,11 +11097,15 @@ var ClaudeCodeAdapter = class extends StdioAgentAdapter {
       case "user":
         for (const block of Array.isArray(msg.message?.content) ? msg.message.content : []) {
           if (block.type !== "tool_result") continue;
+          const output = flattenContent(block.content);
+          if (output.includes(ASYNC_LAUNCH_MARKER)) {
+            emit({ type: "background_agent", id: block.tool_use_id ?? "" });
+          }
           emit({
             type: "tool_result",
             id: block.tool_use_id ?? "",
             name: "",
-            output: flattenContent(block.content),
+            output,
             success: block.is_error !== true
           });
         }
@@ -11049,6 +11525,8 @@ var OpenCodeAdapter = class {
   exited = false;
   disposed = false;
   opts = null;
+  /** Whether this turn has already emitted reply text — see {@link emitPart}. */
+  turnHasText = false;
   async start(opts) {
     this.opts = opts;
     assertWorkspaceExists(opts.cwd, { isDirectory: this.deps.isDirectory });
@@ -11116,6 +11594,7 @@ ${this.stderrTail.trim()}` : ""}`);
       return;
     }
     const seen = /* @__PURE__ */ new Set();
+    this.turnHasText = false;
     const streamAbort = new AbortController();
     let connected = () => {
     };
@@ -11184,7 +11663,10 @@ ${this.stderrTail.trim()}` : ""}`);
     if (part.type === "text" && part.text) {
       if (seen.has(`text:${id}`)) return;
       seen.add(`text:${id}`);
-      onEvent({ type: "assistant_text", text: part.text });
+      onEvent({ type: "assistant_text", text: this.turnHasText ? `
+
+${part.text}` : part.text });
+      this.turnHasText = true;
       return;
     }
     if (part.type === "reasoning" && part.text) {
@@ -11351,6 +11833,7 @@ function normalizeAgentArgs(tool, args) {
 
 // src/services/harness/CliAgentAiService.ts
 var MAX_JSON_REPAIRS = 2;
+var MAX_AGENT_WAITS = 2;
 var LOG_MAX_CHARS = 1e4;
 function defaultAdapter(runner, deps) {
   switch (runner) {
@@ -11491,13 +11974,16 @@ var CliAgentAiService = class {
     let pending = message;
     let emptyNudgeSent = false;
     let jsonRepairAttempts = 0;
+    let agentWaits = 0;
+    const carried = [];
+    const replyText = (text) => [...carried, text].filter((part) => part.trim()).join("\n\n");
     try {
       for (; ; ) {
         const turn = await this.runTurn(pending, onProgress, combined);
         researchLog.push(...turn.researchLog);
         if (turn.aborted || combined?.aborted) {
           onProgress({ type: "interrupted" });
-          return { kind: "message", text: turn.text, researchLog };
+          return { kind: "message", text: replyText(turn.text), researchLog };
         }
         if (turn.error) {
           return { kind: "message", text: turn.error, researchLog };
@@ -11515,6 +12001,18 @@ var CliAgentAiService = class {
             researchLog
           };
         }
+        if (turn.backgroundAgents > 0 && agentWaits < MAX_AGENT_WAITS && !combined?.aborted) {
+          agentWaits++;
+          carried.push(turn.text);
+          pending = [
+            `You ended your turn with ${turn.backgroundAgents} subagent(s) still running in the background.`,
+            "Ordewell hands the conversation back to the user when your turn ends, so anything you say after it never reaches them \u2014",
+            "the results you promised to report would be lost.",
+            "Wait for those agents to finish NOW, in this reply, and do not end your turn until you have their results.",
+            "Then give the user your synthesis. In future replies, await your agents inside the turn rather than backgrounding them."
+          ].join(" ");
+          continue;
+        }
         if (extractPrdBlock(turn.text)) conversation.prdCaptured = true;
         const reply = classifyPlannerReply(turn.text, {
           runners: conversation.runners,
@@ -11523,7 +12021,11 @@ var CliAgentAiService = class {
         });
         switch (reply.kind) {
           case "task_ops":
-            return { kind: "task_ops", ops: reply.ops, text: turn.text, researchLog };
+            return { kind: "task_ops", ops: reply.ops, text: replyText(turn.text), researchLog };
+          // The read channel is a text envelope precisely so it reaches here
+          // too: a harness planner has no Ordewell tool loop to call into.
+          case "task_query":
+            return { kind: "task_query", query: reply.query, text: replyText(turn.text), researchLog };
           case "plan":
             if (conversation.prdEnabled && !conversation.prdCaptured && !conversation.prdNudgeSent && !combined?.aborted) {
               conversation.prdNudgeSent = true;
@@ -11536,7 +12038,7 @@ var CliAgentAiService = class {
               continue;
             }
             this.conversation = null;
-            return { kind: "plan", tasks: reply.tasks, text: turn.text, researchLog };
+            return { kind: "plan", tasks: reply.tasks, text: replyText(turn.text), researchLog };
           case "broken_task_ops":
             if (jsonRepairAttempts < MAX_JSON_REPAIRS && !combined?.aborted) {
               jsonRepairAttempts++;
@@ -11544,6 +12046,13 @@ var CliAgentAiService = class {
               continue;
             }
             break;
+          case "broken_task_query":
+            if (jsonRepairAttempts < MAX_JSON_REPAIRS && !combined?.aborted) {
+              jsonRepairAttempts++;
+              pending = reEmitTaskQueryPrompt(reply.error.message);
+              continue;
+            }
+            break;
           case "broken_plan":
             if (jsonRepairAttempts < MAX_JSON_REPAIRS && !combined?.aborted) {
               jsonRepairAttempts++;
@@ -11554,7 +12063,7 @@ var CliAgentAiService = class {
           case "prose":
             break;
         }
-        return { kind: "message", text: turn.text, researchLog };
+        return { kind: "message", text: replyText(turn.text), researchLog };
       }
     } finally {
       this.activeAbort = null;
@@ -11574,6 +12083,7 @@ var CliAgentAiService = class {
     let text = "";
     let error;
     let stepIndex = 0;
+    let backgroundAgents = 0;
     const truncate = (value) => value.length > LOG_MAX_CHARS ? `${value.slice(0, LOG_MAX_CHARS)}
 [... truncated, total ${value.length} chars]` : value;
     const settle = (id, rawOutput, success, outcome) => {
@@ -11613,6 +12123,9 @@ var CliAgentAiService = class {
         case "tool_result":
           settle(event.id, event.output, event.success, event.success ? "success" : "failure");
           return;
+        case "background_agent":
+          backgroundAgents++;
+          return;
         case "permission_request": {
           const mapped = mapAgentTool(event.name);
           const args = JSON.stringify({ detail: event.detail });
@@ -11643,7 +12156,7 @@ var CliAgentAiService = class {
       adapter.dispose();
       this.adapter = null;
     }
-    return { text, researchLog, error, aborted: signal?.aborted };
+    return { text, researchLog, error, aborted: signal?.aborted, backgroundAgents };
   }
   // --- Process lifecycle ---
   async startAdapter(opts) {
@@ -12250,6 +12763,12 @@ function deleteSession(sessionId, baseDir, logger = defaultLogger) {
 }
 
 // src/services/createSession.ts
+var CATALOG_MODEL_CAP = 100;
+var MAX_TASK_QUERIES = 3;
+var MAX_TASK_QUERIES_HARD = 6;
+function freshReadBudget() {
+  return { answered: 0, seen: /* @__PURE__ */ new Set() };
+}
 var PlanEditError = class extends Error {
   constructor(message) {
     super(message);
@@ -12486,6 +13005,21 @@ var Session = class {
   runnerModesFor(runners) {
     return runnerModesFrom(this.registry, runners);
   }
+  /**
+   * The catalog a model/task-mode edit is checked against — the same
+   * discovered models and manifest modes the per-turn catalog block shows the
+   * planner, so a refusal here can never name something invalid that the
+   * planner was never told about. `modelsCache` is read live, not filtered by
+   * the allowlist here — {@link checkModelAndModeValidity} narrows by
+   * allowlist itself, the same way `coerceAssignments` does.
+   */
+  editCatalog() {
+    return {
+      modelsByRunner: this.modelsCache,
+      runnerModes: this.runnerModesFor(this.plan?.runners ?? []),
+      perRunnerAllowlist: this.settingsFn().modelAllowlist ?? this.currentAllowlist
+    };
+  }
   get planState() {
     return this.plan;
   }
@@ -12665,10 +13199,12 @@ var Session = class {
   async continueConversation(userMessage, options) {
     if (!this.plan) throw new Error("No planning conversation to continue");
     const priorHistory = this.plan.conversationHistory ?? [];
+    const priorResearchLog = this.plan.researchLog ?? [];
     const now = (/* @__PURE__ */ new Date()).toISOString();
     this.appendTranscript("user", userMessage, now);
+    const historyAfterOwnAppend = this.plan.conversationHistory;
     this.plan.researchLog = [...this.plan.researchLog ?? [], { id: `up-${Date.now()}`, type: "user_prompt", content: userMessage, timestamp: now }];
-    const contextBlock = this.planContextBlock();
+    const contextBlock = [this.catalogBlock(), this.planContextBlock()].filter(Boolean).join("\n\n");
     const outgoing = contextBlock ? `${contextBlock}
 
 ${userMessage}` : userMessage;
@@ -12681,6 +13217,8 @@ ${userMessage}` : userMessage;
         (p) => this.translateProgress(p),
         options?.signal
       ) : await this.resumeConversation(outgoing, priorHistory, options);
+      const reads = freshReadBudget();
+      turn = await this.drainTaskQueries(turn, reads, options);
       if ((turn.kind === "task_ops" || turn.kind === "plan") && this.hasLiveWork) {
         this.queueMessage(userMessage);
         this.plan.queuedMessages = this.getQueuedMessages();
@@ -12690,11 +13228,74 @@ ${userMessage}` : userMessage;
           researchLog: turn.researchLog
         };
       }
-      return await this.settleTurn(turn, options);
+      return await this.settleTurn(turn, options, reads);
+    } catch (err) {
+      if (this.plan && this.plan.conversationHistory === historyAfterOwnAppend) {
+        this.plan.conversationHistory = priorHistory;
+        this.plan.researchLog = priorResearchLog;
+      }
+      throw err;
     } finally {
       releaseAbort();
     }
   }
+  /**
+   * Answer every read the planner emits until it says something else.
+   *
+   * The channel is a text envelope rather than a registered tool because the
+   * protocol has to be identical on both planner backends (ADR-0009): Ordewell
+   * owns a tool loop only in the API case, and a harness planner running as a
+   * coding-agent subprocess can only be reached this way.
+   *
+   * Draining here — outside {@link repairLoop} — is what keeps reads free of
+   * the repair budget. A planner that looks a task up and *then* fumbles its
+   * ops JSON still gets its two corrective retries; charging it for the read
+   * would cost it the chance to fix the edit.
+   */
+  async drainTaskQueries(turn, reads, options) {
+    const carried = [];
+    let current = turn;
+    while (current.kind === "task_query") {
+      carried.push(...current.researchLog);
+      if (reads.answered >= MAX_TASK_QUERIES_HARD || !this.aiService.hasActiveConversation() || options?.signal?.aborted) {
+        return {
+          kind: "message",
+          text: "The planner kept asking to read tasks instead of answering. Nothing was changed \u2014 ask again, or be more specific about the edit you want.",
+          researchLog: carried
+        };
+      }
+      const signature = taskQuerySignature(current.query);
+      const insist = reads.seen.has(signature) || reads.answered >= MAX_TASK_QUERIES;
+      reads.seen.add(signature);
+      reads.answered++;
+      const answer = this.taskQueryAnswer(current.query);
+      current = await this.aiService.continueConversation(
+        insist ? `${answer}
+
+${TASK_QUERY_ANSWER_OR_OPS}` : answer,
+        (p) => this.translateProgress(p),
+        options?.signal
+      );
+    }
+    return carried.length > 0 ? { ...current, researchLog: [...carried, ...current.researchLog] } : current;
+  }
+  /**
+   * Render one read out of live state. Never persisted to the transcript: the
+   * detail is context for the planner's next reply, and re-sending it on every
+   * later turn is exactly the cost this channel exists to avoid.
+   */
+  taskQueryAnswer(query) {
+    const runners = this.plan?.runners ?? [];
+    const allowlist = this.settingsFn().modelAllowlist ?? this.currentAllowlist;
+    return renderTaskQueryAnswer(query, this.store.planTasks, {
+      runners,
+      // Allowlist-filtered like the always-on block: a read must not offer a
+      // model the planner is forbidden to assign.
+      models: filterModelsForPrompt(this.modelsCache, allowlist),
+      modes: this.runnerModesFor(runners),
+      autonomousDefault: this.config.autonomousMode
+    });
+  }
   /**
    * Drive a planner turn to a persisted, broadcast outcome. Task edits apply
    * atomically; validation failures are fed back to the model for up to 2
@@ -12702,7 +13303,7 @@ ${userMessage}` : userMessage;
    * first turn (startPlanning) and every later turn route through here — one
    * path, not two.
    */
-  async settleTurn(turn, options) {
+  async settleTurn(turn, options, reads = freshReadBudget()) {
     const invalidOps = (errors, researchLog) => ({
       turn: {
         kind: "message",
@@ -12714,11 +13315,15 @@ The plan is unchanged. Rephrase the request, or adjust the tasks manually.`,
       }
     });
     const settled = await repairLoop({
-      first: () => turn,
-      resend: (corrective) => this.aiService.continueConversation(
-        corrective,
-        (p) => this.translateProgress(p),
-        options?.signal
+      first: () => this.drainTaskQueries(turn, reads, options),
+      resend: async (corrective) => this.drainTaskQueries(
+        await this.aiService.continueConversation(
+          corrective,
+          (p) => this.translateProgress(p),
+          options?.signal
+        ),
+        reads,
+        options
       ),
       interpret: (t) => {
         if (t.kind !== "task_ops") return { done: { turn: t } };
@@ -12738,6 +13343,52 @@ The plan is unchanged. Rephrase the request, or adjust the tasks manually.`,
     }
     return this.applyConversationTurn(settled.turn);
   }
+  /**
+   * The catalog the planner may actually draw from — model ids and task-mode
+   * ids, per selected runner — emitted on EVERY turn, before any plan exists
+   * or after. The system prompt shows this once at conversation start; a long
+   * grill-me interview or PRD negotiation outlives that single showing and the
+   * planner starts misquoting it, so this re-states it per turn instead.
+   *
+   * Built from the allowlist-filtered view (`filterModelsForPrompt`), the same
+   * one the system prompt used — a restricted allowlist stays a hard bound on
+   * every turn, not just the first. `this.modelsCache` itself is never
+   * filtered: `coerceAssignments` needs the full discovered catalog alongside
+   * the allowlist to resolve labels and clamp effort to real variants.
+   *
+   * Reads `this.plan.runners` live, so a runner admitted mid-session by a
+   * retarget (`admitRunner`) is filtered and shown like every other — there is
+   * no separate "originally selected" list to fall stale.
+   */
+  catalogBlock() {
+    if (!this.plan) return null;
+    const allowlist = this.settingsFn().modelAllowlist ?? this.currentAllowlist;
+    const filteredModels = filterModelsForPrompt(this.modelsCache, allowlist);
+    const runnerModes = this.runnerModesFor(this.plan.runners);
+    const autonomousDefault = this.config.autonomousMode;
+    const modelLines = this.plan.runners.map((runner) => {
+      const models = filteredModels[runner] ?? [];
+      const capped = models.slice(0, CATALOG_MODEL_CAP);
+      const remainder = models.length - capped.length;
+      const ids = capped.map((m) => m.modelId).join(", ") || "(no models discovered)";
+      return `${runner}: ${ids}${remainder > 0 ? ` \u2026 +${remainder} more not shown` : ""}`;
+    });
+    const modeLines = this.plan.runners.map((runner) => {
+      const modes = runnerModes[runner] ?? [];
+      if (modes.length === 0) return `${runner}: (no modes declared)`;
+      const defaultId = resolveDefaultMode(modes, autonomousDefault);
+      const ids = modes.map((m) => `${m.id}${m.id === defaultId ? " (default)" : ""}`).join(", ");
+      return `${runner}: ${ids}`;
+    });
+    return [
+      "<available_models>",
+      ...modelLines,
+      "</available_models>",
+      "<available_task_modes>",
+      ...modeLines,
+      "</available_task_modes>"
+    ].join("\n");
+  }
   /**
    * The "you are here" block for post-plan chat: current tasks with stable
    * references, plus the task-ops protocol. Injected per turn (never
@@ -12747,44 +13398,48 @@ The plan is unchanged. Rephrase the request, or adjust the tasks manually.`,
   planContextBlock() {
     if (!this.plan || this.store.planTasks.length === 0) return null;
     const orderOf = new Map(this.store.planTasks.map((t) => [t.id, `#${t.order}`]));
-    const lines = this.store.planTasks.map(
-      (t) => `#${t.order} id=${t.id} "${t.title}" [${t.status}] runner:${t.assignedRunner}${t.assignedModel ? ` model:${t.assignedModel.modelId}` : ""} deps:[${t.dependencies.map((d) => orderOf.get(d) ?? d).join(", ")}]`
-    );
+    const lines = this.store.planTasks.map((t) => {
+      const isMan = t.type === "user";
+      const runFields = isMan ? `steps:${t.userSteps?.length ?? 0}` : `${t.assignedModel ? `model:${t.assignedModel.modelId} ` : ""}mode:${t.taskMode ?? "build"} effort:${t.thinkingEffort ?? "-"}`;
+      return `#${t.order} id=${t.id} "${t.title}" [${t.status}] type:${isMan ? "MAN" : "AI"} runner:${t.assignedRunner} ${runFields} autonomy:${t.autonomy ?? "-"} slice:${t.sliceType ?? "-"} deps:[${t.dependencies.map((d) => orderOf.get(d) ?? d).join(", ")}]`;
+    });
     const locked = this.store.planTasks.filter((t) => t.status === "in_progress");
     const execNote = this.hasLiveWork ? `
 Execution is RUNNING${locked.length ? ` \u2014 these tasks are locked: ${locked.map((t) => `#${t.order}`).join(", ")}` : ""}. Any task edits you emit will be queued and applied between batches.` : "";
-    const modelLines = [];
-    for (const runner of this.plan.runners) {
-      const models = this.modelsCache[runner] ?? [];
-      const ids = models.map((m) => m.modelId).join(", ");
-      modelLines.push(`${runner}: ${ids || "(no models discovered)"}`);
-    }
-    const modelBlock = modelLines.length > 0 ? ["<available_models>", ...modelLines, "</available_models>"].join("\n") : "";
+    const updateChanges = UPDATABLE_FIELDS.map((f) => f === "dependencies" ? '"dependencies"?:["<id or #order>"]' : `"${f}"?`).join(",");
     return [
       "<current_plan>",
       ...lines,
       "</current_plan>",
-      modelBlock,
-      "The block above is the CURRENT task plan. Choose how to respond:",
+      "The block above is the CURRENT task plan \u2014 short fields only. Choose how to respond:",
       "- To answer a question or discuss, reply in plain prose (no JSON).",
+      // The reminder text is owned by TaskQuery beside the parser, so the
+      // protocol the planner reads and the one Ordewell accepts stay one thing.
+      TASK_QUERY_REMINDER,
       "- To modify specific tasks, reply with ONLY this JSON object:",
       '  {"taskOps": [',
-      '    {"op":"update","taskId":"<id or #order>","changes":{"title"?,"description"?,"prompt"?,"dependencies"?:["<id or #order>"],"assignedRunner"?,"assignedModel"?,"taskMode"?}},',
-      '    {"op":"add","task":{"title","description","prompt","dependencies":["<id or #order>"],"assignedRunner"?,"assignedModel"?}},',
+      `    {"op":"update","taskId":"<id or #order>","changes":{${updateChanges}}},`,
+      '    {"op":"add","task":{"title","description","prompt","dependencies":["<id or #order>"],"assignedRunner"?,"assignedModel"?},"handle"?:"<name>"},',
       '    {"op":"remove","taskId":"<id or #order>"},',
-      '    {"op":"reorder","taskIds":["<id or #order>", "... every task exactly once"]},',
-      '    {"op":"merge","taskIds":["<id or #order>", "..."],"merged":{"title","description","prompt"?,"assignedRunner"?,"assignedModel"?,...}},',
-      '    {"op":"split","taskId":"<id or #order>","parts":[{"title","description","prompt"?,"assignedRunner"?,"assignedModel"?,...}, ...]}',
+      '    {"op":"reorder","taskIds":["<id or #order>", "... every task exactly once"]},   // only to re-prioritise INDEPENDENT tasks',
+      '    {"op":"merge","taskIds":["<id or #order>", "..."],"merged":{"title","description","prompt"?,"assignedRunner"?,"assignedModel"?,...},"handle"?:"<name>"},',
+      '    {"op":"split","taskId":"<id or #order>","parts":[{"title","description","prompt"?,"assignedRunner"?,"assignedModel"?,...}, ...],"handle"?:"<name>"},',
+      `    {"op":"rearm","taskId":"<id or #order>","changes"?:{${updateChanges}}}`,
       "  ]}",
       '- For sweeping changes, you may instead emit a full {"tasks":[...]} plan JSON.',
+      'Every "<id or #order>" ref in a batch resolves against the plan shown above, before any op in the batch runs \u2014 an earlier remove/merge/split never shifts what a later "#N" means.',
+      'Give "add", "merge", or "split" a "handle" (any name you choose, unused elsewhere in this batch) to let a LATER op in the same batch reference the task it produces \u2014 for "split", the handle names its last part. A handle used before its defining op is rejected.',
       'When creating or changing tasks, set "assignedRunner" and "assignedModel" ({"modelId","modelLabel","thinkingEffort"?}) using only the runners and models listed in <available_models>.',
-      "Keep dependencies consistent: no cycles, no references to removed tasks, dependencies must come before dependents, and never touch running or completed tasks." + execNote
+      'Keep dependencies consistent: no cycles, no references to removed tasks, and never touch running or completed tasks \u2014 "rearm" is the one exception, below.',
+      'Just declare the dependencies you want \u2014 display order is repaired for you afterwards, so a rewire or a newly added prerequisite never needs a "reorder" op. Only a task that is running or completed cannot be shifted, so an edit that would need one to move is rejected.' + execNote,
+      'Flipping "type" between "ai" and "user" is a content change, not just a label: an update to "user" needs "userSteps" in the SAME op, and an update to "ai" needs "prompt" in the SAME op \u2014 the model/mode/effort/autonomy fields (flipping to "user") or the userSteps (flipping to "ai") are cleared automatically.',
+      '"rearm" puts a failed OR completed task back to pending \u2014 verdict and output summary are cleared, any dependents it had blocked are released, and it may carry field changes (e.g. a corrected "prompt") applied in the same op. A running task cannot be re-armed. Never rearm a task just to relabel it \u2014 only when it should actually run again.'
     ].filter(Boolean).join("\n");
   }
   /** Validate + commit a task_ops turn atomically. Returns the errors on rejection (plan untouched). */
   applyTaskOpsTurn(turn) {
     if (!this.plan) throw new Error("No active plan state");
-    const result = applyTaskOps(this.store.planTasks, turn.ops, this.plan.runners);
+    const result = applyTaskOps(this.store.planTasks, turn.ops, this.plan.runners, this.editCatalog());
     if (!result.ok) return { errors: result.errors };
     const now = (/* @__PURE__ */ new Date()).toISOString();
     const content = `Tasks updated:
@@ -13051,15 +13706,22 @@ Execution is RUNNING${locked.length ? ` \u2014 these tasks are locked: ${locked.
     return plan;
   }
   /**
-   * Patch one task's fields. A hand-set dependency list is the one patch that
-   * can leave the plan unschedulable, so it goes through the same
-   * {@link canSetDependencies} guard the planner's pickers use rather than a
-   * second copy of the rule — and throws, so the surface can say why.
+   * Patch one task's fields. A hand-set dependency list, or a type flip
+   * between AI and MAN, are the patches that can leave a task incoherent
+   * (unschedulable, or carrying fields that mean nothing for its new type),
+   * so both go through the same {@link validateTaskEdit} guard the planner's
+   * task-ops applier uses (as the 'direct' actor, which skips the lock rule)
+   * rather than a second copy of the rules — and throws, so the surface can
+   * say why. Gated on the task existing so an edit to an unknown id still
+   * falls through to the no-op `store.update` below instead of throwing.
    */
   async updateTask(taskId, changes) {
-    if (changes.dependencies) {
-      const check = canSetDependencies(this.store.planTasks, taskId, changes.dependencies);
-      if (!check.ok) throw new PlanEditError(check.error ?? "Those dependencies are not valid");
+    if ((changes.dependencies || changes.type || changes.assignedModel || changes.taskMode) && this.store.get(taskId)) {
+      const check = validateTaskEdit("direct", this.store.planTasks, taskId, changes, this.editCatalog());
+      if (!check.ok) throw new PlanEditError(check.error ?? "Those changes are not valid");
+      if (check.clear?.length) {
+        changes = { ...changes, ...Object.fromEntries(check.clear.map((f) => [f, void 0])) };
+      }
     }
     return this.editPlan(
       () => Boolean(this.store.update(taskId, changes)),
@@ -15157,6 +15819,11 @@ var PlannerModelMemory = class {
   SettingsService,
   StdioAgentAdapter,
   TASK_OPS_ENVELOPE_KEY,
+  TASK_QUERY_ANSWER_OR_OPS,
+  TASK_QUERY_ENVELOPE_KEY,
+  TASK_QUERY_FIELDS,
+  TASK_QUERY_PROTOCOL,
+  TASK_QUERY_REMINDER,
   TRUNCATED_PLAN_REPAIR_INSTRUCTION,
   TaskOrchestrator,
   TmuxRunner,
@@ -15277,6 +15944,7 @@ var PlannerModelMemory = class {
   parsePartialPlan,
   parsePlanJson,
   parseTaskOpsJson,
+  parseTaskQueryJson,
   pendingEditRulesBlock,
   planDirectLaunch,
   planShellLaunch,
@@ -15285,11 +15953,13 @@ var PlannerModelMemory = class {
   providerForRunner,
   reEmitPlanPrompt,
   reEmitTaskOpsPrompt,
+  reEmitTaskQueryPrompt,
   readDaemonToken,
   referencePattern,
   removeTaskFromPlan,
   renderPlanMap,
   renderPriorOutputs,
+  renderTaskQueryAnswer,
   renumberTasks,
   repairLoop,
   researchShellWarning,
@@ -15323,7 +15993,9 @@ var PlannerModelMemory = class {
   summarizeOutput,
   summarizeToolCall,
   taskOpsRejectedPrompt,
+  taskQuerySignature,
   textHasTaskOps,
+  textHasTaskQuery,
   tmuxSessionName,
   tmuxSocketName,
   tmuxWindowName,