@atlasharness/atlascode 0.1.52 → 0.1.54

package/dist/cli.js

@@ -85608,7 +85608,7 @@ function findDeferredToolUseState(conversation) {
   return { toolUseId, toolName, deferReason };
 }
 async function reEvaluateDeferredToolCalls(params) {
-  const { conversation, toolUseId, tools, toolHooks, checkPermission } = params;
+  const { conversation, toolUseId, tools, toolHooks, checkPermission, signal, toolContext } = params;
   let tu;
   let assistantMsg;
   for (let i = conversation.length - 1;i >= 0; i--) {
@@ -85646,7 +85646,9 @@ async function reEvaluateDeferredToolCalls(params) {
   const outcome = await executeToolUse(tu, assistantMsg, {
     tools,
     hooks: toolHooks,
-    checkPermission
+    checkPermission,
+    signal,
+    toolContext
   });
   if (outcome.deferred) {
     const payload = {
@@ -85672,6 +85674,51 @@ async function reEvaluateDeferredToolCalls(params) {
   };
   return { suspended: false, messages: [...conversation, resultMsg] };
 }
+function recoverDeferredToolUseMarkers(messages, chain) {
+  const chainUuids = new Set;
+  for (const m of chain)
+    chainUuids.add(m.uuid);
+  const resolvedToolUseIds = new Set;
+  for (const m of messages.values()) {
+    const content = m.message?.content;
+    if (Array.isArray(content)) {
+      for (const b of content) {
+        const rec = b;
+        if (rec?.type === "tool_result" && typeof rec.tool_use_id === "string") {
+          resolvedToolUseIds.add(rec.tool_use_id);
+        }
+      }
+    }
+  }
+  const byParent = new Map;
+  for (const m of messages.values()) {
+    if (m.type !== "system" || m.subtype !== "deferred_tool_use")
+      continue;
+    if (chainUuids.has(m.uuid))
+      continue;
+    const pu = m.parentUuid;
+    if (!pu || !chainUuids.has(pu))
+      continue;
+    if (typeof m.tool_use_id === "string" && resolvedToolUseIds.has(m.tool_use_id))
+      continue;
+    const arr = byParent.get(pu);
+    if (arr)
+      arr.push(m);
+    else
+      byParent.set(pu, [m]);
+  }
+  if (byParent.size === 0)
+    return chain;
+  const out = [];
+  for (const m of chain) {
+    out.push(m);
+    const kids = byParent.get(m.uuid);
+    if (kids)
+      for (const k of kids)
+        out.push(k);
+  }
+  return out;
+}
 function resolveHeadlessTpc(tpc) {
   if (tpc)
     return tpc;
@@ -85828,7 +85875,8 @@ async function runHeadless(inputPrompt, options) {
   const loopDeps = {
     ...bundle.deps,
     signal: abortController.signal,
-    checkPermission
+    checkPermission,
+    toolContext: makeCtx()
   };
   const autoCompact = {
     contextWindow: (roleModel ? getProviderContextWindow(roleModel) : undefined) ?? 200000,
@@ -85965,7 +86013,9 @@ async function runHeadless(inputPrompt, options) {
         toolUseId: deferredState.toolUseId,
         tools,
         toolHooks: loopDeps.hooks?.toolHooks,
-        checkPermission
+        checkPermission,
+        signal: loopDeps.signal,
+        toolContext: loopDeps.toolContext
       });
       conversation = re.messages;
       if (loopDeps.transcript) {
@@ -86116,11 +86166,12 @@ async function loadResumedMessages(options) {
     return [];
   }
   const chain = buildConversationChain(loaded.messages, leafMessage);
+  const conversation = recoverDeferredToolUseMarkers(loaded.messages, chain);
   await processResumedConversation({
-    messages: chain,
+    messages: conversation,
     sessionId: resumedId
   }, { forkSession: false, sessionIdOverride: resumedId });
-  return chain;
+  return conversation;
 }
 var init_print = __esm(() => {
   init_engine();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlasharness/atlascode",
-  "version": "0.1.52",
+  "version": "0.1.54",
   "description": "AtlasCode \u2014 Coding Agent for the domestic computing ecosystem (Ascend NPU + domestic LLM backends)",
   "bin": {
     "atlas": "dist/cli.js",