atris 3.74.3 → 3.74.4

package/lib/yes-lock.js

@@ -674,21 +674,42 @@ const PUSH_HINT = 'a branch push runs without a yes as: git push origin <branch>
 
 // git reads, plus local work that cannot move a ref other than the branch it is on
 const GIT_SEALED_READS = new Set(['status', 'diff', 'log', 'show', 'blame', 'rev-parse', 'ls-files', 'grep', 'describe', 'rev-list', 'merge-base', 'cat-file', 'ls-tree', 'show-ref', 'for-each-ref', 'shortlog', 'check-ignore', 'help', 'version']);
-const GIT_SEALED_LOCAL = new Set(['add', 'rm', 'mv', 'restore']);
+const GIT_SEALED_LOCAL = new Set(['add', 'rm', 'mv', 'restore', 'update-index', 'write-tree']);
 const GIT_SEALED_GLOBALS = new Set(['--no-pager', '-P', '--no-optional-locks', '--literal-pathspecs', '--version', '--help', '-h']);
 // the shape of a branch name git accepts, without the corners that read as something else
 const BRANCH_NAME = /^(?!-)(?!\.)(?!.*\.\.)(?!.*\/\/)(?!.*\/\.)(?!.*@\{)(?!.*\.lock(?:\/|$))[A-Za-z0-9._/-]+(?<![./])$/;
 
-// Only -C and a few output switches go before the command. -c,
-// --config-env, and --exec-path are held: config can name a program git runs
-// (core.fsmonitor, core.pager), and git puts its own folder first on PATH for
-// that program, so a git inside it would skip the wrapper.
+// -c a woken run may pass: a value that only turns something off, or a key
+// that only changes how output looks. The engines harden their own git calls
+// this way (hooks, fsmonitor, askpass, protocols, gc all off). A -c that
+// names a program, path, command, alias, helper, pager, editor, or route is
+// held, since git runs that program with its own folder first on PATH, where
+// a git inside it skips the wrapper; so are the keys whose value is a name,
+// URL, or refspec (alias, remote, url, push, include, credential, branch
+// routing), where even an empty value can reroute (url.<x>.insteadOf=).
+const GIT_DISPLAY_KEYS = new Set(['format.pretty', 'log.showsignature', 'status.showuntrackedfiles', 'core.quotepath', 'core.safecrlf', 'safe.barerepository', 'color.ui']);
+const GIT_ROUTE_KEYS = /^(alias|remote|url|push|include|includeif|credential)\.|^branch\..+\.(remote|pushremote|merge)$/;
+
+function sealedGitConfigOk(pair) {
+  const eq = String(pair).indexOf('=');
+  const key = (eq < 0 ? String(pair) : String(pair).slice(0, eq)).trim().toLowerCase();
+  const value = eq < 0 ? 'true' : String(pair).slice(eq + 1).trim();
+  if (GIT_DISPLAY_KEYS.has(key)) return true;
+  if (key === 'core.hookspath') return value === '/dev/null';
+  if (GIT_ROUTE_KEYS.test(key)) return false;
+  return /^(|false|never|0|no|off)$/i.test(value);
+}
+
+// Only -C, -c that turns something off, and a few output switches go before
+// the command. --config-env and --exec-path are held.
 function sealedGitPrefix(args) {
   const prefix = [];
   for (let i = 0; i < args.length; i += 1) {
     const a = args[i];
-    if (a === '-C') {
-      prefix.push(a, String(args[i + 1] === undefined ? '' : args[i + 1]));
+    if (a === '-C' || a === '-c') {
+      const value = String(args[i + 1] === undefined ? '' : args[i + 1]);
+      if (a === '-c' && !sealedGitConfigOk(value)) return { bad: `-c ${value}` };
+      prefix.push(a, value);
       i += 1;
       continue;
     }
@@ -726,9 +747,11 @@ function sealedGit(args, ctx) {
   if (!p.sub) return pass();
   if (GIT_SEALED_READS.has(p.sub) || GIT_SEALED_LOCAL.has(p.sub)) return pass();
   // the questions below are asked of the repo the command names
-  const repo = ctx.forRepo(p.prefix.filter((a, i, all) => a === '-C' || all[i - 1] === '-C'));
+  const repo = ctx.forRepo(p.prefix.filter((a, i, all) => a === '-C' || a === '-c' || all[i - 1] === '-C' || all[i - 1] === '-c'));
   const rest = p.rest;
   switch (p.sub) {
+    // a new repo has no remote; a template or a git folder elsewhere could bring hooks
+    case 'init': return rest.some(a => /^--(template|separate-git-dir)(=|$)/.test(a)) ? hold('git init with a template or a git folder elsewhere can bring hooks') : pass();
     case 'push': return sealedPush(p, repo);
     case 'fetch': return sealedFetch(rest, repo);
     case 'commit': return isMainRef(repo.currentBranch()) ? hold('a commit here would land on master') : pass();
@@ -764,7 +787,9 @@ function sealedPush(p, repo) {
     words.push(a);
   }
   if (words.length !== 2 || words[0] !== 'origin') return hold(`a handed-off job pushes one branch to origin; ${PUSH_HINT}`);
-  const head = words[1].match(/^HEAD:refs\/heads\/(.+)$/);
+  // HEAD:<branch> is written out as HEAD:refs/heads/<branch>, so a name that
+  // matches a tag on origin can never update the tag
+  const head = words[1].match(/^HEAD:(?:refs\/heads\/(?=.))?(?!refs\/)(.+)$/);
   const branch = head ? head[1] : words[1];
   if (!head && (branch.includes(':') || branch.startsWith('refs/'))) return hold(`git push ${words[1]} names more than a branch; ${PUSH_HINT}`);
   if (isMainRef(branch)) return hold(`git push to master lands on master; ${PUSH_HINT}`);
@@ -964,6 +989,8 @@ const ATRIS_SEALED = {
 function sealedAtris(args, missionId) {
   const [cmd = '', sub = ''] = args;
   if (args.length === 1 && ['--version', '-v', '--help', '-h'].includes(cmd)) return pass();
+  // the boot read: atris prints the welcome screen for its spec file and stops
+  if (args.length === 1 && (cmd === 'atris.md' || cmd.endsWith('/atris.md'))) return pass();
   const allowed = Object.prototype.hasOwnProperty.call(ATRIS_SEALED, cmd) ? ATRIS_SEALED[cmd] : null;
   if (!allowed) return hold(`atris ${cmd} is not on the list a handed-off job may run`);
   const subOk = allowed === true || ['help', '--help', '-h'].includes(sub)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "atris",
-  "version": "3.74.3",
+  "version": "3.74.4",
   "description": "you say what you want in plain words. atris builds it, checks it, and shows you proof.",
   "mcpName": "io.github.atrislabs/atris",
   "main": "bin/atris.js",