@agent-plan/pi-adapter 0.2.19-next.15 → 0.2.19-next.17

package/dist/index.js

@@ -10,7 +10,7 @@
  */
 import { Type } from "typebox";
 import { ExportService, PlanStore, setWriteBusyHook, setWriteNotifyHook, migrateToUuids, migrateToGlobalSequence, withFeatureLock, needsMotivation, findPhaseByRef, findTaskByRef, buildRecap, addChecklistItem, removeChecklistItem, toggleChecklistItem } from "@agent-plan/core";
-import { createChecklistItemId, createFeatureId, createPhaseId, createShortId, createTaskId, clampSlug, normalizeSlug, formatPhaseRef, formatFeatureRef, featureNumberOfPhase } from "@agent-plan/core/naming";
+import { createChecklistItemId, createFeatureId, createPhaseId, createShortId, createTaskId, clampSlug, normalizeSlug, formatPhaseRef, formatFeatureRef, featureNumberOfPhase, validateResolvedTarget } from "@agent-plan/core/naming";
 import { join, dirname } from "node:path";
 import { homedir } from "node:os";
 import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
@@ -105,11 +105,13 @@ const PLANNER_COMMAND_COMPLETIONS = [
     { value: "init", label: "init", description: "Initialize planner in this project" },
     { value: "show", label: "show", description: "Show planner overview" },
     { value: "repair", label: "repair", description: "Repair planner integrity" },
+    { value: "cleanup-orphans", label: "cleanup-orphans", description: "List and remove orphan phase files" },
     { value: "project discuss", label: "project discuss", description: "Run project discovery" },
     { value: "project language", label: "project language", description: "Set persistent language preferences" },
     { value: "feature list", label: "feature list", description: "List features" },
     { value: "feature add", label: "feature add", description: "Create a feature" },
     { value: "feature show", label: "feature show", description: "Show a feature" },
+    { value: "feature discuss", label: "feature discuss", description: "Discuss a feature" },
     { value: "feature update", label: "feature update", description: "Update a feature" },
     { value: "feature delete", label: "feature delete", description: "Delete a feature" },
     { value: "phase add", label: "phase add", description: "Add a phase" },
@@ -253,6 +255,34 @@ function phaseLabel(phase) {
 function taskLabel(task) {
     return `T${formatSequence(task.number)} — ${task.title}`;
 }
+function resolveFeatureRefStrict(features, ref) {
+    const raw = ref.trim();
+    if (!raw)
+        return { ok: false, error: "Feature ref is required." };
+    const normalized = raw.toLowerCase();
+    const byNumber = normalized.match(/^f(\d+)$/)
+        ? features.find((feature) => feature.number === parseInt(normalized.slice(1), 10))
+        : undefined;
+    if (byNumber)
+        return { ok: true, feature: byNumber };
+    const byShortId = features.find((feature) => feature.shortId?.toLowerCase() === normalized);
+    if (byShortId)
+        return { ok: true, feature: byShortId };
+    const byId = features.find((feature) => feature.id.toLowerCase() === normalized);
+    if (byId)
+        return { ok: true, feature: byId };
+    const exactName = features.filter((feature) => feature.name.toLowerCase() === normalized);
+    if (exactName.length === 1)
+        return { ok: true, feature: exactName[0] };
+    if (exactName.length > 1)
+        return { ok: false, error: `Ambiguous feature ref: ${raw}. Multiple features have that exact name; use F00x, shortId, or UUID.` };
+    const partialName = features.filter((feature) => feature.name.toLowerCase().includes(normalized));
+    if (partialName.length === 1)
+        return { ok: true, feature: partialName[0] };
+    if (partialName.length > 1)
+        return { ok: false, error: `Ambiguous feature ref: ${raw}. Matches: ${partialName.map((feature) => formatFeatureRef(feature.number)).join(", ")}. Use a specific F00x, shortId, or UUID.` };
+    return { ok: false, error: `Feature not found: ${raw}` };
+}
 async function buildHandoffMarkdown(st, reason, overrides) {
     const [plan, resume, activity] = await Promise.all([
         st.loadAll(),
@@ -750,9 +780,10 @@ export default function planPiExtension(pi) {
             // ── Step 1: Enable gating ───────────────────────────────────────
             // No blocking prompt in session_start: ctx.ui.input()/select() do not
             // render for NPM-loaded ESM extensions during session_start (they hang
-            // until the safety-net timeout). The planner is always DISABLED at
-            // startup; the user enables it with '/planner load' (which also starts
-            // the web UI on LAN and triggers the resume summary showing the URL).
+            // until the safety-net timeout). Tracked upstream via planner task
+            // T151 · EBRST. The planner is always DISABLED at startup; the user
+            // enables it with '/planner load' (which also starts the web UI on LAN
+            // and triggers the resume summary showing the URL).
             let enablePlanner = false;
             if (exists) {
                 ctx.ui.notify("Planner detected in this project. Run '/planner load' to enable the planner and start the web UI (LAN).", "info");
@@ -945,6 +976,7 @@ export default function planPiExtension(pi) {
             "init",
             "show",
             "repair",
+            "cleanup-orphans",
             "project discuss",
             "project language",
             "feature list",
@@ -978,8 +1010,8 @@ export default function planPiExtension(pi) {
             "load",
             "stop",
         ];
-        const SUB_HELP = "Available: init, show, repair, project, feature, phase, task, discuss, handoff, web, export, export-full, bypass, clear-bypass, load, stop\n" +
-            "Try: /planner <TAB>  |  /planner feature list  |  /planner task start  |  /planner export-full\n" +
+        const SUB_HELP = "Available: init, show, repair, cleanup-orphans, project, feature, phase, task, discuss, handoff, web, export, export-full, bypass, clear-bypass, load, stop\n" +
+            "Try: /planner <TAB>  |  /planner feature list  |  /planner task start  |  /planner cleanup-orphans\n" +
             "Handoff actions: /planner handoff list | show [P00x] | write [P00x] | clear [P00x] | prepare";
         if (!a) {
             const action = await ctx.ui.select("Planner action", PLANNER_MENU_ACTIONS);
@@ -1135,6 +1167,34 @@ export default function planPiExtension(pi) {
                 ?? features.find((feature) => feature.name.toLowerCase().includes(normalized))
                 ?? null;
         }
+        function resolveFeatureRef(features, ref) {
+            const raw = ref.trim();
+            if (!raw)
+                return { ok: false, error: "Feature ref is required." };
+            const normalized = raw.toLowerCase();
+            const byNumber = normalized.match(/^f(\d+)$/)
+                ? features.find((feature) => feature.number === parseInt(normalized.slice(1), 10))
+                : undefined;
+            if (byNumber)
+                return { ok: true, feature: byNumber };
+            const byShortId = features.find((feature) => feature.shortId?.toLowerCase() === normalized);
+            if (byShortId)
+                return { ok: true, feature: byShortId };
+            const byId = features.find((feature) => feature.id.toLowerCase() === normalized);
+            if (byId)
+                return { ok: true, feature: byId };
+            const exactName = features.filter((feature) => feature.name.toLowerCase() === normalized);
+            if (exactName.length == 1)
+                return { ok: true, feature: exactName[0] };
+            if (exactName.length > 1)
+                return { ok: false, error: `Ambiguous feature ref: ${raw}. Multiple features have that exact name; use F00x, shortId, or UUID.` };
+            const partialName = features.filter((feature) => feature.name.toLowerCase().includes(normalized));
+            if (partialName.length == 1)
+                return { ok: true, feature: partialName[0] };
+            if (partialName.length > 1)
+                return { ok: false, error: `Ambiguous feature ref: ${raw}. Matches: ${partialName.map((feature) => formatFeatureRef(feature.number)).join(", ")}. Use a specific F00x, shortId, or UUID.` };
+            return { ok: false, error: `Feature not found: ${raw}` };
+        }
         function findPhaseByRef(phases, ref) {
             const normalized = ref.trim().toLowerCase();
             if (!normalized)
@@ -1324,7 +1384,7 @@ export default function planPiExtension(pi) {
         // ═══════════════════════════════════════════════════════════════
         if (a === "feature") {
             if (!b) {
-                ctx.ui.notify("feature actions: list  |  add [name]  |  show [id|name]  |  update [id|name]  |  delete [id|name]", "info");
+                ctx.ui.notify("feature actions: list  |  add [name]  |  show [id|name]  |  discuss [id|name]  |  update [id|name]  |  delete [id|name]", "info");
                 return;
             }
             if (b === "list") {
@@ -1415,6 +1475,44 @@ export default function planPiExtension(pi) {
                 ].filter(Boolean).join("\n"), "info");
                 return;
             }
+            if (b === "discuss") {
+                const featuresDoc = await st.loadFeatures();
+                let feature = subArgs.trim() ? findFeatureByRef(featuresDoc.features, subArgs.trim()) : null;
+                if (!feature) {
+                    feature = await pickFeature();
+                    if (!feature) {
+                        ctx.ui.notify("No features to discuss. Create one first.", "warning");
+                        return;
+                    }
+                }
+                const description = await ctx.ui.editor("Feature description / scope / current implementation state", feature.description || "");
+                const workDone = await ctx.ui.editor("Work done / already decided", feature.workDone || "");
+                const workRemaining = await ctx.ui.editor("Work remaining / next work", feature.workRemaining || "");
+                const dependencies = await ctx.ui.input(`Dependencies (comma-separated) [${feature.dependsOn.join(", ") || ""}]`);
+                const featureId = feature.id;
+                const updatedDoc = await st.updateFeatures((doc) => {
+                    const target = doc.features.find((entry) => entry.id === featureId);
+                    if (!target)
+                        return doc;
+                    if (description !== undefined)
+                        target.description = description.trim();
+                    if (workDone !== undefined)
+                        target.workDone = workDone.trim();
+                    if (workRemaining !== undefined)
+                        target.workRemaining = workRemaining.trim();
+                    if (dependencies !== undefined)
+                        target.dependsOn = splitCsv(dependencies);
+                    target.discussedAt = nowISO();
+                    target.contextReady = true;
+                    target.contextReadyReason = "Updated through /planner feature discuss.";
+                    target.updatedAt = nowISO();
+                    return doc;
+                });
+                feature = updatedDoc.features.find((entry) => entry.id === featureId) ?? feature;
+                await st.writeGenerated();
+                ctx.ui.notify(`Feature discussed/updated: ${formatFeatureRef(feature.number)}${feature.shortId ? ` +MI+ ${feature.shortId}` : ""} +EM+ ${feature.name}`, "info");
+                return;
+            }
             if (b === "update") {
                 const featuresDoc = await st.loadFeatures();
                 let feature = subArgs.trim() ? findFeatureByRef(featuresDoc.features, subArgs.trim()) : null;
@@ -1513,7 +1611,7 @@ export default function planPiExtension(pi) {
                 ctx.ui.notify(`Feature deleted: ${featureId}${phases.length > 0 ? cascade ? `; deleted ${affectedPhases} phase(s)` : `; unlinked ${affectedPhases} phase(s)` : ""}`, "info");
                 return;
             }
-            ctx.ui.notify(`Unknown feature action "${b}". Try: list, add, show, update, delete`, "warning");
+            ctx.ui.notify(`Unknown feature action "${b}". Try: list, add, show, discuss, update, delete`, "warning");
             return;
         }
         // ═══════════════════════════════════════════════════════════════
@@ -2299,6 +2397,25 @@ export default function planPiExtension(pi) {
             ctx.ui.notify(`Repair done: renamed ${m.renamed}, repaired ${m.repaired} refs, inferred ${m.inferred}. Integrity: ${dup} duplicate, ${dang} dangling.`, "info");
             return;
         }
+        if (a === "cleanup-orphans") {
+            const found = await st.listOrphanPhases();
+            if (found.length === 0) {
+                ctx.ui.notify("No orphan phases found.", "info");
+                return;
+            }
+            const lines = [
+                `Found ${found.length} orphan phase${found.length === 1 ? "" : "s"}:`,
+                ...found.map((phase) => `- ${phase.compositeRef}${phase.shortId ? ` · ${phase.shortId}` : ""} — ${phase.title} (${phase.reason})`),
+            ];
+            const confirmed = await ctx.ui.confirm(lines.join("\n\n"), "Delete orphan phase files?");
+            if (!confirmed) {
+                ctx.ui.notify("Cleanup aborted.", "warning");
+                return;
+            }
+            const report = await st.cleanupOrphanPhases();
+            ctx.ui.notify(`Removed ${report.removed.length} orphan phase${report.removed.length === 1 ? "" : "s"}.`, "info");
+            return;
+        }
         // ── export ──
         if (a === "export" || a === "export-full") {
             const isFull = a === "export-full" || subArgs.includes("--full");
@@ -2703,6 +2820,38 @@ export default function planPiExtension(pi) {
             return { content: [{ type: "text", text: lines.join("\n") }], details: report };
         },
     });
+    pi.registerTool({
+        name: "plan_cleanup_orphan_phases",
+        label: "Plan Cleanup Orphan Phases",
+        description: "Discover phase files that no longer resolve to a valid owning feature, and optionally delete them. Run once with confirm=false (default) to inspect, then rerun with confirm=true to remove them.",
+        parameters: Type.Object({
+            confirm: Type.Optional(Type.Boolean({ description: "Set true to actually delete the discovered orphan phase files. Default: false (dry-run/list only)." })),
+        }),
+        async execute(_id, params, _signal, _onUpdate, ctx) {
+            const st = await requirePlan(ctx);
+            if (!st)
+                return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const found = await st.listOrphanPhases();
+            if (!params.confirm) {
+                if (found.length === 0)
+                    return { content: [{ type: "text", text: "No orphan phases found." }], details: { found: [] } };
+                const lines = [
+                    `Found ${found.length} orphan phase${found.length === 1 ? "" : "s"}.`,
+                    ...found.map((phase) => `- ${phase.compositeRef}${phase.shortId ? ` · ${phase.shortId}` : ""} — ${phase.title} (${phase.reason})`),
+                    "Rerun with confirm=true to delete these orphan phase files.",
+                ];
+                return { content: [{ type: "text", text: lines.join("\n") }], details: { found, confirmRequired: true } };
+            }
+            const report = await st.cleanupOrphanPhases();
+            if (report.removed.length === 0)
+                return { content: [{ type: "text", text: "No orphan phases found." }], details: report };
+            const lines = [
+                `Removed ${report.removed.length} orphan phase${report.removed.length === 1 ? "" : "s"}.`,
+                ...report.removed.map((phase) => `- ${phase.compositeRef}${phase.shortId ? ` · ${phase.shortId}` : ""} — ${phase.title}`),
+            ];
+            return { content: [{ type: "text", text: lines.join("\n") }], details: report };
+        },
+    });
     pi.registerTool({
         name: "plan_get_handoff",
         label: "Plan Get Handoff",
@@ -2991,6 +3140,51 @@ export default function planPiExtension(pi) {
             return { content: [{ type: "text", text: `✅ Feature created: ${formatFeatureRef(feature.number)} — ${feature.name}${feature.shortId ? ` · ${feature.shortId}` : ""}` }], details: feature };
         },
     });
+    pi.registerTool({
+        name: "feature_discuss",
+        label: "Feature Discuss",
+        description: "Persist feature discovery/governance fields so the feature context is ready before detailed implementation planning.",
+        parameters: Type.Object({
+            featureId: Type.String({ description: "Feature ref: F00x, shortId, UUID, or name" }),
+            description: Type.Optional(Type.String({ description: "Current implementation state, scope, and goals for this feature" })),
+            workDone: Type.Optional(Type.String({ description: "What is already implemented / decided" })),
+            workRemaining: Type.Optional(Type.String({ description: "What still needs to be done" })),
+            dependencies: Type.Optional(Type.Array(Type.String(), { description: "Cross-feature or external dependencies" })),
+        }),
+        async execute(_id, params, _signal, _onUpdate, ctx) {
+            const st = await requirePlan(ctx);
+            if (!st)
+                return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const features = (await st.loadFeatures()).features;
+            const resolvedFeature = resolveFeatureRefStrict(features, params.featureId);
+            if (!resolvedFeature.ok)
+                return { content: [{ type: "text", text: resolvedFeature.error }], details: {} };
+            const featureId = resolvedFeature.feature.id;
+            const updatedDoc = await st.updateFeatures((doc) => {
+                const feature = doc.features.find((f) => f.id === featureId);
+                if (!feature)
+                    return doc;
+                if (params.description !== undefined)
+                    feature.description = params.description;
+                if (params.workDone !== undefined)
+                    feature.workDone = params.workDone;
+                if (params.workRemaining !== undefined)
+                    feature.workRemaining = params.workRemaining;
+                if (params.dependencies !== undefined)
+                    feature.dependsOn = params.dependencies.map((item) => item.trim()).filter(Boolean);
+                feature.discussedAt = nowISO();
+                feature.contextReady = true;
+                feature.contextReadyReason = "Updated through feature_discuss tool.";
+                feature.updatedAt = nowISO();
+                return doc;
+            });
+            const feature = updatedDoc.features.find((f) => f.id === featureId);
+            if (!feature)
+                return { content: [{ type: "text", text: `Feature not found: ${params.featureId}` }], details: {} };
+            await st.writeGenerated();
+            return { content: [{ type: "text", text: `✅ Feature discussed/updated: ${formatFeatureRef(feature.number)} — ${feature.name}${feature.shortId ? ` · ${feature.shortId}` : ""}` }], details: feature };
+        },
+    });
     pi.registerTool({
         name: "feature_update",
         label: "Feature Update",
@@ -3018,10 +3212,15 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const features = (await st.loadFeatures()).features;
+            const resolvedFeature = resolveFeatureRefStrict(features, params.featureId);
+            if (!resolvedFeature.ok)
+                return { content: [{ type: "text", text: resolvedFeature.error }], details: {} };
+            const featureId = resolvedFeature.feature.id;
             let foundDoc;
             try {
                 foundDoc = await st.updateFeatures((doc) => {
-                    const feature = doc.features.find((f) => f.id === params.featureId);
+                    const feature = doc.features.find((f) => f.id === featureId);
                     if (!feature)
                         return doc; // not found: no-op, handled below
                     if (params.name !== undefined)
@@ -3059,7 +3258,7 @@ export default function planPiExtension(pi) {
             catch (e) {
                 return { content: [{ type: "text", text: `Update failed: ${e}` }], details: {} };
             }
-            const feature = foundDoc?.features.find((f) => f.id === params.featureId);
+            const feature = foundDoc?.features.find((f) => f.id === featureId);
             if (!feature)
                 return { content: [{ type: "text", text: `Feature not found: ${params.featureId}` }], details: {} };
             await st.writeGenerated();
@@ -3078,21 +3277,23 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const features = (await st.loadFeatures()).features;
+            const resolvedFeature = resolveFeatureRefStrict(features, params.featureId);
+            if (!resolvedFeature.ok)
+                return { content: [{ type: "text", text: resolvedFeature.error }], details: {} };
+            const featureId = resolvedFeature.feature.id;
             let deleted = false;
             await st.updateFeatures((doc) => {
                 const before = doc.features.length;
-                doc.features = doc.features.filter((f) => f.id !== params.featureId);
+                doc.features = doc.features.filter((f) => f.id !== featureId);
                 if (doc.features.length !== before)
                     deleted = true;
                 return doc;
             });
-            if (!deleted) {
-                return { content: [{ type: "text", text: `Feature not found: ${params.featureId}` }], details: {} };
-            }
             let cascadeCount = 0;
             if (params.cascade) {
                 const phases = await st.loadAllPhases();
-                for (const phase of phases.filter((p) => p.featureId === params.featureId)) {
+                for (const phase of phases.filter((p) => p.featureId === featureId)) {
                     await st.deletePhase(phase.id);
                     cascadeCount += 1;
                 }
@@ -3136,7 +3337,7 @@ export default function planPiExtension(pi) {
     pi.registerTool({
         name: "phase_get",
         label: "Phase Get",
-        description: "Show a phase. Compact identity by default (saves tokens); pass full=true to include the description.",
+        description: "Show a phase. Compact identity by default (saves tokens); pass full=true to include the description and derived linked requirements.",
         parameters: Type.Object({
             phaseId: Type.String({ description: "Phase ref: F00x/P00x, bare P00x (global), shortId, UUID, or title" }),
             full: Type.Optional(Type.Boolean({ description: "If true, include the phase description. Default: compact identity only." })),
@@ -3149,8 +3350,13 @@ export default function planPiExtension(pi) {
             const phase = findPhaseByRef(await st.loadAllPhases(), features, params.phaseId.trim());
             if (!phase)
                 return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
-            const summary = `${phase.title} — ${formatPhaseRef(phase.number, featureNumberOfPhase(phase, features))}${phase.shortId ? ` · ${phase.shortId}` : ""} (${phase.status}; ${phase.tasks.length} tasks)`;
-            return { content: [{ type: "text", text: params.full ? `${summary}\n\n${phase.description || ""}` : summary }], details: {} };
+            const linkedRequirements = await st.linkedRequirementsForPhase(phase.id);
+            const reqCount = linkedRequirements.length;
+            const summary = `${phase.title} — ${formatPhaseRef(phase.number, featureNumberOfPhase(phase, features))}${phase.shortId ? ` · ${phase.shortId}` : ""} (${phase.status}; ${phase.tasks.length} tasks${reqCount ? `; ${reqCount} linked requirement${reqCount === 1 ? "" : "s"}` : ""})`;
+            const requirementsBlock = reqCount > 0
+                ? `\n\nLinked requirements:\n${linkedRequirements.map((requirement) => `- ${requirement.title} (${requirement.status})`).join("\n")}`
+                : "";
+            return { content: [{ type: "text", text: params.full ? `${summary}\n\n${phase.description || ""}${requirementsBlock}` : summary }], details: { linkedRequirements } };
         },
     });
     pi.registerTool({
@@ -3170,18 +3376,27 @@ export default function planPiExtension(pi) {
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
             if (!params.featureId?.trim())
                 return { content: [{ type: "text", text: "featureId is required: a phase must belong to a feature." }], details: {} };
+            const createPhaseFeatures = (await st.loadFeatures()).features;
+            const resolvedFeature = resolveFeatureRefStrict(createPhaseFeatures, params.featureId);
+            if (!resolvedFeature.ok)
+                return { content: [{ type: "text", text: resolvedFeature.error }], details: {} };
+            const featureId = resolvedFeature.feature.id;
+            const featureValidation = await validateResolvedTarget("feature", featureId, () => st.loadFeatures().then((doc) => doc.features.find((f) => f.id === featureId)).catch(() => undefined));
+            if (!featureValidation.ok)
+                return { content: [{ type: "text", text: featureValidation.error }], details: {} };
+            const existingFeature = (await st.loadFeatures()).features.find((f) => f.id === featureId);
+            if (!existingFeature)
+                return { content: [{ type: "text", text: `Resolved feature ${featureId} no longer exists. Refusing to create phase.` }], details: {} };
             let phase;
-            await withFeatureLock(params.featureId, async () => {
-                const phases = await st.loadAllPhases();
-                const featurePhases = phases.filter((p) => p.featureId === params.featureId);
+            await withFeatureLock(featureId, async () => {
                 const number = await st.allocPhaseNumber();
                 const id = createPhaseId();
                 const shortId = createShortId(await st.assignedShortIds());
-                const priority = await st.nextPriority("phase", params.featureId);
+                const priority = await st.nextPriority("phase", featureId);
                 const now = nowISO();
                 phase = {
                     id, number, shortId, priority, slug: normalizeSlug(params.title), title: params.title,
-                    featureId: params.featureId,
+                    featureId,
                     status: params.status ?? "draft",
                     discussedAt: "",
                     contextReady: false,
@@ -3198,7 +3413,7 @@ export default function planPiExtension(pi) {
                 await st.savePhase(phase);
                 // Atomic: serialize concurrent phase_create linking to the same feature.
                 await st.updateFeatures((doc) => {
-                    const feature = doc.features.find((f) => f.id === params.featureId);
+                    const feature = doc.features.find((f) => f.id === featureId);
                     if (feature && !feature.phaseIds.includes(phase.id)) {
                         feature.phaseIds.push(phase.id);
                         feature.updatedAt = now;
@@ -3245,14 +3460,20 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const features = (await st.loadFeatures()).features;
+            const resolvedPhase = findPhaseByRef(await st.loadAllPhases(), features, params.phaseId.trim());
+            if (!resolvedPhase)
+                return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
+            const phaseId = resolvedPhase.id;
             let phase;
             try {
-                phase = await st.loadPhase(params.phaseId);
+                phase = await st.loadPhase(phaseId);
             }
             catch {
                 return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
             }
             const prevFeatureId = phase.featureId;
+            let nextFeatureIdForUpdate = prevFeatureId;
             if (params.title !== undefined) {
                 phase.title = params.title;
                 phase.slug = normalizeSlug(params.title);
@@ -3282,14 +3503,22 @@ export default function planPiExtension(pi) {
             if (params.completionCriteria !== undefined)
                 phase.completionCriteria = params.completionCriteria;
             if (params.featureId !== undefined) {
-                const nextFeatureId = params.featureId === "" ? undefined : params.featureId;
-                phase.featureId = nextFeatureId;
-                if (nextFeatureId !== prevFeatureId) {
+                if (params.featureId === "") {
+                    nextFeatureIdForUpdate = undefined;
+                }
+                else {
+                    const resolvedFeature = resolveFeatureRefStrict(features, params.featureId);
+                    if (!resolvedFeature.ok)
+                        return { content: [{ type: "text", text: resolvedFeature.error }], details: {} };
+                    nextFeatureIdForUpdate = resolvedFeature.feature.id;
+                }
+                phase.featureId = nextFeatureIdForUpdate;
+                if (nextFeatureIdForUpdate !== prevFeatureId) {
                     await st.updateFeatures((doc) => {
                         for (const f of doc.features) {
                             if (f.id === prevFeatureId)
                                 f.phaseIds = f.phaseIds.filter((pid) => pid !== phase.id);
-                            if (f.id === nextFeatureId && !f.phaseIds.includes(phase.id))
+                            if (f.id === nextFeatureIdForUpdate && !f.phaseIds.includes(phase.id))
                                 f.phaseIds.push(phase.id);
                         }
                         return doc;
@@ -3314,19 +3543,24 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
+            const features = (await st.loadFeatures()).features;
+            const resolvedPhase = findPhaseByRef(await st.loadAllPhases(), features, params.phaseId.trim());
+            if (!resolvedPhase)
+                return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
+            const phaseId = resolvedPhase.id;
             let phase;
             try {
-                phase = await st.loadPhase(params.phaseId);
+                phase = await st.loadPhase(phaseId);
             }
             catch {
                 return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
             }
-            await st.deletePhase(params.phaseId);
+            await st.deletePhase(phaseId);
             if (phase.featureId) {
                 await st.updateFeatures((doc) => {
                     const feature = doc.features.find((f) => f.id === phase.featureId);
                     if (feature) {
-                        feature.phaseIds = feature.phaseIds.filter((pid) => pid !== params.phaseId);
+                        feature.phaseIds = feature.phaseIds.filter((pid) => pid !== phaseId);
                         feature.updatedAt = nowISO();
                     }
                     return doc;
@@ -3416,22 +3650,26 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
-            // Verify phase exists first (fast-fail before generating an id).
-            try {
-                await st.loadPhase(params.phaseId);
-            }
-            catch {
+            // Resolve the phase ref (accepts F00x/P00x, bare P00x, shortId, UUID, title).
+            const features = (await st.loadFeatures()).features;
+            const resolvedPhase = findPhaseByRef(await st.loadAllPhases(), features, params.phaseId.trim());
+            if (!resolvedPhase)
                 return { content: [{ type: "text", text: `Phase not found: ${params.phaseId}` }], details: {} };
-            }
+            const phaseId = resolvedPhase.id;
+            const phaseValidation = await validateResolvedTarget("phase", phaseId, () => st.loadPhase(phaseId).catch(() => undefined));
+            if (!phaseValidation.ok)
+                return { content: [{ type: "text", text: phaseValidation.error }], details: {} };
+            const existingPhase = await st.loadPhase(phaseId);
+            if (!existingPhase)
+                return { content: [{ type: "text", text: `Resolved phase ${phaseId} no longer exists. Refusing to create task.` }], details: {} };
             const shortName = clampSlug(params.shortName ?? params.title, 30, `task-${Date.now().toString(36)}`); // clamp+strip trailing dash; never empty
             const taskId = createTaskId();
             const shortId = createShortId(await st.assignedShortIds());
-            const priority = await st.nextPriority("task", params.phaseId);
+            const priority = await st.nextPriority("task", phaseId);
             const now = nowISO();
             const initialStatus = params.status ?? "planned";
-            const existingPhase = await st.loadPhase(params.phaseId);
             const task = {
-                id: taskId, phaseId: params.phaseId, number: await st.allocTaskNumber(), shortId, priority, shortName,
+                id: taskId, phaseId, number: await st.allocTaskNumber(), shortId, priority, shortName,
                 title: params.title,
                 status: initialStatus,
                 description: params.description ?? "",
@@ -3450,7 +3688,7 @@ export default function planPiExtension(pi) {
             };
             // Atomic read-modify-write on the phase file: serializes concurrent
             // task_create calls on the SAME phaseId (batch) so tasks don't get lost.
-            await st.updatePhase(params.phaseId, (phase) => {
+            await st.updatePhase(phaseId, (phase) => {
                 phase.tasks.push(task);
                 phase.taskIds.push(taskId);
                 phase.updatedAt = now;
@@ -3488,15 +3726,16 @@ export default function planPiExtension(pi) {
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
             // Find the phase hosting this task first.
-            const allPhases = await st.loadAllPhases();
-            const hostPhase = allPhases.find((p) => p.tasks.some((t) => t.id === params.taskId));
-            if (!hostPhase)
+            const features = (await st.loadFeatures()).features;
+            const found = findTaskByRef(await st.loadAllPhases(), features, params.taskId.trim());
+            if (!found)
                 return { content: [{ type: "text", text: `Task not found: ${params.taskId}` }], details: {} };
+            const hostPhase = found.phase;
             const now = nowISO();
             let updatedTask;
             try {
                 const updatedPhase = await st.updatePhase(hostPhase.id, (phase) => {
-                    const task = phase.tasks.find((t) => t.id === params.taskId);
+                    const task = phase.tasks.find((t) => t.id === found.task.id);
                     if (!task)
                         return phase;
                     if (params.title !== undefined)
@@ -3559,13 +3798,13 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
-            const phases = await st.loadAllPhases();
-            const hostPhase = phases.find((p) => p.tasks.some((t) => t.id === params.taskId));
-            if (!hostPhase)
+            const features = (await st.loadFeatures()).features;
+            const found = findTaskByRef(await st.loadAllPhases(), features, params.taskId.trim());
+            if (!found)
                 return { content: [{ type: "text", text: `Task not found: ${params.taskId}` }], details: {} };
-            await st.updatePhase(hostPhase.id, (phase) => {
-                phase.tasks = phase.tasks.filter((t) => t.id !== params.taskId);
-                phase.taskIds = phase.taskIds.filter((id) => id !== params.taskId);
+            await st.updatePhase(found.phase.id, (phase) => {
+                phase.tasks = phase.tasks.filter((t) => t.id !== found.task.id);
+                phase.taskIds = phase.taskIds.filter((id) => id !== found.task.id);
                 phase.updatedAt = nowISO();
                 return phase;
             });
@@ -3585,19 +3824,19 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
-            const phases = await st.loadAllPhases();
-            const hostPhase = phases.find((p) => p.tasks.some((t) => t.id === params.taskId));
-            const task = hostPhase?.tasks.find((t) => t.id === params.taskId);
-            if (!task || !hostPhase)
+            const features = (await st.loadFeatures()).features;
+            const found = findTaskByRef(await st.loadAllPhases(), features, params.taskId.trim());
+            if (!found)
                 return { content: [{ type: "text", text: `Task not found: ${params.taskId}` }], details: {} };
+            const task = found.task;
             if (task.status === "in-progress")
                 return { content: [{ type: "text", text: `Task ${task.id} is already in-progress.` }], details: task };
             if (task.status === "done")
                 return { content: [{ type: "text", text: `Task ${task.id} is done. Use task_update to reopen.` }], details: task };
             const now = nowISO();
             let startedTask;
-            await st.updatePhase(hostPhase.id, (phase) => {
-                const t = phase.tasks.find((x) => x.id === params.taskId);
+            await st.updatePhase(found.phase.id, (phase) => {
+                const t = phase.tasks.find((x) => x.id === found.task.id);
                 if (!t)
                     return phase;
                 applyTaskLifecycleDates(t, "in-progress", now);
@@ -3625,11 +3864,11 @@ export default function planPiExtension(pi) {
             const st = await requirePlan(ctx);
             if (!st)
                 return { content: [{ type: "text", text: "No .planner/ found." }], details: {} };
-            const phases = await st.loadAllPhases();
-            const hostPhase = phases.find((p) => p.tasks.some((t) => t.id === params.taskId));
-            const task = hostPhase?.tasks.find((t) => t.id === params.taskId);
-            if (!task || !hostPhase)
+            const features = (await st.loadFeatures()).features;
+            const found = findTaskByRef(await st.loadAllPhases(), features, params.taskId.trim());
+            if (!found)
                 return { content: [{ type: "text", text: `Task not found: ${params.taskId}` }], details: {} };
+            const task = found.task;
             if (task.status === "done")
                 return { content: [{ type: "text", text: `Task ${task.id} is already done.` }], details: task };
             const unchecked = task.checklist.filter((item) => !item.checked);
@@ -3641,8 +3880,8 @@ export default function planPiExtension(pi) {
             }
             const now = nowISO();
             let completedTask;
-            await st.updatePhase(hostPhase.id, (phase) => {
-                const t = phase.tasks.find((x) => x.id === params.taskId);
+            await st.updatePhase(found.phase.id, (phase) => {
+                const t = phase.tasks.find((x) => x.id === found.task.id);
                 if (!t)
                     return phase;
                 applyTaskLifecycleDates(t, "done", now);
@@ -3909,8 +4148,9 @@ export default function planPiExtension(pi) {
             const profile = await st.loadCodebaseProfile();
             const resume = await st.loadResume().catch(() => null) ?? await st.refreshResume();
             const activity = await st.loadActivityLog();
-            const recentActivity = activity.entries.slice(-8).reverse();
+            const recentActivity = activity.entries.slice(-3).reverse();
             const handoffs = await st.listHandoffs();
+            const featureById = new Map(plan.features.features.map((feature) => [feature.id, feature]));
             const phaseById = new Map(plan.phases.map((phase) => [phase.id, phase]));
             const orderedPhases = [
                 ...plan.features.features.flatMap((feature) => {
@@ -3923,21 +4163,9 @@ export default function planPiExtension(pi) {
                 ...plan.phases.filter((phase) => !phase.featureId)
                     .sort((left, right) => left.number - right.number || left.createdAt.localeCompare(right.createdAt)),
             ];
-            const phaseLines = orderedPhases
-                .map((p) => `- ${statusIcon(p.status)} \`${p.id}\` — ${phaseLabel(p)} (${p.status})`)
-                .join("\n");
-            const active = orderedPhases
-                .filter((p) => p.status === "in-progress")
-                .map((p) => `\`${p.id}\``)
-                .join(", ");
-            const doneFeaturesCount = plan.features.features.filter((f) => f.status === "done").length;
-            const activeFeaturesCount = plan.features.features.filter((f) => f.status === "in-progress").length;
-            const donePhasesCount = plan.phases.filter((p) => p.status === "done").length;
-            const activePhasesCount = plan.phases.filter((p) => p.status === "in-progress" || p.status === "discovery").length;
-            const totalTasksCount = orderedPhases.reduce((total, phase) => total + phase.tasks.length, 0);
-            const doneTasksCount = orderedPhases.reduce((total, phase) => total + phase.tasks.filter((task) => task.status === "done").length, 0);
-            const activeTasksCount = orderedPhases.reduce((total, phase) => total + phase.tasks.filter((task) => task.status === "in-progress").length, 0);
-            const hasActiveWork = activeFeaturesCount > 0 || activePhasesCount > 0 || activeTasksCount > 0;
+            const hasActiveWork = plan.features.features.some((feature) => feature.status === "in-progress")
+                || plan.phases.some((phase) => phase.status === "in-progress" || phase.status === "discovery")
+                || orderedPhases.some((phase) => phase.tasks.some((task) => task.status === "in-progress"));
             const currentPhase = hasActiveWork
                 ? orderedPhases.find((phase) => phase.id === resume.currentPhaseId && (phase.status === "in-progress" || phase.tasks.some((task) => resume.inProgressTaskIds.includes(task.id))))
                     ?? orderedPhases.find((phase) => phase.tasks.some((task) => resume.inProgressTaskIds.includes(task.id)))
@@ -3954,16 +4182,51 @@ export default function planPiExtension(pi) {
                     ?? null)
                 : null;
             const currentFeature = hasActiveWork && currentPhase?.featureId
-                ? plan.features.features.find((feature) => feature.id === currentPhase.featureId) ?? null
+                ? featureById.get(currentPhase.featureId) ?? null
                 : hasActiveWork
                     ? plan.features.features.find((feature) => feature.status === "in-progress") ?? null
                     : null;
-            const nextActivity = handoffs.length > 0
-                ? "Read the most recent phase handoff (handoff show <ref>), validate it against current plan ordering and dependencies, then pick the next task. (Legacy resume.json nextSteps may be stale — the handoff is authoritative.)"
-                : hasActiveWork
-                    ? (resume.nextSteps[0]
-                        ?? (currentTask ? `Resume task ${currentTask.id} — ${taskLabel(currentTask)}` : currentPhase ? `Resume phase ${currentPhase.id} — ${phaseLabel(currentPhase)}` : "Resume the active work stream"))
-                    : "Review the current plan and choose the next task.";
+            const currentFeatureRef = currentFeature ? formatFeatureRef(currentFeature.number) : "";
+            const currentPhaseRef = currentPhase ? formatPhaseRef(currentPhase.number, currentFeature?.number) : "";
+            const currentTaskRef = currentTask && currentPhase
+                ? `${formatPhaseRef(currentPhase.number, currentFeature?.number)}/T${pad(currentTask.number)}`
+                : "";
+            const phaseStatusOrder = ["draft", "discovery", "planned", "in-progress", "blocked", "done", "canceled"];
+            const phaseStatusCounts = new Map(phaseStatusOrder.map((status) => [status, 0]));
+            for (const phase of plan.phases) {
+                phaseStatusCounts.set(phase.status, (phaseStatusCounts.get(phase.status) ?? 0) + 1);
+            }
+            const phaseCountsSummary = phaseStatusOrder
+                .map((status) => `${status}=${phaseStatusCounts.get(status) ?? 0}`)
+                .join(" ");
+            const activeTaskMap = new Map();
+            for (const phase of orderedPhases) {
+                const featureNumber = phase.featureId ? featureById.get(phase.featureId)?.number : undefined;
+                for (const task of phase.tasks) {
+                    if (!resume.inProgressTaskIds.includes(task.id) && task.status !== "in-progress")
+                        continue;
+                    activeTaskMap.set(task.id, { phase, task, featureNumber });
+                }
+            }
+            const inProgressTaskLines = [...activeTaskMap.values()]
+                .sort((left, right) => left.task.number - right.task.number || left.task.createdAt.localeCompare(right.task.createdAt))
+                .map(({ phase, task, featureNumber }) => `${formatPhaseRef(phase.number, featureNumber)}/T${pad(task.number)} — ${task.title}`);
+            const otherActiveOrBlockedPhases = orderedPhases
+                .filter((phase) => phase.id !== currentPhase?.id && (phase.status === "in-progress" || phase.status === "discovery" || phase.status === "blocked"))
+                .slice(0, 6)
+                .map((phase) => {
+                const featureNumber = phase.featureId ? featureById.get(phase.featureId)?.number : undefined;
+                return `${statusIcon(phase.status)} ${formatPhaseRef(phase.number, featureNumber)} — ${phase.title} (${phase.status})`;
+            });
+            const openQuestions = plan.phases
+                .flatMap((phase) => phase.openQuestions.map((question) => `[${formatPhaseRef(phase.number, featureNumberOfPhase(phase, plan.features.features))}] ${question}`))
+                .slice(0, 8);
+            const acceptedDecisions = [
+                ...project.acceptedDecisions.map((decision) => `[project] ${decision.title}`),
+                ...plan.features.features.flatMap((feature) => feature.acceptedDecisions.map((decision) => `[feature ${formatFeatureRef(feature.number)}] ${decision.title}`)),
+                ...plan.phases.flatMap((phase) => phase.acceptedDecisions.map((decision) => `[phase ${formatPhaseRef(phase.number, featureNumberOfPhase(phase, plan.features.features))}] ${decision.title}`)),
+                ...plan.phases.flatMap((phase) => phase.tasks.flatMap((task) => task.acceptedDecisions.map((decision) => `[task ${formatPhaseRef(phase.number, featureNumberOfPhase(phase, plan.features.features))}/T${pad(task.number)}] ${decision.title}`))),
+            ].slice(0, 20);
             const webServer = server;
             const webLocalUrl = webServer?.localUrl ?? webServer?.url ?? "";
             const webLanUrl = webServer?.lanUrl ?? "";
@@ -3976,15 +4239,6 @@ export default function planPiExtension(pi) {
             catch { }
             const webUrl = webLocalUrl;
             const webUrlFull = webLanUrl ? `${webLocalUrl} (LAN: ${webLanUrl})` : webLocalUrl;
-            const openQuestions = plan.phases
-                .flatMap((p) => p.openQuestions.map((q) => `[${p.id}] ${q}`))
-                .slice(0, 12);
-            const acceptedDecisions = [
-                ...project.acceptedDecisions.map((d) => `[project] ${d.title}`),
-                ...plan.features.features.flatMap((f) => f.acceptedDecisions.map((d) => `[feature ${f.id}] ${d.title}`)),
-                ...plan.phases.flatMap((p) => p.acceptedDecisions.map((d) => `[phase ${p.id}] ${d.title}`)),
-                ...plan.phases.flatMap((p) => p.tasks.flatMap((t) => t.acceptedDecisions.map((d) => `[task ${t.id}] ${d.title}`))),
-            ].slice(0, 20);
             const pkgSummary = profile?.packageJson
                 ? `name=${profile.packageJson.name ?? "?"} pm=${profile.packageJson.packageManager ?? "npm"} scripts=${Object.keys(profile.packageJson.scripts).join(",") || "none"} deps=${Object.keys(profile.packageJson.dependencies).length} devDeps=${Object.keys(profile.packageJson.devDependencies).length}`
                 : "(no package.json)";
@@ -4006,96 +4260,60 @@ export default function planPiExtension(pi) {
             // Build/refresh the context block (slow path: cache miss).
             const contextBlock = [
                 `[Plan Context — ${project.name}]`,
-                // ── Web UI status (prominent — agent must surface URL in its summary) ──
                 webUrl ? `🌐 WEB UI RUNNING: ${webUrlFull}${webPort ? ` (port ${webPort})` : ""}. Include this address+port at the end of your resume summary.` : `Web UI: not running. Start it with '/planner web start'.`,
                 "",
-                // ── MANDATORY OPERATIONAL PROTOCOL (top priority, non-negotiable) ──
-                "",
-                "═══════════════════════════════════════════════════════════════",
-                "MANDATORY OPERATIONAL PROTOCOL (violation = execution failure):",
-                "═══════════════════════════════════════════════════════════════",
-                "1. HANDOFF HYGIENE: If one or more phases have a pending handoff (entity-scoped, phase.handoff), present the list, read the relevant one with handoff show <ref> for context. Handoffs are KEPT until a task in the phase starts (auto-archived to .planner/handoff-archive/) or the phase completes — no manual clear needed. They are non-blocking context artifacts, not locks — they never block task_start.",
-                "2. TASK LIFECYCLE: BEFORE coding ANY file: call task_start. AFTER finishing work on ANY task: call task_complete. No exceptions. No 'I'll do it later'. NOTE: Planner operations (plan_write_handoff / /planner handoff, task_start, task_complete, task_update, status reads) are NOT code edits. They are ALWAYS allowed regardless of task state — you may write/refresh the handoff even when no task is in-progress (e.g., all tasks done, or capturing state mid-flight). Never refuse to write a handoff because 'no task is open'; that is incorrect.",
-                "3. IMMEDIATE SYNC: Update task status AT THE EXACT MOMENT of transition. Start = task_start NOW. Done = task_complete NOW. Blocked = task_update with motivation NOW. Never batch status updates.",
-                "4. BLOCKED MOTIVATION: Transitions to blocked/canceled/rejected/deferred/waiting/planned(from non-planned) MUST include a detailed 'motivation' parameter. Write it as if the next person has zero context.",
-                "5. NO SHORTCUTS: If a tool blocks you, follow the protocol. Bypasses are for emergencies only, not for convenience.",
-                "6. ENTITY REFERENCES & FAST LOOKUP: Feature/Phase/Task numbers are GLOBALLY unique (one P003, one T007 in the whole plan) — bare P00x/T00x is a valid unambiguous ref. PREFER the 5-char shortId (e.g. UUXD1) or composite F00x/P00x/T00x in chat; NEVER a raw UUID. To FIND an entity: call feature_list / phase_list / task_list (compact, ~2K tokens for the whole plan) — do NOT read .planner/*.json files or plan_get full=true (~32K tokens) to locate an entity. To ACT: pass the ref directly to the action tool (task_start/complete/update/phase_update accept F00x/P00x/T00x, bare P00x/T00x, shortId, UUID, title). To read a description: call task_get / phase_get / feature_get with full=true for that ONE entity. Tool responses already show shortId + compositeRef; reuse them.",
-                "═══════════════════════════════════════════════════════════════",
+                "Operational rules:",
+                "- Handoffs are context, not locks. Read the relevant handoff with handoff show <ref> before resuming.",
+                "- BEFORE any code edit/write: task_start. AFTER finishing a task: task_complete.",
+                "- Use task_update with motivation for blocked/canceled/rejected/deferred/waiting/planned(from non-planned).",
+                "- Planner ops (status/handoff/planner metadata) are NOT code edits; they are always allowed.",
+                "- Prefer shortId or F00x/P00x/T00x refs. Find via feature_list / phase_list / task_list; read one entity via *_get(full=true).",
+                "- If edit/write guard blocks you, start the right task or use an explicit bypass.",
                 "",
-                // ── Project details ──
                 `Goal: ${project.goal || "(not set)"}`,
                 project.description ? `Description: ${project.description}` : "",
                 `Stack: ${[...project.technologies, ...project.tools].join(", ") || "(not set)"}`,
                 `Codebase: ${pkgSummary} | dirs=${profile?.directories.join(",") || "none"} | scanned=${profile?.scannedAt ?? "never"}`,
                 `Ambient: ${ambientSummary}`,
                 "",
-                "Global rules (re-read before every phase/task start):",
-                project.globalRules.length ? project.globalRules.map((r) => `- ${r}`).join("\n") : "- (none)",
-                "",
-                "Workflow rules:",
-                `  before phase start: ${project.workflowRules.beforePhaseStart.join(" | ") || "(none)"}`,
-                `  before task start: ${project.workflowRules.beforeTaskStart.join(" | ") || "(none)"}`,
-                `  after phase complete: ${project.workflowRules.afterPhaseComplete.join(" | ") || "(none)"}`,
+                "Global rules:",
+                project.globalRules.length ? project.globalRules.map((rule) => `- ${rule}`).join("\n") : "- (none)",
                 "",
+                `Workflow: before phase=${project.workflowRules.beforePhaseStart.join(" | ") || "(none)"}; before task=${project.workflowRules.beforeTaskStart.join(" | ") || "(none)"}; after phase=${project.workflowRules.afterPhaseComplete.join(" | ") || "(none)"}`,
                 `Scope: ${project.scope.join(", ") || "(none)"}`,
                 `Out of scope: ${project.outOfScope.join(", ") || "(none)"}`,
                 "",
                 acceptedDecisions.length ? "Accepted decisions (do not re-litigate):" : "",
-                ...acceptedDecisions.map((d) => `- ${d}`),
+                ...acceptedDecisions.map((decision) => `- ${decision}`),
                 openQuestions.length ? "" : "",
                 openQuestions.length ? "Open questions:" : "",
-                ...openQuestions.map((q) => `- ${q}`),
+                ...openQuestions.map((question) => `- ${question}`),
                 "",
-                "Resume focus (where we are now):",
-                resume.currentPhaseId ? `  current phase: ${resume.currentPhaseId}` : "  current phase: (none)",
-                resume.inProgressTaskIds.length ? `  in-progress tasks: ${resume.inProgressTaskIds.join(", ")}` : "  in-progress tasks: (none)",
+                "Resume focus:",
+                currentFeatureRef ? `  current feature: ${currentFeatureRef} — ${currentFeature?.name}` : "  current feature: (none)",
+                currentPhaseRef ? `  current phase: ${currentPhaseRef} — ${currentPhase?.title}` : "  current phase: (none)",
+                currentTaskRef ? `  current task: ${currentTaskRef} — ${currentTask?.title}` : "  current task: (none)",
+                inProgressTaskLines.length ? `  in-progress tasks: ${inProgressTaskLines.join("; ")}` : "  in-progress tasks: (none)",
                 resume.blockers.length ? `  blockers: ${resume.blockers.join("; ")}` : "  blockers: (none)",
-                resume.nextSteps.length ? `  next steps: ${resume.nextSteps.join("; ")}${handoffs.length > 0 ? " (⚠️ may be stale — handoff is authoritative)" : resume.nextStepsUpdatedAt ? ` (last updated ${resume.nextStepsUpdatedAt}, may be stale)` : ""}` : "  next steps: (none)",
-                resume.lastSessionSummary ? `  last session: ${resume.lastSessionSummary}` : "",
-                "",
-                recentActivity.length ? "Recent activity (most recent first):" : "",
-                ...recentActivity.map((e) => `- ${e.at} [${e.type}] ${e.ref}: ${e.summary}`),
+                handoffs.length === 0 && resume.nextSteps.length
+                    ? `  next step: ${resume.nextSteps[0]}${resume.nextStepsUpdatedAt ? ` (updated ${resume.nextStepsUpdatedAt})` : ""}`
+                    : "",
                 "",
-                `${plan.phases.length} phases defined.`,
-                "Current phases:",
-                phaseLines || "  _none_",
-                active ? `Active: ${active}` : "",
+                "Phase overview:",
+                `  counts: ${phaseCountsSummary}`,
+                currentPhaseRef ? `  current: ${currentPhaseRef} — ${currentPhase?.title} (${currentPhase?.status})` : "  current: (none)",
+                otherActiveOrBlockedPhases.length ? "  other active/blocked:" : "  other active/blocked: (none)",
+                ...otherActiveOrBlockedPhases.map((line) => `  - ${line}`),
                 "",
-                "Primary command UX:",
-                "- Use `/planner <TAB>` for grouped subcommand suggestions.",
-                "- Use `/planner` with no args to open the navigable planner menu.",
-                "- Feature commands: planner feature list|add|show|update|delete.",
-                "- Phase commands: planner phase add|show|discuss|update|delete.",
-                "- Task commands: planner task add|show|discuss|update|delete|start|complete.",
-                "- Handoff commands: planner handoff prepare|show|write|clear.",
-                "- Web/session commands: planner web start|stop|status, planner export|export-full, planner load, planner disable, planner repair.",
-                "Legacy flat aliases may also exist for backward compatibility, but prefer grouped `/planner ...` forms.",
-                "Planner discuss mode is Agent Plan only: ignore GSD workflows/skills/commands unless the user explicitly asks for GSD.",
-                `Language preferences: plan content=${project.contentLanguage || "(not set)"}; chat=${project.chatLanguage || "(not set)"}.`,
-                "If these language preferences are already set, follow them automatically and do NOT ask again in later sessions.",
-                "Ask for language only if BOTH preferences are unset.",
-                "If one preference is set and the other is unset, infer the missing one from the saved value and persist it immediately with project_set_language_preferences without asking the user again.",
-                "Persist accepted decisions into project data, not only chat. Use acceptedDecisions on project/feature/phase/task when the user accepts a decision or solution.",
-                "If you are creating a planner from an existing plan or document, do NOT leave project title, project description, project goal, or top-level requirements empty when the source material provides them.",
-                "When deriving a project title from an existing document, prefer a concise human project title; if the candidate title is long or compound, ask the user to confirm before using it.",
-                "Before starting any phase/task, emit a recap of current state and ask the user if requirements/dependencies changed before planning tasks.",
+                recentActivity.length ? "Recent activity:" : "",
+                ...recentActivity.map((entry) => `- ${entry.at} [${entry.type}] ${entry.ref}: ${entry.summary}`),
                 "",
-                "TASK STATUS RULES (strict — do not skip):",
-                "- BEFORE you start implementation work on ANY task, you MUST call task_start to set it to in-progress. This sets startedAt.",
-                "- AFTER you finish implementation work on ANY task, you MUST call task_complete to set it to done. This sets completedAt.",
-                "- Phase and feature statuses are DERIVED from task statuses. They are not the primary source of truth.",
-                "- Therefore, if not strictly necessary, do NOT change phase.status or feature.status directly. Move the task statuses instead and let rollup derive the parent statuses.",
-                "- The extension blocks edit/write when no task is in-progress (bash stays free so git pull/build/test work). If you hit that block, either call task_start, OR ask the user to authorize a one-time bypass (they can run /planner bypass, or you can call plan_authorize_bypass) and then retry.",
-                "- If you forget these task status calls, the derived rollup breaks: phase/feature can stay stale, the dashboard shows wrong active work, and resume focus is wrong.",
-                "- Before your final answer after implementation work, either call task_complete if the task is finished, or explicitly tell the user the task remains in-progress.",
-                "- Use task_complete with force=true only if you have a good reason to skip the checklist check.",
-                "- To reopen a completed task, use task_start (recommended) or task_update.",
                 handoffs.length > 0 ? `Pending phase handoffs (${handoffs.length}):` : "",
-                ...handoffs.map((h, i) => `  [${i + 1}] ${h.compositeRef} — ${h.updatedAt} — "${h.firstLine}"`),
-                handoffs.length > 0 ? "Read the relevant one with handoff show <ref> (or /planner handoff show <ref>) as previous-session context, but validate it against the current planner state, ordering, and dependencies before treating any target as the next task." : "",
-                handoffs.length > 0 ? "If planner state shows no task/phase in-progress, do NOT present a handoff target as the current focus; present it only as a candidate to validate." : "",
-                handoffs.length > 0 ? "Handoffs are KEPT until a task in the phase starts (auto-archived to .planner/handoff-archive/) or the phase completes — read with handoff show <ref> for context; no manual clear needed." : "",
-                "Plan tools available: project_set_language_preferences, plan_init, project_update, requirement_list, requirement_create, requirement_update, requirement_delete, plan_get, feature_list, feature_get, feature_create, feature_update, feature_delete, phase_list, phase_get, phase_create, phase_update, phase_delete, task_list, task_get, task_create, task_update, task_delete, task_start, task_complete, plan_render, plan_get_handoff, plan_write_handoff, plan_delete_handoff, handoff_list, handoff_show, handoff_write, handoff_clear, plan_authorize_bypass, plan_clear_bypass",
+                ...handoffs.map((handoff, index) => `  [${index + 1}] ${handoff.compositeRef} — ${handoff.updatedAt} — "${handoff.firstLine}"`),
+                handoffs.length > 0 ? "Use handoff show <ref>; if no task is active, treat the handoff target as a candidate to validate, not the current focus." : "",
+                "",
+                `Language: content=${project.contentLanguage || "(not set)"}; chat=${project.chatLanguage || "(not set)"}`,
+                "Planner discuss mode is Agent Plan only: ignore GSD workflows unless the user explicitly asks for GSD.",
             ].filter(Boolean).join("\n");
             contextBlockCache = contextBlock;
             contextBlockDirty = false;