@h-rig/core 0.0.6-alpha.176 → 0.0.6-alpha.177

package/dist/src/hook-materializer.js

@@ -1,7 +1,7 @@
 // @bun
 // packages/core/src/hook-materializer.ts
-import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
-import { dirname, resolve as resolve2 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { resolve as resolve2 } from "path";
 
 // packages/core/src/hook-runtime.ts
 import { appendFileSync, existsSync, mkdirSync, readFileSync, realpathSync, writeSync } from "fs";
@@ -116,18 +116,6 @@ function resolveBunCliInvocation() {
 }
 
 // packages/core/src/hook-materializer.ts
-var MARKER_PLUGIN = "_rigPlugin";
-var MARKER_HOOK_ID = "_rigHookId";
-function matcherToString(matcher) {
-  if (matcher.kind === "all")
-    return;
-  if (matcher.kind === "tool")
-    return matcher.name;
-  return matcher.pattern;
-}
-function isPluginOwned(cmd) {
-  return typeof cmd[MARKER_PLUGIN] === "string";
-}
 function shellQuote(value) {
   return `'${value.replaceAll("'", `'\\''`)}'`;
 }
@@ -158,124 +146,7 @@ function buildTypedHookShimCommand(pluginName, hook, projectRoot) {
   ].filter(Boolean);
   return parts.join(" ");
 }
-function createPiNoopSessionHookAdapter() {
-  return {
-    id: "pi",
-    materialize() {
-      return {
-        adapterId: "pi",
-        status: "skipped",
-        reason: "Pi sessions do not consume Claude Code settings hooks."
-      };
-    }
-  };
-}
-function createClaudeCodeSessionHookAdapter() {
-  return {
-    id: "claude-code",
-    materialize(projectRoot, entries) {
-      return writeClaudeCodeHookSettings(projectRoot, entries);
-    }
-  };
-}
-function defaultAgentSessionHookAdapters(env = process.env) {
-  if (env.RIG_AGENT_SESSION_HOOK_ADAPTER === "claude-code") {
-    return [createClaudeCodeSessionHookAdapter()];
-  }
-  if (env.RIG_AGENT_SESSION_HOOK_ADAPTER === "pi" || typeof env.PI_CODING_AGENT_SESSION_DIR === "string" && env.PI_CODING_AGENT_SESSION_DIR.trim().length > 0 || env.RIG_RUN_PROCESS === "1") {
-    return [createPiNoopSessionHookAdapter()];
-  }
-  return [createClaudeCodeSessionHookAdapter()];
-}
-function materializeSessionHookAdapters(projectRoot, entries, adapters = [createClaudeCodeSessionHookAdapter()]) {
-  return adapters.map((adapter) => adapter.materialize(projectRoot, entries));
-}
-function materializeHooks(projectRoot, entries) {
-  const result = createClaudeCodeSessionHookAdapter().materialize(projectRoot, entries);
-  return result.status === "materialized" ? result.path : resolve2(projectRoot, ".claude", "settings.json");
-}
-function applyClaudeCodeSessionHooksToSettings(existing, entries, projectRoot, options = {}) {
-  const hooks = typeof existing.hooks === "object" && existing.hooks !== null && !Array.isArray(existing.hooks) ? existing.hooks : {};
-  const replacePluginOwned = options.replacePluginOwned ?? true;
-  if (replacePluginOwned) {
-    for (const event of Object.keys(hooks)) {
-      const groups = hooks[event] ?? [];
-      const cleaned = [];
-      for (const group of groups) {
-        const operatorHooks = group.hooks.filter((h) => !isPluginOwned(h));
-        if (operatorHooks.length > 0) {
-          cleaned.push({ ...group, hooks: operatorHooks });
-        }
-      }
-      if (cleaned.length > 0) {
-        hooks[event] = cleaned;
-      } else {
-        delete hooks[event];
-      }
-    }
-  }
-  const materializedEvents = new Set;
-  for (const { pluginName, hook, typed } of entries) {
-    const command = hook.command ?? (typed ? buildTypedHookShimCommand(pluginName, hook, projectRoot) : undefined);
-    if (!command) {
-      continue;
-    }
-    const event = hook.event;
-    materializedEvents.add(event);
-    const matcherString = matcherToString(hook.matcher);
-    const groups = hooks[event] ??= [];
-    let group = groups.find((g) => g.matcher === matcherString);
-    if (!group) {
-      group = matcherString === undefined ? { hooks: [] } : { matcher: matcherString, hooks: [] };
-      groups.push(group);
-    }
-    const alreadyPresent = group.hooks.some((candidate) => candidate[MARKER_PLUGIN] === pluginName && candidate[MARKER_HOOK_ID] === hook.id);
-    if (alreadyPresent) {
-      continue;
-    }
-    group.hooks.push({
-      type: "command",
-      command,
-      [MARKER_PLUGIN]: pluginName,
-      [MARKER_HOOK_ID]: hook.id
-    });
-  }
-  const next = { ...existing };
-  if (Object.keys(hooks).length > 0) {
-    next.hooks = hooks;
-  } else {
-    delete next.hooks;
-  }
-  return { settings: next, events: [...materializedEvents].sort() };
-}
-function writeClaudeCodeHookSettings(projectRoot, entries) {
-  const settingsPath = resolve2(projectRoot, ".claude", "settings.json");
-  const existing = existsSync2(settingsPath) ? safeReadJson(settingsPath) : {};
-  const { settings, events } = applyClaudeCodeSessionHooksToSettings(existing, entries, projectRoot);
-  mkdirSync2(dirname(settingsPath), { recursive: true });
-  writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}
-`, "utf-8");
-  return {
-    adapterId: "claude-code",
-    status: "materialized",
-    path: settingsPath,
-    events
-  };
-}
-function safeReadJson(path) {
-  try {
-    return JSON.parse(readFileSync2(path, "utf-8"));
-  } catch {
-    return {};
-  }
-}
 export {
   resolveHookRunnerPath,
-  materializeSessionHookAdapters,
-  materializeHooks,
-  defaultAgentSessionHookAdapters,
-  createPiNoopSessionHookAdapter,
-  createClaudeCodeSessionHookAdapter,
-  buildTypedHookShimCommand,
-  applyClaudeCodeSessionHooksToSettings
+  buildTypedHookShimCommand
 };

package/dist/src/hook-protocol.js

@@ -151,26 +151,6 @@ function isTaskConfigEntry(value) {
   }
   return true;
 }
-async function readTaskConfigFromDisk(configPath) {
-  if (!existsSync(configPath)) {
-    return null;
-  }
-  try {
-    const bunFile = bunRuntime()?.file;
-    const content = bunFile ? await bunFile(configPath).json() : JSON.parse(readFileSync(configPath, "utf-8"));
-    return isPlainObject(content) ? content : null;
-  } catch {
-    return null;
-  }
-}
-function taskConfigCandidates(ctx) {
-  const taskWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  return [
-    ctx?.monorepoMainRoot ? resolve(ctx.monorepoMainRoot, ".rig", "task-config.json") : "",
-    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
-    taskWorkspace ? resolve(taskWorkspace, ".rig", "task-config.json") : ""
-  ].filter(Boolean);
-}
 async function resolveTaskConfig(_projectRoot, _taskId) {
   const ctx = getContext();
   if (ctx) {
@@ -188,16 +168,6 @@ async function resolveTaskConfig(_projectRoot, _taskId) {
       }
     } catch {}
   }
-  for (const configPath of taskConfigCandidates(ctx)) {
-    const config = await readTaskConfigFromDisk(configPath);
-    if (!config) {
-      continue;
-    }
-    const taskEntry = config[_taskId];
-    if (isTaskConfigEntry(taskEntry)) {
-      return taskEntry;
-    }
-  }
   return {};
 }
 async function resolveTaskScopes(projectRoot, taskId) {
@@ -327,7 +297,7 @@ function block(hookName, message, projectRoot) {
     lines.push("");
     lines.push(`REPEATED VIOLATION (${count}x ${hookName}).`);
     lines.push("STOP. Read the FULL CLAUDE.md from top to bottom.");
-    lines.push("If stuck, write the problem to .rig/state/failed_approaches.md and request help.");
+    lines.push("If stuck, record the failed approach in the task-state failure log and request help.");
   }
   writeSync(1, `${lines.join(`
 `)}

package/dist/src/hook-runner.d.ts

@@ -1,9 +1,9 @@
 /**
  * hook-runner.ts — entrypoint for typed plugin hooks.
  *
- * The hook-materializer writes a shim command into `.claude/settings.json`
- * for every plugin hook that ships a typed implementation instead of a raw
- * command string:
+ * The provider-owned session-hook materializer writes a shim command into
+ * the active session host for every plugin hook that ships a typed
+ * implementation instead of a raw command string:
  *
  *   <bun> <this file> --plugin <name> --hook <id> [--event <event>] [--project-root <dir>]
  *

package/dist/src/hook-runner.js

@@ -2,7 +2,7 @@
 // packages/core/src/load-config.ts
 import { existsSync as existsSync2, mkdirSync, mkdtempSync, readFileSync as readFileSync2, readdirSync, rmSync, statSync } from "fs";
 import { isBuiltin } from "module";
-import { dirname, isAbsolute, join as join2, relative, resolve } from "path";
+import { basename, dirname, isAbsolute, join as join2, relative, resolve } from "path";
 import { pathToFileURL } from "url";
 import { Schema as Schema3 } from "effect";
 import { RigConfig as RigConfig3 } from "@rig/contracts";
@@ -69,8 +69,11 @@ function parseDeclarativeFile(path) {
 }
 function loadDeclarativeConfig(path) {
   const data = parseDeclarativeFile(path);
-  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : {};
-  const useStandard = standardSection.enabled !== false;
+  const standardSection = data.standard && typeof data.standard === "object" && !Array.isArray(data.standard) ? data.standard : null;
+  if (standardSection?.enabled !== true && standardSection?.enabled !== false) {
+    throw new Error(`Declarative config ${path} must explicitly set [standard] enabled = true or false.`);
+  }
+  const useStandard = standardSection.enabled === true;
   let plugins = [];
   if (useStandard) {
     const resolver = getStandardPluginsResolver();
@@ -112,19 +115,27 @@ function packageNameAndSubpath(specifier) {
 function exportTargetFromEntry(entry) {
   if (typeof entry === "string")
     return entry;
-  if (entry && typeof entry === "object" && !Array.isArray(entry)) {
+  if (Array.isArray(entry)) {
+    for (const candidate of entry) {
+      const target = exportTargetFromEntry(candidate);
+      if (target)
+        return target;
+    }
+    return null;
+  }
+  if (entry && typeof entry === "object") {
     const conditions = entry;
-    for (const key of ["bun", "import", "default", "require"]) {
-      if (typeof conditions[key] === "string")
-        return conditions[key];
+    for (const key of ["bun", "node", "import", "default", "require"]) {
+      const target = exportTargetFromEntry(conditions[key]);
+      if (target)
+        return target;
     }
   }
   return null;
 }
 function patternExportTarget(record, subpath) {
-  for (const [pattern, entry] of Object.entries(record)) {
-    if (!pattern.includes("*"))
-      continue;
+  const entries = Object.entries(record).filter(([pattern]) => pattern.includes("*")).sort(([a], [b]) => b.replace("*", "").length - a.replace("*", "").length);
+  for (const [pattern, entry] of entries) {
     const [prefix = "", suffix = ""] = pattern.split("*");
     if (!subpath.startsWith(prefix) || !subpath.endsWith(suffix))
       continue;
@@ -149,6 +160,49 @@ function exportTargetFromPackageJson(pkg, subpath) {
     return target;
   return subpath === "." && typeof pkg.module === "string" ? pkg.module : subpath === "." && typeof pkg.main === "string" ? pkg.main : null;
 }
+function patternImportTarget(record, specifier) {
+  for (const [pattern, entry] of Object.entries(record)) {
+    if (!pattern.includes("*"))
+      continue;
+    const [prefix = "", suffix = ""] = pattern.split("*");
+    if (!specifier.startsWith(prefix) || !specifier.endsWith(suffix))
+      continue;
+    const replacement = specifier.slice(prefix.length, specifier.length - suffix.length);
+    const target = exportTargetFromEntry(entry);
+    if (target)
+      return target.replace("*", replacement);
+  }
+  return null;
+}
+function resolvePackagePrivateImport(specifier, importer, projectRoot) {
+  if (!specifier.startsWith("#") || !importer || !isAbsolute(importer))
+    return null;
+  let dir = dirname(importer);
+  const stop = resolve(projectRoot);
+  while (isWithinDir(dir, stop)) {
+    const packageJsonPath = join2(dir, "package.json");
+    if (existsSync2(packageJsonPath)) {
+      try {
+        const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+        const imports = pkg.imports;
+        if (imports && typeof imports === "object" && !Array.isArray(imports)) {
+          const record = imports;
+          const target = exportTargetFromEntry(record[specifier]) ?? patternImportTarget(record, specifier);
+          if (target)
+            return resolveModulePath(join2(dir, target));
+        }
+      } catch {
+        return null;
+      }
+      return null;
+    }
+    const parent = dirname(dir);
+    if (parent === dir)
+      return null;
+    dir = parent;
+  }
+  return null;
+}
 function resolvePackageDirFromBunStore(packageName, nodeModulesDir) {
   const storeDir = join2(nodeModulesDir, ".bun");
   if (!existsSync2(storeDir))
@@ -223,8 +277,15 @@ function resolvePackageExportFromDir(packageDir, subpath) {
   if (existsSync2(packageJsonPath)) {
     try {
       const pkg = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
-      const target = exportTargetFromPackageJson(pkg, subpath);
-      if (target) {
+      const targets = [
+        exportTargetFromPackageJson(pkg, subpath),
+        ...subpath === "." ? [typeof pkg.module === "string" ? pkg.module : null, typeof pkg.main === "string" ? pkg.main : null] : []
+      ];
+      const seen = new Set;
+      for (const target of targets) {
+        if (!target || seen.has(target))
+          continue;
+        seen.add(target);
         const resolved = resolveModulePath(join2(packageDir, target));
         if (resolved)
           return resolved;
@@ -312,10 +373,17 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
   }
   const RUNTIME_ONLY_EXTERNAL_PACKAGES = new Set(["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"]);
   const configDir = dirname(configPath);
+  const configProjectRoot = basename(configDir) === ".rig" ? dirname(configDir) : configDir;
   const UNRESOLVED_NAMESPACE = "rig-config-unresolved";
+  const ABSOLUTE_EXTERNAL_NAMESPACE = "rig-config-absolute-external";
   const unresolvedLocalPlugin = {
     name: "rig-config-unresolved-local",
     setup(build) {
+      build.onLoad({ filter: /[\\/]@oh-my-pi[\\/]pi-coding-agent[\\/]src[\\/]export[\\/]html[\\/](?:template\.css|template\.html|template\.js|tool-views\.generated\.js)$/ }, (args) => ({
+        loader: "js",
+        contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
+`
+      }));
       build.onLoad({ filter: /\.(?:html|txt)$/ }, (args) => ({
         loader: "js",
         contents: `export default ${JSON.stringify(readFileSync2(args.path, "utf8"))};
@@ -325,32 +393,77 @@ async function importConfigViaRuntimeBundleUnserialized(configPath) {
         const directFilePath = resolvedFilePath(args.path, configDir);
         if (directFilePath)
           return { path: directFilePath };
+        if (args.path.startsWith("#")) {
+          const packagePrivatePath = resolvePackagePrivateImport(args.path, args.importer, configProjectRoot);
+          if (packagePrivatePath)
+            return { path: packagePrivatePath };
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+          return;
+        }
         const packageImport = packageNameAndSubpath(args.path);
-        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
-          return { path: args.path, external: true };
+        if (packageImport?.packageName === "uhyphen" && packageImport.subpath === ".") {
+          const uhyphenPath = resolveProjectPackageImport("uhyphen", configProjectRoot);
+          if (uhyphenPath)
+            return { path: uhyphenPath };
         }
-        const projectPackagePath = resolveProjectPackageImport(args.path, configDir);
+        if (packageImport && packageImport.packageName !== "uhyphen") {
+          try {
+            const parent2 = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configProjectRoot;
+            const resolved = bun.resolveSync?.(args.path, parent2);
+            const filePath = resolvedFilePath(resolved, configProjectRoot);
+            if (filePath)
+              return { path: filePath };
+          } catch {}
+        }
+        const projectPackagePath = packageImport ? resolveProjectPackageImport(args.path, configProjectRoot) : null;
         if (projectPackagePath)
           return { path: projectPackagePath };
+        if (packageImport && (packageImport.packageName.startsWith("@rig/") || RUNTIME_ONLY_EXTERNAL_PACKAGES.has(packageImport.packageName))) {
+          return { path: args.path, external: true };
+        }
         if (/^(?:node|bun):/.test(args.path) || isBuiltin(args.path))
           return;
         if (packageImport)
           return { path: args.path, external: true };
-        const parentCandidates = args.path.startsWith(".") ? [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null, configDir].filter((value) => Boolean(value)) : [args.importer && isAbsolute(args.importer) ? dirname(args.importer) : configDir];
+        const importerDir = args.importer && isAbsolute(args.importer) ? dirname(args.importer) : null;
+        if (args.path.startsWith(".") && importerDir) {
+          const fromImporter = resolveModulePath(resolve(importerDir, args.path));
+          if (fromImporter)
+            return { path: fromImporter };
+          if (/[\\/]node_modules[\\/]/.test(args.importer ?? ""))
+            return;
+        }
+        const parentCandidates = args.path.startsWith(".") ? [importerDir, configDir].filter((value) => Boolean(value)) : [importerDir ?? configDir];
         for (const parent2 of parentCandidates) {
-          const filePath = resolvedFilePath(resolve(parent2, args.path), configDir);
+          const filePath = resolvedFilePath(resolve(parent2, args.path), configProjectRoot);
           if (filePath)
             return { path: filePath };
         }
         const parent = parentCandidates[0] ?? configDir;
         try {
           const resolved = bun.resolveSync?.(args.path, parent) ?? resolve(parent, args.path);
-          const filePath = resolvedFilePath(resolved, configDir);
+          const filePath = resolvedFilePath(resolved, configProjectRoot);
           if (filePath)
             return { path: filePath };
         } catch {}
         return { path: args.path, namespace: UNRESOLVED_NAMESPACE };
       });
+      build.onLoad({ filter: /.*/, namespace: ABSOLUTE_EXTERNAL_NAMESPACE }, (args) => {
+        const href = pathToFileURL(args.path).href;
+        return {
+          loader: "js",
+          contents: `export * from ${JSON.stringify(href)};
+const mod = await import(${JSON.stringify(href)});
+export default (mod && "default" in mod) ? mod.default : mod;
+`
+        };
+      });
       build.onLoad({ filter: /.*/, namespace: UNRESOLVED_NAMESPACE }, (args) => ({
         loader: "js",
         contents: `module.exports = {};
@@ -362,7 +475,6 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
   const result = await bun.build({
     entrypoints: [configPath],
     target: "bun",
-    external: ["effect", "mupdf", "fastembed", "onnxruntime-node", "markit-ai"],
     format: "esm",
     throw: false,
     packages: "bundle",
@@ -373,7 +485,7 @@ throw new Error(${JSON.stringify(`Failed to bundle ${configPath}: Could not reso
 `);
     throw new Error(`Failed to bundle ${configPath}: ${detail || "unknown bundler error"}`);
   }
-  const bundleParentDir = join2(configDir, ".rig", "tmp");
+  const bundleParentDir = join2(configProjectRoot, ".rig", "tmp");
   mkdirSync(bundleParentDir, { recursive: true });
   const dir = mkdtempSync(join2(bundleParentDir, "rig-config-bundle-"));
   try {

package/dist/src/hook-runtime.js

@@ -151,26 +151,6 @@ function isTaskConfigEntry(value) {
   }
   return true;
 }
-async function readTaskConfigFromDisk(configPath) {
-  if (!existsSync(configPath)) {
-    return null;
-  }
-  try {
-    const bunFile = bunRuntime()?.file;
-    const content = bunFile ? await bunFile(configPath).json() : JSON.parse(readFileSync(configPath, "utf-8"));
-    return isPlainObject(content) ? content : null;
-  } catch {
-    return null;
-  }
-}
-function taskConfigCandidates(ctx) {
-  const taskWorkspace = process.env.RIG_TASK_WORKSPACE?.trim();
-  return [
-    ctx?.monorepoMainRoot ? resolve(ctx.monorepoMainRoot, ".rig", "task-config.json") : "",
-    process.env.MONOREPO_MAIN_ROOT?.trim() ? resolve(process.env.MONOREPO_MAIN_ROOT.trim(), ".rig", "task-config.json") : "",
-    taskWorkspace ? resolve(taskWorkspace, ".rig", "task-config.json") : ""
-  ].filter(Boolean);
-}
 async function resolveTaskConfig(_projectRoot, _taskId) {
   const ctx = getContext();
   if (ctx) {
@@ -188,16 +168,6 @@ async function resolveTaskConfig(_projectRoot, _taskId) {
       }
     } catch {}
   }
-  for (const configPath of taskConfigCandidates(ctx)) {
-    const config = await readTaskConfigFromDisk(configPath);
-    if (!config) {
-      continue;
-    }
-    const taskEntry = config[_taskId];
-    if (isTaskConfigEntry(taskEntry)) {
-      return taskEntry;
-    }
-  }
   return {};
 }
 async function resolveTaskScopes(projectRoot, taskId) {
@@ -327,7 +297,7 @@ function block(hookName, message, projectRoot) {
     lines.push("");
     lines.push(`REPEATED VIOLATION (${count}x ${hookName}).`);
     lines.push("STOP. Read the FULL CLAUDE.md from top to bottom.");
-    lines.push("If stuck, write the problem to .rig/state/failed_approaches.md and request help.");
+    lines.push("If stuck, record the failed approach in the task-state failure log and request help.");
   }
   writeSync(1, `${lines.join(`
 `)}

package/dist/src/json-files.js

@@ -5,7 +5,6 @@ import { dirname as dirname2, resolve as resolve2 } from "path";
 
 // packages/core/src/layout.ts
 import {
-  RIG_ARTIFACTS_DIRNAME,
   RIG_DEFINITION_DIRNAME,
   RIG_STATE_DIRNAME
 } from "@rig/contracts";