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

fix(offload): restore path consistency with ~/.offload mounts

Browse Source
This commit is contained in:
mkorwel
2026-03-17 15:34:13 -07:00
parent bdf00c1d8c
commit 70b3e7c786
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gemini/skills/offload/scripts/orchestrator.ts
+14 -11
View File
@@ -31,18 +31,20 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
return 1; return 1;
} }
const { projectId, zone, remoteWorkDir } = config; const { projectId, zone } = config;
const targetVM = `gcli-offload-${env.USER || 'mattkorwel'}`; const targetVM = `gcli-offload-${env.USER || 'mattkorwel'}`;
const provider = ProviderFactory.getProvider({ projectId, zone, instanceName: targetVM }); const provider = ProviderFactory.getProvider({ projectId, zone, instanceName: targetVM });
// 2. Wake Worker // 2. Wake Worker & Verify Container
await provider.ensureReady(); await provider.ensureReady();
const remotePolicyPath = `~/.gemini/policies/offload-policy.toml`; // Use Absolute Container Paths to avoid ambiguity
const persistentScripts = `~/.offload/scripts`; const containerHome = '/home/node';
const remoteWorkDir = `${containerHome}/dev/main`;
const remotePolicyPath = `${containerHome}/.gemini/policies/offload-policy.toml`;
const persistentScripts = `${containerHome}/.offload/scripts`;
const sessionName = `offload-${prNumber}-${action}`; const sessionName = `offload-${prNumber}-${action}`;
const remoteWorktreeDir = `~/dev/worktrees/${sessionName}`; const remoteWorktreeDir = `${containerHome}/dev/worktrees/${sessionName}`;
// 3. Remote Context Setup (Parallel Worktree) // 3. Remote Context Setup (Parallel Worktree)
console.log(`🚀 Provisioning persistent worktree for ${action} on #${prNumber}...`); console.log(`🚀 Provisioning persistent worktree for ${action} on #${prNumber}...`);
@@ -51,14 +53,14 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
if (action === 'implement') { if (action === 'implement') {
const branchName = `impl-${prNumber}`; const branchName = `impl-${prNumber}`;
setupCmd = ` setupCmd = `
mkdir -p ~/dev/worktrees && \ mkdir -p ${containerHome}/dev/worktrees && \
cd ${remoteWorkDir} && \ cd ${remoteWorkDir} && \
git fetch upstream main && \ git fetch upstream main && \
git worktree add -f -b ${branchName} ${remoteWorktreeDir} upstream/main git worktree add -f -b ${branchName} ${remoteWorktreeDir} upstream/main
`; `;
} else { } else {
setupCmd = ` setupCmd = `
mkdir -p ~/dev/worktrees && \ mkdir -p ${containerHome}/dev/worktrees && \
cd ${remoteWorkDir} && \ cd ${remoteWorkDir} && \
git fetch upstream pull/${prNumber}/head && \ git fetch upstream pull/${prNumber}/head && \
git worktree add -f ${remoteWorktreeDir} FETCH_HEAD git worktree add -f ${remoteWorktreeDir} FETCH_HEAD
@@ -70,16 +72,17 @@ export async function runOrchestrator(args: string[], env: NodeJS.ProcessEnv = p
// 4. Execution Logic (Persistent Workstation Mode) // 4. Execution Logic (Persistent Workstation Mode)
const remoteWorker = `tsx ${persistentScripts}/entrypoint.ts ${prNumber} remote-branch ${remotePolicyPath} ${action}`; const remoteWorker = `tsx ${persistentScripts}/entrypoint.ts ${prNumber} remote-branch ${remotePolicyPath} ${action}`;
// We MUST ensure this entire block is interpreted as a SINGLE string passed to the container's shell // Launch tmux INSIDE the container
const remoteTmuxCmd = `tmux attach-session -t ${sessionName} 2>/dev/null || tmux new-session -s ${sessionName} -n 'offload' 'cd /home/node/dev/worktrees/${sessionName} && ${remoteWorker}; exec $SHELL'`; const remoteTmuxCmd = `tmux attach-session -t ${sessionName} 2>/dev/null || tmux new-session -s ${sessionName} -n 'offload' 'cd ${remoteWorktreeDir} && ${remoteWorker}; exec $SHELL'`;
const containerWrap = `sudo docker exec -it maintainer-worker sh -c ${q(remoteTmuxCmd)}`; const containerWrap = `sudo docker exec -it maintainer-worker sh -c ${q(remoteTmuxCmd)}`;
const finalSSH = provider.getRunCommand(containerWrap, { interactive: true }); const finalSSH = provider.getRunCommand(containerWrap, { interactive: true });
const isWithinGemini = !!env.GEMINI_CLI || !!env.GEMINI_SESSION_ID || !!env.GCLI_SESSION_ID; const isWithinGemini = !!env.GEMINI_CLI || !!env.GEMINI_SESSION_ID || !!env.GCLI_SESSION_ID;
const terminalTarget = config.terminalTarget || 'tab'; const terminalTarget = config.terminalTarget || 'tab';
const forceMainTerminal = true; // Stay in current terminal for E2E verification
if (isWithinGemini && env.TERM_PROGRAM === 'iTerm.app') { if (!forceMainTerminal && isWithinGemini && env.TERM_PROGRAM === 'iTerm.app') {
const tempCmdPath = path.join(process.env.TMPDIR || '/tmp', `offload-ssh-${prNumber}.sh`); const tempCmdPath = path.join(process.env.TMPDIR || '/tmp', `offload-ssh-${prNumber}.sh`);
fs.writeFileSync(tempCmdPath, `#!/bin/bash\n${finalSSH}\nrm "$0"`, { mode: 0o755 }); fs.writeFileSync(tempCmdPath, `#!/bin/bash\n${finalSSH}\nrm "$0"`, { mode: 0o755 });
.gemini/skills/offload/scripts/providers/GceCosProvider.ts
+2 -1
View File
@@ -78,11 +78,12 @@ export class GceCosProvider implements WorkerProvider {
-v ~/.offload:/home/node/.offload:rw \\ -v ~/.offload:/home/node/.offload:rw \\
-v ~/dev:/home/node/dev:rw \\ -v ~/dev:/home/node/dev:rw \\
-v ~/.gemini:/home/node/.gemini:rw \\ -v ~/.gemini:/home/node/.gemini:rw \\
${imageUri} /bin/bash -c "apt-get update && apt-get install -y tmux && while true; do sleep 1000; done" ${imageUri} /bin/bash -c "while true; do sleep 1000; done"
fi fi
echo "✅ Maintainer Worker is active." echo "✅ Maintainer Worker is active."
`; `;
const result = spawnSync('gcloud', [ const result = spawnSync('gcloud', [
'compute', 'instances', 'create', this.instanceName, 'compute', 'instances', 'create', this.instanceName,
'--project', this.projectId, '--project', this.projectId,