@getpaseo/server 0.1.62 → 0.1.65

package/dist/server/server/workspace-registry-model.d.ts

@@ -1,18 +1,27 @@
 import type { ProjectCheckoutLitePayload, ProjectPlacementPayload } from "../shared/messages.js";
-import type { WorkspaceGitService } from "./workspace-git-service.js";
 import type { PersistedWorkspaceRecord } from "./workspace-registry.js";
 export type PersistedProjectKind = "git" | "non_git";
 export type PersistedWorkspaceKind = "local_checkout" | "worktree" | "directory";
-export type DetectStaleWorkspacesInput = {
+export interface DirectoryProjectMembership {
+    cwd: string;
+    checkout: ProjectCheckoutLitePayload;
+    workspaceId: string;
+    workspaceKind: PersistedWorkspaceKind;
+    workspaceDisplayName: string;
+    projectKey: string;
+    projectName: string;
+    projectRootPath: string;
+    projectKind: PersistedProjectKind;
+}
+export interface DetectStaleWorkspacesInput {
     activeWorkspaces: PersistedWorkspaceRecord[];
     checkDirectoryExists: (cwd: string) => Promise<boolean>;
-};
+}
 export declare function normalizeWorkspaceId(cwd: string): string;
 export declare function deriveWorkspaceId(cwd: string, checkout: ProjectCheckoutLitePayload): string;
 export declare function deriveProjectGroupingKey(options: {
     cwd: string;
     remoteUrl: string | null;
-    isPaseoOwnedWorktree: boolean;
     mainRepoRoot: string | null;
 }): string;
 export declare function deriveProjectGroupingName(projectKey: string): string;
@@ -37,6 +46,10 @@ export declare function checkoutLiteFromGitSnapshot(cwd: string, git: {
 export declare function detectStaleWorkspaces(input: DetectStaleWorkspacesInput): Promise<Set<string>>;
 export declare function buildProjectPlacementForCwd(input: {
     cwd: string;
-    workspaceGitService: WorkspaceGitService;
-}): Promise<ProjectPlacementPayload>;
+    checkout: ProjectCheckoutLitePayload;
+}): ProjectPlacementPayload;
+export declare function classifyDirectoryForProjectMembership(input: {
+    cwd: string;
+    checkout: ProjectCheckoutLitePayload;
+}): DirectoryProjectMembership;
 //# sourceMappingURL=workspace-registry-model.d.ts.map

package/dist/server/server/workspace-registry-model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-model.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEjG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAExE,MAAM,MAAM,oBAAoB,GAAG,KAAK,GAAG,SAAS,CAAC;AACrD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,UAAU,GAAG,WAAW,CAAC;AACjF,MAAM,MAAM,0BAA0B,GAAG;IACvC,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,GAAG,MAAM,CAG3F;AAiDD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG,MAAM,CAYT;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQpE;AAQD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAMT;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAKT;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,oBAAoB,CAE5F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,sBAAsB,CAKhG;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE;IACH,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GACA,0BAA0B,CAgC5B;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAWtB;AAED,wBAAsB,2BAA2B,CAAC,KAAK,EAAE;IACvD,GAAG,EAAE,MAAM,CAAC;IACZ,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C,GAAG,OAAO,CAAC,uBAAuB,CAAC,CAgCnC"}
+{"version":3,"file":"workspace-registry-model.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,uBAAuB,CAAC;AAEjG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAExE,MAAM,MAAM,oBAAoB,GAAG,KAAK,GAAG,SAAS,CAAC;AACrD,MAAM,MAAM,sBAAsB,GAAG,gBAAgB,GAAG,UAAU,GAAG,WAAW,CAAC;AAEjF,MAAM,WAAW,0BAA0B;IACzC,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,sBAAsB,CAAC;IACtC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,oBAAoB,CAAC;CACnC;AAED,MAAM,WAAW,0BAA0B;IACzC,gBAAgB,EAAE,wBAAwB,EAAE,CAAC;IAC7C,oBAAoB,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACzD;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAMxD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,0BAA0B,GAAG,MAAM,CAG3F;AAiDD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GAAG,MAAM,CAYT;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAQpE;AAQD,wBAAgB,0BAA0B,CAAC,KAAK,EAAE;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAMT;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE;IAC3C,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,MAAM,CAKT;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,oBAAoB,CAE5F;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,0BAA0B,GAAG,sBAAsB,CAKhG;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,EACX,GAAG,EAAE;IACH,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,oBAAoB,EAAE,OAAO,CAAC;IAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,GACA,0BAA0B,CAgC5B;AAED,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,0BAA0B,GAChC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAgBtB;AAED,wBAAgB,2BAA2B,CAAC,KAAK,EAAE;IACjD,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,uBAAuB,CAO1B;AAED,wBAAgB,qCAAqC,CAAC,KAAK,EAAE;IAC3D,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,0BAA0B,CAAC;CACtC,GAAG,0BAA0B,CA8B7B"}

package/dist/server/server/workspace-registry-model.js

@@ -58,7 +58,7 @@ export function deriveProjectGroupingKey(options) {
         return remoteKey;
     }
     const mainRepoRoot = options.mainRepoRoot?.trim();
-    if (options.isPaseoOwnedWorktree && mainRepoRoot) {
+    if (mainRepoRoot) {
         return mainRepoRoot;
     }
     return options.cwd;
@@ -84,7 +84,7 @@ export function deriveWorkspaceDisplayName(input) {
     return deriveWorkspaceDirectoryName(input.cwd);
 }
 export function deriveProjectRootPath(input) {
-    if (input.checkout.isGit && input.checkout.isPaseoOwnedWorktree) {
+    if (input.checkout.isGit && input.checkout.mainRepoRoot) {
         return input.checkout.mainRepoRoot;
     }
     return input.cwd;
@@ -96,7 +96,7 @@ export function deriveWorkspaceKind(checkout) {
     if (!checkout.isGit) {
         return "directory";
     }
-    return checkout.isPaseoOwnedWorktree ? "worktree" : "local_checkout";
+    return checkout.mainRepoRoot ? "worktree" : "local_checkout";
 }
 export function checkoutLiteFromGitSnapshot(cwd, git) {
     if (!git.isGit) {
@@ -128,43 +128,57 @@ export function checkoutLiteFromGitSnapshot(cwd, git) {
         remoteUrl: git.remoteUrl,
         worktreeRoot: git.repoRoot ?? cwd,
         isPaseoOwnedWorktree: false,
-        mainRepoRoot: null,
+        mainRepoRoot: git.mainRepoRoot,
     };
 }
 export async function detectStaleWorkspaces(input) {
     const staleWorkspaceIds = new Set();
-    for (const workspace of input.activeWorkspaces) {
-        const dirExists = await input.checkDirectoryExists(workspace.cwd);
-        if (!dirExists) {
+    const existenceChecks = await Promise.all(input.activeWorkspaces.map(async (workspace) => ({
+        workspace,
+        exists: await input.checkDirectoryExists(workspace.cwd),
+    })));
+    for (const { workspace, exists } of existenceChecks) {
+        if (!exists) {
             staleWorkspaceIds.add(workspace.workspaceId);
         }
     }
     return staleWorkspaceIds;
 }
-export async function buildProjectPlacementForCwd(input) {
+export function buildProjectPlacementForCwd(input) {
+    const membership = classifyDirectoryForProjectMembership(input);
+    return {
+        projectKey: membership.projectKey,
+        projectName: membership.projectName,
+        checkout: membership.checkout,
+    };
+}
+export function classifyDirectoryForProjectMembership(input) {
     const normalizedCwd = normalizeWorkspaceId(input.cwd);
-    const checkout = await input.workspaceGitService
-        .getSnapshot(normalizedCwd)
-        .then((snapshot) => checkoutLiteFromGitSnapshot(normalizedCwd, snapshot.git))
-        .catch(() => ({
+    const checkout = {
+        ...input.checkout,
         cwd: normalizedCwd,
-        isGit: false,
-        currentBranch: null,
-        remoteUrl: null,
-        worktreeRoot: null,
-        isPaseoOwnedWorktree: false,
-        mainRepoRoot: null,
-    }));
+    };
     const projectKey = deriveProjectGroupingKey({
         cwd: checkout.worktreeRoot ?? normalizedCwd,
         remoteUrl: checkout.remoteUrl,
-        isPaseoOwnedWorktree: checkout.isPaseoOwnedWorktree,
         mainRepoRoot: checkout.mainRepoRoot,
     });
     return {
+        cwd: normalizedCwd,
+        checkout,
+        workspaceId: deriveWorkspaceId(normalizedCwd, checkout),
+        workspaceKind: deriveWorkspaceKind(checkout),
+        workspaceDisplayName: deriveWorkspaceDisplayName({
+            cwd: normalizedCwd,
+            checkout,
+        }),
         projectKey,
         projectName: deriveProjectGroupingName(projectKey),
-        checkout,
+        projectRootPath: deriveProjectRootPath({
+            cwd: normalizedCwd,
+            checkout,
+        }),
+        projectKind: deriveProjectKind(checkout),
     };
 }
 //# sourceMappingURL=workspace-registry-model.js.map

package/dist/server/server/workspace-registry-model.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-registry-model.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-registry-model.js","sourceRoot":"","sources":["../../../src/server/workspace-registry-model.ts"],"names":[],"mappings":"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"}

package/dist/server/server/workspace-registry.d.ts

@@ -39,7 +39,7 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     cwd: string;
     createdAt: string;
     updatedAt: string;
-    kind: "directory" | "local_checkout" | "worktree";
+    kind: "worktree" | "directory" | "local_checkout";
     archivedAt: string | null;
     projectId: string;
     workspaceId: string;
@@ -48,7 +48,7 @@ declare const PersistedWorkspaceRecordSchema: z.ZodObject<{
     cwd: string;
     createdAt: string;
     updatedAt: string;
-    kind: "directory" | "local_checkout" | "worktree";
+    kind: "worktree" | "directory" | "local_checkout";
     archivedAt: string | null;
     projectId: string;
     workspaceId: string;

package/dist/server/server/workspace-script-runtime-store.d.ts

@@ -6,10 +6,10 @@ export interface ScriptRuntimeEntry {
     terminalId: string;
     exitCode: number | null;
 }
-type RuntimeEntryKey = {
+interface RuntimeEntryKey {
     workspaceId: string;
     scriptName: string;
-};
+}
 export declare class WorkspaceScriptRuntimeStore {
     private readonly entries;
     private readonly scriptsByWorkspace;

package/dist/server/server/workspace-script-runtime-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-script-runtime-store.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-script-runtime-store.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkC;IAErE,GAAG,CAAC,GAAG,EAAE,eAAe,GAAG,kBAAkB,GAAG,IAAI;IAKpD,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAYpC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAWlC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAqB3D,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO7C,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAIxC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;CAGvB"}
+{"version":3,"file":"workspace-script-runtime-store.d.ts","sourceRoot":"","sources":["../../../src/server/workspace-script-runtime-store.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,SAAS,EAAE,SAAS,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,2BAA2B;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAyC;IACjE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAkC;IAErE,GAAG,CAAC,GAAG,EAAE,eAAe,GAAG,kBAAkB,GAAG,IAAI;IAKpD,GAAG,CAAC,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAYpC,MAAM,CAAC,GAAG,EAAE,eAAe,GAAG,IAAI;IAWlC,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,kBAAkB,EAAE;IAqB3D,kBAAkB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAO7C,SAAS,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO;IAIxC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,8BAA8B;IAatC,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,cAAc;CAGvB"}

package/dist/server/server/workspace-service-env.js

@@ -68,9 +68,9 @@ export function assertNoServiceEnvNameCollisions(scriptNames) {
         scriptNamesByEnvName.set(envName, namesForEnvName);
     }
     const collisions = [];
-    for (const [envName, scriptNames] of scriptNamesByEnvName) {
-        if (scriptNames.length > 1) {
-            collisions.push(`Service env name collision for ${envName}: ${scriptNames.join(", ")}`);
+    for (const [envName, names] of scriptNamesByEnvName) {
+        if (names.length > 1) {
+            collisions.push(`Service env name collision for ${envName}: ${names.join(", ")}`);
         }
     }
     if (collisions.length > 0) {

package/dist/server/server/workspace-service-env.js.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-service-env.js","sourceRoot":"","sources":["../../../src/server/workspace-service-env.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workspace-service-env.js","sourceRoot":"","sources":["../../../src/server/workspace-service-env.ts"],"names":[],"mappings":"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"}

package/dist/server/server/worktree-bootstrap.d.ts

@@ -20,17 +20,17 @@ export interface RunAsyncWorktreeBootstrapOptions {
     emitLiveTimelineItem?: (item: AgentTimelineItem) => Promise<boolean>;
     logger?: Logger;
 }
-type MiddleTruncationAccumulator = {
+interface MiddleTruncationAccumulator {
     totalBytes: number;
     head: string;
     tail: string;
     truncated: boolean;
-};
+}
 export type WorktreeSetupOutputAccumulator = MiddleTruncationAccumulator;
-export type WorktreeSetupProgressAccumulator = {
+export interface WorktreeSetupProgressAccumulator {
     resultsByIndex: Map<number, WorktreeSetupCommandResult>;
     outputAccumulatorsByIndex: Map<number, WorktreeSetupOutputAccumulator>;
-};
+}
 export declare function createWorktreeSetupOutputAccumulator(): WorktreeSetupOutputAccumulator;
 export declare function appendWorktreeSetupOutputAccumulator(accumulator: WorktreeSetupOutputAccumulator, chunk: string): void;
 export declare function createWorktreeSetupProgressAccumulator(): WorktreeSetupProgressAccumulator;

package/dist/server/server/worktree-bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worktree-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/server/worktree-bootstrap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worktree-bootstrap.d.ts","sourceRoot":"","sources":["../../../src/server/worktree-bootstrap.ts"],"names":[],"mappings":"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"}

package/dist/server/server/worktree-bootstrap.js

@@ -1,6 +1,6 @@
 import { v4 as uuidv4 } from "uuid";
 import { buildScriptHostname } from "../utils/script-hostname.js";
-import { getScriptConfigs, getWorktreeTerminalSpecs, isServiceScript, processCarriageReturns, resolveWorktreeRuntimeEnv, runWorktreeSetupCommands, WorktreeSetupError, } from "../utils/worktree.js";
+import { getScriptConfigs, getWorktreeTerminalSpecs, isServiceScript, paseoConfigParseError, processCarriageReturns, readPaseoConfig, resolveWorktreeRuntimeEnv, runWorktreeSetupCommands, WorktreeSetupError, } from "../utils/worktree.js";
 import { findFreePort } from "./script-proxy.js";
 import { assertNoServiceEnvNameCollisions, buildWorkspaceServiceEnv, } from "./workspace-service-env.js";
 import { ensureWorkspaceServicePortPlan, requirePlannedWorkspaceServicePort, refreshWorkspaceServicePort, } from "./workspace-service-port-registry.js";
@@ -309,14 +309,15 @@ async function waitForTerminalBootstrapReadiness(terminal) {
         return;
     }
     await new Promise((resolve) => {
-        let settled = false;
+        let pendingResolve = resolve;
         let timeout = null;
         let unsubscribe = null;
         const finish = () => {
-            if (settled) {
+            if (!pendingResolve) {
                 return;
             }
-            settled = true;
+            const fn = pendingResolve;
+            pendingResolve = null;
             if (timeout) {
                 clearTimeout(timeout);
                 timeout = null;
@@ -325,7 +326,7 @@ async function waitForTerminalBootstrapReadiness(terminal) {
                 unsubscribe();
                 unsubscribe = null;
             }
-            resolve();
+            fn();
         };
         unsubscribe = terminal.subscribe((message) => {
             if (message.type !== "output") {
@@ -376,10 +377,10 @@ async function runWorktreeTerminalBootstrap(options, runtimeEnv) {
         }));
         return;
     }
-    const results = [];
-    for (const spec of terminalSpecs) {
+    const terminalManager = options.terminalManager;
+    const results = await Promise.all(terminalSpecs.map(async (spec) => {
         try {
-            const terminal = await options.terminalManager.createTerminal({
+            const terminal = await terminalManager.createTerminal({
                 cwd: options.worktree.worktreePath,
                 name: spec.name,
                 env: runtimeEnv,
@@ -389,26 +390,26 @@ async function runWorktreeTerminalBootstrap(options, runtimeEnv) {
                 type: "input",
                 data: `${spec.command}\r`,
             });
-            results.push({
+            return {
                 name: terminal.name ?? spec.name ?? null,
                 command: spec.command,
                 status: "started",
                 terminalId: terminal.id,
                 error: null,
-            });
+            };
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
             options.logger?.warn({ agentId: options.agentId, command: spec.command, err: error }, "Failed to bootstrap worktree terminal");
-            results.push({
+            return {
                 name: spec.name ?? null,
                 command: spec.command,
                 status: "failed",
                 terminalId: null,
                 error: message,
-            });
+            };
         }
-    }
+    }));
     await options.appendTimelineItem(buildTerminalTimelineItem({
         callId,
         status: "completed",
@@ -446,6 +447,7 @@ export async function runAsyncWorktreeBootstrap(options) {
             catch (error) {
                 options.logger?.warn({ err: error, agentId: options.agentId }, "Failed to emit live worktree setup timeline update");
             }
+            return;
         });
     };
     try {
@@ -498,9 +500,77 @@ export async function runAsyncWorktreeBootstrap(options) {
     }
     await runWorktreeTerminalBootstrap(options, runtimeEnv);
 }
+async function setupServiceScriptRoute(params) {
+    const { scriptConfigs, config, scriptName, projectSlug, branchName, workspaceId, daemonPort, daemonListenHost, existingRuntimeEntry, routeStore, } = params;
+    const hostname = buildScriptHostname({ projectSlug, branchName, scriptName });
+    const serviceDeclarations = [];
+    for (const [configuredScriptName, scriptConfig] of scriptConfigs) {
+        if (isServiceScript(scriptConfig)) {
+            serviceDeclarations.push({
+                scriptName: configuredScriptName,
+                port: scriptConfig.port,
+            });
+        }
+    }
+    assertNoServiceEnvNameCollisions(serviceDeclarations.map((serviceDeclaration) => serviceDeclaration.scriptName));
+    const plannedPorts = await ensureWorkspaceServicePortPlan({
+        workspaceId,
+        services: serviceDeclarations,
+        allocatePort: findFreePort,
+    });
+    const port = existingRuntimeEntry?.lifecycle === "stopped"
+        ? await refreshWorkspaceServicePort({
+            workspaceId,
+            service: { scriptName, port: config.port },
+            allocatePort: findFreePort,
+        })
+        : requirePlannedWorkspaceServicePort(plannedPorts, scriptName);
+    const peers = [];
+    for (const [peerScriptName, peerPort] of plannedPorts) {
+        peers.push({
+            scriptName: peerScriptName,
+            port: peerScriptName === scriptName ? port : peerPort,
+        });
+    }
+    const env = buildWorkspaceServiceEnv({
+        scriptName,
+        projectSlug,
+        branchName,
+        daemonPort,
+        daemonListenHost,
+        peers,
+    });
+    routeStore.registerRoute({
+        hostname,
+        port,
+        workspaceId,
+        projectSlug,
+        scriptName,
+    });
+    return { hostname, port, env };
+}
+async function acquireWorkspaceScriptTerminal(params) {
+    const { serviceScript, existingRuntimeEntry, terminalManager, repoRoot, scriptName, env } = params;
+    let reusableTerminal = null;
+    if (!serviceScript && existingRuntimeEntry?.terminalId) {
+        reusableTerminal = terminalManager.getTerminal(existingRuntimeEntry.terminalId) ?? null;
+    }
+    const terminal = reusableTerminal ??
+        (await terminalManager.createTerminal({
+            cwd: repoRoot,
+            name: scriptName,
+            title: scriptName,
+            env,
+        }));
+    return { terminal, reusableTerminal };
+}
 export async function spawnWorkspaceScript(options) {
     const { repoRoot, workspaceId, projectSlug, branchName, scriptName, daemonPort, daemonListenHost, routeStore, runtimeStore, terminalManager, logger, onLifecycleChanged, } = options;
-    const scriptConfigs = getScriptConfigs(repoRoot);
+    const configResult = readPaseoConfig(repoRoot);
+    if (!configResult.ok) {
+        throw paseoConfigParseError(configResult);
+    }
+    const scriptConfigs = getScriptConfigs(configResult.config);
     const config = scriptConfigs.get(scriptName);
     if (!config) {
         throw new Error(`Script '${scriptName}' is not configured in paseo.json`);
@@ -519,69 +589,31 @@ export async function spawnWorkspaceScript(options) {
         const existingRuntimeEntry = runtimeStore.get({ workspaceId, scriptName });
         let env;
         if (serviceScript) {
-            hostname = buildScriptHostname({
-                projectSlug,
-                branchName,
-                scriptName,
-            });
-            const serviceDeclarations = [];
-            for (const [configuredScriptName, scriptConfig] of scriptConfigs) {
-                if (isServiceScript(scriptConfig)) {
-                    serviceDeclarations.push({
-                        scriptName: configuredScriptName,
-                        port: scriptConfig.port,
-                    });
-                }
-            }
-            assertNoServiceEnvNameCollisions(serviceDeclarations.map((serviceDeclaration) => serviceDeclaration.scriptName));
-            const plannedPorts = await ensureWorkspaceServicePortPlan({
-                workspaceId,
-                services: serviceDeclarations,
-                allocatePort: findFreePort,
-            });
-            port =
-                existingRuntimeEntry?.lifecycle === "stopped"
-                    ? await refreshWorkspaceServicePort({
-                        workspaceId,
-                        service: { scriptName, port: config.port },
-                        allocatePort: findFreePort,
-                    })
-                    : requirePlannedWorkspaceServicePort(plannedPorts, scriptName);
-            const peers = [];
-            for (const [peerScriptName, peerPort] of plannedPorts) {
-                peers.push({
-                    scriptName: peerScriptName,
-                    port: peerScriptName === scriptName ? port : peerPort,
-                });
-            }
-            env = buildWorkspaceServiceEnv({
+            const serviceSetup = await setupServiceScriptRoute({
+                scriptConfigs,
+                config,
                 scriptName,
                 projectSlug,
                 branchName,
+                workspaceId,
                 daemonPort,
                 daemonListenHost,
-                peers,
-            });
-            routeStore.registerRoute({
-                hostname,
-                port,
-                workspaceId,
-                projectSlug,
-                scriptName,
+                existingRuntimeEntry,
+                routeStore,
             });
+            hostname = serviceSetup.hostname;
+            port = serviceSetup.port;
+            env = serviceSetup.env;
             routeRegistered = true;
         }
-        let reusableTerminal = null;
-        if (!serviceScript && existingRuntimeEntry?.terminalId) {
-            reusableTerminal = terminalManager.getTerminal(existingRuntimeEntry.terminalId) ?? null;
-        }
-        const terminal = reusableTerminal ??
-            (await terminalManager.createTerminal({
-                cwd: repoRoot,
-                name: scriptName,
-                title: scriptName,
-                env,
-            }));
+        const { terminal, reusableTerminal } = await acquireWorkspaceScriptTerminal({
+            serviceScript,
+            existingRuntimeEntry,
+            terminalManager,
+            repoRoot,
+            scriptName,
+            env,
+        });
         runtimeStore.set({
             workspaceId,
             scriptName,