ws-aitoolkit 0.1.2__tar.gz → 0.1.4__tar.gz

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ws-aitoolkit
-Version: 0.1.2
+Version: 0.1.4
 Summary: Your memory, skills and rules, in any AI.
 Author: Michael Fry
 License-Expression: Apache-2.0

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ws-aitoolkit"
-version = "0.1.2"
+version = "0.1.4"
 description = "Your memory, skills and rules, in any AI."
 readme = "README.md"
 license = "Apache-2.0"

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ws-aitoolkit"
-version = "0.1.2"
+version = "0.1.4"
 description = "Your memory, skills and rules, in any AI."
 readme = "README.md"
 license = "Apache-2.0"

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/src/ws/_build.py

@@ -1,6 +1,6 @@
 """Written by the release workflow before uv build; absent in a checkout."""
 
-git_sha = "92389d65eb2553fe9d570d9fd6f37cb386b08c01"
+git_sha = "9ed7a1d78df76dd7e28498dd93f03890e6b1efb1"
 dirty = False
-build_date = "2026-11-01T07:40:02Z"
+build_date = "2026-11-01T15:26:17Z"
 source = "release"

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/src/ws/extcmd.py

@@ -2,7 +2,7 @@
 
 Precedence, first match wins: a built-in command; `ws-<word>` on PATH (a word is `[a-z][a-z0-9-]{0,40}`); the
 profile's `[cli] fallback`; the usual usage error with "did you mean". An external gets the arguments after its word,
-`WS_OUTPUT=json` when `--json` was given, and `-C PATH` as its working folder (the way git runs `git-<word>`). The
+`--json` (before any `--`) and `WS_OUTPUT=json` when `--json` was given, and `-C PATH` as its working folder (the way git runs `git-<word>`). The
 fallback gets the whole original argument list, leading flags and the empty list (a bare `ws`) included, and runs with
 `WS_FALLBACK=1`; a run that already has it set is not handed on again. The fallback is an absolute path (or `~/...`) to a
 file that is yours, executable and closed to other writers, the same test a job file passes, in a folder that other
@@ -177,9 +177,12 @@ def plan(
         found = find_external(first, env)
         if found:
             child = dict(env)
+            args = rest[1:]
             if g.json:
                 child["WS_OUTPUT"] = "json"
-            return Launch(found, rest[1:], child)
+                cut = args.index("--") if "--" in args else len(args)
+                args = [*args[:cut], "--json", *args[cut:]]  # passed on as well: most programs read the flag
+            return Launch(found, args, child)
     elif first is not None and first.split("=")[0] in flags:
         return None
     try:

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/src/ws/guards/syntax_check.py

@@ -104,6 +104,22 @@ def _run(argv: list[str], path: str) -> tuple[str | None, str | None]:
     return f"{path}: {argv[0]} found a problem:\n{_brief(done.stdout + done.stderr)}", None
 
 
+def _bash_shebang(path: str) -> bool:
+    """Does the script ask for bash on its first line (`#!/bin/bash`, `#!/usr/bin/env bash`)? Then `sh -n` would
+    report bash syntax such as `>(...)` as an error."""
+    try:
+        with open(path, "rb") as f:
+            first = f.readline(256)
+    except OSError:
+        return False
+    if not first.startswith(b"#!"):
+        return False
+    words = first[2:].split()
+    if words and words[0].endswith(b"/env"):
+        words = [w for w in words[1:] if not w.startswith(b"-")]
+    return bool(words) and words[0].rsplit(b"/", 1)[-1] == b"bash"
+
+
 def judge(call, cfg: Config, ctx) -> Finding | None:
     path = os.path.abspath(os.path.join(ctx.cwd or "", call.value))
     ext = path.rsplit(".", 1)[-1].lower() if "." in os.path.basename(path) else ""
@@ -118,7 +134,7 @@ def judge(call, cfg: Config, ctx) -> Finding | None:
             data = f.read()
         problem, note = {"py": _python, "json": _json, "toml": _toml}[ext](path, data), None
     elif ext in ("sh", "bash"):
-        shell = "bash" if ext == "bash" else "sh"
+        shell = "bash" if ext == "bash" or _bash_shebang(path) else "sh"
         if shutil.which(shell) is None and shutil.which("bash") is not None:
             shell = "bash"
         problem, note = _run([shell, "-n"], path)

{ws_aitoolkit-0.1.2 → ws_aitoolkit-0.1.4}/src/ws/policy.py

@@ -1131,6 +1131,28 @@ def _cluster(flags: list[str], letter: str) -> bool:
 # --- paths: deny_read, protected files ----------------------------------------------------------------------------
 
 
+def _glob_class(pattern: str, i: int) -> tuple[str, int] | None:
+    """The bracket class opening at `pattern[i]` as a regex class and the index of its `]`, or None when it is not
+    one (no `]` before a `/`, or a range like `s-c` that runs backwards), so the `[` is matched as itself."""
+    j = pattern.find("]", i + 2)
+    if j < 0 or "/" in pattern[i + 1 : j]:
+        return None
+    body = pattern[i + 1 : j]
+    neg = body[0] in "!^"
+    body = body[1:] if neg else body
+    parts, k = [], 0
+    while k < len(body):
+        if k + 2 < len(body) and body[k + 1] == "-":
+            if body[k] > body[k + 2]:
+                return None
+            parts.append(re.escape(body[k]) + "-" + re.escape(body[k + 2]))
+            k += 3
+        else:
+            parts.append(re.escape(body[k]))
+            k += 1
+    return "[" + ("^" if neg else "") + "".join(parts) + "]", j
+
+
 def _glob_regex_path(pattern: str) -> re.Pattern:
     out, i = [], 0
     while i < len(pattern):
@@ -1147,10 +1169,9 @@ def _glob_regex_path(pattern: str) -> re.Pattern:
             out.append("[^/]*")
         elif c == "?":
             out.append("[^/]")
-        elif c == "[" and (j := pattern.find("]", i + 2)) > 0:
-            body = pattern[i + 1 : j]
-            out.append("[" + ("^" + body[1:] if body[0] == "!" else body) + "]")
-            i = j
+        elif c == "[" and (cls := _glob_class(pattern, i)) is not None:
+            out.append(cls[0])
+            i = cls[1]
         else:
             out.append(re.escape(c))
         i += 1