@atlasharness/atlascode 0.1.8 → 0.1.10

package/dist/cli.js

@@ -791,6 +791,7 @@ async function executeToolUse(tu, assistantMsg, deps) {
       isError: true
     };
   }
+  const toolCallContext = deps.toolContext !== undefined ? { ...deps.toolContext, signal: deps.signal, checkPermission: deps.checkPermission } : { signal: deps.signal, checkPermission: deps.checkPermission };
   const schemaResult = validateInputBySchema(tu.input, tool.inputSchema);
   if (schemaResult.valid === false) {
     const discovered = deps.discoveredToolNames ?? new Set(deps.tools.map((t) => t.name));
@@ -806,7 +807,7 @@ async function executeToolUse(tu, assistantMsg, deps) {
       isError: true
     };
   }
-  const validation = await tool.validateInput?.(tu.input, { signal: deps.signal });
+  const validation = await tool.validateInput?.(tu.input, toolCallContext);
   if (validation && validation.result === false) {
     return {
       block: {
@@ -863,7 +864,7 @@ async function executeToolUse(tu, assistantMsg, deps) {
   let block;
   let isError = false;
   try {
-    const res = await tool.call(callInput, { signal: deps.signal, checkPermission: deps.checkPermission }, undefined, assistantMsg);
+    const res = await tool.call(callInput, toolCallContext, undefined, assistantMsg);
     block = tool.mapToolResultToToolResultBlockParam(res.data, tu.id);
   } catch (error) {
     block = {
@@ -80437,7 +80438,7 @@ var init_context = __esm(() => {
 // src/engine/query/loop.ts
 import { randomUUID as randomUUID18 } from "crypto";
 async function queryOneRound(deps, tools, messages) {
-  const resp = await deps.modelProvider.chat({
+  const chatArgs = {
     messages,
     role: deps.role,
     sessionModel: deps.sessionModel,
@@ -80448,8 +80449,30 @@ async function queryOneRound(deps, tools, messages) {
     responseFormat: deps.responseFormat,
     fallbackModel: deps.fallbackModel,
     options: deps.effortValue !== undefined ? { effortValue: deps.effortValue } : undefined
-  });
-  const assistantContent = resp.message.content ?? [];
+  };
+  let resp = await deps.modelProvider.chat(chatArgs);
+  let assistantContent = resp.message.content ?? [];
+  const isEmptyContent = (content) => {
+    if (!Array.isArray(content))
+      return true;
+    return !content.some((block) => {
+      const b = block;
+      if (!b)
+        return false;
+      if (b.type === "tool_use")
+        return true;
+      return b.type === "text" && String(b.text ?? "").trim() !== "";
+    });
+  };
+  if (isEmptyContent(assistantContent) && !deps.signal?.aborted) {
+    const retried = await deps.modelProvider.chat(chatArgs);
+    const retriedContent = retried.message.content ?? [];
+    if (!isEmptyContent(retriedContent)) {
+      resp = retried;
+      assistantContent = retriedContent;
+    }
+  }
+  const empty = isEmptyContent(assistantContent);
   const assistantMsg = {
     type: "assistant",
     role: "assistant",
@@ -80463,7 +80486,8 @@ async function queryOneRound(deps, tools, messages) {
     tools,
     signal: deps.signal,
     checkPermission: deps.checkPermission,
-    hooks: deps.hooks?.toolHooks
+    hooks: deps.hooks?.toolHooks,
+    toolContext: deps.toolContext
   });
   const toolResults = outcomes.map((o) => ({
     toolUseId: o.toolUseId,
@@ -80485,7 +80509,8 @@ async function queryOneRound(deps, tools, messages) {
     messages: [...messages, assistantMsg, ...resultMessages],
     toolResults,
     assistantContent,
-    stopReason: resp.message.stop_reason
+    stopReason: resp.message.stop_reason,
+    empty
   };
 }
 async function queryAgentLoop(deps, args) {
@@ -80556,7 +80581,15 @@ async function queryAgentLoop(deps, args) {
       tracking = { ...tracking, turnCounter: tracking.turnCounter + 1 };
     }
   }
-  const result = { messages, turns, terminated, tracking, lastRound };
+  const emptyTerminated = lastRound?.empty === true;
+  const result = {
+    messages,
+    turns,
+    terminated,
+    tracking,
+    lastRound,
+    emptyTerminated
+  };
   deps.emit?.({ type: "loop_end", result });
   return result;
 }
@@ -178813,6 +178846,7 @@ function getSimpleDoingTasksSection() {
   ];
   const items = [
     `The user will primarily request you to perform software engineering tasks. These may include solving bugs, adding new functionality, refactoring code, explaining code, and more. When given an unclear or generic instruction, consider it in the context of these software engineering tasks and the current working directory. For example, if the user asks you to change "methodName" to snake case, do not reply with just "method_name", instead find the method in the code and modify the code.`,
+    `When the working directory is empty or the target file does not yet exist, proceed directly to creating or writing what the task needs — do not spend turns probing the environment (ls, tool version checks, etc.) first. Only run a probe when you genuinely need its output to decide the next step.`,
     `You are highly capable and often allow users to complete ambitious tasks that would otherwise be too complex or take too long. You should defer to user judgement about whether a task is too large to attempt.`,
     `In general, do not propose changes to code you haven't read. If a user asks about or wants you to modify a file, read it first. Understand existing code before suggesting modifications.`,
     `Do not create files unless they're absolutely necessary for achieving your goal. Generally prefer editing an existing file to creating a new one, as this prevents file bloat and builds on existing work more effectively.`,
@@ -270014,9 +270048,6 @@ function AssistantMessageBlock(t0) {
       return t1;
     }
     case "thinking": {
-      if (!isTranscriptMode && !verbose) {
-        return null;
-      }
       const isLastThinking = !lastThinkingBlockId || thinkingBlockId === lastThinkingBlockId;
       const t1 = isTranscriptMode && !isLastThinking;
       let t2;
@@ -318883,6 +318914,7 @@ function buildAgentLoopParams(m) {
       canUseTool: m.canUseTool,
       toolUseContext: m.toolUseContext
     }),
+    toolContext: m.toolUseContext,
     hooks: createLoopHooks({
       options: {
         sessionId: getSessionId(),
@@ -475546,11 +475578,21 @@ Error: sandbox required but unavailable: ${reason}
       toolUseContext,
       querySource: getQuerySourceForREPL()
     });
-    for await (const event of queryEngineLoopStream({
+    const loopGen = queryEngineLoopStream({
       deps: loopDeps,
       args: loopArgs
-    })) {
-      onQueryEvent(event);
+    });
+    let loopResult;
+    {
+      let iter = await loopGen.next();
+      while (!iter.done) {
+        onQueryEvent(iter.value);
+        iter = await loopGen.next();
+      }
+      loopResult = iter.value;
+    }
+    if (loopResult?.emptyTerminated) {
+      setMessages((prev) => [...prev, createSystemMessage("本轮未产生任何响应（模型空输出，已重试仍为空）。请重试，或检查网关连接与模型配置。", "warning")]);
     }
     queryCheckpoint("query_end");
     resetLoadingState();
@@ -475598,6 +475640,9 @@ Error: sandbox required but unavailable: ${reason}
         }
       }
       await onQueryImpl(latestMessages, newMessages, abortController, shouldQuery, additionalAllowedTools, mainLoopModelParam, effort);
+    } catch (error) {
+      logError3(error);
+      setMessages((prev) => [...prev, createSystemMessage(`本轮执行出错：${errorMessage2(error)}。请重试。`, "error")]);
     } finally {
       if (queryGuard.end(thisGeneration)) {
         setLastQueryCompletionTime(Date.now());
@@ -493576,7 +493621,8 @@ async function binMain() {
     await runDevCli();
     return;
   }
-  const isTuiInvocation = argv.length === 0 || argv[0] === "code";
+  const hasPrintFlag = argv.includes("-p") || argv.includes("--print");
+  const isTuiInvocation = argv.length === 0 || argv[0] === "code" || argv[0].startsWith("-") && !hasPrintFlag;
   if (isTuiInvocation) {
     if (argv[0] === "code") {
       process.argv = [process.argv[0], process.argv[1], ...argv.slice(1)];

package/package.json

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