Skip to content
Closed
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
482 changes: 482 additions & 0 deletions .plans/11-centralized-sqlite-persistence-revamp.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions .plans/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@
8. `08-precommit-format-and-lint.md`
9. `09-event-state-test-expansion.md`
10. `10-unify-process-session-abstraction.md`
11. `11-centralized-sqlite-persistence-revamp.md`
52 changes: 45 additions & 7 deletions apps/desktop/src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,48 @@ function backendEnv(): NodeJS.ProcessEnv {
};
}

function resolveBackendLaunch(backendEntry: string): {
command: string;
args: string[];
env: NodeJS.ProcessEnv;
} {
const runtimeOverride = process.env.T3CODE_BACKEND_RUNTIME?.trim();
if (runtimeOverride && runtimeOverride.length > 0) {
if (runtimeOverride === "electron-node") {
return {
command: process.execPath,
args: [backendEntry],
env: {
...backendEnv(),
ELECTRON_RUN_AS_NODE: "1",
},
};
}
return {
command: runtimeOverride,
args: [backendEntry],
env: backendEnv(),
};
}

if (isDevelopment) {
return {
command: "bun",
args: [backendEntry],
env: backendEnv(),
};
}

return {
command: process.execPath,
args: [backendEntry],
env: {
...backendEnv(),
ELECTRON_RUN_AS_NODE: "1",
},
};
}

function scheduleBackendRestart(reason: string): void {
if (isQuitting || restartTimer) return;

Expand All @@ -322,14 +364,10 @@ function startBackend(): void {
return;
}

const child = spawn(process.execPath, [backendEntry], {
const launch = resolveBackendLaunch(backendEntry);
const child = spawn(launch.command, launch.args, {
cwd: resolveBackendCwd(),
// In Electron main, process.execPath points to the Electron binary.
// Run the child in Node mode so this backend process does not become a GUI app instance.
env: {
...backendEnv(),
ELECTRON_RUN_AS_NODE: "1",
},
env: launch.env,
stdio: "inherit",
});
backendProcess = child;
Expand Down
1 change: 1 addition & 0 deletions apps/server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"test": "vitest run"
},
"dependencies": {
"@pierre/diffs": "^1.1.0-beta.16",
"node-pty": "^1.1.0",
"open": "^10.1.0",
"ws": "^8.18.0"
Expand Down
22 changes: 17 additions & 5 deletions apps/server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { fileURLToPath } from "node:url";

import { fixPath } from "./fixPath";
import { createLogger } from "./logger";
import { ProjectRegistry } from "./projectRegistry";
import { PersistenceService } from "./persistenceService";
import { createServer } from "./wsServer";

fixPath();
Expand Down Expand Up @@ -49,6 +49,13 @@ function resolveStateDir(raw: string | undefined): string {
return path.resolve(expandHomePath(raw.trim()));
}

function resolveStateDbPath(raw: string | undefined): string {
if (!raw || raw.trim().length === 0) {
return path.join(os.homedir(), ".t3", "state.sqlite");
}
return path.resolve(expandHomePath(raw.trim()));
}

async function findAvailablePort(preferred: number): Promise<number> {
return new Promise((resolve, reject) => {
const server = net.createServer();
Expand Down Expand Up @@ -101,8 +108,12 @@ async function main() {
const requestedPort = parsePort(process.env.T3CODE_PORT);
const port =
requestedPort ?? (mode === "desktop" ? DEFAULT_PORT : await findAvailablePort(DEFAULT_PORT));
const stateDir = resolveStateDir(process.env.T3CODE_STATE_DIR);
const projectRegistry = new ProjectRegistry(stateDir);
const legacyStateDir = resolveStateDir(process.env.T3CODE_STATE_DIR);
const stateDbPath = resolveStateDbPath(process.env.T3CODE_STATE_DB_PATH);
const persistenceService = new PersistenceService({
dbPath: stateDbPath,
legacyProjectsJsonPath: path.join(legacyStateDir, "projects.json"),
});
const devUrl = process.env.VITE_DEV_SERVER_URL;
const noBrowser = parseBooleanEnv(process.env.T3CODE_NO_BROWSER) ?? mode === "desktop";
const authToken = process.env.T3CODE_AUTH_TOKEN;
Expand All @@ -120,7 +131,7 @@ async function main() {
cwd,
staticDir,
devUrl,
projectRegistry,
persistenceService,
authToken,
});
await server.start();
Expand All @@ -130,7 +141,8 @@ async function main() {
url,
cwd,
mode,
stateDir,
stateDbPath,
legacyStateDir,
authEnabled: Boolean(authToken),
});

Expand Down
Loading