@wrongstack/core 0.268.0 → 0.269.0

package/dist/defaults/index.js

@@ -331,6 +331,9 @@ function formatCtx(ctx) {
   }
 }
 
+// src/storage/session-store.ts
+init_atomic_write();
+
 // src/utils/expect-defined.ts
 function expectDefined(value, label) {
   if (value === null || value === void 0) {
@@ -341,9 +344,6 @@ function expectDefined(value, label) {
   return value;
 }
 
-// src/storage/session-store.ts
-init_atomic_write();
-
 // src/utils/message-invariants.ts
 function repairToolUseAdjacency(messages) {
   const removedToolUses = [];
@@ -406,7 +406,7 @@ function hasToolResult(msg) {
 }
 function toolUseIds(msg) {
   const ids = /* @__PURE__ */ new Set();
-  if (!msg || msg.role !== "assistant") return ids;
+  if (msg?.role !== "assistant") return ids;
   for (const block of contentBlocks(msg)) {
     if (block.type === "tool_use") ids.add(block.id);
   }
@@ -414,7 +414,7 @@ function toolUseIds(msg) {
 }
 function toolResultIds(msg) {
   const ids = /* @__PURE__ */ new Set();
-  if (!msg || msg.role !== "user") return ids;
+  if (msg?.role !== "user") return ids;
   for (const block of contentBlocks(msg)) {
     if (block.type === "tool_result") ids.add(block.tool_use_id);
   }
@@ -1206,8 +1206,19 @@ function calState(key) {
   return state;
 }
 var MIN_SAMPLES_FOR_CALIBRATION = 3;
+var MODEL_FAMILY_RATIO = {
+  // Anthropic: ~3.8-4.0 chars/token depending on model
+  claude: 3.8,
+  // OpenAI: ~4.0 chars/token
+  "gpt-4": 4,
+  "gpt-3.5": 4,
+  // Google: ~3.5 chars/token
+  gemini: 3.5,
+  // DeepSeek: ~3.5 chars/token
+  deepseek: 3.5
+};
 var ESTIMATE_CACHE = /* @__PURE__ */ new Map();
-var ESTIMATE_CACHE_MAX_SIZE = 1e4;
+var ESTIMATE_CACHE_MAX_SIZE = 5e4;
 function getCachedEstimate(key, compute) {
   const existing = ESTIMATE_CACHE.get(key);
   if (existing !== void 0) return existing;
@@ -1335,8 +1346,24 @@ function estimateRequestTokensCalibrated(messages, systemPrompt, tools, calibrat
       total: Math.round(result.total * safeRatio)
     };
   }
+  const fallbackRatio = getModelFamilyRatio(calibrationKey);
+  if (fallbackRatio !== null) {
+    return {
+      messages: Math.round(result.messages * fallbackRatio),
+      systemPrompt: Math.round(result.systemPrompt * fallbackRatio),
+      tools: Math.round(result.tools * fallbackRatio),
+      total: Math.round(result.total * fallbackRatio)
+    };
+  }
   return result;
 }
+function getModelFamilyRatio(calibrationKey) {
+  const lower = calibrationKey.toLowerCase();
+  for (const [family, ratio] of Object.entries(MODEL_FAMILY_RATIO)) {
+    if (lower.includes(family)) return ratio / 3.5;
+  }
+  return null;
+}
 
 // src/utils/tool-output-serializer.ts
 var DEFAULT_LIST_LIMIT = 500;
@@ -1347,6 +1374,7 @@ var GREP_MATCHES_PER_FILE = 3;
 var DIFF_INLINE_LINE_LIMIT = 260;
 var DIFF_HUNK_LIMIT = 8;
 var DIFF_HUNK_CONTEXT = 14;
+var GREP_LINE_RE = /^(.+?):(\d+):(.*)$/;
 function createToolOutputSerializer(opts = {}) {
   const capBytes = opts.perIterationOutputCapBytes ?? 1e5;
   function serialize(value, context = {}) {
@@ -1732,7 +1760,7 @@ ${renderStringList(passthrough, "", 50)}`);
   return sections.join("\n");
 }
 function parseGrepContentLine(line) {
-  const match = /^(.+?):(\d+):(.*)$/.exec(line);
+  const match = GREP_LINE_RE.exec(line);
   if (!match?.[1] || !match[2]) return void 0;
   return { file: match[1], line: match[2], text: match[3] ?? "" };
 }
@@ -1750,22 +1778,20 @@ function compactDiff(diff) {
   const hunks = lines.filter((line) => line.startsWith("@@")).length;
   const added = lines.filter((line) => line.startsWith("+") && !line.startsWith("+++")).length;
   const removed = lines.filter((line) => line.startsWith("-") && !line.startsWith("---")).length;
-  const selected = /* @__PURE__ */ new Set();
+  const intervals = [];
   let hunkCount = 0;
   for (let i = 0; i < lines.length; i++) {
     const line = lines[i] ?? "";
     if (line.startsWith("diff --git") || line.startsWith("--- ") || line.startsWith("+++ ")) {
-      selected.add(i);
+      intervals.push([i, i]);
       continue;
     }
     if (!line.startsWith("@@")) continue;
     if (hunkCount >= DIFF_HUNK_LIMIT) continue;
     hunkCount++;
-    for (let j = i; j <= Math.min(lines.length - 1, i + DIFF_HUNK_CONTEXT); j++) {
-      selected.add(j);
-    }
+    intervals.push([i, Math.min(lines.length - 1, i + DIFF_HUNK_CONTEXT)]);
   }
-  if (selected.size === 0) {
+  if (intervals.length === 0) {
     return joinSections([
       renderHeader("diff_summary", {
         files: fileCount,
@@ -1778,17 +1804,29 @@ function compactDiff(diff) {
       `[serializer omitted ${Math.max(0, lines.length - DIFF_INLINE_LINE_LIMIT)} diff line(s)]`
     ]);
   }
+  const merged = [intervals[0]];
+  for (let i = 1; i < intervals.length; i++) {
+    const last = merged[merged.length - 1];
+    const current = intervals[i];
+    if (current[0] <= last[1] + 1) {
+      last[1] = Math.max(last[1], current[1]);
+    } else {
+      merged.push(current);
+    }
+  }
   const excerpt = [];
-  let previous = -1;
-  for (const index of [...selected].sort((a, b) => a - b)) {
-    if (index > previous + 1) {
-      const omitted = previous === -1 ? index : index - previous - 1;
+  let prevLine = -1;
+  for (const [start, end] of merged) {
+    if (start > prevLine + 1) {
+      const omitted = prevLine === -1 ? start : start - prevLine - 1;
       excerpt.push(`[serializer omitted ${omitted} diff line(s)]`);
     }
-    excerpt.push(lines[index] ?? "");
-    previous = index;
+    for (let j = start; j <= end; j++) {
+      excerpt.push(lines[j] ?? "");
+    }
+    prevLine = end;
   }
-  const trailing = lines.length - previous - 1;
+  const trailing = lines.length - prevLine - 1;
   if (trailing > 0) excerpt.push(`[serializer omitted ${trailing} trailing diff line(s)]`);
   return joinSections([
     renderHeader("diff_summary", {
@@ -2062,6 +2100,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * processes. When the limit is reached, the oldest entry is evicted.
    */
   _loadCache = /* @__PURE__ */ new Map();
+  _indexCache = null;
   static LOAD_CACHE_MAX_ENTRIES = 50;
   constructor(opts) {
     this.dir = opts.dir;
@@ -2223,13 +2262,8 @@ var DefaultSessionStore = class _DefaultSessionStore {
     let errorMsg;
     let cacheHit = false;
     try {
-      let stat6;
-      try {
-        const s = await fsp2.stat(file);
-        stat6 = { mtimeMs: s.mtimeMs, size: s.size };
-      } catch (err) {
-        throw err;
-      }
+      const s = await fsp2.stat(file);
+      const stat6 = { mtimeMs: s.mtimeMs, size: s.size };
       const cached = this._loadCache.get(id);
       if (cached && cached.mtimeMs === stat6.mtimeMs && cached.size === stat6.size) {
         cacheHit = true;
@@ -2320,6 +2354,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
       await ensureDir(this.dir);
       const line = JSON.stringify(summary) + "\n";
       await fsp2.appendFile(this.indexFile, line, "utf8");
+      this._indexCache = null;
       this.indexAppendCount++;
       if (this.indexAppendCount >= _DefaultSessionStore.COMPACT_EVERY) {
         await this.compactIndex();
@@ -2334,6 +2369,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
       await ensureDir(this.dir);
       const line = JSON.stringify({ action: "delete", id }) + "\n";
       await fsp2.appendFile(this.indexFile, line, "utf8");
+      this._indexCache = null;
       this.indexAppendCount++;
     } catch {
     }
@@ -2353,6 +2389,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
       const lines = entries.map((s) => JSON.stringify(s)).join("\n") + "\n";
       await fsp2.writeFile(tmp, lines, "utf8");
       await fsp2.rename(tmp, this.indexFile);
+      this._indexCache = null;
     } catch (err) {
       outcome = "failure";
       errorMsg = toErrorMessage(err);
@@ -2366,10 +2403,22 @@ var DefaultSessionStore = class _DefaultSessionStore {
    * Returns empty array when the index doesn't exist or is corrupt.
    */
   async readIndex() {
+    let stat6;
+    try {
+      const s = await fsp2.stat(this.indexFile);
+      stat6 = { mtimeMs: s.mtimeMs, size: s.size };
+    } catch {
+      this._indexCache = null;
+      return [];
+    }
+    if (this._indexCache !== null && this._indexCache.mtimeMs === stat6.mtimeMs && this._indexCache.size === stat6.size) {
+      return [...this._indexCache.summaries];
+    }
     let raw;
     try {
       raw = await fsp2.readFile(this.indexFile, "utf8");
     } catch {
+      this._indexCache = null;
       return [];
     }
     const deleted = /* @__PURE__ */ new Set();
@@ -2389,7 +2438,9 @@ var DefaultSessionStore = class _DefaultSessionStore {
       } catch {
       }
     }
-    return Array.from(seen.values());
+    const summaries = Array.from(seen.values());
+    this._indexCache = { ...stat6, summaries };
+    return [...summaries];
   }
   /**
    * Rebuild the index from disk by scanning all sessions and writing a
@@ -2403,6 +2454,7 @@ var DefaultSessionStore = class _DefaultSessionStore {
     const lines = valid.map((s) => JSON.stringify(s)).join("\n") + "\n";
     await fsp2.writeFile(tmp, lines, "utf8");
     await fsp2.rename(tmp, this.indexFile);
+    this._indexCache = null;
     return valid.length;
   }
   /** Recursively collect session IDs from date-shard subdirectories.
@@ -3102,6 +3154,12 @@ var FileSessionWriter = class _FileSessionWriter {
       files
     });
   }
+  /**
+   * Truncate the session file to the checkpoint with the given promptIndex,
+   * removing all events that follow it. Uses a single-pass byte-offset scan
+   * so post-checkpoint content is never read or parsed — O(1) memory instead
+   * of O(N) JSON.parse calls over the full file.
+   */
   async truncateToCheckpoint(targetPromptIndex) {
     if (!this.filePath) return 0;
     if (this.flushTimer) {
@@ -3110,51 +3168,118 @@ var FileSessionWriter = class _FileSessionWriter {
     }
     await this.flushBuffer();
     await this.writeChain;
-    const raw = await fsp2.readFile(this.filePath, "utf8");
-    const lines = raw.split("\n");
-    const kept = [];
+    const CHUNK_SIZE = 65536;
+    let fd;
+    let fileOffset = 0;
+    let lineStartOffset = 0;
+    let checkpointByteOffset = -1;
     let removedCount = 0;
-    let targetCheckpointLine = -1;
-    let afterTarget = false;
-    for (let i = 0; i < lines.length; i++) {
-      const line = expectDefined(lines[i]);
-      if (!line.trim()) continue;
-      let event;
-      try {
-        event = JSON.parse(line);
-      } catch {
-        kept.push(line);
-        continue;
-      }
-      if (event.type === "checkpoint") {
-        if (event.promptIndex === targetPromptIndex) {
-          targetCheckpointLine = kept.length;
-          afterTarget = true;
-        } else if (event.promptIndex > targetPromptIndex) {
-          afterTarget = true;
+    let targetCheckpointSeen = false;
+    try {
+      fd = await fsp2.open(this.filePath, "r", 384);
+      while (true) {
+        const buf = Buffer.alloc(CHUNK_SIZE);
+        const { bytesRead } = await fd.read(buf, 0, CHUNK_SIZE, fileOffset);
+        if (bytesRead === 0) break;
+        let chunkPos = 0;
+        while (chunkPos < bytesRead) {
+          const idx = buf.indexOf("\n", chunkPos);
+          if (idx === -1) {
+            lineStartOffset = fileOffset + chunkPos;
+            break;
+          }
+          if (checkpointByteOffset !== -1) {
+            removedCount++;
+          } else {
+            const lineBytes = buf.subarray(chunkPos, idx);
+            const line = new TextDecoder("utf-8", { fatal: false }).decode(lineBytes);
+            if (line.trim()) {
+              try {
+                const event = JSON.parse(line);
+                if (event.type === "checkpoint") {
+                  if (event.promptIndex === targetPromptIndex) {
+                    checkpointByteOffset = lineStartOffset;
+                    targetCheckpointSeen = true;
+                  } else if (event.promptIndex !== void 0 && event.promptIndex > targetPromptIndex) {
+                    checkpointByteOffset = lineStartOffset;
+                  }
+                } else if (targetCheckpointSeen && event.promptIndex !== void 0 && event.promptIndex > targetPromptIndex) {
+                  removedCount++;
+                } else if (targetCheckpointSeen && event.promptIndex === void 0) {
+                  removedCount++;
+                } else if (!targetCheckpointSeen && event.promptIndex === void 0) {
+                  removedCount++;
+                } else if (!targetCheckpointSeen && event.promptIndex !== void 0 && event.promptIndex > targetPromptIndex) {
+                  removedCount++;
+                }
+              } catch {
+              }
+            }
+          }
+          chunkPos = idx + 1;
+          lineStartOffset = fileOffset + chunkPos;
         }
-      }
-      if (event.promptIndex !== void 0 && event.promptIndex > targetPromptIndex) {
-        removedCount++;
-      } else if (event.promptIndex === void 0) {
-        if (!afterTarget || targetCheckpointLine === -1) {
-          kept.push(line);
-        } else {
-          removedCount++;
+        fileOffset += bytesRead;
+        if (chunkPos >= bytesRead) {
+          lineStartOffset = fileOffset;
         }
-      } else {
-        kept.push(line);
       }
+    } finally {
+      await fd?.close();
     }
-    const truncated = kept.join("\n");
+    if (checkpointByteOffset === -1) return 0;
+    await this.writeChain;
+    await this.handle.close();
     const tmpPath = `${this.filePath}.rewind.tmp`;
-    await fsp2.writeFile(tmpPath, truncated + "\n", "utf8");
+    const src = await fsp2.open(this.filePath, "r", 384);
     try {
-      await this.handle.close();
+      const statResult = await src.stat();
+      const totalSize = statResult.size;
+      const prefixBytes = checkpointByteOffset;
+      let newlineAfterCheckpoint = prefixBytes;
+      if (prefixBytes < totalSize) {
+        const probeBuf = Buffer.alloc(Math.min(CHUNK_SIZE, totalSize - prefixBytes));
+        const { bytesRead: probeRead } = await src.read(probeBuf, 0, probeBuf.length, prefixBytes);
+        if (probeRead > 0) {
+          const nl = probeBuf.indexOf("\n");
+          newlineAfterCheckpoint = nl !== -1 ? prefixBytes + nl + 1 : totalSize;
+        }
+      } else {
+        newlineAfterCheckpoint = totalSize;
+      }
+      const writeFd = await fsp2.open(tmpPath, "w", 384);
+      try {
+        let copied = 0;
+        let readOffset = 0;
+        while (readOffset < newlineAfterCheckpoint) {
+          const toCopy = Math.min(CHUNK_SIZE, newlineAfterCheckpoint - readOffset);
+          const copyBuf = Buffer.alloc(toCopy);
+          const { bytesRead: r } = await src.read(copyBuf, 0, toCopy, readOffset);
+          if (r === 0) break;
+          await writeFd.write(copyBuf, 0, r);
+          readOffset += r;
+          copied += r;
+        }
+        const raw = await fsp2.readFile(this.filePath);
+        const tail = raw.subarray(newlineAfterCheckpoint).toString("utf8");
+        for (const line of tail.split("\n")) {
+          if (!line.trim()) continue;
+          try {
+            JSON.parse(line);
+          } catch {
+            await writeFd.write(`${line}
+`, void 0, "utf8");
+          }
+        }
+      } finally {
+        await writeFd.close();
+      }
+      await src.close();
       await fsp2.rename(tmpPath, this.filePath);
       this.handle = await fsp2.open(this.filePath, "a", 384);
     } catch (err) {
       await fsp2.unlink(tmpPath).catch(() => void 0);
+      this.handle = await fsp2.open(this.filePath, "a", 384).catch(() => this.handle);
       throw err;
     }
     await this.append({
@@ -3554,6 +3679,7 @@ var MEMORY_TYPE_LABELS = {
 init_atomic_write();
 var TYPE_PRIORITY_RE = /^\[(\w+)\|(\w+)\]\s+/;
 var TAG_RE = /#([\w-]+)/g;
+var MAX_MEMORY_CONSOLIDATE_BACKUPS = 5;
 function formatMetadata(entry) {
   const parts = [];
   if (entry.type && entry.priority) {
@@ -3746,6 +3872,7 @@ ${line}`;
     const backup = `${file}.bak.${Date.now()}`;
     try {
       await fsp2.copyFile(file, backup);
+      await pruneConsolidateBackups(file);
     } catch {
     }
     try {
@@ -3756,6 +3883,20 @@ ${line}`;
     return removed;
   }
 };
+async function pruneConsolidateBackups(file) {
+  const dir = path4.dirname(file);
+  const base = path4.basename(file);
+  const prefix = `${base}.bak.`;
+  const backups = (await fsp2.readdir(dir)).filter((name) => name.startsWith(prefix)).sort().reverse();
+  await Promise.all(
+    backups.slice(MAX_MEMORY_CONSOLIDATE_BACKUPS).map(async (name) => {
+      try {
+        await fsp2.unlink(path4.join(dir, name));
+      } catch {
+      }
+    })
+  );
+}
 function parseEntries(raw, scope = "project-memory") {
   const entries = [];
   for (const line of raw.split("\n")) {
@@ -4935,7 +5076,9 @@ var BEHAVIOR_DEFAULTS = {
     plugins: true,
     memory: true,
     modelsRegistry: true,
-    skills: true
+    skills: true,
+    tokenSavingMode: "off",
+    allowOutsideProjectRoot: true
   },
   mcpServers: {},
   indexing: {
@@ -4944,7 +5087,8 @@ var BEHAVIOR_DEFAULTS = {
     watchExternal: true,
     debounceMs: 400
   },
-  session: { ...DEFAULT_SESSION_LOGGING_CONFIG }
+  session: { ...DEFAULT_SESSION_LOGGING_CONFIG },
+  autonomy: { autoProceedDelayMs: DEFAULT_AUTONOMY_CONFIG.autoProceedDelayMs }
 };
 function envBool(v) {
   return !/^(0|false|no|off)$/i.test(v.trim());
@@ -5951,7 +6095,7 @@ function createSessionEventBridge(writer, level = "standard", options = {}) {
       if (!shouldSample(event)) return;
       try {
         await target.append(event);
-      } catch (err) {
+      } catch (_err) {
       }
     },
     async appendBatch(events) {
@@ -9625,6 +9769,7 @@ ${post.additionalContext}`;
       } catch (err) {
         const msg = toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
+        const { category, retryable, detail } = classifyToolError(err);
         this.opts.renderer?.writeToolResult(tool.name, scrubbed, true);
         const result = {
           type: "tool_result",
@@ -9635,6 +9780,9 @@ ${post.additionalContext}`;
         budget = this.budgetForString(result.content, budget);
         if (err instanceof Error) span?.recordError(err);
         span?.setAttribute("tool.is_error", true);
+        span?.setAttribute("tool.error_category", category);
+        span?.setAttribute("tool.error_retryable", retryable);
+        if (detail) span?.setAttribute("tool.error_detail", detail);
         return { result, tool, durationMs: Date.now() - start };
       } finally {
         span?.end();
@@ -9646,6 +9794,9 @@ ${post.additionalContext}`;
       } catch (err) {
         const msg = toErrorMessage(err);
         const scrubbed = this.opts.secretScrubber.scrub(msg);
+        const { category, retryable, detail } = classifyToolError(err);
+        const tool = this.registry.get(use.name);
+        this.opts.renderer?.writeToolResult(tool?.name ?? use.name, scrubbed, true);
         const result = {
           type: "tool_result",
           tool_use_id: use.id,
@@ -9653,7 +9804,7 @@ ${post.additionalContext}`;
           is_error: true
         };
         budget = this.budgetForString(result.content, budget);
-        return { result, tool: this.registry.get(use.name), durationMs: 0 };
+        return { result, tool, durationMs: 0 };
       }
     };
     if (strategy === "sequential") {
@@ -9885,6 +10036,58 @@ function extractMalformedRaw(input) {
   }
 }
 var TOOL_OUTPUT_ARTIFACT_THRESHOLD_BYTES = 64 * 1024;
+function classifyToolError(err) {
+  if (err instanceof Error && err.name === "AbortError") {
+    return { category: "fatal" /* FATAL */, retryable: false, detail: "aborted" };
+  }
+  if (err instanceof Error && "code" in err) {
+    const code = err.code;
+    switch (code) {
+      case "ETIMEDOUT":
+      case "ECONNRESET":
+      case "ECONNREFUSED":
+      case "ENETUNREACH":
+      case "EHOSTUNREACH":
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: code };
+      case "ENOENT":
+      case "ENOTDIR":
+        return { category: "not_found" /* NOT_FOUND */, retryable: false, detail: code };
+      case "EACCES":
+      case "EPERM":
+        return { category: "permission" /* PERMISSION */, retryable: false, detail: code };
+      case "EBUSY":
+      case "EMFILE":
+      case "ENFILE":
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: code };
+    }
+  }
+  if (err instanceof Error && "response" in err) {
+    const response = err.response;
+    const status = response?.status;
+    if (status !== void 0) {
+      if (status === 429 || status === 503 || status === 502 || status === 504) {
+        return { category: "transient" /* TRANSIENT */, retryable: true, detail: `HTTP ${status}` };
+      }
+      if (status === 404 || status === 410) {
+        return { category: "not_found" /* NOT_FOUND */, retryable: false, detail: `HTTP ${status}` };
+      }
+      if (status === 401 || status === 403) {
+        return { category: "permission" /* PERMISSION */, retryable: false, detail: `HTTP ${status}` };
+      }
+      if (status === 400) {
+        return { category: "validation" /* VALIDATION */, retryable: false, detail: `HTTP ${status}` };
+      }
+    }
+  }
+  if (err instanceof Error && err.message.includes("validation")) {
+    return { category: "validation" /* VALIDATION */, retryable: false, detail: "validation" };
+  }
+  return {
+    category: "fatal" /* FATAL */,
+    retryable: false,
+    detail: err instanceof Error ? err.message.slice(0, 100) : String(err).slice(0, 100)
+  };
+}
 async function maybePersistLargeToolOutput(toolName, content, budget) {
   const bytes = Buffer.byteLength(content, "utf8");
   if (bytes <= Math.min(TOOL_OUTPUT_ARTIFACT_THRESHOLD_BYTES, Math.max(0, budget))) {
@@ -10827,8 +11030,8 @@ ${recentJournal}` : "No prior iterations.",
       await saveGoal(this.goalPath, abandoned, this.opts.events);
     }
     try {
-      const { unlink: unlink10 } = await import('fs/promises');
-      await unlink10(this.goalPath);
+      const { unlink: unlink11 } = await import('fs/promises');
+      await unlink11(this.goalPath);
     } catch {
     }
     this.opts.onEternalStop?.();
@@ -11211,7 +11414,7 @@ var SubagentBudget = class _SubagentBudget {
    */
   _busRequestDecision(entry) {
     const bus = this._events;
-    if (!bus || !bus.hasListenerFor("budget.threshold_reached")) {
+    if (!bus?.hasListenerFor("budget.threshold_reached")) {
       return Promise.resolve("stop");
     }
     return new Promise((resolve6) => {