stratagate-dsh 0.3.12 → 0.3.13

package/dist/plugin.js

@@ -2304,7 +2304,6 @@ function updateDreaming(state, events, command, now) {
   let run = state.dreaming;
   if (command.kind === "start") {
     if (run && ["running", "pausing", "paused"].includes(run.status)) throw new Error("A Dreaming run already exists; resume or terminate it");
-    if (command.tokenLimit !== void 0 && (!Number.isSafeInteger(command.tokenLimit) || command.tokenLimit <= 0)) throw new Error("Invalid token boundary");
     const topics = state.topics.filter((t) => !t.invalidated && t.sourceEventIds.length && t.sourceEventIds.every((id) => sources2.has(id)));
     const units = topics.flatMap((topic2) => {
       const ids2 = topic2.sourceEventIds.filter((id) => sources2.has(id));
@@ -2343,7 +2342,7 @@ function updateDreaming(state, events, command, now) {
       changedBatches: 0,
       readOffsets: {},
       idleCalls: 0,
-      tokenLimit: command.tokenLimit ?? null,
+      tokenLimit: null,
       activity: "\u6B63\u5728\u8BFB\u53D6\u76EE\u5F55",
       reason: null,
       createdAt: now,
@@ -2373,11 +2372,8 @@ function updateDreaming(state, events, command, now) {
   if (command.kind === "resume") {
     const expired = !!run.leaseUntil && Date.parse(run.leaseUntil) <= Date.parse(now);
     if (run.status !== "paused" && !(expired && ["running", "pausing"].includes(run.status))) throw new Error("Dreaming is not paused");
-    if (command.tokenLimit !== void 0) {
-      if (!Number.isSafeInteger(command.tokenLimit) || command.tokenLimit <= run.estimatedTokens) throw new Error("Token boundary must exceed consumed estimate");
-      run.tokenLimit = command.tokenLimit;
-    }
     if (run.policyVersion !== DREAMING_POLICY_VERSION) throw new Error("Dreaming policy changed; terminate this run and start again");
+    run.tokenLimit = null;
     run.status = "running";
     run.owner = command.owner;
     run.epoch++;
@@ -10438,9 +10434,7 @@ function dreamingPayload(memory, run) {
     lastWriteFailure: lastWriteFailure ?? null,
     retrievedEvidenceIds: Object.keys(run.evidenceVersions).slice(-100),
     totalRetrievedEvidence: Object.keys(run.evidenceVersions).length,
-    recentTools,
-    estimatedTokensConsumed: run.estimatedTokens,
-    tokenBoundary: run.tokenLimit
+    recentTools
   };
 }
 function dreamingEstimatedTokens(payload, action) {
@@ -10449,19 +10443,19 @@ function dreamingEstimatedTokens(payload, action) {
 function dreamingStatus(run) {
   if (!run) return null;
   const interrupted = ["running", "pausing"].includes(run.status) && !!run.leaseUntil && Date.parse(run.leaseUntil) <= Date.now();
+  const legacyBoundary = run.status === "paused" && run.tokenLimit != null && /消耗边界/.test(run.reason ?? "");
   return {
     id: run.id,
     sessionId: run.sessionId ?? null,
     status: interrupted ? "paused" : run.status,
     scope: run.scope,
     activity: interrupted ? "\u5DF2\u6682\u505C" : run.activity,
-    reason: interrupted ? "\u4E0A\u6B21\u8FD0\u884C\u5DF2\u4E2D\u65AD\uFF0C\u53EF\u4EE5\u7EE7\u7EED" : run.reason,
+    reason: interrupted ? "\u4E0A\u6B21\u8FD0\u884C\u5DF2\u4E2D\u65AD\uFF0C\u53EF\u4EE5\u7EE7\u7EED" : legacyBoundary ? "\u4E0A\u6B21\u6574\u7406\u5DF2\u6682\u505C\uFF0C\u53EF\u4EE5\u7EE7\u7EED\uFF1B\u5DF2\u5B8C\u6210\u7684\u4FEE\u6539\u5DF2\u4FDD\u5B58\u3002" : run.reason,
     completed: run.cursor,
     total: run.units.length,
     changedBatches: run.changedBatches,
     calls: run.calls,
     estimatedTokens: run.estimatedTokens,
-    tokenLimit: run.tokenLimit,
     updatedAt: run.updatedAt
   };
 }
@@ -11883,14 +11877,14 @@ var StrataGateRuntime = class {
     const run = await this.dreamingRun(namespace, id);
     return { sessionId: await this.dreamingHost.open(namespace, run) };
   }
-  async adminDreamingControl(namespace, action, id, tokenLimit) {
+  async adminDreamingControl(namespace, action, id) {
     if (this.closed) throw new Error("Runtime is closed");
     if ((action === "start" || action === "resume") && [...this.dreamingRuns.keys()].some((key) => key !== namespace)) {
       throw new Error("\u53E6\u4E00\u4E2A\u8BB0\u5FC6\u7A7A\u95F4\u6B63\u5728 Dreaming\uFF0C\u8BF7\u7B49\u5F85\u5B8C\u6210\u6216\u5148\u6682\u505C\u5B83");
     }
     let command;
-    if (action === "start") command = { kind: "start", owner: this.dreamingOwner, ...tokenLimit !== void 0 ? { tokenLimit } : {} };
-    else if (action === "resume" && id) command = { kind: "resume", id, owner: this.dreamingOwner, ...tokenLimit !== void 0 ? { tokenLimit } : {} };
+    if (action === "start") command = { kind: "start", owner: this.dreamingOwner };
+    else if (action === "resume" && id) command = { kind: "resume", id, owner: this.dreamingOwner };
     else if ((action === "pause" || action === "terminate") && id) command = { kind: action, id };
     else throw new Error("Invalid Dreaming control");
     const run = await this.retryExternalImportWrite(namespace, (memory) => memory.dreaming(command.kind === "start" && this.agentMemoryRetrievalWeight <= 0 ? { ...command, allowedEventIds: memory.listEvents().filter((event) => event.status !== "forgotten" && event.status !== "archived").map((event) => event.id) } : command));
@@ -11936,10 +11930,6 @@ var StrataGateRuntime = class {
           } finally {
             if (owned) await memory.close();
           }
-          if (run.tokenLimit !== null && run.estimatedTokens + estimateTokens(JSON.stringify(payload)) + 256 > run.tokenLimit) {
-            await mutate({ kind: "suspend", ...claim, reason: "\u5DF2\u8FBE\u5230\u672C\u8F6E token \u6D88\u8017\u8FB9\u754C\uFF0C\u8FDB\u5EA6\u5DF2\u4FDD\u5B58\uFF1B\u63D0\u9AD8\u8FB9\u754C\u540E\u53EF\u4EE5\u7EE7\u7EED\uFF08\u6D88\u8017\u4E3A\u4F30\u7B97\uFF09" });
-            return;
-          }
           const action = await this.models.runDetached(`dreaming:${run.id}`, () => this.models.dreamingStep(payload), controller.signal);
           if (controller.signal.aborted) return;
           const repeated = run.trace.filter((entry) => entry.tool === action.tool && JSON.stringify(entry.args) === JSON.stringify(action.args)).length;
@@ -13397,19 +13387,7 @@ ${profile}
     });
     scoped.on("agent/request", async (_payload, next) => {
       const config = await next();
-      const run = await this.runtime.dreamingRun(binding.namespace, binding.id);
-      const input = estimateTokens(JSON.stringify({ messages: [
-        ...binding.agent.session.deriveMessages(),
-        ...binding.pendingMessages ?? [],
-        { role: "system", content: [{ type: "text", text: this.systemPrompt() }] }
-      ], tools: modelTools })) + 1024;
-      if (run.tokenLimit !== null && run.estimatedTokens + input + 256 > run.tokenLimit) {
-        this.keepDirections(binding, binding.pendingMessages ?? []);
-        if (run.status !== "completed") await this.runtime.dreamingMutate(binding.namespace, run, { kind: "suspend", reason: "\u5DF2\u8FBE\u5230\u672C\u8F6E\u6D88\u8017\u8FB9\u754C\uFF0C\u8FDB\u5EA6\u5DF2\u4FDD\u5B58\uFF1B\u63D0\u9AD8\u8FB9\u754C\u540E\u53EF\u4EE5\u7EE7\u7EED\uFF08\u6D88\u8017\u4E3A\u4F30\u7B97\uFF09" });
-        throw new Error("Dreaming consumption boundary reached");
-      }
-      const remaining = run.tokenLimit === null ? RESPONSE_TOKEN_LIMIT : run.tokenLimit - run.estimatedTokens - input;
-      return { ...config, maxTokens: Math.min(RESPONSE_TOKEN_LIMIT, remaining) };
+      return { ...config, maxTokens: RESPONSE_TOKEN_LIMIT };
     });
     const runtime = this.runtime;
     scoped.on("llm/stream", async function* (options, next) {
@@ -13420,10 +13398,6 @@ ${profile}
       await binding.accounting;
       const run = await runtime.dreamingRun(binding.namespace, binding.id);
       const input = estimateTokens(JSON.stringify({ messages: options.messages, tools: options.tools ?? [] }));
-      if (run.tokenLimit !== null && run.estimatedTokens + input + (options.maxTokens ?? 32768) > run.tokenLimit) {
-        if (run.status !== "completed") await runtime.dreamingMutate(binding.namespace, run, { kind: "suspend", reason: "\u5B9E\u9645\u6A21\u578B\u8BF7\u6C42\u8FBE\u5230\u672C\u8F6E\u6D88\u8017\u8FB9\u754C\uFF0C\u8FDB\u5EA6\u5DF2\u4FDD\u5B58\uFF08\u6D88\u8017\u4E3A\u4F30\u7B97\uFF09" });
-        throw new Error("Dreaming consumption boundary reached before model dispatch");
-      }
       const saved = await runtime.dreamingMutate(binding.namespace, run, { kind: "model-step", estimatedTokens: input });
       if (saved.status !== "running" && saved.status !== "completed") throw new Error("Dreaming paused at safe boundary");
       binding.pendingMessages = [];
@@ -15352,10 +15326,8 @@ async function handleAdminRequest(runtime, req, res) {
           sendJson(res, 200, await runtime.adminDreamingSession(namespace, id));
           return;
         }
-        const rawLimit = url.searchParams.get("tokenLimit");
-        const tokenLimit = rawLimit === null || rawLimit === "" ? void 0 : Number(rawLimit);
-        if (!["start", "pause", "resume", "terminate"].includes(action) || action !== "start" && !id || tokenLimit !== void 0 && (!Number.isSafeInteger(tokenLimit) || tokenLimit <= 0)) throw new AdminHttpError(400, "Invalid Dreaming control");
-        sendJson(res, 200, await runtime.adminDreamingControl(namespace, action, id, tokenLimit));
+        if (!["start", "pause", "resume", "terminate"].includes(action) || action !== "start" && !id) throw new AdminHttpError(400, "Invalid Dreaming control");
+        sendJson(res, 200, await runtime.adminDreamingControl(namespace, action, id));
       } else throw new AdminHttpError(405, "Dreaming requires GET or POST");
     } else if (path === "/api/stratagate/import") {
       if (req.method === "GET") {