Skip to content

The open-source agent harness - the runtime layer that turns an LLM into a working agent.

Use `dev` suffix on app data dir to separate dev db from npx default path (#415)

Chirag Jainf18e67f70b6c
diff --git a/package.json b/package.json
index c54fe7d9b..b20d7606e 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,6 @@
"sdk:generate": "bash scripts/generate-sdk.sh",
"smoke:down": "docker compose down",
"smoke": "docker compose up --build --wait && node -e \"Promise.all([fetch('http://127.0.0.1:8791/healthz'), fetch('http://127.0.0.1:8791/')]).then(async ([health, ui]) => { if (!health.ok) throw new Error('healthz returned ' + health.status); const html = await ui.text(); if (!ui.ok || !html.includes('id=\\\"root\\\"')) throw new Error('UI did not return its app shell'); console.log('healthz and UI OK'); })\"",
- "prestandalone:dev:no-watch": "pnpm --filter @truefoundry/trueforge migrate:legacy-sqlite-path",
- "prestandalone:dev": "pnpm --filter @truefoundry/trueforge migrate:legacy-sqlite-path",
"standalone:dev:no-watch": "STANDALONE=true NODE_ENV=development pnpm --parallel --filter @truefoundry/trueforge --filter frontend dev:no-watch",
"standalone:dev": "STANDALONE=true NODE_ENV=development pnpm --parallel --filter @truefoundry/trueforge-core --filter @truefoundry/trueforge --filter frontend dev",
"standalone:start": "STANDALONE=true NODE_ENV=production pnpm --filter @truefoundry/trueforge start",
diff --git a/packages/trueforge/.env.example b/packages/trueforge/.env.example
index b110c2a9a..da8f1c21c 100644
--- a/packages/trueforge/.env.example
+++ b/packages/trueforge/.env.example
@@ -10,6 +10,9 @@
## server package directly (e.g. `node dist/main.js` or `tsx src/main.ts`).
## ---------------------------------------------------------------------------
+## Useful to configure the application data dir for different environments.
+APP_DATA_DIR_SUFFIX=dev
+
## HTTP port the server listens on. Optional, defaults to 8790.
PORT=8790
diff --git a/packages/trueforge/package.json b/packages/trueforge/package.json
index 5d86136aa..1790bf5da 100644
--- a/packages/trueforge/package.json
+++ b/packages/trueforge/package.json
@@ -42,7 +42,6 @@
"migrate": "NODE_OPTIONS='--conditions=trueforge-dev' STANDALONE=false tsx --env-file=.env src/db/postgres/migrate-cli.ts",
"openapi:write": "pnpm run build:gen && NODE_OPTIONS='--conditions=trueforge-dev' tsx --env-file=.env.test scripts/write-openapi.ts",
"pack:dry": "pnpm pack --dry-run",
- "migrate:legacy-sqlite-path": "node scripts/migrate-legacy-sqlite-path.mjs",
"predev:no-watch": "pnpm --filter @truefoundry/trueforge-core build:gen && pnpm run build:gen",
"predev": "pnpm --filter @truefoundry/trueforge-core build:gen && pnpm run build:gen",
"test:eventsub": "jest --config jest.eventsub.config.cjs",
diff --git a/packages/trueforge/scripts/migrate-legacy-sqlite-path.mjs b/packages/trueforge/scripts/migrate-legacy-sqlite-path.mjs
deleted file mode 100644
index b18f0fbb9..000000000
--- a/packages/trueforge/scripts/migrate-legacy-sqlite-path.mjs
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * One-shot migrate for the default standalone SQLite data dir rename:
- * env-paths("truefoundry-utils")/db/db.sqlite* → env-paths("trueforge")/db/db.sqlite*
- *
- * Assumes the earlier flat → `db/` layout move under truefoundry-utils already
- * ran for existing installs. This only relocates that `db/` tree to the new
- * app name.
- *
- * - No legacy `db/` files → noop.
- * - Destination already has db.sqlite + db.sqlite-shm + db.sqlite-wal → noop.
- * - Otherwise replace destination `db/` by copying, then best-effort delete
- * the legacy copies (warn only if delete fails).
- *
- * Used by root `prestandalone:dev` / `:no-watch`.
- */
-import { copyFileSync, existsSync, mkdirSync, readdirSync, rmSync, unlinkSync } from 'node:fs';
-import path from 'node:path';
-
-import envPaths from 'env-paths';
-
-const LEGACY_ENV_PATHS_APP_NAME = 'truefoundry-utils';
-const ENV_PATHS_APP_NAME = 'trueforge';
-const SQLITE_BASENAME = 'db.sqlite';
-const COMPLETE_DEST_FILES = ['db.sqlite', 'db.sqlite-shm', 'db.sqlite-wal'];
-
-function isSqliteFileName(name) {
- return name === SQLITE_BASENAME || name.startsWith(`${SQLITE_BASENAME}-`);
-}
-
-const legacyDataDir = envPaths(LEGACY_ENV_PATHS_APP_NAME, { suffix: '' }).data;
-const legacyDbDir = path.join(legacyDataDir, 'db');
-if (!existsSync(legacyDbDir)) {
- process.exit(0);
-}
-
-const legacyNames = readdirSync(legacyDbDir).filter(isSqliteFileName);
-if (legacyNames.length === 0) {
- process.exit(0);
-}
-
-const newDbDir = path.join(envPaths(ENV_PATHS_APP_NAME, { suffix: '' }).data, 'db');
-if (COMPLETE_DEST_FILES.every(name => existsSync(path.join(newDbDir, name)))) {
- process.exit(0);
-}
-
-rmSync(newDbDir, { recursive: true, force: true });
-mkdirSync(newDbDir, { recursive: true });
-
-for (const name of legacyNames) {
- const source = path.join(legacyDbDir, name);
- const destination = path.join(newDbDir, name);
- console.log(`Moving ${source} → ${destination}`);
- copyFileSync(source, destination);
-}
-
-for (const name of legacyNames) {
- const source = path.join(legacyDbDir, name);
- try {
- unlinkSync(source);
- } catch (error) {
- console.warn(`Could not remove legacy ${source}:`, error instanceof Error ? error.message : error);
- }
-}
-
-try {
- if (existsSync(legacyDbDir) && readdirSync(legacyDbDir).length === 0) {
- rmSync(legacyDbDir, { recursive: true, force: true });
- }
-} catch (error) {
- console.warn(`Could not remove empty legacy dir ${legacyDbDir}:`, error instanceof Error ? error.message : error);
-}
diff --git a/packages/trueforge/src/config.ts b/packages/trueforge/src/config.ts
index 5efb90e46..b809ca0e8 100644
--- a/packages/trueforge/src/config.ts
+++ b/packages/trueforge/src/config.ts
@@ -159,18 +159,17 @@ function resolveOptionalPathEnv(envKey: string): string | undefined {
* Absolute SQLite file path for standalone mode.
* Env: `SQLITE_PATH` (optional). Default: `{env-paths data}/db/db.sqlite`.
*/
-function resolveSqlitePath(): string {
+function resolveSqlitePath(appDataDir: string): string {
const override = getEnv('SQLITE_PATH');
if (override !== undefined && override.trim() !== '') {
return path.resolve(override);
}
- const paths = envPaths(ENV_PATHS_APP_NAME, { suffix: '' });
- return path.join(paths.data, 'db', 'db.sqlite');
+ return path.join(appDataDir, 'db', 'db.sqlite');
}
/** Parent for local sandbox roots. Same env-paths data dir as SQLite (`{suffix:''}`). */
-function resolveLocalSandboxRootParent(): string {
- return path.join(envPaths(ENV_PATHS_APP_NAME, { suffix: '' }).data, 'sandboxes');
+function resolveLocalSandboxRootParent(appDataDir: string): string {
+ return path.join(appDataDir, 'sandboxes');
}
/** Short tmp parent for Code Mode UDS socks (≤65 bytes after realpath). */
@@ -478,6 +477,9 @@ const standalone = parseBoolean({
defaultValue: true,
});
+const appDataDirSuffix = getEnv('APP_DATA_DIR_SUFFIX', { defaultValue: '' }) ?? '';
+const appDataDir = envPaths(ENV_PATHS_APP_NAME, { suffix: appDataDirSuffix }).data;
+
const port = parsePort(getEnv('PORT'));
const host = getEnv('HOST', { defaultValue: DEFAULT_HOST }) ?? DEFAULT_HOST;
@@ -563,8 +565,8 @@ const configuration: ServerConfiguration = standalone
? {
...shared,
STANDALONE: true,
- SQLITE_PATH: resolveSqlitePath(),
- LOCAL_SANDBOX_ROOT_PARENT: resolveLocalSandboxRootParent(),
+ SQLITE_PATH: resolveSqlitePath(appDataDir),
+ LOCAL_SANDBOX_ROOT_PARENT: resolveLocalSandboxRootParent(appDataDir),
CODE_MODE_SOCKET_PARENT: resolveCodeModeSocketParent(),
}
: {