@getpaseo/server 0.1.97-beta.3 → 0.1.98

package/dist/server/server/managed-processes/managed-processes.d.ts

@@ -0,0 +1,76 @@
+import type { Logger } from "pino";
+import type { ProcessTerminator, TreeKillTarget } from "../../utils/tree-kill.js";
+export interface ManagedProcessSnapshot {
+    pid: number;
+    commandLine: string | null;
+    startedAt: string | null;
+}
+export type ManagedProcessInspection = {
+    status: "alive";
+    snapshot: ManagedProcessSnapshot;
+} | {
+    status: "not-found";
+} | {
+    status: "error";
+    error: unknown;
+};
+export interface ManagedProcessTable {
+    inspect(pid: number): Promise<ManagedProcessInspection>;
+}
+export interface ManagedProcessCommandRunner {
+    exec(command: string, args: string[]): Promise<{
+        stdout: string;
+        stderr: string;
+    }>;
+}
+export interface ManagedProcessOwner {
+    provider: string;
+    kind: string;
+}
+export interface ManagedProcessRecordInput {
+    owner: ManagedProcessOwner;
+    pid: number;
+    command: string;
+    args: string[];
+    metadata?: Record<string, unknown>;
+}
+export interface ManagedProcessRecord extends ManagedProcessRecordInput {
+    id: string;
+    metadata: Record<string, unknown>;
+    identity: {
+        commandLine: string | null;
+        startedAt: string | null;
+    };
+    createdAt: string;
+}
+export interface ManagedProcessReapResult {
+    checked: number;
+    dead: number;
+    mismatched: number;
+    removed: number;
+    terminated: number;
+    errors: Array<{
+        id: string;
+        message: string;
+    }>;
+}
+export interface ManagedProcessRegistry {
+    record(input: ManagedProcessRecordInput): Promise<ManagedProcessRecord>;
+    remove(id: string): Promise<void>;
+    list(): Promise<ManagedProcessRecord[]>;
+    reapStale(): Promise<ManagedProcessReapResult>;
+}
+interface ManagedProcessRegistryOptions {
+    paseoHome: string;
+    processTable: ManagedProcessTable;
+    terminateProcess: ProcessTerminator;
+    logger: Logger;
+}
+export declare function createManagedProcessRegistry(options: ManagedProcessRegistryOptions): ManagedProcessRegistry;
+export declare function createSystemManagedProcessTable(options?: {
+    platform?: NodeJS.Platform;
+    commandRunner?: ManagedProcessCommandRunner;
+}): ManagedProcessTable;
+export declare function createPidTarget(pid: number): TreeKillTarget;
+export {};
+//# sourceMappingURL=managed-processes.d.ts.map

package/dist/server/server/managed-processes/managed-processes.js

@@ -0,0 +1,326 @@
+import { randomUUID } from "node:crypto";
+import { promises as fs } from "node:fs";
+import path from "node:path";
+import { z } from "zod";
+import { writeJsonFileAtomic } from "../atomic-file.js";
+import { execCommand } from "../../utils/spawn.js";
+const MANAGED_PROCESS_GRACEFUL_SHUTDOWN_TIMEOUT_MS = 5000;
+const MANAGED_PROCESS_FORCE_SHUTDOWN_TIMEOUT_MS = 1000;
+const MANAGED_PROCESS_EXIT_POLL_INTERVAL_MS = 50;
+const MANAGED_PROCESS_ID_PATTERN = /^[a-zA-Z0-9_-]+$/;
+// `ps -o lstart` emits a fixed-width 24-char ctime stamp, e.g. "Sat Jun 20 10:30:40 2026".
+const POSIX_LSTART_WIDTH = 24;
+const ManagedProcessRecordSchema = z.object({
+    id: z.string().min(1),
+    owner: z.object({
+        provider: z.string().min(1),
+        kind: z.string().min(1),
+    }),
+    pid: z.number().int().positive(),
+    command: z.string().min(1),
+    args: z.array(z.string()),
+    metadata: z.record(z.string(), z.unknown()).default({}),
+    identity: z.object({
+        commandLine: z.string().nullable(),
+        startedAt: z.string().nullable(),
+    }),
+    createdAt: z.string().min(1),
+});
+const WindowsProcessSnapshotSchema = z.object({
+    ProcessId: z.number().int().positive(),
+    CommandLine: z.string().nullable().optional(),
+    CreationDate: z.string().nullable().optional(),
+});
+export function createManagedProcessRegistry(options) {
+    return new FileBackedManagedProcessRegistry(options);
+}
+export function createSystemManagedProcessTable(options) {
+    return new SystemManagedProcessTable({
+        platform: options?.platform ?? process.platform,
+        commandRunner: options?.commandRunner ?? {
+            exec: execCommand,
+        },
+    });
+}
+class SystemManagedProcessTable {
+    constructor(options) {
+        this.platform = options.platform;
+        this.commandRunner = options.commandRunner;
+    }
+    async inspect(pid) {
+        if (!Number.isInteger(pid) || pid <= 0) {
+            return { status: "not-found" };
+        }
+        try {
+            return this.platform === "win32"
+                ? await this.inspectWindows(pid)
+                : await this.inspectPosix(pid);
+        }
+        catch (error) {
+            return { status: "error", error };
+        }
+    }
+    async inspectPosix(pid) {
+        let stdout;
+        try {
+            ({ stdout } = await this.commandRunner.exec("ps", [
+                "-ww",
+                "-p",
+                String(pid),
+                "-o",
+                "lstart=",
+                "-o",
+                "command=",
+            ]));
+        }
+        catch (error) {
+            // `ps -p <pid>` exits non-zero when no process matches the pid; a numeric
+            // exit code means ps ran and found nothing, distinct from ps failing to run.
+            return isCommandExitFailure(error) ? { status: "not-found" } : { status: "error", error };
+        }
+        const line = stdout.trimEnd();
+        if (!line) {
+            return { status: "not-found" };
+        }
+        const startedAt = line.slice(0, POSIX_LSTART_WIDTH).trim();
+        const commandLine = line.slice(POSIX_LSTART_WIDTH).trim();
+        return {
+            status: "alive",
+            snapshot: {
+                pid,
+                commandLine: commandLine || null,
+                startedAt: startedAt || null,
+            },
+        };
+    }
+    async inspectWindows(pid) {
+        const command = [
+            `$process = Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}';`,
+            "if ($process) { $process | Select-Object ProcessId,CommandLine,CreationDate | ConvertTo-Json -Compress }",
+        ].join(" ");
+        const { stdout } = await this.commandRunner.exec("powershell.exe", [
+            "-NoProfile",
+            "-NonInteractive",
+            "-Command",
+            command,
+        ]);
+        const trimmed = stdout.trim();
+        if (!trimmed) {
+            return { status: "not-found" };
+        }
+        const parsed = WindowsProcessSnapshotSchema.parse(JSON.parse(trimmed));
+        return {
+            status: "alive",
+            snapshot: {
+                pid,
+                commandLine: parsed.CommandLine ?? null,
+                startedAt: parsed.CreationDate ?? null,
+            },
+        };
+    }
+}
+class FileBackedManagedProcessRegistry {
+    constructor(options) {
+        this.directory = path.join(options.paseoHome, "runtime", "managed-processes");
+        this.processTable = options.processTable;
+        this.terminateProcess = options.terminateProcess;
+        this.logger = options.logger.child({ module: "managed-processes" });
+    }
+    async record(input) {
+        const inspection = await this.processTable.inspect(input.pid);
+        const snapshot = inspection.status === "alive" ? inspection.snapshot : null;
+        const record = {
+            id: randomUUID(),
+            owner: input.owner,
+            pid: input.pid,
+            command: input.command,
+            args: input.args,
+            metadata: input.metadata ?? {},
+            identity: {
+                commandLine: snapshot?.commandLine ?? null,
+                startedAt: snapshot?.startedAt ?? null,
+            },
+            createdAt: new Date().toISOString(),
+        };
+        await writeJsonFileAtomic(this.recordPath(record.id), record);
+        return record;
+    }
+    async remove(id) {
+        await fs.rm(this.recordPath(id), { force: true });
+    }
+    async list() {
+        const entries = await this.readEntries();
+        return entries.map((entry) => entry.record);
+    }
+    async reapStale() {
+        const result = {
+            checked: 0,
+            dead: 0,
+            mismatched: 0,
+            removed: 0,
+            terminated: 0,
+            errors: [],
+        };
+        for (const entry of await this.readEntries()) {
+            result.checked += 1;
+            try {
+                const inspection = await this.processTable.inspect(entry.record.pid);
+                if (inspection.status === "not-found") {
+                    await fs.rm(entry.path, { force: true });
+                    result.dead += 1;
+                    result.removed += 1;
+                    continue;
+                }
+                if (inspection.status === "error") {
+                    // Inspection failed, so we cannot tell whether the helper is still
+                    // alive. Keep the record and retry on the next reconcile rather than
+                    // orphaning a live process by deleting its record without killing it.
+                    const message = inspection.error instanceof Error ? inspection.error.message : String(inspection.error);
+                    result.errors.push({ id: entry.record.id, message });
+                    this.logger.warn({
+                        err: inspection.error,
+                        id: entry.record.id,
+                        pid: entry.record.pid,
+                        owner: entry.record.owner,
+                    }, "Could not inspect managed helper process; leaving record for next reconcile");
+                    continue;
+                }
+                const snapshot = inspection.snapshot;
+                if (!processIdentityMatches(entry.record, snapshot)) {
+                    await fs.rm(entry.path, { force: true });
+                    result.mismatched += 1;
+                    result.removed += 1;
+                    continue;
+                }
+                await this.terminateProcess(createPidTarget(entry.record.pid), {
+                    gracefulTimeoutMs: MANAGED_PROCESS_GRACEFUL_SHUTDOWN_TIMEOUT_MS,
+                    forceTimeoutMs: MANAGED_PROCESS_FORCE_SHUTDOWN_TIMEOUT_MS,
+                    onForceSignal: () => {
+                        this.logger.warn({
+                            pid: entry.record.pid,
+                            owner: entry.record.owner,
+                            timeoutMs: MANAGED_PROCESS_GRACEFUL_SHUTDOWN_TIMEOUT_MS,
+                        }, "Managed helper process did not exit after SIGTERM; sending SIGKILL");
+                    },
+                });
+                await fs.rm(entry.path, { force: true });
+                result.terminated += 1;
+                result.removed += 1;
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                result.errors.push({ id: entry.record.id, message });
+                this.logger.warn({ err: error, id: entry.record.id, pid: entry.record.pid, owner: entry.record.owner }, "Failed to reap managed helper process");
+            }
+        }
+        return result;
+    }
+    recordPath(id) {
+        if (!MANAGED_PROCESS_ID_PATTERN.test(id)) {
+            throw new Error(`Invalid managed process record id: ${id}`);
+        }
+        return path.join(this.directory, `${id}.json`);
+    }
+    async readEntries() {
+        let fileNames;
+        try {
+            fileNames = await fs.readdir(this.directory);
+        }
+        catch (error) {
+            if (isNodeErrorWithCode(error, "ENOENT")) {
+                return [];
+            }
+            throw error;
+        }
+        const entries = [];
+        for (const fileName of fileNames) {
+            if (!fileName.endsWith(".json")) {
+                continue;
+            }
+            const filePath = path.join(this.directory, fileName);
+            try {
+                const raw = await fs.readFile(filePath, "utf8");
+                const parsed = ManagedProcessRecordSchema.parse(JSON.parse(raw));
+                entries.push({ path: filePath, record: parsed });
+            }
+            catch (error) {
+                // A single corrupt or partially-written record must not abort the whole
+                // reconcile and leave every other leftover un-reaped. Skip it.
+                this.logger.warn({ err: error, file: fileName }, "Skipping unreadable managed process record");
+            }
+        }
+        return entries;
+    }
+}
+function processIdentityMatches(record, snapshot) {
+    if (record.identity.startedAt && snapshot.startedAt) {
+        if (record.identity.startedAt !== snapshot.startedAt) {
+            return false;
+        }
+        return snapshot.commandLine ? commandLineMatchesRecord(record, snapshot.commandLine) : true;
+    }
+    if (record.identity.commandLine && snapshot.commandLine) {
+        return (normalizeCommandLine(record.identity.commandLine) ===
+            normalizeCommandLine(snapshot.commandLine));
+    }
+    return snapshot.commandLine ? commandLineMatchesRecord(record, snapshot.commandLine) : false;
+}
+function commandLineMatchesRecord(record, commandLine) {
+    // Require the command name and args as one contiguous run, not scattered
+    // tokens. Without exact process identity (lstart), a reused PID whose command
+    // line merely mentions "opencode", "serve" and the port elsewhere must not be
+    // mistaken for our leftover and killed.
+    const normalized = normalizeCommandLine(commandLine);
+    const commandName = path.basename(record.command).toLowerCase();
+    const signature = [commandName, ...record.args].map((token) => token.toLowerCase()).join(" ");
+    return normalized.includes(signature);
+}
+function normalizeCommandLine(commandLine) {
+    return commandLine.replace(/\s+/g, " ").trim().toLowerCase();
+}
+export function createPidTarget(pid) {
+    return {
+        pid,
+        exitCode: null,
+        signalCode: null,
+        kill(signal) {
+            process.kill(pid, signal);
+            return true;
+        },
+        // The reaper has no ChildProcess handle for a leftover from a previous
+        // daemon, so it observes exit by polling the pid. Without this, termination
+        // can never see a graceful SIGTERM exit and always waits out the full
+        // graceful+force window before escalating to SIGKILL.
+        once(_event, listener) {
+            const timer = setInterval(() => {
+                if (!isProcessAlive(pid)) {
+                    clearInterval(timer);
+                    listener();
+                }
+            }, MANAGED_PROCESS_EXIT_POLL_INTERVAL_MS);
+            timer.unref();
+        },
+    };
+}
+function isProcessAlive(pid) {
+    try {
+        process.kill(pid, 0);
+        return true;
+    }
+    catch (error) {
+        return isNodeErrorWithCode(error, "EPERM");
+    }
+}
+function isCommandExitFailure(error) {
+    // execFile rejects with a numeric `code` (the process exit status) when the
+    // command ran and exited non-zero; a string `code` (e.g. "ENOENT") means it
+    // never ran.
+    return typeof error?.code === "number";
+}
+function isNodeErrorWithCode(error, code) {
+    return (typeof error === "object" &&
+        error !== null &&
+        "code" in error &&
+        error.code === code);
+}
+//# sourceMappingURL=managed-processes.js.map

package/dist/server/server/migrations/backfill-workspace-id.migration.js

@@ -12,16 +12,18 @@ import { resolve, sep } from "node:path";
 // Picks the workspace that owned `cwd` for a legacy, unstamped agent record.
 // Prefers an exact-cwd workspace (oldest wins) and otherwise attributes to the
 // deepest enclosing workspace directory, never letting the home directory own
-// descendants. Used only by the one-time backfill below.
-function resolveLegacyWorkspaceOwner(cwd, workspaces) {
+// descendants. Live records only consider live workspaces; archived records can
+// resolve to archived workspaces so History/restore retains legacy ownership.
+// Used only by the one-time backfill below.
+function resolveLegacyWorkspaceOwner(cwd, workspaces, options) {
     const normalizedCwd = resolve(cwd);
     const userHome = resolve(homedir());
-    const activeWorkspaces = Array.from(workspaces).filter((workspace) => !workspace.archivedAt);
-    const exactMatches = activeWorkspaces.filter((workspace) => resolve(workspace.cwd) === normalizedCwd);
+    const candidateWorkspaces = Array.from(workspaces).filter((workspace) => options?.includeArchived === true || !workspace.archivedAt);
+    const exactMatches = candidateWorkspaces.filter((workspace) => resolve(workspace.cwd) === normalizedCwd);
     if (exactMatches.length > 0) {
         return oldestWorkspace(exactMatches).workspaceId;
     }
-    const prefixMatches = activeWorkspaces.filter((workspace) => {
+    const prefixMatches = candidateWorkspaces.filter((workspace) => {
         const workspaceCwd = resolve(workspace.cwd);
         if (workspaceCwd === userHome) {
             return false;
@@ -45,7 +47,9 @@ export async function backfillWorkspaceIdForLegacyAgents(options) {
         if (record.workspaceId) {
             continue;
         }
-        const workspaceId = resolveLegacyWorkspaceOwner(record.cwd, workspaceRecords);
+        const workspaceId = resolveLegacyWorkspaceOwner(record.cwd, workspaceRecords, {
+            includeArchived: record.archivedAt != null,
+        });
         if (!workspaceId) {
             continue;
         }

package/dist/server/server/package-version.d.ts

@@ -6,13 +6,7 @@ interface ResolvePackageVersionParams {
 export declare const packageJsonSchema: z.ZodObject<{
     name: z.ZodOptional<z.ZodString>;
     version: z.ZodOptional<z.ZodString>;
-}, "strip", z.ZodTypeAny, {
-    name?: string | undefined;
-    version?: string | undefined;
-}, {
-    name?: string | undefined;
-    version?: string | undefined;
-}>;
+}, z.core.$strip>;
 export type PackageJson = z.infer<typeof packageJsonSchema>;
 export declare class PackageVersionResolutionError extends Error {
     constructor(params: {

package/dist/server/server/paseo-worktree-service.js

@@ -4,7 +4,7 @@ import { classifyDirectoryForProjectMembership, deriveProjectGroupingName, gener
 import { createWorktreeCore, } from "./worktree-core.js";
 import { validateBranchSlug } from "../utils/worktree.js";
 import { getCurrentBranch, localBranchExists, renameCurrentBranch } from "../utils/checkout-git.js";
-import { markPaseoWorktreeFirstAgentBranchAutoNameAttempted, readPaseoWorktreeMetadata, writePaseoWorktreeFirstAgentBranchAutoNameMetadata, } from "../utils/worktree-metadata.js";
+import { markPaseoWorktreeFirstAgentBranchAutoNameAttempted, normalizeBaseRefName, readPaseoWorktreeMetadata, writePaseoWorktreeFirstAgentBranchAutoNameMetadata, } from "../utils/worktree-metadata.js";
 import { resolveFirstAgentPromptTitle } from "./agent/create-agent-title.js";
 import { buildAgentBranchNameSeed } from "./agent/prompt-attachments.js";
 export async function createPaseoWorktree(input, deps) {
@@ -15,6 +15,7 @@ export async function createPaseoWorktree(input, deps) {
         projectId: input.projectId,
         repoRoot: createdWorktree.repoRoot,
         worktree: createdWorktree.worktree,
+        baseBranch: resolveIntentBaseBranch(createdWorktree.intent),
         title: resolveFirstAgentPromptTitle(input.firstAgentContext),
         deps,
     });
@@ -109,6 +110,18 @@ function maybeMarkFirstAgentBranchAutoNameEligible(options) {
         placeholderBranchName: createdWorktree.worktree.branchName,
     });
 }
+// The base branch is normalized to match worktree.json's baseRefName (origin/
+// stripped). checkout-branch worktrees have no distinct base, so they stay null.
+function resolveIntentBaseBranch(intent) {
+    switch (intent.kind) {
+        case "branch-off":
+            return normalizeBaseRefName(intent.baseBranch);
+        case "checkout-github-pr":
+            return normalizeBaseRefName(intent.baseRefName);
+        case "checkout-branch":
+            return null;
+    }
+}
 async function upsertWorkspaceForWorktree(options) {
     const normalizedCwd = resolve(options.worktree.worktreePath);
     const normalizedInputCwd = resolve(options.inputCwd);
@@ -142,6 +155,7 @@ async function upsertWorkspaceForWorktree(options) {
         kind: "worktree",
         displayName: options.worktree.branchName || normalizedCwd,
         branch: options.worktree.branchName || null,
+        baseBranch: options.baseBranch ?? null,
         title: options.title ?? null,
         createdAt: now,
         updatedAt: now,