@kimuson/claude-code-viewer 0.4.9 → 0.4.11

package/dist/main.js

@@ -856,6 +856,7 @@ import {
 } from "@anthropic-ai/claude-code";
 import { Command, Path as Path7 } from "@effect/platform";
 import { Data, Effect as Effect10 } from "effect";
+var isNpxShimPath = (path) => /_npx[/\\].*node_modules[\\/]\.bin/.test(path);
 var ClaudeCodePathNotFoundError = class extends Data.TaggedError(
   "ClaudeCodePathNotFoundError"
 ) {
@@ -874,38 +875,35 @@ var resolveClaudeCodePath = Effect10.gen(function* () {
     Command.make("which", "claude").pipe(
       Command.env({
         PATH: pathEnv
-      }),
-      Command.runInShell(true)
+      })
+      // DO NOT Specify `runInShell(true)` here, it causes resolve node_modules/.bin/claude to be executed.
     )
   ).pipe(
     Effect10.map((output) => output.trim()),
+    // npx 実行時に `.npm/_npx/.../node_modules/.bin/claude` が最優先で解決されるのを防ぐ
     Effect10.map((output) => output === "" ? null : output),
     // 存在しない時、空文字になる模様
     Effect10.catchAll(() => Effect10.succeed(null))
   );
-  if (whichClaude !== null) {
+  if (whichClaude !== null && !isNpxShimPath(whichClaude)) {
     return whichClaude;
   }
-  const projectClaudeCode = yield* Effect10.try(() => {
-    const parts = __dirname.split("/");
-    const packagePath = parts.slice(0, parts.indexOf("claude-code-viewer") + 1).join("/");
-    return path.join(
-      packagePath,
-      "node_modules",
-      "@anthropic-ai",
-      "claude-code",
-      "cli.js"
-    );
-  }).pipe(
-    Effect10.catchAll(() => {
-      return Effect10.fail(
-        new ClaudeCodePathNotFoundError({
-          message: "Claude Code CLI not found in any location"
-        })
-      );
-    })
+  const buildInClaude = yield* Command.string(
+    Command.make("which", "claude").pipe(Command.runInShell(true))
+  ).pipe(
+    Effect10.map((output) => output.trim()),
+    Effect10.map((output) => output === "" ? null : output),
+    // 存在しない時、空文字になる模様
+    Effect10.catchAll(() => Effect10.succeed(null))
   );
-  return projectClaudeCode;
+  if (buildInClaude === null || isNpxShimPath(buildInClaude)) {
+    return yield* Effect10.fail(
+      new ClaudeCodePathNotFoundError({
+        message: "Claude Code CLI not found in any location"
+      })
+    );
+  }
+  return buildInClaude;
 });
 var Config = Effect10.gen(function* () {
   const claudeCodeExecutablePath = yield* resolveClaudeCodePath;
@@ -6361,7 +6359,7 @@ import { z as z28 } from "zod";
 // package.json
 var package_default = {
   name: "@kimuson/claude-code-viewer",
-  version: "0.4.9",
+  version: "0.4.11",
   type: "module",
   license: "MIT",
   repository: {