Skip to content

fix(server): skip file initialization for remote workspaces #2070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AllenSHH wants to merge 1 commit into
base: dev
Choose a base branch
from
+14 −8
Open

fix(server): skip file initialization for remote workspaces #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/server/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,18 @@ let managedOpencode: ManagedOpencodeServer | null = null;

if (!config.readOnly) {
for (const workspace of config.workspaces) {
if (workspace.workspaceType === "remote") {
continue;
}
await ensureWorkspaceFiles(workspace.path, workspace.preset ?? "starter");
}
}

if (!config.opencodeBaseUrl && process.env.OPENWORK_MANAGE_OPENCODE === "1") {
const workspace = config.workspaces[0];
if (workspace?.path) {
const localWorkspace = config.workspaces.find((w) => w.workspaceType !== "remote" && w.path);
const managedOpencodeCwd = process.env.OPENWORK_MANAGED_OPENCODE_CWD?.trim() || localWorkspace?.path;
if (managedOpencodeCwd) {
const openworkRuntimeConfig = buildOpenworkRuntimeConfig();
const managedOpencodeCwd = process.env.OPENWORK_MANAGED_OPENCODE_CWD?.trim() || workspace.path;
await mkdir(managedOpencodeCwd, { recursive: true });
managedOpencode = await createManagedOpencodeServer({
bin: process.env.OPENWORK_OPENCODE_BIN,
Expand Down
13 changes: 8 additions & 5 deletions apps/server/src/embedded.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,20 @@ export async function startEmbeddedServer(options: EmbeddedServerOptions): Promi

if (!config.readOnly) {
for (const workspace of config.workspaces) {
if (workspace.workspaceType === "remote") {
continue;
}
await ensureWorkspaceFiles(workspace.path, workspace.preset ?? "starter");
}
}

if (!config.opencodeBaseUrl && options.manageOpencode) {
const workspace = config.workspaces[0];
if (workspace?.path) {
const localWorkspace = config.workspaces.find((w) => w.workspaceType !== "remote" && w.path);
const cwd = options.opencodeCwd
|| process.env.OPENWORK_MANAGED_OPENCODE_CWD?.trim()
|| localWorkspace?.path;
if (cwd) {
const openworkRuntimeConfig = buildOpenworkRuntimeConfig();
const cwd = options.opencodeCwd
|| process.env.OPENWORK_MANAGED_OPENCODE_CWD?.trim()
|| workspace.path;
await mkdir(cwd, { recursive: true });

managedOpencode = await createManagedOpencodeServer({
Expand Down