agent-tower 0.4.16-beta.0 → 0.4.16-beta.3

package/dist/services/tunnel.service.d.ts

@@ -1,16 +1,42 @@
+export type TunnelHealthStatus = 'stopped' | 'starting' | 'checking' | 'healthy' | 'degraded' | 'localUnhealthy' | 'exited' | 'error' | 'linkReplaced';
+export interface TunnelStatus {
+    running: boolean;
+    status: TunnelHealthStatus;
+    url: string | null;
+    startedAt: string | null;
+    targetPort: number | null;
+    generation: number;
+    lastCheckedAt: string | null;
+    lastHealthyAt: string | null;
+    lastRemoteError: string | null;
+    lastLocalError: string | null;
+    lastExitAt: string | null;
+    lastError: string | null;
+    consecutiveRemoteFailures: number;
+    consecutiveLocalFailures: number;
+    canRegenerate: boolean;
+}
 export declare const TunnelService: {
     start(port: number): Promise<{
         url: string;
         token: string;
     }>;
+    regenerate(port: number): Promise<{
+        url: string;
+        token: string;
+    }>;
     stop(): void;
-    getStatus(): {
-        running: boolean;
-        url: string | null;
-        startedAt: string | null;
-    };
+    getStatus(): TunnelStatus;
     getToken(): string | null;
     validateToken(candidate: string): boolean;
+    validateHealthCheck(check: string | null | undefined, generation: string | null | undefined): boolean;
+    getHealthResponse(): {
+        ok: boolean;
+        generation: number;
+        status: TunnelHealthStatus;
+    };
     isRunning(): boolean;
+    checkNow(): Promise<void>;
+    __resetForTests(): void;
 };
 //# sourceMappingURL=tunnel.service.d.ts.map

package/dist/services/tunnel.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.service.d.ts","sourceRoot":"","sources":["../../src/services/tunnel.service.ts"],"names":[],"mappings":"AAmBA,eAAO,MAAM,aAAa;gBACN,MAAM,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;YAyC1D,IAAI;;;;;;gBAkBA,MAAM,GAAG,IAAI;6BAIA,MAAM,GAAG,OAAO;iBAQ5B,OAAO;CAGrB,CAAC"}
+{"version":3,"file":"tunnel.service.d.ts","sourceRoot":"","sources":["../../src/services/tunnel.service.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,kBAAkB,GAC1B,SAAS,GACT,UAAU,GACV,UAAU,GACV,SAAS,GACT,UAAU,GACV,gBAAgB,GAChB,QAAQ,GACR,OAAO,GACP,cAAc,CAAC;AAEnB,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,yBAAyB,EAAE,MAAM,CAAC;IAClC,wBAAwB,EAAE,MAAM,CAAC;IACjC,aAAa,EAAE,OAAO,CAAC;CACxB;AAsTD,eAAO,MAAM,aAAa;gBACN,MAAM,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;qBAI3C,MAAM,GAAG,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;YAY/D,IAAI;iBAMC,YAAY;gBAoBb,MAAM,GAAG,IAAI;6BAIA,MAAM,GAAG,OAAO;+BAQd,MAAM,GAAG,IAAI,GAAG,SAAS,cAAc,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,OAAO;;;;;;iBAmBxF,OAAO;gBAIF,OAAO,CAAC,IAAI,CAAC;uBAIZ,IAAI;CAMxB,CAAC"}

package/dist/services/tunnel.service.js

@@ -1,61 +1,293 @@
 import { Tunnel } from 'cloudflared';
 import { randomBytes, timingSafeEqual } from 'node:crypto';
+const HEALTH_CHECK_INTERVAL_MS = 10000;
+const HEALTH_CHECK_TIMEOUT_MS = 5000;
+const REMOTE_DEGRADED_FAILURE_THRESHOLD = 2;
+const LOCAL_HEALTH_PATH = '/api/tunnel/health';
+const LINK_REPLACED_STATUS_TTL_MS = 4000;
 const state = {
     url: null,
-    running: false,
+    status: 'stopped',
     tunnel: null,
     startedAt: null,
+    targetPort: null,
     token: null,
+    generation: 0,
+    healthSecret: null,
+    healthTimer: null,
+    healthCheckInFlight: false,
+    healthCheckPromise: null,
+    lastCheckedAt: null,
+    lastHealthyAt: null,
+    lastRemoteError: null,
+    lastLocalError: null,
+    lastExitAt: null,
+    consecutiveRemoteFailures: 0,
+    consecutiveLocalFailures: 0,
+    lastError: null,
 };
-export const TunnelService = {
-    async start(port) {
-        if (state.running && state.url && state.token) {
-            return { url: state.url, token: state.token };
+function nowIso() {
+    return new Date().toISOString();
+}
+function sanitizeError(error) {
+    if (error instanceof Error)
+        return error.message;
+    if (typeof error === 'string')
+        return error;
+    return 'Unknown error';
+}
+function clearHealthTimer() {
+    if (!state.healthTimer)
+        return;
+    clearInterval(state.healthTimer);
+    state.healthTimer = null;
+}
+function resetRuntimeState(nextStatus) {
+    clearHealthTimer();
+    state.url = null;
+    state.status = nextStatus;
+    state.tunnel = null;
+    state.startedAt = null;
+    state.targetPort = null;
+    state.token = null;
+    state.healthSecret = null;
+    state.healthCheckInFlight = false;
+    state.healthCheckPromise = null;
+    state.lastCheckedAt = null;
+    state.lastHealthyAt = null;
+    state.lastRemoteError = null;
+    state.lastLocalError = null;
+    state.lastExitAt = null;
+    state.lastError = null;
+    state.consecutiveRemoteFailures = 0;
+    state.consecutiveLocalFailures = 0;
+}
+function buildHealthUrl(baseUrl, secret, generation) {
+    const healthUrl = new URL(LOCAL_HEALTH_PATH, baseUrl);
+    healthUrl.searchParams.set('check', secret);
+    healthUrl.searchParams.set('generation', String(generation));
+    return healthUrl.toString();
+}
+async function fetchWithTimeout(url, init = {}) {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), HEALTH_CHECK_TIMEOUT_MS);
+    try {
+        return await fetch(url, {
+            ...init,
+            signal: controller.signal,
+        });
+    }
+    finally {
+        clearTimeout(timeout);
+    }
+}
+async function checkLocalTarget(port, secret, generation) {
+    try {
+        const response = await fetchWithTimeout(buildHealthUrl(`http://127.0.0.1:${port}`, secret, generation), { method: 'GET' });
+        if (!response.ok) {
+            return { ok: false, error: `local health returned ${response.status}` };
+        }
+        const body = await response.json().catch(() => null);
+        if (!body?.ok || body.generation !== generation) {
+            return { ok: false, error: 'local health response did not match current tunnel' };
+        }
+        return { ok: true, error: null };
+    }
+    catch (err) {
+        return { ok: false, error: sanitizeError(err) };
+    }
+}
+async function checkRemoteUrl(url, secret, generation) {
+    try {
+        const response = await fetchWithTimeout(buildHealthUrl(url, secret, generation), { method: 'GET' });
+        if (!response.ok) {
+            return { ok: false, error: `remote health returned ${response.status}` };
+        }
+        const body = await response.json().catch(() => null);
+        if (!body?.ok || body.generation !== generation) {
+            return { ok: false, error: 'remote health response did not match current tunnel' };
+        }
+        return { ok: true, error: null };
+    }
+    catch (err) {
+        return { ok: false, error: sanitizeError(err) };
+    }
+}
+function setHealthStatus(local, remote) {
+    if (!state.tunnel)
+        return;
+    if (!local.ok) {
+        state.status = 'localUnhealthy';
+        return;
+    }
+    if (!remote.ok) {
+        state.status = state.consecutiveRemoteFailures >= REMOTE_DEGRADED_FAILURE_THRESHOLD
+            ? 'degraded'
+            : 'checking';
+        return;
+    }
+    state.status = 'healthy';
+    state.lastHealthyAt = state.lastCheckedAt;
+}
+async function runHealthCheck() {
+    if (state.healthCheckInFlight) {
+        await state.healthCheckPromise;
+        return;
+    }
+    if (!state.tunnel || !state.url || !state.healthSecret || !state.targetPort)
+        return;
+    state.healthCheckInFlight = true;
+    state.healthCheckPromise = (async () => {
+        state.lastCheckedAt = nowIso();
+        try {
+            const generation = state.generation;
+            const port = state.targetPort;
+            const secret = state.healthSecret;
+            const url = state.url;
+            if (!port || !secret || !url)
+                return;
+            const local = await checkLocalTarget(port, secret, generation);
+            state.lastLocalError = local.error;
+            state.consecutiveLocalFailures = local.ok ? 0 : state.consecutiveLocalFailures + 1;
+            let remote = { ok: false, error: 'remote health skipped while local target is unhealthy' };
+            if (local.ok) {
+                remote = await checkRemoteUrl(url, secret, generation);
+            }
+            state.lastRemoteError = remote.error;
+            state.consecutiveRemoteFailures = remote.ok ? 0 : state.consecutiveRemoteFailures + 1;
+            setHealthStatus(local, remote);
+        }
+        finally {
+            state.healthCheckInFlight = false;
+            state.healthCheckPromise = null;
+        }
+    })();
+    await state.healthCheckPromise;
+}
+function startHealthChecks() {
+    clearHealthTimer();
+    void runHealthCheck();
+    state.healthTimer = setInterval(() => {
+        void runHealthCheck();
+    }, HEALTH_CHECK_INTERVAL_MS);
+    state.healthTimer.unref?.();
+}
+function attachTunnelEvents(tunnel) {
+    tunnel.on('exit', () => {
+        if (state.tunnel !== tunnel)
+            return;
+        clearHealthTimer();
+        state.status = 'exited';
+        state.url = null;
+        state.tunnel = null;
+        state.startedAt = null;
+        state.token = null;
+        state.healthSecret = null;
+        state.targetPort = null;
+        state.lastExitAt = nowIso();
+    });
+    tunnel.on('error', (err) => {
+        if (state.tunnel !== tunnel)
+            return;
+        state.lastError = sanitizeError(err);
+        if (state.status === 'healthy' || state.status === 'checking') {
+            state.status = 'degraded';
         }
-        const t = Tunnel.quick(`http://localhost:${port}`);
-        const url = await new Promise((resolve, reject) => {
+    });
+}
+async function startTunnel(port, nextStatus) {
+    if (state.tunnel && state.url && state.token) {
+        return { url: state.url, token: state.token };
+    }
+    state.status = 'starting';
+    state.lastError = null;
+    state.lastExitAt = null;
+    state.targetPort = port;
+    const tunnel = Tunnel.quick(`http://localhost:${port}`);
+    let url;
+    try {
+        url = await new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
-                t.stop();
+                tunnel.stop();
                 reject(new Error('Tunnel startup timed out (30s)'));
             }, 30000);
-            t.once('url', (url) => {
+            tunnel.once('url', (nextUrl) => {
                 clearTimeout(timeout);
-                resolve(url);
+                resolve(nextUrl);
             });
-            t.once('error', (err) => {
+            tunnel.once('error', (err) => {
                 clearTimeout(timeout);
                 reject(err);
             });
         });
-        state.url = url;
-        state.running = true;
-        state.tunnel = t;
-        state.startedAt = new Date().toISOString();
-        state.token = randomBytes(32).toString('base64url');
-        t.on('exit', () => {
-            state.url = null;
-            state.running = false;
-            state.tunnel = null;
-            state.startedAt = null;
-            state.token = null;
-        });
-        return { url, token: state.token };
-    },
-    stop() {
-        if (!state.tunnel)
-            return;
-        state.tunnel.stop();
+    }
+    catch (err) {
+        tunnel.stop();
+        clearHealthTimer();
+        state.status = 'error';
         state.url = null;
-        state.running = false;
         state.tunnel = null;
         state.startedAt = null;
         state.token = null;
+        state.healthSecret = null;
+        state.lastError = sanitizeError(err);
+        throw err;
+    }
+    state.url = url;
+    state.status = nextStatus;
+    state.tunnel = tunnel;
+    state.startedAt = nowIso();
+    state.token = randomBytes(32).toString('base64url');
+    state.healthSecret = randomBytes(32).toString('base64url');
+    state.generation += 1;
+    state.lastCheckedAt = null;
+    state.lastHealthyAt = null;
+    state.lastRemoteError = null;
+    state.lastLocalError = null;
+    state.consecutiveRemoteFailures = 0;
+    state.consecutiveLocalFailures = 0;
+    attachTunnelEvents(tunnel);
+    startHealthChecks();
+    return { url, token: state.token };
+}
+export const TunnelService = {
+    async start(port) {
+        return startTunnel(port, 'checking');
+    },
+    async regenerate(port) {
+        this.stop();
+        const result = await startTunnel(port, 'linkReplaced');
+        const timer = setTimeout(() => {
+            if (state.status === 'linkReplaced') {
+                state.status = 'checking';
+            }
+        }, LINK_REPLACED_STATUS_TTL_MS);
+        timer.unref?.();
+        return result;
+    },
+    stop() {
+        const tunnel = state.tunnel;
+        resetRuntimeState('stopped');
+        if (tunnel)
+            tunnel.stop();
     },
     getStatus() {
         return {
-            running: state.running,
+            running: state.tunnel !== null,
+            status: state.status,
             url: state.url,
             startedAt: state.startedAt,
+            targetPort: state.targetPort,
+            generation: state.generation,
+            lastCheckedAt: state.lastCheckedAt,
+            lastHealthyAt: state.lastHealthyAt,
+            lastRemoteError: state.lastRemoteError,
+            lastLocalError: state.lastLocalError,
+            lastExitAt: state.lastExitAt,
+            lastError: state.lastError,
+            consecutiveRemoteFailures: state.consecutiveRemoteFailures,
+            consecutiveLocalFailures: state.consecutiveLocalFailures,
+            canRegenerate: state.status !== 'starting',
         };
     },
     getToken() {
@@ -70,8 +302,37 @@ export const TunnelService = {
             return false;
         return timingSafeEqual(a, b);
     },
+    validateHealthCheck(check, generation) {
+        if (!state.healthSecret)
+            return false;
+        if (!check || !generation)
+            return false;
+        if (Number(generation) !== state.generation)
+            return false;
+        const a = Buffer.from(state.healthSecret);
+        const b = Buffer.from(check);
+        if (a.length !== b.length)
+            return false;
+        return timingSafeEqual(a, b);
+    },
+    getHealthResponse() {
+        return {
+            ok: true,
+            generation: state.generation,
+            status: state.status,
+        };
+    },
     isRunning() {
-        return state.running;
+        return state.tunnel !== null;
+    },
+    async checkNow() {
+        await runHealthCheck();
+    },
+    __resetForTests() {
+        resetRuntimeState('stopped');
+        state.generation = 0;
+        state.lastExitAt = null;
+        state.lastError = null;
     },
 };
 //# sourceMappingURL=tunnel.service.js.map

package/dist/services/tunnel.service.js.map

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

package/dist/services/workspace.service.d.ts

@@ -1,7 +1,24 @@
+import { type TeamLockService } from './team-lock.service.js';
 import type { GitOperationStatus } from '@agent-tower/shared';
+export interface CreateWorkspaceOptions {
+    branchName?: string;
+    branchNamePrefix?: string;
+    startPoint?: string | null;
+    parentWorkspaceId?: string | null;
+    ownerMemberId?: string | null;
+    reuseInactive?: boolean;
+}
+export interface MergeWorkspaceOptions {
+    commitMessage?: string;
+    lockOwnerId?: string;
+}
 export declare class WorkspaceService {
+    private readonly lockService;
+    private static readonly mainWorkspaceClaims;
+    private static readonly dedicatedWorkspaceClaims;
     private sessionService;
     private eventBus;
+    constructor(lockService?: TeamLockService);
     private getBaseBranch;
     findById(id: string): Promise<({
         task: {
@@ -51,10 +68,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }) | null>;
     /**
@@ -81,10 +101,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     })[]>;
     /**
@@ -96,7 +119,64 @@ export declare class WorkspaceService {
      * - 创建后自动将关联 Task 状态改为 IN_PROGRESS
      * - 失败时回滚已创建的数据库记录
      */
-    create(taskId: string, branchName?: string): Promise<{
+    create(taskId: string, branchNameOrOptions?: string | CreateWorkspaceOptions): Promise<{
+        task: {
+            project: {
+                name: string;
+                repoDeletedAt: Date | null;
+                archivedAt: Date | null;
+                repoRemoteUrl: string | null;
+                id: string;
+                description: string | null;
+                repoPath: string;
+                mainBranch: string;
+                copyFiles: string | null;
+                setupScript: string | null;
+                quickCommands: string | null;
+                createdAt: Date;
+                updatedAt: Date;
+            };
+        } & {
+            id: string;
+            description: string | null;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            status: string;
+            priority: number;
+            position: number;
+            projectId: string;
+        };
+        sessions: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            status: string;
+            workspaceId: string;
+            agentType: string;
+            variant: string;
+            providerId: string | null;
+            prompt: string;
+            purpose: string;
+            logSnapshot: string | null;
+            tokenUsage: string | null;
+        }[];
+    } & {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+        status: string;
+        taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
+        branchName: string;
+        baseBranch: string | null;
+        worktreePath: string;
+        commitMessage: string | null;
+        previewTarget: string | null;
+        hibernatedAt: Date | null;
+    }>;
+    getOrCreateMainWorkspace(teamRunId: string): Promise<{
         task: {
             project: {
                 name: string;
@@ -144,12 +224,79 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
+    getOrCreateDedicatedWorkspace(teamRunId: string, memberId: string): Promise<{
+        task: {
+            project: {
+                name: string;
+                repoDeletedAt: Date | null;
+                archivedAt: Date | null;
+                repoRemoteUrl: string | null;
+                id: string;
+                description: string | null;
+                repoPath: string;
+                mainBranch: string;
+                copyFiles: string | null;
+                setupScript: string | null;
+                quickCommands: string | null;
+                createdAt: Date;
+                updatedAt: Date;
+            };
+        } & {
+            id: string;
+            description: string | null;
+            createdAt: Date;
+            updatedAt: Date;
+            title: string;
+            status: string;
+            priority: number;
+            position: number;
+            projectId: string;
+        };
+        sessions: {
+            id: string;
+            createdAt: Date;
+            updatedAt: Date;
+            status: string;
+            workspaceId: string;
+            agentType: string;
+            variant: string;
+            providerId: string | null;
+            prompt: string;
+            purpose: string;
+            logSnapshot: string | null;
+            tokenUsage: string | null;
+        }[];
+    } & {
+        id: string;
+        createdAt: Date;
+        updatedAt: Date;
+        status: string;
+        taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
+        branchName: string;
+        baseBranch: string | null;
+        worktreePath: string;
+        commitMessage: string | null;
+        previewTarget: string | null;
+        hibernatedAt: Date | null;
+    }>;
+    private findOrCreateMainWorkspace;
+    private findOrCreateDedicatedWorkspace;
+    private findDedicatedWorkspace;
+    private activateDedicatedWorkspace;
+    private waitForWorkspaceReady;
+    private ensureActiveWorkspaceWorktree;
+    private restoreInactiveWorkspace;
     /**
      * 删除 Workspace
      *
@@ -172,13 +319,14 @@ export declare class WorkspaceService {
      * 中止工作空间当前进行中的 Git 操作
      */
     abortOperation(id: string): Promise<void>;
-    /**
-     * 合并 Workspace 到主分支（squash merge）
-     *
-     * @param commitMessage - 可选的自定义 commit message
-     * @returns squash commit 的 SHA
-     */
     merge(id: string, commitMessage?: string): Promise<string>;
+    merge(id: string, options?: MergeWorkspaceOptions): Promise<string>;
+    private mergeWithLock;
+    private mergeChildIntoParent;
+    private mergeRootWorkspaceToMain;
+    private assertTeamRunFinalMergeAllowed;
+    private assertNoActiveWriteSessions;
+    private withProjectMergeLock;
     /**
      * 归档 Workspace（标记状态为 ABANDONED）
      */
@@ -230,10 +378,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
     /**
@@ -292,10 +443,13 @@ export declare class WorkspaceService {
         updatedAt: Date;
         status: string;
         taskId: string;
+        parentWorkspaceId: string | null;
+        ownerMemberId: string | null;
         branchName: string;
         baseBranch: string | null;
         worktreePath: string;
         commitMessage: string | null;
+        previewTarget: string | null;
         hibernatedAt: Date | null;
     }>;
     /**