@atlasharness/atlascode 0.1.63 → 0.1.65

package/dist/cli.js

@@ -26901,7 +26901,39 @@ function llmTimeoutRemediationHint(error, currentTimeoutMs) {
   const head = typeof currentTimeoutMs === "number" && currentTimeoutMs > 0 ? `当前超时 ${Math.round(currentTimeoutMs / 1000)}s` : "慢模型长生成可能超过缺省超时";
   return `LLM 请求超时（${head}）。可调大：env ATLAS_LLM_TIMEOUT=<毫秒> 或 settings.json llmTimeoutMs 键（上限 ${Math.round(LLM_TIMEOUT_CAP_MS / 60000)}min）。`;
 }
-function gatewayUnreachableRemediationHint(error) {
+function describeEndpointFailure(baseURL) {
+  if (!baseURL)
+    return "LLM 端点";
+  let host;
+  let port;
+  try {
+    const u = new URL(baseURL);
+    host = u.hostname;
+    port = u.port;
+  } catch {
+    return "LLM 端点";
+  }
+  if (host === "localhost" || host === "0.0.0.0" || host === "[::1]" || host.startsWith("127.")) {
+    return port ? `本地端口 ${port}` : "本地网关";
+  }
+  const knownProviders = [
+    [/api\.deepseek\.com$/i, "DeepSeek"],
+    [/api\.openai\.com$/i, "OpenAI"],
+    [/^(dashscope|api)\.aliyuncs\.com$/i, "阿里百炼"],
+    [/api\.moonshot\.cn$/i, "Kimi"],
+    [/api\.minimax\.chat$/i, "MiniMax"],
+    [/api\.baichuan-ai\.com$/i, "百川"],
+    [/api\.01\.ai$/i, "零一万物"],
+    [/api\.siliconflow\.cn$/i, "硅基流动"],
+    [/api\.lkeap\.com$/i, "腾讯混元"]
+  ];
+  for (const [re, name] of knownProviders) {
+    if (re.test(host))
+      return `${name} 服务`;
+  }
+  return host;
+}
+function gatewayUnreachableRemediationHint(error, endpointLabel) {
   if (!error || typeof error !== "object")
     return null;
   const e = error;
@@ -26918,7 +26950,7 @@ function gatewayUnreachableRemediationHint(error) {
   const isNetworkErrno = /ECONNREFUSED|ECONNRESET|ENOTFOUND|ENETUNREACH|EHOSTUNREACH|EAI_AGAIN|fetch failed|socket hang up/i.test(haystack);
   if (!isSdkConnection && !isNetworkErrno)
     return null;
-  return "IFF 不可达：已切人工确认 —— /doctor 排查";
+  return `${endpointLabel ?? "LLM 端点"} 不可达：已切人工确认 —— /doctor 排查`;
 }
 function modelRetryBackoffMs(attempt, baseMs = MODEL_RETRY_BACKOFF_BASE_MS, capMs = MODEL_RETRY_BACKOFF_CAP_MS) {
   const base = Math.max(0, baseMs);
@@ -27824,6 +27856,18 @@ function setLlmTimeoutSettingsSource(next) {
 function getCurrentLlmTimeoutMs() {
   return resolveLlmTimeoutMs(process.env.ATLAS_LLM_TIMEOUT, llmTimeoutSettingsSource?.());
 }
+function getCurrentEndpointLabel(modelRef) {
+  let baseURL;
+  if (modelRef) {
+    const resolved = resolveModel(modelRef);
+    if (resolved?.baseURL)
+      baseURL = resolved.baseURL;
+  }
+  if (!baseURL) {
+    baseURL = getRoleConfig("small").baseURL;
+  }
+  return describeEndpointFailure(baseURL);
+}
 function resolveLlmTimeoutMs(envRaw = process.env.ATLAS_LLM_TIMEOUT, settingsMs) {
   const fromSettings = () => typeof settingsMs === "number" && Number.isInteger(settingsMs) && settingsMs >= 1 ? Math.min(settingsMs, LLM_TIMEOUT_CAP_MS) : LLM_TIMEOUT_DEFAULT_MS;
   if (envRaw === undefined || envRaw === "")
@@ -27847,6 +27891,7 @@ var init_modelprovider2 = __esm(() => {
   init_modelprovider();
   init_constants2();
   init_shared();
+  init_roles7();
   init_constants2();
   init_modelprovider();
   init_types2();
@@ -37047,9 +37092,9 @@ function formatAgentLine(agent) {
 function getPrompt(agents) {
   const list = agents.length > 0 ? agents.map(formatAgentLine).join(`
 `) : "- general-purpose: General-purpose agent for researching and executing multi-step tasks.";
-  return "Launch a subagent to run a self-contained task in an isolated context. " + "Provide a short description (3-5 words) and a fully self-contained prompt " + "(the subagent cannot see this conversation). " + "Be cost-aware about delegating: prefer to do the work inline in this " + "conversation for a small task with a known, bounded target (a single-file " + "edit, a quick lookup, a change you can finish without broad exploration) — " + "spawning a subagent has overhead. Delegate when the task is genuinely " + "parallelizable or would otherwise flood this context with material you do " + "not need to keep (a broad multi-file search, an isolated multi-step " + "implementation, or independent work that can run alongside your own). Keep " + "each delegated brief narrow and evidence-focused: name the exact goal, the " + "files or area, and the expected deliverable rather than a broad " + '"figure this out." Because the subagent cannot see this conversation, its ' + "prompt must be fully self-contained — state every constraint, file, and " + "reporting requirement it needs. " + `Available agent types and the tools they have access to:
+  return "Launch a subagent to run a self-contained task in an isolated context. " + "Provide a short description (3-5 words) and a fully self-contained prompt " + "(the subagent cannot see this conversation). " + "Be cost-aware about delegating: prefer to do the work inline in this " + "conversation for a small task with a known, bounded target (a single-file " + "edit, a quick lookup, a change you can finish without broad exploration) — " + "spawning a subagent has overhead. Delegate when the task is genuinely " + "parallelizable or would otherwise flood this context with material you do " + "not need to keep (a broad multi-file search, an isolated multi-step " + "implementation, or independent work that can run alongside your own). Keep " + "each delegated brief narrow and evidence-focused: name the exact goal, the " + "files or area, and the expected deliverable rather than a broad " + '"figure this out." Because the subagent cannot see this conversation, its ' + "prompt must be fully self-contained — state every constraint, file, and " + "reporting requirement it needs. " + "Set run_in_background to true to launch a subagent that runs while you " + "continue working in this conversation; you will receive a task-notification " + "when it completes. Use this only for genuinely parallel work, not to defer " + "a result you need before you can proceed. " + `Available agent types and the tools they have access to:
 ${list}
-` + `The ${AGENT_TOOL_NAME} tool runs the subagent and returns its final result ` + "when it completes; act on that result once it is returned.";
+` + `The ${AGENT_TOOL_NAME} tool runs the subagent and returns its final result ` + "when it completes; act on that result once it is returned. " + "Do not predict or assume what the subagent will find — wait for its " + "returned result and act on what it actually reports.";
 }
 var init_prompt = () => {};
 
@@ -37091,9 +37136,72 @@ async function runAgent(args) {
     turns: loopResult.turns
   };
 }
+function wrapPermissionGateForBackground(gate, onNeedsInput) {
+  if (!gate)
+    return;
+  return async (tool, input, callContext) => {
+    const verdict = await gate(tool, input, callContext);
+    if (verdict.ask) {
+      onNeedsInput({
+        toolName: tool.name,
+        reason: verdict.reason
+      });
+    }
+    return verdict;
+  };
+}
+async function runAsyncAgentLifecycle(args) {
+  const { description, toolUseId, signal, agentId } = args;
+  const wrappedCheckPermission = wrapPermissionGateForBackground(args.checkPermission, (req) => {
+    enqueueAgentNotification({
+      taskId: agentId,
+      description,
+      status: "needs_input",
+      inputRequest: `Permission required for ${req.toolName}${req.reason ? `: ${req.reason}` : ""}`,
+      ...toolUseId ? { toolUseId } : {}
+    });
+  });
+  try {
+    const { result } = await runAgent({
+      ...args,
+      checkPermission: wrappedCheckPermission
+    });
+    const finalMessage = result.content.map((b) => b.text).join("");
+    enqueueAgentNotification({
+      taskId: agentId,
+      description,
+      status: "completed",
+      finalMessage: finalMessage || undefined,
+      usage: {
+        totalTokens: result.totalTokens,
+        toolUses: result.totalToolUseCount,
+        durationMs: result.totalDurationMs
+      },
+      ...toolUseId ? { toolUseId } : {}
+    });
+  } catch (err) {
+    if (signal?.aborted) {
+      enqueueAgentNotification({
+        taskId: agentId,
+        description,
+        status: "killed",
+        ...toolUseId ? { toolUseId } : {}
+      });
+      return;
+    }
+    enqueueAgentNotification({
+      taskId: agentId,
+      description,
+      status: "failed",
+      error: err instanceof Error ? err.message : String(err),
+      ...toolUseId ? { toolUseId } : {}
+    });
+  }
+}
 var init_runAgent = __esm(() => {
   init_query2();
   init_agentToolUtils();
+  init_localAgentTask();
 });
 
 // src/engine/tools/agent/AgentTool.ts
@@ -37119,6 +37227,8 @@ var init_AgentTool = __esm(() => {
   init_prompt();
   init_runAgent();
   init_coordinator();
+  init_task2();
+  init_localAgentTask();
   AGENT_TOOL_INPUT_SCHEMA = {
     type: "object",
     properties: {
@@ -37137,6 +37247,10 @@ var init_AgentTool = __esm(() => {
       model: {
         enum: ["small", "premium", "fast"],
         description: "Optional model override for this agent. Takes precedence over the agent definition's model. If omitted, inherits from the parent."
+      },
+      run_in_background: {
+        type: "boolean",
+        description: "Set to true to run this agent in the background. You will be notified when it completes."
       }
     },
     required: ["description", "prompt"]
@@ -37173,6 +37287,13 @@ var init_AgentTool = __esm(() => {
 ` + text
         };
       }
+      if (c && c.status === "async_launched") {
+        return {
+          type: "tool_result",
+          tool_use_id: toolUseID,
+          content: "[agent launched in background] agentId=" + (c.agentId ?? "") + " output=" + (c.outputFile ?? "")
+        };
+      }
       return {
         type: "tool_result",
         tool_use_id: toolUseID,
@@ -37190,6 +37311,38 @@ var init_AgentTool = __esm(() => {
       const allowFanOut = isCoordinatorMode() && childSpawnDepth < MAX_WORKER_SPAWN_DEPTH;
       const resolvedTools = resolveAgentTools(agentDefinition, availableTools, allowFanOut).resolvedTools;
       const agentId = "agent-" + randomUUID5();
+      if (input.run_in_background) {
+        const outputFile = getTaskOutputPath(agentId);
+        runAsyncAgentLifecycle({
+          agentDefinition,
+          prompt: input.prompt,
+          tools: resolvedTools,
+          modelProvider,
+          parentRole,
+          overrideRole: input.model,
+          agentId,
+          spawnDepth: childSpawnDepth,
+          signal: ctx.signal,
+          checkPermission: ctx.checkPermission,
+          description: input.description
+        }).catch((err) => {
+          enqueueAgentNotification({
+            taskId: agentId,
+            description: input.description,
+            status: "failed",
+            error: err instanceof Error ? err.message : String(err)
+          });
+        });
+        return {
+          data: {
+            status: "async_launched",
+            agentId,
+            description: input.description,
+            prompt: input.prompt,
+            outputFile
+          }
+        };
+      }
       const { result } = await runAgent({
         agentDefinition,
         prompt: input.prompt,
@@ -79576,24 +79729,27 @@ function enqueueAgentNotification({
   usage,
   toolUseId,
   worktreePath,
-  worktreeBranch
+  worktreeBranch,
+  inputRequest
 }) {
-  let shouldEnqueue = false;
-  updateTaskState(taskId, setAppState, (task) => {
-    if (task.notified) {
-      return task;
+  if (setAppState && status !== "needs_input") {
+    let shouldEnqueue = false;
+    updateTaskState(taskId, setAppState, (task) => {
+      if (task.notified) {
+        return task;
+      }
+      shouldEnqueue = true;
+      return {
+        ...task,
+        notified: true
+      };
+    });
+    if (!shouldEnqueue) {
+      return;
     }
-    shouldEnqueue = true;
-    return {
-      ...task,
-      notified: true
-    };
-  });
-  if (!shouldEnqueue) {
-    return;
   }
   const escapedDescription = escapeXml(description);
-  const summary = status === "completed" ? `Agent "${escapedDescription}" completed` : status === "failed" ? `Agent "${escapedDescription}" failed: ${escapeXml(error || "Unknown error")}` : `Agent "${escapedDescription}" was stopped`;
+  const summary = status === "completed" ? `Agent "${escapedDescription}" completed` : status === "failed" ? `Agent "${escapedDescription}" failed: ${escapeXml(error || "Unknown error")}` : status === "killed" ? `Agent "${escapedDescription}" was stopped` : status === "needs_input" ? `Agent "${escapedDescription}" needs input: ${escapeXml(inputRequest || "Permission request or question pending")}` : `Agent "${escapedDescription}" ${escapeXml(status)}`;
   const outputPath = getTaskOutputPath(taskId);
   const toolUseIdLine = toolUseId ? `
 <${TOOL_USE_ID_TAG}>${escapeXml(toolUseId)}</${TOOL_USE_ID_TAG}>` : "";
@@ -180576,6 +180732,7 @@ __export(exports_engineCompat, {
   roughTokenCountEstimationForContent: () => roughTokenCountEstimationForContent,
   roughTokenCountEstimationForMessages: () => roughTokenCountEstimationForMessages,
   runAgent: () => runAgent,
+  runAsyncAgentLifecycle: () => runAsyncAgentLifecycle,
   runCleanupFunctions: () => runCleanupFunctions2,
   runHooksStream: () => runHooksStream,
   runPostCompactCleanup: () => runPostCompactCleanup,
@@ -180667,6 +180824,7 @@ __export(exports_engineCompat, {
   waitForSessionMemoryExtraction: () => waitForSessionMemoryExtraction,
   waitForTeammatesToBecomeIdle: () => waitForTeammatesToBecomeIdle,
   worktreeBranchName: () => worktreeBranchName,
+  wrapPermissionGateForBackground: () => wrapPermissionGateForBackground,
   writeCronTasks: () => writeCronTasks,
   writeToMailbox: () => writeToMailbox
 });
@@ -275816,7 +275974,7 @@ function extractPartialResult(messages) {
   }
   return;
 }
-async function runAsyncAgentLifecycle({
+async function runAsyncAgentLifecycle2({
   taskId,
   abortController,
   makeStream,
@@ -311087,7 +311245,7 @@ async function resumeAgentBackground({
     invocationEmitted: false
   };
   const wrapWithCwd = (fn) => resumedWorktreePath ? runWithCwdOverride(resumedWorktreePath, fn) : fn();
-  runWithAgentContext(asyncAgentContext, () => wrapWithCwd(() => runAsyncAgentLifecycle({
+  runWithAgentContext(asyncAgentContext, () => wrapWithCwd(() => runAsyncAgentLifecycle2({
     taskId: agentBackgroundTask.agentId,
     abortController: agentBackgroundTask.abortController,
     makeStream: (onCacheSafeParams) => runAgent2({
@@ -321015,6 +321173,10 @@ function buildAgentLoopParams(m) {
       toolUseContext: m.toolUseContext
     }),
     toolContext: m.toolUseContext,
+    hasPendingBackgroundTasks: () => {
+      const tasks = m.toolUseContext?.getAppState?.()?.tasks;
+      return tasks ? hasNonTerminalTasks(tasks) : false;
+    },
     hooks: createLoopHooks({
       options: {
         sessionId: getSessionId(),
@@ -321046,6 +321208,7 @@ function buildAgentLoopParams(m) {
 var init_agentLoopDeps = __esm(() => {
   init_modelprovider2();
   init_engine();
+  init_Task();
   init_settings3();
   init_shared();
   init_bootstrap();
@@ -366288,6 +366451,25 @@ var init_GlimmerMessage = __esm(() => {
   };
 });
 
+// src/tui/components/Spinner/spinnerGates.ts
+function getSpinnerDisplayGates(input) {
+  const { verbose, hasRunningTeammates, effectiveElapsedMs } = input;
+  const forceShow = verbose || hasRunningTeammates;
+  const wantsTimer = forceShow || effectiveElapsedMs > SHOW_TIMER_AFTER_MS;
+  return {
+    wantsTimer,
+    wantsTokens: forceShow || effectiveElapsedMs > SHOW_TOKENS_AFTER_MS,
+    wantsStatusIndicator: wantsTimer
+  };
+}
+function computeStallState(input) {
+  const { timeSinceLastToken, currentResponseLength, hasActiveTools } = input;
+  const isStalled = timeSinceLastToken > STALL_AFTER_MS && !hasActiveTools && currentResponseLength > 0;
+  const stalledIntensity = isStalled ? Math.min((timeSinceLastToken - STALL_AFTER_MS) / STALL_FADE_MS, 1) : 0;
+  return { isStalled, stalledIntensity };
+}
+var SHOW_TIMER_AFTER_MS = 1000, SHOW_TOKENS_AFTER_MS = 5000, STALL_AFTER_MS = 3000, STALL_FADE_MS = 2000;
+
 // src/tui/components/Spinner/useStalledAnimation.ts
 function useStalledAnimation(time, currentResponseLength, hasActiveTools = false, reducedMotion = false) {
   const lastTokenTime = import_react103.useRef(time);
@@ -366310,8 +366492,11 @@ function useStalledAnimation(time, currentResponseLength, hasActiveTools = false
   } else {
     timeSinceLastToken = time - mountTime.current;
   }
-  const isStalled = timeSinceLastToken > 3000 && !hasActiveTools;
-  const intensity = isStalled ? Math.min((timeSinceLastToken - 3000) / 2000, 1) : 0;
+  const { isStalled, stalledIntensity: intensity } = computeStallState({
+    timeSinceLastToken,
+    currentResponseLength,
+    hasActiveTools
+  });
   if (!reducedMotion && (intensity > 0 || stalledIntensityRef.current > 0)) {
     const dt = time - lastSmoothTime.current;
     if (dt >= 50) {
@@ -366340,17 +366525,6 @@ var init_useStalledAnimation = __esm(() => {
   import_react103 = __toESM(require_react(), 1);
 });
 
-// src/tui/components/Spinner/spinnerGates.ts
-function getSpinnerDisplayGates(input) {
-  const { verbose, hasRunningTeammates, effectiveElapsedMs } = input;
-  const forceShow = verbose || hasRunningTeammates;
-  return {
-    wantsTimer: forceShow || effectiveElapsedMs > SHOW_TIMER_AFTER_MS,
-    wantsTokens: forceShow || effectiveElapsedMs > SHOW_TOKENS_AFTER_MS
-  };
-}
-var SHOW_TIMER_AFTER_MS = 1000, SHOW_TOKENS_AFTER_MS = 5000;
-
 // src/tui/components/Spinner/SpinnerAnimationRow.tsx
 function SpinnerAnimationRow({
   mode,
@@ -366389,7 +366563,8 @@ function SpinnerAnimationRow({
   } = useStalledAnimation(time, currentResponseLength, hasActiveTools || leaderIsIdle, reducedMotion);
   const frame = reducedMotion ? 0 : Math.floor(time / 120);
   const glimmerSpeed = mode === "requesting" ? 50 : 200;
-  const glimmerMessageWidth = import_react104.useMemo(() => stringWidth2(message), [message]);
+  const displayMessage = mode === "requesting" ? message + "…" : message;
+  const glimmerMessageWidth = import_react104.useMemo(() => stringWidth2(displayMessage), [displayMessage]);
   const cycleLength = glimmerMessageWidth + 20;
   const cyclePosition = Math.floor(time / glimmerSpeed);
   const glimmerIndex = reducedMotion ? -100 : isStalled ? -100 : mode === "requesting" ? cyclePosition % cycleLength - 10 : glimmerMessageWidth + 10 - cyclePosition % cycleLength;
@@ -366425,7 +366600,7 @@ function SpinnerAnimationRow({
   const messageWidth = glimmerMessageWidth + 2;
   const sep = SEP_WIDTH;
   const wantsThinking = thinkingStatus !== null;
-  const { wantsTimer, wantsTokens } = getSpinnerDisplayGates({
+  const { wantsTimer, wantsTokens, wantsStatusIndicator } = getSpinnerDisplayGates({
     verbose,
     hasRunningTeammates,
     effectiveElapsedMs
@@ -366443,7 +366618,8 @@ function SpinnerAnimationRow({
   const showTimer = wantsTimer && availableSpace > usedAfterThinking + timerWidth;
   const usedAfterTimer = usedAfterThinking + (showTimer ? timerWidth + sep : 0);
   const showTokens = wantsTokens && totalTokens > 0 && availableSpace > usedAfterTimer + tokensWidth;
-  const thinkingOnly = showThinking && thinkingStatus === "thinking" && !spinnerSuffix && !showTimer && !showTokens && true;
+  const showStatusIndicator = !showTokens && wantsStatusIndicator && mode === "requesting" && !hasRunningTeammates && availableSpace > usedAfterTimer + 2;
+  const thinkingOnly = showThinking && thinkingStatus === "thinking" && !spinnerSuffix && !showTimer && !showTokens && !showStatusIndicator && true;
   const thinkingElapsedSec = (time - THINKING_DELAY_MS) / 1000;
   const thinkingOpacity = time < THINKING_DELAY_MS ? 0 : (Math.sin(thinkingElapsedSec * Math.PI * 2 / THINKING_GLOW_PERIOD_S) + 1) / 2;
   const thinkingShimmerColor = toRGBColor(interpolateColor(THINKING_INACTIVE, THINKING_INACTIVE_SHIMMER, thinkingOpacity));
@@ -366467,7 +366643,9 @@ function SpinnerAnimationRow({
         ]
       }, undefined, true, undefined, this)
     ]
-  }, "tokens", true, undefined, this)] : [], ...showThinking && thinkingText ? [thinkingStatus === "thinking" && !reducedMotion ? /* @__PURE__ */ jsx_dev_runtime184.jsxDEV(ThemedText, {
+  }, "tokens", true, undefined, this)] : [], ...showStatusIndicator ? [/* @__PURE__ */ jsx_dev_runtime184.jsxDEV(SpinnerModeGlyph, {
+    mode
+  }, "statusGlyph", false, undefined, this)] : [], ...showThinking && thinkingText ? [thinkingStatus === "thinking" && !reducedMotion ? /* @__PURE__ */ jsx_dev_runtime184.jsxDEV(ThemedText, {
     color: thinkingShimmerColor,
     children: thinkingOnly ? `(${thinkingText})` : thinkingText
   }, "thinking", false, undefined, this) : /* @__PURE__ */ jsx_dev_runtime184.jsxDEV(ThemedText, {
@@ -366521,7 +366699,7 @@ function SpinnerAnimationRow({
         time
       }, undefined, false, undefined, this),
       /* @__PURE__ */ jsx_dev_runtime184.jsxDEV(GlimmerMessage, {
-        message,
+        message: displayMessage,
         mode,
         messageColor,
         glimmerIndex,
@@ -425223,6 +425401,9 @@ import { randomBytes as randomBytes22 } from "crypto";
 function isTerminalTaskStatus2(status) {
   return status === "completed" || status === "failed" || status === "killed";
 }
+function hasNonTerminalTasks(tasks) {
+  return Object.values(tasks).some((t) => !isTerminalTaskStatus2(t.status));
+}
 function getTaskIdPrefix(type) {
   return TASK_ID_PREFIXES[type] ?? "x";
 }
@@ -479281,7 +479462,8 @@ Error: sandbox required but unavailable: ${reason}
     } catch (error) {
       logError3(error);
       const llmTimeoutHint = llmTimeoutRemediationHint(error, getCurrentLlmTimeoutMs());
-      const gwHint = gatewayUnreachableRemediationHint(error);
+      const endpointLabel = getCurrentEndpointLabel(mainLoopModelParam);
+      const gwHint = gatewayUnreachableRemediationHint(error, endpointLabel);
       setMessages((prev) => [...prev, createSystemMessage(`本轮执行出错：${errorMessage2(error)}。${llmTimeoutHint ? `${llmTimeoutHint} ` : ""}${gwHint ? `${gwHint} ` : ""}请重试。`, "error")]);
     } finally {
       if (queryGuard.end(thisGeneration)) {

package/package.json

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