@atlasharness/atlascode 0.1.14 → 0.1.16

package/dist/cli.js

@@ -863,20 +863,24 @@ async function executeToolUse(tu, assistantMsg, deps) {
   const callInput = verdict.updatedInput ?? effectiveInput;
   let block;
   let isError = false;
+  let toolUseResult;
   try {
     const res = await tool.call(callInput, toolCallContext, undefined, assistantMsg);
     block = tool.mapToolResultToToolResultBlockParam(res.data, tu.id);
+    toolUseResult = res.data;
   } catch (error) {
+    const errorText = `tool error [${classifyToolError(error)}]: ${String(error?.message ?? error)}`;
     block = {
       type: "tool_result",
       tool_use_id: tu.id,
-      content: `<tool_use_error>tool error [${classifyToolError(error)}]: ${String(error?.message ?? error)}</tool_use_error>`,
+      content: `<tool_use_error>${errorText}</tool_use_error>`,
       is_error: true
     };
     isError = true;
+    toolUseResult = errorText;
   }
   const postOutcome = await deps.hooks?.postToolUse?.(tool, callInput, block, tu.id);
-  return { block, isError };
+  return { block, isError, toolUseResult };
 }
 var init_toolExecution = () => {};
 
@@ -903,7 +907,13 @@ async function runToolBatch(toolUses, assistantMsg, deps) {
   for (const batch of partitionToolCalls(toolUses, deps.tools)) {
     for (const tu of batch.blocks) {
       const r = await executeToolUse(tu, assistantMsg, deps);
-      outcomes.push({ toolUseId: tu.id, name: tu.name, block: r.block, isError: r.isError });
+      outcomes.push({
+        toolUseId: tu.id,
+        name: tu.name,
+        block: r.block,
+        isError: r.isError,
+        toolUseResult: r.toolUseResult
+      });
     }
   }
   return outcomes;
@@ -20042,6 +20052,17 @@ var init_openai = __esm(() => {
   init_bedrock2();
 });
 
+// src/modelprovider/constants.ts
+var API_IMAGE_MAX_BASE64_SIZE, IMAGE_TARGET_RAW_SIZE, PDF_TARGET_RAW_SIZE, API_PDF_MAX_PAGES = 100, LLM_TIMEOUT_DEFAULT_MS = 600000, LLM_TIMEOUT_CAP_MS = 1800000, SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER, AFK_MODE_BETA_HEADER;
+var init_constants2 = __esm(() => {
+  init_shared();
+  API_IMAGE_MAX_BASE64_SIZE = 5 * 1024 * 1024;
+  IMAGE_TARGET_RAW_SIZE = API_IMAGE_MAX_BASE64_SIZE * 3 / 4;
+  PDF_TARGET_RAW_SIZE = 20 * 1024 * 1024;
+  SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER = feature("CONNECTOR_TEXT") ? "summarize-connector-text-2026-03-13" : "";
+  AFK_MODE_BETA_HEADER = feature("TRANSCRIPT_CLASSIFIER") ? "afk-mode-2026-01-31" : "";
+});
+
 // src/modelprovider/clients.ts
 function clientCacheKey(provider, baseURL, apiKey) {
   return provider + "|" + (baseURL || "") + "|" + (apiKey || "");
@@ -20056,7 +20077,7 @@ function getClientForEntry(entry) {
     baseURL: entry.baseURL,
     apiKey: entry.apiKey,
     maxRetries: 0,
-    timeout: 120000
+    timeout: LLM_TIMEOUT_DEFAULT_MS
   });
   clientCache.set(key, client);
   return client;
@@ -20064,6 +20085,7 @@ function getClientForEntry(entry) {
 var clientCache;
 var init_clients = __esm(() => {
   init_openai();
+  init_constants2();
   clientCache = new Map;
 });
 
@@ -26997,6 +27019,27 @@ var init_params = __esm(() => {
   init_effort();
 });
 
+// src/modelprovider/types.ts
+var APIError2, APIConnectionError2, APIConnectionTimeoutError2;
+var init_types2 = __esm(() => {
+  APIError2 = class APIError2 extends Error {
+    status;
+    error;
+    constructor(message, status, error) {
+      super(message);
+      this.name = "APIError";
+      if (status !== undefined)
+        this.status = status;
+      if (error !== undefined)
+        this.error = error;
+    }
+  };
+  APIConnectionError2 = class APIConnectionError2 extends APIError2 {
+  };
+  APIConnectionTimeoutError2 = class APIConnectionTimeoutError2 extends APIConnectionError2 {
+  };
+});
+
 // src/modelprovider/modelprovider.ts
 import { randomUUID } from "crypto";
 function mapOpenAIUsage(u) {
@@ -27015,6 +27058,29 @@ function isRetryableError(err) {
   const msg = String(err?.message || err?.code || "");
   return /timeout|ECONN|EPIPE|fetch failed|socket|aborted/i.test(msg);
 }
+function isClientRequestTimeout(err) {
+  if (!err || typeof err !== "object")
+    return false;
+  const e = err;
+  if (err instanceof APIConnectionTimeoutError2)
+    return true;
+  if (e.name === "APIConnectionTimeoutError" || e.name === "APITimeoutError")
+    return true;
+  return false;
+}
+function shouldRetryModelError(err, signal) {
+  if (signal?.aborted)
+    return false;
+  if (isClientRequestTimeout(err))
+    return false;
+  return isRetryableError(err);
+}
+function llmTimeoutRemediationHint(error, currentTimeoutMs) {
+  if (!isClientRequestTimeout(error))
+    return null;
+  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 startLlmWaitHeartbeat(modelId, attempt, totalRetries) {
   const startedAt = Date.now();
   const id = setInterval(() => {
@@ -27028,10 +27094,13 @@ function startLlmWaitHeartbeat(modelId, attempt, totalRetries) {
 class OpenAIProvider {
   maxRetriesPerModel;
   timeoutMs;
-  constructor(maxRetriesPerModel = 3, timeoutMs = 120000) {
+  constructor(maxRetriesPerModel = 3, timeoutMs = LLM_TIMEOUT_DEFAULT_MS) {
     this.maxRetriesPerModel = maxRetriesPerModel;
     this.timeoutMs = timeoutMs;
   }
+  getTimeoutMs() {
+    return this.timeoutMs;
+  }
   async chat(args) {
     const refs = getRoleModels(args.role, args.sessionModel, args.fallbackModel);
     if (refs.length === 0) {
@@ -27118,7 +27187,7 @@ class OpenAIProvider {
           };
         } catch (err) {
           lastErr = err;
-          if (!isRetryableError(err) || args.signal?.aborted)
+          if (!shouldRetryModelError(err, args.signal))
             break;
         }
       }
@@ -27168,7 +27237,7 @@ class OpenAIProvider {
           break;
         } catch (err) {
           lastErr = err;
-          if (!isRetryableError(err) || args.signal?.aborted)
+          if (!shouldRetryModelError(err, args.signal))
             break;
         }
       }
@@ -27178,7 +27247,7 @@ class OpenAIProvider {
     if (lastErr) {
       const message = lastErr instanceof Error ? lastErr.message || lastErr.name : String(lastErr);
       const code = lastErr?.name === "TimeoutError" ? "TIMEOUT" : "API_ERROR";
-      yield { type: "error", code, message, retryable: isRetryableError(lastErr) };
+      yield { type: "error", code, message, retryable: shouldRetryModelError(lastErr, args.signal) };
       return;
     }
     throw new Error(`No models configured for role '${args.role}'.`);
@@ -27424,15 +27493,15 @@ class OpenAIProvider {
 var init_modelprovider = __esm(() => {
   init_openai();
   init_clients();
+  init_constants2();
   init_roles7();
   init_shared();
   init_shared();
   init_params();
+  init_types2();
+  init_constants2();
 });
 
-// src/modelprovider/types.ts
-var init_types2 = () => {};
-
 // src/modelprovider/errorUtils.ts
 function extractConnectionErrorDetails(error) {
   if (!error || typeof error !== "object") {
@@ -27571,17 +27640,6 @@ var init_errorUtils = __esm(() => {
   ]);
 });
 
-// src/modelprovider/constants.ts
-var API_IMAGE_MAX_BASE64_SIZE, IMAGE_TARGET_RAW_SIZE, PDF_TARGET_RAW_SIZE, API_PDF_MAX_PAGES = 100, SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER, AFK_MODE_BETA_HEADER;
-var init_constants2 = __esm(() => {
-  init_shared();
-  API_IMAGE_MAX_BASE64_SIZE = 5 * 1024 * 1024;
-  IMAGE_TARGET_RAW_SIZE = API_IMAGE_MAX_BASE64_SIZE * 3 / 4;
-  PDF_TARGET_RAW_SIZE = 20 * 1024 * 1024;
-  SUMMARIZE_CONNECTOR_TEXT_BETA_HEADER = feature("CONNECTOR_TEXT") ? "summarize-connector-text-2026-03-13" : "";
-  AFK_MODE_BETA_HEADER = feature("TRANSCRIPT_CLASSIFIER") ? "afk-mode-2026-01-31" : "";
-});
-
 // src/modelprovider/errorMessaging.ts
 function registerErrorMessagingPorts(p) {
   ports = p;
@@ -27721,10 +27779,22 @@ var init_queryWithRoleFallback = __esm(() => {
 
 // src/modelprovider/index.ts
 function getModelProvider() {
-  return _provider ??= new OpenAIProvider(3, resolveLlmTimeoutMs());
+  return _provider ??= new OpenAIProvider(3, resolveLlmTimeoutMs(process.env.ATLAS_LLM_TIMEOUT, llmTimeoutSettingsSource?.()));
+}
+function setLlmTimeoutSettingsSource(next) {
+  llmTimeoutSettingsSource = next;
+}
+function getCurrentLlmTimeoutMs() {
+  return resolveLlmTimeoutMs(process.env.ATLAS_LLM_TIMEOUT, llmTimeoutSettingsSource?.());
 }
-function resolveLlmTimeoutMs() {
-  return parseBoundedIntEnv("ATLAS_LLM_TIMEOUT", process.env.ATLAS_LLM_TIMEOUT, 120000, 1800000, 1).effective;
+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 === "")
+    return fromSettings();
+  const env = parseBoundedIntEnv("ATLAS_LLM_TIMEOUT", envRaw, LLM_TIMEOUT_DEFAULT_MS, LLM_TIMEOUT_CAP_MS, 1);
+  if (env.status !== "invalid")
+    return env.effective;
+  return fromSettings();
 }
 function lazyProxy(resolve) {
   return new Proxy({}, {
@@ -27735,13 +27805,16 @@ function lazyProxy(resolve) {
     }
   });
 }
-var _provider, modelProvider;
+var _provider, llmTimeoutSettingsSource = null, modelProvider;
 var init_modelprovider2 = __esm(() => {
   init_modelprovider();
+  init_constants2();
   init_shared();
+  init_constants2();
   init_modelprovider();
   init_types2();
   init_modelErrors();
+  init_modelprovider();
   init_params();
   init_roles7();
   init_errorUtils();
@@ -75853,7 +75926,7 @@ var init_loadSkillsDir = __esm(() => {
     logForDebugging(`Loading skills from: managed=${managedSkillsDir}, user=${userSkillsDir}, project=[${projectSkillsDirs.join(", ")}]`);
     const additionalDirs = [];
     const skillsLocked = false;
-    const projectSettingsEnabled = isSettingSourceEnabled("projectSettings") && !skillsLocked;
+    const projectSkillsEnabled = !skillsLocked && !isEnvTruthy(process.env.ATLAS_DISABLE_PROJECT_SKILLS);
     const [
       managedSkills,
       userSkills,
@@ -75863,8 +75936,8 @@ var init_loadSkillsDir = __esm(() => {
     ] = await Promise.all([
       isEnvTruthy(process.env.ATLAS_DISABLE_POLICY_SKILLS) ? Promise.resolve([]) : loadSkillsFromSkillsDir(managedSkillsDir, "policySettings"),
       isSettingSourceEnabled("userSettings") && !skillsLocked ? loadSkillsFromSkillsDir(userSkillsDir, "userSettings") : Promise.resolve([]),
-      projectSettingsEnabled ? Promise.all(projectSkillsDirs.map((dir) => loadSkillsFromSkillsDir(dir, "projectSettings"))) : Promise.resolve([]),
-      projectSettingsEnabled ? Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir(join31(dir, ".atlas", "skills"), "projectSettings"))) : Promise.resolve([]),
+      projectSkillsEnabled ? Promise.all(projectSkillsDirs.map((dir) => loadSkillsFromSkillsDir(dir, "projectSettings"))) : Promise.resolve([]),
+      projectSkillsEnabled ? Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir(join31(dir, ".atlas", "skills"), "projectSettings"))) : Promise.resolve([]),
       skillsLocked ? Promise.resolve([]) : loadSkillsFromCommandsDir(cwd)
     ]);
     const allSkillsWithPaths = [
@@ -76307,7 +76380,7 @@ Important:
 // src/engine/tools/skill/skillTool.ts
 import { randomUUID as randomUUID14 } from "crypto";
 async function getAllCommands() {
-  return getCommands(getProjectRoot());
+  return getCommands(process.cwd());
 }
 function getToolUseIDFromParentMessage(parentMessage, toolName) {
   if (!parentMessage)
@@ -76378,7 +76451,6 @@ function skillHasOnlySafeProperties(command) {
 }
 var SKILL_TOOL_INPUT_SCHEMA, SAFE_SKILL_PROPERTIES, SkillTool;
 var init_skillTool = __esm(() => {
-  init_bootstrap();
   init_shared();
   init_permissions3();
   init_modelprovider2();
@@ -76445,7 +76517,7 @@ var init_skillTool = __esm(() => {
       return skill ?? "";
     },
     async description() {
-      return getSkillPrompt(getProjectRoot());
+      return getSkillPrompt(process.cwd());
     },
     async checkPermissions(input, context) {
       const { skill, args } = input;
@@ -80590,7 +80662,8 @@ async function queryOneRound(deps, tools, messages) {
     role: "user",
     uuid: randomUUID18(),
     timestamp: now,
-    message: { role: "user", content: [o.block] }
+    message: { role: "user", content: [o.block] },
+    toolUseResult: o.toolUseResult
   }));
   if (deps.transcript) {
     deps.transcript.record([...messages, assistantMsg, ...resultMessages]);
@@ -121602,6 +121675,7 @@ var isMcpServerCommandEntry = () => ({}), isMcpServerNameEntry = () => ({}), isM
     object({ kind: literal("window"), tokens: number2().int().min(1000) }),
     object({ kind: literal("pct"), pct: number2().min(1).max(100) })
   ]).optional(),
+  llmTimeoutMs: number2().int().positive().optional(),
   prefersReducedMotion: boolean2().optional(),
   syntaxHighlightingDisabled: boolean2().optional(),
   spinnerTipsEnabled: boolean2().optional(),
@@ -148266,28 +148340,28 @@ function getEventPriority(eventType) {
     case "focus":
     case "blur":
     case "paste":
-      return import_constants48.DiscreteEventPriority;
+      return import_constants53.DiscreteEventPriority;
     case "resize":
     case "scroll":
     case "mousemove":
-      return import_constants48.ContinuousEventPriority;
+      return import_constants53.ContinuousEventPriority;
     default:
-      return import_constants48.DefaultEventPriority;
+      return import_constants53.DefaultEventPriority;
   }
 }
 
 class Dispatcher {
   currentEvent = null;
-  currentUpdatePriority = import_constants48.DefaultEventPriority;
+  currentUpdatePriority = import_constants53.DefaultEventPriority;
   discreteUpdates = null;
   resolveEventPriority() {
-    if (this.currentUpdatePriority !== import_constants48.NoEventPriority) {
+    if (this.currentUpdatePriority !== import_constants53.NoEventPriority) {
       return this.currentUpdatePriority;
     }
     if (this.currentEvent) {
       return getEventPriority(this.currentEvent.type);
     }
-    return import_constants48.DefaultEventPriority;
+    return import_constants53.DefaultEventPriority;
   }
   dispatch(target, event) {
     const previousEvent = this.currentEvent;
@@ -148312,18 +148386,18 @@ class Dispatcher {
   dispatchContinuous(target, event) {
     const previousPriority = this.currentUpdatePriority;
     try {
-      this.currentUpdatePriority = import_constants48.ContinuousEventPriority;
+      this.currentUpdatePriority = import_constants53.ContinuousEventPriority;
       return this.dispatch(target, event);
     } finally {
       this.currentUpdatePriority = previousPriority;
     }
   }
 }
-var import_constants48;
+var import_constants53;
 var init_dispatcher = __esm(() => {
   init_log5();
   init_event_handlers();
-  import_constants48 = __toESM(require_constants2(), 1);
+  import_constants53 = __toESM(require_constants2(), 1);
 });
 
 // src/tui/ink/events/terminal-event.ts
@@ -157130,7 +157204,7 @@ function applyPositionedHighlight(screen, stylePool, positions, rowOffset, curre
   }
   return true;
 }
-var import_constants50, timing;
+var import_constants55, timing;
 var init_render_to_screen = __esm(() => {
   init_debug();
   init_dom();
@@ -157139,7 +157213,7 @@ var init_render_to_screen = __esm(() => {
   init_reconciler();
   init_render_node_to_output();
   init_screen();
-  import_constants50 = __toESM(require_constants2(), 1);
+  import_constants55 = __toESM(require_constants2(), 1);
   timing = { reconcile: 0, yoga: 0, paint: 0, scan: 0, calls: 0 };
 });
 
@@ -157445,7 +157519,7 @@ class Ink {
         };
       }
     };
-    this.container = reconciler_default.createContainer(this.rootNode, import_constants51.ConcurrentRoot, null, false, null, "id", noop_default, noop_default, noop_default, noop_default);
+    this.container = reconciler_default.createContainer(this.rootNode, import_constants56.ConcurrentRoot, null, false, null, "id", noop_default, noop_default, noop_default, noop_default);
     if (false) {}
   }
   handleResume = () => {
@@ -158258,7 +158332,7 @@ function drainStdin(stdin = process.stdin) {
     }
   }
 }
-var import_constants51, jsx_dev_runtime8, ALT_SCREEN_ANCHOR_CURSOR, CURSOR_HOME_PATCH, ERASE_THEN_HOME_PATCH, CONSOLE_STDOUT_METHODS, CONSOLE_STDERR_METHODS;
+var import_constants56, jsx_dev_runtime8, ALT_SCREEN_ANCHOR_CURSOR, CURSOR_HOME_PATCH, ERASE_THEN_HOME_PATCH, CONSOLE_STDOUT_METHODS, CONSOLE_STDERR_METHODS;
 var init_ink = __esm(() => {
   init_noop();
   init_throttle2();
@@ -158291,7 +158365,7 @@ var init_ink = __esm(() => {
   init_dec();
   init_osc();
   init_useTerminalNotification();
-  import_constants51 = __toESM(require_constants2(), 1);
+  import_constants56 = __toESM(require_constants2(), 1);
   jsx_dev_runtime8 = __toESM(require_jsx_dev_runtime(), 1);
   ALT_SCREEN_ANCHOR_CURSOR = Object.freeze({
     x: 0,
@@ -271649,7 +271723,7 @@ async function* runAgent2({
   }
   const skillsToPreload = agentDefinition.skills ?? [];
   if (skillsToPreload.length > 0) {
-    const allSkills = await getSkillToolCommands2(getProjectRoot());
+    const allSkills = await getSkillToolCommands2(process.cwd());
     const validSkills = [];
     for (const skillName of skillsToPreload) {
       const resolvedName = resolveSkillName(skillName, allSkills, agentDefinition);
@@ -274515,8 +274589,8 @@ var init_UI10 = __esm(() => {
 async function getAllCommands2(context) {
   const mcpSkills = context.getAppState().mcp.commands.filter((cmd) => cmd.type === "prompt" && cmd.loadedFrom === "mcp");
   if (mcpSkills.length === 0)
-    return getCommands2(getProjectRoot());
-  const localCommands = await getCommands2(getProjectRoot());
+    return getCommands2(process.cwd());
+  const localCommands = await getCommands2(process.cwd());
   return uniqBy_default([...localCommands, ...mcpSkills], "name");
 }
 async function executeForkedSkill2(command, commandName, args, context, canUseTool, parentMessage, onProgress) {
@@ -274612,7 +274686,6 @@ function isOfficialMarketplaceSkill(command) {
 var inputSchema14, outputSchema12, SkillTool2, SAFE_SKILL_PROPERTIES2;
 var init_SkillTool = __esm(() => {
   init_uniqBy();
-  init_bootstrap();
   init_commands5();
   init_Tool();
   init_debug();
@@ -274662,7 +274735,7 @@ var init_SkillTool = __esm(() => {
       return outputSchema12();
     },
     description: async ({ skill }) => `Execute skill: ${skill}`,
-    prompt: async () => getPrompt20(getProjectRoot()),
+    prompt: async () => getPrompt20(process.cwd()),
     toAutoClassifierInput: ({ skill }) => skill ?? "",
     async validateInput({ skill }, context) {
       const trimmed = skill.trim();
@@ -322785,8 +322858,8 @@ async function discoverSkillDirsForPaths2(filePaths, cwd) {
   return newDirs.sort((a, b) => b.split(pathSep2).length - a.split(pathSep2).length);
 }
 async function addSkillDirectories2(dirs) {
-  if (!isSettingSourceEnabled2("projectSettings") || isRestrictedToPluginOnly("skills")) {
-    logForDebugging3("[skills] Dynamic skill discovery skipped: projectSettings disabled or plugin-only policy");
+  if (isEnvTruthy2(process.env.ATLAS_DISABLE_PROJECT_SKILLS) || isRestrictedToPluginOnly("skills")) {
+    logForDebugging3("[skills] Dynamic skill discovery skipped: ATLAS_DISABLE_PROJECT_SKILLS kill switch or plugin-only policy");
     return;
   }
   if (dirs.length === 0) {
@@ -322879,10 +322952,10 @@ var init_loadSkillsDir2 = __esm(() => {
     logForDebugging3(`Loading skills from: managed=${managedSkillsDir}, user=${userSkillsDir}, project=[${projectSkillsDirs.join(", ")}]`);
     const additionalDirs = getAdditionalDirectoriesForClaudeMd();
     const skillsLocked = isRestrictedToPluginOnly("skills");
-    const projectSettingsEnabled = isSettingSourceEnabled2("projectSettings") && !skillsLocked;
+    const projectSkillsEnabled = !skillsLocked && !isEnvTruthy2(process.env.ATLAS_DISABLE_PROJECT_SKILLS);
     if (isBareMode()) {
-      if (additionalDirs.length === 0 || !projectSettingsEnabled) {
-        logForDebugging3(`[bare] Skipping skill dir discovery (${additionalDirs.length === 0 ? "no --add-dir" : "projectSettings disabled or skillsLocked"})`);
+      if (additionalDirs.length === 0 || !projectSkillsEnabled) {
+        logForDebugging3(`[bare] Skipping skill dir discovery (${additionalDirs.length === 0 ? "no --add-dir" : "project skills disabled (kill switch) or skillsLocked"})`);
         return [];
       }
       const additionalSkillsNested = await Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir2(join107(dir, getConfigDirName2(), "skills"), "projectSettings")));
@@ -322897,8 +322970,8 @@ var init_loadSkillsDir2 = __esm(() => {
     ] = await Promise.all([
       isEnvTruthy2(process.env.ATLAS_DISABLE_POLICY_SKILLS) ? Promise.resolve([]) : loadSkillsFromSkillsDir2(managedSkillsDir, "policySettings"),
       isSettingSourceEnabled2("userSettings") && !skillsLocked ? loadSkillsFromSkillsDir2(userSkillsDir, "userSettings") : Promise.resolve([]),
-      projectSettingsEnabled ? Promise.all(projectSkillsDirs.map((dir) => loadSkillsFromSkillsDir2(dir, "projectSettings"))) : Promise.resolve([]),
-      projectSettingsEnabled ? Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir2(join107(dir, getConfigDirName2(), "skills"), "projectSettings"))) : Promise.resolve([]),
+      projectSkillsEnabled ? Promise.all(projectSkillsDirs.map((dir) => loadSkillsFromSkillsDir2(dir, "projectSettings"))) : Promise.resolve([]),
+      projectSkillsEnabled ? Promise.all(additionalDirs.map((dir) => loadSkillsFromSkillsDir2(join107(dir, getConfigDirName2(), "skills"), "projectSettings"))) : Promise.resolve([]),
       skillsLocked ? Promise.resolve([]) : loadSkillsFromCommandsDir2(cwd)
     ]);
     const allSkillsWithPaths = [
@@ -430252,6 +430325,7 @@ function wireContextHostPorts() {
   });
   setAutoCompactSettingsSource(() => getGlobalConfig().autoCompactEnabled);
   setAutoCompactWindowSettingsSource(() => getInitialSettings2().autoCompactWindow);
+  setLlmTimeoutSettingsSource(() => getInitialSettings2().llmTimeoutMs);
   setTimeBasedMCConfigSource(() => getFeatureValue_CACHED_MAY_BE_STALE("atlas_slate_heron", TIME_BASED_MC_CONFIG_DEFAULTS));
   clearPostCompactResetsForTesting();
   if (feature("CONTEXT_COLLAPSE")) {
@@ -430280,6 +430354,7 @@ function wireContextHostPorts() {
 }
 var init_contextHostWiring = __esm(() => {
   init_shared();
+  init_modelprovider2();
   init_engine();
   init_config6();
   init_settings3();
@@ -475911,7 +475986,8 @@ 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")]);
+      const llmTimeoutHint = llmTimeoutRemediationHint(error, getCurrentLlmTimeoutMs());
+      setMessages((prev) => [...prev, createSystemMessage(`本轮执行出错：${errorMessage2(error)}。${llmTimeoutHint ? `${llmTimeoutHint} ` : ""}请重试。`, "error")]);
     } finally {
       if (queryGuard.end(thisGeneration)) {
         setLastQueryCompletionTime(Date.now());
@@ -477590,6 +477666,7 @@ Note: ctrl + z now suspends AtlasHarness, ctrl + _ undoes input.
 var import_compiler_runtime323, React137, import_react280, jsx_dev_runtime427, UltraplanChoiceDialog = () => null, UltraplanLaunchDialog = () => null, launchUltraplan2 = null, useVoiceIntegration2, VoiceKeybindingHandler2, useAntOrgWarningNotification = () => {}, getCoordinatorUserContext3, SUGGEST_BG_PR_NOOP = (_p, _n) => false, useScheduledTasks2, EMPTY_MCP_CLIENTS2, RECENT_SCROLL_REPIN_WINDOW_MS = 3000, TITLE_ANIMATION_FRAMES, TITLE_STATIC_PREFIX = "✳", TITLE_ANIMATION_INTERVAL_MS = 960;
 var init_REPL = __esm(() => {
   init_shared();
+  init_modelprovider2();
   init_bootstrap();
   init_bootstrapState();
   init_tokenBudget();

package/package.json

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