@agent-plan/core 0.4.1 → 0.4.2

package/dist/task-selection.js

@@ -1,3 +1,4 @@
+import { deviationsForSession } from "./session-focus.js";
 import { listOnHoldWork, startedOpenPhaseIds } from "./on-hold.js";
 const hardUnavailable = new Set(["blocked", "deferred", "canceled", "rejected"]);
 const terminal = new Set(["done", "canceled", "rejected"]);
@@ -177,7 +178,7 @@ export function recommendNextTask(features, phases, deviations = [], currentPhas
     // explicit instead of two bare string literals that look like an
     // accidental inclusion of a "closed" state in an "open" list.
     const returnRequiredStates = new Set(["resume-required", "resolved"]);
-    const liveDeviations = deviations
+    const liveDeviations = deviationsForSession(deviations, sessionId)
         .filter((deviation) => deviation.state === "approved"
         || deviation.state === "active"
         || returnRequiredStates.has(deviation.state))
@@ -198,10 +199,18 @@ export function recommendNextTask(features, phases, deviations = [], currentPhas
             return { kind: "resume", candidate: temporary, deviation: top, reason: "Continue the temporary task of the most recent approved deviation." };
         }
     }
+    // Tasks another session set aside on purpose (its live side task still points back at
+    // them). They are that session's to return to: never offer them to this one.
+    const heldByOtherSessions = new Set(sessionId
+        ? deviations
+            .filter((deviation) => deviation.ownerSession !== "" && deviation.ownerSession !== sessionId
+            && (deviation.state === "approved" || deviation.state === "active" || returnRequiredStates.has(deviation.state)))
+            .map((deviation) => deviation.resumeTaskId)
+        : []);
     // A saved checkpoint without a surviving deviation must never disappear
     // behind new priority work. Select the most recent checkpoint (LIFO).
     const checkpointed = candidates
-        .filter(({ task }) => task.status === "planned" && task.pauseSnapshot)
+        .filter(({ task }) => task.status === "planned" && task.pauseSnapshot && !heldByOtherSessions.has(task.id))
         .sort((left, right) => right.task.pauseSnapshot.pausedAt.localeCompare(left.task.pauseSnapshot.pausedAt));
     if (checkpointed[0]) {
         return {
@@ -213,6 +222,8 @@ export function recommendNextTask(features, phases, deviations = [], currentPhas
     const ready = candidates.filter(({ feature, phase, task }) => {
         if (task.status !== "planned")
             return false;
+        if (heldByOtherSessions.has(task.id))
+            return false;
         if (hardUnavailable.has(phase.status) || (feature && hardUnavailable.has(feature.status)))
             return false;
         return task.dependsOn.every((id) => byTaskId.get(id)?.task.status === "done");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-plan/core",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "private": false,
   "description": "Harness-agnostic core for Agent Plan: schemas, persistence, ordering, status rollups, and markdown rendering.",
   "license": "MIT",

package/planner-skill.md

@@ -121,9 +121,9 @@ Then call `handoff_write` / `planner-handoff-write` once with the preparation to
 
 If a write fails for any reason, the planner retains the exact capsule you submitted against that phase and preparation token. **Do not redraft or resend `content`/`markdown_content` on the retry** — fix only what the error named (a missing field, a stale token needs a fresh `handoff_prepare`, a corrected supporting-document manifest, etc.) and call `handoff_write` again with the same `expectedHandoffUpdatedAt`, omitting `content`; the retained capsule is reused automatically. Only pass `content` again if you are deliberately changing the body — the new one replaces the retained one. Omitting it when nothing was ever retained for that exact phase + token (a first attempt, an aged-out draft, or a phase that has since gone terminal) is itself a typed failure (`HANDOFF_RETAINED_CONTENT_NOT_FOUND`) naming the fix. A stale token is still refused even when a capsule is retained for it — retention makes the retry cheap, it never lets outdated content overwrite newer state.
 
-A successful write persists only a **handoff candidate** and returns `resumeReady: false`. Immediately call `handoff_show` / `planner-handoff-show` with the exact phase reference and read the persisted capsule. If the capsule omits resume-critical context, rewrite it; otherwise call `handoff_verify` / `planner-handoff-verify` with the content hash. Source reviews and omission lists are optional legacy evidence; the planner derives them when omitted. Only a successful verification result with `resumeReady: true` authorizes telling the user that the handoff is resume-ready.
+A successful write persists only a **handoff candidate** and returns `resumeReady: false`. Immediately call `handoff_show` / `planner-handoff-show` with the exact phase reference and read the persisted capsule from the tool result text first, then from structured `content` when the host exposes it. Some hosts show only minimal structured keys while still exposing the full text body; do not mistake `structuredContent` with only identifiers for a missing handoff body. If neither text nor structured content includes the capsule body, retry the planner tool and report the tool or transport issue. Reading raw `.planner/*.json` or `.planner/EXPORT.md` is only a diagnostic/recovery fallback when the tool is unavailable or demonstrably failed; label it as a fallback and do not treat it as a successful `handoff_show` read-back. If the capsule omits resume-critical context, rewrite it; otherwise call `handoff_verify` / `planner-handoff-verify` with the content hash. Source reviews and omission lists are optional legacy evidence; the planner derives them when omitted. Only a successful verification result with `resumeReady: true` authorizes telling the user that the handoff is resume-ready.
 
-`handoff_list` is a compact paginated index of active handoffs and exposes whether each is resume-ready. Use `handoff_show` for one bounded active body and its metadata; after phase completion/rejection/cancellation, the same exact phase-scoped show call returns the latest terminal archive so its closeout and `.planner/docs/` references remain discoverable. Clear/archive only after explicit intent or when phase completion makes the handoff non-operational.
+`handoff_list` is a compact paginated index of active handoffs and exposes whether each is resume-ready. Use `handoff_show` for one bounded active body and its metadata; after phase completion/rejection/cancellation, the same exact phase-scoped show call returns the latest terminal archive so its closeout and `.planner/docs/` references remain discoverable. If `handoff_show` text is visible, use that body even when structured metadata is minimal. If the body is genuinely absent, diagnose the tool/client path before falling back to storage files, and never run export merely to refresh a handoff read unless the user explicitly asked for an export. Clear/archive only after explicit intent or when phase completion makes the handoff non-operational.
 
 ## Hierarchical description freshness