@pentoshi/clai 2.0.26 → 2.0.28

package/README.md

@@ -59,7 +59,7 @@ clai --classic      # start the legacy line-based REPL
 CLAI_CLASSIC=1 clai # persistent shell-level opt-out (CLAI_TUI=0 also works)
 
 # One-shot ask mode (explains but doesn't execute)
-clai --mode ask "create a python venv and install requests"
+clai --mode ask "how to create a python venv and install requests"
 
 # One-shot agent mode (executes)
 clai --mode agent "find all PDFs larger than 10MB in ~/Documents"

package/dist/agent/context-manager.d.ts

@@ -22,6 +22,16 @@ export interface CompactResult {
     afterTokens: number;
     summarized: boolean;
 }
+/**
+ * Content prefixes that mark a `role:"system"` message as compacted session
+ * memory (vs. the main system prompt or transient injected guidance). Exported
+ * so history-persistence can KEEP this memory when it drops other system
+ * messages — otherwise a resumed session that compacted mid-run would lose all
+ * summarized context.
+ */
+export declare const COMPACTION_MEMORY_PREFIX = "Session memory from compacted earlier turns:";
+export declare const MECHANICAL_MEMORY_PREFIX = "Earlier turns in this session, summarized";
+export declare function isCompactionMemoryMessage(message: ChatMessage): boolean;
 /**
  * Replace older messages with a single condensed "memory" message while
  * preserving the system prompt and the most recent N messages.
@@ -35,7 +45,10 @@ export interface CompactResult {
 export declare function compactMessages(messages: ChatMessage[], options?: CompactOptions): ChatMessage[];
 /**
  * Compact older turns into a model-written memory while retaining recent
- * messages verbatim. If summarization fails, the deterministic compactor is
- * used so `/compact` still reduces context without losing the recent tail.
+ * messages verbatim. The model summary is the ONLY compaction path: if the
+ * model fails to produce a summary we DO NOT fall back to a mechanical dump
+ * of the transcript (that historically produced an enormous, low-quality
+ * "memory" of tens of thousands of lines). Instead we throw, so the caller
+ * can report the failure and the original messages stay untouched.
  */
 export declare function compactMessagesWithSummary(messages: ChatMessage[], summarize: (prompt: string) => Promise<string>, options?: CompactOptions, sessionTranscript?: string | undefined): Promise<CompactResult>;

package/dist/agent/context-manager.js

@@ -18,6 +18,20 @@ export function estimateMessagesTokens(messages) {
 }
 const DEFAULT_BUDGET_TOKENS = 32_000;
 const DEFAULT_KEEP_RECENT = 12;
+/**
+ * Content prefixes that mark a `role:"system"` message as compacted session
+ * memory (vs. the main system prompt or transient injected guidance). Exported
+ * so history-persistence can KEEP this memory when it drops other system
+ * messages — otherwise a resumed session that compacted mid-run would lose all
+ * summarized context.
+ */
+export const COMPACTION_MEMORY_PREFIX = "Session memory from compacted earlier turns:";
+export const MECHANICAL_MEMORY_PREFIX = "Earlier turns in this session, summarized";
+export function isCompactionMemoryMessage(message) {
+    return (message.role === "system" &&
+        (message.content.startsWith(COMPACTION_MEMORY_PREFIX) ||
+            message.content.startsWith(MECHANICAL_MEMORY_PREFIX)));
+}
 /**
  * Replace older messages with a single condensed "memory" message while
  * preserving the system prompt and the most recent N messages.
@@ -62,15 +76,18 @@ export function compactMessages(messages, options = {}) {
     }
     const memo = {
         role: "system",
-        content: `Earlier turns in this session, summarized to fit the context budget. Full artifacts (when produced) are saved on disk and can be expanded with /output.\n\n` +
+        content: `${MECHANICAL_MEMORY_PREFIX} to fit the context budget. Full artifacts (when produced) are saved on disk and can be expanded with /output.\n\n` +
             bullets.join("\n"),
     };
     return [...head, memo, ...tail];
 }
 /**
  * Compact older turns into a model-written memory while retaining recent
- * messages verbatim. If summarization fails, the deterministic compactor is
- * used so `/compact` still reduces context without losing the recent tail.
+ * messages verbatim. The model summary is the ONLY compaction path: if the
+ * model fails to produce a summary we DO NOT fall back to a mechanical dump
+ * of the transcript (that historically produced an enormous, low-quality
+ * "memory" of tens of thousands of lines). Instead we throw, so the caller
+ * can report the failure and the original messages stay untouched.
  */
 export async function compactMessagesWithSummary(messages, summarize, options = {}, sessionTranscript) {
     const before = messages.length;
@@ -88,6 +105,7 @@ export async function compactMessagesWithSummary(messages, summarize, options =
         older = messages.slice(start, tailStart);
     }
     if (older.length === 0 && !sessionTranscript?.trim()) {
+        // Genuinely nothing to compact yet — return a no-op result.
         return {
             messages: [...messages],
             before,
@@ -111,73 +129,26 @@ export async function compactMessagesWithSummary(messages, summarize, options =
         "",
         transcript,
     ].join("\n");
-    try {
-        const summary = redactSecrets((await summarize(prompt)).trim());
-        if (!summary)
-            throw new Error("empty summary");
-        const head = start === 1 ? [messages[0]] : [];
-        const compacted = [
-            ...head,
-            { role: "system", content: `Session memory from compacted earlier turns:\n\n${summary}` },
-            ...messages.slice(tailStart),
-        ];
-        const afterTokens = estimateMessagesTokens(compacted);
-        if (afterTokens >= beforeTokens && !isForced) {
-            const deterministicCompacted = compactMessages(messages, { ...options, budgetTokens: 0 });
-            const detTokens = estimateMessagesTokens(deterministicCompacted);
-            if (detTokens < beforeTokens) {
-                return {
-                    messages: deterministicCompacted,
-                    before,
-                    after: deterministicCompacted.length,
-                    beforeTokens,
-                    afterTokens: detTokens,
-                    summarized: false,
-                };
-            }
-            return {
-                messages: [...messages],
-                before,
-                after: before,
-                beforeTokens,
-                afterTokens: beforeTokens,
-                summarized: false,
-            };
-        }
-        return {
-            messages: compacted,
-            before,
-            after: compacted.length,
-            beforeTokens,
-            afterTokens,
-            summarized: true,
-        };
-    }
-    catch (error) {
-        if (error instanceof Error && (error.name === "AbortError" || error.message?.includes("aborted"))) {
-            throw error;
-        }
-        const compacted = compactMessages(messages, { ...options, budgetTokens: 0 });
-        const afterTokens = estimateMessagesTokens(compacted);
-        if (afterTokens >= beforeTokens && !isForced) {
-            return {
-                messages: [...messages],
-                before,
-                after: before,
-                beforeTokens,
-                afterTokens: beforeTokens,
-                summarized: false,
-            };
-        }
-        return {
-            messages: compacted,
-            before,
-            after: compacted.length,
-            beforeTokens,
-            afterTokens,
-            summarized: false,
-        };
-    }
+    // The summary is the only path. Any failure propagates to the caller —
+    // there is deliberately NO deterministic fallback.
+    const summary = redactSecrets((await summarize(prompt)).trim());
+    if (!summary)
+        throw new Error("compaction failed: model returned an empty summary");
+    const head = start === 1 ? [messages[0]] : [];
+    const compacted = [
+        ...head,
+        { role: "system", content: `${COMPACTION_MEMORY_PREFIX}\n\n${summary}` },
+        ...messages.slice(tailStart),
+    ];
+    const afterTokens = estimateMessagesTokens(compacted);
+    return {
+        messages: compacted,
+        before,
+        after: compacted.length,
+        beforeTokens,
+        afterTokens,
+        summarized: true,
+    };
 }
 function oneLine(text, maxChars) {
     const cleaned = text.replace(/\s+/g, " ").trim();

package/dist/agent/context-manager.js.map

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

package/dist/agent/events.d.ts

@@ -48,7 +48,7 @@ export type AgentEvent = {
 } | {
     type: "confirm-request";
     id: string;
-    kind: "tool" | "pentest" | "reset" | "continue";
+    kind: "tool" | "pentest" | "reset" | "continue" | "plan" | "switch";
     prompt: string;
 } | {
     type: "turn-end";

package/dist/agent/runner.d.ts

@@ -14,12 +14,21 @@ export interface SessionPolicy {
         value: boolean;
     };
 }
-export declare function createSessionPolicy(): SessionPolicy;
+export declare function createSessionPolicy(sessionId?: string): SessionPolicy;
 export interface ConfirmPort {
     confirmTool(call: ToolCall): Promise<boolean>;
     confirmPentest(): Promise<boolean>;
     /** Ask the user whether to continue after hitting the step budget. */
     confirmContinue?(steps: number): Promise<boolean>;
+    /**
+     * Ask whether to leave ask mode and run an action task in agent mode.
+     * Optional so existing ports keep working; ask-mode handoff falls back to a
+     * default "no" when a port doesn't implement it.
+     */
+    confirmAgentSwitch?(info: {
+        reason: string;
+        tools: string[];
+    }): Promise<boolean>;
 }
 export interface AgentRunOptions {
     provider?: ProviderId | undefined;
@@ -32,6 +41,14 @@ export interface AgentRunOptions {
     onToolStart?: ((call: ToolCall) => void) | undefined;
     onToolResult?: ((call: ToolCall, result: ToolResult) => void) | undefined;
     onEvent?: ((event: AgentEvent) => void) | undefined;
+    /**
+     * Called when a turn ends with the FULL conversation for the turn — the user
+     * message, every assistant tool-call, every tool result, and the final
+     * answer (system prompts excluded). Callers persist this so a resumed
+     * session gives the model back what it actually did (commands, outputs,
+     * results), not just its prose answers.
+     */
+    onMessages?: ((messages: ChatMessage[]) => void) | undefined;
     confirm?: ConfirmPort | undefined;
     requestSecret?: ((request: {
         title: string;
@@ -115,6 +132,25 @@ export declare function countToolFences(text: string): number;
 export declare function parseAllToolCalls(text: string): ToolCall[];
 /** Structural equality for two tool calls (name + canonical args JSON). */
 export declare function sameToolCall(a: ToolCall, b: ToolCall): boolean;
+/**
+ * Partition a batch of tool calls (in document order) into execution groups.
+ * A run of consecutive parallel-safe calls forms one group to be run
+ * concurrently (bounded by maxGroupSize); every non-parallel-safe call is its
+ * own single-element group, i.e. a sequential barrier. Because plan updates
+ * and side-effecting tools are never parallel-safe, they always split the
+ * batch — which keeps parallelism scoped within a single task and prevents
+ * plan-state races and overlapping writes.
+ */
+export declare function groupToolCallsForExecution(calls: ToolCall[], isParallelSafe: (call: ToolCall) => boolean, maxGroupSize?: number): ToolCall[][];
+/**
+ * Build the conversation to hand back to the caller at turn end. Strips system
+ * prompts (they're re-added each turn) but keeps the user turn plus every
+ * assistant tool-call and tool result, then appends the final answer if it
+ * isn't already the last message. Persisting this is what lets a resumed
+ * session give the model back what it actually did — commands, outputs, and
+ * results — instead of only its prose answers.
+ */
+export declare function buildTurnHistory(messages: ChatMessage[], answer: string): ChatMessage[];
 /**
  * Collapse pathological repetition before a message is stored in history.
  * Some models degenerate into emitting the same short phrase hundreds of
@@ -123,6 +159,7 @@ export declare function sameToolCall(a: ToolCall, b: ToolCall): boolean;
  * copies and note the collapse so the meaning is preserved without the bulk.
  */
 export declare function collapseRepeatedText(text: string): string;
+export declare function formatToolArgs(call: ToolCall): string;
 /**
  * Detect pentest/security tasks that need the full step budget.
  * Mirrors looksLikeBuildTask but for security work.