dream-wf 0.1.2 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dream-wf",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Trellis workflow patch installer and MCP/skill aggregator for Cursor, Claude Code, OpenCode and Codex.",
   "type": "module",
   "bin": {

package/src/cli/index.js

@@ -280,7 +280,7 @@ function formatBanner() {
     "██║    ██║██╔═══██╗ ██╔════╝  ██╔═══██╗ ██║╚██╔╝██║",
     "███████╔╝ ██║   ██║ ███████╗  ██║   ██║ ██║ ╚═╝ ██║",
     "╚══════╝  ╚═╝   ╚═╝ ╚══════╝  ╚═╝   ╚═╝ ╚═╝     ╚═╝",
-    "  Dream WorkFlow v0.1.2",
+    "  Dream WorkFlow v0.1.3",
   ].join("\n");
 
   if (!process.stdout.isTTY || process.env.NO_COLOR) {
@@ -292,7 +292,7 @@ function formatBanner() {
 
 function helpText() {
   return [
-    "dream-wf v0.1.2 · Trellis workflow 安装聚合器",
+    "dream-wf v0.1.3 · Trellis workflow 安装聚合器",
     "",
     "Usage:",
     "  dream-wf                         # 交互式 TUI（推荐）",

package/src/platforms/claude-code/index.js

@@ -5,6 +5,9 @@ import { writeIfChanged } from '../../lib/files.js';
 import { installCommonDreamWfFiles, installManagedBlock, installSelectedSkills } from '../shared.js';
 import { installMcpServers } from '../../lib/mcp.js';
 
+const CLAUDE_GUARD_COMMAND = 'python3 -X utf8 .claude/hooks/dream-wf-guard.py';
+const LEGACY_CLAUDE_GUARD_COMMAND = 'python3 "$CLAUDE_PROJECT_DIR/.claude/hooks/dream-wf-guard.py"';
+
 export async function installClaudeCode(packageRoot, targetRoot, options) {
   const results = [];
 
@@ -39,16 +42,18 @@ async function mergeClaudeSettings(rootDir) {
   settings.hooks = settings.hooks ?? {};
   settings.hooks.PreToolUse = settings.hooks.PreToolUse ?? [];
 
-  const changed = pushUniqueByCommand(settings.hooks.PreToolUse, {
+  const migrated = replaceHookCommand(settings.hooks.PreToolUse, LEGACY_CLAUDE_GUARD_COMMAND, CLAUDE_GUARD_COMMAND);
+  const added = pushUniqueByCommand(settings.hooks.PreToolUse, {
     matcher: '*',
     hooks: [
       {
         type: 'command',
-        command: 'python3 "$CLAUDE_PROJECT_DIR/.claude/hooks/dream-wf-guard.py"',
+        command: CLAUDE_GUARD_COMMAND,
         timeout: 10
       }
     ]
   });
+  const changed = migrated || added;
 
   if (changed) {
     await writeJsonObject(settingsPath, settings);
@@ -56,3 +61,20 @@ async function mergeClaudeSettings(rootDir) {
 
   return { changed, action: changed ? 'updated' : 'unchanged', path: settingsPath };
 }
+
+function replaceHookCommand(items, oldCommand, newCommand) {
+  let changed = false;
+  for (const item of items) {
+    if (!item || typeof item !== 'object' || !Array.isArray(item.hooks)) {
+      continue;
+    }
+
+    for (const hook of item.hooks) {
+      if (hook?.command === oldCommand) {
+        hook.command = newCommand;
+        changed = true;
+      }
+    }
+  }
+  return changed;
+}

package/src/platforms/codex/index.js

@@ -5,6 +5,10 @@ import { writeIfChanged, readTextIfExists, writeTextFile } from '../../lib/files
 import { installCommonDreamWfFiles, installManagedBlock, installSelectedSkills } from '../shared.js';
 import { installMcpServers } from '../../lib/mcp.js';
 
+const CODEX_GUARD_MATCHER = 'Bash|Shell|shell|apply_patch|Edit|Write';
+const CODEX_GUARD_COMMAND = 'python3 -X utf8 .codex/hooks/dream-wf-guard.py';
+const LEGACY_CODEX_GUARD_COMMAND = 'python3 "$CODEX_PROJECT_DIR/.codex/hooks/dream-wf-guard.py"';
+
 // Codex CLI 读取项目根的 AGENTS.md 作为入口规则。
 // Codex 支持 PreToolUse 阻塞式 hook，配置在 .codex/hooks.json（和 config.toml [hooks] 段等效）。
 // 需要在 config.toml 里加 [features] hooks = true 来启用 hooks 功能。
@@ -64,16 +68,18 @@ async function mergeCodexHooks(rootDir) {
   hooks.hooks = hooks.hooks ?? {};
   hooks.hooks.PreToolUse = hooks.hooks.PreToolUse ?? [];
 
-  const changed = pushUniqueByCommand(hooks.hooks.PreToolUse, {
-    matcher: 'Bash|Shell|shell|apply_patch|Edit|Write',
+  const migrated = replaceHookCommand(hooks.hooks.PreToolUse, LEGACY_CODEX_GUARD_COMMAND, CODEX_GUARD_COMMAND);
+  const added = pushUniqueByCommand(hooks.hooks.PreToolUse, {
+    matcher: CODEX_GUARD_MATCHER,
     hooks: [
       {
         type: 'command',
-        command: 'python3 "$CODEX_PROJECT_DIR/.codex/hooks/dream-wf-guard.py"',
+        command: CODEX_GUARD_COMMAND,
         timeout: 10
       }
     ]
   });
+  const changed = migrated || added;
 
   if (changed) {
     await writeJsonObject(hooksPath, hooks);
@@ -81,3 +87,20 @@ async function mergeCodexHooks(rootDir) {
 
   return { changed, action: changed ? 'updated' : 'unchanged', path: hooksPath };
 }
+
+function replaceHookCommand(items, oldCommand, newCommand) {
+  let changed = false;
+  for (const item of items) {
+    if (!item || typeof item !== 'object' || !Array.isArray(item.hooks)) {
+      continue;
+    }
+
+    for (const hook of item.hooks) {
+      if (hook?.command === oldCommand) {
+        hook.command = newCommand;
+        changed = true;
+      }
+    }
+  }
+  return changed;
+}