fix: address code review issues

claude · claude · commit 6b69726bbab8 · 2025-12-26T04:50:36.000Z
- Fix singleton readline interface for stdin prompts
- Fix SQL directory resolution with proper fallback paths
- Add error logging for unhandled spawn errors
- Use any type for MCP SDK request handler (SDK types vary)
- Use cross-platform shebang replacement in build script
- Clarify auth server timing with comments
diff --git a/cli/bin/postgres-ai.ts b/cli/bin/postgres-ai.ts
@@ -94,7 +94,11 @@ function spawn(cmd: string, args: string[], options?: { stdio?: "pipe" | "ignore
     handlers["close"]?.forEach((cb) => cb(code));
     handlers["exit"]?.forEach((cb) => cb(code));
   }).catch((err) => {
-    handlers["error"]?.forEach((cb) => cb(null, String(err)));
+    if (handlers["error"]?.length) {
+      handlers["error"].forEach((cb) => cb(null, String(err)));
+    } else {
+      console.error(`Spawn error for ${cmd}:`, err);
+    }
   });
 
   return {
diff --git a/cli/lib/auth-server.ts b/cli/lib/auth-server.ts
@@ -174,8 +174,10 @@ export function createCallbackServer(
       resolved = true;
       clearTimeout(timeout);
 
-      setTimeout(() => serverInstance?.stop(), 100);
+      // Resolve first, then stop server asynchronously after response is sent.
+      // The 100ms delay ensures the HTTP response is fully written before closing.
       resolveCallback({ code, state });
+      setTimeout(() => serverInstance?.stop(), 100);
 
       return new Response(`
 <!DOCTYPE html>
diff --git a/cli/lib/init.ts b/cli/lib/init.ts
@@ -160,16 +160,20 @@ export type InitPlan = {
 };
 
 function sqlDir(): string {
-  // Handle both development (lib/init.ts) and production (dist/bin/postgres-ai.js) paths
-  // Development: lib/ -> ../sql
-  // Production (bundled): dist/bin/ -> ../sql (copied during build)
-  const devPath = path.resolve(__dirname, "..", "sql");
-  const prodPath = path.resolve(__dirname, "..", "sql");
-
-  if (fs.existsSync(devPath)) {
-    return devPath;
+  // Handle both development and production paths
+  // Development: lib/init.ts -> ../sql
+  // Production (bundled): dist/bin/postgres-ai.js -> ../sql (copied during build)
+  const candidates = [
+    path.resolve(__dirname, "..", "sql"),       // bundled: dist/bin -> dist/sql
+    path.resolve(__dirname, "..", "..", "sql"), // dev from lib: lib -> ../sql
+  ];
+
+  for (const candidate of candidates) {
+    if (fs.existsSync(candidate)) {
+      return candidate;
+    }
   }
-  return prodPath;
+  throw new Error(`SQL directory not found. Searched: ${candidates.join(", ")}`);
 }
 
 function loadSqlTemplate(filename: string): string {
diff --git a/cli/lib/mcp-server.ts b/cli/lib/mcp-server.ts
@@ -75,7 +75,8 @@ export async function startMcpServer(rootOpts?: RootOptsLike, extra?: { debug?:
     };
   });
 
-  server.setRequestHandler(CallToolRequestSchema, async (req: { params: { name: string; arguments?: Record<string, unknown> } }) => {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  server.setRequestHandler(CallToolRequestSchema, async (req: any) => {
     const toolName = req.params.name;
     const args = (req.params.arguments as Record<string, unknown>) || {};
 
diff --git a/cli/package.json b/cli/package.json
@@ -22,7 +22,7 @@
     "node": ">=18"
   },
   "scripts": {
-    "build": "bun build ./bin/postgres-ai.ts --outdir ./dist/bin --target node && sed -i '1s|#!/usr/bin/env bun|#!/usr/bin/env node|' ./dist/bin/postgres-ai.js && cp -r sql dist/",
+    "build": "bun build ./bin/postgres-ai.ts --outdir ./dist/bin --target node && node -e \"const fs=require('fs');const f='./dist/bin/postgres-ai.js';fs.writeFileSync(f,fs.readFileSync(f,'utf8').replace('#!/usr/bin/env bun','#!/usr/bin/env node'))\" && cp -r sql dist/",
     "prepublishOnly": "npm run build",
     "start": "bun ./bin/postgres-ai.ts --help",
     "start:node": "node ./dist/bin/postgres-ai.js --help",
