stratagate-dsh 0.2.84 → 0.2.86

package/dist/plugin.js

@@ -11,6 +11,9 @@ var StructuredReasoningEffortSettings = z.object({
   showShortTermStatus: z.boolean().default(true).description("\u663E\u793A\u77ED\u671F\u8BB0\u5FC6\u5757\u72B6\u6001").comment("\u63A7\u5236\u77ED\u671F\u8BB0\u5FC6\u5757\u8FDB\u5EA6\u3001Block \u5C01\u5B58\u4E0E\u6574\u7406\u72B6\u6001\u7684\u804A\u5929\u5185\u63D0\u793A\uFF1B\u540E\u53F0\u5904\u7406\u4E0D\u53D7\u5F71\u54CD\u3002"),
   showRetrievalStatus: z.boolean().default(true).description("\u663E\u793A\u8BB0\u5FC6\u68C0\u7D22\u72B6\u6001").comment("\u63A7\u5236\u68C0\u7D22\u6B21\u6570\u3001\u8FD4\u56DE\u6570\u91CF\u548C\u8BB0\u5FC6\u91C7\u7528\u4FE1\u606F\u7684\u804A\u5929\u5185\u63D0\u793A\uFF1B\u68C0\u7D22\u4E0E\u91C7\u7528\u4E0D\u53D7\u5F71\u54CD\u3002")
 });
+function volatileIfSupported(schema) {
+  return schema.volatile?.() ?? schema;
+}
 var Config = z.object({
   database: z.string().required(),
   sessionRoot: z.string(),
@@ -24,11 +27,17 @@ var Config = z.object({
   model: z.string(),
   maxOutputTokens: z.natural().min(256).default(2048),
   structuredTaskTimeoutMs: z.natural().min(1e3).default(12e4),
-  structuredReasoningEffort: z.union(["auto", "force-off"]).default("auto"),
-  showStrataGateStatus: z.boolean().default(true),
-  showShortTermStatus: z.boolean().default(true),
-  showRetrievalStatus: z.boolean().default(true)
+  structuredReasoningEffort: volatileIfSupported(z.union(["auto", "force-off"]).default("auto")),
+  showStrataGateStatus: volatileIfSupported(z.boolean().default(true)),
+  showShortTermStatus: volatileIfSupported(z.boolean().default(true)),
+  showRetrievalStatus: volatileIfSupported(z.boolean().default(true))
 });
+function liveConfigValue(value) {
+  return value && typeof value === "object" && "get" in value && typeof value.get === "function" ? value.get() : value;
+}
+function isLiveConfigValue(value) {
+  return value !== null && typeof value === "object" && "get" in value && typeof value.get === "function";
+}
 function resolveConfig(config) {
   const database = config.database?.trim() ?? "";
   const sessionRoot = config.sessionRoot?.trim();
@@ -52,10 +61,10 @@ function resolveConfig(config) {
     ...provider && model ? { provider, model } : {},
     maxOutputTokens: Math.max(256, Math.floor(config.maxOutputTokens ?? 2048)),
     structuredTaskTimeoutMs: Math.max(1e3, Math.floor(config.structuredTaskTimeoutMs ?? 12e4)),
-    structuredReasoningEffort: config.structuredReasoningEffort ?? "auto",
-    showStrataGateStatus: config.showStrataGateStatus ?? true,
-    showShortTermStatus: config.showShortTermStatus ?? true,
-    showRetrievalStatus: config.showRetrievalStatus ?? true
+    structuredReasoningEffort: liveConfigValue(config.structuredReasoningEffort) ?? "auto",
+    showStrataGateStatus: liveConfigValue(config.showStrataGateStatus) ?? true,
+    showShortTermStatus: liveConfigValue(config.showShortTermStatus) ?? true,
+    showRetrievalStatus: liveConfigValue(config.showRetrievalStatus) ?? true
   };
 }
 
@@ -5573,6 +5582,125 @@ var StrataGate = class _StrataGate {
   }
 };
 
+// src/dsh-compatibility.ts
+import { readFileSync } from "node:fs";
+import { createRequire } from "node:module";
+var nodeRequire = createRequire(import.meta.url);
+var RUNTIME_PACKAGES = [
+  "@deepseek-ai/cordis",
+  "@deepseek-ai/dsh-agent-default-model",
+  "@deepseek-ai/dsh-client-ui-conversation",
+  "@deepseek-ai/dsh-llm",
+  "@deepseek-ai/dsh-native-command",
+  "@deepseek-ai/dsh-session",
+  "@deepseek-ai/dsh-settings",
+  "@deepseek-ai/dsh-system-prompt",
+  "@deepseek-ai/dsh-tools",
+  "@deepseek-ai/schemastery"
+];
+var SUPPORTED_RUNTIME_FAMILIES = [
+  {
+    cli: "0.1.2-rc.1",
+    versions: {
+      "@deepseek-ai/cordis": "4.0.2",
+      "@deepseek-ai/dsh-agent-default-model": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-native-command": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
+      "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
+      "@deepseek-ai/schemastery": "3.18.2"
+    }
+  },
+  {
+    cli: "0.1.5-rc.1",
+    versions: {
+      "@deepseek-ai/cordis": "4.0.2",
+      "@deepseek-ai/dsh-agent-default-model": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-native-command": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-session": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2",
+      "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
+      "@deepseek-ai/schemastery": "3.18.2"
+    }
+  },
+  {
+    cli: "0.1.6-alpha.1",
+    versions: {
+      "@deepseek-ai/cordis": "4.0.2",
+      "@deepseek-ai/dsh-agent-default-model": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-client-ui-conversation": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-llm": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-native-command": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-session": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-settings": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-system-prompt": "0.1.6-alpha.1",
+      "@deepseek-ai/dsh-tools": "0.1.6-alpha.1",
+      "@deepseek-ai/schemastery": "3.18.2"
+    }
+  },
+  {
+    cli: "0.1.7-rc.1",
+    versions: {
+      "@deepseek-ai/cordis": "4.0.4",
+      "@deepseek-ai/dsh-agent-default-model": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-client-ui-conversation": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-native-command": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-session": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-settings": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-system-prompt": "0.1.7-rc.1",
+      "@deepseek-ai/dsh-tools": "0.1.7-rc.1",
+      "@deepseek-ai/schemastery": "3.18.4"
+    }
+  }
+];
+var STRATAGATE_MESSAGE_SOURCE_KIND = "plugin:stratagate-memory";
+function buildDshMessageSource(version, form) {
+  const source = version === "0.1.7-rc.1" ? { kind: STRATAGATE_MESSAGE_SOURCE_KIND } : { kind: "plugin", plugin: "stratagate-memory" };
+  return form ? { ...source, form } : source;
+}
+function installedVersion(packageName) {
+  try {
+    const manifestPath = nodeRequire.resolve(`${packageName}/package.json`);
+    const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
+    if (typeof manifest.version === "string" && manifest.version.length > 0) return manifest.version;
+  } catch {
+  }
+  return "<missing>";
+}
+function buildDshReplaceSurfaceOp(version, start, end) {
+  return version === "0.1.2-rc.1" ? { op: "replace", start, end } : { op: "replace", startSeq: start, endSeq: end };
+}
+function dshReplaceSurfaceOp(start, end) {
+  return buildDshReplaceSurfaceOp(installedVersion("@deepseek-ai/dsh-session"), start, end);
+}
+function dshMessageSource(form) {
+  return buildDshMessageSource(installedVersion("@deepseek-ai/dsh-session"), form);
+}
+function isStrataGateMessageSource(source) {
+  if (!source || typeof source !== "object") return false;
+  const value = source;
+  return value.kind === STRATAGATE_MESSAGE_SOURCE_KIND || value.kind === "plugin" && value.plugin === "stratagate-memory";
+}
+function classifyDshRuntime(packageVersions) {
+  const family = SUPPORTED_RUNTIME_FAMILIES.find(({ versions }) => RUNTIME_PACKAGES.every((name2) => packageVersions[name2] === versions[name2]));
+  if (family) return { cliVersion: family.cli, packageVersions };
+  const found = RUNTIME_PACKAGES.map((name2) => `${name2}@${packageVersions[name2]}`).join(", ");
+  throw new Error(
+    `StrataGate cannot start because this DSH profile resolves an unsupported or mixed core runtime. Resolved: ${found}. Supported tested hosts are @deepseek-ai/dsh@0.1.2-rc.1 (internal DSH packages 0.1.2-rc.1) and @deepseek-ai/dsh@0.1.5-rc.1 (its real dependency tree uses internal DSH packages 0.1.5-rc.2), and @deepseek-ai/dsh@0.1.6-alpha.1 (internal DSH packages 0.1.6-alpha.1), and @deepseek-ai/dsh@0.1.7-rc.1 (internal DSH packages 0.1.7-rc.1). Reinstall or update stratagate-dsh through \`dsh plugin --profile <name> add <package>\` so the host supplies its peers.`
+  );
+}
+function assertCompatibleDshRuntime() {
+  const packageVersions = Object.fromEntries(RUNTIME_PACKAGES.map((name2) => [name2, installedVersion(name2)]));
+  return classifyDshRuntime(packageVersions);
+}
+
 // src/json-response.ts
 var RESPONSE_PREVIEW_LIMIT = 500;
 function truncateResponsePreview(value) {
@@ -5994,9 +6122,10 @@ function compactGraphProjectionContext(context) {
   };
 }
 var DshModelBridge = class {
-  constructor(ctx, config) {
+  constructor(ctx, config, liveStructuredReasoningEffort) {
     this.ctx = ctx;
     this.config = config;
+    this.liveStructuredReasoningEffort = liveStructuredReasoningEffort;
     this.structuredReasoningEffort = config.structuredReasoningEffort ?? "auto";
     this.ctx.on?.("llm/adapters-updated", () => {
       this.offCapabilities.clear();
@@ -6005,6 +6134,7 @@ var DshModelBridge = class {
   }
   ctx;
   config;
+  liveStructuredReasoningEffort;
   sessions = new AsyncLocalStorage();
   successfulResponses = [];
   offCapabilities = /* @__PURE__ */ new Map();
@@ -6030,6 +6160,9 @@ var DshModelBridge = class {
   setStructuredReasoningEffort(mode) {
     this.structuredReasoningEffort = mode;
   }
+  currentStructuredReasoningEffort() {
+    return this.liveStructuredReasoningEffort?.() ?? this.structuredReasoningEffort;
+  }
   run(session, operation) {
     return this.sessions.run({ session, sessionId: session.id }, operation);
   }
@@ -6258,7 +6391,7 @@ var DshModelBridge = class {
       attemptsUsed = attempt;
       const message = createUserMessage({
         content: [{ type: "text", text: JSON.stringify(payload) }],
-        source: { kind: "plugin", plugin: "stratagate-memory" }
+        source: dshMessageSource()
       });
       const assembler = new BlockAssembler();
       const request = {
@@ -6392,14 +6525,14 @@ ${JSON_RETRY_INSTRUCTION}`,
     const key = `${route.provider}\0${route.model}`;
     const cached = this.offCapabilities.get(key);
     if (cached) {
-      if (cached === "unsupported" && this.structuredReasoningEffort === "force-off") {
+      if (cached === "unsupported" && this.currentStructuredReasoningEffort() === "force-off") {
         this.warnOffFallbackOnce(key, `${route.provider}/${route.model} does not support reasoningEffort=off; using the model default`);
       }
       return cached === "supported";
     }
     if (typeof this.ctx.llm.resolveModelInfo !== "function") {
       this.offCapabilities.set(key, "unsupported");
-      if (this.structuredReasoningEffort === "force-off") {
+      if (this.currentStructuredReasoningEffort() === "force-off") {
         this.warnOffFallbackOnce(key, `${route.provider}/${route.model} capabilities are unavailable; using the model default`);
       }
       return false;
@@ -6418,16 +6551,16 @@ ${JSON_RETRY_INSTRUCTION}`,
           timer.unref?.();
         })
       ]);
-      if (!info.reasoning) return this.structuredReasoningEffort === "force-off";
+      if (!info.reasoning) return this.currentStructuredReasoningEffort() === "force-off";
       const supported = info.reasoning.efforts.some(({ id }) => String(id) === "off");
       this.offCapabilities.set(key, supported ? "supported" : "unsupported");
-      if (!supported && this.structuredReasoningEffort === "force-off") {
+      if (!supported && this.currentStructuredReasoningEffort() === "force-off") {
         this.warnOffFallbackOnce(key, `${route.provider}/${route.model} does not support reasoningEffort=off; using the model default`);
       }
       return supported;
     } catch {
       this.offCapabilities.set(key, "unsupported");
-      if (this.structuredReasoningEffort === "force-off") {
+      if (this.currentStructuredReasoningEffort() === "force-off") {
         this.warnOffFallbackOnce(key, `${route.provider}/${route.model} capability lookup failed; using the model default`);
       }
       return false;
@@ -6516,13 +6649,14 @@ function renderBlocks(blocks) {
         break;
       case "tool-call":
         break;
-      case "tool-result": {
-        const nested = renderBlocks(block.content);
-        if (nested) output.push(nested);
+      default: {
+        const legacy = block;
+        if (legacy.type === "tool-result" && legacy.content) {
+          const nested = renderBlocks(legacy.content);
+          if (nested) output.push(nested);
+        }
         break;
       }
-      default:
-        break;
     }
   }
   return output.join("\n").trim();
@@ -6574,6 +6708,7 @@ var TurnFolder = class {
         return null;
       }
       case "tool/result": {
+        if (event.surfaceOp && event.surfaceOp !== "append") return null;
         const callId = String(event.data.message.source.callId);
         const pending = this.pending(sessionId, event.data.turn);
         if (pending.ignoredTools.has(callId)) return null;
@@ -6618,93 +6753,6 @@ var TurnFolder = class {
   }
 };
 
-// src/dsh-compatibility.ts
-import { readFileSync } from "node:fs";
-import { createRequire } from "node:module";
-var nodeRequire = createRequire(import.meta.url);
-var RUNTIME_PACKAGES = [
-  "@deepseek-ai/cordis",
-  "@deepseek-ai/dsh-agent-default-model",
-  "@deepseek-ai/dsh-client-ui-conversation",
-  "@deepseek-ai/dsh-llm",
-  "@deepseek-ai/dsh-session",
-  "@deepseek-ai/dsh-settings",
-  "@deepseek-ai/dsh-system-prompt",
-  "@deepseek-ai/dsh-tools",
-  "@deepseek-ai/schemastery"
-];
-var SUPPORTED_RUNTIME_FAMILIES = [
-  {
-    cli: "0.1.2-rc.1",
-    versions: {
-      "@deepseek-ai/cordis": "4.0.2",
-      "@deepseek-ai/dsh-agent-default-model": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-client-ui-conversation": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-session": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-settings": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-system-prompt": "0.1.2-rc.1",
-      "@deepseek-ai/dsh-tools": "0.1.2-rc.1",
-      "@deepseek-ai/schemastery": "3.18.2"
-    }
-  },
-  {
-    cli: "0.1.5-rc.1",
-    versions: {
-      "@deepseek-ai/cordis": "4.0.2",
-      "@deepseek-ai/dsh-agent-default-model": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-client-ui-conversation": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-llm": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-session": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-settings": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-system-prompt": "0.1.5-rc.2",
-      "@deepseek-ai/dsh-tools": "0.1.5-rc.2",
-      "@deepseek-ai/schemastery": "3.18.2"
-    }
-  },
-  {
-    cli: "0.1.6-alpha.1",
-    versions: {
-      "@deepseek-ai/cordis": "4.0.2",
-      "@deepseek-ai/dsh-agent-default-model": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-client-ui-conversation": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-llm": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-session": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-settings": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-system-prompt": "0.1.6-alpha.1",
-      "@deepseek-ai/dsh-tools": "0.1.6-alpha.1",
-      "@deepseek-ai/schemastery": "3.18.2"
-    }
-  }
-];
-function installedVersion(packageName) {
-  try {
-    const manifestPath = nodeRequire.resolve(`${packageName}/package.json`);
-    const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
-    if (typeof manifest.version === "string" && manifest.version.length > 0) return manifest.version;
-  } catch {
-  }
-  return "<missing>";
-}
-function buildDshReplaceSurfaceOp(version, start, end) {
-  return version === "0.1.2-rc.1" ? { op: "replace", start, end } : { op: "replace", startSeq: start, endSeq: end };
-}
-function dshReplaceSurfaceOp(start, end) {
-  return buildDshReplaceSurfaceOp(installedVersion("@deepseek-ai/dsh-session"), start, end);
-}
-function classifyDshRuntime(packageVersions) {
-  const family = SUPPORTED_RUNTIME_FAMILIES.find(({ versions }) => RUNTIME_PACKAGES.every((name2) => packageVersions[name2] === versions[name2]));
-  if (family) return { cliVersion: family.cli, packageVersions };
-  const found = RUNTIME_PACKAGES.map((name2) => `${name2}@${packageVersions[name2]}`).join(", ");
-  throw new Error(
-    `StrataGate cannot start because this DSH profile resolves an unsupported or mixed core runtime. Resolved: ${found}. Supported tested hosts are @deepseek-ai/dsh@0.1.2-rc.1 (internal DSH packages 0.1.2-rc.1) and @deepseek-ai/dsh@0.1.5-rc.1 (its real dependency tree uses internal DSH packages 0.1.5-rc.2), and @deepseek-ai/dsh@0.1.6-alpha.1 (internal DSH packages 0.1.6-alpha.1). Reinstall or update stratagate-dsh through \`dsh plugin --profile <name> add <package>\` so the host supplies its peers.`
-  );
-}
-function assertCompatibleDshRuntime() {
-  const packageVersions = Object.fromEntries(RUNTIME_PACKAGES.map((name2) => [name2, installedVersion(name2)]));
-  return classifyDshRuntime(packageVersions);
-}
-
 // src/metadata.ts
 import { DatabaseSync as DatabaseSync2 } from "node:sqlite";
 var METADATA_SCHEMA = `
@@ -6818,7 +6866,6 @@ function graphProjectionCanRun(job, now = Date.now()) {
 var AUTO_EVENT_LIMIT = 4;
 var AUTO_ELEMENT_LIMIT = 4;
 var AUTO_MEMORY_TOKEN_BUDGET = 900;
-var COMPACTION_SOURCE_PLUGIN = "stratagate-memory";
 var FEEDBACK_PROMPT_COOLDOWN_MS = 5 * 24 * 60 * 60 * 1e3;
 function projectKey(cwd) {
   const canonical = resolve(cwd ?? process.cwd()).replaceAll("\\", "/").toLowerCase();
@@ -7483,7 +7530,7 @@ var StrataGateRuntime = class {
     const memory = await this.space(session);
     const threadId = String(session.id);
     const blockContexts = memory.getBlockContext(threadId);
-    if (this.syncDecayedBlockSurface(session, blockContexts)) {
+    if (this.syncDecayedBlockSurface(session, memory, blockContexts)) {
       await this.flushNativeSession(session);
     }
     const openTail = memory.listOpenTail(threadId);
@@ -7526,32 +7573,54 @@ var StrataGateRuntime = class {
    * while deriveMessages() sees only this compressed checkpoint.
    */
   replaceSealedSurface(session, block, context, endTurn) {
-    const sourceEventSeqs = sealedSurfaceSeqs(session, endTurn, block.endTurn - block.startTurn + 1);
+    if (endTurn === null || hostCompactionActive(session)) return false;
+    const sourceEventSeqs = sealedSurfaceSeqs(session, endTurn, block);
+    if (!sourceEventSeqs) return false;
     const start = sourceEventSeqs[0];
     const end = sourceEventSeqs.at(-1);
-    if (start === void 0 || end === void 0) {
-      throw new Error(`Cannot compact StrataGate block ${block.id}: no DSH surface range was found`);
-    }
+    if (start === void 0 || end === void 0) return false;
+    const selected = selectCompressedBlockSurface(session, sourceEventSeqs, block, context);
+    if (!selected) return false;
     session.append("user/message", createUserMessage2({
-      content: [{ type: "text", text: renderBlockSurfaceMessage(context) }],
-      source: { kind: "plugin", plugin: COMPACTION_SOURCE_PLUGIN }
+      content: [{ type: "text", text: selected }],
+      source: dshMessageSource()
     }), {
       surfaceOp: dshReplaceSurfaceOp(start, end),
       sourceEventSeqs
     });
+    return true;
   }
   /** Keep each native Block checkpoint synchronized with its current decay pointer. */
-  syncDecayedBlockSurface(session, contexts) {
+  syncDecayedBlockSurface(session, memory, contexts) {
+    if (hostCompactionActive(session)) return false;
     const current = currentBlockSurfaceMessages(session);
+    const blocks = new Map(memory.listBlocks().map((block) => [block.id, block]));
+    const checkpointLimit = surfaceCheckpointLimit(session);
     let changed = false;
     for (const context of contexts) {
       const node = current.get(context.id);
       if (!node) continue;
-      const text3 = renderBlockSurfaceMessage(context);
+      const currentLevel = Number(node.text.match(/^Level: L([0-5]) /mu)?.[1] ?? -1);
+      const currentTokens = surfaceCheckpointTokens(node.text);
+      const sourceTokens = originalCheckpointSourceTokens(session, node.seq);
+      const violatesLimit = currentTokens > checkpointLimit || sourceTokens !== null && !worthwhileSurfaceReduction(sourceTokens, currentTokens);
+      if (context.level >= currentLevel && currentLevel >= 0 && !violatesLimit) continue;
+      const block = blocks.get(context.id);
+      if (!block) continue;
+      const highestLevel = currentLevel >= 0 ? Math.min(context.level, currentLevel) : context.level;
+      const text3 = selectCompressedBlockSurfaceText(
+        node.text,
+        context,
+        block,
+        highestLevel,
+        sourceTokens,
+        checkpointLimit
+      );
+      if (!text3) continue;
       if (node.text === text3) continue;
       session.append("user/message", createUserMessage2({
         content: [{ type: "text", text: text3 }],
-        source: { kind: "plugin", plugin: COMPACTION_SOURCE_PLUGIN }
+        source: dshMessageSource()
       }), {
         surfaceOp: dshReplaceSurfaceOp(node.seq, node.seq),
         sourceEventSeqs: [node.seq]
@@ -7562,6 +7631,7 @@ var StrataGateRuntime = class {
   }
   /** Finish native-surface replacement when an admin retry ran without the target session loaded. */
   async syncPendingRetrySurface(session, memory) {
+    if (hostCompactionActive(session)) return;
     const namespace = this.namespaceFor(session);
     const threadId = String(session.id);
     const pending = [...this.pendingSurfaceSync.entries()].filter(([, item]) => item.namespace === namespace);
@@ -7578,9 +7648,8 @@ var StrataGateRuntime = class {
       const context = contexts.get(blockId);
       if (!block || block.processingStatus !== "ready" || !context) continue;
       try {
-        this.replaceSealedSurface(session, block, context, dshTurnAtBlockEnd(session, block));
+        changed = this.replaceSealedSurface(session, block, context, dshTurnAtBlockEnd(session, block)) || changed;
         this.pendingSurfaceSync.delete(key);
-        changed = true;
       } catch (error) {
         this.onIngestError(error);
       }
@@ -8286,7 +8355,9 @@ var StrataGateRuntime = class {
           try {
             await memory2.resumePendingWork({ deferDerivation: true, threadId: String(session.id) });
             const contexts = memory2.getBlockContext(String(session.id));
-            this.syncDecayedBlockSurface(session, contexts);
+            if (this.syncDecayedBlockSurface(session, memory2, contexts)) {
+              await this.flushNativeSession(session);
+            }
           } finally {
             await this.persistSuccessfulResponses(memory2);
           }
@@ -8382,14 +8453,22 @@ var StrataGateRuntime = class {
         await this.persistSuccessfulResponses(memory);
         this.noteNewCoreJobFailures(session, failedBefore, memory);
         const contexts = memory.getBlockContext(threadId);
+        let changed = false;
         for (const block of resumed.readyBlocks) {
           if (block.threadId !== threadId) continue;
           const context = contexts.find(({ id }) => id === block.id);
           if (!context) throw new Error(`Missing context for ready StrataGate block ${block.id}`);
-          this.replaceSealedSurface(session, block, context, dshTurnAtBlockEnd(session, block));
+          if (hostCompactionActive(session)) {
+            this.pendingSurfaceSync.set(`${this.namespaceFor(session)}\0${block.id}`, {
+              namespace: this.namespaceFor(session),
+              blockId: block.id
+            });
+            continue;
+          }
+          changed = this.replaceSealedSurface(session, block, context, dshTurnAtBlockEnd(session, block)) || changed;
         }
-        const changed = this.syncDecayedBlockSurface(session, contexts);
-        if (resumed.readyBlocks.length > 0 || changed) await this.flushNativeSession(session);
+        changed = this.syncDecayedBlockSurface(session, memory, contexts) || changed;
+        if (changed) await this.flushNativeSession(session);
       }).catch((error) => {
         this.notePluginError(session, error);
         this.onIngestError(error);
@@ -8551,8 +8630,11 @@ function renderContent(content) {
       output.push(block.text.trim());
     } else if (block.type === "image") {
       output.push("[image]");
-    } else if (block.type === "tool-result" && Array.isArray(block.content)) {
-      output.push(renderContent(block.content));
+    } else {
+      const legacy = block;
+      if (legacy.type === "tool-result" && Array.isArray(legacy.content)) {
+        output.push(renderContent(legacy.content));
+      }
     }
   }
   return output.filter(Boolean).join("\n");
@@ -8580,11 +8662,10 @@ function dshTurnAtBlockEnd(session, block) {
     const event = events[index];
     if (event?.type === "turn/end" && event.time === blockEnd) return event.data.turn;
   }
-  throw new Error(`Cannot match StrataGate block ${block.id} to its completed DSH turn`);
+  return null;
 }
-function sealedSurfaceSeqs(session, endTurn, turnCount) {
+function sealedSurfaceSeqs(session, endTurn, block) {
   const currentSurface = [...session.surface.nodes];
-  const currentSet = new Set(currentSurface);
   const completed = [];
   let open2;
   const events = session.snapshotEvents();
@@ -8599,30 +8680,122 @@ function sealedSurfaceSeqs(session, endTurn, turnCount) {
     if (hasHumanMessage && event.data.turn <= endTurn) {
       completed.push({
         turn: event.data.turn,
+        endTime: event.time,
         start: open2.start,
         end: event.seq,
-        nodes: currentSurface.filter((seq) => seq > open2.start && seq < event.seq && currentSet.has(seq))
+        nodes: currentSurface.filter((seq) => {
+          if (seq > open2.start && seq < event.seq) return true;
+          const current = session.eventAt(seq);
+          return current?.type === "tool/result" && current.surfaceOp !== "append" && current.sourceEventSeqs?.some((source) => source > open2.start && source < event.seq);
+        })
       });
     }
     open2 = void 0;
   }
+  const sourceTimes = block.l5Raw.filter((message) => message.role === "user").map((message) => Date.parse(message.createdAt));
+  const turnCount = block.endTurn - block.startTurn + 1;
   const selected = completed.slice(-turnCount);
-  if (selected.length !== turnCount || selected.at(-1)?.turn !== endTurn) {
-    throw new Error(`Cannot identify ${turnCount} completed DSH turns ending at turn ${endTurn}`);
-  }
+  if (selected.length !== turnCount || selected.at(-1)?.turn !== endTurn || sourceTimes.length !== turnCount || selected.some((turn, index) => turn.endTime !== sourceTimes[index])) return null;
+  const firstTurn = selected[0];
+  const lastTurn = selected.at(-1);
+  if (events.some((event) => {
+    const hostEvent = event;
+    return hostEvent.type === "compaction/summary" && hostEvent.data.shadowedSeqs?.some((seq) => seq >= firstTurn.start && seq <= lastTurn.end);
+  })) return null;
   const emptyTurn = selected.find((turn) => turn.nodes.length === 0);
-  if (emptyTurn) {
-    throw new Error(`Cannot compact DSH turn ${emptyTurn.turn}: its original messages are no longer on the surface`);
-  }
+  if (emptyTurn) return null;
   const start = selected[0].nodes[0];
   const end = selected.at(-1).nodes.at(-1);
   const startIndex = currentSurface.indexOf(start);
   const endIndex = currentSurface.indexOf(end);
-  if (startIndex < 0 || endIndex < startIndex) {
-    throw new Error(`Cannot identify a contiguous DSH surface range ending at turn ${endTurn}`);
-  }
+  if (startIndex < 0 || endIndex < startIndex) return null;
   return currentSurface.slice(startIndex, endIndex + 1);
 }
+function hostCompactionActive(session) {
+  let lastBoundary;
+  let lastSeed;
+  for (let seq = session.seq - 1; seq >= 0; seq -= 1) {
+    const event = session.eventAt(seq);
+    if (!event) continue;
+    if (lastSeed === void 0 && event.type === "session/end-seed") lastSeed = seq;
+    if (!lastBoundary && (String(event.type) === "compaction/start" || String(event.type) === "compaction/end")) lastBoundary = event;
+    if (lastSeed !== void 0 && lastBoundary) break;
+  }
+  return lastBoundary?.type === "compaction/start" && (lastSeed === void 0 || lastBoundary.seq > lastSeed);
+}
+var SURFACE_MIN_SAVED_TOKENS = 32;
+var SURFACE_MAX_REPLACEMENT_RATIO = 0.9;
+var SURFACE_MAX_WINDOW_FRACTION = 0.04;
+var SURFACE_CHECKPOINT_CEILING_TOKENS = 4096;
+function surfaceCheckpointLimit(session) {
+  const window = typeof session.requestContext === "function" ? session.requestContext()?.contextWindow : void 0;
+  return typeof window === "number" && Number.isInteger(window) && window > 0 ? Math.max(1, Math.min(SURFACE_CHECKPOINT_CEILING_TOKENS, Math.floor(window * SURFACE_MAX_WINDOW_FRACTION))) : SURFACE_CHECKPOINT_CEILING_TOKENS;
+}
+function surfaceCheckpointTokens(text3) {
+  return estimateTokens(JSON.stringify(createUserMessage2({
+    content: [{ type: "text", text: text3 }],
+    source: dshMessageSource()
+  })));
+}
+function originalCheckpointSourceTokens(session, seq) {
+  const visited = /* @__PURE__ */ new Set();
+  const visit = (sourceSeq) => {
+    if (visited.has(sourceSeq)) return null;
+    visited.add(sourceSeq);
+    const event = session.eventAt(sourceSeq);
+    if (!event) return null;
+    if (event.type === "user/message" && isStrataGateMessageSource(event.data.source)) {
+      const sources2 = event.sourceEventSeqs;
+      if (!sources2?.length) return null;
+      let total = 0;
+      for (const source of sources2) {
+        const tokens = visit(source);
+        if (tokens === null) return null;
+        total += tokens;
+      }
+      return total;
+    }
+    const message = session.deriveEventMessage(event);
+    return message ? estimateTokens(JSON.stringify(message)) : null;
+  };
+  return visit(seq);
+}
+function worthwhileSurfaceReduction(before, after) {
+  return before - after >= SURFACE_MIN_SAVED_TOKENS && after <= before * SURFACE_MAX_REPLACEMENT_RATIO;
+}
+function selectCompressedBlockSurfaceText(currentText, context, block, highestLevel, sourceTokens, checkpointLimit) {
+  const before = surfaceCheckpointTokens(currentText);
+  for (let level = highestLevel; level >= 0; level -= 1) {
+    const candidate = renderBlockSurfaceMessage({
+      ...context,
+      level,
+      label: blockLevelLabel(level),
+      content: level === context.level ? context.content : renderBlock(block, level)
+    });
+    const tokens = surfaceCheckpointTokens(candidate);
+    if (tokens <= checkpointLimit && worthwhileSurfaceReduction(before, tokens) && (sourceTokens === null || worthwhileSurfaceReduction(sourceTokens, tokens))) return candidate;
+  }
+  return null;
+}
+function selectCompressedBlockSurface(session, sourceSeqs, block, context) {
+  const before = sourceSeqs.reduce((sum, seq) => {
+    const event = session.eventAt(seq);
+    const message = event && session.deriveEventMessage(event);
+    return sum + (message ? estimateTokens(JSON.stringify(message)) : 0);
+  }, 0);
+  const checkpointLimit = surfaceCheckpointLimit(session);
+  for (let level = context.level; level >= 0; level -= 1) {
+    const candidate = renderBlockSurfaceMessage({
+      ...context,
+      level,
+      label: blockLevelLabel(level),
+      content: level === context.level ? context.content : renderBlock(block, level)
+    });
+    const tokens = surfaceCheckpointTokens(candidate);
+    if (tokens <= checkpointLimit && worthwhileSurfaceReduction(before, tokens)) return candidate;
+  }
+  return null;
+}
 function renderBlockSurfaceMessage(context) {
   return [
     "[StrataGate conversation block]",
@@ -8723,7 +8896,7 @@ function currentBlockSurfaceMessages(session) {
   if (!session.surface?.nodes) return blocks;
   for (const seq of session.surface.nodes) {
     const event = session.eventAt(seq);
-    if (event?.type !== "user/message" || event.data.source.kind !== "plugin" || event.data.source.plugin !== COMPACTION_SOURCE_PLUGIN) continue;
+    if (event?.type !== "user/message" || !isStrataGateMessageSource(event.data.source)) continue;
     const text3 = event.data.content.flatMap((block) => block.type === "text" ? [block.text] : []).join("\n");
     const blockId = text3.match(/^\[StrataGate conversation block\]\nBlock: ([^\n]+)/u)?.[1] ?? text3.match(/^\[StrataGate compressed conversation\]\nBlock ([^;\n]+);/u)?.[1];
     if (blockId) blocks.set(blockId, { seq, text: text3 });
@@ -10390,7 +10563,7 @@ import {
 } from "node:fs/promises";
 import { basename, dirname as dirname2, join } from "node:path";
 import { createHash as createHash3, randomUUID } from "node:crypto";
-import { encodeSeqRanges } from "@deepseek-ai/dsh-session";
+import { encodeSeqRanges, KNOWN_SESSION_EVENT_TYPES } from "@deepseek-ai/dsh-session";
 var LEGACY_EVENT_TYPE = "stratagate/memory-citations";
 var COMPAT_EVENT_TYPE = "feedback/record";
 var ZSTD_MAGIC = 4247762216;
@@ -10544,12 +10717,24 @@ function prepareLegacyCitationGeneration(sourceBytes, compression, modules) {
   if (decodedCut !== migratedCut) throw new Error("StrataGate compatibility migration changed the inherited Session cut");
   const physicalHeader = { ...headerValue, version: 1 };
   modules.releasedV1SessionFormatCodec.decodeHeader(physicalHeader);
-  const restore = modules.sessionFormatCatalog.createRestore(physicalHeader, {
-    recovery: "strict",
-    validation: "transformed"
-  });
-  for (const row of outputRows) restore.decodeRow(row);
-  const current = restore.finish();
+  const v1 = modules.releasedV1SessionFormatCodec.createDecoder(physicalHeader, "strict");
+  const v1Events = [];
+  const v1Context = {
+    emitEvent(event) {
+      v1Events.push(event);
+    },
+    emitRun(run) {
+      for (const event of run.expand()) v1Events.push(event);
+    }
+  };
+  for (const row of outputRows) v1.decodeRow(row, v1Context);
+  const v1Cut = v1.finish(v1Context);
+  if (v1Cut !== decodedCut) throw new Error("StrataGate compatibility migration changed the inherited Session cut");
+  const current = modules.restoreReleasedV1Artifact({
+    header: v1.header,
+    inheritedEventCount: v1Cut,
+    events: v1Events
+  }, KNOWN_SESSION_EVENT_TYPES);
   return {
     bytes: encodeGeneration(physicalHeader, outputRows, compression),
     citationSeqs,
@@ -10558,15 +10743,12 @@ function prepareLegacyCitationGeneration(sourceBytes, compression, modules) {
 }
 async function loadMigrationModules() {
   try {
-    const [edge, catalog] = await Promise.all([
-      import("@deepseek-ai/dsh-session-format-v0-to-v1"),
-      import("@deepseek-ai/dsh-session-format-catalog")
-    ]);
+    const edge = await import("@deepseek-ai/dsh-session-format-v0-to-v1");
     return {
       releasedV0SessionFormatCodec: edge.releasedV0SessionFormatCodec,
       releasedV1SessionFormatCodec: edge.releasedV1SessionFormatCodec,
       sessionFormatV0ToV1: edge.sessionFormatV0ToV1,
-      sessionFormatCatalog: catalog.sessionFormatCatalog
+      restoreReleasedV1Artifact: edge.restoreReleasedV1Artifact
     };
   } catch (error) {
     if (error?.code === "ERR_MODULE_NOT_FOUND") return void 0;
@@ -10728,7 +10910,11 @@ async function apply(ctx, config) {
     ctx.logger.info(`stratagate-memory prepared ${legacyMigration.migrated} legacy Session generation(s) for DSH ${compatibility.cliVersion}`);
   }
   await mkdir2(dirname3(resolved.database), { recursive: true });
-  const models = new DshModelBridge(ctx, resolved);
+  const models = new DshModelBridge(
+    ctx,
+    resolved,
+    isLiveConfigValue(config.structuredReasoningEffort) ? () => liveConfigValue(config.structuredReasoningEffort) ?? "auto" : void 0
+  );
   const runtime = new StrataGateRuntime(resolved, models, (error) => {
     ctx.logger.error(`stratagate-memory ingestion failed: ${renderError(error)}`);
   }, async (session) => {
@@ -10743,18 +10929,17 @@ async function apply(ctx, config) {
   };
   let effortSource = () => effortEntry;
   ctx.inject(["settings"], (settingsCtx) => {
-    settingsCtx.settings.installSection(
-      ctx,
-      STRATAGATE_SETTINGS_NAMESPACE,
-      StructuredReasoningEffortSettings,
-      effortEntry,
-      {
+    const settings = settingsCtx.settings;
+    if (settings.installSection) {
+      settings.installSection(ctx, STRATAGATE_SETTINGS_NAMESPACE, StructuredReasoningEffortSettings, effortEntry, {
         setSource: (current) => {
           effortSource = current;
         },
         onChange: () => models.setStructuredReasoningEffort(effortSource().structuredReasoningEffort)
-      }
-    );
+      });
+    } else if (settings.configure) {
+      settingsCtx.effect(() => settings.configure({ auto: false }, ctx.fiber));
+    }
   });
   ctx.systemPrompt.section({ name: "tool:stratagate-memory", order: 113, text: MEMORY_PROTOCOL });
   ctx.systemPrompt.section({ name: "tool:stratagate-feedback", order: 114, text: FEEDBACK_PROTOCOL });
@@ -10788,7 +10973,7 @@ async function apply(ctx, config) {
         type: "text",
         text: `StrataGate retrieval batches are still unresolved: ${runtime.pendingBatchIds(agent.session).join(", ")}. Before ending this turn, close each one with memory_record_use using its batch_id and evidence_refs set to exactly the refs from that batch used in the answer, or [] if none were used.`
       }],
-      source: { kind: "plugin", plugin: name, form: "instructions" }
+      source: dshMessageSource("instructions")
     }));
   });
   registerMemoryTools(ctx, runtime);