@technomoron/agent-run 0.99.32 → 0.99.34

package/dist/guards.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderGuardShims = renderGuardShims;
 const path = require("path");
 const constants_1 = require("./constants");
+const GIT_TEST_REPO_MARKER = '.agent-run-test-repo';
 function renderGuardShims(context) {
     const names = [];
     if (context.guardrails.blockGitWrite) {
@@ -34,16 +35,46 @@ function posixGitShim() {
     return [
         '#!/usr/bin/env bash',
         'set -euo pipefail',
+        'agent_run_test_repo() {',
+        '  local dir="$PWD"',
+        '  while [ "$#" -gt 0 ]; do',
+        '    case "$1" in',
+        '      -C)',
+        '        [ "$#" -ge 2 ] || return 1',
+        '        dir="$(cd -- "$dir" 2>/dev/null && cd -- "$2" 2>/dev/null && pwd -P)" || return 1',
+        '        shift 2 ;;',
+        '      -c)',
+        '        [ "$#" -ge 2 ] || return 1',
+        '        shift 2 ;;',
+        '      --git-dir*|--work-tree*) return 1 ;;',
+        '      -*) shift ;;',
+        '      *) break ;;',
+        '    esac',
+        '  done',
+        '  dir="$(cd -- "$dir" 2>/dev/null && pwd -P)" || return 1',
+        '  while :; do',
+        `    if [ -e "$dir/${GIT_TEST_REPO_MARKER}" ]; then return 0; fi`,
+        '    [ "$dir" != "/" ] || return 1',
+        '    dir="${dir%/*}"',
+        '    [ -n "$dir" ] || dir="/"',
+        '  done',
+        '}',
+        'blocked=""',
+        'skip_value=0',
         'for arg in "$@"; do',
+        '  if [ "$skip_value" = 1 ]; then skip_value=0; continue; fi',
         '  case "$arg" in',
-        '    commit|tag|push)',
-        '      if [ "${AGENT_RUN_ALLOW_GIT_WRITE:-}" != "1" ]; then',
-        '        echo "agent-run: blocked git $arg. Review and run it manually, or set AGENT_RUN_ALLOW_GIT_WRITE=1 for this invocation." >&2',
-        '        exit 42',
-        '      fi',
-        '      ;;',
+        '    -C|-c|--git-dir|--work-tree|--namespace|--super-prefix|--config-env) skip_value=1; continue ;;',
+        '    --help|-h|--version|-v|--html-path|--man-path|--info-path|--) break ;;',
+        '    -*) continue ;;',
+        '    commit|tag|push) blocked="$arg"; break ;;',
+        '    *) break ;;',
         '  esac',
         'done',
+        'if [ -n "$blocked" ] && [ "${AGENT_RUN_ALLOW_GIT_WRITE:-}" != "1" ] && ! agent_run_test_repo "$@"; then',
+        '  echo "agent-run: blocked git $blocked. Review and run it manually, or set AGENT_RUN_ALLOW_GIT_WRITE=1 for this invocation." >&2',
+        '  exit 42',
+        'fi',
         ...posixRunRealCommand('git'),
         ''
     ].join('\n');
@@ -105,16 +136,31 @@ function posixRunRealCommand(tool) {
 function windowsShim(name) {
     const executable = name === 'npm' || name === 'pnpm' ? `${name}.cmd` : `${name}.exe`;
     const guard = name === 'git' ? windowsGitGuard() : name === 'gh' ? windowsGhGuard() : windowsPublishGuard(name);
+    const helpers = name === 'git' ? windowsGitTestRepo() : [];
     return [
         '@echo off',
+        'setlocal DisableDelayedExpansion',
         ...guard,
         ':run',
+        'for %%D in ("%~dp0.") do set "AGENT_RUN_GUARD_DIR=%%~fD"',
         'if defined AGENT_RUN_REAL_PATH (',
         '  set "PATH=%AGENT_RUN_REAL_PATH%"',
         ') else (',
-        '  for /f "tokens=1,* delims=;" %%A in ("%PATH%") do set "PATH=%%B"',
+        '  for /f "tokens=1,* delims=;" %%A in ("%PATH%") do for %%D in ("%%~A\\.") do if /I "%%~fD"=="%AGENT_RUN_GUARD_DIR%" set "PATH=%%B"',
+        ')',
+        'set "AGENT_RUN_COMMAND="',
+        `for %%I in (${executable}) do set "AGENT_RUN_COMMAND=%%~$PATH:I"`,
+        'if not defined AGENT_RUN_COMMAND (',
+        `  echo agent-run: cannot find the real ${name} command outside the guard directory. 1>&2`,
+        '  exit /b 127',
+        ')',
+        'if /I "%AGENT_RUN_COMMAND%"=="%~f0" (',
+        `  echo agent-run: refused recursive ${name} guard resolution. 1>&2`,
+        '  exit /b 127',
         ')',
-        `${executable} %*`,
+        '"%AGENT_RUN_COMMAND%" %*',
+        'exit /b %ERRORLEVEL%',
+        ...helpers,
         ''
     ].join('\n');
 }
@@ -122,17 +168,77 @@ function windowsGitGuard() {
     return [
         ':scan',
         'if "%~1"=="" goto run',
+        'if "%~1"=="-C" goto skip_git_value',
+        'if "%~1"=="-c" goto skip_git_value',
+        'if "%~1"=="--git-dir" goto skip_git_value',
+        'if "%~1"=="--work-tree" goto skip_git_value',
+        'if "%~1"=="--namespace" goto skip_git_value',
+        'if "%~1"=="--super-prefix" goto skip_git_value',
+        'if "%~1"=="--config-env" goto skip_git_value',
+        'if "%~1"=="--help" goto run',
+        'if "%~1"=="-h" goto run',
+        'if "%~1"=="--version" goto run',
+        'if "%~1"=="-v" goto run',
+        'if "%~1"=="--html-path" goto run',
+        'if "%~1"=="--man-path" goto run',
+        'if "%~1"=="--info-path" goto run',
+        'if "%~1"=="--" goto run',
         'if /I "%~1"=="commit" goto block_git',
         'if /I "%~1"=="tag" goto block_git',
         'if /I "%~1"=="push" goto block_git',
+        'set "ARG=%~1"',
+        'if not "%ARG:~0,1%"=="-" goto run',
+        'shift',
+        'goto scan',
+        ':skip_git_value',
+        'shift',
+        'if "%~1"=="" goto run',
         'shift',
         'goto scan',
         ':block_git',
         'if "%AGENT_RUN_ALLOW_GIT_WRITE%"=="1" goto run',
+        'call :agent_run_test_repo %*',
+        'if not errorlevel 1 goto run',
         'echo agent-run: blocked git write. Review and run it manually, or set AGENT_RUN_ALLOW_GIT_WRITE=1 for this invocation. 1>&2',
         'exit /b 42'
     ];
 }
+function windowsGitTestRepo() {
+    return [
+        ':agent_run_test_repo',
+        'setlocal enabledelayedexpansion',
+        'set "TARGET=%CD%"',
+        ':agent_run_scan',
+        'if "%~1"=="" goto agent_run_walk',
+        'if "%~1"=="-C" goto agent_run_chdir',
+        'if "%~1"=="-c" (shift & shift & goto agent_run_scan)',
+        'set "ARG=%~1"',
+        'if /I "!ARG:~0,9!"=="--git-dir" goto agent_run_deny',
+        'if /I "!ARG:~0,11!"=="--work-tree" goto agent_run_deny',
+        'if "!ARG:~0,1!"=="-" (shift & goto agent_run_scan)',
+        'goto agent_run_walk',
+        ':agent_run_chdir',
+        'if "%~2"=="" goto agent_run_deny',
+        'pushd "!TARGET!" 2>nul',
+        'if errorlevel 1 goto agent_run_deny',
+        'pushd "%~2" 2>nul',
+        'if errorlevel 1 (popd & goto agent_run_deny)',
+        'set "TARGET=!CD!"',
+        'popd',
+        'popd',
+        'shift',
+        'shift',
+        'goto agent_run_scan',
+        ':agent_run_walk',
+        `if exist "!TARGET!\\${GIT_TEST_REPO_MARKER}" (endlocal & exit /b 0)`,
+        'for %%D in ("!TARGET!\\..") do set "PARENT=%%~fD"',
+        'if /I "!PARENT!"=="!TARGET!" goto agent_run_deny',
+        'set "TARGET=!PARENT!"',
+        'goto agent_run_walk',
+        ':agent_run_deny',
+        'endlocal & exit /b 1'
+    ];
+}
 function windowsGhGuard() {
     return [
         'set "SAW_RELEASE=0"',

package/dist/process.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findRealBinary = findRealBinary;
-exports.execTool = execTool;
 exports.execCommand = execCommand;
 exports.openEditor = openEditor;
 exports.parseEditorCommand = parseEditorCommand;
@@ -73,10 +72,6 @@ function isAgentRunRedirectShim(filePath) {
         return false;
     }
 }
-function execTool(command, args) {
-    (0, utils_1.verbose)(`exec tool: ${(0, utils_1.formatCommand)(command, args)}`);
-    execCommand(command, args);
-}
 function execCommand(command, args, env, cwd, onExit) {
     (0, utils_1.verbose)(`spawn: ${(0, utils_1.formatCommand)(command, args)} cwd=${cwd ?? process.cwd()}`);
     const child = crossSpawn(command, args, { cwd, env, stdio: 'inherit' });

package/dist/project.js

@@ -12,7 +12,6 @@ exports.resolveProfileResult = resolveProfileResult;
 exports.parseProfile = parseProfile;
 exports.projectRootForProfile = projectRootForProfile;
 exports.defaultConfigRoot = defaultConfigRoot;
-exports.defaultConfigRootSearchCandidates = defaultConfigRootSearchCandidates;
 const childProcess = require("child_process");
 const fs = require("fs");
 const os = require("os");
@@ -163,7 +162,7 @@ function resolveProfileResult(projectRoot, configRoot = defaultConfigRoot(projec
     const named = resolved.profile ? (0, config_1.namedBrainProfile)(configRoot, resolved.profile) : null;
     if (named)
         return { profile: named, reason: '' };
-    if (useDefault && (0, config_1.readBrainConfig)(configRoot)?.enabled && !readAgentRunEnv(projectRoot).AGENT_RUN_PROFILE?.trim()) {
+    if (useDefault && (0, config_1.readBrainConfig)(configRoot)?.enabled) {
         const configured = resolved.profile !== null && ['agent-run.jsonc', 'local.md.njk', 'AGENTS-MODS.md']
             .some((name) => fs.existsSync(path.join(configRoot, resolved.profile, name)));
         if (!configured)
@@ -172,11 +171,6 @@ function resolveProfileResult(projectRoot, configRoot = defaultConfigRoot(projec
     return resolved;
 }
 function resolveLegacyProfileResult(projectRoot) {
-    const envProfile = readAgentRunEnv(projectRoot).AGENT_RUN_PROFILE?.trim();
-    if (envProfile) {
-        (0, utils_1.verbose)(`using ${constants_1.ENV_FILE_NAME} AGENT_RUN_PROFILE=${envProfile}`);
-        return parseProfile(envProfile, `${constants_1.ENV_FILE_NAME} AGENT_RUN_PROFILE`);
-    }
     const githubProfile = resolveGitHubProfile(projectRoot);
     if (githubProfile !== null) {
         (0, utils_1.verbose)(`using GitHub origin profile=${githubProfile}`);
@@ -321,12 +315,11 @@ function parseEnvFile(content) {
     }
     return env;
 }
-function defaultConfigRoot(projectRoot, options = {}) {
+function defaultConfigRoot(projectRoot) {
     const explicit = explicitConfigRoot(projectRoot);
     if (explicit !== null) {
         return explicit;
     }
-    void options;
     return path.join(os.homedir(), '.agent-run');
 }
 function explicitConfigRoot(projectRoot) {
@@ -342,17 +335,3 @@ function explicitConfigRoot(projectRoot) {
     const localValue = env[constants_1.CONFIG_DIR_ENV]?.trim();
     return localValue ? path.resolve(projectRoot, localValue) : null;
 }
-function defaultConfigRootSearchCandidates(_projectRoot, options = {}) {
-    const platform = options.platform ?? process.platform;
-    const pathApi = platform === 'win32' ? path.win32 : path.posix;
-    const homeDir = options.homeDir ?? os.homedir();
-    const names = ['agent-config', 'agent-configs'];
-    if (platform === 'win32') {
-        return [pathApi.join(homeDir, 'Documents', 'code'), pathApi.join(homeDir, 'Desktop', 'code'), 'C:\\code'].flatMap((root) => names.map((name) => pathApi.join(root, name)));
-    }
-    return [
-        ...names.map((name) => pathApi.join(homeDir, 'code', name)),
-        ...names.map((name) => pathApi.join(homeDir, name)),
-        ...names.map((name) => pathApi.join(homeDir, `.${name}`))
-    ];
-}

package/dist/renderer.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderProfile = renderProfile;
 exports.syncAgentProfile = syncAgentProfile;
+exports.syncRenderedProfile = syncRenderedProfile;
 exports.checkRenderedProfile = checkRenderedProfile;
 const fs = require("fs");
 const path = require("path");
@@ -30,8 +31,8 @@ function renderProfile(projectRoot, agentDir, checkOnly = false, targetTool = nu
     const brainEnabled = (0, config_1.readBrainConfig)(configRoot)?.enabled === true;
     if (brainEnabled && !context.mcpServers['agent-brain']) {
         context.mcpServers['agent-brain'] = {
-            transport: 'stdio', enabled: true, command: process.execPath,
-            args: [path.join(__dirname, 'agent-brain.js'), 'mcp', '--configdir', configRoot, '--cwd', projectRoot, '--socket', (0, config_1.defaultSocketPath)(configRoot)],
+            transport: 'stdio', enabled: true, command: 'agent-brain',
+            args: ['mcp', '--configdir', configRoot, '--cwd', projectRoot],
             env: {}, headers: {}
         };
     }
@@ -87,6 +88,10 @@ function validateManifestProfile(manifestProfile, inferredProfile, agentDir) {
 }
 function syncAgentProfile(projectRoot, agentDir, options) {
     const rendered = renderProfile(projectRoot, agentDir, false, null, undefined, options);
+    return syncRenderedProfile(rendered);
+}
+function syncRenderedProfile(rendered) {
+    (0, config_tree_1.ensureConfigRootGitignore)(rendered.configRoot);
     syncRuntimeDirs(rendered);
     removeStaleGeneratedEntries(rendered);
     for (const file of rendered.files) {

package/dist/templates.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNunjucksEnv = createNunjucksEnv;
+exports.createSkillNunjucksEnv = createSkillNunjucksEnv;
 exports.buildRenderContext = buildRenderContext;
 exports.resolveConfigPath = resolveConfigPath;
 exports.renderTemplateFile = renderTemplateFile;
@@ -19,6 +20,33 @@ function createNunjucksEnv(configRoot) {
         throwOnUndefined: true
     });
 }
+function createSkillNunjucksEnv(configRoot, profileDir, trace) {
+    const roots = [path.join(configRoot, 'global', 'skills'), path.join(profileDir, 'skills')];
+    class SkillLoader extends nunjucks.Loader {
+        getSource(name) {
+            const target = path.resolve(configRoot, name);
+            if (!roots.some((root) => (0, utils_1.isSamePathOrDescendant)(target, root))) {
+                throw new Error(`Skill template must be inside an active skills directory: ${name}`);
+            }
+            let current = configRoot;
+            for (const part of path.relative(configRoot, target).split(path.sep).filter(Boolean)) {
+                current = path.join(current, part);
+                if (fs.lstatSync(current).isSymbolicLink()) {
+                    throw new Error(`Symlinks are not supported in skill templates: ${current}`);
+                }
+            }
+            if (fs.statSync(target).size > 1024 * 1024) {
+                throw new Error(`Skill template exceeds 1 MiB: ${target}`);
+            }
+            const src = fs.readFileSync(target, 'utf8');
+            trace?.sourceFiles.add(target);
+            return { src, path: target, noCache: true };
+        }
+    }
+    return new nunjucks.Environment(new SkillLoader(), {
+        autoescape: false, trimBlocks: true, lstripBlocks: true, throwOnUndefined: true
+    });
+}
 function buildRenderContext(projectRoot, profileDir, configRoot, manifest, env) {
     const date = (0, utils_1.localDateString)();
     const liveDir = path.join(profileDir, constants_1.LIVE_DIR_NAME);
@@ -84,8 +112,8 @@ function buildPermissionsAllow(manifest) {
     }
     return [...allow];
 }
-function resolveConfigPath(configRoot, relativePath, context) {
-    const rendered = createNunjucksEnv(configRoot).renderString(relativePath, context);
+function resolveConfigPath(configRoot, relativePath, context, env) {
+    const rendered = env.renderString(relativePath, context);
     const resolved = path.resolve(configRoot, rendered);
     if (!(0, utils_1.isSamePathOrDescendant)(resolved, path.resolve(configRoot))) {
         throw new Error(`config path escapes config root: ${relativePath}`);
@@ -97,20 +125,20 @@ function resolveRuntimePath(configRoot, pathTemplate, env, context) {
     return path.isAbsolute(rendered) ? path.resolve(rendered) : path.resolve(configRoot, rendered);
 }
 function renderTemplateFile(env, configRoot, templatePath, context, trace) {
-    const resolvedPath = resolveConfigPath(configRoot, templatePath, context);
+    const resolvedPath = resolveConfigPath(configRoot, templatePath, context, env);
     if (!fs.existsSync(resolvedPath)) {
         throw new Error(`missing template: ${resolvedPath}`);
     }
     const relativePath = path.relative(configRoot, resolvedPath).replace(/\\/g, '/');
     let content = fs.readFileSync(resolvedPath, 'utf8');
-    traceTemplateSource(configRoot, resolvedPath, content, context, trace);
+    traceTemplateSource(env, configRoot, resolvedPath, content, context, trace);
     if (path.basename(resolvedPath) === 'AGENTS-MODS.md') {
         content = renderLegacyAgentsMods(resolvedPath, [], trace);
         return env.renderString(content, context);
     }
     return env.render(relativePath, context);
 }
-function traceTemplateSource(configRoot, sourcePath, content, context, trace, stack = []) {
+function traceTemplateSource(env, configRoot, sourcePath, content, context, trace, stack = []) {
     if (trace === undefined) {
         return;
     }
@@ -126,9 +154,9 @@ function traceTemplateSource(configRoot, sourcePath, content, context, trace, st
         if (!includePath) {
             continue;
         }
-        const includedPath = resolveConfigPath(configRoot, includePath, context);
+        const includedPath = resolveConfigPath(configRoot, includePath, context, env);
         if (fs.existsSync(includedPath)) {
-            traceTemplateSource(configRoot, includedPath, fs.readFileSync(includedPath, 'utf8'), context, trace, nextStack);
+            traceTemplateSource(env, configRoot, includedPath, fs.readFileSync(includedPath, 'utf8'), context, trace, nextStack);
         }
     }
 }

package/examples/basic-config/agent-config/starter/basic-project/agent-run.jsonc

@@ -14,7 +14,7 @@
       "triage"
     ],
     "overrides": {
-      "triage": "{{ profile }}/overrides/triage.SKILL.md.njk"
+      "triage": "{{ profile }}/skills/triage/SKILL.md.njk"
     }
   },
   "mcp": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technomoron/agent-run",
-  "version": "0.99.32",
+  "version": "0.99.34",
   "packageManager": "pnpm@10.34.5",
   "bin": {
     "agent-run": "dist/agent-run.js",
@@ -36,8 +36,7 @@
     "test:integration": "bash ./scripts/test.sh",
     "test:release": "bash ./scripts/test-release.sh",
     "release": "bash ./scripts/release.sh",
-    "release:check": "bash ./scripts/release-check.sh",
-    "release:preflight": "pnpm cleanbuild && pnpm test && pnpm release:check -- --local",
+    "release:preflight": "pnpm cleanbuild && pnpm test",
     "release:verify": "bash ./scripts/release-verify.sh"
   },
   "author": "Bjorn Erik Jacobsen",

package/scripts/ensure-agent-brain.sh

@@ -17,7 +17,7 @@ for account in "$@"; do
 	loginctl enable-linger "$username"
 	systemctl start "user@$uid.service"
 	user_systemctl() {
-		runuser -u "$username" -- env "XDG_RUNTIME_DIR=/run/user/$uid" "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus" systemctl --user "$@"
+		runuser -u "$username" -- env "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$uid/bus" systemctl --user "$@"
 	}
 	user_systemctl daemon-reload
 	user_systemctl enable agent-brain.service

package/scripts/install-systemd-jobs.sh

@@ -19,7 +19,6 @@ USAGE
 }
 
 ROOT="$(cd "$(dirname "$0")/.." && pwd)"
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 INSTALL_LIBEXEC_DIR="${INSTALL_LIBEXEC_DIR:-${INSTALL_LIB_DIR:-/usr/local/libexec/agent-run}}"
 SYSTEMD_DIR="${SYSTEMD_DIR:-/etc/systemd/system}"
 SYSTEMD_USER_DIR="${SYSTEMD_USER_DIR:-/etc/systemd/user}"
@@ -30,13 +29,7 @@ SERVICE_FILE="$ROOT/ops/systemd/ai-tools-update.service"
 TIMER_FILE="$ROOT/ops/systemd/ai-tools-update.timer"
 BRAIN_HELPER="$ROOT/scripts/ensure-agent-brain.sh"
 BRAIN_SERVICE="$ROOT/ops/systemd/agent-brain.service"
-if [ ! -f "$UPDATE_SCRIPT" ]; then
-	UPDATE_SCRIPT="$SCRIPT_DIR/update-ai-tools.sh"
-	SERVICE_FILE="$SCRIPT_DIR/ai-tools-update.service"
-	TIMER_FILE="$SCRIPT_DIR/ai-tools-update.timer"
-	BRAIN_HELPER="$SCRIPT_DIR/ensure-agent-brain.sh"
-	BRAIN_SERVICE="$SCRIPT_DIR/agent-brain.service"
-fi
+
 
 INSTALL_AI_TOOLS=0
 DRY_RUN=0