MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-07-03 06:37:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

feat(workspaces): unify paths and remove redundant worktree repair

Browse Source
This commit is contained in:
mkorwel
2026-03-19 01:07:38 -07:00
parent 80a54318ec
commit b8343150bb
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gemini/skills/workspaces/scripts/orchestrator.ts
+3 -8
View File
@@ -48,10 +48,9 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
// 2. Wake Worker & Verify Container
await provider.ensureReady();
// Paths
const hostWorkspaceRoot = `/mnt/disks/data`;
// Paths - Unified across host and container
const hostWorkspaceRoot = `/home/node/.workspaces`;
const hostWorkDir = `${hostWorkspaceRoot}/main`;
const containerHome = '/home/node';
const containerWorkspaceRoot = `/home/node/.workspaces`;
const remotePolicyPath = `${containerWorkspaceRoot}/policies/workspace-policy.toml`;
@@ -68,7 +67,7 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
// FIX: Ensure container user (node) owns the workspaces directories
console.log(' - Synchronizing container permissions...');
await provider.exec(`sudo chown -R 1000:1000 /mnt/disks/data`);
await provider.exec(`sudo chown -R 1000:1000 /home/node/.workspaces`);
if (check.status !== 0) {
console.log(` - Provisioning isolated git worktree for ${prNumber}...`);
@@ -100,10 +99,6 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
console.log(' ✅ Remote worktree ready.');
}
// REPAIR: Git worktrees use absolute paths. If the host and container paths differ, they break.
console.log(' - Repairing remote worktree context...');
await provider.exec(`sudo docker exec maintainer-worker git -C ${remoteWorktreeDir} worktree repair ${containerWorkspaceRoot}/main`);
// AUTH: Dynamically retrieve credentials from host-side config/disk
const remoteConfigPath = `${hostWorkspaceRoot}/gemini-cli-config/.gemini/settings.json`;
const remoteSettingsRes = await provider.getExecOutput(`cat ${remoteConfigPath}`);