@hasna/hooks 0.10.2 → 0.10.3

package/bin/native-safety-entry.js

@@ -899,8 +899,9 @@ function evaluate(input, deps) {
 if (false) {}
 
 // hooks/hook-workspace-repos-guard/src/hook.ts
+import { closeSync, constants, fstatSync, lstatSync, openSync, readFileSync as readFileSync2, statSync as statSync2 } from "fs";
 import { homedir } from "os";
-import { isAbsolute as isAbsolute2, join as join2, normalize as normalize2, relative, resolve as resolve2, sep as sep2 } from "path";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join2, normalize as normalize2, relative, resolve as resolve2, sep as sep2 } from "path";
 var FILE_WRITE_TOOLS = new Set(["Write", "Edit", "MultiEdit", "NotebookEdit"]);
 var PATCH_TOOLS = new Set(["apply_patch", "ApplyPatch", "functions.apply_patch"]);
 var DEFAULT_ORGS = ["hasna", "hasnaxyz", "hasna-products"];
@@ -914,11 +915,47 @@ function legacyRoot(home) {
 function protectedRoots(home) {
   return [reposRoot(home), legacyRoot(home)];
 }
-function resolveAllowedOrgs(env = process.env) {
+function allowedOrgsFile(home) {
+  return join2(home, ".hasna", "hooks", "config", "workspace-repos-guard-orgs");
+}
+var ORG_NAME = /^[A-Za-z0-9](?:[A-Za-z0-9-]{0,37}[A-Za-z0-9])?$/;
+function ownedAndClosed(stat) {
+  const uid = process.getuid?.();
+  return uid !== undefined && (stat.uid === 0 || stat.uid === uid) && (stat.mode & 18) === 0;
+}
+function readAllowedOrgsFile(home) {
+  const file = allowedOrgsFile(home);
+  let text;
+  try {
+    const fd = openSync(file, constants.O_RDONLY | constants.O_NOFOLLOW);
+    try {
+      const stat = fstatSync(fd);
+      if (!stat.isFile() || !ownedAndClosed(stat) || stat.size > 4096)
+        return null;
+      text = readFileSync2(fd, "utf8");
+    } finally {
+      closeSync(fd);
+    }
+    const top = normalize2(home);
+    for (let dir = dirname2(file);dir !== top; dir = dirname2(dir)) {
+      const stat = lstatSync(dir);
+      if (!stat.isDirectory() || !ownedAndClosed(stat) || dir === dirname2(dir))
+        return null;
+    }
+    if (!ownedAndClosed(statSync2(top)))
+      return null;
+  } catch {
+    return null;
+  }
+  const names = text.replace(/#[^\n]*/g, "").split(/[\s,]+/).filter(Boolean);
+  return names.length > 0 && names.every((name) => ORG_NAME.test(name)) ? new Set(names) : null;
+}
+function resolveAllowedOrgs(env = process.env, home = homedir()) {
   const raw = env.WORKSPACE_REPOS_GUARD_ORGS;
-  if (typeof raw !== "string" || !raw.trim())
-    return new Set(DEFAULT_ORGS);
-  return new Set(raw.split(",").map((s) => s.trim()).filter(Boolean));
+  if (typeof raw === "string" && raw.trim()) {
+    return new Set(raw.split(",").map((s) => s.trim()).filter(Boolean));
+  }
+  return readAllowedOrgsFile(home) ?? new Set(DEFAULT_ORGS);
 }
 function classifyPath(target, root, orgs, op) {
   if (op === "read")
@@ -952,6 +989,11 @@ function classifyPath(target, root, orgs, op) {
   return { blocked: false };
 }
 var WRITE_FLAGS = /\b(?:-o|--output|-O|--output-document|-out)\b/;
+var FD_DUPLICATION = /\d*[<>]&\s*(?:\d+|-)(?=$|[\s;&|)])/g;
+var OUTPUT_REDIRECT = /(?:\d+|&)?(?:>>|>\||>&|<>|>)\s*([^\s;&|<>()\x60]*)/g;
+function withoutFdDuplication(segment) {
+  return segment.replace(FD_DUPLICATION, " ");
+}
 function segmentOperation(segment) {
   const trimmed = segment.trim();
   if (!trimmed)
@@ -980,7 +1022,7 @@ function segmentOperation(segment) {
   } else if (/(?:^|\s)(?:python3?|node|bun)\b[^;&|]*\s+-[ce](?:\s|$)/.test(trimmed)) {
     return "write";
   }
-  if (/(?:^|[;&|])\s*echo\b/.test(trimmed) || /[>&]/.test(trimmed))
+  if (/(?:^|[;&|])\s*echo\b/.test(trimmed) || />/.test(withoutFdDuplication(trimmed)))
     return "write";
   return "read";
 }
@@ -1017,22 +1059,51 @@ function unwrapSegment(segment) {
 function regexEscape(text) {
   return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
+function cdDestinations(operand, bases, home) {
+  if (operand === undefined)
+    return [home];
+  let word = expandHomeSpelling2(operand, home);
+  const quoted = word.match(/^(['"])(.*)\1$/);
+  if (quoted)
+    word = quoted[2];
+  if (!word || word === "-" || /[$\x60*?[\]{}~\\'"]/.test(word))
+    return null;
+  return [...new Set(bases.map((base) => resolve2(base, word)))];
+}
+var REL_OPERAND = /(?:^|\s)(\.\.?|[^\s"';&|<>()\x60/]+(?:\/[^\s"';&|<>()\x60]*)?)\s*$/;
 function bashTargets(command, home, cwd) {
   if (!command)
     return [];
   const roots = protectedRoots(home);
-  const segments = command.split(/\s*&&\s*|\s*\|\|\s*|;\s*|\n+/);
+  const underRoot = (path) => roots.some((root) => path === root || path.startsWith(`${root}${sep2}`));
+  const parts = command.split(/(\s*&&\s*|\s*\|\|\s*|;\s*|\n+)/);
   const targets = [];
-  let cwdUnderRepos = null;
-  for (const rawSegment of segments) {
+  let current = [cwd];
+  let reachable = new Set([cwd]);
+  let certain = true;
+  const subshells = [];
+  for (let index = 0;index < parts.length; index += 2) {
+    const separator = index === 0 ? "" : parts[index - 1].trim();
+    if (separator === "||")
+      certain = false;
+    else if (separator !== "&&")
+      certain = true;
+    if (separator !== "&&" || !certain)
+      current = [...reachable];
+    const rawSegment = parts[index];
+    const opens = (rawSegment.match(/^[\s({]*/)?.[0].match(/\(/g) ?? []).length;
+    const closes = (rawSegment.match(/[\s)}]*$/)?.[0].match(/\)/g) ?? []).length;
+    for (let i = 0;i < opens; i++)
+      subshells.push({ current: [...current], reachable: new Set(reachable), certain });
     const segment = unwrapSegment(rawSegment);
     const op = segmentOperation(segment);
-    const cdMatch = segment.match(/(?:^|\s)cd(?:\s+(?:-[A-Za-z]+|--))*\s+([^\s;&|<>()\x60]+)/);
-    if (cdMatch) {
-      const cdTarget = expandHomeSpelling2(cdMatch[1], home);
-      if (cdTarget && roots.some((root) => cdTarget === root || cdTarget.startsWith(`${root}${sep2}`))) {
-        cwdUnderRepos = cdTarget;
-      }
+    const plainCd = segment.match(/^cd(?:\s+(?:-[A-Za-z@]+|--))*(?:\s+([^\s;&|<>()\x60]+))?$/);
+    const embeddedCd = plainCd ? null : segment.match(/(?:^|\s)cd(?:\s+(?:-[A-Za-z]+|--))*\s+([^\s;&|<>()\x60]+)/);
+    if (embeddedCd) {
+      for (const dir of cdDestinations(embeddedCd[1], current, home) ?? [])
+        reachable.add(dir);
+      certain = false;
+      current = [...reachable];
     }
     const homeLiteral = regexEscape(home);
     const suffix = roots.map((root) => regexEscape(root.slice(home.length + 1))).join("|");
@@ -1046,14 +1117,35 @@ function bashTargets(command, home, cwd) {
       targets.push({ path: normalize2(expanded).replace(/\/+$/, ""), op });
     }
     if (!foundExplicit && (op === "delete" || op === "write")) {
-      const base = cwdUnderRepos ?? (roots.some((root) => cwd === root || cwd.startsWith(`${root}${sep2}`)) ? cwd : null);
-      if (base) {
-        const relMatch = segment.match(/(?:^|\s)(\.\.?|[^\s"';&|<>()\x60/]+(?:\/[^\s"';&|<>()\x60]*)?)\s*$/);
-        if (relMatch) {
-          targets.push({ path: normalize2(resolve2(base, relMatch[1])), op });
+      const operands = [];
+      const commandPart = withoutFdDuplication(segment).replace(OUTPUT_REDIRECT, (_match, operand) => {
+        if (operand)
+          operands.push(operand);
+        return " ";
+      });
+      const commandOp = segmentOperation(commandPart);
+      const relMatch = commandOp === "read" ? null : commandPart.match(REL_OPERAND);
+      for (const base of current.filter(underRoot)) {
+        for (const operand of operands) {
+          targets.push({ path: normalize2(resolve2(base, expandHomeSpelling2(operand, home))), op: "write" });
         }
+        if (relMatch)
+          targets.push({ path: normalize2(resolve2(base, relMatch[1])), op: commandOp });
+      }
+    }
+    if (plainCd) {
+      const next = cdDestinations(plainCd[1], current, home);
+      if (next) {
+        for (const dir of next)
+          reachable.add(dir);
+        if (certain)
+          current = next;
+      } else {
+        certain = false;
       }
     }
+    for (let i = 0;i < closes && subshells.length > 0; i++)
+      ({ current, reachable, certain } = subshells.pop());
   }
   return targets;
 }
@@ -1067,14 +1159,14 @@ function patchTargets(patch, cwd) {
   }
   return targets;
 }
-function evaluate2(input) {
+function evaluate2(input, options = {}) {
   const warnings = [];
   if (input.hook_event_name !== "PreToolUse")
     return { output: { continue: true }, warnings };
   const tool = typeof input.tool_name === "string" ? input.tool_name : "";
-  const home = homedir();
+  const home = options.home ?? homedir();
   const roots = protectedRoots(home);
-  const orgs = resolveAllowedOrgs();
+  const orgs = resolveAllowedOrgs(process.env, home);
   if (tool === "Bash") {
     const command = getCommand(input);
     if (!command)

package/bin/serve.js

@@ -676,7 +676,7 @@ function getHook(name) {
 import { existsSync as existsSync2, mkdirSync, readFileSync, readdirSync, realpathSync, writeFileSync } from "fs";
 import { basename, dirname, isAbsolute, join as join3, normalize, resolve as resolve2, sep } from "path";
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/external.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
   void: () => voidType,
@@ -788,7 +788,7 @@ __export(exports_external, {
   BRAND: () => BRAND
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/util.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/util.js
 var util;
 (function(util2) {
   util2.assertEqual = (_) => {};
@@ -919,7 +919,7 @@ var getParsedType = (data) => {
   }
 };
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/ZodError.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/ZodError.js
 var ZodIssueCode = util.arrayToEnum([
   "invalid_type",
   "invalid_literal",
@@ -1038,7 +1038,7 @@ ZodError.create = (issues) => {
   return error;
 };
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/locales/en.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/locales/en.js
 var errorMap = (issue, _ctx) => {
   let message;
   switch (issue.code) {
@@ -1141,7 +1141,7 @@ var errorMap = (issue, _ctx) => {
 };
 var en_default = errorMap;
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/errors.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/errors.js
 var overrideErrorMap = en_default;
 function setErrorMap(map) {
   overrideErrorMap = map;
@@ -1149,7 +1149,7 @@ function setErrorMap(map) {
 function getErrorMap() {
   return overrideErrorMap;
 }
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/parseUtil.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
   const { data, path, errorMaps, issueData } = params;
   const fullPath = [...path, ...issueData.path || []];
@@ -1255,14 +1255,14 @@ var isAborted = (x) => x.status === "aborted";
 var isDirty = (x) => x.status === "dirty";
 var isValid = (x) => x.status === "valid";
 var isAsync = (x) => typeof Promise !== "undefined" && x instanceof Promise;
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/errorUtil.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/errorUtil.js
 var errorUtil;
 (function(errorUtil2) {
   errorUtil2.errToObj = (message) => typeof message === "string" ? { message } : message || {};
   errorUtil2.toString = (message) => typeof message === "string" ? message : message?.message;
 })(errorUtil || (errorUtil = {}));
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/types.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/types.js
 class ParseInputLazyPath {
   constructor(parent, value, path, key) {
     this._cachedPath = [];
@@ -5362,7 +5362,7 @@ import { readFileSync as readFileSync5 } from "fs";
 import { dirname as dirname4, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath5 } from "url";
 
-// ../hooks0102-standalone-lock/node_modules/@hasna/contracts/dist/client/transport.js
+// ../../node_modules/.bun/@hasna+contracts@1.2.2+944b86d8024e79fa/node_modules/@hasna/contracts/dist/client/transport.js
 import { spawnSync } from "child_process";
 import { closeSync as closeSync2, fstatSync as fstatSync2, openSync as openSync2, readFileSync as readFileSync22 } from "fs";
 import { O_NOFOLLOW as O_NOFOLLOW2, O_NONBLOCK as O_NONBLOCK2, O_RDONLY as O_RDONLY2 } from "constants";

package/dist/index.js

@@ -581,7 +581,7 @@ var init_redact = __esm(() => {
   ];
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/util.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/util.js
 var util, objectUtil, ZodParsedType, getParsedType = (data) => {
   const t = typeof data;
   switch (t) {
@@ -712,7 +712,7 @@ var init_util = __esm(() => {
   ]);
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/ZodError.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/ZodError.js
 var ZodIssueCode, quotelessJson = (obj) => {
   const json = JSON.stringify(obj, null, 2);
   return json.replace(/"([^"]+)":/g, "$1:");
@@ -833,7 +833,7 @@ var init_ZodError = __esm(() => {
   };
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/locales/en.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/locales/en.js
 var errorMap = (issue, _ctx) => {
   let message;
   switch (issue.code) {
@@ -940,7 +940,7 @@ var init_en = __esm(() => {
   en_default = errorMap;
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/errors.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/errors.js
 function setErrorMap(map) {
   overrideErrorMap = map;
 }
@@ -953,7 +953,7 @@ var init_errors = __esm(() => {
   overrideErrorMap = en_default;
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/parseUtil.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/parseUtil.js
 function addIssueToContext(ctx, issueData) {
   const overrideMap = getErrorMap();
   const issue = makeIssue({
@@ -1058,10 +1058,10 @@ var init_parseUtil = __esm(() => {
   });
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/typeAliases.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/typeAliases.js
 var init_typeAliases = () => {};
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/helpers/errorUtil.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/helpers/errorUtil.js
 var errorUtil;
 var init_errorUtil = __esm(() => {
   (function(errorUtil2) {
@@ -1070,7 +1070,7 @@ var init_errorUtil = __esm(() => {
   })(errorUtil || (errorUtil = {}));
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/types.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/types.js
 class ParseInputLazyPath {
   constructor(parent, value, path, key) {
     this._cachedPath = [];
@@ -4421,7 +4421,7 @@ var init_types = __esm(() => {
   NEVER = INVALID;
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/v3/external.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/v3/external.js
 var exports_external = {};
 __export(exports_external, {
   void: () => voidType,
@@ -4541,7 +4541,7 @@ var init_external = __esm(() => {
   init_ZodError();
 });
 
-// ../hooks0102-standalone-lock/node_modules/zod/index.js
+// ../../node_modules/.bun/zod@3.25.76/node_modules/zod/index.js
 var init_zod = __esm(() => {
   init_external();
   init_external();
@@ -5101,7 +5101,7 @@ var init_profiles = __esm(() => {
   init_app_home();
 });
 
-// ../hooks0102-standalone-lock/node_modules/@hasna/contracts/dist/client/transport.js
+// ../../node_modules/.bun/@hasna+contracts@1.2.2+944b86d8024e79fa/node_modules/@hasna/contracts/dist/client/transport.js
 import { isIP } from "net";
 import { spawnSync } from "child_process";
 import { closeSync as closeSync22, fstatSync as fstatSync22, openSync as openSync22, readFileSync as readFileSync22 } from "fs";
@@ -7920,7 +7920,7 @@ function writeCodexSettings(path, settings) {
 // src/lib/claude-skills-coordination.ts
 import { createHash as createHash5 } from "crypto";
 
-// ../hooks0102-standalone-lock/node_modules/@hasna/skills/dist/index.js
+// ../../node_modules/.bun/@hasna+skills@0.9.14+a00d3064559565bb/node_modules/@hasna/skills/dist/index.js
 import { existsSync as existsSync9 } from "fs";
 import { homedir as homedir4 } from "os";
 import { join as join8, resolve as resolve3 } from "path";

package/dist/sdk/index.js

@@ -1,5 +1,5 @@
 // @bun
-// ../hooks0102-standalone-lock/node_modules/@hasna/contracts/dist/client/transport.js
+// ../../node_modules/.bun/@hasna+contracts@1.2.2+944b86d8024e79fa/node_modules/@hasna/contracts/dist/client/transport.js
 import { isIP } from "net";
 import { spawnSync } from "child_process";
 import { closeSync as closeSync2, fstatSync as fstatSync2, openSync as openSync2, readFileSync as readFileSync2 } from "fs";

package/hooks/hook-workspace-repos-guard/README.md

@@ -32,17 +32,39 @@ Home spellings (`~`, `$HOME`, `${HOME}`, quoted or not, including split-quote
 forms like `"$HOME"/.hasna/repos/clones`, which Bash treats identically to the
 unquoted spelling) are expanded before classification; `apply_patch` tools
 are inspected through their `Add File` / `Update File` / `Delete File`
-markers; Bash relative operands are resolved against the command's cwd when
-it sits under the clones root; parenthesized command groups
-(`(cd ... && rm -rf ...)`) are unwrapped.
+markers; parenthesized command groups (`(cd ... && rm -rf ...)`) are
+unwrapped.
+
+Bash relative operands (a trailing bare name, `.`, `..`, and the operand of
+an output redirection such as `> file` or `>> file`) are resolved against the
+directory the command segment runs in, and only count when that directory is
+under a protected root. That directory starts as the command's cwd. A plain
+`cd DIR` moves it for the segments joined to it by `&&`, so
+`cd /tmp && printf x > out` is not attributed to the session cwd. After `;`,
+a newline or `||` the `cd` may have failed, so the earlier directories stay
+in scope. A `cd` inside `( ... )`, a pipeline or the background does not move
+it, and neither does a `cd` whose target cannot be resolved statically.
+Descriptor duplication (`2>&1`, `>&2`, `1>&-`) is not a write.
 
 ## Configuration
 
-Allowed orgs default to `hasna,hasnaxyz,hasna-products` and are overridable
-with the `WORKSPACE_REPOS_GUARD_ORGS` env var (comma-separated). Private
-workspace orgs must be added per-install via that var; they are never part
-of the public default. The home directory is resolved with `os.homedir()` —
-never hardcoded.
+Allowed orgs default to `hasna,hasnaxyz,hasna-products`. Private workspace
+orgs must be added per-install; they are never part of the public default.
+There are two per-install routes, checked in this order:
+
+1. The `WORKSPACE_REPOS_GUARD_ORGS` env var (comma-separated), for installs
+   that run the hook with the harness environment (`hooks run`).
+2. The file `$HOME/.hasna/hooks/config/workspace-repos-guard-orgs`. The
+   native safety registration (`hooks safety install`) runs the guard with
+   only `HOME` and `PATH`, so the env var never reaches it and this file is
+   the route that does. List the org names separated by commas or whitespace;
+   `#` starts a comment. The list replaces the default, so include the
+   default orgs you still need. The file and every directory from it up to
+   `HOME` must be owned by the user or root and not writable by group or
+   others. A missing, untrusted or malformed file is ignored and the default
+   applies.
+
+The home directory is resolved with `os.homedir()` — never hardcoded.
 
 ## Failure mode