oh-my-opencode 4.5.12 → 4.7.0

package/dist/plugin/hooks/create-core-hooks.d.ts

@@ -37,7 +37,6 @@ export declare function createCoreHooks(args: {
     teamToolGating: ReturnType<typeof import("../../hooks").createTeamToolGating> | null;
     notepadWriteGuard: ReturnType<typeof import("../../hooks").createNotepadWriteGuardHook> | null;
     planFormatValidator: ReturnType<typeof import("../../hooks").createPlanFormatValidatorHook> | null;
-    contextWindowMonitor: ReturnType<typeof import("../../hooks").createContextWindowMonitorHook> | null;
     preemptiveCompaction: ReturnType<typeof import("../../hooks").createPreemptiveCompactionHook> | null;
     sessionRecovery: ReturnType<typeof import("../../hooks").createSessionRecoveryHook> | null;
     sessionNotification: ReturnType<typeof import("../../hooks").createSessionNotification> | null;

package/dist/plugin/hooks/create-session-hooks.d.ts

@@ -3,10 +3,9 @@ import type { BackgroundManager } from "../../features/background-agent";
 import type { ModelFallbackControllerAccessor } from "../../hooks/model-fallback";
 import type { ModelCacheState } from "../../plugin-state";
 import type { PluginContext } from "../types";
-import { createContextWindowMonitorHook, createSessionRecoveryHook, createSessionNotification, createThinkModeHook, createModelFallbackHook, createAnthropicContextWindowLimitRecoveryHook, createAutoUpdateCheckerHook, createAgentUsageReminderHook, createNonInteractiveEnvHook, createInteractiveBashSessionHook, createRalphLoopHook, createEditErrorRecoveryHook, createDelegateTaskRetryHook, createTaskResumeInfoHook, createStartWorkHook, createPrometheusMdOnlyHook, createSisyphusJuniorNotepadHook, createNoSisyphusGptHook, createNoHephaestusNonGptHook, createQuestionLabelTruncatorHook, createPreemptiveCompactionHook, createRuntimeFallbackHook, createLegacyPluginToastHook } from "../../hooks";
+import { createSessionRecoveryHook, createSessionNotification, createThinkModeHook, createModelFallbackHook, createAnthropicContextWindowLimitRecoveryHook, createAutoUpdateCheckerHook, createAgentUsageReminderHook, createNonInteractiveEnvHook, createInteractiveBashSessionHook, createRalphLoopHook, createEditErrorRecoveryHook, createDelegateTaskRetryHook, createTaskResumeInfoHook, createStartWorkHook, createPrometheusMdOnlyHook, createSisyphusJuniorNotepadHook, createNoSisyphusGptHook, createNoHephaestusNonGptHook, createQuestionLabelTruncatorHook, createPreemptiveCompactionHook, createRuntimeFallbackHook, createLegacyPluginToastHook } from "../../hooks";
 import { createAnthropicEffortHook } from "../../hooks/anthropic-effort";
 export type SessionHooks = {
-    contextWindowMonitor: ReturnType<typeof createContextWindowMonitorHook> | null;
     preemptiveCompaction: ReturnType<typeof createPreemptiveCompactionHook> | null;
     sessionRecovery: ReturnType<typeof createSessionRecoveryHook> | null;
     sessionNotification: ReturnType<typeof createSessionNotification> | null;

package/dist/plugin/messages-transform.d.ts

@@ -7,7 +7,14 @@ type MessageWithParts = {
 type MessagesTransformOutput = {
     messages: MessageWithParts[];
 };
+type MessagesTransformHooks = {
+    contextInjectorMessagesTransform?: CreatedHooks["contextInjectorMessagesTransform"];
+    teamModeStatusInjector?: CreatedHooks["teamModeStatusInjector"];
+    teamMailboxInjector?: CreatedHooks["teamMailboxInjector"];
+    thinkingBlockValidator?: CreatedHooks["thinkingBlockValidator"];
+    toolPairValidator?: CreatedHooks["toolPairValidator"];
+};
 export declare function createMessagesTransformHandler(args: {
-    hooks: CreatedHooks;
+    hooks: MessagesTransformHooks;
 }): (input: Record<string, never>, output: MessagesTransformOutput) => Promise<void>;
 export {};

package/dist/plugin/user-abort-interrupted-recovery-guard.d.ts

@@ -0,0 +1,6 @@
+export type UserAbortInterruptedRecoveryGuard = {
+    readonly noteSessionError: (sessionID: string, errorName: string | undefined) => boolean;
+    readonly shouldSkipRecovery: (sessionID: string) => boolean;
+    readonly clear: (sessionID: string) => void;
+};
+export declare function createUserAbortInterruptedRecoveryGuard(): UserAbortInterruptedRecoveryGuard;

package/dist/shared/command-executor/execute-hook-command.d.ts

@@ -8,6 +8,8 @@ export interface ExecuteHookOptions {
     zshPath?: string;
     /** Timeout in milliseconds. Process is killed after this. Default: 30000 */
     timeoutMs?: number;
+    /** Grace period before force-killing and resolving timed-out commands. Default: 5000 */
+    killGraceMs?: number;
     /** When provided, scrub process.env to only include these vars plus HOME/PATH/etc. Used for plugin-sourced hooks. */
     allowedEnvVars?: string[];
 }

package/dist/shared/prompt-async-gate/recent-dispatches.d.ts

@@ -0,0 +1,14 @@
+type RecentPromptDispatch = {
+    readonly source: string;
+    readonly expiresAt: number;
+};
+export declare function getRecentPromptDispatch(sessionID: string, dedupeKey: string): RecentPromptDispatch | undefined;
+export declare function rememberRecentPromptDispatch(args: {
+    readonly sessionID: string;
+    readonly dedupeKey: string;
+    readonly source: string;
+    readonly holdMs: number;
+}): void;
+export declare function deleteRecentPromptDispatch(sessionID: string, dedupeKey: string): void;
+export declare function clearRecentPromptDispatchesForTesting(): void;
+export {};

package/dist/shared/prompt-async-gate/semantic-dedupe.d.ts

@@ -0,0 +1,7 @@
+import type { InternalPromptDispatchResult } from "./types";
+export declare function createSemanticPromptDedupeKey(input: unknown): string;
+export declare function coalesceRecentSemanticPromptDispatch(args: {
+    readonly sessionID: string;
+    readonly dedupeKey: string;
+    readonly source: string;
+}): InternalPromptDispatchResult | undefined;

package/dist/shared/prompt-async-gate/session-idle-dispatch.d.ts

@@ -8,6 +8,7 @@ export declare function dispatchAfterSessionIdle<TInput>(args: {
     readonly dedupeKey: string;
     readonly settleMs: number;
     readonly postDispatchHoldMs: number;
+    readonly semanticDedupeHoldMs: number;
     readonly dispatchTimeoutMs: number;
     readonly checkStatus: boolean;
     readonly checkToolState: boolean;

package/dist/shared/prompt-async-gate/timing.d.ts

@@ -1,4 +1,5 @@
 export declare const DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS = 2000;
+export declare const DEFAULT_PROMPT_SEMANTIC_DEDUPE_HOLD_MS = 15000;
 export declare const DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS = 30000;
 export declare const DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS = 5000;
 export declare const DEFAULT_PROMPT_QUEUE_RETRY_MS = 250;

package/dist/shared/prompt-async-gate/types.d.ts

@@ -49,6 +49,7 @@ type InternalPromptDispatchCommonArgs<TInput> = {
     readonly queueRetryMs?: number;
     readonly settleMs?: number;
     readonly postDispatchHoldMs?: number;
+    readonly semanticDedupeHoldMs?: number;
     readonly dispatchTimeoutMs?: number;
     readonly checkStatus?: boolean;
     readonly checkToolState?: boolean;
@@ -112,6 +113,7 @@ export type QueuedInternalPrompt = {
     readonly dedupeKey: string;
     readonly settleMs: number;
     readonly postDispatchHoldMs: number;
+    readonly semanticDedupeHoldMs: number;
     readonly dispatchTimeoutMs: number;
     readonly queueRetryMs: number;
     readonly checkStatus: boolean;

package/dist/shared/prompt-async-gate.d.ts

@@ -1,5 +1,5 @@
 import type { InternalPromptDispatchArgs, InternalPromptDispatchResult, PromptAsyncInput, PromptAsyncReservationReleaseOptions } from "./prompt-async-gate/types";
-export { DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS, DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS, DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS, DEFAULT_PROMPT_QUEUE_RETRY_MS, _setPromptGateMessagesFetchTimeoutMsForTesting, } from "./prompt-async-gate/timing";
+export { DEFAULT_PROMPT_ASYNC_POST_DISPATCH_HOLD_MS, DEFAULT_PROMPT_DISPATCH_TIMEOUT_MS, DEFAULT_PROMPT_GATE_MESSAGES_FETCH_TIMEOUT_MS, DEFAULT_PROMPT_QUEUE_RETRY_MS, DEFAULT_PROMPT_SEMANTIC_DEDUPE_HOLD_MS, _setPromptGateMessagesFetchTimeoutMsForTesting, } from "./prompt-async-gate/timing";
 export type { InternalPromptDispatchArgs, InternalPromptDispatchMode, InternalPromptDispatchResult, InternalPromptQueueBehavior, PromptAsyncGateResult, } from "./prompt-async-gate/types";
 export declare function dispatchInternalPrompt<TInput = PromptAsyncInput>(args: InternalPromptDispatchArgs<TInput>): Promise<InternalPromptDispatchResult>;
 export declare function releaseAllPromptAsyncReservationsForTesting(): void;

package/dist/tools/skill/description-formatter.d.ts

@@ -1,3 +1,7 @@
 import type { SkillInfo } from "./types";
 import type { CommandInfo } from "../slashcommand/types";
-export declare function formatCombinedDescription(skills?: SkillInfo[], commands?: CommandInfo[]): string;
+interface CombinedDescriptionOptions {
+    includeSkills?: boolean;
+}
+export declare function formatCombinedDescription(skills?: SkillInfo[], commands?: CommandInfo[], options?: CombinedDescriptionOptions): string;
+export {};

package/dist/tools/skill/types.d.ts

@@ -66,4 +66,5 @@ export interface SkillLoadOptions {
         } | undefined>;
         dirs(): string[] | Promise<string[]>;
     };
+    includeSkillsInDescription?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oh-my-opencode",
-  "version": "4.5.12",
+  "version": "4.7.0",
   "description": "The Best AI Agent Harness - Batteries-Included OpenCode Plugin with Multi-Model Orchestration, Parallel Background Agents, and Crafted LSP/AST Tools",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -9,6 +9,7 @@
     "packages/rules-engine",
     "packages/ast-grep-core",
     "packages/ast-grep-mcp",
+    "packages/git-bash-mcp",
     "packages/utils",
     "packages/model-core",
     "packages/prompts-core",
@@ -23,7 +24,8 @@
     "oh-my-opencode": "bin/oh-my-opencode.js",
     "oh-my-openagent": "bin/oh-my-opencode.js",
     "omo": "bin/oh-my-opencode.js",
-    "lazycodex": "bin/oh-my-opencode.js"
+    "lazycodex": "bin/oh-my-opencode.js",
+    "lazycodex-ai": "bin/oh-my-opencode.js"
   },
   "files": [
     "dist",
@@ -35,6 +37,7 @@
     ".agents/skills",
     "packages/lsp-tools-mcp/dist",
     "packages/ast-grep-mcp/dist",
+    "packages/git-bash-mcp/dist",
     "packages/shared-skills/package.json",
     "packages/shared-skills/index.mjs",
     "packages/shared-skills/skills",
@@ -52,7 +55,7 @@
     "./schema.json": "./dist/oh-my-opencode.schema.json"
   },
   "scripts": {
-    "build": "bun run build:ast-grep-mcp && bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
+    "build": "bun run build:ast-grep-mcp && bun run build:git-bash-mcp && bun build src/index.ts --outdir dist --target bun --format esm --external @ast-grep/napi --external zod && bun run build:node-require-shim && tsc --emitDeclarationOnly && bun build src/cli/index.ts --outdir dist/cli --target bun --format esm --external @ast-grep/napi && bun run build:schema",
     "build:lsp-tools-mcp": "npm --prefix packages/lsp-tools-mcp ci && npm --prefix packages/lsp-tools-mcp run build",
     "build:node-require-shim": "bun run script/patch-node-require-shim.ts",
     "build:all": "bun run build && bun run build:binaries",
@@ -65,12 +68,13 @@
     "prepublishOnly": "bun run clean && bun run build:lsp-tools-mcp && bun run build",
     "test:model-capabilities": "bun test src/shared/model-capability-aliases.test.ts src/shared/model-capability-guardrails.test.ts src/shared/model-capabilities.test.ts src/cli/doctor/checks/model-resolution.test.ts --bail",
     "typecheck": "tsgo --noEmit && bun run typecheck:packages",
-    "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/ast-grep-core/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/prompts-core/tsconfig.json && tsgo --noEmit -p packages/comment-checker-core/tsconfig.json && tsgo --noEmit -p packages/hashline-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json",
+    "typecheck:packages": "tsgo --noEmit -p packages/rules-engine/tsconfig.json && tsgo --noEmit -p packages/ast-grep-core/tsconfig.json && tsgo --noEmit -p packages/ast-grep-mcp/tsconfig.json && tsgo --noEmit -p packages/git-bash-mcp/tsconfig.json && tsgo --noEmit -p packages/utils/tsconfig.json && tsgo --noEmit -p packages/model-core/tsconfig.json && tsgo --noEmit -p packages/prompts-core/tsconfig.json && tsgo --noEmit -p packages/comment-checker-core/tsconfig.json && tsgo --noEmit -p packages/hashline-core/tsconfig.json && tsgo --noEmit -p packages/boulder-state/tsconfig.json && tsgo --noEmit -p packages/agents-md-core/tsconfig.json && tsgo --noEmit -p packages/omo-codex/tsconfig.json",
     "typecheck:script": "tsgo --noEmit -p script/tsconfig.json",
     "test": "bun test",
-    "test:codex": "bun run build:ast-grep-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
+    "test:codex": "bun run build:ast-grep-mcp && bun run build:lsp-tools-mcp && npm --prefix packages/omo-codex/plugin ci && bun run --cwd packages/omo-codex/plugin build && bun test src/cli/cli-installer.platform.test.ts src/cli/install-codex/codex-cache.test.ts src/cli/install-codex/codex-cleanup.test.ts src/cli/install-codex/codex-config-agent-cleanup.test.ts src/cli/install-codex/codex-config-reasoning.test.ts src/cli/install-codex/codex-config-toml.test.ts src/cli/install-codex/codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex-project-local-cleanup.test.ts src/cli/install-codex/install-codex.test.ts src/cli/install-codex/install-codex-packaged.test.ts src/cli/install-codex/link-cached-plugin-agents.test.ts packages/omo-codex/src/**/*.test.ts packages/utils/src/jsonc-parser.test.ts packages/utils/src/frontmatter.test.ts packages/hashline-core/src/hash-computation.test.ts packages/hashline-core/src/smoke-untested-modules.test.ts packages/rules-engine/src/index.test.ts packages/rules-engine/src/security-boundary.test.ts packages/agents-md-core/src/injector.test.ts packages/omo-codex/plugin/components/lsp/test/package-smoke.test.ts && node --test packages/omo-codex/plugin/test/*.test.mjs packages/omo-codex/scripts/install-cache-copy.test.mjs packages/omo-codex/scripts/install-cli-args.test.mjs packages/omo-codex/scripts/install-config-autonomous.test.mjs packages/omo-codex/scripts/install-config-reasoning.test.mjs packages/omo-codex/scripts/install-config.test.mjs packages/omo-codex/scripts/install-project-local-cleanup.test.mjs packages/omo-codex/scripts/install-local-entrypoint.test.mjs packages/omo-codex/scripts/install-local-git-bash-preflight.test.mjs packages/omo-codex/scripts/install-local.test.mjs packages/omo-codex/scripts/install-mcp-runtime.test.mjs packages/omo-codex/scripts/install-packaged-local.test.mjs packages/omo-codex/scripts/install/git-bash.test.mjs packages/omo-codex/scripts/install-agent-links.test.mjs packages/omo-codex/scripts/install-bin-links.test.mjs packages/omo-codex/scripts/sync-telemetry-component.test.mjs",
     "test:windows-codex": "bun run test:codex",
-    "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build"
+    "build:ast-grep-mcp": "bun run --cwd packages/ast-grep-mcp build",
+    "build:git-bash-mcp": "bun run --cwd packages/git-bash-mcp build"
   },
   "keywords": [
     "opencode",
@@ -102,7 +106,6 @@
     "commander": "^14.0.3",
     "detect-libc": "^2.1.2",
     "diff": "^9.0.0",
-    "effect": "4.0.0-beta.65",
     "js-yaml": "^4.1.1",
     "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
@@ -113,6 +116,7 @@
   "devDependencies": {
     "@oh-my-opencode/ast-grep-core": "workspace:*",
     "@oh-my-opencode/ast-grep-mcp": "workspace:*",
+    "@oh-my-opencode/git-bash-mcp": "workspace:*",
     "@oh-my-opencode/agents-md-core": "workspace:*",
     "@oh-my-opencode/boulder-state": "workspace:*",
     "@oh-my-opencode/comment-checker-core": "workspace:*",
@@ -131,17 +135,17 @@
     "zod": "^4.4.3"
   },
   "optionalDependencies": {
-    "oh-my-opencode-darwin-arm64": "4.5.12",
-    "oh-my-opencode-darwin-x64": "4.5.12",
-    "oh-my-opencode-darwin-x64-baseline": "4.5.12",
-    "oh-my-opencode-linux-arm64": "4.5.12",
-    "oh-my-opencode-linux-arm64-musl": "4.5.12",
-    "oh-my-opencode-linux-x64": "4.5.12",
-    "oh-my-opencode-linux-x64-baseline": "4.5.12",
-    "oh-my-opencode-linux-x64-musl": "4.5.12",
-    "oh-my-opencode-linux-x64-musl-baseline": "4.5.12",
-    "oh-my-opencode-windows-x64": "4.5.12",
-    "oh-my-opencode-windows-x64-baseline": "4.5.12"
+    "oh-my-opencode-darwin-arm64": "4.7.0",
+    "oh-my-opencode-darwin-x64": "4.7.0",
+    "oh-my-opencode-darwin-x64-baseline": "4.7.0",
+    "oh-my-opencode-linux-arm64": "4.7.0",
+    "oh-my-opencode-linux-arm64-musl": "4.7.0",
+    "oh-my-opencode-linux-x64": "4.7.0",
+    "oh-my-opencode-linux-x64-baseline": "4.7.0",
+    "oh-my-opencode-linux-x64-musl": "4.7.0",
+    "oh-my-opencode-linux-x64-musl-baseline": "4.7.0",
+    "oh-my-opencode-windows-x64": "4.7.0",
+    "oh-my-opencode-windows-x64-baseline": "4.7.0"
   },
   "overrides": {
     "hono": "^4.12.18",

package/packages/ast-grep-mcp/dist/cli.js

@@ -342,13 +342,44 @@ function errorMessage(error) {
 import { createRequire } from "module";
 import { dirname, join as join2 } from "path";
 import { existsSync, statSync as statSync2 } from "fs";
+var WINDOWS_EXECUTABLE_EXTENSIONS = [".exe", ".cmd", ".bat"];
 function isValidBinary(filePath) {
   try {
-    return statSync2(filePath).size > 1e4;
+    const stats = statSync2(filePath);
+    if (!stats.isFile()) {
+      return false;
+    }
+    const size = stats.size;
+    const lowerPath = filePath.toLowerCase();
+    if (lowerPath.endsWith(".cmd") || lowerPath.endsWith(".bat")) {
+      return size > 0;
+    }
+    return size > 1e4;
   } catch {
     return false;
   }
 }
+function executableCandidates(filePath, platform = process.platform) {
+  if (platform !== "win32")
+    return [filePath];
+  const candidates = [filePath];
+  const lowerPath = filePath.toLowerCase();
+  if (WINDOWS_EXECUTABLE_EXTENSIONS.some((extension) => lowerPath.endsWith(extension))) {
+    return candidates;
+  }
+  for (const extension of WINDOWS_EXECUTABLE_EXTENSIONS) {
+    candidates.push(`${filePath}${extension}`);
+  }
+  return candidates;
+}
+function findValidExecutable(filePath) {
+  for (const candidate of executableCandidates(filePath)) {
+    if (existsSync(candidate) && isValidBinary(candidate)) {
+      return candidate;
+    }
+  }
+  return null;
+}
 function getPlatformPackageName() {
   const platform = process.platform;
   const arch = process.arch;
@@ -363,29 +394,42 @@ function getPlatformPackageName() {
   };
   return platformMap[`${platform}-${arch}`] ?? null;
 }
+function isModuleResolutionFailure(error) {
+  return error instanceof Error && (error.message.includes("Cannot find module") || error.message.includes("Cannot find package"));
+}
 function findSgCliPathSync() {
-  const binaryName = process.platform === "win32" ? "sg.exe" : "sg";
+  const binaryName = "sg";
   try {
     const require2 = createRequire(import.meta.url);
     const cliPackageJsonPath = require2.resolve("@ast-grep/cli/package.json");
     const cliDirectory = dirname(cliPackageJsonPath);
     const sgPath = join2(cliDirectory, binaryName);
-    if (existsSync(sgPath) && isValidBinary(sgPath)) {
-      return sgPath;
+    const validSgPath = findValidExecutable(sgPath);
+    if (validSgPath) {
+      return validSgPath;
+    }
+  } catch (error) {
+    if (!isModuleResolutionFailure(error)) {
+      throw error;
     }
-  } catch {}
+  }
   const platformPackage = getPlatformPackageName();
   if (platformPackage) {
     try {
       const require2 = createRequire(import.meta.url);
       const packageJsonPath = require2.resolve(`${platformPackage}/package.json`);
       const packageDirectory = dirname(packageJsonPath);
-      const astGrepBinaryName = process.platform === "win32" ? "ast-grep.exe" : "ast-grep";
+      const astGrepBinaryName = "ast-grep";
       const binaryPath = join2(packageDirectory, astGrepBinaryName);
-      if (existsSync(binaryPath) && isValidBinary(binaryPath)) {
-        return binaryPath;
+      const validBinaryPath = findValidExecutable(binaryPath);
+      if (validBinaryPath) {
+        return validBinaryPath;
+      }
+    } catch (error) {
+      if (!isModuleResolutionFailure(error)) {
+        throw error;
       }
-    } catch {}
+    }
   }
   if (process.platform === "darwin") {
     const homebrewPaths = ["/opt/homebrew/bin/sg", "/usr/local/bin/sg"];