wind-agent-cli 1.37.2 → 1.37.3

package/server/modules/worktrees/worktrees.routes.ts

@@ -1,116 +1,116 @@
-import express from 'express';
-
-import type { WorktreeServices } from '@/shared/types.js';
-import { AppError, asyncHandler, createApiSuccessResponse } from '@/shared/utils.js';
-
-/**
- * Parses the project identifier shared by all Worktrees routes.
- *
- * Path resolution intentionally remains in the injected application service so
- * this transport layer never reaches into the Database module.
- */
-function readProjectId(projectIdValue: unknown): string {
-  const projectId = typeof projectIdValue === 'string' ? projectIdValue.trim() : '';
-  if (!projectId) {
-    throw new AppError('project is required', {
-      code: 'PROJECT_ID_REQUIRED',
-      statusCode: 400,
-    });
-  }
-
-  return projectId;
-}
-
-function readRequiredString(value: unknown, name: string): string {
-  const parsed = typeof value === 'string' ? value.trim() : '';
-  if (!parsed) {
-    throw new AppError(`${name} is required`, {
-      code: 'INVALID_REQUEST_BODY',
-      statusCode: 400,
-    });
-  }
-  return parsed;
-}
-
-/**
- * Builds the Worktrees HTTP router around an injected application-service API.
- *
- * Keeping construction explicit lets route tests supply deterministic services
- * and ensures parsing remains the route layer's only responsibility.
- */
-export function createWorktreesRouter(services: WorktreeServices): express.Router {
-  const router = express.Router();
-
-  router.get(
-    '/',
-    asyncHandler(async (req, res) => {
-      const projectPath = services.resolveProjectPath(readProjectId(req.query.project));
-      const result = await services.list({ projectPath });
-      res.json(createApiSuccessResponse(result));
-    }),
-  );
-
-  router.post(
-    '/create',
-    asyncHandler(async (req, res) => {
-      const body = req.body as Record<string, unknown>;
-      const projectPath = services.resolveProjectPath(readProjectId(body.project));
-      const branch = readRequiredString(body.branch, 'branch');
-      const baseBranch = typeof body.baseBranch === 'string' ? body.baseBranch : null;
-
-      const result = await services.createAndOpen({ projectPath, branch, baseBranch });
-      res.json(createApiSuccessResponse(result));
-    }),
-  );
-
-  router.post(
-    '/open',
-    asyncHandler(async (req, res) => {
-      const body = req.body as Record<string, unknown>;
-      const projectPath = services.resolveProjectPath(readProjectId(body.project));
-      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
-
-      const project = await services.open({ projectPath, worktreePath });
-      res.json(createApiSuccessResponse({ project }));
-    }),
-  );
-
-  router.post(
-    '/merge',
-    asyncHandler(async (req, res) => {
-      const body = req.body as Record<string, unknown>;
-      const projectPath = services.resolveProjectPath(readProjectId(body.project));
-      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
-
-      const result = await services.merge({
-        projectPath,
-        worktreePath,
-        squash: typeof body.squash === 'boolean' ? body.squash : false,
-        message: typeof body.message === 'string' ? body.message : null,
-        removeAfterMerge: typeof body.removeAfterMerge === 'boolean' ? body.removeAfterMerge : false,
-      });
-
-      res.json(createApiSuccessResponse(result));
-    }),
-  );
-
-  router.post(
-    '/remove',
-    asyncHandler(async (req, res) => {
-      const body = req.body as Record<string, unknown>;
-      const projectPath = services.resolveProjectPath(readProjectId(body.project));
-      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
-
-      const result = await services.remove({
-        projectPath,
-        worktreePath,
-        force: typeof body.force === 'boolean' ? body.force : false,
-        deleteBranch: typeof body.deleteBranch === 'boolean' ? body.deleteBranch : false,
-      });
-
-      res.json(createApiSuccessResponse(result));
-    }),
-  );
-
-  return router;
-}
+import express from 'express';
+
+import type { WorktreeServices } from '@/shared/types.js';
+import { AppError, asyncHandler, createApiSuccessResponse } from '@/shared/utils.js';
+
+/**
+ * Parses the project identifier shared by all Worktrees routes.
+ *
+ * Path resolution intentionally remains in the injected application service so
+ * this transport layer never reaches into the Database module.
+ */
+function readProjectId(projectIdValue: unknown): string {
+  const projectId = typeof projectIdValue === 'string' ? projectIdValue.trim() : '';
+  if (!projectId) {
+    throw new AppError('project is required', {
+      code: 'PROJECT_ID_REQUIRED',
+      statusCode: 400,
+    });
+  }
+
+  return projectId;
+}
+
+function readRequiredString(value: unknown, name: string): string {
+  const parsed = typeof value === 'string' ? value.trim() : '';
+  if (!parsed) {
+    throw new AppError(`${name} is required`, {
+      code: 'INVALID_REQUEST_BODY',
+      statusCode: 400,
+    });
+  }
+  return parsed;
+}
+
+/**
+ * Builds the Worktrees HTTP router around an injected application-service API.
+ *
+ * Keeping construction explicit lets route tests supply deterministic services
+ * and ensures parsing remains the route layer's only responsibility.
+ */
+export function createWorktreesRouter(services: WorktreeServices): express.Router {
+  const router = express.Router();
+
+  router.get(
+    '/',
+    asyncHandler(async (req, res) => {
+      const projectPath = services.resolveProjectPath(readProjectId(req.query.project));
+      const result = await services.list({ projectPath });
+      res.json(createApiSuccessResponse(result));
+    }),
+  );
+
+  router.post(
+    '/create',
+    asyncHandler(async (req, res) => {
+      const body = req.body as Record<string, unknown>;
+      const projectPath = services.resolveProjectPath(readProjectId(body.project));
+      const branch = readRequiredString(body.branch, 'branch');
+      const baseBranch = typeof body.baseBranch === 'string' ? body.baseBranch : null;
+
+      const result = await services.createAndOpen({ projectPath, branch, baseBranch });
+      res.json(createApiSuccessResponse(result));
+    }),
+  );
+
+  router.post(
+    '/open',
+    asyncHandler(async (req, res) => {
+      const body = req.body as Record<string, unknown>;
+      const projectPath = services.resolveProjectPath(readProjectId(body.project));
+      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
+
+      const project = await services.open({ projectPath, worktreePath });
+      res.json(createApiSuccessResponse({ project }));
+    }),
+  );
+
+  router.post(
+    '/merge',
+    asyncHandler(async (req, res) => {
+      const body = req.body as Record<string, unknown>;
+      const projectPath = services.resolveProjectPath(readProjectId(body.project));
+      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
+
+      const result = await services.merge({
+        projectPath,
+        worktreePath,
+        squash: typeof body.squash === 'boolean' ? body.squash : false,
+        message: typeof body.message === 'string' ? body.message : null,
+        removeAfterMerge: typeof body.removeAfterMerge === 'boolean' ? body.removeAfterMerge : false,
+      });
+
+      res.json(createApiSuccessResponse(result));
+    }),
+  );
+
+  router.post(
+    '/remove',
+    asyncHandler(async (req, res) => {
+      const body = req.body as Record<string, unknown>;
+      const projectPath = services.resolveProjectPath(readProjectId(body.project));
+      const worktreePath = readRequiredString(body.worktreePath, 'worktreePath');
+
+      const result = await services.remove({
+        projectPath,
+        worktreePath,
+        force: typeof body.force === 'boolean' ? body.force : false,
+        deleteBranch: typeof body.deleteBranch === 'boolean' ? body.deleteBranch : false,
+      });
+
+      res.json(createApiSuccessResponse(result));
+    }),
+  );
+
+  return router;
+}

package/server/shared/claude-cli-path.ts

@@ -1,139 +1,139 @@
-import { execFileSync } from 'node:child_process';
-import fs from 'node:fs';
-import path from 'node:path';
-
-const DEFAULT_CLAUDE_COMMAND = 'claude';
-const CLAUDE_SCRIPT_EXTENSIONS = new Set(['.cjs', '.js', '.jsx', '.mjs', '.ts', '.tsx']);
-const CLAUDE_WRAPPER_SEGMENTS = ['node_modules', '@anthropic-ai', 'claude-code', 'bin', 'claude.exe'] as const;
-
-export type ResolveClaudeCodeExecutablePathDependencies = {
-  execFileSync?: typeof execFileSync;
-  existsSync?: typeof fs.existsSync;
-  platform?: NodeJS.Platform;
-  readFileSync?: typeof fs.readFileSync;
-};
-
-function getPathApi(platform: NodeJS.Platform) {
-  return platform === 'win32' ? path.win32 : path;
-}
-
-function stripWrappingQuotes(value: string): string {
-  const trimmed = value.trim();
-  if (
-    (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
-    (trimmed.startsWith("'") && trimmed.endsWith("'"))
-  ) {
-    return trimmed.slice(1, -1);
-  }
-  return trimmed;
-}
-
-function isPathLike(value: string): boolean {
-  return value.includes('/') || value.includes('\\');
-}
-
-function resolveClaudeWrapperBinary(
-  wrapperPath: string,
-  deps: Required<ResolveClaudeCodeExecutablePathDependencies>,
-): string | null {
-  const pathApi = getPathApi(deps.platform);
-  const directCandidate = pathApi.resolve(pathApi.dirname(wrapperPath), ...CLAUDE_WRAPPER_SEGMENTS);
-
-  if (deps.existsSync(directCandidate)) {
-    return directCandidate;
-  }
-
-  let content: string;
-  try {
-    content = deps.readFileSync(wrapperPath, 'utf8');
-  } catch {
-    return null;
-  }
-
-  const matches = content.matchAll(/["']([^"'\\\r\n]*claude\.exe)["']/gi);
-  for (const match of matches) {
-    const rawTarget = match[1]
-      .replace(/^\$basedir[\\/]/i, '')
-      .replace(/^%dp0%[\\/]/i, '')
-      .replace(/^%~dp0[\\/]/i, '');
-    const normalizedTarget = rawTarget.replace(/[\\/]/g, pathApi.sep);
-    const candidate = pathApi.isAbsolute(normalizedTarget)
-      ? normalizedTarget
-      : pathApi.resolve(pathApi.dirname(wrapperPath), normalizedTarget);
-
-    if (deps.existsSync(candidate)) {
-      return candidate;
-    }
-  }
-
-  return null;
-}
-
-function resolveWindowsClaudeExecutablePath(
-  configuredPath: string,
-  deps: Required<ResolveClaudeCodeExecutablePathDependencies>,
-): string {
-  const pathApi = getPathApi(deps.platform);
-  const extension = pathApi.extname(configuredPath).toLowerCase();
-  const explicitPath = isPathLike(configuredPath) || pathApi.isAbsolute(configuredPath);
-
-  if (CLAUDE_SCRIPT_EXTENSIONS.has(extension)) {
-    return configuredPath;
-  }
-
-  if (explicitPath && extension === '.exe') {
-    return configuredPath;
-  }
-
-  if (explicitPath) {
-    return resolveClaudeWrapperBinary(configuredPath, deps) ?? configuredPath;
-  }
-
-  try {
-    const stdout = deps.execFileSync('where.exe', [configuredPath], {
-      encoding: 'utf8',
-      stdio: ['ignore', 'pipe', 'ignore'],
-      windowsHide: true,
-    });
-    const candidates = stdout
-      .split(/\r?\n/)
-      .map((entry) => entry.trim())
-      .filter(Boolean);
-
-    for (const candidate of candidates) {
-      if (pathApi.extname(candidate).toLowerCase() === '.exe') {
-        return candidate;
-      }
-    }
-
-    for (const candidate of candidates) {
-      const resolved = resolveClaudeWrapperBinary(candidate, deps);
-      if (resolved) {
-        return resolved;
-      }
-    }
-  } catch {
-    return configuredPath;
-  }
-
-  return configuredPath;
-}
-
-export function resolveClaudeCodeExecutablePath(
-  configuredPath: string | undefined = process.env.CLAUDE_CLI_PATH,
-  dependencies: ResolveClaudeCodeExecutablePathDependencies = {},
-): string {
-  const deps: Required<ResolveClaudeCodeExecutablePathDependencies> = {
-    execFileSync: dependencies.execFileSync ?? execFileSync,
-    existsSync: dependencies.existsSync ?? fs.existsSync,
-    platform: dependencies.platform ?? process.platform,
-    readFileSync: dependencies.readFileSync ?? fs.readFileSync,
-  };
-
-  const normalizedPath = stripWrappingQuotes(configuredPath || DEFAULT_CLAUDE_COMMAND);
-  if (deps.platform !== 'win32') {
-    return normalizedPath;
-  }
-
-  return resolveWindowsClaudeExecutablePath(normalizedPath, deps);
-}
+import { execFileSync } from 'node:child_process';
+import fs from 'node:fs';
+import path from 'node:path';
+
+const DEFAULT_CLAUDE_COMMAND = 'claude';
+const CLAUDE_SCRIPT_EXTENSIONS = new Set(['.cjs', '.js', '.jsx', '.mjs', '.ts', '.tsx']);
+const CLAUDE_WRAPPER_SEGMENTS = ['node_modules', '@anthropic-ai', 'claude-code', 'bin', 'claude.exe'] as const;
+
+export type ResolveClaudeCodeExecutablePathDependencies = {
+  execFileSync?: typeof execFileSync;
+  existsSync?: typeof fs.existsSync;
+  platform?: NodeJS.Platform;
+  readFileSync?: typeof fs.readFileSync;
+};
+
+function getPathApi(platform: NodeJS.Platform) {
+  return platform === 'win32' ? path.win32 : path;
+}
+
+function stripWrappingQuotes(value: string): string {
+  const trimmed = value.trim();
+  if (
+    (trimmed.startsWith('"') && trimmed.endsWith('"')) ||
+    (trimmed.startsWith("'") && trimmed.endsWith("'"))
+  ) {
+    return trimmed.slice(1, -1);
+  }
+  return trimmed;
+}
+
+function isPathLike(value: string): boolean {
+  return value.includes('/') || value.includes('\\');
+}
+
+function resolveClaudeWrapperBinary(
+  wrapperPath: string,
+  deps: Required<ResolveClaudeCodeExecutablePathDependencies>,
+): string | null {
+  const pathApi = getPathApi(deps.platform);
+  const directCandidate = pathApi.resolve(pathApi.dirname(wrapperPath), ...CLAUDE_WRAPPER_SEGMENTS);
+
+  if (deps.existsSync(directCandidate)) {
+    return directCandidate;
+  }
+
+  let content: string;
+  try {
+    content = deps.readFileSync(wrapperPath, 'utf8');
+  } catch {
+    return null;
+  }
+
+  const matches = content.matchAll(/["']([^"'\\\r\n]*claude\.exe)["']/gi);
+  for (const match of matches) {
+    const rawTarget = match[1]
+      .replace(/^\$basedir[\\/]/i, '')
+      .replace(/^%dp0%[\\/]/i, '')
+      .replace(/^%~dp0[\\/]/i, '');
+    const normalizedTarget = rawTarget.replace(/[\\/]/g, pathApi.sep);
+    const candidate = pathApi.isAbsolute(normalizedTarget)
+      ? normalizedTarget
+      : pathApi.resolve(pathApi.dirname(wrapperPath), normalizedTarget);
+
+    if (deps.existsSync(candidate)) {
+      return candidate;
+    }
+  }
+
+  return null;
+}
+
+function resolveWindowsClaudeExecutablePath(
+  configuredPath: string,
+  deps: Required<ResolveClaudeCodeExecutablePathDependencies>,
+): string {
+  const pathApi = getPathApi(deps.platform);
+  const extension = pathApi.extname(configuredPath).toLowerCase();
+  const explicitPath = isPathLike(configuredPath) || pathApi.isAbsolute(configuredPath);
+
+  if (CLAUDE_SCRIPT_EXTENSIONS.has(extension)) {
+    return configuredPath;
+  }
+
+  if (explicitPath && extension === '.exe') {
+    return configuredPath;
+  }
+
+  if (explicitPath) {
+    return resolveClaudeWrapperBinary(configuredPath, deps) ?? configuredPath;
+  }
+
+  try {
+    const stdout = deps.execFileSync('where.exe', [configuredPath], {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+      windowsHide: true,
+    });
+    const candidates = stdout
+      .split(/\r?\n/)
+      .map((entry) => entry.trim())
+      .filter(Boolean);
+
+    for (const candidate of candidates) {
+      if (pathApi.extname(candidate).toLowerCase() === '.exe') {
+        return candidate;
+      }
+    }
+
+    for (const candidate of candidates) {
+      const resolved = resolveClaudeWrapperBinary(candidate, deps);
+      if (resolved) {
+        return resolved;
+      }
+    }
+  } catch {
+    return configuredPath;
+  }
+
+  return configuredPath;
+}
+
+export function resolveClaudeCodeExecutablePath(
+  configuredPath: string | undefined = process.env.CLAUDE_CLI_PATH,
+  dependencies: ResolveClaudeCodeExecutablePathDependencies = {},
+): string {
+  const deps: Required<ResolveClaudeCodeExecutablePathDependencies> = {
+    execFileSync: dependencies.execFileSync ?? execFileSync,
+    existsSync: dependencies.existsSync ?? fs.existsSync,
+    platform: dependencies.platform ?? process.platform,
+    readFileSync: dependencies.readFileSync ?? fs.readFileSync,
+  };
+
+  const normalizedPath = stripWrappingQuotes(configuredPath || DEFAULT_CLAUDE_COMMAND);
+  if (deps.platform !== 'win32') {
+    return normalizedPath;
+  }
+
+  return resolveWindowsClaudeExecutablePath(normalizedPath, deps);
+}

package/server/shared/frontmatter.ts

@@ -1,18 +1,18 @@
-import matter from 'gray-matter';
-
-const disabledFrontmatterEngine = () => ({});
-
-const frontmatterOptions = {
-  language: 'yaml',
-  // Disable JS/JSON frontmatter parsing to avoid executable project content.
-  // Mirrors Gatsby's mitigation for gray-matter.
-  engines: {
-    js: disabledFrontmatterEngine,
-    javascript: disabledFrontmatterEngine,
-    json: disabledFrontmatterEngine,
-  },
-};
-
-export function parseFrontMatter(content: string) {
-  return matter(content, frontmatterOptions);
-}
+import matter from 'gray-matter';
+
+const disabledFrontmatterEngine = () => ({});
+
+const frontmatterOptions = {
+  language: 'yaml',
+  // Disable JS/JSON frontmatter parsing to avoid executable project content.
+  // Mirrors Gatsby's mitigation for gray-matter.
+  engines: {
+    js: disabledFrontmatterEngine,
+    javascript: disabledFrontmatterEngine,
+    json: disabledFrontmatterEngine,
+  },
+};
+
+export function parseFrontMatter(content: string) {
+  return matter(content, frontmatterOptions);
+}