refactor(ui-desktop): prefer GOOSE_PATH_ROOT for path resolution

Signed-off-by: Vadim Polulyakh <bavadim@gmail.com>
(cherry picked from commit 7f789c8)

Author: bavadim

ui/desktop/src/bin/jbang

@@ -20,10 +20,11 @@ trap 'log "An error occurred. Exiting with status $?."' ERR
 
 log "Starting jbang setup script."
 
-if [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
-    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
-elif [ -n "${GOOSE_PATH_ROOT:-}" ]; then
+if [ -n "${GOOSE_PATH_ROOT:-}" ]; then
     RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_PATH_ROOT}/config"
+elif [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
+    log "GOOSE_CONFIG_DIR is deprecated for desktop shims; prefer GOOSE_PATH_ROOT."
+    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
 else
     RESOLVED_GOOSE_CONFIG_DIR="${HOME}/.config/goose"
 fi

ui/desktop/src/bin/node-setup-common.sh

@@ -23,10 +23,11 @@ trap 'log "An error occurred. Exiting with status $?."' ERR
 
 log "Starting node setup (common)."
 
-if [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
-    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
-elif [ -n "${GOOSE_PATH_ROOT:-}" ]; then
+if [ -n "${GOOSE_PATH_ROOT:-}" ]; then
     RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_PATH_ROOT}/config"
+elif [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
+    log "GOOSE_CONFIG_DIR is deprecated for desktop shims; prefer GOOSE_PATH_ROOT."
+    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
 else
     RESOLVED_GOOSE_CONFIG_DIR="${HOME}/.config/goose"
 fi

ui/desktop/src/bin/uvx

@@ -20,10 +20,11 @@ trap 'log "An error occurred. Exiting with status $?."' ERR
 
 log "Starting uvx setup script."
 
-if [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
-    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
-elif [ -n "${GOOSE_PATH_ROOT:-}" ]; then
+if [ -n "${GOOSE_PATH_ROOT:-}" ]; then
     RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_PATH_ROOT}/config"
+elif [ -n "${GOOSE_CONFIG_DIR:-}" ]; then
+    log "GOOSE_CONFIG_DIR is deprecated for desktop shims; prefer GOOSE_PATH_ROOT."
+    RESOLVED_GOOSE_CONFIG_DIR="${GOOSE_CONFIG_DIR}"
 else
     RESOLVED_GOOSE_CONFIG_DIR="${HOME}/.config/goose"
 fi

ui/desktop/src/main.ts

@@ -439,18 +439,12 @@ const getBundledConfig = (): BundledConfig => {
 const { defaultProvider, defaultModel, predefinedModels, baseUrlShare, version } =
   getBundledConfig();
 
-const resolveGooseConfigDir = (): string => {
-  const explicitConfigDir = process.env.GOOSE_CONFIG_DIR?.trim();
-  if (explicitConfigDir) {
-    return expandTilde(explicitConfigDir);
-  }
-
+const resolveGoosePathRoot = (): string | undefined => {
   const pathRoot = process.env.GOOSE_PATH_ROOT?.trim();
   if (pathRoot) {
-    return path.join(expandTilde(pathRoot), 'config');
+    return expandTilde(pathRoot);
   }
-
-  return '~/.config/goose';
+  return undefined;
 };
 
 const GENERATED_SECRET = crypto.randomBytes(32).toString('hex');
@@ -470,8 +464,7 @@ let appConfig = {
   GOOSE_DEFAULT_MODEL: defaultModel,
   GOOSE_PREDEFINED_MODELS: predefinedModels,
   GOOSE_API_HOST: 'http://127.0.0.1',
-  GOOSE_CONFIG_DIR: resolveGooseConfigDir(),
-  GOOSE_PATH_ROOT: process.env.GOOSE_PATH_ROOT,
+  GOOSE_PATH_ROOT: resolveGoosePathRoot(),
   GOOSE_WORKING_DIR: '',
   // If GOOSE_ALLOWLIST_WARNING env var is not set, defaults to false (strict blocking mode)
   GOOSE_ALLOWLIST_WARNING: process.env.GOOSE_ALLOWLIST_WARNING === 'true',
@@ -503,8 +496,7 @@ const createChat = async (
     serverSecret,
     dir: dir || os.homedir(),
     env: {
-      GOOSE_PATH_ROOT: process.env.GOOSE_PATH_ROOT,
-      GOOSE_CONFIG_DIR: appConfig.GOOSE_CONFIG_DIR,
+      GOOSE_PATH_ROOT: appConfig.GOOSE_PATH_ROOT as string | undefined,
     },
     externalGoosed: settings.externalGoosed,
     isPackaged: app.isPackaged,

ui/desktop/src/recipe/recipe_management.ts

@@ -42,14 +42,14 @@ export const convertToLocaleDateString = (lastModified: string): string => {
 
 export const getStorageDirectory = (isGlobal: boolean): string => {
   if (isGlobal) {
-    const configDir = window.appConfig.get('GOOSE_CONFIG_DIR') as string | undefined;
-    if (configDir) {
-      return `${configDir}/recipes`;
-    }
     const pathRoot = window.appConfig.get('GOOSE_PATH_ROOT') as string | undefined;
     if (pathRoot) {
       return `${pathRoot}/config/recipes`;
     }
+    const configDir = window.appConfig.get('GOOSE_CONFIG_DIR') as string | undefined;
+    if (configDir) {
+      return `${configDir}/recipes`;
+    }
     return '~/.config/goose/recipes';
   } else {
     // For directory recipes, build absolute path using working directory