@anhlp/alp-runtime 0.0.0-beta.2 → 0.0.1-beta.3

package/dist/runtime.js

@@ -47,6 +47,7 @@ import { addGate, checkGates, resolveGate, blockersOf, childrenOf, closeTask, ep
 var MAX_WAKES = 8;
 var USER_REPLY_MS = 6e4;
 var USER_WROTE = "The user just wrote to you; their message follows. Answer them first in a short message they can read (tool calls alone show them nothing), and steer an assignment with alp_send when their words change its brief. Your assignments keep running: then alp_wait again, or end your turn and ALP wakes you with their results.";
+var TURN_ENDED = "Turn ended before the result arrived. Running assignments keep running; ALP wakes you with their results as mail.";
 var CHECKED_IN = "Not a result: the assignment keeps running. Act on this mail first (a steer from your requester or the user's words may change what your assignments should do: pass that on with alp_send), then alp_wait again or end your turn.";
 var RESTART_LIMIT = 3;
 var RESTART_WINDOW_MS = 10 * 6e4;
@@ -139,11 +140,12 @@ function createAlpRuntime(options = {}) {
       ...session.parent ? { parentId: session.parent } : {},
       ...session.toolCallId ? { toolCallId: session.toolCallId } : {},
       ...session.active ? { activeTurnId: session.active } : {},
-      ...session.parked ? { parked: session.parked.reason } : {},
+      // turn.ended listeners persist the intent before terminal() finishes parking it.
+      ...session.parked?.reason ?? session.parkReason ? { parked: session.parked?.reason ?? session.parkReason } : {},
       ...session.instructionsSha ? { instructionsSha: session.instructionsSha } : {},
       ...takesImages(session) ? { promptImages: true } : {},
       ...session.usage ? { usage: session.usage } : {},
-      busy: !!(session.active || session.pending || session.children.size || session.assignments.size || hasActiveMail(session) || reviewing(session))
+      busy: !!(session.active || session.pending || session.parked || session.parkReason || session.children.size || session.assignments.size || hasActiveMail(session) || reviewing(session))
     };
   }
   function terminal(sessionId, session, state, error) {
@@ -161,7 +163,7 @@ function createAlpRuntime(options = {}) {
       clearTimeout(waiter.timer);
       waiter.resolve(null);
     }
-    cancelQuestions(sessionId);
+    cancelQuestions(sessionId, true);
     if (session.parent) sessions.get(session.parent)?.assignments.get(sessionId)?.ask?.resolve(toolResult(false, { error: "Turn ended" }));
     session.mail = session.mail.filter((event) => !(event.deliveredTurn === turnId && state === "completed"));
     for (const event of session.mail) {
@@ -319,7 +321,7 @@ function createAlpRuntime(options = {}) {
     if (method === "turn/completed" && params.turn.id === session.active) {
       const state = params.turn.status === "completed" ? "completed" : params.turn.status === "interrupted" ? "canceled" : "failed";
       if (state === "failed" && LIMIT_ERRORS.includes(params.turn.error?.codexErrorInfo)) {
-        if (session.parent && session.role !== "supervisor") session.parkReason = `the ${label(session.runtimeKind)} usage limit was reached`;
+        if (session.role !== "supervisor") session.parkReason = `the ${label(session.runtimeKind)} usage limit was reached`;
         void limitReached(session, params.turn.error);
       }
       terminal(
@@ -335,6 +337,7 @@ function createAlpRuntime(options = {}) {
     if (!session || session.closed) return;
     session.closed = true;
     cancelQuestions(sessionId);
+    approvalLedger.delete(sessionId);
     releaseClaims(sessionId, session.mapping.agent.projectRoot);
     await Promise.all(
       [...session.children, ...session.supervisor ? [session.supervisor] : []].map(closeSession)
@@ -601,7 +604,7 @@ ${output.slice(0, 4e3)}` : ""}`;
     const root = sessions.get(rootId);
     const watcher = root?.mapping.team?.supervisor ? root.mapping.team.supervisor.agent : "supervisor";
     if (!root?.supervisor || entry.from === "supervisor" || entry.agent === watcher) return;
-    const line = entry.event === "assignment.started" ? `${entry.parentAgent} \u2192 ${entry.agent} assignment ${entry.assignmentId}${entry.taskId ? ` for task ${entry.taskId}` : ""} (${entry.model}, ${entry.thinking ?? "default effort"}, ${entry.mode}, ${entry.isolation}${entry.wait ? "" : ", async"}): ${clip(entry.task)}` : entry.event === "assignment.finished" ? `${entry.agent} assignment ${entry.assignmentId} ${entry.status}${entry.handoff ? `, handoff ${entry.handoff.outcome}${entry.handoff.verdict ? `, ${verdictLine(entry.handoff.verdict)}` : ""}: ${clip(entry.handoff.summary)}` : ", no handoff"}${entry.error ? ` (${clip(entry.error, 200)})` : ""}${entry.handoff?.discovered?.length ? `; discovered: ${clip(entry.handoff.discovered.join("; "))}` : ""}` : entry.event === "mail" && entry.kind !== "result" && entry.kind !== "board" ? `mail ${entry.kind} from ${entry.from}${entry.replyTo ? ` (reply to ${entry.replyTo})` : ""}: ${clip(entry.body ?? "")}` : entry.event === "human.question" ? `${entry.agent} asked the user: ${clip(entry.body)}` : entry.event === "human.answer" ? `user ${entry.outcome} ${entry.questionId}${entry.answer ? `: ${clip(entry.answer)}` : ""}` : entry.event === "board.pin" ? `${entry.agent} pinned ${entry.kind}${entry.paths ? ` ${entry.paths.join(", ")}` : ""}: ${clip(entry.body)}` : entry.event === "lesson" ? `${entry.agent} recorded a ${entry.scope} lesson: ${clip(entry.lesson)}` : entry.event === "skill" && Array.isArray(entry.roles) ? `${entry.agent} saved skill ${entry.name} for ${entry.roles.join(", ")} with the user's approval` : entry.event === "task" ? `${entry.agent} ${TASK_PAST[entry.action] ?? entry.action} task ${entry.id} "${clip(entry.title, 120)}"${entry.status ? ` (now ${entry.status})` : ""}${entry.detail ? `: ${clip(entry.detail)}` : ""}` : entry.event === "epic.landed" ? `${entry.agent} closed ${entry.id} "${clip(entry.title, 120)}": ${entry.tasks} tasks, ${entry.reworked} reworked, ${entry.unverified?.length ?? 0} closed unverified` : entry.event === "recall" ? `${entry.agent} recalled ${entry.recalled} assignment ${entry.assignmentId}: ${clip(entry.question)}` : entry.event === "issue" ? `${entry.action === "create" ? `opened issue "${clip(entry.title, 200)}"` : `commented on issue #${entry.issue}`} in ${entry.repo} with the user's approval: ${entry.url}` : entry.event?.startsWith("worktree.") ? `${entry.event.slice("worktree.".length)} worktree of ${entry.assignmentId} (${entry.branch})${entry.status ? `: ${entry.status}` : ""}` : void 0;
+    const line = entry.event === "assignment.started" ? `${entry.parentAgent} \u2192 ${entry.agent} assignment ${entry.assignmentId}${entry.taskId ? ` for task ${entry.taskId}` : ""} (${entry.model}, ${entry.thinking ?? "default effort"}, ${entry.mode}, ${entry.isolation}${entry.wait ? "" : ", async"}): ${clip(entry.task)}` : entry.event === "assignment.finished" ? `${entry.agent} assignment ${entry.assignmentId} ${entry.status}${entry.handoff ? `, handoff ${entry.handoff.outcome}${entry.handoff.verdict ? `, ${verdictLine(entry.handoff.verdict)}` : ""}: ${clip(entry.handoff.summary)}` : ", no handoff"}${entry.error ? ` (${clip(entry.error, 200)})` : ""}${entry.handoff?.discovered?.length ? `; discovered: ${clip(entry.handoff.discovered.join("; "))}` : ""}` : entry.event === "mail" && entry.kind !== "result" && entry.kind !== "board" ? `mail ${entry.kind} from ${entry.from}${entry.replyTo ? ` (reply to ${entry.replyTo})` : ""}: ${clip(entry.body ?? "")}` : entry.event === "human.question" ? `${entry.agent} asked the user: ${clip(entry.body)}` : entry.event === "human.answer" ? `user ${entry.outcome} ${entry.questionId}${entry.answer ? `: ${clip(entry.answer)}` : ""}` : entry.event === "board.pin" ? `${entry.agent} pinned ${entry.kind}${entry.paths ? ` ${entry.paths.join(", ")}` : ""}: ${clip(entry.body)}` : entry.event === "lesson" ? `${entry.agent} recorded a ${entry.scope} lesson: ${clip(entry.lesson)}` : entry.event === "skill" && Array.isArray(entry.roles) ? `${entry.agent} saved skill ${entry.name} for ${entry.roles.join(", ")} with the user's approval` : entry.event === "task" ? `${entry.agent} ${TASK_PAST[entry.action] ?? entry.action} task ${entry.id} "${clip(entry.title, 120)}"${entry.status ? ` (now ${entry.status})` : ""}${entry.detail ? `: ${clip(entry.detail)}` : ""}` : entry.event === "epic.landed" ? `${entry.agent} closed ${entry.id} "${clip(entry.title, 120)}": ${entry.tasks} tasks, ${entry.reworked} reworked, ${entry.unverified?.length ?? 0} closed unverified` : entry.event === "recall" ? `${entry.agent} recalled ${entry.recalled} assignment ${entry.assignmentId}: ${clip(entry.question)}` : entry.event === "skill.approval" && !entry.saved ? `skill approval ${entry.approvalId} for ${entry.name}: not saved (${entry.error ?? entry.outcome})` : entry.event === "issue.approval" ? `issue approval ${entry.approvalId} in ${entry.repo}: ${entry.posted ? entry.url : entry.error ?? entry.outcome}` : entry.event === "issue" ? `${entry.action === "create" ? `opened issue "${clip(entry.title, 200)}"` : `commented on issue #${entry.issue}`} in ${entry.repo} with the user's approval: ${entry.url}` : entry.event?.startsWith("worktree.") ? `${entry.event.slice("worktree.".length)} worktree of ${entry.assignmentId} (${entry.branch})${entry.status ? `: ${entry.status}` : ""}` : void 0;
     if (line) root.journal.push(stamp(line));
   }
   const eventful = (journal) => journal.some((line) => !unstamped(line).startsWith("turn ended:"));
@@ -1036,20 +1039,34 @@ Review the process against ALP.md, ${agent}'s AGENT.md and the recorded lessons.
     else post(session.parent, { kind: "stalled", from: assignment.agent, assignment: sessionId, body: `Parked: ${session.parked.reason}. ALP continues this assignment where it stopped when ${label(session.runtimeKind)} is resumed (${options.autoResume !== false && (pauseOf(session.runtimeKind)?.by ?? "alpd") === "alpd" ? `ALP resumes it as soon as ${label(session.runtimeKind)} says the limit lifted` : "the user runs alp resume"}). Wait for it, start other work, or stop it with alp_cancel and give the rest to an agent on another runtime (pass model claude:\u2026 or codex:\u2026); what it changed stays in your checkout or its worktree.` });
   }
   function continueParked(sessionId, session) {
-    const { reason, prompt } = session.parked;
-    session.parked = void 0;
-    session.wakeHeld = false;
-    session.lastActivity = Date.now();
-    emit(sessionId, { type: "session.updated", session: snapshot(sessionId, session) });
-    const parent = session.parent ? sessions.get(session.parent) : void 0;
-    const assignment = parent?.assignments.get(sessionId);
-    runLog(rootOf(sessionId), { event: "assignment.resumed", assignmentId: sessionId, agent: session.mapping.agent.name });
-    if (assignment) emit(session.parent, { type: "assignment", assignment: assignmentSnapshot(assignment, "running") });
-    void startPrompt(sessionId, {
-      clientMessageId: `alp-resume-${randomUUID()}`,
-      delivery: "auto",
-      content: [{ type: "text", text: prompt ?? `ALP resumed this assignment; it had stopped because ${reason}. Continue where you left off: your earlier work in this session and its files are intact. Finish with alp_handoff as before.` }]
-    }, session.parent ? "assignment" : "wake").catch((error) => session.settle?.("failed", error));
+    void enqueue(async () => {
+      if (session.closed || session.active || session.pending || !session.parked || pauseOf(session.runtimeKind)) return;
+      const parked = session.parked;
+      const { reason, prompt } = parked;
+      session.parked = void 0;
+      session.wakeHeld = false;
+      session.lastActivity = Date.now();
+      const parent = session.parent ? sessions.get(session.parent) : void 0;
+      const assignment = parent?.assignments.get(sessionId);
+      runLog(rootOf(sessionId), { event: "assignment.resumed", assignmentId: sessionId, agent: session.mapping.agent.name });
+      if (assignment) emit(session.parent, { type: "assignment", assignment: assignmentSnapshot(assignment, "running") });
+      try {
+        await startPrompt(sessionId, {
+          clientMessageId: `alp-resume-${randomUUID()}`,
+          delivery: "auto",
+          content: [{ type: "text", text: prompt ?? (session.parent ? `ALP resumed this assignment; it had stopped because ${reason}. Continue where you left off: your earlier work in this session and its files are intact. Finish with alp_handoff as before.` : `ALP resumed this session; it had stopped because ${reason}. Continue the user's request where you left off: your earlier work in this thread and its files are intact.`) }]
+        }, session.parent ? "assignment" : "wake");
+        session.resumedTurn = session.active;
+        emit(sessionId, { type: "session.updated", session: snapshot(sessionId, session) });
+      } catch (error) {
+        if (!session.closed && !session.active) {
+          session.parked = parked;
+          emit(sessionId, { type: "session.updated", session: snapshot(sessionId, session) });
+          if (assignment) emit(session.parent, { type: "assignment", assignment: assignmentSnapshot(assignment, "parked") });
+        }
+        notice("warning", `Could not resume ${session.mapping.agent.name}: ${errorData(error).message}`);
+      }
+    });
   }
   async function limitReset(session, error) {
     const at = (seconds) => typeof seconds === "number" && seconds > 0 ? new Date(seconds * 1e3).toISOString() : void 0;
@@ -1066,8 +1083,9 @@ Review the process against ALP.md, ${agent}'s AGENT.md and the recorded lessons.
   }
   async function limitReached(session, error) {
     const kind = session.runtimeKind;
-    if (paused.runtimes[kind]?.by === "alpd") return;
+    if (pauseOf(kind)) return;
     const resetsAt = await limitReset(session, error);
+    if (closed || session.closed || pauseOf(kind)) return;
     const pause = { since: (/* @__PURE__ */ new Date()).toISOString(), by: "alpd", reason: `${label(kind)} usage limit reached`, ...resetsAt ? { resetsAt } : {} };
     pauseRuntime(kind, pause);
     const other = RUNTIMES.find((candidate) => candidate !== kind && !pauseOf(candidate));
@@ -1208,10 +1226,10 @@ ${cut(session.brief, BRIEF_CHARS)}`);
   function lessonFiles(mapping) {
     return [path.join(mapping.agent.projectRoot, ".alp", LESSONS_FILE), ...options.libraryDir ? [path.join(options.libraryDir, LESSONS_FILE)] : []];
   }
-  async function confirm(sessionId, session, body) {
+  async function confirm(sessionId, session, body, approval) {
     if ([...userQuestions.values()].some((pending) => pending.question.sessionId === sessionId)) return { approved: false, outcome: "busy", feedback: "A question is already waiting for the user" };
     const say = wordsFor(session);
-    const result = await askUser(sessionId, session, void 0, body, [say.approve, say.reject]);
+    const result = await askUser(sessionId, session, void 0, body, [say.approve, say.reject], approval);
     let value;
     try {
       value = JSON.parse(result.contentItems[0].text);
@@ -1222,25 +1240,45 @@ ${cut(session.brief, BRIEF_CHARS)}`);
     const answer = String(value.answer).trim();
     return APPROVALS.includes(answer.toLowerCase()) ? { approved: true } : { approved: false, outcome: "answered", feedback: answer };
   }
-  const declined = (decision) => toolResult(true, {
-    approved: false,
-    outcome: decision.outcome,
-    ...decision.feedback ? { feedback: decision.feedback } : {},
-    next: "Nothing was saved or posted. Revise from the feedback and propose again, or drop it."
-  });
   const text = (value, limit) => typeof value === "string" && !!value.trim() && value.length <= limit;
+  const approvalCancellation = /* @__PURE__ */ new WeakMap();
+  const approvalLedger = /* @__PURE__ */ new Map();
+  const approvalsOf = (sessionId) => {
+    let approvals = approvalLedger.get(sessionId);
+    if (!approvals) approvalLedger.set(sessionId, approvals = /* @__PURE__ */ new Map());
+    return approvals;
+  };
+  const approvalCanceled = (session, cancellation) => closed || session.closed || cancellation !== (approvalCancellation.get(session) ?? 0);
   async function skillTool(sessionId, session, args) {
-    if (!plainObject(args, ["name", "description", "body", "roles", "lessons", "replace"]) || typeof args.name !== "string" || !/^[a-z0-9][a-z0-9-]{1,62}$/.test(args.name) || !text(args.description, 300) || !text(args.body, SKILL_BODY_CHARS) || !Array.isArray(args.roles) || !args.roles.length || args.roles.length > 10 || !args.roles.every((role) => typeof role === "string" && /^[\w.-]+$/.test(role) && role !== "." && role !== "..") || args.lessons !== void 0 && (!Array.isArray(args.lessons) || args.lessons.length > 50 || !args.lessons.every((lesson) => text(lesson, LESSON_CHARS))) || args.replace !== void 0 && typeof args.replace !== "boolean") {
+    const cancellation = approvalCancellation.get(session) ?? 0;
+    args = structuredClone(args);
+    if (!plainObject(args, ["name", "description", "body", "roles", "lessons", "replace", "requestId"]) || typeof args.name !== "string" || !/^[a-z0-9][a-z0-9-]{1,62}$/.test(args.name) || !text(args.description, 300) || !text(args.body, SKILL_BODY_CHARS) || !Array.isArray(args.roles) || !args.roles.length || args.roles.length > 10 || !args.roles.every((role) => typeof role === "string" && /^[\w.-]+$/.test(role) && role !== "." && role !== "..") || args.lessons !== void 0 && (!Array.isArray(args.lessons) || args.lessons.length > 50 || !args.lessons.every((lesson) => text(lesson, LESSON_CHARS))) || args.replace !== void 0 && typeof args.replace !== "boolean") {
       return toolResult(false, { error: `A skill needs a name (lowercase letters, digits, hyphens), a one-line description, a body of at most ${SKILL_BODY_CHARS} characters, and the roles that get it` });
     }
-    if (!options.libraryDir) return toolResult(false, { error: "This host keeps no user skill library" });
-    const known = /* @__PURE__ */ new Set([...STARTER_ROLES, ...await discoverAgents(session.mapping.agent.projectRoot, { library: options.libraryDir, templates: options.templates })]);
+    if (args.requestId !== void 0 && !text(args.requestId, 100)) return toolResult(false, { error: "requestId must be a nonempty string of at most 100 characters" });
+    const library = options.libraryDir;
+    if (!library) return toolResult(false, { error: "This host keeps no user skill library" });
+    const known = /* @__PURE__ */ new Set([...STARTER_ROLES, ...await discoverAgents(session.mapping.agent.projectRoot, { library, templates: options.templates })]);
     const unknown = args.roles.filter((role) => !known.has(role));
     if (unknown.length) return toolResult(false, { error: `Unknown roles: ${unknown.join(", ")}. Roles are ${[...known].join(", ")}` });
-    const file = path.join(options.libraryDir, "skills", args.name, "SKILL.md");
+    const file = path.join(library, "skills", args.name, "SKILL.md");
+    const content = `---
+name: ${args.name}
+description: ${JSON.stringify(args.description.replace(/\s+/g, " ").trim())}
+---
+
+${args.body.trim()}
+`;
+    const lessons = (args.lessons ?? []).map((lesson) => lesson.replace(/\s+/g, " ").trim());
+    const draftKey = JSON.stringify(["skill", content, args.roles, lessons, !!args.replace]);
+    const key = `skill:${args.requestId ?? draftKey}`;
+    const approvals = approvalsOf(sessionId);
+    const previous = approvals.get(key);
+    if (previous && previous.draftKey !== draftKey) return toolResult(false, { error: "requestId was already used for a different draft" });
+    if (previous) return toolResult(true, previous.result ?? { status: "pending_approval", approvalId: previous.approvalId, file });
     const existing = await readFile(file, "utf8").catch(() => void 0);
     if (existing !== void 0 && !args.replace) return toolResult(false, { error: `The library already has a skill named ${args.name} (${file}); read it, then pass replace: true to propose a new version, or choose another name` });
-    const rolesFile = path.join(options.libraryDir, "role-skills.json");
+    const rolesFile = path.join(library, "role-skills.json");
     const readRoles = async () => {
       const raw = await readFile(rolesFile, "utf8").catch(() => "{}");
       const roles = JSON.parse(raw);
@@ -1252,62 +1290,77 @@ ${cut(session.brief, BRIEF_CHARS)}`);
     } catch (error) {
       return toolResult(false, { error: errorData(error).message });
     }
-    const content = `---
-name: ${args.name}
-description: ${JSON.stringify(args.description.replace(/\s+/g, " ").trim())}
----
-
-${args.body.trim()}
-`;
-    const lessons = (args.lessons ?? []).map((lesson) => lesson.replace(/\s+/g, " ").trim());
+    if (approvalCanceled(session, cancellation)) return toolResult(false, { error: "Skill proposal canceled or session closed; no approval was created" });
+    if ([...userQuestions.values()].some((pending) => pending.question.sessionId === sessionId)) return toolResult(false, { error: "A question is already waiting for the user; finish it before proposing a skill" });
+    const approvalId = `q-${randomUUID()}`;
+    const record2 = { approvalId, draftKey };
+    approvals.set(key, record2);
     const say = wordsFor(session);
-    const decision = await confirm(
+    const decision = confirm(
       sessionId,
       session,
       say.skill(session.mapping.agent.name, existing !== void 0, file, args.roles.join(", "), lessons) + `
 ${say.answerLine(session.mapping.agent.name)}
 
-${content}`
+${content}`,
+      { id: approvalId }
     );
-    if (!decision.approved) return declined(decision);
-    try {
-      await mkdir(path.dirname(file), { recursive: true });
-      await writeFile(file, content);
-      const roles = await readRoles();
-      for (const role of args.roles) {
-        const list = Array.isArray(roles[role]) ? roles[role] : [];
-        if (!list.includes(args.name)) list.push(args.name);
-        roles[role] = list;
-      }
-      await writeFile(rolesFile, JSON.stringify(roles, null, 2) + "\n");
-    } catch (error) {
-      return toolResult(false, { error: errorData(error).message });
-    }
-    const removed = /* @__PURE__ */ new Set();
-    for (const lessonFile of lessonFiles(session.mapping)) {
-      const current = await readFile(lessonFile, "utf8").catch(() => void 0);
-      if (current === void 0) continue;
-      const kept = current.split("\n").filter((line) => {
-        const match = /^- \d{4}-\d\d-\d\d: (.*)$/.exec(line);
-        if (!match || !lessons.includes(match[1].trim())) return true;
-        removed.add(match[1].trim());
-        return false;
-      });
-      if (kept.length !== current.split("\n").length) await writeFile(lessonFile, kept.join("\n")).catch(() => {
-      });
-    }
-    runLog(rootOf(sessionId), { event: "skill", agent: session.mapping.agent.name, name: args.name, roles: args.roles, replaced: existing !== void 0, lessons: [...removed] });
-    return toolResult(true, {
-      approved: true,
-      saved: file,
-      roles: args.roles,
-      lessonsRemoved: [...removed],
-      ...lessons.length > removed.size ? { lessonsNotFound: lessons.filter((lesson) => !removed.has(lesson)) } : {},
-      next: "New sessions of those roles list the skill; read the file now if you need it in this one."
-    });
+    const save = async () => {
+      if (existing === void 0 && !args.replace && await readFile(file, "utf8").then(() => true, () => false)) {
+        return { approved: true, saved: false, error: `A skill named ${args.name} was saved meanwhile (${file}); nothing was overwritten`, next: "Read it, then propose again with replace: true if yours should replace it." };
+      }
+      try {
+        await mkdir(path.dirname(file), { recursive: true });
+        await writeFile(file, content);
+        const roles = await readRoles();
+        for (const role of args.roles) {
+          const list = Array.isArray(roles[role]) ? roles[role] : [];
+          if (!list.includes(args.name)) list.push(args.name);
+          roles[role] = list;
+        }
+        await writeFile(rolesFile, JSON.stringify(roles, null, 2) + "\n");
+      } catch (error) {
+        return { approved: true, saved: false, error: errorData(error).message, next: "Tell the user; nothing is retried automatically." };
+      }
+      const removed = /* @__PURE__ */ new Set();
+      for (const lessonFile of lessonFiles(session.mapping)) {
+        const current = await readFile(lessonFile, "utf8").catch(() => void 0);
+        if (current === void 0) continue;
+        const kept = current.split("\n").filter((line) => {
+          const match = /^- \d{4}-\d\d-\d\d: (.*)$/.exec(line);
+          if (!match || !lessons.includes(match[1].trim())) return true;
+          removed.add(match[1].trim());
+          return false;
+        });
+        if (kept.length !== current.split("\n").length) await writeFile(lessonFile, kept.join("\n")).catch(() => {
+        });
+      }
+      runLog(rootOf(sessionId), { event: "skill", agent: session.mapping.agent.name, name: args.name, roles: args.roles, replaced: existing !== void 0, lessons: [...removed] });
+      return {
+        approved: true,
+        saved: file,
+        roles: args.roles,
+        lessonsRemoved: [...removed],
+        ...lessons.length > removed.size ? { lessonsNotFound: lessons.filter((lesson) => !removed.has(lesson)) } : {},
+        next: "New sessions of those roles list the skill; read the file now if you need it in this one."
+      };
+    };
+    void (async () => {
+      const answer = await decision;
+      const canceled = approvalCanceled(session, cancellation);
+      const result = !answer.approved || canceled ? { approved: false, saved: false, outcome: canceled ? "canceled" : answer.outcome, ...answer.feedback ? { feedback: answer.feedback } : {}, next: "Nothing was saved. Revise from the feedback and propose again with a fresh requestId, or drop it." } : await save();
+      record2.result = { status: "resolved", approvalId, name: args.name, ...result };
+      runLog(rootOf(sessionId), { event: "skill.approval", agent: session.mapping.agent.name, ...record2.result });
+      if (!closed && !session.closed && sessions.get(sessionId) === session) {
+        post(sessionId, { kind: "result", from: "ALP", assignment: approvalId, body: `Skill approval result: ${JSON.stringify(record2.result)}` });
+      }
+    })();
+    return toolResult(true, { status: "pending_approval", approvalId, file, next: "Continue other work or end your turn. ALP sends the user's decision, and whether the skill was saved, by mail; do not resubmit this draft." });
   }
   async function issueTool(sessionId, session, args) {
-    if (!plainObject(args, ["action", "target", "query", "title", "body", "issue", "labels"]) || !["search", "create", "comment"].includes(args.action) || !["project", "alp"].includes(args.target)) {
+    const cancellation = approvalCancellation.get(session) ?? 0;
+    args = structuredClone(args);
+    if (!plainObject(args, ["action", "target", "query", "title", "body", "issue", "labels", "requestId"]) || !["search", "create", "comment"].includes(args.action) || !["project", "alp"].includes(args.target)) {
       return toolResult(false, { error: "An issue call needs action (search, create or comment) and target (project or alp)" });
     }
     const project = session.mapping.agent.projectRoot;
@@ -1333,6 +1386,7 @@ ${content}`
     if (args.labels !== void 0 && (args.action !== "create" || !Array.isArray(args.labels) || args.labels.length > 10 || !args.labels.every((label2) => text(label2, 50)))) {
       return toolResult(false, { error: "labels are up to 10 existing label names, for create" });
     }
+    if (args.requestId !== void 0 && !text(args.requestId, 100)) return toolResult(false, { error: "requestId must be a nonempty string of at most 100 characters" });
     if (args.action === "create" && args.labels?.length) {
       try {
         const labels = JSON.parse(await github(["label", "list", "-R", repo, "--limit", "1000", "--json", "name"], { cwd: project }));
@@ -1343,9 +1397,20 @@ ${content}`
         return toolResult(false, { repo, error: `Could not validate issue labels: ${errorData(error).message}` });
       }
     }
+    if (approvalCanceled(session, cancellation)) return toolResult(false, { error: "Issue proposal canceled or session closed; no approval was created" });
+    const draftKey = JSON.stringify([repo, args.action, args.title ?? null, args.issue ?? null, args.body, [...args.labels ?? []].sort()]);
+    const key = `issue:${args.requestId ?? draftKey}`;
+    const approvals = approvalsOf(sessionId);
+    const previous = approvals.get(key);
+    if (previous && previous.draftKey !== draftKey) return toolResult(false, { error: "requestId was already used for a different draft" });
+    if (previous) return toolResult(true, previous.result ?? { status: "pending_approval", approvalId: previous.approvalId, repo });
+    if ([...userQuestions.values()].some((pending) => pending.question.sessionId === sessionId)) return toolResult(false, { error: "A question is already waiting for the user; finish it before proposing another issue draft" });
+    const approvalId = `q-${randomUUID()}`;
+    const record2 = { approvalId, draftKey };
+    approvals.set(key, record2);
     const where = `${repo}${args.target === "alp" ? " (ALP itself)" : ""}`;
     const say = wordsFor(session);
-    const decision = await confirm(
+    const decision = confirm(
       sessionId,
       session,
       say.issue(session.mapping.agent.name, args.action === "create", args.issue, where) + `
@@ -1354,18 +1419,31 @@ ${say.answerLine(session.mapping.agent.name)}
 ` + (args.action === "create" ? `${say.issueTitle}: ${args.title}
 ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
 ` : ""}
-` : "") + args.body
+` : "") + args.body.trim() + ISSUE_FOOTER,
+      { id: approvalId }
     );
-    if (!decision.approved) return declined(decision);
-    const body = args.body.trim() + ISSUE_FOOTER;
-    try {
-      const output = args.action === "create" ? await github(["issue", "create", "-R", repo, "--title", args.title, "--body-file", "-", ...(args.labels ?? []).flatMap((label2) => ["--label", label2])], { cwd: project, input: body }) : await github(["issue", "comment", String(args.issue), "-R", repo, "--body-file", "-"], { cwd: project, input: body });
-      const url = output.trim().split("\n").at(-1) ?? "";
-      runLog(rootOf(sessionId), { event: "issue", action: args.action, repo, ...args.title ? { title: args.title } : {}, ...args.issue ? { issue: args.issue } : {}, url });
-      return toolResult(true, { approved: true, posted: true, repo, url });
-    } catch (error) {
-      return toolResult(false, { approved: true, posted: false, repo, error: errorData(error).message, next: "Tell the user; the GitHub CLI may need `gh auth login`." });
-    }
+    void (async () => {
+      const answer = await decision;
+      let result;
+      const canceled = approvalCanceled(session, cancellation);
+      if (!answer.approved || canceled) {
+        result = { approved: false, posted: false, outcome: canceled ? "canceled" : answer.outcome, ...answer.feedback ? { feedback: answer.feedback } : {} };
+      } else {
+        try {
+          const body = args.body.trim() + ISSUE_FOOTER;
+          const output = args.action === "create" ? await github(["issue", "create", "-R", repo, "--title", args.title, "--body-file", "-", ...(args.labels ?? []).flatMap((label2) => ["--label", label2])], { cwd: project, input: body }) : await github(["issue", "comment", String(args.issue), "-R", repo, "--body-file", "-"], { cwd: project, input: body });
+          result = { approved: true, posted: true, url: output.trim().split("\n").at(-1) ?? "" };
+        } catch (error) {
+          result = { approved: true, posted: false, error: errorData(error).message, next: "Tell the user; do not retry this draft automatically: GitHub may have accepted it before reporting an error." };
+        }
+      }
+      record2.result = { status: "resolved", approvalId, repo, ...result };
+      runLog(rootOf(sessionId), { event: "issue.approval", action: args.action, ...args.title ? { title: args.title } : {}, ...args.issue ? { issue: args.issue } : {}, ...record2.result });
+      if (!closed && !session.closed && sessions.get(sessionId) === session) {
+        post(sessionId, { kind: "result", from: "ALP", assignment: approvalId, body: `Issue approval result: ${JSON.stringify(record2.result)}` });
+      }
+    })();
+    return toolResult(true, { status: "pending_approval", approvalId, repo, next: "Continue other work. ALP sends the decision and posting result by mail; do not resubmit this draft." });
   }
   function touch(sessionId, session) {
     const now = Date.now();
@@ -1389,6 +1467,8 @@ ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
     if (session && !session.closed) {
       emit(sessionId, { type: "mail", mail: publicEvent(mail) });
       session.mail.push(mail);
+      if (mail.kind === "result" || mail.kind === "question") session.wakes = 0;
+      if (mail.kind === "result" || mail.kind === "question" || mail.kind === "checkin") session.wakeFailures = 0;
       deliver(sessionId, session);
     }
     return mail;
@@ -1411,7 +1491,7 @@ ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
       if (session.mail.some((event) => !event.deliveredTurn && !event.passive && !event.defer)) void steerMail(sessionId, session);
     } else if (!waking) {
       return;
-    } else if (!session.wakeBlocked && session.wakes < MAX_WAKES) {
+    } else if (!session.wakeBlocked && session.wakeFailures < MAX_WAKES && (session.wakes < MAX_WAKES || session.mail.some((event) => !event.deliveredTurn && event.kind === "checkin"))) {
       autoWake(sessionId, session);
     } else if (session.parent && !session.wakeBlocked && !held(session)) {
       session.settle?.("failed", `Wake limit (${MAX_WAKES}) reached with mail outstanding`);
@@ -1445,6 +1525,7 @@ ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
       session.wakeHeld = true;
       return;
     }
+    const checkIn2 = session.mail.find((event) => !event.deliveredTurn && event.kind === "checkin");
     const batch = takeBatch(session.mail, () => true);
     if (!batch.length) return;
     for (const event of batch) event.deliveredTurn = STARTING;
@@ -1457,11 +1538,13 @@ ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
         release();
         return deliver(sessionId, session);
       }
+      if (session.wakeFailures >= MAX_WAKES || session.wakes >= MAX_WAKES && (!checkIn2 || !session.mail.includes(checkIn2))) return release();
       if (!batch.every((event) => event.kind === "checkin")) session.wakes++;
       const id = `alp-wake-${randomUUID()}`;
       try {
         await startPrompt(sessionId, { clientMessageId: id, delivery: "auto", content: [{ type: "text", text: renderMail(batch, session.parentAgent) }] }, "wake", batch);
       } catch {
+        session.wakeFailures++;
         release();
         deliver(sessionId, session);
       }
@@ -1561,6 +1644,17 @@ ${args.labels?.length ? `${say.issueLabels}: ${args.labels.join(", ")}
       waiter.resolve("user");
     }
   }
+  function releaseQuestions(sessionId) {
+    for (const { question, settle, asked } of [...userQuestions.values()]) {
+      if (question.sessionId !== sessionId || !asked) continue;
+      settle("canceled", void 0, "the user wrote instead of answering", toolResult(true, {
+        status: "user_wrote",
+        userMessage: true,
+        question: question.id,
+        next: `${USER_WROTE} Their message may be the answer to your question; if it is not, ask again later.`
+      }));
+    }
+  }
   const assignmentSnapshot = (assignment, status) => ({
     id: assignment.id,
     agent: assignment.agent,
@@ -1770,7 +1864,7 @@ ${refused}`, next: "Fix what it reports, then call alp_handoff again." });
     const pending = [...session.assignments.keys()].some((id) => !ids || ids.has(id)) || takeBatch(session.mail, (event) => event.kind !== "board" && !event.defer && accept(event)).length > 0;
     const events = pending ? await waitFor(sessionId, session, accept, Math.min(args.timeoutMs ?? 3e5, 9e5)) : [];
     if (events === "user") return toolResult(true, { events: [], userMessage: true, running: running(session), next: USER_WROTE });
-    if (!events) return toolResult(false, { error: "Turn ended" });
+    if (!events) return toolResult(false, session.closed || session.wakeBlocked ? { error: "Turn ended" } : { error: TURN_ENDED, running: running(session) });
     return toolResult(true, { events: events.map(publicEvent), running: running(session) });
   }
   function sendTool(sessionId, session, args) {
@@ -1800,10 +1894,10 @@ ${refused}`, next: "Fix what it reports, then call alp_handoff again." });
     }
     return toolResult(true, { sent: post(assignment.id, { kind: args.kind, from, assignment: assignment.id, body: args.body, ...args.replyTo ? { replyTo: args.replyTo } : {} }).id });
   }
-  function askUser(sessionId, session, assignment, body, options2) {
+  function askUser(sessionId, session, assignment, body, options2, approval, asked = false) {
     const rootId = rootOf(sessionId);
     const question = {
-      id: `q-${randomUUID().slice(0, 8)}`,
+      id: approval?.id ?? `q-${randomUUID().slice(0, 8)}`,
       sessionId,
       rootId,
       agent: session.mapping.agent.name,
@@ -1829,7 +1923,7 @@ The user answered: "${answer}"`);
           next: "Decide, and record the assumption in your handoff or final message; or report that you are blocked."
         })));
       };
-      userQuestions.set(question.id, { question, settle });
+      userQuestions.set(question.id, { question, settle, persistent: !!approval, asked });
       if (assignment) assignment.ask = { id: question.id, resolve: (result) => settle("canceled", void 0, void 0, result) };
       emit(sessionId, { type: "question", question });
       runLog(rootId, { event: "human.question", questionId: question.id, sessionId, agent: question.agent, body, ...options2?.length ? { options: options2 } : {} });
@@ -1842,9 +1936,9 @@ The user answered: "${answer}"`);
     if (!session.parent || !sessions.has(session.parent)) return;
     post(session.parent, { kind: "note", from: session.mapping.agent.name, assignment: sessionId, body: `[ALP, on behalf of ${session.mapping.agent.name}] ${body}` });
   }
-  function cancelQuestions(sessionId) {
-    for (const { question, settle } of [...userQuestions.values()]) {
-      if (question.sessionId === sessionId) settle("canceled", void 0, void 0, toolResult(false, { error: "Turn ended" }));
+  function cancelQuestions(sessionId, turnOnly = false) {
+    for (const { question, settle, persistent } of [...userQuestions.values()]) {
+      if (question.sessionId === sessionId && (!turnOnly || !persistent)) settle("canceled", void 0, void 0, toolResult(false, { error: "Turn ended" }));
     }
   }
   function askTool(sessionId, session, args) {
@@ -1864,7 +1958,7 @@ The user answered: "${answer}"`);
     if (to === "user" && session.parent && !session.userOpened) {
       return Promise.resolve(toolResult(false, { error: `Only main talks to the user; ask ${session.parentAgent ?? "your requester"} with alp_ask instead` }));
     }
-    if (to === "user") return askUser(sessionId, session, assignment, args.question, args.options);
+    if (to === "user") return askUser(sessionId, session, assignment, args.question, args.options, void 0, true);
     if (!session.parent || !parent || !assignment) return Promise.resolve(toolResult(false, { error: 'This session has no requester; ask the user with to: "user"' }));
     const parentId = session.parent;
     return new Promise((resolve) => {
@@ -2011,9 +2105,11 @@ The user answered: "${answer}"`);
     }
     const rootId = rootOf(sessionId);
     const root = sessions.get(rootId);
-    if (root.calls >= 16) {
+    const advisor = ["advisor", "reviewer"].includes(roleOf(session.mapping, args.agent) ?? "") && childMode === "read-only";
+    const budget = advisor ? "advisorCalls" : "calls";
+    if (root[budget] >= 16) {
       return toolResult(false, {
-        error: "Delegation limit reached for this turn"
+        error: `${advisor ? "Advisor" : "Implementation"} delegation budget exhausted (16 starts across the root session tree since its last new user turn). Mail wakes and child turns do not reset it; a new accepted user prompt in root (including steering) resets both budgets.`
       });
     }
     const peer = roleOf(session.mapping, args.agent) === "peer";
@@ -2026,7 +2122,7 @@ The user answered: "${answer}"`);
     const continued = args.continueFrom !== void 0 ? session.worktrees.get(args.continueFrom) : void 0;
     if (args.continueFrom !== void 0 && !continued && !sharedContinuation) return toolResult(false, { error: `${args.continueFrom} was merged or discarded meanwhile` });
     if (continued) session.worktrees.delete(args.continueFrom);
-    root.calls++;
+    root[budget]++;
     if (peer) root.peerCount++;
     const childId = `alp-child-${randomUUID()}`;
     const startedAt = Date.now();
@@ -2186,12 +2282,15 @@ ${digest}` : "")
     const events = await waitFor(sessionId, session, (event2) => event2.assignment === childId && (event2.kind === "result" || event2.kind === "question"), void 0, true);
     if (events === "user") return toolResult(true, { assignmentId: childId, agent: args.agent, status: "running", userMessage: true, next: USER_WROTE });
     if (!events) {
-      return toolResult(false, {
-        agent: args.agent,
-        assignmentId: childId,
-        status: "canceled",
-        error: "Parent assignment stopped"
-      });
+      if (session.closed || session.wakeBlocked || !session.assignments.has(childId)) {
+        return toolResult(false, {
+          agent: args.agent,
+          assignmentId: childId,
+          status: "canceled",
+          error: "Parent assignment stopped"
+        });
+      }
+      return toolResult(false, { agent: args.agent, assignmentId: childId, status: "running", error: TURN_ENDED });
     }
     const event = events.find((candidate) => candidate.kind === "result") ?? events.find((candidate) => candidate.kind === "question");
     if (!event) return toolResult(true, { assignmentId: childId, agent: args.agent, status: "running", events: events.map(publicEvent), next: CHECKED_IN });
@@ -2257,10 +2356,12 @@ ${digest}` : "")
       peerCount: 0,
       assignments: /* @__PURE__ */ new Map(),
       calls: 0,
+      advisorCalls: 0,
       mail: [],
       waiters: [],
       lastActivity: Date.now(),
       wakes: 0,
+      wakeFailures: 0,
       wakeBlocked: false,
       toolCalls: /* @__PURE__ */ new Map(),
       acknowledged: Promise.resolve(),
@@ -2565,7 +2666,7 @@ Write scope: change files only under ${session.spec.writeRoot}. Your working dir
     runLog(entry.rootId, { event: "assignment.finished", assignmentId: entry.assignmentId, reconciled: true, ...result });
     if (parent && !parent.closed) post(entry.parentId, { kind: "result", from: entry.agent, assignment: entry.assignmentId, result });
   }
-  async function recoverTree(rootId, continueRoot) {
+  async function recoverTree(rootId, continueRoot, parkedRoot) {
     const root = sessions.get(rootId);
     if (!root || root.closed) throw new Error(`Session ${rootId} is not open`);
     const entries = inherited.filter((entry) => entry.rootId === rootId).sort((a, b) => a.ancestry.length - b.ancestry.length);
@@ -2602,7 +2703,11 @@ Write scope: change files only under ${session.spec.writeRoot}. Your working dir
       runLog(rootId, { event: "assignment.recovered", assignmentId: entry.assignmentId, agent: entry.agent, ...entry.taskId ? { taskId: entry.taskId } : {} });
       proceed(entry.assignmentId, child, `ALP: ${cause} while you worked on this assignment, and reopened this session. Your earlier work in it${entry.worktree ? " and your worktree" : ""} is intact; check where you stopped (for example with git status), then continue. Finish with alp_handoff as before.${listed(resumed.get(entry.assignmentId))}`);
     }
-    if (continueRoot) proceed(rootId, root, `ALP: ${cause} during your turn, and reopened this session. Continue the user's request where you stopped.${listed(resumed.get(rootId))}`);
+    if (parkedRoot) {
+      root.parked = { reason: parkedRoot, since: Date.now() };
+      emit(rootId, { type: "session.updated", session: snapshot(rootId, root) });
+      if (options.autoResume !== false && options.recoveryResume !== false && !pauseOf(root.runtimeKind)) continueParked(rootId, root);
+    } else if (continueRoot) proceed(rootId, root, `ALP: ${cause} during your turn, and reopened this session. Continue the user's request where you stopped.${listed(resumed.get(rootId))}`);
     else for (const assignment of resumed.get(rootId) ?? []) post(rootId, { kind: "note", from: assignment.agent, assignment: assignment.id, passive: true, body: `${cause}; ALP reopened this assignment and it continues. It reports when done.` });
     const failed = outcomes.filter((outcome) => outcome.outcome === "failed");
     if (entries.length || continueRoot) {
@@ -2649,6 +2754,11 @@ Write scope: change files only under ${session.spec.writeRoot}. Your working dir
     const activeTurn = session.active;
     session.wakeBlocked = true;
     session.userStopped = true;
+    session.parked = void 0;
+    session.parkReason = void 0;
+    emit(sessionId, { type: "session.updated", session: snapshot(sessionId, session) });
+    approvalCancellation.set(session, (approvalCancellation.get(session) ?? 0) + 1);
+    cancelQuestions(sessionId);
     if (activeTurn && session.runtimeKind === "codex" && session.threadId) {
       const partial = [...session.text.values()].join("\n").trim();
       if (partial) interruptedThreads.set(session.threadId, partial.slice(-4e3));
@@ -2721,11 +2831,9 @@ Write scope: change files only under ${session.spec.writeRoot}. Your working dir
       if (!wake) {
         session.handoff = void 0;
         session.wakes = 0;
+        session.wakeFailures = 0;
         session.wakeBlocked = false;
         session.userStopped = false;
-        if (!session.parent) {
-          session.calls = 0;
-        }
       }
     }
     try {
@@ -2767,6 +2875,10 @@ ${interrupted}`), text_elements: [] }] : [],
       );
       const turnId = prompt.delivery === "steer" ? session.active : result.turn.id;
       for (const event of mail) event.deliveredTurn = turnId;
+      if (!session.parent && origin === "user") {
+        session.calls = 0;
+        session.advisorCalls = 0;
+      }
       session.seen.add(
         prompt.clientMessageId
       );
@@ -2782,7 +2894,10 @@ ${interrupted}`), text_elements: [] }] : [],
       });
       if (origin === "user" && !session.parent) session.userWaiting ??= Date.now();
       if (session.supervisor && origin === "user") session.journal.push(stamp(`user ${prompt.delivery === "steer" ? "steered" : "asked"} ${session.mapping.agent.name}: ${clip(text2, 1500)}`));
-      if (prompt.delivery === "steer" && origin === "user" && !session.parent) releaseWaiters(session);
+      if (prompt.delivery === "steer" && origin === "user" && !session.parent) {
+        releaseWaiters(session);
+        releaseQuestions(sessionId);
+      }
       emit(sessionId, {
         type: "prompt.accepted",
         clientMessageId: prompt.clientMessageId,
@@ -2823,12 +2938,19 @@ ${interrupted}`), text_elements: [] }] : [],
       return opened;
     }),
     prompt: (sessionId, input) => enqueue(async () => {
+      const session = sessions.get(sessionId);
+      const parked = session?.parked;
       try {
-        await startPrompt(sessionId, input, "user");
+        const prompt = session?.active && session.resumedTurn === session.active && input.delivery === "auto" ? { ...input, delivery: "steer" } : input;
+        await startPrompt(sessionId, prompt, "user");
+        if (session && parked && session.parked === parked) {
+          session.parked = void 0;
+          emit(sessionId, { type: "session.updated", session: snapshot(sessionId, session) });
+        }
       } catch (error) {
-        const session = sessions.get(sessionId);
-        if (session?.seen.has(input.clientMessageId)) return;
-        session?.seen.add(input.clientMessageId);
+        const session2 = sessions.get(sessionId);
+        if (session2?.seen.has(input.clientMessageId)) return;
+        session2?.seen.add(input.clientMessageId);
         emit(sessionId, { type: "prompt.failed", clientMessageId: input.clientMessageId, error: errorData(error) });
       }
     }),
@@ -2972,8 +3094,8 @@ ${interrupted}`), text_elements: [] }] : [],
     recoverable() {
       return [...inherited];
     },
-    recover(rootId, { continueRoot = false } = {}) {
-      return enqueue(() => recoverTree(rootId, continueRoot));
+    recover(rootId, { continueRoot = false, parkedRoot } = {}) {
+      return enqueue(() => recoverTree(rootId, continueRoot, parkedRoot));
     },
     async abandon(rootId, reason) {
       const entries = inherited.filter((entry) => entry.rootId === rootId);