@atlasharness/atlascode 0.1.14 → 0.1.15

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;
@@ -75853,7 +75863,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 +75873,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 = [
@@ -80590,7 +80600,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]);
@@ -322785,8 +322796,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 +322890,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 +322908,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 = [

package/package.json

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