comisai 1.0.14 → 1.0.16

package/node_modules/@comis/agent/dist/bootstrap/index.d.ts

@@ -1,5 +1,5 @@
 export { type BootstrapFile, type TruncationResult, type PromptMode, type RuntimeInfo, type InboundMetadata, type BootstrapContextFile, SUBAGENT_BOOTSTRAP_ALLOWLIST, BOOTSTRAP_HEAD_RATIO, BOOTSTRAP_TAIL_RATIO, } from "./types.js";
-export { loadWorkspaceBootstrapFiles, truncateFileContent, filterBootstrapFilesForSubAgent, filterBootstrapFilesForLightContext, filterBootstrapFilesForGroupChat, buildBootstrapContextFiles, } from "./workspace-loader.js";
+export { loadWorkspaceBootstrapFiles, truncateFileContent, filterBootstrapFilesForSubAgent, filterBootstrapFilesForLightContext, filterBootstrapFilesForCron, filterBootstrapFilesForGroupChat, buildBootstrapContextFiles, } from "./workspace-loader.js";
 export * from "./sections/index.js";
 export { extractMarkdownSections, MAX_POST_COMPACTION_CHARS } from "./section-extractor.js";
 export { assembleRichSystemPrompt, assembleRichSystemPromptBlocks, SECTION_SEPARATOR } from "./system-prompt-assembler.js";

package/node_modules/@comis/agent/dist/bootstrap/index.js

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // Bootstrap — workspace file loading & system prompt assembly
 export { SUBAGENT_BOOTSTRAP_ALLOWLIST, BOOTSTRAP_HEAD_RATIO, BOOTSTRAP_TAIL_RATIO, } from "./types.js";
-export { loadWorkspaceBootstrapFiles, truncateFileContent, filterBootstrapFilesForSubAgent, filterBootstrapFilesForLightContext, filterBootstrapFilesForGroupChat, buildBootstrapContextFiles, } from "./workspace-loader.js";
+export { loadWorkspaceBootstrapFiles, truncateFileContent, filterBootstrapFilesForSubAgent, filterBootstrapFilesForLightContext, filterBootstrapFilesForCron, filterBootstrapFilesForGroupChat, buildBootstrapContextFiles, } from "./workspace-loader.js";
 export * from "./sections/index.js";
 export { extractMarkdownSections, MAX_POST_COMPACTION_CHARS } from "./section-extractor.js";
 export { assembleRichSystemPrompt, assembleRichSystemPromptBlocks, SECTION_SEPARATOR } from "./system-prompt-assembler.js";

package/node_modules/@comis/agent/dist/bootstrap/system-prompt-assembler.d.ts

@@ -82,6 +82,32 @@ export interface AssemblerParams {
     /** Whether Silent Execution Planner (SEP) is enabled for this agent. */
     sepEnabled?: boolean;
 }
+/**
+ * Internal descriptor for a system prompt section.
+ *
+ * Engineering notes:
+ *  - `id` must be unique across SECTIONS and stable (used by tests).
+ *  - `includeIn` must be non-empty.
+ *  - `build` receives `(params, mode)` and is responsible for forwarding
+ *    `mode === "minimal"` as the existing builders' `isMinimal` parameter.
+ *
+ * @internal exported for tests only
+ */
+export interface SectionDescriptor {
+    readonly id: string;
+    readonly includeIn: ReadonlySet<PromptMode>;
+    readonly build: (params: AssemblerParams, mode: PromptMode) => string[];
+}
+/**
+ * Canonical section list in emission order.
+ *
+ * Order MUST match the previous hand-written `buildAllSections` so the
+ * `staticPrefix`/`attribution` index boundaries (2 + 2) continue to enclose
+ * identity+persona and safety+language respectively.
+ *
+ * @internal exported for tests only
+ */
+export declare const SECTIONS: ReadonlyArray<SectionDescriptor>;
 /**
  * Assemble a rich multi-section system prompt.
  *

package/node_modules/@comis/agent/dist/bootstrap/system-prompt-assembler.js

@@ -50,63 +50,92 @@ function joinSections(sections) {
     const nonEmpty = sections.filter((lines) => lines.length > 0);
     return nonEmpty.map((lines) => lines.join("\n")).join(SECTION_SEPARATOR);
 }
+/** Sections present in full, operational, and minimal modes.
+ *  NB: builders may still self-filter to `[]` when their isMinimal flag is set. */
+const MODES_ALL = new Set(["full", "operational", "minimal"]);
+/** Sections present in full and minimal modes (stripped in operational).
+ *  Interactive-only guidance that doesn't apply to autonomous cron/heartbeat runs
+ *  but that minimal sub-agent contexts historically saw before this refactor.
+ *  Minimal-mode builders typically self-filter to [] via their own isMinimal flag;
+ *  membership here preserves pre-refactor behavior without changing minimal output. */
+const MODES_FULL_MIN = new Set(["full", "minimal"]);
+/** Sections present only in full mode (stripped in operational AND minimal).
+ *  Reserved for sections whose builder is cheap but whose output is not desired
+ *  in either non-interactive context. Currently unused; MODES_FULL_MIN is
+ *  preferred to preserve pre-refactor minimal output. */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars -- reserved for future use
+const MODES_FULL = new Set(["full"]);
 /**
- * Build all section arrays in the canonical order (1-22).
+ * Canonical section list in emission order.
+ *
+ * Order MUST match the previous hand-written `buildAllSections` so the
+ * `staticPrefix`/`attribution` index boundaries (2 + 2) continue to enclose
+ * identity+persona and safety+language respectively.
+ *
+ * @internal exported for tests only
+ */
+export const SECTIONS = [
+    // --- Static prefix block (indices 0-1 in every mode that includes them) ---
+    { id: "identity", includeIn: MODES_ALL, build: (p) => buildIdentitySection(p.agentName ?? "Comis") },
+    { id: "persona", includeIn: MODES_ALL, build: (p) => buildPersonaSection(p.bootstrapFiles ?? []) },
+    // --- Attribution block (safety self-filters in minimal) ---
+    { id: "safety", includeIn: MODES_ALL, build: (p, m) => buildSafetySection(m === "minimal") },
+    { id: "language", includeIn: MODES_ALL, build: (p) => buildLanguageSection(p.userLanguage) },
+    // --- Semi-stable body: operational-kept sections (MODES_ALL -- builders self-filter for minimal) ---
+    { id: "tooling", includeIn: MODES_ALL, build: (p, m) => buildToolingSection(p.toolNames ?? [], m === "minimal" ? "small" : "large", p.toolSummaries) },
+    { id: "tool-call-style", includeIn: MODES_ALL, build: (p, m) => buildToolCallStyleSection(m === "minimal", p.toolNames ?? []) },
+    // --- Operational-stripped sections (MODES_FULL_MIN -- dropped in "operational") ---
+    { id: "self-update", includeIn: MODES_FULL_MIN, build: (p, m) => buildSelfUpdateGatingSection(p.toolNames ?? [], m === "minimal", true) },
+    { id: "config-secret", includeIn: MODES_FULL_MIN, build: (p, m) => buildConfigSecretIntegritySection(p.toolNames ?? [], m === "minimal") },
+    { id: "privileged", includeIn: MODES_FULL_MIN, build: (p, m) => buildPrivilegedToolsSection(p.toolNames ?? [], m === "minimal", true) },
+    { id: "compact-recover", includeIn: MODES_FULL_MIN, build: (p, m) => buildCompactedOutputRecoverySection(m === "minimal") },
+    { id: "post-compact", includeIn: MODES_FULL_MIN, build: (p, m) => buildPostCompactionRecoverySection(p.bootstrapFiles ?? [], m === "minimal", p.postCompactionSections) },
+    { id: "coding-fallback", includeIn: MODES_FULL_MIN, build: (p, m) => buildCodingFallbackSection(p.toolNames ?? [], m === "minimal", true) },
+    { id: "task-delegation", includeIn: MODES_FULL_MIN, build: (p, m) => buildTaskDelegationSection(p.toolNames ?? [], m === "minimal", p.subAgentToolNames, p.mcpToolsInherited, true) },
+    // --- Operational-kept body (MODES_ALL) ---
+    { id: "skills", includeIn: MODES_ALL, build: (p, m) => buildSkillsSection(p.skillsPrompt, m === "minimal", p.promptSkillsXml, p.activePromptSkillContent) },
+    { id: "memory-recall", includeIn: MODES_ALL, build: (p, m) => buildMemoryRecallSection(p.hasMemoryTools ?? false, m === "minimal") },
+    { id: "workspace", includeIn: MODES_ALL, build: (p, m) => buildWorkspaceSection(p.workspaceDir, m === "minimal") },
+    // --- Operational-stripped body ---
+    { id: "documentation", includeIn: MODES_FULL_MIN, build: (p, m) => p.documentationConfig
+            ? buildDocumentationSection(p.documentationConfig, p.toolNames ?? [], m === "minimal")
+            : [] },
+    { id: "messaging", includeIn: MODES_ALL, build: (p, m) => buildMessagingSection(p.toolNames ?? [], m === "minimal", p.channelContext) },
+    { id: "background", includeIn: MODES_FULL_MIN, build: (p, m) => buildBackgroundTaskSection(p.toolNames ?? [], m === "minimal", p.channelContext) },
+    { id: "silent-replies", includeIn: MODES_FULL_MIN, build: (p, m) => buildSilentRepliesSection(m === "minimal") },
+    { id: "heartbeats", includeIn: MODES_FULL_MIN, build: (p, m) => buildHeartbeatsSection(p.heartbeatPrompt, m === "minimal") },
+    { id: "reactions", includeIn: MODES_FULL_MIN, build: (p, m) => buildReactionGuidanceSection(p.reactionLevel, p.channelContext?.channelType, m === "minimal") },
+    { id: "media-sharing", includeIn: MODES_FULL_MIN, build: (p, m) => buildMediaSharingSection(p.outboundMediaEnabled, m === "minimal") },
+    { id: "media-files", includeIn: MODES_FULL_MIN, build: (p, m) => buildMediaFilesSection(p.hasMemoryTools ?? false, (p.toolNames ?? []).includes("message"), p.workspaceDir, p.mediaPersistenceEnabled ?? false, m === "minimal") },
+    { id: "autonomous-media", includeIn: MODES_FULL_MIN, build: (p, m) => buildAutonomousMediaSection(p.autonomousMediaEnabled ?? false, m === "minimal") },
+    { id: "reasoning", includeIn: MODES_ALL, build: (p, m) => buildReasoningSection(p.reasoningEnabled ?? false, m === "minimal", p.reasoningTagHint ?? false) },
+    { id: "sep", includeIn: MODES_FULL_MIN, build: (p, m) => buildTaskPlanningSection(p.sepEnabled ?? false, m === "minimal") },
+    { id: "runtime-meta", includeIn: MODES_ALL, build: (p, m) => buildRuntimeMetadataSection(p.runtimeInfo ?? {}, m === "minimal") },
+    { id: "sender-trust", includeIn: MODES_FULL_MIN, build: (p, m) => buildSenderTrustSection(p.senderTrustEntries ?? [], p.senderTrustDisplayMode ?? "raw", m === "minimal") },
+    { id: "project-context", includeIn: MODES_ALL, build: (p, m) => buildProjectContextSection(p.bootstrapFiles ?? [], m === "minimal", p.excludeBootstrapFromContext ? new Set(["BOOTSTRAP.md"]) : undefined, p.workspaceProfile) },
+];
+/**
+ * Build all section arrays in the canonical order.
+ *
+ * Filters `SECTIONS` by mode inclusion, then builds each included descriptor.
+ * Subagent context is appended unconditionally as the last entry (matches the
+ * previous behavior).
  *
  * Shared by both `assembleRichSystemPrompt` and `assembleRichSystemPromptBlocks`
  * to guarantee identity by construction between both assembly functions.
  *
  * @returns Array of section line arrays in fixed order
  */
-function buildAllSections(params, isMinimal) {
-    const agentName = params.agentName ?? "Comis";
-    const modelTier = isMinimal ? "small" : "large";
-    return [
-        // --- Static prefix sections (indices 0-1) ---
-        buildIdentitySection(agentName), // 1
-        buildPersonaSection(params.bootstrapFiles ?? []), // 1b: Persona (SOUL.md) before Safety
-        // --- Attribution sections (indices 2-3) ---
-        buildSafetySection(isMinimal), // 2
-        buildLanguageSection(params.userLanguage), // 2b
-        // --- Semi-stable body sections (indices 4+) ---
-        buildToolingSection(params.toolNames ?? [], modelTier, params.toolSummaries), // 3
-        buildToolCallStyleSection(isMinimal, params.toolNames ?? []), // 4
-        buildSelfUpdateGatingSection(params.toolNames ?? [], isMinimal, true), // 5: deferred to tool result
-        buildConfigSecretIntegritySection(params.toolNames ?? [], isMinimal), // 5a: always-present
-        buildPrivilegedToolsSection(params.toolNames ?? [], isMinimal, true), // 5b: deferred to tool result
-        buildCompactedOutputRecoverySection(isMinimal), // 6
-        buildPostCompactionRecoverySection(// 6a
-        params.bootstrapFiles ?? [], isMinimal, params.postCompactionSections),
-        buildCodingFallbackSection(params.toolNames ?? [], isMinimal, true), // 6b: deferred to tool result
-        buildTaskDelegationSection(params.toolNames ?? [], isMinimal, params.subAgentToolNames, params.mcpToolsInherited, true), // 6c: deferred to tool result
-        buildSkillsSection(params.skillsPrompt, isMinimal, params.promptSkillsXml, params.activePromptSkillContent), // 7: Merged filesystem + prompt skills
-        buildMemoryRecallSection(params.hasMemoryTools ?? false, isMinimal), // 8
-        buildWorkspaceSection(params.workspaceDir, isMinimal), // 9
-        params.documentationConfig
-            ? buildDocumentationSection(params.documentationConfig, params.toolNames ?? [], isMinimal)
-            : [], // 9b: Documentation
-        buildMessagingSection(params.toolNames ?? [], isMinimal, params.channelContext), // 10
-        buildBackgroundTaskSection(params.toolNames ?? [], isMinimal, params.channelContext), // 11
-        buildSilentRepliesSection(isMinimal), // 14
-        buildHeartbeatsSection(params.heartbeatPrompt, isMinimal), // 15
-        buildReactionGuidanceSection(params.reactionLevel, params.channelContext?.channelType, isMinimal), // 16
-        buildMediaSharingSection(params.outboundMediaEnabled, isMinimal), // 16b
-        buildMediaFilesSection(// 16c
-        params.hasMemoryTools ?? false, (params.toolNames ?? []).includes("message"), params.workspaceDir, params.mediaPersistenceEnabled ?? false, isMinimal),
-        buildAutonomousMediaSection(params.autonomousMediaEnabled ?? false, isMinimal), // 16d
-        buildReasoningSection(params.reasoningEnabled ?? false, isMinimal, params.reasoningTagHint ?? false), // 17
-        buildTaskPlanningSection(params.sepEnabled ?? false, isMinimal), // 17b: SEP task planning (static, cache-stable)
-        // buildDateTimeSection() removed from system prompt (relocated to user-message preamble in prompt-assembly.ts)
-        buildRuntimeMetadataSection(params.runtimeInfo ?? {}, isMinimal), // 19
-        // buildInboundMetadataSection() removed from system prompt (relocated to user-message preamble in prompt-assembly.ts)
-        buildSenderTrustSection(params.senderTrustEntries ?? [], params.senderTrustDisplayMode ?? "raw", isMinimal), // 20b
-        buildProjectContextSection(// 21
-        params.bootstrapFiles ?? [], isMinimal, params.excludeBootstrapFromContext ? new Set(["BOOTSTRAP.md"]) : undefined, params.workspaceProfile),
-        // Subagent: prefer structured params, fall back to raw extraSystemPrompt
-        ...(params.subagentRole
-            ? [buildSubagentRoleSection(params.subagentRole)]
-            : [buildSubagentContextSection(params.extraSystemPrompt)]), // 22
-    ];
+function buildAllSections(params, mode) {
+    const base = SECTIONS
+        .filter((s) => s.includeIn.has(mode))
+        .map((s) => s.build(params, mode));
+    // Subagent section: prefer structured params, fall back to raw extraSystemPrompt.
+    // Unconditional; matches the previous hand-written emission.
+    const subagent = params.subagentRole
+        ? buildSubagentRoleSection(params.subagentRole)
+        : buildSubagentContextSection(params.extraSystemPrompt);
+    return [...base, subagent];
 }
 /**
  * Append additional sections (backward compat for RAG memory etc.) to a joined string.
@@ -141,8 +170,7 @@ export function assembleRichSystemPrompt(params) {
     if (mode === "none") {
         return buildIdentitySection(agentName).join("\n");
     }
-    const isMinimal = mode === "minimal";
-    const allSections = buildAllSections(params, isMinimal);
+    const allSections = buildAllSections(params, mode);
     // Filter out empty arrays, join each section's lines, then join sections
     const joined = joinSections(allSections);
     // Append additional sections (backward compat for RAG memory etc.)
@@ -186,9 +214,13 @@ export function assembleRichSystemPromptBlocks(params) {
             semiStableBody: "",
         };
     }
-    const isMinimal = mode === "minimal";
-    const allSections = buildAllSections(params, isMinimal);
+    const allSections = buildAllSections(params, mode);
     // Split at boundaries: identity+persona | safety+language | tooling+workspace+...
+    // Boundaries are index-based on the filtered section list. In `"full"` and
+    // `"operational"` modes the first 2 entries are identity+persona (both are
+    // in MODES_FULL_OP) and the next 2 are safety+language (MODES_ALL). In
+    // `"minimal"` mode persona is dropped, so the prefix shrinks by one and the
+    // byte-identity between full/operational is NOT expected in minimal mode.
     const staticSections = allSections.slice(0, STATIC_PREFIX_SECTION_COUNT);
     const attributionSections = allSections.slice(STATIC_PREFIX_SECTION_COUNT, STATIC_PREFIX_SECTION_COUNT + ATTRIBUTION_SECTION_COUNT);
     const bodySections = allSections.slice(STATIC_PREFIX_SECTION_COUNT + ATTRIBUTION_SECTION_COUNT);

package/node_modules/@comis/agent/dist/bootstrap/types.d.ts

@@ -37,10 +37,16 @@ export interface TruncationResult {
  * System prompt verbosity mode.
  *
  * - `"full"`: All workspace sections included (primary agents)
+ * - `"operational"`: All workspace sections relevant to autonomous operations;
+ *    drops interactive-only guidance (compaction recovery, silent replies,
+ *    heartbeats, reactions, media, SEP, sender trust). Used for cron and
+ *    heartbeat executions. `staticPrefix` and `attribution` cache blocks
+ *    remain byte-identical to `"full"` so the cached identity/attribution
+ *    prefix is shared across modes.
  * - `"minimal"`: Only AGENTS.md + TOOLS.md (sub-agents)
  * - `"none"`: Identity-only prompt (lightweight contexts)
  */
-export type PromptMode = "full" | "minimal" | "none";
+export type PromptMode = "full" | "operational" | "minimal" | "none";
 /**
  * Runtime metadata injected into the system prompt header.
  */

package/node_modules/@comis/agent/dist/bootstrap/workspace-loader.d.ts

@@ -87,6 +87,18 @@ export declare function filterBootstrapFilesForSubAgent(files: BootstrapFile[]):
  * @returns Filtered array containing only HEARTBEAT.md
  */
 export declare function filterBootstrapFilesForLightContext(files: BootstrapFile[]): BootstrapFile[];
+/**
+ * Filter bootstrap files for cron execution.
+ *
+ * Autonomous cron runs don't need heartbeat cadence rules, user preferences,
+ * tooling docs, or workspace bootstrap -- only the agent's persona (SOUL.md)
+ * and role behavior (ROLE.md). Mirrors the pattern of
+ * filterBootstrapFilesForLightContext.
+ *
+ * @param files - Full array of loaded bootstrap files
+ * @returns Filtered array containing only SOUL.md and ROLE.md
+ */
+export declare function filterBootstrapFilesForCron(files: BootstrapFile[]): BootstrapFile[];
 /**
  * Filter bootstrap files for group chat context.
  *

package/node_modules/@comis/agent/dist/bootstrap/workspace-loader.js

@@ -136,6 +136,27 @@ const HEARTBEAT_LIGHT_ALLOWLIST = new Set(["HEARTBEAT.md"]);
 export function filterBootstrapFilesForLightContext(files) {
     return files.filter((f) => HEARTBEAT_LIGHT_ALLOWLIST.has(f.name));
 }
+/**
+ * Allowlist for cron execution context.
+ * Retains ONLY SOUL.md and ROLE.md -- the persona and role behavior needed
+ * for autonomous cron runs. Strips heartbeat cadence rules, user preferences,
+ * tooling docs, and workspace bootstrap.
+ */
+const CRON_BOOTSTRAP_ALLOWLIST = new Set(["SOUL.md", "ROLE.md"]);
+/**
+ * Filter bootstrap files for cron execution.
+ *
+ * Autonomous cron runs don't need heartbeat cadence rules, user preferences,
+ * tooling docs, or workspace bootstrap -- only the agent's persona (SOUL.md)
+ * and role behavior (ROLE.md). Mirrors the pattern of
+ * filterBootstrapFilesForLightContext.
+ *
+ * @param files - Full array of loaded bootstrap files
+ * @returns Filtered array containing only SOUL.md and ROLE.md
+ */
+export function filterBootstrapFilesForCron(files) {
+    return files.filter((f) => CRON_BOOTSTRAP_ALLOWLIST.has(f.name));
+}
 /**
  * Excludelist for group chat context mode.
  * Excludes USER.md (privacy protection: personal preferences

package/node_modules/@comis/agent/dist/bridge/pi-event-bridge.js

@@ -49,9 +49,14 @@ export function createPiEventBridge(deps) {
                 // -----------------------------------------------------------------
                 case "message_update": {
                     const ame = event.assistantMessageEvent;
-                    if (ame && ame.type === "text_delta") {
-                        m.textEmitted = true; // Track that visible text was produced in some turn
-                        if (deps.onDelta) {
+                    if (ame && (ame.type === "text_delta" || ame.type === "thinking_delta")) {
+                        if (ame.type === "text_delta") {
+                            // Track that visible text was produced in some turn.
+                            // thinking_delta intentionally excluded — empty-final-turn detection
+                            // depends on this flag reflecting user-visible text only.
+                            m.textEmitted = true;
+                        }
+                        if (deps.onDelta && typeof ame.delta === "string") {
                             try {
                                 deps.onDelta(ame.delta);
                             }
@@ -394,7 +399,7 @@ export function createPiEventBridge(deps) {
                             totalTokens: usage.totalTokens,
                             cost,
                             provider: deps.provider,
-                            model: deps.model,
+                            model: deps.getCurrentModel?.() ?? deps.model,
                             sessionKey: formatSessionKey(deps.sessionKey),
                             operationType: deps.operationType,
                         });
@@ -457,7 +462,7 @@ export function createPiEventBridge(deps) {
                             channelId: deps.channelId,
                             executionId: deps.executionId,
                             provider: deps.provider,
-                            model: deps.model,
+                            model: deps.getCurrentModel?.() ?? deps.model,
                             tokens: {
                                 prompt: usage.input,
                                 completion: usage.output,
@@ -475,7 +480,7 @@ export function createPiEventBridge(deps) {
                             cacheWriteTokens,
                             sessionKey: formatSessionKey(deps.sessionKey),
                             savedVsUncached,
-                            cacheEligible: getCacheProviderInfo(deps.provider, deps.model).cacheEligible,
+                            cacheEligible: getCacheProviderInfo(deps.provider, deps.getCurrentModel?.() ?? deps.model).cacheEligible,
                             responseId,
                             cacheCreation: effectiveCacheCreation,
                         });
@@ -561,17 +566,13 @@ export function createPiEventBridge(deps) {
                     // SEP: Extract plan from first LLM turn that has tool calls + assistant text.
                     // This runs inside the agentic loop so subsequent turns can track against the plan.
                     if (deps.executionPlan && deps.sepConfig && !deps.executionPlan.current) {
-                        const hasToolCalls = Array.isArray(assistantMsg?.content) && assistantMsg.content.some((c) => {
-                            const block = c;
-                            return block.type === "toolCall" || block.type === "tool_use";
-                        });
                         const assistantTextForPlan = Array.isArray(assistantMsg?.content)
                             ? assistantMsg.content
                                 .filter((c) => c?.type === "text")
                                 .map((c) => c.text ?? "")
                                 .join(" ")
                             : "";
-                        if (hasToolCalls && assistantTextForPlan.length > 0) {
+                        if (assistantTextForPlan.length > 0) {
                             const steps = extractPlanFromResponse(assistantTextForPlan, deps.sepConfig.maxSteps);
                             if (steps && steps.length >= deps.sepConfig.minSteps) {
                                 const plan = {

package/node_modules/@comis/agent/dist/context-engine/constants.d.ts

@@ -96,6 +96,17 @@ export declare const MCP_DEFERRAL_THRESHOLD = 0.1;
  *  this many blocks apart cannot see each other for prefix matching.
  *  Used by: lookback window enforcement in stream-wrappers.ts. */
 export declare const CACHE_LOOKBACK_WINDOW = 20;
+/** Maximum message blocks before cache-aware compaction trigger.
+ *  With 4 breakpoints (3 Comis + 1 SDK) and a 20-block lookback window,
+ *  optimal coverage spans 4 × 20 = 80 blocks. Trigger when the count
+ *  *exceeds* 60 (i.e. first fires at 61 blocks — 75% of theoretical max)
+ *  to leave headroom for multi-call turns.
+ *
+ *  APPROXIMATION NOTE: `messages.length` (AgentMessage[]) approximates
+ *  Anthropic's request-body `messages[]` block count but is not strictly 1:1.
+ *  Treat 60 as a defensive setpoint, not a calibrated threshold.
+ *  Used by: llm-compaction layer cache-aware trigger. */
+export declare const CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD = 60;
 /** Context utilization percentage that triggers LLM compaction. Used by: llm-compaction layer. */
 export declare const COMPACTION_TRIGGER_PERCENT = 85;
 /** Default turns to wait before re-triggering compaction. Used by: llm-compaction layer. */

package/node_modules/@comis/agent/dist/context-engine/constants.js

@@ -155,6 +155,17 @@ export const MCP_DEFERRAL_THRESHOLD = 0.10;
  *  this many blocks apart cannot see each other for prefix matching.
  *  Used by: lookback window enforcement in stream-wrappers.ts. */
 export const CACHE_LOOKBACK_WINDOW = 20;
+/** Maximum message blocks before cache-aware compaction trigger.
+ *  With 4 breakpoints (3 Comis + 1 SDK) and a 20-block lookback window,
+ *  optimal coverage spans 4 × 20 = 80 blocks. Trigger when the count
+ *  *exceeds* 60 (i.e. first fires at 61 blocks — 75% of theoretical max)
+ *  to leave headroom for multi-call turns.
+ *
+ *  APPROXIMATION NOTE: `messages.length` (AgentMessage[]) approximates
+ *  Anthropic's request-body `messages[]` block count but is not strictly 1:1.
+ *  Treat 60 as a defensive setpoint, not a calibrated threshold.
+ *  Used by: llm-compaction layer cache-aware trigger. */
+export const CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD = 60;
 // ---------------------------------------------------------------------------
 // LLM Compaction (Layer 5: )
 // ---------------------------------------------------------------------------

package/node_modules/@comis/agent/dist/context-engine/index.d.ts

@@ -8,7 +8,7 @@
  */
 export type { TokenBudget, TokenAnchor, ContextLayer, ContextEngine, ContextEngineDeps, ContextEngineMetrics, AssembledContext, LayerCircuitBreaker, MicrocompactionGuard, ObservationMasker, CacheOptimizationMetrics, CacheSessionStats, EvictionStats, } from "./types.js";
 export type { ToolMaskingTier } from "./constants.js";
-export { SAFETY_MARGIN_PERCENT, MIN_SAFETY_MARGIN_TOKENS, OUTPUT_RESERVE_TOKENS, CONTEXT_ROT_BUFFER_PERCENT, LAYER_CIRCUIT_BREAKER_THRESHOLD, DEFAULT_KEEP_WINDOW_TURNS, MAX_INLINE_TOOL_RESULT_CHARS, MAX_INLINE_MCP_TOOL_RESULT_CHARS, MAX_INLINE_FILE_READ_RESULT_CHARS, TOOL_RESULT_HARD_CAP_CHARS, DEFAULT_OBSERVATION_KEEP_WINDOW, OBSERVATION_MASKING_CHAR_THRESHOLD, TOOL_MASKING_TIERS, resolveToolMaskingTier, EPHEMERAL_TOOL_KEEP_WINDOW, CHARS_PER_TOKEN_RATIO, CHARS_PER_TOKEN_RATIO_STRUCTURED, SYSTEM_PROMPT_HASH_LENGTH, BOOTSTRAP_BUDGET_WARN_PERCENT, MIN_CACHEABLE_TOKENS, DEFAULT_MIN_CACHEABLE_TOKENS, MCP_DEFERRAL_THRESHOLD, CACHE_LOOKBACK_WINDOW, COMPACTION_TRIGGER_PERCENT, COMPACTION_COOLDOWN_TURNS, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, } from "./constants.js";
+export { SAFETY_MARGIN_PERCENT, MIN_SAFETY_MARGIN_TOKENS, OUTPUT_RESERVE_TOKENS, CONTEXT_ROT_BUFFER_PERCENT, LAYER_CIRCUIT_BREAKER_THRESHOLD, DEFAULT_KEEP_WINDOW_TURNS, MAX_INLINE_TOOL_RESULT_CHARS, MAX_INLINE_MCP_TOOL_RESULT_CHARS, MAX_INLINE_FILE_READ_RESULT_CHARS, TOOL_RESULT_HARD_CAP_CHARS, DEFAULT_OBSERVATION_KEEP_WINDOW, OBSERVATION_MASKING_CHAR_THRESHOLD, TOOL_MASKING_TIERS, resolveToolMaskingTier, EPHEMERAL_TOOL_KEEP_WINDOW, CHARS_PER_TOKEN_RATIO, CHARS_PER_TOKEN_RATIO_STRUCTURED, SYSTEM_PROMPT_HASH_LENGTH, BOOTSTRAP_BUDGET_WARN_PERCENT, MIN_CACHEABLE_TOKENS, DEFAULT_MIN_CACHEABLE_TOKENS, MCP_DEFERRAL_THRESHOLD, CACHE_LOOKBACK_WINDOW, CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD, COMPACTION_TRIGGER_PERCENT, COMPACTION_COOLDOWN_TURNS, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, } from "./constants.js";
 export { computeTokenBudget } from "./token-budget.js";
 export { createContextEngine } from "./context-engine.js";
 export { createThinkingBlockCleaner } from "./thinking-block-cleaner.js";

package/node_modules/@comis/agent/dist/context-engine/index.js

@@ -8,7 +8,7 @@
  * @module
  */
 // Constants
-export { SAFETY_MARGIN_PERCENT, MIN_SAFETY_MARGIN_TOKENS, OUTPUT_RESERVE_TOKENS, CONTEXT_ROT_BUFFER_PERCENT, LAYER_CIRCUIT_BREAKER_THRESHOLD, DEFAULT_KEEP_WINDOW_TURNS, MAX_INLINE_TOOL_RESULT_CHARS, MAX_INLINE_MCP_TOOL_RESULT_CHARS, MAX_INLINE_FILE_READ_RESULT_CHARS, TOOL_RESULT_HARD_CAP_CHARS, DEFAULT_OBSERVATION_KEEP_WINDOW, OBSERVATION_MASKING_CHAR_THRESHOLD, TOOL_MASKING_TIERS, resolveToolMaskingTier, EPHEMERAL_TOOL_KEEP_WINDOW, CHARS_PER_TOKEN_RATIO, CHARS_PER_TOKEN_RATIO_STRUCTURED, SYSTEM_PROMPT_HASH_LENGTH, BOOTSTRAP_BUDGET_WARN_PERCENT, MIN_CACHEABLE_TOKENS, DEFAULT_MIN_CACHEABLE_TOKENS, MCP_DEFERRAL_THRESHOLD, CACHE_LOOKBACK_WINDOW, COMPACTION_TRIGGER_PERCENT, COMPACTION_COOLDOWN_TURNS, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, } from "./constants.js";
+export { SAFETY_MARGIN_PERCENT, MIN_SAFETY_MARGIN_TOKENS, OUTPUT_RESERVE_TOKENS, CONTEXT_ROT_BUFFER_PERCENT, LAYER_CIRCUIT_BREAKER_THRESHOLD, DEFAULT_KEEP_WINDOW_TURNS, MAX_INLINE_TOOL_RESULT_CHARS, MAX_INLINE_MCP_TOOL_RESULT_CHARS, MAX_INLINE_FILE_READ_RESULT_CHARS, TOOL_RESULT_HARD_CAP_CHARS, DEFAULT_OBSERVATION_KEEP_WINDOW, OBSERVATION_MASKING_CHAR_THRESHOLD, TOOL_MASKING_TIERS, resolveToolMaskingTier, EPHEMERAL_TOOL_KEEP_WINDOW, CHARS_PER_TOKEN_RATIO, CHARS_PER_TOKEN_RATIO_STRUCTURED, SYSTEM_PROMPT_HASH_LENGTH, BOOTSTRAP_BUDGET_WARN_PERCENT, MIN_CACHEABLE_TOKENS, DEFAULT_MIN_CACHEABLE_TOKENS, MCP_DEFERRAL_THRESHOLD, CACHE_LOOKBACK_WINDOW, CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD, COMPACTION_TRIGGER_PERCENT, COMPACTION_COOLDOWN_TURNS, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, } from "./constants.js";
 // Token budget algebra
 export { computeTokenBudget } from "./token-budget.js";
 // Context engine factory

package/node_modules/@comis/agent/dist/context-engine/llm-compaction.js

@@ -25,7 +25,7 @@
  * @module
  */
 import { generateSummary } from "@mariozechner/pi-coding-agent";
-import { COMPACTION_TRIGGER_PERCENT, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, CHARS_PER_TOKEN_RATIO, MIN_MIDDLE_MESSAGES_FOR_COMPACTION, } from "./constants.js";
+import { COMPACTION_TRIGGER_PERCENT, COMPACTION_MAX_RETRIES, OVERSIZED_MESSAGE_CHARS_THRESHOLD, COMPACTION_REQUIRED_SECTIONS, CHARS_PER_TOKEN_RATIO, MIN_MIDDLE_MESSAGES_FOR_COMPACTION, CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD, } from "./constants.js";
 import { estimateContextCharsWithDualRatio, estimateMessageChars, estimateWithAnchor, } from "../safety/token-estimator.js";
 // ---------------------------------------------------------------------------
 // Structured output instructions
@@ -258,27 +258,41 @@ export function createLlmCompactionLayer(config, deps) {
                 if (turnsSinceLastCompaction < config.compactionCooldownTurns) {
                     return messages;
                 }
-                // Step 3: Threshold check
-                // Use anchor-based estimation when available for accurate threshold check
-                /* eslint-disable @typescript-eslint/no-explicit-any */
-                const contextChars = estimateContextCharsWithDualRatio(messages);
-                /* eslint-enable @typescript-eslint/no-explicit-any */
-                const charBasedTokens = Math.ceil(contextChars / CHARS_PER_TOKEN_RATIO);
-                const anchor = deps.getTokenAnchor?.() ?? null;
-                const contextTokens = estimateWithAnchor(anchor, messages, charBasedTokens);
-                const thresholdTokens = Math.floor(budget.windowTokens * COMPACTION_TRIGGER_PERCENT / 100);
-                if (contextTokens <= thresholdTokens) {
-                    return messages;
+                // Step 2b: Cache-aware block count trigger.
+                // Fires BEFORE the token-based threshold because lookback overflow
+                // causes cache breaks regardless of how few tokens the messages contain.
+                const messageCount = messages.length;
+                const blockThreshold = CACHE_AWARE_COMPACTION_BLOCK_THRESHOLD;
+                const blockCountExceeded = messageCount > blockThreshold;
+                // Step 3: Token threshold check (only when block-count trigger didn't fire)
+                let contextTokens;
+                let thresholdTokens;
+                if (!blockCountExceeded) {
+                    /* eslint-disable @typescript-eslint/no-explicit-any */
+                    const contextChars = estimateContextCharsWithDualRatio(messages);
+                    /* eslint-enable @typescript-eslint/no-explicit-any */
+                    const charBasedTokens = Math.ceil(contextChars / CHARS_PER_TOKEN_RATIO);
+                    const anchor = deps.getTokenAnchor?.() ?? null;
+                    contextTokens = estimateWithAnchor(anchor, messages, charBasedTokens);
+                    thresholdTokens = Math.floor(budget.windowTokens * COMPACTION_TRIGGER_PERCENT / 100);
+                    if (contextTokens <= thresholdTokens) {
+                        return messages;
+                    }
                 }
-                // Step 4: Pipeline order guarantees observation masker ran before this layer
+                // Step 4: Unified log (conditional spread keeps JSON shape clean).
                 deps.logger.warn({
-                    contextTokens,
-                    thresholdTokens,
+                    messageCount,
+                    ...(blockCountExceeded
+                        ? { blockThreshold, trigger: "block_count" }
+                        : { contextTokens, thresholdTokens, trigger: "token_threshold" }),
                     windowTokens: budget.windowTokens,
-                    messageCount: messages.length,
                     errorKind: "resource",
-                    hint: "Context approaching capacity; LLM compaction will summarize older messages to free space",
-                }, "LLM compaction triggered: context exceeds 85% threshold");
+                    hint: blockCountExceeded
+                        ? "Message count approaching breakpoint lookback limit; compacting to prevent cache fragmentation"
+                        : "Context approaching capacity; LLM compaction will summarize older messages to free space",
+                }, blockCountExceeded
+                    ? "LLM compaction triggered: message count exceeds cache lookback threshold"
+                    : "LLM compaction triggered: context exceeds 85% threshold");
                 // Step 5: Resolve model
                 /* eslint-disable @typescript-eslint/no-explicit-any */
                 let model;

package/node_modules/@comis/agent/dist/executor/cache-break-diff-writer.d.ts

@@ -60,6 +60,8 @@ export interface CacheBreakDiffPayload {
         message: number;
         sdkAuto: number;
     };
+    /** Model ID for per-model cost attribution. Populated by pi-event-bridge.ts. */
+    model?: string;
 }
 export interface CacheBreakDiffWriterConfig {
     /** Directory for diff files (e.g., ~/.comis/cache-breaks) */

package/node_modules/@comis/agent/dist/executor/cache-break-diff-writer.js

@@ -12,6 +12,7 @@
 import { writeFileSync, mkdirSync, readdirSync, unlinkSync } from "node:fs";
 import { createPatch } from "diff";
 import { safePath } from "@comis/core";
+import { resolveModelPricing, ZERO_COST } from "../model/model-catalog.js";
 const MAX_DIFF_FILES = 50;
 /** DIFF-CONTENT: Maximum chars per category (system, tools) for snapshot content before diffing. */
 const MAX_SNAPSHOT_CHARS = 50_000;
@@ -40,6 +41,7 @@ export function buildDiffableContent(system, tools, model) {
  */
 export function createCacheBreakDiffWriter(config) {
     let dirEnsured = false;
+    const unknownModelWarnLatch = new Set();
     return (event) => {
         try {
             if (!dirEnsured) {
@@ -50,6 +52,24 @@ export function createCacheBreakDiffWriter(config) {
             const ts = new Date(event.timestamp).toISOString().replace(/[:.]/g, "-");
             const filename = `${ts}_${event.agentId}_${event.reason}.json`;
             const filePath = safePath(config.outputDir, filename);
+            // Cost attribution: compute estimated USD impact using per-model pricing.
+            const modelId = event.model ?? "";
+            const pricing = resolveModelPricing(event.provider, modelId);
+            const pricingKnown = pricing !== ZERO_COST && pricing.input > 0;
+            const retentionDisabled = event.ttlCategory === "none";
+            const writeRatePerToken = event.ttlCategory === "long" ? pricing.cacheWrite1h : pricing.cacheWrite;
+            const readRatePerToken = pricing.cacheRead;
+            const perTokenDelta = Math.max(0, writeRatePerToken - readRatePerToken);
+            const estimatedCostUsd = retentionDisabled
+                ? 0
+                : (pricingKnown ? event.tokenDrop * perTokenDelta : null);
+            if (!pricingKnown && !retentionDisabled && modelId) {
+                const latchKey = `${event.provider}:${modelId}`;
+                if (!unknownModelWarnLatch.has(latchKey)) {
+                    unknownModelWarnLatch.add(latchKey);
+                    config.logger.warn({ provider: event.provider, model: modelId, hint: "Cache break cost attribution unavailable for this model", errorKind: "config" }, "Unknown model pricing for cache break cost attribution");
+                }
+            }
             const diff = {
                 timestamp: new Date(event.timestamp).toISOString(),
                 agentId: event.agentId,
@@ -85,6 +105,22 @@ export function createCacheBreakDiffWriter(config) {
                 effortValue: event.effortValue,
                 // Breakpoint budget context
                 ...(event.breakpointBudget && { breakpointBudget: event.breakpointBudget }),
+                // Cost attribution
+                estimatedCostUsd: estimatedCostUsd === null
+                    ? null
+                    : Math.round(estimatedCostUsd * 100_000) / 100_000,
+                costBreakdown: {
+                    writeRatePerMTok: pricingKnown
+                        ? Math.round(writeRatePerToken * 1_000_000 * 100) / 100
+                        : null,
+                    readRatePerMTok: pricingKnown
+                        ? Math.round(readRatePerToken * 1_000_000 * 100) / 100
+                        : null,
+                    tokenDrop: event.tokenDrop,
+                    model: event.model ?? null,
+                    ttlCategory: event.ttlCategory,
+                    pricingKnown,
+                },
             };
             writeFileSync(filePath, JSON.stringify(diff, null, 2) + "\n");
             // DIFF-CONTENT: Generate unified diff file alongside JSON

package/node_modules/@comis/agent/dist/executor/executor-post-execution.d.ts

@@ -140,6 +140,18 @@ export interface PostExecutionParams {
  * @returns true if the turn qualifies for memory storage
  */
 export declare function shouldStorePairedMemory(userText: string, agentResponse: string): boolean;
+/**
+ * Check whether paired memory content was stored recently for this agent.
+ *
+ * Exact-content hashing (not semantic similarity) -- targets the cron pattern
+ * of identical prompt + identical NO_REPLY response. Lazy eviction keeps the
+ * cache bounded without a timer.
+ *
+ * Exported for unit tests.
+ */
+export declare function isDuplicatePairedMemory(content: string, agentId: string): boolean;
+/** Reset the paired-memory dedup cache. Exported for unit tests. */
+export declare function resetPairedMemoryDedupForTests(): void;
 /**
  * Run post-execution cleanup for a PiExecutor turn.
  *