oh-my-customcode 0.16.0 → 0.16.2

package/dist/cli/index.js

@@ -9152,8 +9152,28 @@ function checkOutdated(tools) {
     }
   } catch {}
 }
+function collectToolResults(toolNames) {
+  const tools = [];
+  for (const toolName of toolNames) {
+    const tool = getToolInfo(toolName);
+    tools.push(tool);
+  }
+  checkOutdated(tools);
+  const hasUpdates = tools.some((t) => t.updateAvailable);
+  return {
+    tools,
+    hasUpdates,
+    warnings: [],
+    skipped: false
+  };
+}
 async function runPreflightCheck(options = {}) {
-  const { skip = false, tools: toolNames = ["claude-code"], timeout = 5000 } = options;
+  const {
+    skip = false,
+    tools: toolNames = ["claude-code"],
+    timeout = 5000,
+    _collectFn = collectToolResults
+  } = options;
   if (skip) {
     return {
       tools: [],
@@ -9181,8 +9201,8 @@ async function runPreflightCheck(options = {}) {
       skipReason: "Homebrew not available"
     };
   }
-  return new Promise((resolve) => {
-    const timeoutId = setTimeout(() => {
+  const timeoutPromise = new Promise((resolve) => {
+    setTimeout(() => {
       resolve({
         tools: [],
         hasUpdates: false,
@@ -9191,34 +9211,21 @@ async function runPreflightCheck(options = {}) {
         skipReason: "Timeout"
       });
     }, timeout);
-    try {
-      const tools = [];
-      for (const toolName of toolNames) {
-        const tool = getToolInfo(toolName);
-        tools.push(tool);
-      }
-      checkOutdated(tools);
-      const hasUpdates = tools.some((t) => t.updateAvailable);
-      const warnings = [];
-      clearTimeout(timeoutId);
-      resolve({
-        tools,
-        hasUpdates,
-        warnings,
-        skipped: false
-      });
-    } catch (error) {
-      clearTimeout(timeoutId);
-      const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      resolve({
-        tools: [],
-        hasUpdates: false,
-        warnings: [`Pre-flight check failed: ${errorMessage}`],
-        skipped: true,
-        skipReason: "Error during check"
-      });
-    }
   });
+  const collectPromise = (async () => {
+    const result = await _collectFn(toolNames);
+    return result;
+  })().catch((error) => {
+    const errorMessage = error instanceof Error ? error.message : "Unknown error";
+    return {
+      tools: [],
+      hasUpdates: false,
+      warnings: [`Pre-flight check failed: ${errorMessage}`],
+      skipped: true,
+      skipReason: "Error during check"
+    };
+  });
+  return Promise.race([collectPromise, timeoutPromise]);
 }
 function formatPreflightWarnings(result) {
   if (!result.hasUpdates) {
@@ -12608,7 +12615,7 @@ var $visitAsync = visit.visitAsync;
 import { join as join3 } from "node:path";
 
 // src/utils/fs.ts
-import { dirname as dirname2, isAbsolute, join as join2, normalize, relative, resolve, sep } from "node:path";
+import { dirname as dirname2, isAbsolute, join as join2, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 function validatePreserveFilePath(filePath, projectRoot) {
   if (!filePath || filePath.trim() === "") {
@@ -12623,19 +12630,12 @@ function validatePreserveFilePath(filePath, projectRoot) {
       reason: "Absolute paths are not allowed"
     };
   }
-  const normalizedPath = normalize(filePath);
-  if (normalizedPath.startsWith("..")) {
-    return {
-      valid: false,
-      reason: "Path cannot traverse outside project root"
-    };
-  }
-  const resolvedPath = resolve(projectRoot, normalizedPath);
+  const resolvedPath = resolve(projectRoot, filePath);
   const relativePath = relative(projectRoot, resolvedPath);
   if (relativePath.startsWith("..") || isAbsolute(relativePath)) {
     return {
       valid: false,
-      reason: "Resolved path escapes project root"
+      reason: "Path cannot traverse outside project root"
     };
   }
   return { valid: true };
@@ -13000,7 +13000,6 @@ function getDefaultConfig() {
     lastUpdated: "",
     installedComponents: [],
     componentVersions: {},
-    agents: {},
     preferences: getDefaultPreferences(),
     sourceRepo: "https://github.com/baekenough/oh-my-customcode",
     autoUpdate: {
@@ -13091,10 +13090,10 @@ function mergeConfig(defaults, overrides, targetDir) {
       ...defaults.componentVersions,
       ...overrides.componentVersions
     },
-    agents: {
+    agents: defaults.agents || overrides.agents ? {
       ...defaults.agents,
       ...overrides.agents
-    },
+    } : undefined,
     preserveFiles: mergedPreserveFiles,
     customComponents: overrides.customComponents ? deduplicateCustomComponents([
       ...defaults.customComponents || [],
@@ -13732,10 +13731,7 @@ function determineWorkflowType(hasDevelop, branchPatterns, allBranches) {
   if (!hasDevelop && !hasFeatureBranches) {
     return "trunk-based";
   }
-  if (hasDevelop) {
-    return "git-flow";
-  }
-  return "github-flow";
+  return "git-flow";
 }
 function detectGitWorkflow(cwd) {
   if (!isGitRepo(cwd)) {
@@ -14696,12 +14692,7 @@ async function pathExists2(targetPath) {
   }
 }
 function isValidUtf8Text(content) {
-  try {
-    content.toString("utf-8");
-    return true;
-  } catch {
-    return false;
-  }
+  return !content.includes(0);
 }
 async function findAllFiles(dir2) {
   const results = [];
@@ -15194,15 +15185,7 @@ function resolveConfigPreserveFiles(options, config) {
   const preserveFiles = config.preserveFiles || [];
   const validatedPaths = [];
   for (const filePath of preserveFiles) {
-    const validation = validatePreserveFilePath(filePath, options.targetDir);
-    if (validation.valid) {
-      validatedPaths.push(filePath);
-    } else {
-      warn("preserve_files.invalid_path", {
-        path: filePath,
-        reason: validation.reason ?? "Invalid path"
-      });
-    }
+    validatedPaths.push(filePath);
   }
   return validatedPaths;
 }
@@ -15243,11 +15226,8 @@ function resolveCustomizations(customizations, configPreserveFiles, targetDir) {
       lastUpdated: new Date().toISOString()
     };
   }
-  if (customizations) {
-    customizations.preserveFiles = validatedManifestFiles;
-    return customizations;
-  }
-  return null;
+  customizations.preserveFiles = validatedManifestFiles;
+  return customizations;
 }
 async function updateEntryDoc(targetDir, config, options) {
   const layout = getProviderLayout();

package/dist/index.js

@@ -5,7 +5,7 @@ var __require = /* @__PURE__ */ createRequire(import.meta.url);
 import { join as join2 } from "node:path";
 
 // src/utils/fs.ts
-import { dirname, isAbsolute, join, normalize, relative, resolve, sep } from "node:path";
+import { dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { fileURLToPath } from "node:url";
 function validatePreserveFilePath(filePath, projectRoot) {
   if (!filePath || filePath.trim() === "") {
@@ -20,19 +20,12 @@ function validatePreserveFilePath(filePath, projectRoot) {
       reason: "Absolute paths are not allowed"
     };
   }
-  const normalizedPath = normalize(filePath);
-  if (normalizedPath.startsWith("..")) {
-    return {
-      valid: false,
-      reason: "Path cannot traverse outside project root"
-    };
-  }
-  const resolvedPath = resolve(projectRoot, normalizedPath);
+  const resolvedPath = resolve(projectRoot, filePath);
   const relativePath = relative(projectRoot, resolvedPath);
   if (relativePath.startsWith("..") || isAbsolute(relativePath)) {
     return {
       valid: false,
-      reason: "Resolved path escapes project root"
+      reason: "Path cannot traverse outside project root"
     };
   }
   return { valid: true };
@@ -388,7 +381,6 @@ function getDefaultConfig() {
     lastUpdated: "",
     installedComponents: [],
     componentVersions: {},
-    agents: {},
     preferences: getDefaultPreferences(),
     sourceRepo: "https://github.com/baekenough/oh-my-customcode",
     autoUpdate: {
@@ -479,10 +471,10 @@ function mergeConfig(defaults, overrides, targetDir) {
       ...defaults.componentVersions,
       ...overrides.componentVersions
     },
-    agents: {
+    agents: defaults.agents || overrides.agents ? {
       ...defaults.agents,
       ...overrides.agents
-    },
+    } : undefined,
     preserveFiles: mergedPreserveFiles,
     customComponents: overrides.customComponents ? deduplicateCustomComponents([
       ...defaults.customComponents || [],
@@ -578,10 +570,7 @@ function determineWorkflowType(hasDevelop, branchPatterns, allBranches) {
   if (!hasDevelop && !hasFeatureBranches) {
     return "trunk-based";
   }
-  if (hasDevelop) {
-    return "git-flow";
-  }
-  return "github-flow";
+  return "git-flow";
 }
 function detectGitWorkflow(cwd) {
   if (!isGitRepo(cwd)) {
@@ -1233,15 +1222,7 @@ function resolveConfigPreserveFiles(options, config) {
   const preserveFiles = config.preserveFiles || [];
   const validatedPaths = [];
   for (const filePath of preserveFiles) {
-    const validation = validatePreserveFilePath(filePath, options.targetDir);
-    if (validation.valid) {
-      validatedPaths.push(filePath);
-    } else {
-      warn("preserve_files.invalid_path", {
-        path: filePath,
-        reason: validation.reason ?? "Invalid path"
-      });
-    }
+    validatedPaths.push(filePath);
   }
   return validatedPaths;
 }
@@ -1282,11 +1263,8 @@ function resolveCustomizations(customizations, configPreserveFiles, targetDir) {
       lastUpdated: new Date().toISOString()
     };
   }
-  if (customizations) {
-    customizations.preserveFiles = validatedManifestFiles;
-    return customizations;
-  }
-  return null;
+  customizations.preserveFiles = validatedManifestFiles;
+  return customizations;
 }
 async function updateEntryDoc(targetDir, config, options) {
   const layout = getProviderLayout();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-customcode",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "description": "Batteries-included agent harness for Claude Code",
   "type": "module",
   "bin": {

package/templates/.claude/hooks/hooks.json

@@ -7,7 +7,7 @@
         "hooks": [
           {
             "type": "command",
-            "command": "if [ -f /tmp/.claude-dev-stage ]; then stage=$(cat /tmp/.claude-dev-stage | tr -d '[:space:]'); if [ -z \"$stage\" ]; then exit 0; fi; case \"$stage\" in plan|verify-plan|verify-impl|compound|done) echo \"⛔ BLOCKED: Write/Edit disabled in '$stage' stage. Only allowed during 'implement' stage. Use 'echo implement > /tmp/.claude-dev-stage' to transition.\"; exit 2;; esac; fi"
+            "command": "bash .claude/hooks/scripts/stage-blocker.sh"
           }
         ],
         "description": "Block Write/Edit tools during plan/verify/compound stages — only allow in implement stage"

package/templates/.claude/hooks/scripts/stage-blocker.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+# Stage-blocking hook: blocks Write/Edit in non-implement stages
+if [ -f /tmp/.claude-dev-stage ]; then
+  stage=$(cat /tmp/.claude-dev-stage | tr -d '[:space:]')
+  if [ -z "$stage" ]; then exit 0; fi
+  case "$stage" in
+    plan|verify-plan|verify-impl|compound|done)
+      echo "⛔ BLOCKED: Write/Edit disabled in '$stage' stage. Only allowed during 'implement' stage. Use 'echo implement > /tmp/.claude-dev-stage' to transition."
+      exit 2
+      ;;
+  esac
+fi