no git roots allowed in parent of homedir

Author: charleslien

npm-app/src/menu.ts

@@ -18,7 +18,7 @@ import {
 
 import { codebuffConfigFile } from 'common/json-config/constants'
 import { Formatter } from 'picocolors/types'
-import { getProjectRoot, isSubdir } from './project-files'
+import { getProjectRoot, isValidProjectRoot } from './project-files'
 
 export interface CommandInfo {
   commandText: string // e.g., 'type "login"', 'type "diff" or "d"', 'hit ESC key or Ctrl-C'
@@ -219,7 +219,7 @@ export function displayGreeting(costMode: CostMode, username: string | null) {
     console.log(`${costModeDescription[costMode]}`)
   }
 
-  if (isSubdir(getProjectRoot(), os.homedir())) {
+  if (!isValidProjectRoot(getProjectRoot())) {
     console.info(
       `Welcome! Codebuff is your AI pair programmer that edits your codebase through natural conversation.
 

npm-app/src/project-files.ts

@@ -73,6 +73,10 @@ export function getCurrentChatDir(): string {
   return dir
 }
 
+export function isValidProjectRoot(dir: string): boolean {
+  return !isSubdir(dir, os.homedir())
+}
+
 const execAsync = promisify(exec)
 
 let projectRoot: string
@@ -155,6 +159,9 @@ export function toAbsolutePath(filepath: string, projectRoot: string): string {
   return path.normalize(path.resolve(projectRoot, filepath))
 }
 
+/**
+ * Returns true if the `toPath` is a subdirectory of `fromPath`.
+ */
 export function isSubdir(fromPath: string, toPath: string) {
   const resolvedFrom = path.resolve(fromPath)
   const resolvedTo = path.resolve(toPath)

npm-app/src/utils/git.ts

@@ -3,7 +3,7 @@ import fs, { existsSync, statSync } from 'fs'
 import gitUrlParse from 'git-url-parse'
 import { getConfig, listFiles, log, ReadCommitResult } from 'isomorphic-git'
 import path from 'path'
-import { getWorkingDirectory } from '../project-files'
+import { getWorkingDirectory, isValidProjectRoot } from '../project-files'
 import { logger } from './logger'
 
 /**
@@ -38,7 +38,7 @@ export function findGitRoot(startDir: string): string | null {
   while (currentDir !== path.parse(currentDir).root) {
     const gitDir = path.join(currentDir, '.git')
     if (existsSync(gitDir) && statSync(gitDir).isDirectory()) {
-      return currentDir
+      return isValidProjectRoot(currentDir) ? currentDir : null
     }
     currentDir = path.dirname(currentDir)
   }