@psiclawops/hypercompositor 0.8.3 → 0.8.5

package/dist/index.d.ts

@@ -136,6 +136,32 @@ export declare function resolveEffectiveBudget(args: {
     budget: number;
     source: string;
 };
+export interface ModelIdentity {
+    rawModel: string | null;
+    modelKey: string | null;
+    provider: string | null;
+    modelId: string | null;
+}
+export declare function resolveModelIdentity(model?: string): ModelIdentity;
+export declare function diffModelState(previous: {
+    model?: string;
+    modelKey?: string | null;
+    provider?: string | null;
+    modelId?: string | null;
+    tokenBudget?: number;
+} | null | undefined, current: {
+    model?: string;
+    tokenBudget?: number;
+}): {
+    previousIdentity: ModelIdentity;
+    currentIdentity: ModelIdentity;
+    modelChanged: boolean;
+    providerChanged: boolean;
+    modelIdChanged: boolean;
+    budgetChanged: boolean;
+    budgetDownshift: boolean;
+    budgetUplift: boolean;
+};
 /**
  * Bust the assembly cache for a specific agent+session.
  * Call this after writing to identity files (SOUL.md, IDENTITY.md, TOOLS.md,

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -400,6 +400,48 @@ export function resolveEffectiveBudget(args) {
         source: 'fallback contextWindowSize',
     };
 }
+export function resolveModelIdentity(model) {
+    const modelKey = normalizeModelKey(model);
+    if (!modelKey) {
+        return {
+            rawModel: model ?? null,
+            modelKey: null,
+            provider: null,
+            modelId: null,
+        };
+    }
+    const slash = modelKey.indexOf('/');
+    return {
+        rawModel: model ?? null,
+        modelKey,
+        provider: slash > 0 ? modelKey.slice(0, slash) : null,
+        modelId: slash > 0 && slash < modelKey.length - 1 ? modelKey.slice(slash + 1) : modelKey,
+    };
+}
+export function diffModelState(previous, current) {
+    const previousIdentity = previous?.modelKey || previous?.provider || previous?.modelId
+        ? {
+            rawModel: previous.model ?? null,
+            modelKey: previous.modelKey ?? normalizeModelKey(previous.model),
+            provider: previous.provider ?? resolveModelIdentity(previous.model).provider,
+            modelId: previous.modelId ?? resolveModelIdentity(previous.model).modelId,
+        }
+        : resolveModelIdentity(previous?.model);
+    const currentIdentity = resolveModelIdentity(current.model);
+    const previousBudget = previous?.tokenBudget;
+    const currentBudget = current.tokenBudget;
+    const budgetChanged = previousBudget != null && currentBudget != null && previousBudget !== currentBudget;
+    return {
+        previousIdentity,
+        currentIdentity,
+        modelChanged: previousIdentity.modelKey !== currentIdentity.modelKey,
+        providerChanged: previousIdentity.provider !== currentIdentity.provider,
+        modelIdChanged: previousIdentity.modelId !== currentIdentity.modelId,
+        budgetChanged,
+        budgetDownshift: previousBudget != null && currentBudget != null && currentBudget < previousBudget,
+        budgetUplift: previousBudget != null && currentBudget != null && currentBudget > previousBudget,
+    };
+}
 function normalizeModelKey(model) {
     if (!model)
         return null;
@@ -723,6 +765,31 @@ function extractTextFromInboundContent(content) {
         .map(part => part.text ?? '')
         .join('\n');
 }
+function resolveAssistantTokenCount(msg, runtimeContext) {
+    const usage = msg.usage;
+    if (usage && typeof usage === 'object') {
+        const candidates = [
+            usage.total,
+            usage.totalTokens,
+            usage.total_tokens,
+            usage.output,
+            usage.outputTokens,
+            usage.output_tokens,
+            usage.completionTokens,
+            usage.completion_tokens,
+        ];
+        for (const candidate of candidates) {
+            if (typeof candidate === 'number' && Number.isFinite(candidate) && candidate > 0) {
+                return Math.floor(candidate);
+            }
+        }
+    }
+    const runtimeTokenCount = runtimeContext?.currentTokenCount;
+    if (typeof runtimeTokenCount === 'number' && Number.isFinite(runtimeTokenCount) && runtimeTokenCount > 0) {
+        return Math.floor(runtimeTokenCount);
+    }
+    return undefined;
+}
 function collectNeutralToolPairStats(messages) {
     const callIds = new Set();
     const resultIds = new Set();
@@ -1291,10 +1358,10 @@ function createHyperMemEngine() {
                 // Non-fatal: missing files are silently skipped.
                 let identityBlock;
                 try {
-                    // Council agents live at workspace-council/<agentId>/
+                    // Council agents live at workspace/<agentId>/
                     // Other agents at workspace/<agentId>/ — try council path first
                     const homedir = os.homedir();
-                    const councilPath = path.join(homedir, '.openclaw', 'workspace-council', agentId);
+                    const councilPath = path.join(homedir, '.openclaw', 'workspace', agentId);
                     const workspacePath = path.join(homedir, '.openclaw', 'workspace', agentId);
                     let wsPath = councilPath;
                     try {
@@ -1326,7 +1393,7 @@ function createHyperMemEngine() {
                 let _wsPathForSeed;
                 try {
                     const homedir2 = os.homedir();
-                    const councilPath2 = path.join(homedir2, '.openclaw', 'workspace-council', agentId);
+                    const councilPath2 = path.join(homedir2, '.openclaw', 'workspace', agentId);
                     const workspacePath2 = path.join(homedir2, '.openclaw', 'workspace', agentId);
                     try {
                         await fs.access(councilPath2);
@@ -1361,7 +1428,7 @@ function createHyperMemEngine() {
                 // Post-warm pressure check: if messages.db had accumulated history,
                 // warm() may have loaded the session straight to 80%+. Pre-trim now
                 // so the first turn has headroom instead of starting saturated.
-                // This is the "restart at 98%" failure mode reported by Helm 2026-04-05:
+                // This is the "restart at 98%" failure mode reported by Eve 2026-04-05:
                 // JSONL truncation + Redis flush isn't enough if messages.db is still full
                 // and warm() reloads it. Trim here closes the loop.
                 try {
@@ -2063,23 +2130,32 @@ function createHyperMemEngine() {
                         console.warn('[hypermem-plugin] assemble: Redis trim failed (non-fatal):', trimErr.message);
                     }
                     // ── Budget downshift: proactive reshape pass ───────────────────────────────────────
-                    // If this session previously composed at a higher token budget (e.g. gpt-5.4
-                    // → claude-sonnet model switch), the Redis window is still sized for the old
-                    // budget. trimHistoryToTokenBudget above trims by count but skips tool
-                    // gradient logic. A downshift >10% triggers a full reshape: apply tool
-                    // gradient at the new budget + trim, then write back before compose runs.
-                    // This prevents several turns of compaction churn after a model switch.
-                    //
-                    // Bug fix: previously read from getWindow() which is always null here
-                    // (afterTurn invalidates it every turn). Also fixed: was doing setWindow()
-                    // then invalidateWindow() which is a write-then-delete no-op. Now reads
-                    // from history list and writes back via replaceHistory().
+                    // Detect provider/model identity changes as well as raw budget changes.
+                    // Provider routing matters operationally because the same model family can
+                    // land on a different effective context window, for example Copilot Sonnet
+                    // vs direct Anthropic Sonnet. Only budget downshifts trigger the demoted
+                    // reshape guard, but verbose logs now show provider/model swaps even when
+                    // the effective budget stays flat or increases.
                     let lastState = null;
                     try {
                         lastState = await hm.cache.getModelState(agentId, sk);
                         const DOWNSHIFT_THRESHOLD = 0.10;
-                        const isDownshift = lastState &&
-                            (lastState.tokenBudget - effectiveBudget) / lastState.tokenBudget > DOWNSHIFT_THRESHOLD;
+                        const modelDelta = diffModelState(lastState, {
+                            model,
+                            tokenBudget: effectiveBudget,
+                        });
+                        const downshiftFraction = lastState?.tokenBudget
+                            ? (lastState.tokenBudget - effectiveBudget) / lastState.tokenBudget
+                            : 0;
+                        const isDownshift = modelDelta.budgetDownshift && downshiftFraction > DOWNSHIFT_THRESHOLD;
+                        if (lastState && (modelDelta.modelChanged || modelDelta.budgetChanged)) {
+                            verboseLog(`[hypermem-plugin] model state change: ` +
+                                `prev=${modelDelta.previousIdentity.modelKey ?? 'unknown'} ` +
+                                `next=${modelDelta.currentIdentity.modelKey ?? 'unknown'} ` +
+                                `providerChanged=${modelDelta.providerChanged} ` +
+                                `modelIdChanged=${modelDelta.modelIdChanged} ` +
+                                `budget=${lastState.tokenBudget}->${effectiveBudget}`);
+                        }
                         if (isDownshift && !_deferToolPruning) {
                             // Sprint 2.2a: demote reshape to guard telemetry.
                             //
@@ -2244,8 +2320,12 @@ ${replayRecovery.emittedText}`
                     await persistReplayRecoveryState(hm, agentId, sk, replayRecovery.nextState);
                     // Update model state for downshift detection on next turn
                     try {
+                        const modelIdentity = resolveModelIdentity(model);
                         await hm.cache.setModelState(agentId, sk, {
                             model: model ?? 'unknown',
+                            modelKey: modelIdentity.modelKey ?? undefined,
+                            provider: modelIdentity.provider ?? undefined,
+                            modelId: modelIdentity.modelId ?? undefined,
                             tokenBudget: effectiveBudget,
                             composedAt: new Date().toISOString(),
                             historyDepth,
@@ -2481,7 +2561,7 @@ ${replayRecovery.emittedText}`
          * it never calls ingest() or ingestBatch(). So we must ingest the new
          * messages here, using messages.slice(prePromptMessageCount).
          */
-        async afterTurn({ sessionId, sessionKey, messages, prePromptMessageCount, isHeartbeat }) {
+        async afterTurn({ sessionId, sessionKey, messages, prePromptMessageCount, isHeartbeat, runtimeContext }) {
             if (isHeartbeat)
                 return;
             try {
@@ -2523,7 +2603,9 @@ ${replayRecovery.emittedText}`
                         await hm.recordUserMessage(agentId, sk, stripMessageMetadata(neutral.textContent ?? ''));
                     }
                     else {
-                        await hm.recordAssistantMessage(agentId, sk, neutral);
+                        await hm.recordAssistantMessage(agentId, sk, neutral, {
+                            tokenCount: neutral.role === 'assistant' ? resolveAssistantTokenCount(m, runtimeContext) : undefined,
+                        });
                     }
                 }
                 // P3.1: Topic detection on the inbound user message
@@ -2583,7 +2665,7 @@ ${replayRecovery.emittedText}`
                 // gradient-compressed window to budget before writing to Redis. Without
                 // this, afterTurn writes up to 250 messages regardless of budget, causing
                 // trimHistoryToTokenBudget to fire and trim ~200 messages on every
-                // subsequent assemble() — the churn loop seen in Helm's logs.
+                // subsequent assemble() — the churn loop seen in Eve's logs.
                 if (hm.cache.isConnected) {
                     try {
                         const modelState = await hm.cache.getModelState(agentId, sk);
@@ -2607,7 +2689,7 @@ ${replayRecovery.emittedText}`
                 // If a session just finished a turn at >80% pressure, the NEXT turn's
                 // incoming tool results (parallel web searches, large exec output, etc.)
                 // will hit a window with no headroom — the ingestion wave failure mode
-                // (reported by Helm, 2026-04-05). Pre-trim here so the tool-loop
+                // (reported by Eve, 2026-04-05). Pre-trim here so the tool-loop
                 // assemble() path starts the next turn with meaningful space.
                 //
                 // Uses modelState.tokenBudget if cached; skips if unavailable (non-fatal).

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@psiclawops/hypercompositor",
-  "version": "0.8.3",
-  "description": "HyperCompositor \u2014 context engine plugin for OpenClaw",
+  "version": "0.8.5",
+  "description": "HyperCompositor — context engine plugin for OpenClaw",
   "type": "module",
   "main": "dist/index.js",
   "license": "Apache-2.0",
@@ -18,7 +18,7 @@
   "openclaw": {
     "plugin": {
       "id": "hypercompositor",
-      "name": "HyperCompositor \u2014 Context Engine",
+      "name": "HyperCompositor — Context Engine",
       "kind": "context-engine"
     },
     "extensions": [
@@ -38,12 +38,12 @@
     "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@psiclawops/hypermem": "file:.."
+    "@psiclawops/hypermem": "file:..",
+    "zod": "^4.0.0"
   },
   "devDependencies": {
     "openclaw": "*",
-    "typescript": "^5.4.0",
-    "zod": "^4.0.0"
+    "typescript": "^5.4.0"
   },
   "peerDependencies": {
     "openclaw": "*"