@zelari/core 2.33.1 → 2.34.1

package/dist/agents/council/memberMessages.js

@@ -0,0 +1,95 @@
+import { resolveRoleSystemPrompt } from '../roles.js';
+import { buildSystemPromptSplit, computeAgentTools } from '../systemPromptBuilder.js';
+import { getAllTools } from '../tools.js';
+import { councilModeBanner } from '../../council/modeBanners.js';
+/**
+ * Tools that mutate project files. In implementation-mode council runs only the
+ * chairman (Lucifero) implements; specialists + Minosse analyze and hand off.
+ * We strip these from every non-implementer so multiple agents never edit the
+ * same files (multi-writer chaos) and "who implemented" stays unambiguous.
+ * Note: specialists inherit write tools via skill `requiredTools`, so this must
+ * filter the RESULT of computeAgentTools, not just the declared role tools.
+ */
+export const MUTATING_PROJECT_TOOLS = ['write_file', 'edit_file'];
+/**
+ * Remove file-mutating tools for non-implementer members in implementation mode.
+ * Design-phase and the implementer (chairman) keep the full set unchanged.
+ */
+export function restrictImplementationWrites(toolNames, opts) {
+    if (opts.runMode !== 'implementation' || opts.isImplementer)
+        return toolNames;
+    return toolNames.filter((t) => !MUTATING_PROJECT_TOOLS.includes(t));
+}
+/** @internal */
+export function buildAgentMessages(agent, userMessage, ragContext, workspaceContext, priorOutputs, aiConfig, executableTools, runMode = 'implementation', languageModule) {
+    // v0.7.5: the AVAILABLE TOOLS prompt block must match the schemas the
+    // harness actually advertises. The v0.7.3 fix filtered the schemas
+    // (filterExecutable) but NOT this prompt text, so members still read
+    // "searchRAG: search the knowledge base…" in their system prompt and
+    // called it — every call a guaranteed "Tool not found" (live test
+    // 2026-07-03, /council in Z:\EasyPeasy\test).
+    const allToolNames = computeAgentTools(agent, aiConfig);
+    const toolNames = executableTools
+        ? allToolNames.filter((n) => executableTools.has(n))
+        : allToolNames;
+    // Merge language policy into custom modules so every primary council turn
+    // gets it (retries previously received the arg but never used it).
+    const mergedAiConfig = languageModule
+        ? {
+            enabledSkills: aiConfig?.enabledSkills ?? [],
+            enabledTools: aiConfig?.enabledTools ?? [],
+            agentSkillConfigs: aiConfig?.agentSkillConfigs ?? [],
+            customSkills: aiConfig?.customSkills,
+            customPromptModules: [
+                ...(aiConfig?.customPromptModules ?? []),
+                languageModule,
+            ],
+        }
+        : aiConfig;
+    // Mode-split: design mandatories only when runMode is design-phase.
+    const modeAwareAgent = {
+        ...agent,
+        systemPrompt: resolveRoleSystemPrompt(agent, runMode),
+    };
+    // Cache-efficient split (Cache Wars): stable = identity/tools/role;
+    // volatile = workspace/RAG; banners stay trailing system msgs (volatile).
+    const split = buildSystemPromptSplit(modeAwareAgent, {
+        tools: getAllTools(),
+        toolNames,
+        aiConfig: mergedAiConfig,
+        workspaceContext,
+        ragContext,
+        mode: 'council',
+        includeWorkspaceInPrompt: true,
+    });
+    const messages = [
+        { role: 'system', content: split.stable },
+    ];
+    if (split.volatile.trim()) {
+        messages.push({ role: 'system', content: split.volatile });
+    }
+    messages.push({ role: 'system', content: councilModeBanner(runMode, { isImplementer: agent.id === 'lucifer' }) }, { role: 'system', content: 'IMPORTANT: Before making any tool calls or expensive operations, check if the information already exists in the shared context from previous agents. Avoid redundant work.' });
+    if (priorOutputs.length > 0) {
+        // Cap each prior member blob so one verbose specialist cannot saturate
+        // downstream members (chairman especially). Full text is not product law.
+        const MAX_PRIOR_CHARS = 2800;
+        const summary = priorOutputs
+            .map((o) => {
+            const body = o.content.length > MAX_PRIOR_CHARS
+                ? `${o.content.slice(0, MAX_PRIOR_CHARS)}\n… [truncated ${o.content.length}→${MAX_PRIOR_CHARS} chars; treat as hypothesis]`
+                : o.content;
+            return `[${o.name} - ${o.role}]: ${body}`;
+        })
+            .join('\n\n');
+        messages.push({
+            role: 'user',
+            content: `Previous council members have said (hypotheses — prefer product files on disk if they conflict):\n${summary}\n\n` +
+                `Original user request: ${userMessage}`,
+        });
+    }
+    else {
+        messages.push({ role: 'user', content: userMessage });
+    }
+    return messages;
+}
+//# sourceMappingURL=memberMessages.js.map

package/dist/agents/council/memberMessages.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"memberMessages.js","sourceRoot":"","sources":["../../../src/agents/council/memberMessages.ts"],"names":[],"mappings":"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"}

package/dist/agents/council/outputCleaning.d.ts

@@ -0,0 +1,49 @@
+export interface ClarificationRequest {
+    question: string;
+    choices?: string[];
+    context?: string;
+}
+export declare function parseClarificationRequest(text: string): ClarificationRequest | null;
+/** True when text contains a structured question with ≥2 choices (pause UI). */
+export declare function hasInteractiveClarification(text: string): boolean;
+/**
+ * Strip real clarification blocks from display prose.
+ *
+ * A block is real only when `---QUESTION---` is followed (after whitespace)
+ * by `{`. Mentions of the marker in prose or backticks are left intact —
+ * the old marker→EOF regex ate the rest of any reply that *talked about*
+ * the protocol (Desktop/headless streamScrub then stopped emitting).
+ *
+ * Incomplete `{` (streaming, no balanced JSON, no ---END---) still hides
+ * from the marker through EOF so JSON scaffolding does not flash.
+ */
+export declare function stripQuestionBlocks(text: string): string;
+export declare function parseThinking(text: string): string;
+export interface CleanAgentContentOptions {
+    /**
+     * When true (default), strip `---QUESTION---` blocks from display text.
+     * Set false when cleaning text for rolling PROVIDER history — the model
+     * still needs to see its own clarifying question on the next turn.
+     */
+    stripQuestion?: boolean;
+    /**
+     * When true (default), strip `<think>` / `<thinking>` blocks (UI display).
+     * Set **false** for multi-turn **provider** history: MiniMax-M3 (and M2.x)
+     * require the full assistant `content` including think tags so interleaved
+     * tool-use reasoning continues. Stripping them for the API degrades tool
+     * loops ("announces intent then stops"). Display paths keep the default.
+     */
+    stripThink?: boolean;
+}
+/**
+ * Strip model "private" channels from text shown to the user / re-fed as
+ * history. Covers:
+ *   - complete + unclosed `<think>` / `<thinking>` (GLM/MiniMax style) — optional
+ *   - MiniMax XML tool-call wrappers
+ *   - clarifying-question JSON blocks (display only; keep in provider history)
+ *
+ * Without unclosed-tag stripping, streamed thinking that never got a closing
+ * tag leaked into the TUI as visible assistant prose (v1.8.1).
+ */
+export declare function cleanAgentContent(text: string, opts?: CleanAgentContentOptions): string;
+//# sourceMappingURL=outputCleaning.d.ts.map

package/dist/agents/council/outputCleaning.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"outputCleaning.d.ts","sourceRoot":"","sources":["../../../src/agents/council/outputCleaning.ts"],"names":[],"mappings":"AASA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAwCD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CA6BnF;AAED,gFAAgF;AAChF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGjE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA+BxD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMlD;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,wBAA6B,GAClC,MAAM,CAgDR"}

package/dist/agents/council/outputCleaning.js

@@ -0,0 +1,190 @@
+/**
+ * outputCleaning — clarifying-question parsing and model output cleaning,
+ * extracted verbatim from agents/councilApi.ts.
+ */
+import { scrubProprietaryLeak } from '../secrecyPolicy.js';
+const QUESTION_MARKER = '---QUESTION---';
+const QUESTION_END_MARKER = '---END---';
+/**
+ * Extract the first top-level JSON object from `s` using brace depth so trailing
+ * MiniMax/tool garbage after `}` does not break JSON.parse (common failure mode:
+ * `---QUESTION--- {…}]<]minimax…` without ---END---).
+ */
+function extractBalancedJsonObject(s) {
+    const start = s.indexOf('{');
+    if (start < 0)
+        return null;
+    let depth = 0;
+    let inString = false;
+    let escape = false;
+    for (let i = start; i < s.length; i++) {
+        const ch = s[i];
+        if (inString) {
+            if (escape) {
+                escape = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escape = true;
+                continue;
+            }
+            if (ch === '"')
+                inString = false;
+            continue;
+        }
+        if (ch === '"') {
+            inString = true;
+            continue;
+        }
+        if (ch === '{')
+            depth++;
+        else if (ch === '}') {
+            depth--;
+            if (depth === 0)
+                return s.slice(start, i + 1);
+        }
+    }
+    return null;
+}
+export function parseClarificationRequest(text) {
+    const start = text.indexOf(QUESTION_MARKER);
+    if (start < 0)
+        return null;
+    const rest = text.slice(start + QUESTION_MARKER.length);
+    const end = rest.indexOf(QUESTION_END_MARKER);
+    const block = end >= 0 ? rest.slice(0, end) : rest;
+    const cleaned = block.replace(/```json\n?/g, '').replace(/```\n?/g, '').trim();
+    const jsonText = extractBalancedJsonObject(cleaned) ??
+        (() => {
+            const objStart = cleaned.indexOf('{');
+            const objEnd = cleaned.lastIndexOf('}');
+            return objStart >= 0 && objEnd > objStart
+                ? cleaned.slice(objStart, objEnd + 1)
+                : cleaned;
+        })();
+    try {
+        const parsed = JSON.parse(jsonText);
+        if (typeof parsed.question !== 'string' || !parsed.question.trim())
+            return null;
+        return {
+            question: parsed.question.trim(),
+            choices: Array.isArray(parsed.choices)
+                ? parsed.choices.filter((c) => typeof c === 'string' && c.trim().length > 0).map((c) => c.trim())
+                : undefined,
+            context: typeof parsed.context === 'string' ? parsed.context.trim() : undefined,
+        };
+    }
+    catch {
+        return null;
+    }
+}
+/** True when text contains a structured question with ≥2 choices (pause UI). */
+export function hasInteractiveClarification(text) {
+    const c = parseClarificationRequest(text);
+    return !!(c && c.choices && c.choices.length >= 2);
+}
+/**
+ * Strip real clarification blocks from display prose.
+ *
+ * A block is real only when `---QUESTION---` is followed (after whitespace)
+ * by `{`. Mentions of the marker in prose or backticks are left intact —
+ * the old marker→EOF regex ate the rest of any reply that *talked about*
+ * the protocol (Desktop/headless streamScrub then stopped emitting).
+ *
+ * Incomplete `{` (streaming, no balanced JSON, no ---END---) still hides
+ * from the marker through EOF so JSON scaffolding does not flash.
+ */
+export function stripQuestionBlocks(text) {
+    let out = '';
+    let rest = text;
+    while (true) {
+        const start = rest.indexOf(QUESTION_MARKER);
+        if (start < 0) {
+            out += rest;
+            break;
+        }
+        out += rest.slice(0, start);
+        const afterMarker = rest.slice(start + QUESTION_MARKER.length);
+        const trimmed = afterMarker.replace(/^\s+/, '');
+        if (!trimmed.startsWith('{')) {
+            out += QUESTION_MARKER;
+            rest = afterMarker;
+            continue;
+        }
+        const endIdx = afterMarker.indexOf(QUESTION_END_MARKER);
+        if (endIdx >= 0) {
+            rest = afterMarker.slice(endIdx + QUESTION_END_MARKER.length);
+            continue;
+        }
+        const json = extractBalancedJsonObject(trimmed);
+        if (json) {
+            const jsonAt = afterMarker.indexOf(json);
+            rest = afterMarker.slice(jsonAt + json.length);
+            continue;
+        }
+        break;
+    }
+    return out.replace(/\n{3,}/g, '\n\n').trim();
+}
+export function parseThinking(text) {
+    // Prefer complete blocks; fall back to unclosed trailing block (common mid-stream).
+    const complete = text.match(/<think(?:ing)?>([\s\S]*?)<\/think(?:ing)?>/i);
+    if (complete)
+        return complete[1].trim();
+    const open = text.match(/<think(?:ing)?>([\s\S]*)$/i);
+    return open ? open[1].trim() : '';
+}
+/**
+ * Strip model "private" channels from text shown to the user / re-fed as
+ * history. Covers:
+ *   - complete + unclosed `<think>` / `<thinking>` (GLM/MiniMax style) — optional
+ *   - MiniMax XML tool-call wrappers
+ *   - clarifying-question JSON blocks (display only; keep in provider history)
+ *
+ * Without unclosed-tag stripping, streamed thinking that never got a closing
+ * tag leaked into the TUI as visible assistant prose (v1.8.1).
+ */
+export function cleanAgentContent(text, opts = {}) {
+    const stripQuestion = opts.stripQuestion !== false;
+    const stripThink = opts.stripThink !== false;
+    let out = text;
+    if (stripThink) {
+        out = out
+            .replace(/<think(?:ing)?>[\s\S]*?<\/think(?:ing)?>/gi, '')
+            .replace(/<think(?:ing)?>[\s\S]*$/gi, '')
+            .replace(/<\/think(?:ing)?>/gi, '');
+    }
+    // Tool-call markup that models sometimes dump into prose (MiniMax / GLM / generic).
+    // Prefer closed-block removal first; only then strip *trailing* unclosed
+    // open tags. Never use a mid-string open-tag → EOF wipe for tool tags when
+    // there may still be real prose after a broken unclosed tag sequence —
+    // headless streamScrub re-cleans the full buffer each push, so closed pairs
+    // are enough mid-stream; trailing open is for end-of-turn.
+    out = out
+        .replace(/<minimax:tool_call>[\s\S]*?<\/minimax:tool_call>/gi, '')
+        .replace(/<\/?minimax:tool_call>/gi, '')
+        .replace(/<tool_call>[\s\S]*?<\/tool_call>/gi, '')
+        .replace(/<\/?tool_call>/gi, '')
+        .replace(/<function_call>[\s\S]*?<\/function_call>/gi, '')
+        .replace(/<\/?function_call>/gi, '')
+        .replace(/<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, '')
+        .replace(/<\/invoke>/gi, '')
+        .replace(/<parameter\b[^>]*>[\s\S]*?<\/parameter>/gi, '')
+        .replace(/<\/parameter>/gi, '')
+        .replace(/\]\s*<\]\s*minimax\s*\[>\s*\[?<invoke\b[^>]*>[\s\S]*?<\/invoke>/gi, '')
+        // Trailing unclosed tool channels only (end of buffer)
+        .replace(/<minimax:tool_call>[\s\S]*$/gi, '')
+        .replace(/<tool_call>[\s\S]*$/gi, '')
+        .replace(/<function_call>[\s\S]*$/gi, '')
+        .replace(/<invoke\b[^>]*>[\s\S]*$/gi, '')
+        .replace(/\]\s*<\]\s*minimax\s*\[>[\s\S]*$/gi, '')
+        .replace(/^\s*\]\s*<\]\s*minimax\s*\[>.*$/gim, '')
+        .replace(/^\s*<\/?(?:tool_call|function_call|invoke|parameter|minimax:tool_call)\b[^>]*>\s*$/gim, '');
+    if (stripQuestion) {
+        out = stripQuestionBlocks(out);
+    }
+    out = out.replace(/\n{3,}/g, '\n\n').trim();
+    // Defense-in-depth: strip proprietary prompt dumps that escaped model policy.
+    return scrubProprietaryLeak(out);
+}
+//# sourceMappingURL=outputCleaning.js.map

package/dist/agents/council/outputCleaning.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"outputCleaning.js","sourceRoot":"","sources":["../../../src/agents/council/outputCleaning.ts"],"names":[],"mappings":"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"}

package/dist/agents/council/retryTurn.d.ts

@@ -0,0 +1,130 @@
+/**
+ * retryTurn — forced tool-emission retry turns (v0.7.7 Pass 3), extracted
+ * verbatim from agents/councilApi.ts.
+ */
+import type { BrainEvent } from '../../shared/events.js';
+import type { ProviderStreamFn } from '../../core/AgentHarness.js';
+import type { AgentRole } from '../../types/index.js';
+import type { SystemPromptConfig, SystemPromptModule } from '../../types/systemTypes.js';
+import type { CouncilRunMode } from '../../council/runMode.js';
+import type { ToolEmissionCheckResult, ToolEmissionRequirement } from './toolEmission.js';
+import type { PureCouncilConfig } from './types.js';
+/**
+ * Maximum number of forced retry turns per council member. Cap of 1
+ * keeps the worst-case council latency bounded (a single extra turn per
+ * member × 4 design-phase members ≈ 30-60 s on top of the base run).
+ * Going above 1 tends to produce hallucinated tool arguments because
+ * the model has already spent its "tool budget" on exploration.
+ */
+export declare const MAX_RETRY_PER_MEMBER = 1;
+/**
+ * Pure helper: should the council loop spin up one more forced turn for
+ * this member to recover the missing tool emissions?
+ *
+ * Returns true when:
+ *   - at least one tool is still missing after the post-condition check, AND
+ *   - the retry budget for this member has not been exhausted.
+ *
+ * Returns false otherwise. Tested as a pure function so the council
+ * loop can branch on the answer without coupling to AgentHarness.
+ */
+export declare function shouldRetryMember(missingToolNames: string[], attemptsSoFar: number): boolean;
+/**
+ * Build the one-line prompt that the retry turn sends to the model.
+ * The shape matters: the model is primed by its role prompt to produce
+ * prose, so the retry prompt must be unambiguous, imperative, and
+ * scoped to ONLY the missing tools.
+ *
+ * Format: "You did not emit: <names>. Call <names> NOW with concrete
+ * arguments. No prose."
+ *
+ * Multiple tools are listed comma-separated in the same call so the
+ * model can satisfy them in a single tool_calls turn (which is the
+ * cheapest path through AgentHarness).
+ */
+export declare function buildRetryPrompt(missingToolNames: string[]): string;
+export declare function runRetryTurnForMember(args: {
+    agent: AgentRole;
+    missingToolNames: string[];
+    /**
+     * Per-tool minimum emission count. The retry budget is the SUM of these
+     * values (not just the number of distinct missing tools), because
+     * requirements like `createTask min: 12` need 12 separate calls even
+     * though only 1 distinct tool is missing. If omitted, the budget
+     * defaults to `missingToolNames.length` (suitable for tools like
+     * createDocument that need only one call).
+     */
+    minPerTool?: Record<string, number>;
+    executableTools: ReadonlySet<string> | null;
+    userMessage: string;
+    ragContext: string;
+    workspaceContext: string;
+    priorOutputs: {
+        name: string;
+        role: string;
+        content: string;
+    }[];
+    aiConfig?: SystemPromptConfig;
+    sessionId: string;
+    effectiveModel: string;
+    effectiveProvider: string;
+    eventBus?: BrainEvent['sessionId'] extends string ? unknown : never;
+    toolRegistry?: unknown;
+    providerStream: ProviderStreamFn;
+    runMode?: CouncilRunMode;
+    /** Override the default buildRetryPrompt message. */
+    retryPrompt?: string;
+    /**
+     * v1.7.0 (agy audit M2): pre-built language module. Optional — when
+     * omitted, no language-policy system message is added (preserves the
+     * pre-1.7 retry behavior for tests and callers that don't track it).
+     * `runCouncilPure` threads the module it built once per run.
+     */
+    languageModule?: SystemPromptModule;
+    /** Cooperative cancel — skip the retry turn when already aborted. */
+    signal?: AbortSignal;
+}): AsyncGenerator<BrainEvent, string[], void>;
+/**
+ * Shared retry orchestrator used by specialist, oracle, and chairman
+ * loops. Given the post-condition check result, decides whether to
+ * spin up a forced retry turn, and if so yields the events from that
+ * turn back to the caller (so the UI sees them) while mutating the
+ * shared `emittedToolNames` array (so the next post-condition check
+ * sees the union of original + retry emissions).
+ *
+ * The retry turn is skipped when:
+ *   - the check passed (no missing tools), OR
+ *   - the retry budget for this member is exhausted (shouldRetryMember).
+ *
+ * On retry failure (network error, model error, etc.) the function logs
+ * the error and continues — it never throws. The next post-condition
+ * check will simply re-warn.
+ */
+export declare function applyRetryIfMissing(args: {
+    agent: AgentRole;
+    check: ToolEmissionCheckResult;
+    /**
+     * Original per-member requirements. Used to compute the retry budget
+     * (sum of `min` for each missing tool) so the model can satisfy all
+     * minimums in one tool_calls turn. If omitted, defaults to 1 per
+     * distinct missing tool.
+     */
+    requirements?: ToolEmissionRequirement[];
+    emittedToolNames: string[];
+    executableNames: ReadonlySet<string> | null;
+    sessionId: string;
+    userMessage: string;
+    agentOutputs: {
+        name: string;
+        role: string;
+        content: string;
+    }[];
+    config: PureCouncilConfig;
+    effectiveProvider: string;
+    effectiveModel: string;
+    /** Callback to bump the per-member tool-call counter on each retry emission. */
+    onToolCall: () => void;
+    /** v1.7.0 (Pass-2 agy finding): see applyCompletionRetry. */
+    languageModule?: SystemPromptModule;
+}): AsyncGenerator<BrainEvent, void, void>;
+//# sourceMappingURL=retryTurn.d.ts.map

package/dist/agents/council/retryTurn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"retryTurn.d.ts","sourceRoot":"","sources":["../../../src/agents/council/retryTurn.ts"],"names":[],"mappings":"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"}