@sous-io/sous 0.2.34 → 0.2.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sous-io/sous",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "description": "Compiles AI coding agent configuration (CLAUDE.md, skills, memories) from LiquidJS templates",
   "type": "module",
   "license": "Apache-2.0",

package/recipes/core/sous-skills/sous.recipe.yaml

@@ -11,7 +11,7 @@ formatVersion: 1
 
 namespace: core
 name: sous-skills
-version: 0.2.34
+version: 0.2.36
 
 description: >-
   The skills that teach an agent what sous is and how it works: which files sous

package/src/lib/config-kernel.mjs

@@ -247,7 +247,9 @@ async function main() {
     async loadConfigs(globPattern) {
       const where = `loadConfigs(${JSON.stringify(globPattern)}) in ${currentFile}`;
       const pattern = resolveBuilderPath(globPattern, where);
-      const matches = globSync(pattern, { absolute: true })
+      // glob reads `\` as an escape, so a Windows path is handed over with `/`
+      // separators (see src/lib/glob-pattern.ts; this file stays plain JS).
+      const matches = globSync(pattern.split(path.sep).join("/"), { absolute: true })
         .filter((p) => fs.statSync(p).isFile())
         .sort(bytewiseCompare);
       for (const match of matches) {

package/src/lib/glob-pattern.ts

@@ -0,0 +1,24 @@
+/**
+ * Filesystem paths as glob patterns.
+ *
+ * glob and minimatch read `\` in a pattern as an escape character, never as a
+ * path separator, and want `/` on every platform. A pattern built with
+ * `path.join` or `path.resolve` on Windows is all backslashes, so it silently
+ * matched nothing: a recipe's skills, memories and config layers, an include
+ * glob and an `entryGlob` target all came up empty without an error.
+ */
+
+import path from "node:path";
+
+/**
+ * Writes a path or a path-shaped glob with `/` separators, so glob reads it the
+ * same way on Windows as everywhere else. A no-op where `/` is the separator, so
+ * a pattern's own escapes survive on every other platform.
+ *
+ * toGlobPattern("C:\\recipes\\skills\\**\\*"); // -> "C:/recipes/skills/**\/*" on Windows
+ *
+ * @param value - A filesystem path, or a glob pattern built from one.
+ */
+export function toGlobPattern(value: string): string {
+  return path.sep === "\\" ? value.split(path.sep).join("/") : value;
+}

package/src/lib/include-resolver.ts

@@ -4,6 +4,7 @@ import { globSync } from "glob";
 import { minimatch } from "minimatch";
 import { compareBytewise, hasGlob, type ViewFile } from "../services/ref-resolver/index.js";
 import { expandHome } from "./config-discovery.js";
+import { toGlobPattern } from "./glob-pattern.js";
 import type {
   NamespaceResolution,
   NamespaceResolver,
@@ -382,7 +383,9 @@ export function resolveInclude(rawPath: string, opts: IncludeResolveOptions): In
  * @param pattern - An absolute glob pattern.
  */
 function expandPattern(pattern: string): string[] {
-  return globSync(pattern, { absolute: true, nodir: true, dot: true }).sort(compareBytewise);
+  return globSync(toGlobPattern(pattern), { absolute: true, nodir: true, dot: true }).sort(
+    compareBytewise
+  );
 }
 
 /**

package/src/lib/repos/git-clone.ts

@@ -16,6 +16,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
 import { ConfigError } from "../errors.js";
+import { LF_CHECKOUT_OPTIONS } from "./store/hash.js";
 
 /** What one git invocation produced. */
 export type GitResult = {
@@ -211,15 +212,20 @@ export function cloneRepo(
   const depth = options.depth ?? 1;
   const runner = options.runner ?? runGit;
 
+  // A linked checkout is hashed when its recipes are released or compiled, so
+  // it keeps the committed bytes whatever this machine's line-ending settings are.
   if (depth > 0) {
-    const shallow = runner(["clone", "--depth", String(depth), "--", url, destDir], {});
+    const shallow = runner(
+      ["clone", ...LF_CHECKOUT_OPTIONS, "--depth", String(depth), "--", url, destDir],
+      {}
+    );
     if (shallow.status === 0) return { depth, fellBackToFullClone: false };
     // git leaves the destination behind on some failures; clear it so the retry
     // is not refused by its own leftovers.
     fs.rmSync(destDir, { recursive: true, force: true });
   }
 
-  runGitOrThrow(["clone", "--", url, destDir], {
+  runGitOrThrow(["clone", ...LF_CHECKOUT_OPTIONS, "--", url, destDir], {
     runner: options.runner,
     what: `Cloning ${url}`,
   });

package/src/lib/repos/providers/git.ts

@@ -14,6 +14,7 @@ import { spawn } from "node:child_process";
 import fs from "node:fs/promises";
 import path from "node:path";
 import { ConfigError } from "../../errors.js";
+import { LF_CHECKOUT_OPTIONS } from "../store/hash.js";
 
 /** What a finished subprocess reports back. */
 export type CommandResult = {
@@ -174,6 +175,9 @@ export async function fetchSubtree(options: {
         "1",
         "--filter=blob:none",
         "--sparse",
+        // The fetched subtree is hashed against its pin, so its bytes must be the
+        // committed ones whatever this machine's line-ending settings are.
+        ...LF_CHECKOUT_OPTIONS,
         "--branch",
         tag,
         // Everything after this is a path or a URL, never an option, whatever it

package/src/lib/repos/recipe-config-layers.ts

@@ -27,6 +27,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { globSync } from "glob";
 import { parse as parseYaml } from "yaml";
+import { toGlobPattern } from "../glob-pattern.js";
 import { parseJsoncText } from "./load-manifest.js";
 import { listLockedRecipes, readRecipeManifestIn } from "./locked-recipes.js";
 
@@ -224,11 +225,11 @@ export function listRecipeConfigLayers(
       if (content.kind !== "config") continue;
 
       const ignore = (content.exclude ?? []).map((pattern) =>
-        path.join(recipe.dir, pattern)
+        toGlobPattern(path.join(recipe.dir, pattern))
       );
 
       for (const include of content.include) {
-        for (const filePath of globSync(path.join(recipe.dir, include), {
+        for (const filePath of globSync(toGlobPattern(path.join(recipe.dir, include)), {
           absolute: true,
           ignore,
         })) {

package/src/lib/repos/recipe-memories.ts

@@ -22,6 +22,7 @@ import { globSync } from "glob";
 import { compareBytewise } from "../../services/ref-resolver/index.js";
 import { realPathInside } from "../include-resolver.js";
 import { inferGlobBase } from "../markdown-compiler.js";
+import { toGlobPattern } from "../glob-pattern.js";
 import { compileRecipeKeyMatcher } from "./recipe-key-matcher.js";
 import {
   listLockedRecipes,
@@ -137,9 +138,11 @@ export function listMemories(options: MemoryListingOptions): MemoryFile[] {
     const mine = new Map<string, MemoryFile>();
     for (const content of manifest.contents) {
       if (content.kind !== "memories") continue;
-      const ignore = (content.exclude ?? []).map((pattern) => path.join(recipe.dir, pattern));
+      const ignore = (content.exclude ?? []).map((pattern) =>
+        toGlobPattern(path.join(recipe.dir, pattern))
+      );
       for (const include of content.include) {
-        const pattern = path.join(recipe.dir, include);
+        const pattern = toGlobPattern(path.join(recipe.dir, include));
         const base = inferGlobBase(pattern);
         for (const file of globSync(pattern, { absolute: true, ignore, dot: true })) {
           if (!isFile(file)) continue;

package/src/lib/repos/recipe-targets.ts

@@ -30,6 +30,7 @@ import path from "node:path";
 import { globSync } from "glob";
 import type { CompilationTarget } from "../markdown-compiler.js";
 import { inferGlobBase } from "../markdown-compiler.js";
+import { toGlobPattern } from "../glob-pattern.js";
 import type { Settings, VarScope } from "../settings.js";
 import { normalizeConfigPath, substituteVarsStrict } from "../settings.js";
 import type { ContentKind } from "./formats/recipe-manifest.js";
@@ -186,11 +187,11 @@ export function buildRecipeTargets(options: RecipeTargetOptions): RecipeTargets
       const recipeScope = options.scopeFor?.(recipe) ?? options.scope ?? {};
 
       const ignore = (content.exclude ?? []).map((pattern) =>
-        path.join(recipe.dir, pattern)
+        toGlobPattern(path.join(recipe.dir, pattern))
       );
 
       for (const include of content.include) {
-        const pattern = path.join(recipe.dir, include);
+        const pattern = toGlobPattern(path.join(recipe.dir, include));
         const matched = globSync(pattern, { absolute: true, ignore }).filter(isFile);
         const globBase = normalizeConfigPath(inferGlobBase(pattern));
 

package/src/lib/repos/store/hash.ts

@@ -35,6 +35,23 @@ import fs from "node:fs/promises";
 import path from "node:path";
 import { STORE_ENTRY_FILENAME } from "../formats/common.js";
 
+/**
+ * `git clone` options that check files out exactly as they were committed.
+ *
+ * A content hash is over raw bytes, and Git for Windows installs with
+ * `core.autocrlf=true` by default, which rewrites every text file to CRLF on
+ * checkout. A recipe published with LF then hashed differently on such a
+ * machine and failed its own pin. `--config` also writes these into the
+ * clone's own `.git/config`, so later checkouts in a linked working copy keep
+ * the same bytes.
+ */
+export const LF_CHECKOUT_OPTIONS = [
+  "--config",
+  "core.autocrlf=false",
+  "--config",
+  "core.eol=lf",
+] as const;
+
 /** Directory name never included in a content hash. */
 const GIT_DIR_NAME = ".git";
 

package/src/lib/settings.ts

@@ -6,6 +6,7 @@ import { fileURLToPath } from "node:url";
 import { globSync } from "glob";
 import { inferGlobBase, type CompilationConfig, type CompilationTarget, type ResolvedRuntimeContext } from "./markdown-compiler.js";
 import { buildAliasMap, resolveAliasPrefix, type AliasMap } from "./include-resolver.js";
+import { toGlobPattern } from "./glob-pattern.js";
 import {
   CONFD_DIR_NAME,
   ENV_DEFAULTS_NAME,
@@ -1010,7 +1011,7 @@ export function resolveCompilation(
       // base; the first base that matches any files wins, mirroring the first-existing-wins
       // rule of @include resolution.
       const rawPattern = substituteVarsStrict(target.entryGlob!, targetScope, `${where}.entryGlob`);
-      const patternCandidates = resolveAliasPrefix(rawPattern, aliases);
+      const patternCandidates = resolveAliasPrefix(rawPattern, aliases).map(toGlobPattern);
       let pattern = patternCandidates[0];
       let matchedFiles: string[] = [];
       for (const candidate of patternCandidates) {

package/src/lib/watch-service.ts

@@ -2,6 +2,7 @@ import chokidar from "chokidar";
 import { minimatch } from "minimatch";
 import path from "node:path";
 import type { WatchConfig } from "./settings.js";
+import { toGlobPattern } from "./glob-pattern.js";
 import { log } from "../utils/formatting.js";
 
 /** Milliseconds to wait after a change before triggering a rebuild. */
@@ -98,7 +99,7 @@ export class WatchService {
       }
 
       const isExactFile = files.includes(filePath);
-      const matchesGlob = globs.some(g => minimatch(filePath, g));
+      const matchesGlob = globs.some(g => minimatch(filePath, toGlobPattern(g)));
 
       if (isExactFile || matchesGlob) {
         schedule({ type: "partial", filePath });