@sous-io/sous 0.2.35 → 0.2.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sous-io/sous",
-  "version": "0.2.35",
+  "version": "0.2.37",
   "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.35
+version: 0.2.37
 
 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/providers/git.ts

@@ -28,7 +28,14 @@ export type CommandResult = {
 export type CommandRunner = (
   command: string,
   args: string[],
-  options: { cwd?: string }
+  options: {
+    cwd?: string;
+    /**
+     * Start the command through the shell. Only for a fixed command line: it
+     * is how Windows finds a `.cmd` shim such as npm's.
+     */
+    shell?: boolean;
+  }
 ) => Promise<CommandResult>;
 
 /**
@@ -38,13 +45,14 @@ export type CommandRunner = (
  *
  * @param command - The executable to run.
  * @param args - Its arguments, already split.
- * @param options - Optional working directory.
+ * @param options - Optional working directory, and whether to start it through the shell.
  */
 export const spawnCommand: CommandRunner = (command, args, options = {}) =>
   new Promise<CommandResult>((resolve) => {
     const child = spawn(command, args, {
       cwd: options.cwd,
       stdio: ["ignore", "pipe", "pipe"],
+      shell: options.shell === true,
     });
 
     let stdout = "";

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

@@ -83,6 +83,25 @@ export function localRepoPath(url: string): string | undefined {
   return path.isAbsolute(trimmed) ? path.normalize(trimmed) : undefined;
 }
 
+/**
+ * A directory spelled as an identity's owner path: its segments joined with `/`.
+ * The identity becomes directories in the store and the index cache, split on
+ * `/`, so a Windows path would otherwise land there as one segment holding its
+ * drive colon and backslashes. A drive (`C:`) or UNC (`\\server\share`) root
+ * becomes plain segments. A POSIX path comes back unchanged.
+ *
+ * identityOwnerPath("/home/me");        // -> "/home/me"
+ * identityOwnerPath("C:\\Users\\me");  // -> "/C/Users/me" (on Windows)
+ *
+ * @param directory - An absolute, normalized directory.
+ */
+function identityOwnerPath(directory: string): string {
+  const { root } = path.parse(directory);
+  const rootSegments = root.split(/[\\/]/).map((segment) => segment.replace(/:$/, ""));
+  const segments = [...rootSegments, ...directory.slice(root.length).split(path.sep)];
+  return "/" + segments.filter((segment) => segment.length > 0).join("/");
+}
+
 /** A URL that names its scheme, such as `https://` or `ssh://`. */
 const SCHEME_PATTERN = /^[a-z][a-z0-9+.-]*:\/\//i;
 
@@ -290,7 +309,7 @@ export class LocalProvider extends ProviderBase {
 
     return {
       host: "localhost",
-      owner: path.dirname(directory),
+      owner: identityOwnerPath(path.dirname(directory)),
       name: path.basename(directory),
       httpsUrl: directory,
       sshUrl: pathToFileURL(directory).href,

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/self-update/installs.ts

@@ -361,7 +361,8 @@ async function globalRoot(manager: GlobalManager, run: CommandRunner): Promise<s
   const query = GLOBAL_ROOT_QUERIES[manager];
   let output: string;
   try {
-    const result = await run(manager, query.args, {});
+    // On Windows the managers are `.cmd` shims, which only the shell finds.
+    const result = await run(manager, query.args, { shell: process.platform === "win32" });
     if (result.code !== 0) return undefined;
     output = result.stdout.trim().split(/\r?\n/).pop()?.trim() ?? "";
   } catch {

package/src/lib/settings.ts

@@ -2,10 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import { spawnSync } from "node:child_process";
 import { createRequire } from "node:module";
-import { fileURLToPath } from "node:url";
+import { fileURLToPath, pathToFileURL } 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,
@@ -328,7 +329,9 @@ export async function loadSettingsWithLayers(
 
   const attempts: { label: string; args: string[] }[] = [
     { label: "node", args: [CONFIG_KERNEL_PATH] },
-    { label: "tsx", args: ["--import", tsxPath, CONFIG_KERNEL_PATH] },
+    // `--import` takes a module specifier, so the path goes as a file:// URL:
+    // a bare Windows path reads as a URL whose scheme is the drive letter.
+    { label: "tsx", args: ["--import", pathToFileURL(tsxPath).href, CONFIG_KERNEL_PATH] },
   ];
 
   const failures: { label: string; message: string }[] = [];
@@ -1010,7 +1013,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 });