dsh-more 0.0.8 → 0.0.9

package/dist/index.js

@@ -282,9 +282,13 @@ async function createEditedContinuation(ctx, sourceAgent, cut, editedText, child
     agentOptions: {
       ...(request?.provider ?? sourceAgent.options.provider) === void 0 ? {} : { provider: request?.provider ?? sourceAgent.options.provider },
       ...(request?.model ?? sourceAgent.options.model) === void 0 ? {} : { model: request?.model ?? sourceAgent.options.model },
-      ...sourceAgent.options.maxTokens === void 0 ? {} : { maxTokens: sourceAgent.options.maxTokens }
+      ...sourceAgent.options.maxTokens === void 0 ? {} : { maxTokens: sourceAgent.options.maxTokens },
+      ...(request?.reasoningEffort ?? sourceAgent.options.reasoningEffort) === void 0 ? {} : {
+        reasoningEffort: request?.reasoningEffort ?? sourceAgent.options.reasoningEffort
+      }
     },
-    setup: (agentCtx) => {
+    setup: (agentCtx, agent) => {
+      agent.inbox.clear();
       roster?.composeFrom(agentCtx, sourceAgent.ctx);
       releaseRuntimeContextReplay = replaySeedRuntimeContext(agentCtx, seed);
     }
@@ -475,7 +479,21 @@ function recordedDeletionSeqs(events) {
 function buildCleanSeed(source, selection) {
   const deleted = recordedDeletionSeqs(source.snapshotEvents());
   for (const seq of selection.shadowedSeqs) deleted.add(seq);
-  const survivors = source.surface.nodes.filter((seq) => !deleted.has(seq)).map((seq) => source.eventAt(seq)).filter((event) => event !== void 0 && source.deriveEventMessage(event) !== null);
+  const survivors = /* @__PURE__ */ new Map();
+  for (const seq of source.surface.nodes) {
+    if (deleted.has(seq)) continue;
+    const event = source.eventAt(seq);
+    if (event === void 0 || source.deriveEventMessage(event) === null) continue;
+    let anchor = event;
+    while (anchor.surfaceOp !== void 0 && anchor.surfaceOp !== "append") {
+      const previous = source.eventAt(anchor.surfaceOp.startSeq);
+      if (previous === void 0 || previous.seq >= anchor.seq) break;
+      anchor = previous;
+    }
+    const at = survivors.get(anchor.seq) ?? [];
+    at.push(event);
+    survivors.set(anchor.seq, at);
+  }
   const rebuilt = Session.create(SessionId4(`session-rebuild-${randomUUID3()}`));
   let turn = 0;
   let step = 0;
@@ -483,6 +501,8 @@ function buildCleanSeed(source, selection) {
   let stepOpen = false;
   let assistantSeen = false;
   const loggedCalls = /* @__PURE__ */ new Set();
+  const userSeqs = /* @__PURE__ */ new Map();
+  let sourceTurnOpen = false;
   const closeStep = () => {
     if (!stepOpen) return;
     rebuilt.append("step/end", { turn, step });
@@ -509,40 +529,87 @@ function buildCleanSeed(source, selection) {
       stepOpen = true;
     }
   };
-  for (const event of survivors) {
-    if (event.type === "user/message" && event.data.source.kind === "user" && turnOpen) closeTurn();
-    if (event.type === "assistant/message" && assistantSeen) closeStep();
-    openStep();
-    if (event.type === "user/message") {
-      rebuilt.append("user/message", event.data, { surfaceOp: "append" });
+  for (const entry of source.snapshotEvents()) {
+    if ([
+      "permission/preset",
+      "sandbox/mode",
+      "approval/policy",
+      "subagent/model-selection-policy",
+      "model/selection",
+      "request/header",
+      "request/context",
+      "agent-preset/selected"
+    ].includes(entry.type)) {
+      rebuilt.append(entry.type, entry.data);
       continue;
     }
-    if (event.type === "assistant/message") {
-      rebuilt.append("assistant/message", {
-        // Keep the durable stream and settlement metadata required by DSH 0.1.5.
-        // Only the reconstructed turn/step coordinates belong to the new log.
-        ...event.data,
-        turn,
-        step
-      }, { surfaceOp: "append" });
-      assistantSeen = true;
-      for (const call of event.data.message.content) {
-        if (call.type !== "tool-call") continue;
-        rebuilt.append("tool/call", { turn, step, callId: call.id, name: call.name, arguments: call.arguments });
-        loggedCalls.add(call.id);
-      }
+    if (entry.type === "turn/start") {
+      closeTurn();
+      sourceTurnOpen = true;
       continue;
     }
-    if (event.type === "tool/result") {
-      const callId = event.data.message.source.callId;
-      if (!loggedCalls.has(callId)) {
-        rebuilt.append("tool/call", { turn, step, callId: event.data.message.source.callId, name: "restored-tool", arguments: "{}" });
-        loggedCalls.add(callId);
+    if (entry.type === "turn/end") {
+      closeTurn();
+      sourceTurnOpen = false;
+      continue;
+    }
+    if (entry.type === "step/end") {
+      closeStep();
+      continue;
+    }
+    for (const event of survivors.get(entry.seq) ?? []) {
+      if (event.type === "user/message" && !sourceTurnOpen && event.data.source.kind !== "user") {
+        rebuilt.append("user/message", event.data, { surfaceOp: "append" });
+        continue;
+      }
+      if (event.type === "assistant/message" && assistantSeen) closeStep();
+      openStep();
+      if (event.type === "system/message") {
+        rebuilt.append("system/message", { ...event.data, turn, step }, { surfaceOp: "append" });
+        continue;
+      }
+      if (event.type === "user/message") {
+        const appended = rebuilt.append("user/message", event.data, { surfaceOp: "append" });
+        if (event.data.source.kind === "user") userSeqs.set(event.seq, appended.seq);
+        continue;
+      }
+      if (event.type === "assistant/message") {
+        rebuilt.append("assistant/message", {
+          // Keep the durable stream and settlement metadata required by DSH 0.1.5.
+          // Only the reconstructed turn/step coordinates belong to the new log.
+          ...event.data,
+          turn,
+          step
+        }, { surfaceOp: "append" });
+        assistantSeen = true;
+        for (const call of event.data.message.content) {
+          if (call.type !== "tool-call") continue;
+          rebuilt.append("tool/call", { turn, step, callId: call.id, name: call.name, arguments: call.arguments });
+          loggedCalls.add(call.id);
+        }
+        continue;
+      }
+      if (event.type === "tool/result") {
+        const callId = event.data.message.source.callId;
+        if (!loggedCalls.has(callId)) {
+          rebuilt.append("tool/call", { turn, step, callId: event.data.message.source.callId, name: "restored-tool", arguments: "{}" });
+          loggedCalls.add(callId);
+        }
+        rebuilt.append("tool/result", { turn, step, message: event.data.message, ...event.data.error === void 0 ? {} : { error: event.data.error }, ...event.data.meta === void 0 ? {} : { meta: event.data.meta } }, { surfaceOp: "append" });
       }
-      rebuilt.append("tool/result", { turn, step, message: event.data.message, ...event.data.error === void 0 ? {} : { error: event.data.error }, ...event.data.meta === void 0 ? {} : { meta: event.data.meta } }, { surfaceOp: "append" });
     }
   }
   closeTurn();
+  const title = source.snapshotEvents().findLast((event) => event.type === "session/title");
+  if (title?.type === "session/title") {
+    const messageSeqs = title.data.messageSeqs.flatMap((seq) => {
+      const mapped = userSeqs.get(seq);
+      return mapped === void 0 ? [] : [mapped];
+    });
+    if (title.data.source.kind === "user" || messageSeqs.length > 0) {
+      rebuilt.append("session/title", { ...title.data, messageSeqs });
+    }
+  }
   return rebuilt.snapshotEvents();
 }
 async function createDeletedContinuation(ctx, sourceAgent, selection, childId = SessionId4(`session-${randomUUID3()}`)) {
@@ -578,7 +645,10 @@ async function createDeletedContinuation(ctx, sourceAgent, selection, childId =
     agentOptions: {
       ...provider === void 0 ? {} : { provider },
       ...model === void 0 ? {} : { model },
-      ...sourceAgent.options.maxTokens === void 0 ? {} : { maxTokens: sourceAgent.options.maxTokens }
+      ...sourceAgent.options.maxTokens === void 0 ? {} : { maxTokens: sourceAgent.options.maxTokens },
+      ...(request?.reasoningEffort ?? sourceAgent.options.reasoningEffort) === void 0 ? {} : {
+        reasoningEffort: request?.reasoningEffort ?? sourceAgent.options.reasoningEffort
+      }
     },
     setup: (agentCtx) => {
       roster?.composeFrom(agentCtx, sourceAgent.ctx);

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-more",
   "description": "Practical patches for missing DSH Web context and history controls",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "entry": {
     "name": "dsh-more",
     "inject": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-more",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Practical patches for missing DeepSeek Harness Web context and history controls.",
   "type": "module",
   "license": "MIT",