feat(path-b): dev_server.*, ship, autosave, idle-suspend (weeks 2-3)
Completes the rest of the Path B tool surface:
- dev_server.{start,stop,list,logs}: nohup processes inside the dev
container, track PID/port/preview-url in fs_dev_servers. Each gets
a randomized preview subdomain (preview.vibnai.com base; Traefik
wildcard wiring is staged in /vibn-dev/PREVIEWS.md but the Coolify
compose hot-update step is deferred — see file for the recommended
pre-allocated-port-range approach).
- ship: git init (if needed) -> add/commit/push to the project's
Gitea repo via the workspace bot PAT, then triggers a Coolify
production deploy if the project is linked to one. Returns push
output + deployment_uuid.
- /api/admin/path-b/autosave [POST { projectId | sweep:true }]:
force-pushes /workspace to vibn-autosave/main in Gitea. Throttled
to once per 5 min per project. Records every push in fs_dev_autosaves
for audit. Treat Gitea as canonical, container disk as ephemeral.
- /api/admin/path-b/idle-sweep [POST?minutes=30]: suspends every
running dev container whose last_active_at is older than `minutes`.
Wire to a 5-min cron. Idempotent.
- Compose template hardened: pull_policy: never (use locally-built
image, no registry round-trip) + per-project bridge network
(vibn-dev-net-<slug>) so dev containers can't reach internal Vibn
services.
- vibn-dev/setup-on-coolify.sh: one-shot script to build vibn-dev:latest
on the Coolify host. Run before first chat session uses Path B.
- vibn-tools.ts: dev_server_{start,stop,list,logs} + ship Gemini tool
defs added. Smoke test passes — 68 tool definitions accepted.
- MCP version 2.5.0 -> 2.6.0 so /api/mcp tells us when the new build
is live.
Plan doc updated to reflect what shipped vs what's still manual
(DNS wildcard, Traefik cert, build-on-host script run, gitea_file_*
hard-remove deferred to allow A/B).
Made-with: Cursor
This commit is contained in:
@@ -114,9 +114,20 @@ export async function getDevContainerRow(projectId: string): Promise<DevContaine
|
||||
* day 2 alongside the auto-push job.)
|
||||
*/
|
||||
function renderDevCompose(projectSlug: string): string {
|
||||
// Image distribution: we build vibn-dev on the Coolify host once
|
||||
// (see /vibn-dev/setup-on-coolify.sh) and reference it locally.
|
||||
// pull_policy: never tells Docker not to attempt a registry pull.
|
||||
//
|
||||
// Network isolation: vibn-dev sits on its OWN bridge network
|
||||
// (`vibn-dev-net`) which has no route to vibn-postgres, vibn-frontend,
|
||||
// or other workspace services. Egress to the public internet still
|
||||
// works via the bridge's default gateway. This is the cheapest way
|
||||
// to enforce the §7 "no internal Vibn access" guarantee without
|
||||
// touching iptables on the host.
|
||||
return `services:
|
||||
vibn-dev:
|
||||
image: ${VIBN_DEV_IMAGE}
|
||||
pull_policy: never
|
||||
restart: unless-stopped
|
||||
working_dir: /workspace
|
||||
volumes:
|
||||
@@ -125,11 +136,17 @@ function renderDevCompose(projectSlug: string): string {
|
||||
environment:
|
||||
- VIBN_PROJECT_SLUG=${projectSlug}
|
||||
- VIBN_DEV_CONTAINER=1
|
||||
networks:
|
||||
- vibn-dev-net
|
||||
deploy:
|
||||
resources:
|
||||
limits:
|
||||
cpus: '${DEFAULT_CPU_LIMIT}'
|
||||
memory: ${DEFAULT_MEM_LIMIT}
|
||||
networks:
|
||||
vibn-dev-net:
|
||||
name: vibn-dev-net-${projectSlug}
|
||||
driver: bridge
|
||||
volumes:
|
||||
workspace:
|
||||
cache:
|
||||
@@ -354,3 +371,318 @@ export async function getDevContainerStatus(projectId: string): Promise<{
|
||||
// Re-export getService so route handlers can pull live Coolify status
|
||||
// without taking a separate dependency on lib/coolify.
|
||||
export { getService };
|
||||
|
||||
// ── Dev servers ──────────────────────────────────────────────────────
|
||||
//
|
||||
// Long-running processes (Vite, Next dev, etc.) launched inside the
|
||||
// dev container. We don't have a real supervisor; we shell out to
|
||||
// `nohup`, redirect logs to /var/log/vibn-dev/<id>.log, and remember
|
||||
// the PID + port in fs_dev_servers so subsequent calls can stop or
|
||||
// list them.
|
||||
//
|
||||
// Preview URLs are exposed via Traefik's "host" router using the
|
||||
// internal Coolify network (the dev container's primary bridge IP is
|
||||
// reachable from Traefik). Full Traefik wildcard wiring lands in
|
||||
// /vibn-dev/PREVIEWS.md and a separate Traefik config commit; this
|
||||
// module just records the URL we WILL serve at, so the caller can
|
||||
// hand it back to the chat.
|
||||
|
||||
let devServersTableReady = false;
|
||||
async function ensureDevServersTable(): Promise<void> {
|
||||
if (devServersTableReady) return;
|
||||
await query(
|
||||
`CREATE TABLE IF NOT EXISTS fs_dev_servers (
|
||||
id TEXT PRIMARY KEY,
|
||||
project_id TEXT NOT NULL REFERENCES fs_project_dev_containers(project_id) ON DELETE CASCADE,
|
||||
workspace TEXT NOT NULL,
|
||||
name TEXT NOT NULL,
|
||||
command TEXT NOT NULL,
|
||||
port INTEGER NOT NULL,
|
||||
pid INTEGER,
|
||||
preview_url TEXT NOT NULL,
|
||||
state TEXT NOT NULL DEFAULT 'starting',
|
||||
started_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
||||
stopped_at TIMESTAMPTZ
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS fs_dev_servers_project_idx ON fs_dev_servers (project_id, state);`,
|
||||
[],
|
||||
);
|
||||
devServersTableReady = true;
|
||||
}
|
||||
|
||||
export interface DevServerRow {
|
||||
id: string;
|
||||
project_id: string;
|
||||
workspace: string;
|
||||
name: string;
|
||||
command: string;
|
||||
port: number;
|
||||
pid: number | null;
|
||||
preview_url: string;
|
||||
state: 'starting' | 'running' | 'stopped' | 'failed';
|
||||
started_at: Date;
|
||||
stopped_at: Date | null;
|
||||
}
|
||||
|
||||
const PREVIEW_DOMAIN_BASE =
|
||||
process.env.VIBN_PREVIEW_DOMAIN_BASE ?? 'preview.vibnai.com';
|
||||
|
||||
function randomToken(bytes = 4): string {
|
||||
const buf = Buffer.alloc(bytes);
|
||||
for (let i = 0; i < bytes; i++) buf[i] = Math.floor(Math.random() * 256);
|
||||
return buf.toString('hex');
|
||||
}
|
||||
|
||||
function buildPreviewUrl(projectSlug: string, name: string): string {
|
||||
// Random suffix per server so URLs aren't guessable. Subdomain is
|
||||
// <name>-<projectSlug>-<token>.<base> (kept under 63 chars for DNS).
|
||||
const safe = (s: string) => s.toLowerCase().replace(/[^a-z0-9-]/g, '-').slice(0, 20);
|
||||
const sub = `${safe(name)}-${safe(projectSlug)}-${randomToken()}`;
|
||||
return `https://${sub}.${PREVIEW_DOMAIN_BASE}`;
|
||||
}
|
||||
|
||||
export interface StartDevServerOpts {
|
||||
projectId: string;
|
||||
projectSlug: string;
|
||||
command: string;
|
||||
port: number;
|
||||
name?: string;
|
||||
workspace: VibnWorkspace;
|
||||
}
|
||||
|
||||
export async function startDevServer(opts: StartDevServerOpts): Promise<DevServerRow> {
|
||||
await ensureDevServersTable();
|
||||
const id = `ds_${randomToken(6)}`;
|
||||
const name = opts.name ?? `port-${opts.port}`;
|
||||
const previewUrl = buildPreviewUrl(opts.projectSlug, name);
|
||||
const logFile = `/var/log/vibn-dev/${id}.log`;
|
||||
|
||||
// nohup the command, capture PID. We pin the listening interface to
|
||||
// 0.0.0.0 by injecting HOST=0.0.0.0 (handles Vite/Next/Express); we
|
||||
// also export PORT so frameworks that read it pick it up.
|
||||
const launch =
|
||||
`mkdir -p /var/log/vibn-dev && ` +
|
||||
`cd /workspace && ` +
|
||||
`nohup env HOST=0.0.0.0 PORT=${opts.port} VIBN_DEV_SERVER_ID=${id} ` +
|
||||
`bash -lc ${shellEscape(opts.command)} > ${logFile} 2>&1 & ` +
|
||||
`echo $!`;
|
||||
|
||||
const result = await execInDevContainer({
|
||||
projectId: opts.projectId,
|
||||
command: launch,
|
||||
timeoutMs: 5_000,
|
||||
});
|
||||
const pid = parseInt(result.stdout.trim(), 10);
|
||||
|
||||
await query(
|
||||
`INSERT INTO fs_dev_servers
|
||||
(id, project_id, workspace, name, command, port, pid, preview_url, state)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
|
||||
[
|
||||
id,
|
||||
opts.projectId,
|
||||
opts.workspace.slug,
|
||||
name,
|
||||
opts.command,
|
||||
opts.port,
|
||||
Number.isFinite(pid) ? pid : null,
|
||||
previewUrl,
|
||||
'starting',
|
||||
],
|
||||
);
|
||||
|
||||
return {
|
||||
id,
|
||||
project_id: opts.projectId,
|
||||
workspace: opts.workspace.slug,
|
||||
name,
|
||||
command: opts.command,
|
||||
port: opts.port,
|
||||
pid: Number.isFinite(pid) ? pid : null,
|
||||
preview_url: previewUrl,
|
||||
state: 'starting',
|
||||
started_at: new Date(),
|
||||
stopped_at: null,
|
||||
};
|
||||
}
|
||||
|
||||
export async function listDevServers(projectId: string): Promise<DevServerRow[]> {
|
||||
await ensureDevServersTable();
|
||||
return query<DevServerRow>(
|
||||
`SELECT * FROM fs_dev_servers WHERE project_id = $1 AND state != 'stopped' ORDER BY started_at DESC`,
|
||||
[projectId],
|
||||
);
|
||||
}
|
||||
|
||||
export async function stopDevServer(projectId: string, id: string): Promise<void> {
|
||||
await ensureDevServersTable();
|
||||
const row = await queryOne<DevServerRow>(
|
||||
`SELECT * FROM fs_dev_servers WHERE id = $1 AND project_id = $2 LIMIT 1`,
|
||||
[id, projectId],
|
||||
);
|
||||
if (!row) throw new Error(`Dev server ${id} not found`);
|
||||
if (row.pid) {
|
||||
try {
|
||||
await execInDevContainer({
|
||||
projectId,
|
||||
command: `kill ${row.pid} 2>/dev/null || true`,
|
||||
timeoutMs: 3_000,
|
||||
});
|
||||
} catch {}
|
||||
}
|
||||
await query(
|
||||
`UPDATE fs_dev_servers SET state = 'stopped', stopped_at = now() WHERE id = $1`,
|
||||
[id],
|
||||
);
|
||||
}
|
||||
|
||||
export async function tailDevServerLog(
|
||||
projectId: string,
|
||||
id: string,
|
||||
lines = 200,
|
||||
): Promise<string> {
|
||||
const r = await execInDevContainer({
|
||||
projectId,
|
||||
command: `tail -n ${Math.max(1, Math.min(2000, lines))} /var/log/vibn-dev/${id}.log 2>/dev/null || echo '(no log yet)'`,
|
||||
timeoutMs: 5_000,
|
||||
});
|
||||
return r.stdout;
|
||||
}
|
||||
|
||||
// ── Auto-push autosave ───────────────────────────────────────────────
|
||||
//
|
||||
// Treats Gitea as the canonical store; the container disk is ephemeral.
|
||||
// On every chat turn (or every 5 min, whichever comes first) we push
|
||||
// /workspace to a `vibn-autosave/main` branch in the project's repo.
|
||||
//
|
||||
// We don't try to be clever about what changed — just `git add -A &&
|
||||
// git commit --allow-empty -m "autosave $(date)" && git push`. If the
|
||||
// repo doesn't exist yet (fresh project, no `git init` done), we skip
|
||||
// silently — the AI is responsible for `git init`+ first push when it
|
||||
// scaffolds.
|
||||
|
||||
export interface AutosaveOpts {
|
||||
projectId: string;
|
||||
projectSlug: string;
|
||||
workspace: VibnWorkspace;
|
||||
/** Repo name in the workspace's Gitea org. Defaults to projectSlug. */
|
||||
repo?: string;
|
||||
/** Min interval between autosaves (default 5 min). */
|
||||
minIntervalMs?: number;
|
||||
}
|
||||
|
||||
export async function autosaveWorkspace(opts: AutosaveOpts): Promise<{
|
||||
ran: boolean;
|
||||
reason: string;
|
||||
pushedAt?: Date;
|
||||
}> {
|
||||
const row = await getDevContainerRow(opts.projectId);
|
||||
if (!row) return { ran: false, reason: 'no dev container' };
|
||||
if (row.state !== 'running') return { ran: false, reason: `state=${row.state}` };
|
||||
|
||||
// Throttle: don't autosave more than once per minIntervalMs.
|
||||
const minInterval = opts.minIntervalMs ?? 5 * 60_000;
|
||||
const last = await queryOne<{ pushed_at: Date }>(
|
||||
`SELECT pushed_at FROM fs_dev_autosaves WHERE project_id = $1 ORDER BY pushed_at DESC LIMIT 1`,
|
||||
[opts.projectId],
|
||||
).catch(() => null);
|
||||
if (last && Date.now() - new Date(last.pushed_at).getTime() < minInterval) {
|
||||
return { ran: false, reason: 'throttled' };
|
||||
}
|
||||
|
||||
await ensureAutosavesTable();
|
||||
|
||||
// The git config + remote set-url is idempotent; PAT lives in the
|
||||
// container's .netrc. Initial scaffold (init+add+commit+remote add)
|
||||
// runs only when the repo doesn't have git yet.
|
||||
const repo = opts.repo ?? opts.projectSlug;
|
||||
const cmd = `set -e
|
||||
cd /workspace
|
||||
if [ ! -d .git ]; then
|
||||
echo '(no .git, skipping autosave)'
|
||||
exit 0
|
||||
fi
|
||||
git config user.email vibn-bot@vibnai.com
|
||||
git config user.name 'Vibn Autosave'
|
||||
# Force push to the autosave branch — never collides with main.
|
||||
git checkout -B vibn-autosave/main 2>&1 | tail -1
|
||||
git add -A
|
||||
if git diff --cached --quiet; then
|
||||
echo '(no changes)'
|
||||
else
|
||||
git commit -m "autosave $(date -Is)" --quiet
|
||||
fi
|
||||
git push -f origin vibn-autosave/main 2>&1 | tail -3`;
|
||||
|
||||
try {
|
||||
const r = await execInDevContainer({
|
||||
projectId: opts.projectId,
|
||||
command: cmd,
|
||||
timeoutMs: 30_000,
|
||||
});
|
||||
await query(
|
||||
`INSERT INTO fs_dev_autosaves (project_id, workspace, repo, output, code)
|
||||
VALUES ($1, $2, $3, $4, $5)`,
|
||||
[opts.projectId, opts.workspace.slug, repo, (r.stdout + r.stderr).slice(0, 4000), r.code],
|
||||
);
|
||||
return { ran: true, reason: 'pushed', pushedAt: new Date() };
|
||||
} catch (err) {
|
||||
return { ran: false, reason: err instanceof Error ? err.message : String(err) };
|
||||
}
|
||||
}
|
||||
|
||||
let autosavesTableReady = false;
|
||||
async function ensureAutosavesTable(): Promise<void> {
|
||||
if (autosavesTableReady) return;
|
||||
await query(
|
||||
`CREATE TABLE IF NOT EXISTS fs_dev_autosaves (
|
||||
id BIGSERIAL PRIMARY KEY,
|
||||
project_id TEXT NOT NULL,
|
||||
workspace TEXT NOT NULL,
|
||||
repo TEXT NOT NULL,
|
||||
output TEXT,
|
||||
code INTEGER,
|
||||
pushed_at TIMESTAMPTZ NOT NULL DEFAULT now()
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS fs_dev_autosaves_project_idx ON fs_dev_autosaves (project_id, pushed_at DESC);`,
|
||||
[],
|
||||
);
|
||||
autosavesTableReady = true;
|
||||
}
|
||||
|
||||
// ── Idle suspend ─────────────────────────────────────────────────────
|
||||
|
||||
export interface IdleSweepResult {
|
||||
scanned: number;
|
||||
suspended: Array<{ projectId: string; idleMin: number }>;
|
||||
errors: Array<{ projectId: string; error: string }>;
|
||||
}
|
||||
|
||||
/**
|
||||
* Suspend any running dev containers that haven't been touched in
|
||||
* `idleMinutes` minutes. Intended for a once-per-5-min cron. Idempotent:
|
||||
* re-running is a no-op for already-suspended containers.
|
||||
*/
|
||||
export async function suspendIdleContainers(idleMinutes = 30): Promise<IdleSweepResult> {
|
||||
await ensureDevContainersTable();
|
||||
const cutoff = new Date(Date.now() - idleMinutes * 60_000);
|
||||
const rows = await query<DevContainerRow>(
|
||||
`SELECT * FROM fs_project_dev_containers
|
||||
WHERE state = 'running' AND last_active_at < $1`,
|
||||
[cutoff],
|
||||
);
|
||||
const result: IdleSweepResult = { scanned: rows.length, suspended: [], errors: [] };
|
||||
for (const r of rows) {
|
||||
try {
|
||||
await suspendDevContainer(r.project_id);
|
||||
const idleMin = Math.floor((Date.now() - new Date(r.last_active_at).getTime()) / 60_000);
|
||||
result.suspended.push({ projectId: r.project_id, idleMin });
|
||||
} catch (err) {
|
||||
result.errors.push({
|
||||
projectId: r.project_id,
|
||||
error: err instanceof Error ? err.message : String(err),
|
||||
});
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user