zelari-code 1.7.1 → 1.8.0

package/dist/cli/hooks/conversationContext.js

@@ -0,0 +1,136 @@
+/**
+ * conversationContext — shared rolling provider history for all dispatch modes
+ * (agent / council / zelari).
+ *
+ * v1.6.0 fixed single-agent context loss with an in-hook historyRef. That left
+ * council/zelari stateless across turns, and /clear|/new never reset history —
+ * so the model could still "forget" answers or leak prior sessions.
+ *
+ * This module is the single source of truth for provider-side AgentMessage[]
+ * history. Hooks read/write it; slash handlers call clear() on /clear|/new.
+ *
+ * @since v1.8.0 (PR-A context unification)
+ */
+import { compactHistory } from './historyCompaction.js';
+let history = [];
+let lastClarification = null;
+/** Current rolling history (read-only view — callers must not mutate). */
+export function getHistory() {
+    return history;
+}
+/** Replace history after compaction / hydrate. */
+export function setHistory(messages) {
+    history = [...messages];
+}
+/** Compact in place using the same rules as the agent loop. */
+export function compactInPlace() {
+    history = compactHistory(history);
+}
+/** Append messages (e.g. this turn's assistant+tool tail). */
+export function appendMessages(msgs) {
+    if (msgs.length === 0)
+        return;
+    history = history.concat(msgs);
+}
+/** Drop everything ( /clear, /new ). */
+export function clearHistory() {
+    history = [];
+    lastClarification = null;
+}
+/** Serialize for session sidecar / tests. */
+export function serializeHistory() {
+    return [...history];
+}
+/** Hydrate from session restore. */
+export function hydrateHistory(messages) {
+    history = [...messages];
+}
+export function getLastClarification() {
+    return lastClarification;
+}
+export function setLastClarification(c) {
+    lastClarification = c
+        ? { question: c.question, choices: c.choices, at: Date.now() }
+        : null;
+}
+/**
+ * If the user sends a short reply that likely answers the last clarifying
+ * question, return a rewritten user message that re-anchors the question so
+ * the model cannot treat "full" / "2" / "sì" as a brand-new request.
+ *
+ * Returns null when no rewrite is needed (long free-form message, no prior
+ * question, or history already carries enough context).
+ */
+export function maybeAnchorShortAnswer(userText) {
+    const clar = lastClarification;
+    if (!clar)
+        return null;
+    const trimmed = userText.trim();
+    if (!trimmed)
+        return null;
+    // Long free-form answers already carry intent — don't wrap.
+    if (trimmed.length > 80 || trimmed.includes('\n'))
+        return null;
+    const lower = trimmed.toLowerCase();
+    const choices = clar.choices;
+    const matched = choices.find((c) => c.toLowerCase() === lower) ??
+        choices.find((c) => c.toLowerCase().startsWith(lower)) ??
+        choices.find((c) => lower.startsWith(c.toLowerCase().slice(0, Math.min(4, c.length))));
+    // Also treat numeric picks ("1", "2") as choice indices (1-based).
+    let choiceLabel = matched ?? null;
+    if (!choiceLabel && /^\d{1,2}$/.test(trimmed)) {
+        const idx = Number.parseInt(trimmed, 10) - 1;
+        if (idx >= 0 && idx < choices.length)
+            choiceLabel = choices[idx] ?? null;
+    }
+    // Very short replies without a choice match still get anchored if ≤ 24 chars
+    // (e.g. "sì", "ok", "la seconda") — the model needs the prior question.
+    if (!choiceLabel && trimmed.length > 24)
+        return null;
+    const picked = choiceLabel ?? trimmed;
+    return (`The user is answering your previous clarifying question.\n` +
+        `Question: ${clar.question}\n` +
+        `Choices were: ${choices.join(' | ')}\n` +
+        `User's answer: ${picked}\n` +
+        `Proceed using this answer; do not re-ask the same question unless the answer is still ambiguous.`);
+}
+/**
+ * Build a compact text block of recent conversation for council/zelari paths
+ * that do not feed full AgentMessage[] into every member (token control).
+ * Includes the last few user/assistant turns only.
+ */
+export function formatHistoryForCouncil(maxTurns = 4) {
+    if (history.length === 0)
+        return '';
+    const lines = [];
+    // Walk from the end; collect up to maxTurns user+assistant pairs.
+    let turns = 0;
+    const chunk = [];
+    for (let i = history.length - 1; i >= 0 && turns < maxTurns; i--) {
+        const m = history[i];
+        if (m.role === 'user') {
+            chunk.push(`User: ${truncate(m.content, 400)}`);
+            turns += 1;
+        }
+        else if (m.role === 'assistant' && m.content.trim()) {
+            chunk.push(`Assistant: ${truncate(m.content, 600)}`);
+        }
+    }
+    if (chunk.length === 0)
+        return '';
+    lines.push('## Prior conversation (rolling context)');
+    lines.push(...chunk.reverse());
+    return lines.join('\n');
+}
+function truncate(s, max) {
+    const t = s.replace(/\s+/g, ' ').trim();
+    if (t.length <= max)
+        return t;
+    return `${t.slice(0, max - 1)}…`;
+}
+/** Test-only: reset module state. */
+export function _resetConversationContextForTests() {
+    history = [];
+    lastClarification = null;
+}
+//# sourceMappingURL=conversationContext.js.map

package/dist/cli/hooks/conversationContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conversationContext.js","sourceRoot":"","sources":["../../../src/cli/hooks/conversationContext.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAUxD,IAAI,OAAO,GAAmB,EAAE,CAAC;AACjC,IAAI,iBAAiB,GAA6B,IAAI,CAAC;AAEvD,0EAA0E;AAC1E,MAAM,UAAU,UAAU;IACxB,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,kDAAkD;AAClD,MAAM,UAAU,UAAU,CAAC,QAAiC;IAC1D,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,cAAc;IAC5B,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC;AAED,8DAA8D;AAC9D,MAAM,UAAU,cAAc,CAAC,IAA6B;IAC1D,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO;IAC9B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,wCAAwC;AACxC,MAAM,UAAU,YAAY;IAC1B,OAAO,GAAG,EAAE,CAAC;IACb,iBAAiB,GAAG,IAAI,CAAC;AAC3B,CAAC;AAED,6CAA6C;AAC7C,MAAM,UAAU,gBAAgB;IAC9B,OAAO,CAAC,GAAG,OAAO,CAAC,CAAC;AACtB,CAAC;AAED,oCAAoC;AACpC,MAAM,UAAU,cAAc,CAAC,QAAiC;IAC9D,OAAO,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,CAAiD;IAEjD,iBAAiB,GAAG,CAAC;QACnB,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE;QAC9D,CAAC,CAAC,IAAI,CAAC;AACX,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB;IACrD,MAAM,IAAI,GAAG,iBAAiB,CAAC;IAC/B,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAChC,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC1B,4DAA4D;IAC5D,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAE/D,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;IAC7B,MAAM,OAAO,GACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,CAAC;QAC9C,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACtD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAEzF,mEAAmE;IACnE,IAAI,WAAW,GAAG,OAAO,IAAI,IAAI,CAAC;IAClC,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC9C,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,OAAO,CAAC,MAAM;YAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC;IAC3E,CAAC;IAED,6EAA6E;IAC7E,wEAAwE;IACxE,IAAI,CAAC,WAAW,IAAI,OAAO,CAAC,MAAM,GAAG,EAAE;QAAE,OAAO,IAAI,CAAC;IAErD,MAAM,MAAM,GAAG,WAAW,IAAI,OAAO,CAAC;IACtC,OAAO,CACL,4DAA4D;QAC5D,aAAa,IAAI,CAAC,QAAQ,IAAI;QAC9B,iBAAiB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;QACxC,kBAAkB,MAAM,IAAI;QAC5B,kGAAkG,CACnG,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,QAAQ,GAAG,CAAC;IAClD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,kEAAkE;IAClE,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE,CAAC;QACjE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YACtB,KAAK,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAChD,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;aAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;YACtD,KAAK,CAAC,IAAI,CAAC,cAAc,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAClC,KAAK,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;IACtD,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;IAC/B,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,QAAQ,CAAC,CAAS,EAAE,GAAW;IACtC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,CAAC,MAAM,IAAI,GAAG;QAAE,OAAO,CAAC,CAAC;IAC9B,OAAO,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC;AACnC,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,iCAAiC;IAC/C,OAAO,GAAG,EAAE,CAAC;IACb,iBAAiB,GAAG,IAAI,CAAC;AAC3B,CAAC"}

package/dist/cli/hooks/useChatTurn.js

@@ -13,27 +13,27 @@ import { buildSystemPrompt, getAllTools, SINGLE_AGENT_IDENTITY_MODULE, buildLang
 import { parseClarificationRequest, cleanAgentContent, } from "@zelari/core";
 import { appendOrExtendStreamingAssistant, appendSystem, appendToolStart, finalizeStreamingAssistant, updateToolMessageEnd, } from "./messageHelpers.js";
 import { setStreaming, finalizeStreaming, startTool, completeTool, } from "./chatState.js";
-import { compactHistory } from "./historyCompaction.js";
+import { getHistory, compactInPlace, appendMessages, clearHistory, setLastClarification, maybeAnchorShortAnswer, formatHistoryForCouncil, setHistory, } from "./conversationContext.js";
 import { computeSessionStatsDelta } from "./chatStats.js";
 import { envNumber } from "../utils/envNumber.js";
+import { getPhase } from "../phaseState.js";
+import { describePhase } from "../phase.js";
+import { applyBudgetPolicy } from "../budget/tokenBudget.js";
 export function useChatTurn(params) {
     const { sessionId, writerRef, setMessages, commitStreaming, flushStreaming, setBusy, setSessionActive, setSessionStats, setLive, liveRef, setPicker, } = params;
     const harnessRef = useRef(null);
     const [queueCount, setQueueCount] = useState(0);
-    // v1.6.0: rolling conversation history. The single-agent loop was
-    // stateless across turns — each dispatchPrompt rebuilt
-    // messages:[{system},{user}] from scratch, so the model never saw its
-    // own prior question when the user answered with a short reply ("full",
-    // "sì", "la seconda"). This ref carries prior turns forward: the seed
-    // for turn N is [system, ...history, user_N], and after the run we
-    // snapshot the assistant+tool tail the harness accumulated and append
-    // it here for turn N+1. Capped by compactHistory() (ZELARI_HISTORY_TURNS).
-    const historyRef = useRef([]);
+    // v1.8.0: rolling history lives in conversationContext (shared by agent,
+    // council, zelari) so /clear|/new can reset it and short answers bind
+    // across all modes. Seed for turn N is [system, ...history, user_N].
     // v0.7.0: when the live region is wired, streaming + tool events route
     // there; otherwise we fall back to the v0.6 single-array behavior so the
     // existing unit tests (which pass only setMessages/commitStreaming) keep
     // asserting on `messages` directly.
     const useLiveModel = !!(setLive && liveRef);
+    const clearConversationHistory = useCallback(() => {
+        clearHistory();
+    }, []);
     const dispatchPrompt = useCallback(async (userText, opts) => {
         // v0.4.3 audit fix: provider resolution + harness construction now
         // live INSIDE the try block. Previously, throws from providerFromEnv,
@@ -54,13 +54,19 @@ export function useChatTurn(params) {
         // with a partial assistant tail).
         let turnSucceeded = false;
         try {
-            // v1.6.0: trim rolling history before seeding the next turn. No-op
-            // (returns the same ref) under the cap; replaces the array when it
-            // exceeds 2× ZELARI_HISTORY_TURNS. When the env var is 0 the cap
-            // resolves to [] and the loop degrades to the pre-1.6 stateless
-            // [system, user] behavior.
-            historyRef.current = compactHistory(historyRef.current);
-            historySeedLen = historyRef.current.length;
+            // v1.8.0: budget-aware compact (phase plan/build + occupancy thresholds).
+            compactInPlace();
+            const budget = applyBudgetPolicy(getHistory(), getPhase());
+            setHistory(budget.history);
+            for (const w of budget.warnings) {
+                appendSystem(setMessages, w, Date.now());
+            }
+            historySeedLen = getHistory().length;
+            // Short-answer anchor: if the user is replying to a ---QUESTION---,
+            // rewrite the user message so the model cannot treat "full"/"2" as
+            // a brand-new request even if compaction dropped the prior turn.
+            const anchored = maybeAnchorShortAnswer(userText);
+            const effectiveUserText = anchored ?? userText;
             envConfig = await providerFromEnv();
             if (!envConfig) {
                 // Name the ACTIVE provider — the old hardcoded "OPENAI_API_KEY not
@@ -71,7 +77,10 @@ export function useChatTurn(params) {
                 return;
             }
             setBusy(true);
-            const { registry: toolRegistry } = createBuiltinToolRegistry();
+            const workPhase = getPhase();
+            const { registry: toolRegistry } = createBuiltinToolRegistry({
+                planMode: workPhase === "plan",
+            });
             const baseProviderStream = openaiCompatibleProvider(envConfig);
             const failoverResolution = await resolveFailoverStream({
                 failoverEnabled: process.env.ANATHEMA_FAILOVER !== "0",
@@ -200,12 +209,30 @@ export function useChatTurn(params) {
             // SINGLE_AGENT_IDENTITY_MODULE overrides the council-flavored
             // 'base-identity' module so the persona is "Zelari Code in the terminal",
             // not "member of an AI Council".
+            const planPhaseBlock = workPhase === "plan"
+                ? [
+                    "",
+                    "# Work Phase: PLAN",
+                    "You are in PLAN mode. Explore and design only.",
+                    "- Do NOT implement production code or run destructive shell commands.",
+                    "- write_file / edit_file / bash / apply_diff are unavailable.",
+                    "- Produce a clear plan, ask clarifying questions (---QUESTION---), use workspace plan tools when relevant.",
+                    "- When the plan is ready, tell the user to run /build to implement.",
+                ].join("\n")
+                : workPhase === "build" && planSummary
+                    ? [
+                        "",
+                        "# Work Phase: BUILD",
+                        "Implement the approved plan. Prefer acting over describing. Update plan task statuses as you go.",
+                    ].join("\n")
+                    : "";
             const shellContextBlock = [
                 "# Platform & Shell",
                 `platform: ${process.platform}`,
                 `shell: ${resolvedShell.via}`,
                 shellGuidance,
                 nonInteractiveGuidance,
+                planPhaseBlock,
                 "",
                 "# Working Directory",
                 `You are running in: ${cwd}`,
@@ -284,23 +311,19 @@ export function useChatTurn(params) {
                 default: 25,
                 min: 1,
             });
-            // v1.5.2: tool-loop iteration cap (observe → reason → act cycles per
-            // run). Core default is 90 (raised from 30). Overridable for very
-            // large multi-file tasks or to tighten on flaky providers.
-            const maxToolLoopIterations = envNumber(process.env.ZELARI_MAX_TOOL_LOOP_ITERATIONS, {
-                default: 90,
-                min: 1,
-            });
+            // v1.5.2 / v1.8.0: tool-loop cap — budget policy may lower under
+            // context pressure; env still wins as the ceiling via applyBudgetPolicy.
+            const maxToolLoopIterations = budget.maxToolLoopIterations;
             const harness = new AgentHarness({
                 model: envConfig.model,
                 provider: "openai-compatible",
                 messages: [
                     { role: "system", content: systemPrompt },
-                    // v1.6.0: seed prior turns so the model sees its own last
-                    // question when the user answers briefly. historyRef.current
-                    // is compacted above (possibly empty if ZELARI_HISTORY_TURNS=0).
-                    ...historyRef.current,
-                    { role: "user", content: userText },
+                    // v1.8.0: shared rolling history (agent/council/zelari) so short
+                    // answers bind to prior ---QUESTION--- blocks. Possibly empty
+                    // when ZELARI_HISTORY_TURNS=0.
+                    ...getHistory(),
+                    { role: "user", content: effectiveUserText },
                 ],
                 tools: toolRegistry.toOpenAITools().map((t) => ({
                     name: t.function.name,
@@ -455,24 +478,24 @@ export function useChatTurn(params) {
                         const all = h.getMessages();
                         const seedLen = 1 /*system*/ + historySeedLen + 1 /*user*/;
                         if (all.length > seedLen) {
-                            historyRef.current = historyRef.current.concat(all.slice(seedLen));
+                            appendMessages(all.slice(seedLen));
                         }
                     }
                 }
                 catch {
                     // Non-fatal: a snapshot failure must never break the turn.
                 }
-                // v1.6.0: if the assistant ended its turn by posing a clarifying
-                // question (---QUESTION--- block), parse it and open the picker so
-                // the user can pick from the offered choices. Rolling history
-                // (above) already guarantees the model sees its own question next
-                // turn, so the binding works whether the user picks or types. The
-                // picker is purely ergonomic. Skipped when setPicker is unset
-                // (tests) or the run failed.
-                if (turnSucceeded && setPicker && assistantContent) {
+                // v1.6.0/v1.8.0: clarifying-question picker + lastClarification for
+                // short-answer anchoring. Rolling history already binds answers;
+                // setLastClarification covers compaction edge cases.
+                if (turnSucceeded && assistantContent) {
                     try {
                         const clar = parseClarificationRequest(assistantContent);
                         if (clar && clar.choices && clar.choices.length >= 2) {
+                            setLastClarification({
+                                question: clar.question,
+                                choices: clar.choices,
+                            });
                             // Strip the raw ---QUESTION--- block from the finalized
                             // assistant message so the display shows prose, not JSON.
                             const cleaned = cleanAgentContent(assistantContent);
@@ -488,14 +511,20 @@ export function useChatTurn(params) {
                                     return next;
                                 });
                             }
-                            setPicker({
-                                kind: "clarification",
-                                title: clar.question,
-                                items: clar.choices.map((c) => ({ value: c, label: c })),
-                                onAnswer: (value) => {
-                                    void dispatchPrompt(value);
-                                },
-                            });
+                            if (setPicker) {
+                                setPicker({
+                                    kind: "clarification",
+                                    title: clar.question,
+                                    items: clar.choices.map((c) => ({ value: c, label: c })),
+                                    onAnswer: (value) => {
+                                        void dispatchPrompt(value);
+                                    },
+                                });
+                            }
+                        }
+                        else {
+                            // Free-form answer path next turn — clear stale question.
+                            setLastClarification(null);
                         }
                     }
                     catch {
@@ -543,6 +572,7 @@ export function useChatTurn(params) {
             setQueueCount,
             setLive,
             liveRef,
+            setPicker,
         });
     }, [
         sessionId,
@@ -554,6 +584,7 @@ export function useChatTurn(params) {
         setQueueCount,
         setLive,
         liveRef,
+        setPicker,
     ]);
     const pendingZelariRef = useRef(null);
     const dispatchZelariPrompt = useCallback(async (text) => {
@@ -586,10 +617,11 @@ export function useChatTurn(params) {
         harnessRef,
         queueCount,
         setQueueCount,
+        clearConversationHistory,
     };
 }
 async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
-    const { sessionId, writerRef, setMessages, commitStreaming, flushStreaming, setBusy, setLive, liveRef, } = deps;
+    const { sessionId, writerRef, setMessages, commitStreaming, flushStreaming, setBusy, setLive, liveRef, setPicker, } = deps;
     const useLiveModel = !!(setLive && liveRef);
     const envConfig = await providerFromEnv();
     if (!envConfig) {
@@ -599,6 +631,16 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
         return { completionOk: false, ran: false };
     }
     setBusy(true);
+    // v1.8.0: compact shared history + budget + short-answer anchor.
+    compactInPlace();
+    const councilBudget = applyBudgetPolicy(getHistory(), getPhase());
+    setHistory(councilBudget.history);
+    for (const w of councilBudget.warnings) {
+        appendSystem(setMessages, w, Date.now());
+    }
+    const anchored = maybeAnchorShortAnswer(text);
+    const effectiveText = anchored ?? text;
+    appendSystem(setMessages, `[phase] ${describePhase(getPhase())}`, Date.now());
     // Import dynamically to avoid a circular dep at module-load time.
     const { dispatchCouncil } = await import("../councilDispatcher.js");
     const { createWorkspaceContext, createWorkspaceStubs } = await import("../workspace/stubs.js");
@@ -608,14 +650,23 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     const { buildWorkspaceSummary, buildPlanSummary } = await import("../workspace/workspaceSummary.js");
     const { buildLessonsSummary } = await import("../workspace/buildLessonsSummary.js");
     const { FeedbackStore } = await import("../councilFeedback.js");
-    const { registry: councilToolRegistry } = createBuiltinToolRegistry();
+    const workPhase = getPhase();
+    const { registry: councilToolRegistry } = createBuiltinToolRegistry({
+        planMode: workPhase === "plan",
+    });
     const workspaceCtx = createWorkspaceContext();
     const workspaceReg = createWorkspaceToolRegistry(workspaceCtx);
     for (const name of workspaceReg.list()) {
         const td = workspaceReg.get(name);
-        if (td)
-            councilToolRegistry.register(td);
+        if (!td)
+            continue;
+        // Plan phase: keep workspace plan/doc tools (createPlan, …); skip any
+        // that are pure project-file mutators if ever added.
+        councilToolRegistry.register(td);
     }
+    // Force council design-phase when UI phase is plan (and vice-versa for build).
+    const phaseRunMode = overrides.runMode ??
+        (workPhase === "plan" ? "design-phase" : "implementation");
     // v0.7.5: MCP tools for the council too (same lazy singleton as the
     // single-agent path — zero extra spawns).
     try {
@@ -666,7 +717,7 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
     let sliceDegraded = false;
     const PROVIDER_ERROR_ABORT_THRESHOLD = 2;
     try {
-        for await (const event of dispatchCouncil(text, {
+        for await (const event of dispatchCouncil(effectiveText, {
             apiKey: envConfig.apiKey,
             model: envConfig.model,
             provider: "openai-compatible",
@@ -680,10 +731,13 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
             // on and projected their identity onto the task.
             // v0.7.3: append the existing plan (if any) so a follow-up /council
             // continues it instead of re-planning from scratch.
+            // v1.8.0: rolling conversation context so short answers bind across
+            // council turns (same history store as the single-agent path).
             workspaceContext: [
                 buildWorkspaceSummary(process.cwd()),
-                buildPlanSummary(process.cwd(), { userMessage: text }),
-                buildLessonsSummary(process.cwd(), text),
+                buildPlanSummary(process.cwd(), { userMessage: effectiveText }),
+                buildLessonsSummary(process.cwd(), effectiveText),
+                formatHistoryForCouncil(4),
             ]
                 .filter(Boolean)
                 .join("\n\n"),
@@ -691,13 +745,42 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
             // v1.0: Zelari-mode per-slice overrides (memory RAG, forced run mode,
             // raised chairman budget). No-ops for a normal /council run.
             ...(overrides.ragContext ? { ragContext: overrides.ragContext } : {}),
-            ...(overrides.runMode ? { runMode: overrides.runMode } : {}),
+            runMode: phaseRunMode,
             ...(overrides.maxToolCallsChairman
                 ? { maxToolCallsChairman: overrides.maxToolCallsChairman }
                 : {}),
             onCouncilStatus: (message) => {
                 appendSystem(setMessages, message, Date.now());
             },
+            // v1.8.0: pause council when a member asks a structured question.
+            onClarification: setPicker
+                ? (req) => new Promise((resolve) => {
+                    const choices = req.choices ?? [];
+                    if (choices.length < 2) {
+                        resolve(null);
+                        return;
+                    }
+                    setLastClarification({
+                        question: req.question,
+                        choices,
+                    });
+                    let settled = false;
+                    const finish = (value) => {
+                        if (settled)
+                            return;
+                        settled = true;
+                        setPicker(null);
+                        resolve(value);
+                    };
+                    setPicker({
+                        kind: "clarification",
+                        title: req.question,
+                        items: choices.map((c) => ({ value: c, label: c })),
+                        onAnswer: (value) => finish(value),
+                        onCancel: () => finish(null),
+                    });
+                })
+                : undefined,
         })) {
             if (councilAborted) {
                 // Drain remaining events silently after the abort decision.
@@ -857,6 +940,23 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
             finalizeStreaming(setMessages, setLive);
         else
             finalizeStreamingAssistant(setMessages);
+        // v1.8.0: fold this council turn into shared rolling history so the next
+        // agent/council/zelari turn sees user + synthesis (short answers bind).
+        if (membersCompleted > 0 || chairmanProducedOutput) {
+            try {
+                appendMessages([
+                    { role: "user", content: effectiveText },
+                    {
+                        role: "assistant",
+                        content: chairmanSynthesisText.trim() ||
+                            "[council completed without chairman synthesis text]",
+                    },
+                ]);
+            }
+            catch {
+                // Non-fatal.
+            }
+        }
         // v0.7.1 (A3): only auto-write AGENTS.MD when the council actually produced
         // output. Running the hook after an all-error run (e.g. the HTTP 400 from
         // A1) dirtied the working tree with sections rewritten from nothing.
@@ -878,7 +978,7 @@ async function dispatchCouncilPromptImpl(text, deps, overrides = {}) {
                 }
                 const hook = await runPostCouncilHook(workspaceCtx, {
                     runMode: councilRunMode,
-                    userMessage: text,
+                    userMessage: effectiveText,
                     synthesisText: chairmanSynthesisText || undefined,
                     degradedRun: degraded.degraded,
                     degradedReasons: degraded.reasons,