diff --git a/extensions/workspaces/scripts/attach.ts b/extensions/workspaces/scripts/attach.ts index 2556450375..7fa49a5595 100644 --- a/extensions/workspaces/scripts/attach.ts +++ b/extensions/workspaces/scripts/attach.ts @@ -6,11 +6,11 @@ import path from 'node:path'; import fs from 'node:fs'; import { spawnSync } from 'node:child_process'; -import { fileURLToPath } from 'node:url'; + import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); const q = (str: string) => `'${str.replace(/'/g, "'\\''")}'`; diff --git a/extensions/workspaces/scripts/check.ts b/extensions/workspaces/scripts/check.ts index 72681bdf1f..050e44d4d4 100644 --- a/extensions/workspaces/scripts/check.ts +++ b/extensions/workspaces/scripts/check.ts @@ -6,11 +6,11 @@ import { spawnSync } from 'node:child_process'; import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); export async function runChecker( args: string[], diff --git a/extensions/workspaces/scripts/clean.ts b/extensions/workspaces/scripts/clean.ts index 09fbe35fe4..072e66c68e 100644 --- a/extensions/workspaces/scripts/clean.ts +++ b/extensions/workspaces/scripts/clean.ts @@ -5,12 +5,12 @@ */ import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import readline from 'node:readline'; import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); async function confirm(question: string): Promise { const rl = readline.createInterface({ diff --git a/extensions/workspaces/scripts/entrypoint.ts b/extensions/workspaces/scripts/entrypoint.ts index 7f4c77f3e1..4a54c6cba8 100644 --- a/extensions/workspaces/scripts/entrypoint.ts +++ b/extensions/workspaces/scripts/entrypoint.ts @@ -7,7 +7,7 @@ import { spawnSync } from 'child_process'; import path from 'path'; import fs from 'fs'; -import { fileURLToPath } from 'url'; + const __dirname = path.dirname(fileURLToPath(import.meta.url)); const prNumber = process.argv[2]; diff --git a/extensions/workspaces/scripts/fleet.ts b/extensions/workspaces/scripts/fleet.ts index 7c18cbd882..390e8a0e8a 100644 --- a/extensions/workspaces/scripts/fleet.ts +++ b/extensions/workspaces/scripts/fleet.ts @@ -6,11 +6,11 @@ import { spawnSync } from 'node:child_process'; import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); const USER = process.env.USER || 'mattkorwel'; const INSTANCE_PREFIX = `gcli-workspace-${USER}`; diff --git a/extensions/workspaces/scripts/logs.ts b/extensions/workspaces/scripts/logs.ts index 7243f498ed..a16e47cfab 100644 --- a/extensions/workspaces/scripts/logs.ts +++ b/extensions/workspaces/scripts/logs.ts @@ -6,10 +6,10 @@ import { spawnSync } from 'node:child_process'; import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + + +const REPO_ROOT = process.cwd(); export async function runLogs(args: string[]) { const prNumber = args[0]; diff --git a/extensions/workspaces/scripts/orchestrator.ts b/extensions/workspaces/scripts/orchestrator.ts index 041c5d4b28..c59c78f691 100644 --- a/extensions/workspaces/scripts/orchestrator.ts +++ b/extensions/workspaces/scripts/orchestrator.ts @@ -6,11 +6,11 @@ import { spawnSync } from 'node:child_process'; import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); function q(str: string) { return `'${str.replace(/'/g, "'\\''")}'`; diff --git a/extensions/workspaces/scripts/providers/ProviderFactory.ts b/extensions/workspaces/scripts/providers/ProviderFactory.ts index f48ffe056a..24c38c7b68 100644 --- a/extensions/workspaces/scripts/providers/ProviderFactory.ts +++ b/extensions/workspaces/scripts/providers/ProviderFactory.ts @@ -6,11 +6,11 @@ import { GceCosProvider } from './GceCosProvider.ts'; import type { WorkerProvider } from './BaseProvider.ts'; -import path from 'node:path'; -import { fileURLToPath } from 'node:url'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../../..'); + + + +const REPO_ROOT = process.cwd(); export class ProviderFactory { static getProvider(config: { diff --git a/extensions/workspaces/scripts/setup.ts b/extensions/workspaces/scripts/setup.ts index 2ebf090546..7803f186e7 100644 --- a/extensions/workspaces/scripts/setup.ts +++ b/extensions/workspaces/scripts/setup.ts @@ -2,7 +2,7 @@ import { spawnSync } from 'child_process'; import path from 'path'; import fs from 'fs'; import os from 'os'; -import { fileURLToPath } from 'url'; + import readline from 'readline'; import { ProviderFactory } from './providers/ProviderFactory.ts'; diff --git a/extensions/workspaces/scripts/status.ts b/extensions/workspaces/scripts/status.ts index dc897aaf3e..5076763706 100644 --- a/extensions/workspaces/scripts/status.ts +++ b/extensions/workspaces/scripts/status.ts @@ -5,11 +5,11 @@ */ import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { ProviderFactory } from './providers/ProviderFactory.ts'; -const __dirname = path.dirname(fileURLToPath(import.meta.url)); -const REPO_ROOT = path.resolve(__dirname, '../../../..'); + +const REPO_ROOT = process.cwd(); async function runStatus(env: NodeJS.ProcessEnv = process.env) { const settingsPath = path.join(REPO_ROOT, '.gemini/workspaces/settings.json');