@chengchenccc/oh-my-agent 0.2.0-rc.2 → 0.2.0-rc.3

package/dist/core/runtime/agent-loop-runner.js

@@ -1,11 +1,12 @@
+import { debugLog } from "@chengchenccc/agent-contract";
 import { ProviderError } from "@chengchenccc/ai";
 import { buildTextAssistantEntry, buildThinkingBlock, buildToolBatch, } from "./agent-loop-messages.js";
 import { executeTools, readBranchMessages, streamModelTurn, } from "./agent-loop-run.js";
-import { compactSession } from "./compaction.js";
+import { compactSession, latestCompaction } from "./compaction.js";
 import { estimateContextTokens, isSilentContextOverflow, usageTotalTokens, } from "./context-estimate.js";
 import { buildLoopInput } from "./loop-input.js";
 import { renderLoopMeta } from "./prompt.js";
-import { buildTitleContext, generateTitle } from "./title.js";
+import { buildTitleContext, generateTitleAndSummary } from "./title.js";
 import { pruneOldToolResults } from "./tool-pruning.js";
 /** Start the loop: bind runtime, resolve tools, persist the prompt, and
  *  return the system prompt + first branch messages. */
@@ -118,6 +119,7 @@ async function finalizeLoop(ctx, stepState, step, runError) {
         }
     }
     let title;
+    let summary;
     // Auto-title retries on EVERY completed turn while the conversation is
     // still untitled (OMA_CONV_TITLED=1 marks it titled — the backend sets
     // it at spawn and re-checks on commit). The first turn may be low
@@ -129,7 +131,9 @@ async function finalizeLoop(ctx, stepState, step, runError) {
         const titleBranch = await readBranchMessages(opts.store, opts.sessionId);
         const titleCtx = buildTitleContext(titleBranch);
         if (titleCtx) {
-            title = (await generateTitle(mutable.rt, titleCtx)) ?? undefined;
+            const generated = await generateTitleAndSummary(mutable.rt, titleCtx);
+            title = generated.title ?? undefined;
+            summary = generated.summary ?? undefined;
         }
     }
     await emit({ type: "agent_end", status: finalStatus });
@@ -147,12 +151,63 @@ async function finalizeLoop(ctx, stepState, step, runError) {
         usage: state.runUsage,
         error: runError,
         title,
+        summary,
     };
 }
 /** Run one model-turn retry loop (prune/compact/stream/handle). Returns
  *  "break" when the turn completed, or a terminal result. */
-export async function runModelTurnLoop(ctx, stepState) {
+async function runModelTurnLoop(ctx, stepState) {
     const { opts, emit, persist, state, callCtx, tokenEstimateCache, mutable } = ctx;
+    /** One proactive compaction recovery, shared by the threshold trigger and the
+     *  two overflow triggers (silent + provider error).
+     *
+     *  It compacts down to the TRIGGER (`limit * triggerRatio`), not to `limit`.
+     *  Sizing the retained tail to `limit` while the trigger sits at
+     *  `limit * triggerRatio` left a freshly compacted branch over the threshold
+     *  by construction, so the next iteration compacted again — summarizing
+     *  entries the previous compaction had just retained. Targeting the trigger
+     *  brings the estimate under it, which is what quiets the gate.
+     *
+     *  There is deliberately NO "already compacted" flag. One was tried and had
+     *  to be re-armed from state that the loop cannot observe (the check right
+     *  after a recovery already sees the new turn's growth), so it silently
+     *  disabled proactive compaction for the rest of the Run. The no-progress
+     *  case is handled where the decision belongs: compactSession returns an
+     *  empty result when a cut would cover nothing new, so triggering on the
+     *  budget alone can neither loop nor summarize twice for nothing. */
+    const runCompactionRecovery = async () => {
+        stepState.usageAnchor = null;
+        tokenEstimateCache.clear();
+        await emit({ type: "compaction_start" });
+        const contextBudget = opts.contextBudget;
+        try {
+            const result = await compactSession(opts.store, opts.sessionId, opts.summarize, mutable.controller?.signal, {
+                estimate: contextBudget.estimate,
+                // Down to the proactive trigger, so the loop settles instead of
+                // compacting again next iteration — but never above the WINDOW: a
+                // deployment can configure a trigger above it (tests do, to isolate an
+                // overflow), and an overflow recovery must still compact then.
+                limit: contextBudget.limit * Math.min(1, contextBudget.triggerRatio),
+            });
+            if (result.coveredIds.length > 0) {
+                stepState.messages = await readBranchMessages(opts.store, opts.sessionId);
+            }
+        }
+        catch (err) {
+            // Compaction is a best-effort optimization, never a run verdict: a
+            // failed summarizer call (transient network, provider hiccup) used to
+            // propagate to runLoop's outer catch and terminalize an otherwise
+            // healthy run as "failed". Log it and let the model call proceed — if
+            // the context really is over the window, the provider-overflow path
+            // retries once and then terminalizes with its own one-shot guard.
+            debugLog("oma", `compaction failed (run continues): ${err instanceof Error ? err.message : String(err)}`);
+        }
+        finally {
+            // Always settle the UI state: compaction_start pushed a status item
+            // that only compaction_end retires.
+            await emit({ type: "compaction_end" });
+        }
+    };
     // One step = at most one model call. Overflow recovery stays INSIDE
     while (true) {
         // Prune old tool-result content: a lighter
@@ -172,20 +227,30 @@ export async function runModelTurnLoop(ctx, stepState) {
         let callBoundaryId = null;
         if (opts.contextBudget) {
             const branch = await opts.store.readBranch(opts.sessionId);
-            const msgEntries = branch.filter((e) => e.type === "message");
+            // Only LIVE entries: after a compaction the covered prefix is no longer
+            // sent, but the branch still holds it. Counting it (the pre-fix behavior)
+            // kept the estimate above the threshold right after a compaction, so the
+            // very next iteration fired a SECOND compaction that re-summarized
+            // already-covered entries and cut further into the retained tail.
+            const compaction = latestCompaction(branch);
+            const coveredIds = compaction?.coveredIds ?? null;
+            const msgEntries = branch.filter((e) => e.type === "message" && !(coveredIds?.has(e.entryId) ?? false));
+            // The summary replaces the covered prefix on the wire, so it costs
+            // tokens too (it is a CompactionEntry, not a MessageEntry) — but only
+            // while there is no anchor: an anchor's token count comes from a call
+            // whose prompt already contained this summary.
+            const summaryTokens = compaction && !stepState.usageAnchor
+                ? opts.contextBudget.estimate({ role: "user", text: compaction.summary })
+                : 0;
             callBoundaryId = msgEntries.at(-1)?.entryId ?? null;
-            if (!stepState.thresholdCompacted) {
-                const totalTokens = estimateContextTokens(msgEntries, stepState.usageAnchor, (e) => tokenEstimateCache.estimate(e.entryId, e.message, opts.contextBudget.estimate));
-                const overThreshold = totalTokens > opts.contextBudget.limit * opts.contextBudget.triggerRatio;
-                if (overThreshold) {
-                    stepState.thresholdCompacted = true;
-                    stepState.usageAnchor = null;
-                    tokenEstimateCache.clear();
-                    await emit({ type: "compaction_start" });
-                    await compactSession(opts.store, opts.sessionId, opts.summarize, mutable.controller?.signal, opts.contextBudget);
-                    await emit({ type: "compaction_end" });
-                    stepState.messages = await readBranchMessages(opts.store, opts.sessionId);
-                }
+            const totalTokens = estimateContextTokens(msgEntries, stepState.usageAnchor, (e) => tokenEstimateCache.estimate(e.entryId, e.message, opts.contextBudget.estimate)) + summaryTokens;
+            const overThreshold = totalTokens > opts.contextBudget.limit * opts.contextBudget.triggerRatio;
+            if (overThreshold) {
+                // Fires whenever the live context exceeds the trigger. Re-firing is
+                // safe because compactSession no-ops when nothing new can be covered,
+                // so a context that cannot shrink does not buy a summarizer call per
+                // iteration — and a Run that keeps growing keeps compacting.
+                await runCompactionRecovery();
             }
         }
         // beforeModel hook.
@@ -222,12 +287,7 @@ export async function runModelTurnLoop(ctx, stepState) {
                 isSilentContextOverflow(turn.usage, turn.stopReason, opts.contextBudget.limit);
             if (silentOverflow) {
                 stepState.overflowCompacted = true;
-                stepState.usageAnchor = null;
-                tokenEstimateCache.clear();
-                await emit({ type: "compaction_start" });
-                await compactSession(opts.store, opts.sessionId, opts.summarize, mutable.controller?.signal, opts.contextBudget);
-                await emit({ type: "compaction_end" });
-                stepState.messages = await readBranchMessages(opts.store, opts.sessionId);
+                await runCompactionRecovery();
                 continue;
             }
             // TTSR stream-rule hit: discard the partial turn (nothing was
@@ -368,12 +428,7 @@ export async function runModelTurnLoop(ctx, stepState) {
             // Overflow: one-shot compaction recovery inside the same turn.
             if (err instanceof ProviderError && err.kind === "overflow" && !stepState.overflowCompacted) {
                 stepState.overflowCompacted = true;
-                stepState.usageAnchor = null;
-                tokenEstimateCache.clear();
-                await emit({ type: "compaction_start" });
-                await compactSession(opts.store, opts.sessionId, opts.summarize, mutable.controller?.signal, opts.contextBudget);
-                await emit({ type: "compaction_end" });
-                stepState.messages = await readBranchMessages(opts.store, opts.sessionId);
+                await runCompactionRecovery();
                 continue; // retry model call in the SAME turn, no extra step
             }
             // Anything else is terminal: retryStream already applied its
@@ -408,7 +463,6 @@ export async function runLoop(ctx, codingInput, mode) {
             messages: initialMessages,
             forceContinues: 0,
             overflowCompacted: false,
-            thresholdCompacted: false,
             usageAnchor: null,
             naturalStop: false,
             runError: undefined,

package/dist/core/runtime/agent-loop-types.d.ts

@@ -127,6 +127,10 @@ export interface OmaLoopResult {
     readonly error?: string;
     /** Auto-generated conversation title (first Run only; backend guards). */
     readonly title?: string;
+    /** One-sentence session summary from the same call as the title. The CLI
+     *  persists it as the session's `summary` event, which the resume list
+     *  shows next to the title; products (backend) ignore it. */
+    readonly summary?: string;
 }
 export interface OmaSession {
     readonly sessionId: string;

package/dist/core/runtime/agent-loop-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-loop-types.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/agent-loop-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-loop-types.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/agent-loop-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,iBAAiB,EACjB,mBAAmB,EACnB,KAAK,EACN,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,0EAA0E;AAC1E,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAChC;AAED;;;0CAG0C;AAC1C,MAAM,MAAM,iBAAiB,GAAG,CAC9B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,CAAC,EAAE,WAAW,KACjB,OAAO,CAAC,MAAM,CAAC,CAAC;AAErB;;;qDAGqD;AACrD,MAAM,WAAW,aAAc,SAAQ,gBAAgB;IACrD,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,mCAAmC;IACnC,QAAQ,CAAC,WAAW,EAAE,CACpB,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,CAAC,EAAE,WAAW;IACpB,oEAAoE;IACpE,KAAK,CAAC,EAAE,SAAS,UAAU,EAAE,KAC1B,aAAa,CAAC,cAAc,CAAC,CAAC;IACnC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;IACtC;;8CAE0C;IAC1C,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;IAC3C,yEAAyE;IACzE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,KAAK,EAAE,gBAAgB,KAAK,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAC;IACrF;;;;;;wCAMoC;IACpC,QAAQ,CAAC,cAAc,CAAC,EAAE,CACxB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,KACX,OAAO,CAAC;QAAE,KAAK,EAAE,OAAO,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,SAAS,CAAC,CAAC;IAC9D;wFACoF;IACpF,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACvF;;6EAEyE;IACzE,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,eAAe,KAAK,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC;IACnF;;qEAEiE;IACjE,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;;qDAEiD;IACjD,QAAQ,CAAC,aAAa,CAAC,EAAE,aAAa,CAAC;IACvC;;sEAEkE;IAClE,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;IAChC;iFAC6E;IAC7E,QAAQ,CAAC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IACtC;;;kDAG8C;IAC9C,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5C;;;;;gFAK4E;IAC5E,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAC7C;;sCAEkC;IAClC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC;IACvC;;;yEAGqE;IACrE,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,KAAK,IAAI,CAAC;CACrE;AAED;;iEAEiE;AACjE,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,kEAAkE;IAClE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,kDAAkD;IAClD,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;CACjC;AAED;;;;wEAIwE;AACxE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAC;IACvC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;IACvB,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,0EAA0E;IAC1E,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB;;iEAE6D;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IACzE,SAAS,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1D,aAAa,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAC9D;oEACgE;IAChE,KAAK,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI,CAAC;IACxC,IAAI,IAAI,IAAI,CAAC;IACb,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACzB,OAAO,CAAC,QAAQ,EAAE,iBAAiB,GAAG,MAAM,IAAI,CAAC;IACjD,wEAAwE;IACxE,IAAI,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,CAAC;CACjC;AAED;8BAC8B;AAC9B;;4EAE4E;AAC5E,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5F,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,SAAS,SAAS,EAAE,CAAC;IACvC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B;sEACkE;IAClE,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAC3B;6DACyD;IACzD,QAAQ,CAAC,aAAa,CAAC,EAAE,UAAU,CAAC;CACrC"}

package/dist/core/runtime/compaction.d.ts

@@ -1,5 +1,6 @@
 import type { Message } from "@chengchenccc/message";
 import type { SessionStore } from "../store/session-store.js";
+import type { CodingSessionEntry } from "../store/session-tree.js";
 export interface CompactionResult {
     readonly entryId: string;
     readonly coveredIds: readonly string[];
@@ -10,6 +11,14 @@ export interface CompactionBudget {
     estimate(message: Message): number;
     limit: number;
 }
+/** The latest compaction in a branch, if any: its summary and the entry ids it
+ *  covered. Single source for "which entries are still live" — the branch
+ *  rebuild (agent-loop-run) and the threshold estimator (agent-loop-runner)
+ *  must agree, or the estimator counts entries the model no longer receives. */
+export declare function latestCompaction(entries: readonly CodingSessionEntry[]): {
+    summary: string;
+    coveredIds: ReadonlySet<string>;
+} | null;
 /** Compact a session branch: summarize oldest entries, append CompactionEntry,
  *  leave tail entries intact. Shared by threshold/manual/overflow triggers.
  *

package/dist/core/runtime/compaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAG9D,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED;0EAC0E;AAC1E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AA6DD;;;;;;;6EAO6E;AAC7E,wBAAsB,cAAc,CAClC,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,EACnF,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAsC3B"}
+{"version":3,"file":"compaction.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/compaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAEnE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED;0EAC0E;AAC1E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC;IACnC,KAAK,EAAE,MAAM,CAAC;CACf;AAkCD;;;gFAGgF;AAChF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,SAAS,kBAAkB,EAAE,GAAG;IACxE,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACjC,GAAG,IAAI,CAQP;AAkCD;;;;;;;6EAO6E;AAC7E,wBAAsB,cAAc,CAClC,KAAK,EAAE,YAAY,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,MAAM,CAAC,EACnF,MAAM,CAAC,EAAE,WAAW,EACpB,MAAM,CAAC,EAAE,gBAAgB,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAiD3B"}

package/dist/core/runtime/compaction.js

@@ -24,6 +24,19 @@ function adjustCutForToolPairs(messages, cutIdx) {
     }
     return cut;
 }
+/** The latest compaction in a branch, if any: its summary and the entry ids it
+ *  covered. Single source for "which entries are still live" — the branch
+ *  rebuild (agent-loop-run) and the threshold estimator (agent-loop-runner)
+ *  must agree, or the estimator counts entries the model no longer receives. */
+export function latestCompaction(entries) {
+    for (let i = entries.length - 1; i >= 0; i--) {
+        const e = entries[i];
+        if (e?.type === "compaction") {
+            return { summary: e.summary, coveredIds: new Set(e.coversEntryIds) };
+        }
+    }
+    return null;
+}
 /** Compute the compaction cut point. Always returns a value: without a budget
  *  it uses a message-count heuristic; with a budget it accumulates tokens from
  *  the oldest messages until the retained tail fits under the limit. When the
@@ -43,6 +56,11 @@ function findCut(messages, budget) {
         remaining -= tokens[cutIdx];
         cutIdx++;
     }
+    // Never cover the newest message. The summary is prepended to whatever
+    // survives, so a cut that covers everything leaves the model with an empty
+    // conversation — not even the summary. One oversized entry (a huge
+    // tool_result is enough) drives cutIdx to messages.length without this.
+    cutIdx = Math.min(cutIdx, messages.length - 1);
     return { cutIdx, tokensBefore };
 }
 /** Compact a session branch: summarize oldest entries, append CompactionEntry,
@@ -68,6 +86,16 @@ export async function compactSession(store, sessionId, summarizer, signal, budge
     const coveredIds = coveredEntries.map((m) => m.entryId);
     const retainedIds = messages.slice(cutIdx).map((m) => m.entryId);
     const coveredMessages = coveredEntries.map((m) => m.message);
+    const alreadyCovered = latestCompaction(branch)?.coveredIds;
+    if (alreadyCovered && coveredIds.every((id) => alreadyCovered.has(id))) {
+        return { entryId: "", coveredIds: [] };
+    }
+    // The no-progress guard: a cut that covers nothing new (everything it would
+    // cover is already covered by an earlier compaction) buys nothing and would
+    // append an identical CompactionEntry on every loop iteration. This is what
+    // lets the loop trigger compaction purely on the budget — there is no
+    // "already compacted" flag to get stuck in, because compaction itself is the
+    // thing that decides whether it can still do useful work.
     const summary = await summarizer(coveredMessages, signal);
     // If aborted during summarization, do not write a CompactionEntry.
     if (signal?.aborted)

package/dist/core/runtime/context-estimate.d.ts

@@ -1,6 +1,37 @@
-/** Context-token estimation helpers absorbed from oh-my-pi
- * (packages/agent/src/harness/compaction/compaction.ts):
- * usage-anchored estimation + silent-overflow detection. */
+import type { Message } from "@chengchenccc/message";
+/** Token estimate of ONE text run, CJK-aware.
+ *
+ *  chars/4 is the English/code proxy (≈4 chars/token). For CJK it
+ *  UNDER-counts 2-4× (Chinese ≈ 1-1.5 chars/token — deepseek's own docs put
+ *  it at ~1.5), and under-counting is the dangerous direction for a compaction
+ *  trigger: the estimate says "under budget" while the provider is already
+ *  overflowing, so the recovery's own cut math no-ops and the retry 400s again
+ *  (one-shot guard) — a terminally wedged run. CJK is therefore weighted at
+ *  1.5 chars/token. The usage anchor remains the real corrector while a run
+ *  streams; this only needs to be right-side-of-the-line after a resume. */
+export declare function estimateTextTokens(text: string): number;
+/** Approximate token cost of ONE message as it will be SENT to the provider.
+ *
+ *  The single estimator for both the compaction budget and tool-result pruning:
+ *  two divergent copies meant the trigger and the pruning window measured
+ *  different quantities (one counted `text` AND `blocks`, which for a tool
+ *  message is the same payload twice), so pruning's "saved tokens" were not
+ *  comparable to the budget they were subtracted from.
+ *
+ *  What is counted mirrors the wire mapping in
+ *  packages/ai/src/providers/anthropic-messages.ts:
+ *  - a `tool` message sends ONLY its tool_result blocks (`text` is the UI's
+ *    clean copy), so counting `text` as well would double it;
+ *  - every other role sends `text` as a trailing text block unless a text block
+ *    already carries it;
+ *  - image payloads are ignored: providers price an image by its PIXEL
+ *    dimensions (~width*height/750 tokens), not by the base64 length, so
+ *    char/4 over the encoded bytes would over-count it by a size-dependent
+ *    factor and compact far too early.
+ *
+ *  Swap for a real tokenizer by replacing estimateTextTokens —
+ *  `ContextBudget.estimate` stays the extension point. */
+export declare function estimateMessageTokens(message: Message): number;
 /** Per-turn usage quartet (concrete, unlike the all-optional run Usage). */
 export interface TurnUsage {
     readonly inputTokens: number;
@@ -12,7 +43,9 @@ export interface TurnUsage {
  * (input + output + cache legs) and is authoritative for every entry
  * persisted before `afterEntryId`; only entries AFTER it fall back to
  * per-message estimation (chars/4). Falls back wholesale when the anchor
- * entry no longer exists (post-compaction branch, resumed runs).
+ * entry itself no longer exists — the loop clears the anchor when it
+ * compacts and re-anchors on the next call, so today that is reachable only
+ * for an out-of-band compaction of the same branch.
  *
  * ponytail: the anchor is in-memory per Run — pi persists usage on
  * assistant messages and re-anchors after resume. Persist it onto the

package/dist/core/runtime/context-estimate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-estimate.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/context-estimate.ts"],"names":[],"mappings":"AAAA;;4DAE4D;AAE5D,4EAA4E;AAC5E,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;;;sDAQsD;AACtD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED;;;0CAG0C;AAC1C,wBAAgB,qBAAqB,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EACjE,OAAO,EAAE,SAAS,CAAC,EAAE,EACrB,MAAM,EAAE,WAAW,GAAG,IAAI,EAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,GAClC,MAAM,CAOR;AAED;;;;wDAIwD;AACxD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EAC5F,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,YAAY,EAAE,MAAM,GACnB,OAAO,CAQT"}
+{"version":3,"file":"context-estimate.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/context-estimate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAgBrD;;;;;;;;;4EAS4E;AAC5E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAGvD;AAED;;;;;;;;;;;;;;;;;;;;0DAoB0D;AAC1D,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAuB9D;AAED,4EAA4E;AAC5E,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;CACnC;AAED;;;;;;;;;;sDAUsD;AACtD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,CAEzD;AAED;;;0CAG0C;AAC1C,wBAAgB,qBAAqB,CAAC,CAAC,SAAS;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE,EACjE,OAAO,EAAE,SAAS,CAAC,EAAE,EACrB,MAAM,EAAE,WAAW,GAAG,IAAI,EAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,MAAM,GAClC,MAAM,CAOR;AAED;;;;wDAIwD;AACxD,wBAAgB,uBAAuB,CACrC,KAAK,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,EAC5F,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,YAAY,EAAE,MAAM,GACnB,OAAO,CAQT"}

package/dist/core/runtime/context-estimate.js

@@ -1,6 +1,76 @@
 /** Context-token estimation helpers absorbed from oh-my-pi
  * (packages/agent/src/harness/compaction/compaction.ts):
  * usage-anchored estimation + silent-overflow detection. */
+/** Per-message framing overhead (role tag, separators — matches Anthropic's
+ *  documented ~4 tokens/message). */
+const MESSAGE_FRAMING_TOKENS = 4;
+/** CJK code points (BMP): unified + ext-A + compat ideographs, kana, hangul,
+ *  CJK punctuation and fullwidth forms. Astral-plane ideographs (ext B+) are
+ *  rare in chat and count via their 2 UTF-16 units — the wrong direction is
+ *  under-counting, and 2 units of "other" at /4 is still a lower bound. */
+const CJK_RE = /[\u3000-\u30ff\u3400-\u4dbf\u4e00-\u9fff\uf900-\ufaff\uac00-\ud7af\uff00-\uffef]/g;
+/** Token estimate of ONE text run, CJK-aware.
+ *
+ *  chars/4 is the English/code proxy (≈4 chars/token). For CJK it
+ *  UNDER-counts 2-4× (Chinese ≈ 1-1.5 chars/token — deepseek's own docs put
+ *  it at ~1.5), and under-counting is the dangerous direction for a compaction
+ *  trigger: the estimate says "under budget" while the provider is already
+ *  overflowing, so the recovery's own cut math no-ops and the retry 400s again
+ *  (one-shot guard) — a terminally wedged run. CJK is therefore weighted at
+ *  1.5 chars/token. The usage anchor remains the real corrector while a run
+ *  streams; this only needs to be right-side-of-the-line after a resume. */
+export function estimateTextTokens(text) {
+    const cjk = (text.match(CJK_RE) ?? []).length;
+    return (cjk * 2) / 3 + (text.length - cjk) / 4;
+}
+/** Approximate token cost of ONE message as it will be SENT to the provider.
+ *
+ *  The single estimator for both the compaction budget and tool-result pruning:
+ *  two divergent copies meant the trigger and the pruning window measured
+ *  different quantities (one counted `text` AND `blocks`, which for a tool
+ *  message is the same payload twice), so pruning's "saved tokens" were not
+ *  comparable to the budget they were subtracted from.
+ *
+ *  What is counted mirrors the wire mapping in
+ *  packages/ai/src/providers/anthropic-messages.ts:
+ *  - a `tool` message sends ONLY its tool_result blocks (`text` is the UI's
+ *    clean copy), so counting `text` as well would double it;
+ *  - every other role sends `text` as a trailing text block unless a text block
+ *    already carries it;
+ *  - image payloads are ignored: providers price an image by its PIXEL
+ *    dimensions (~width*height/750 tokens), not by the base64 length, so
+ *    char/4 over the encoded bytes would over-count it by a size-dependent
+ *    factor and compact far too early.
+ *
+ *  Swap for a real tokenizer by replacing estimateTextTokens —
+ *  `ContextBudget.estimate` stays the extension point. */
+export function estimateMessageTokens(message) {
+    const blocks = message.blocks ?? [];
+    if (blocks.length === 0) {
+        return Math.ceil(estimateTextTokens(message.text ?? "")) + MESSAGE_FRAMING_TOKENS;
+    }
+    let tokens = 0;
+    let carriesText = false;
+    for (const b of blocks) {
+        if (b.type === "text") {
+            tokens += estimateTextTokens(b.text);
+            carriesText = true;
+        }
+        else if (b.type === "thinking") {
+            tokens += estimateTextTokens(b.text + (b.signature ?? ""));
+        }
+        else if (b.type === "tool_use") {
+            tokens += estimateTextTokens(JSON.stringify(b.input));
+        }
+        else if (b.type === "tool_result") {
+            tokens += estimateTextTokens(b.content);
+        }
+    }
+    if (message.role !== "tool" && !carriesText && message.text) {
+        tokens += estimateTextTokens(message.text);
+    }
+    return Math.ceil(tokens) + MESSAGE_FRAMING_TOKENS;
+}
 export function usageTotalTokens(usage) {
     return usage.inputTokens + usage.outputTokens + usage.cacheReadTokens + usage.cacheWriteTokens;
 }

package/dist/core/runtime/create-runtime.d.ts

@@ -58,14 +58,21 @@ export interface CreateOmaRuntimeOptions {
      *  inherits another session's list. Absent = the legacy workspace-global
      *  todo.json (product shape). */
     todoScope?: string;
+    /** Plan mode: while set, write/edit accept exactly this one path (the plan
+     *  document). The mode layer decides WHEN it applies; the runtime only
+     *  enforces the path rule. */
+    planMode?: {
+        planPath: string;
+    };
     /** Assembled plugin code components (from assemblePluginRuntime, mode
      *  layer). The runtime mounts them; it never reads the registry. */
     pluginComponents?: {
         plugins: readonly Plugin[];
         mcpServers?: readonly PluginMcpConfig[];
     };
-    /** Frozen Run permissionMode; "deny" drops plugin code components. */
-    permissionMode?: "ask" | "auto" | "deny";
+    /** Frozen Run permissionMode; "deny" drops plugin code components.
+     *  "yolo" = ungated at the gate + OS bash sandbox forced when available. */
+    permissionMode?: "ask" | "auto" | "deny" | "yolo";
     /** Standalone modes: gate the repo-controlled workspace .mcp.json behind
      *  the trust record (spec follow-up #3). */
     gateWorkspaceMcp?: boolean;
@@ -82,12 +89,25 @@ export interface CreateOmaRuntimeOptions {
      *  survive follow-up Runs. */
     registry?: CoordinationRegistry;
     /** M-bash: interactive pty console runner (TUI overlay). */
-    bashPtyConsole?: (command: string, cwd: string, env: Record<string, string>) => Promise<{
+    bashPtyConsole?: (command: string, cwd: string, env: Record<string, string>, signal?: AbortSignal) => Promise<{
         exitCode: number | null;
         tail: string;
         killed: boolean;
     }>;
 }
+/** One compaction produced by a Run.
+ *
+ *  `replacesEarlierMessages` is true only when the summary describes EVERY
+ *  message live in the run's branch — the one condition under which a durable
+ *  transcript can fold it losslessly. It is deliberately not a count: coverage
+ *  is measured over the branch, while the session file indexes its own message
+ *  events, and the two spaces differ (branch-only entries such as
+ *  `product_history`/`meta` never reach the file). A count in the wrong space
+ *  silently drops messages; a flag cannot. */
+export interface CompactionSummary {
+    readonly summary: string;
+    readonly replacesEarlierMessages: boolean;
+}
 export interface OmaRuntime {
     /** Start the Run's loop. Returns the segment whose outcome is the Run's
      *  ONLY terminal result. A Runtime accepts exactly one run(). */
@@ -99,8 +119,10 @@ export interface OmaRuntime {
     stop(): Promise<void>;
     /** Close MCP clients and the in-memory Store. Call after the run settles. */
     close(): Promise<void>;
-    /** Compaction summaries from this run's loop; read before close(). */
-    compactions(): Promise<string[]>;
+    /** Compaction summaries from this run's loop; read before close(). Each
+     *  carries whether it describes the whole branch, which is what the durable
+     *  session file needs to fold safely (see loadSessionMessages). */
+    compactions(): Promise<readonly CompactionSummary[]>;
     /** Estimated context footprint of the run's branch under the run model's
      *  window — the same estimate/limit pair the compactor decides on. Read
      *  before close(). */

package/dist/core/runtime/create-runtime.d.ts.map

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

package/dist/core/runtime/create-runtime.js

@@ -1,6 +1,7 @@
 import { mapRunEvent } from "../../protocol/index.js";
 import { extractAutonomousMemory } from "../memory/autonomous-memory.js";
 import { getVectorMemory } from "../memory/vector-memory.js";
+import { latestCompaction } from "./compaction.js";
 import { assembleRunRuntime } from "./run-runtime.js";
 /** One Runtime = one Run. The loop runs directly in-process; steer injects
  *  into the live loop; stop aborts it; close tears down MCP clients and the
@@ -40,6 +41,7 @@ function mapLoopResult(result) {
             status: "completed",
             ...(result.usage ? { usage: result.usage } : {}),
             ...(result.title ? { title: result.title } : {}),
+            ...(result.summary ? { summary: result.summary } : {}),
         }, result.messages);
     }
     if (result.status === "stopped") {
@@ -58,6 +60,7 @@ export async function createOmaRuntime(options) {
         skillRoots: options.skillRoots,
         bashPtyConsole: options.bashPtyConsole,
         ...(options.onPersistMessages ? { onPersistMessages: options.onPersistMessages } : {}),
+        ...(options.planMode ? { planMode: options.planMode } : {}),
         ...(options.pluginComponents?.plugins.length
             ? { codePlugins: options.pluginComponents.plugins }
             : {}),
@@ -196,6 +199,8 @@ export async function createOmaRuntime(options) {
                                 if (entry.type === "compaction" && entry.summary)
                                     compactions.push(entry.summary);
                             }
+                            // (The memory transcript wants the text only; the durable
+                            // session file is the consumer that needs the coverage boundary.)
                             // FIRE-AND-FORGET: awaiting here blocks the outcome (and the
                             // TUI busy state) on a second model call the user cannot abort.
                             memoryLearning = extractAutonomousMemory({
@@ -266,10 +271,19 @@ export async function createOmaRuntime(options) {
          *  run never compacted). Read the store BEFORE close(). */
         async compactions() {
             const branch = await rt.store.readBranch(options.runId);
+            const liveEntries = branch.filter((e) => e.type === "message").map((e) => e.entryId);
             const summaries = [];
             for (const entry of branch) {
-                if (entry.type === "compaction" && entry.summary)
-                    summaries.push(entry.summary);
+                if (entry.type === "compaction" && entry.summary) {
+                    const covered = new Set(entry.coversEntryIds);
+                    summaries.push({
+                        summary: entry.summary,
+                        // "Describes the branch" is checked against the branch AS IT IS
+                        // NOW: a compaction that ran mid-run has messages persisted after
+                        // it, which it cannot describe, so it must not fold them away.
+                        replacesEarlierMessages: liveEntries.length > 0 && liveEntries.every((id) => covered.has(id)),
+                    });
+                }
             }
             return summaries;
         },
@@ -280,10 +294,16 @@ export async function createOmaRuntime(options) {
             if (!budget)
                 return undefined;
             const branch = await rt.store.readBranch(options.runId);
+            // Live entries only, like the loop's threshold check: counting the
+            // covered prefix would leave the meter above the window right after a
+            // compaction that just brought the context down.
+            const coveredIds = latestCompaction(branch)?.coveredIds ?? null;
             let estimatedTokens = 0;
             for (const entry of branch) {
                 if (entry.type !== "message")
                     continue;
+                if (coveredIds?.has(entry.entryId))
+                    continue;
                 estimatedTokens += budget.estimate(entry.message);
             }
             return { estimatedTokens, limit: budget.limit };

package/dist/core/runtime/permission-classifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"permission-classifier.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/permission-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErE;;;;;2CAK2C;AAE3C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;8EAE8E;AAC9E,wBAAgB,iBAAiB,CAC/B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,SAAS,CAIpB;AAED,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAEpD,yEAAyE;AACzE,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAIR;AAED;;yDAEyD;AACzD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,OAAO,EAAE,CAyBX;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CA0B5D;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC7B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,MAAM,KACrB,aAAa,CAAC,cAAc,CAAC,CAAC;AAEnC;2EAC2E;AAC3E,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;wCACoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgB7B;AA4BD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAgB3D"}
+{"version":3,"file":"permission-classifier.d.ts","sourceRoot":"","sources":["../../../src/core/runtime/permission-classifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAErE;;;;;2CAK2C;AAE3C,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC;IACpC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;8EAE8E;AAC9E,wBAAgB,iBAAiB,CAC/B,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,GAAG,SAAS,CAIpB;AAED,eAAO,MAAM,6BAA6B,QAAS,CAAC;AAEpD,yEAAyE;AACzE,wBAAgB,mBAAmB,CACjC,GAAG,GAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAe,GAC9D,MAAM,CAIR;AAED;;yDAEyD;AACzD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,SAAS,MAAM,EAAE,GAC3B,OAAO,EAAE,CAyBX;AAED,kFAAkF;AAClF,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CA0B5D;AAED,MAAM,MAAM,gBAAgB,GAAG,CAC7B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,MAAM,CAAC,EAAE,WAAW,EACpB,eAAe,CAAC,EAAE,MAAM,KACrB,aAAa,CAAC,cAAc,CAAC,CAAC;AAEnC;2EAC2E;AAC3E,wBAAsB,wBAAwB,CAAC,IAAI,EAAE;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,SAAS,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7B,MAAM,EAAE,gBAAgB,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;wCACoC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAgB7B;AAiFD,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAoC3D"}