@jingyi0605/codingns 0.9.0 → 0.9.6

package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.d.ts

@@ -0,0 +1,32 @@
+import { type SchedulerMetrics } from "../tasks/scheduler-metrics.js";
+import type { AssistantSandboxService } from "./assistant-sandbox-service.js";
+interface AssistantSandboxCleanupSchedulerLogger {
+    error(message: string, detail?: unknown): void;
+}
+interface AssistantSandboxCleanupSchedulerOptions {
+    intervalMs?: number;
+    maxIntervalMs?: number;
+    now?: () => string;
+    logger?: AssistantSandboxCleanupSchedulerLogger;
+    schedulerMetrics?: SchedulerMetrics;
+}
+export declare class AssistantSandboxCleanupScheduler {
+    private readonly assistantSandboxService;
+    private readonly intervalMs;
+    private readonly maxIntervalMs;
+    private readonly now;
+    private readonly logger;
+    private readonly schedulerMetrics;
+    private timer;
+    private ticking;
+    private started;
+    private disposed;
+    private idleStreak;
+    constructor(assistantSandboxService: Pick<AssistantSandboxService, "runDueCleanup">, options?: AssistantSandboxCleanupSchedulerOptions);
+    start(): void;
+    dispose(): Promise<void>;
+    runOnce(): Promise<void>;
+    private scheduleNext;
+    private tick;
+}
+export {};

package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js

@@ -0,0 +1,93 @@
+import { nowIso } from "../../shared/utils/time.js";
+import { resolveAdaptiveSchedulerDelayMs } from "../tasks/scheduler-metrics.js";
+const DEFAULT_INTERVAL_MS = 60_000;
+export class AssistantSandboxCleanupScheduler {
+    assistantSandboxService;
+    intervalMs;
+    maxIntervalMs;
+    now;
+    logger;
+    schedulerMetrics;
+    timer = null;
+    ticking = false;
+    started = false;
+    disposed = false;
+    idleStreak = 0;
+    constructor(assistantSandboxService, options = {}) {
+        this.assistantSandboxService = assistantSandboxService;
+        this.intervalMs = Math.max(15_000, options.intervalMs ?? DEFAULT_INTERVAL_MS);
+        this.maxIntervalMs = Math.max(this.intervalMs, options.maxIntervalMs ?? this.intervalMs * 8);
+        this.now = options.now ?? nowIso;
+        this.logger = options.logger ?? console;
+        this.schedulerMetrics = options.schedulerMetrics ?? null;
+    }
+    start() {
+        if (this.timer || this.disposed) {
+            return;
+        }
+        this.started = true;
+        this.scheduleNext(0);
+    }
+    async dispose() {
+        this.started = false;
+        this.disposed = true;
+        if (this.timer) {
+            clearTimeout(this.timer);
+            this.timer = null;
+        }
+        while (this.ticking) {
+            await new Promise((resolve) => setTimeout(resolve, 10));
+        }
+    }
+    async runOnce() {
+        await this.tick(false);
+    }
+    scheduleNext(delayMs) {
+        this.timer = setTimeout(() => {
+            this.timer = null;
+            void this.tick();
+        }, delayMs);
+        this.timer.unref?.();
+    }
+    async tick(shouldScheduleNext = true) {
+        if (this.ticking) {
+            return;
+        }
+        this.ticking = true;
+        const tickStartedAt = Date.now();
+        const referenceAt = this.now();
+        let result = null;
+        let errorCount = 0;
+        try {
+            result = await this.assistantSandboxService.runDueCleanup(referenceAt);
+        }
+        catch (error) {
+            errorCount = 1;
+            this.logger.error("[assistant-sandbox-cleanup-scheduler] tick failed", {
+                error: error instanceof Error ? error.message : String(error),
+                referenceAt
+            });
+        }
+        finally {
+            this.ticking = false;
+            const idle = result?.idle ?? true;
+            const taskCount = result?.dueSandboxCount ?? 0;
+            this.idleStreak = idle ? this.idleStreak + 1 : 0;
+            const nextDelayMs = resolveAdaptiveSchedulerDelayMs(this.intervalMs, this.maxIntervalMs, this.idleStreak);
+            this.schedulerMetrics?.recordTick({
+                schedulerName: "assistant_sandbox_cleanup",
+                referenceAt,
+                durationMs: Date.now() - tickStartedAt,
+                taskCount,
+                idle,
+                errorCount,
+                nextDelayMs,
+                idleStreak: this.idleStreak
+            });
+            if (shouldScheduleNext && this.started && !this.disposed && this.timer === null) {
+                this.scheduleNext(nextDelayMs);
+            }
+        }
+    }
+}
+//# sourceMappingURL=assistant-sandbox-cleanup-scheduler.js.map

package/dist/server/modules/butler/assistant-sandbox-cleanup-scheduler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistant-sandbox-cleanup-scheduler.js","sourceRoot":"","sources":["../../../../src/modules/butler/assistant-sandbox-cleanup-scheduler.ts"],"names":[],"mappings":"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"}

package/dist/server/modules/butler/assistant-sandbox-service.d.ts

@@ -0,0 +1,69 @@
+import type { AssistantSandboxWorkspace, Workspace } from "../../types/domain.js";
+import type { AssistantSandboxWorkspaceRepository } from "../../storage/repositories/assistant-sandbox-workspace-repository.js";
+import type { ButlerProfileService } from "./butler-profile-service.js";
+import type { ButlerProjectService } from "./butler-project-service.js";
+import { type TaskManager } from "../tasks/task-manager.js";
+import type { CloneWorkspaceInput, WorkspaceService } from "../workspace/workspace-service.js";
+export interface AssistantSandboxWorkspaceView extends AssistantSandboxWorkspace {
+    workspace: Workspace | null;
+}
+export interface CreateAssistantSandboxInput {
+    userId: string;
+    controlSessionId?: string | null;
+    title?: string | null;
+    description?: string | null;
+    purpose?: string | null;
+    expiresAt?: string | null;
+    source: {
+        kind: "blank";
+        directoryName?: string | null;
+    } | {
+        kind: "clone";
+        repositoryUrl: string;
+        directoryName?: string | null;
+        auth?: CloneWorkspaceInput["auth"];
+    };
+}
+export interface PromoteAssistantSandboxInput {
+    mode?: "pin" | "project";
+    projectName?: string | null;
+    defaultProvider?: "codex" | "claude-code" | null;
+}
+export interface AssistantSandboxCleanupResult {
+    dueSandboxCount: number;
+    cleanedSandboxCount: number;
+    idle: boolean;
+}
+export declare class AssistantSandboxService {
+    private readonly repository;
+    private readonly butlerProfileService;
+    private readonly workspaceService;
+    private readonly butlerProjectService?;
+    private readonly taskManager;
+    constructor(repository: AssistantSandboxWorkspaceRepository, butlerProfileService: Pick<ButlerProfileService, "getProfile">, workspaceService: Pick<WorkspaceService, "importWorkspace" | "cloneWorkspace" | "removeWorkspace" | "getWorkspaceOrThrow">, butlerProjectService?: Pick<ButlerProjectService, "create"> | undefined, taskManager?: TaskManager);
+    listSandboxes(filters: {
+        userId: string;
+        controlSessionId?: string | null;
+        statuses?: Array<"active" | "archived" | "expired" | "orphaned" | "deleted">;
+        limit?: number;
+    }): AssistantSandboxWorkspaceView[];
+    getSandbox(sandboxId: string, userId: string): AssistantSandboxWorkspaceView;
+    createSandbox(input: CreateAssistantSandboxInput): Promise<AssistantSandboxWorkspaceView>;
+    promoteSandbox(sandboxId: string, userId: string, input?: PromoteAssistantSandboxInput): AssistantSandboxWorkspaceView;
+    markSandboxUsedByControlSession(sandboxId: string, userId: string, controlSessionId: string | null): AssistantSandboxWorkspaceView;
+    markSandboxOrphanedByWorkspaceId(workspaceId: string, userId: string): AssistantSandboxWorkspaceView | null;
+    expireSandbox(sandboxId: string, userId: string): AssistantSandboxWorkspaceView;
+    removeSandbox(sandboxId: string, userId: string): AssistantSandboxWorkspaceView;
+    runDueCleanup(referenceAt: string): Promise<AssistantSandboxCleanupResult>;
+    resolveWorkspaceId(sandboxId: string, userId: string): string;
+    private registerBackgroundTasks;
+    private runDueCleanupDirect;
+    private cleanupSandboxDirect;
+    private createBlankWorkspace;
+    private createCloneWorkspace;
+    private ensureSandboxRootPath;
+    private resolveSandboxRootPath;
+    private removeSandboxDirectoryIfSafe;
+    private requireSandbox;
+    private toView;
+}

package/dist/server/modules/butler/assistant-sandbox-service.js

@@ -0,0 +1,399 @@
+import fs from "node:fs";
+import path from "node:path";
+import { AppError } from "../../shared/errors/app-error.js";
+import { createId } from "../../shared/utils/id.js";
+import { nowIso } from "../../shared/utils/time.js";
+import { createTaskManager } from "../tasks/task-manager.js";
+import { HOST_TASK_TYPES } from "../tasks/task-types.js";
+const DEFAULT_SANDBOX_RETENTION_DAYS = 30;
+const DEFAULT_SANDBOX_CLEANUP_LIMIT = 20;
+export class AssistantSandboxService {
+    repository;
+    butlerProfileService;
+    workspaceService;
+    butlerProjectService;
+    taskManager;
+    constructor(repository, butlerProfileService, workspaceService, butlerProjectService, taskManager = createTaskManager()) {
+        this.repository = repository;
+        this.butlerProfileService = butlerProfileService;
+        this.workspaceService = workspaceService;
+        this.butlerProjectService = butlerProjectService;
+        this.taskManager = taskManager;
+        this.registerBackgroundTasks();
+    }
+    listSandboxes(filters) {
+        return this.repository
+            .list({
+            userId: filters.userId,
+            controlSessionId: filters.controlSessionId ?? null,
+            statuses: filters.statuses,
+            limit: filters.limit
+        })
+            .map((record) => this.toView(record));
+    }
+    getSandbox(sandboxId, userId) {
+        return this.toView(this.requireSandbox(sandboxId, userId));
+    }
+    async createSandbox(input) {
+        const timestamp = nowIso();
+        const sandboxRootPath = this.ensureSandboxRootPath();
+        const workspace = input.source.kind === "blank"
+            ? this.createBlankWorkspace(sandboxRootPath, input)
+            : await this.createCloneWorkspace(sandboxRootPath, input);
+        const record = this.repository.create({
+            id: createId(),
+            userId: input.userId,
+            workspaceId: workspace.id,
+            controlSessionId: normalizeNullableText(input.controlSessionId),
+            title: normalizeSandboxTitle(input.title, workspace.name),
+            description: normalizeNullableText(input.description),
+            sourceKind: input.source.kind,
+            sourceRef: input.source.kind === "clone"
+                ? normalizeNullableText(input.source.repositoryUrl)
+                : workspace.path,
+            visibility: "assistant_only",
+            status: "active",
+            purpose: normalizeNullableText(input.purpose),
+            expiresAt: normalizeNullableIsoTime(input.expiresAt, "expiresAt"),
+            promotedAt: null,
+            createdAt: timestamp,
+            updatedAt: timestamp
+        });
+        return this.toView(record);
+    }
+    promoteSandbox(sandboxId, userId, input = {}) {
+        const current = this.requireSandbox(sandboxId, userId);
+        const promotedAt = nowIso();
+        const updated = this.repository.update({
+            ...current,
+            controlSessionId: null,
+            visibility: "pinned",
+            status: "active",
+            expiresAt: null,
+            promotedAt: current.promotedAt ?? promotedAt,
+            updatedAt: promotedAt
+        });
+        if (input.mode === "project") {
+            if (!this.butlerProjectService) {
+                throw new AppError({
+                    statusCode: 500,
+                    errorCode: "ASSISTANT_SANDBOX_PROMOTE_UNAVAILABLE",
+                    detail: "当前环境未启用沙箱晋升为项目的能力"
+                });
+            }
+            const workspace = this.workspaceService.getWorkspaceOrThrow(updated.workspaceId);
+            this.butlerProjectService.create({
+                workspaceId: workspace.id,
+                name: normalizeNullableText(input.projectName) ?? workspace.name,
+                repoRoot: workspace.repoRoot ?? workspace.path,
+                defaultProvider: input.defaultProvider ?? null,
+                config: {
+                    createdFrom: "assistant_sandbox",
+                    sandboxId: updated.id
+                }
+            });
+        }
+        return this.toView(updated);
+    }
+    markSandboxUsedByControlSession(sandboxId, userId, controlSessionId) {
+        const current = this.requireSandbox(sandboxId, userId);
+        const nextControlSessionId = normalizeNullableText(controlSessionId);
+        if (current.controlSessionId === nextControlSessionId) {
+            return this.toView(current);
+        }
+        const updated = this.repository.update({
+            ...current,
+            controlSessionId: nextControlSessionId,
+            updatedAt: nowIso()
+        });
+        return this.toView(updated);
+    }
+    markSandboxOrphanedByWorkspaceId(workspaceId, userId) {
+        const current = this.repository.findByWorkspaceId(workspaceId.trim());
+        if (!current || current.userId !== userId) {
+            return null;
+        }
+        if (current.status === "deleted") {
+            return this.toView(current);
+        }
+        const updatedAt = nowIso();
+        const nextStatus = isAutomaticCleanupProtected(current) ? current.status : "orphaned";
+        const updated = this.repository.update({
+            ...current,
+            controlSessionId: null,
+            status: nextStatus,
+            expiresAt: nextStatus === "orphaned" ? addDaysIso(updatedAt, DEFAULT_SANDBOX_RETENTION_DAYS) : null,
+            updatedAt
+        });
+        return this.toView(updated);
+    }
+    expireSandbox(sandboxId, userId) {
+        const current = this.requireSandbox(sandboxId, userId);
+        const updatedAt = nowIso();
+        const updated = this.repository.update({
+            ...current,
+            status: "expired",
+            updatedAt
+        });
+        return this.toView(updated);
+    }
+    removeSandbox(sandboxId, userId) {
+        const current = this.requireSandbox(sandboxId, userId);
+        const updatedAt = nowIso();
+        try {
+            this.workspaceService.removeWorkspace(current.workspaceId);
+        }
+        catch {
+            // 工作区可能已被清理或移除；这里仍然收口元数据，避免残留不可操作沙箱。
+        }
+        const updated = this.repository.update({
+            ...current,
+            status: "deleted",
+            updatedAt
+        });
+        return this.toView(updated);
+    }
+    async runDueCleanup(referenceAt) {
+        return await this.taskManager.enqueue(HOST_TASK_TYPES.assistantSandboxTick, {
+            key: "global",
+            source: "assistant_sandbox.run_due_cleanup",
+            input: {
+                referenceAt
+            }
+        }).promise;
+    }
+    resolveWorkspaceId(sandboxId, userId) {
+        const sandbox = this.requireSandbox(sandboxId, userId);
+        if (sandbox.status === "deleted") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "ASSISTANT_SANDBOX_UNAVAILABLE",
+                detail: "该沙箱已经删除，不能再用于启动会话"
+            });
+        }
+        if (sandbox.status === "expired") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "ASSISTANT_SANDBOX_UNAVAILABLE",
+                detail: "该沙箱已过期，不能再用于启动会话"
+            });
+        }
+        if (sandbox.status === "orphaned") {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "ASSISTANT_SANDBOX_UNAVAILABLE",
+                detail: "该沙箱已经孤立，不能再用于启动会话"
+            });
+        }
+        return sandbox.workspaceId;
+    }
+    registerBackgroundTasks() {
+        if (!this.taskManager.has(HOST_TASK_TYPES.assistantSandboxTick)) {
+            this.taskManager.register({
+                taskType: HOST_TASK_TYPES.assistantSandboxTick,
+                executionLane: "host_background",
+                timeoutMs: 10_000,
+                run: async ({ referenceAt }) => await this.runDueCleanupDirect(referenceAt)
+            });
+        }
+        if (!this.taskManager.has(HOST_TASK_TYPES.assistantSandboxCleanup)) {
+            this.taskManager.register({
+                taskType: HOST_TASK_TYPES.assistantSandboxCleanup,
+                executionLane: "host_background",
+                timeoutMs: 10_000,
+                run: async ({ sandboxId, referenceAt }) => {
+                    return this.cleanupSandboxDirect(sandboxId, referenceAt);
+                }
+            });
+        }
+    }
+    async runDueCleanupDirect(referenceAt) {
+        const dueSandboxes = this.repository.listDueCleanup(referenceAt, DEFAULT_SANDBOX_CLEANUP_LIMIT);
+        const handles = dueSandboxes.map((sandbox) => this.taskManager.enqueue(HOST_TASK_TYPES.assistantSandboxCleanup, {
+            key: sandbox.id,
+            source: "assistant_sandbox.tick.cleanup",
+            input: {
+                sandboxId: sandbox.id,
+                referenceAt
+            }
+        }));
+        const results = await Promise.all(handles.map((handle) => handle.promise));
+        const cleanedSandboxCount = results.filter(Boolean).length;
+        return {
+            dueSandboxCount: dueSandboxes.length,
+            cleanedSandboxCount,
+            idle: dueSandboxes.length === 0
+        };
+    }
+    async cleanupSandboxDirect(sandboxId, referenceAt) {
+        const current = this.repository.findById(sandboxId);
+        if (!current || current.status !== "orphaned" || !current.expiresAt || current.expiresAt > referenceAt) {
+            return false;
+        }
+        if (isAutomaticCleanupProtected(current)) {
+            this.repository.update({
+                ...current,
+                status: "active",
+                expiresAt: null,
+                updatedAt: nowIso()
+            });
+            return false;
+        }
+        await this.removeSandboxDirectoryIfSafe(current);
+        this.removeSandbox(current.id, current.userId);
+        return true;
+    }
+    createBlankWorkspace(sandboxRootPath, input) {
+        if (input.source.kind !== "blank") {
+            throw new Error("invalid blank sandbox input");
+        }
+        const directoryName = normalizeSandboxDirectoryName(input.source.directoryName, input.title);
+        const sandboxPath = path.join(sandboxRootPath, directoryName);
+        if (fs.existsSync(sandboxPath)) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "ASSISTANT_SANDBOX_EXISTS",
+                detail: "目标沙箱目录已存在，请换一个名称",
+                field: "directoryName"
+            });
+        }
+        fs.mkdirSync(sandboxPath, { recursive: true });
+        return this.workspaceService.importWorkspace(sandboxPath, normalizeNullableText(input.title) ?? directoryName);
+    }
+    async createCloneWorkspace(sandboxRootPath, input) {
+        if (input.source.kind !== "clone") {
+            throw new Error("invalid clone sandbox input");
+        }
+        return await this.workspaceService.cloneWorkspace({
+            repositoryUrl: input.source.repositoryUrl,
+            parentPath: sandboxRootPath,
+            directoryName: normalizeSandboxDirectoryName(input.source.directoryName, input.title, input.source.repositoryUrl),
+            name: normalizeNullableText(input.title) ?? undefined,
+            auth: input.source.auth
+        });
+    }
+    ensureSandboxRootPath() {
+        const sandboxRootPath = this.resolveSandboxRootPath();
+        fs.mkdirSync(sandboxRootPath, { recursive: true });
+        return sandboxRootPath;
+    }
+    resolveSandboxRootPath() {
+        const profile = this.butlerProfileService.getProfile();
+        if (!profile) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "BUTLER_PROFILE_NOT_INITIALIZED",
+                detail: "代码助手尚未完成初始化，不能创建沙箱工作区"
+            });
+        }
+        const workspacePath = profile.workspacePath;
+        return path.join(path.resolve(workspacePath), "sandboxes");
+    }
+    async removeSandboxDirectoryIfSafe(record) {
+        const sandboxPath = this.toView(record).workspace?.path?.trim() || null;
+        if (!sandboxPath) {
+            return;
+        }
+        const resolvedSandboxPath = path.resolve(sandboxPath);
+        const sandboxRootPath = this.resolveSandboxRootPath();
+        if (!isPathInsideDirectory(resolvedSandboxPath, sandboxRootPath)) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "ASSISTANT_SANDBOX_DELETE_PATH_UNSAFE",
+                detail: "沙箱目录不在允许清理的沙箱根目录内，已拒绝自动删除"
+            });
+        }
+        await fs.promises.rm(resolvedSandboxPath, {
+            recursive: true,
+            force: true
+        });
+    }
+    requireSandbox(sandboxId, userId) {
+        const sandbox = this.repository.findById(sandboxId.trim());
+        if (!sandbox || sandbox.userId !== userId) {
+            throw new AppError({
+                statusCode: 404,
+                errorCode: "ASSISTANT_SANDBOX_NOT_FOUND",
+                detail: "未找到对应的助手沙箱"
+            });
+        }
+        return sandbox;
+    }
+    toView(record) {
+        try {
+            return {
+                ...record,
+                workspace: this.workspaceService.getWorkspaceOrThrow(record.workspaceId)
+            };
+        }
+        catch {
+            return {
+                ...record,
+                workspace: null
+            };
+        }
+    }
+}
+function isAutomaticCleanupProtected(sandbox) {
+    return sandbox.visibility === "pinned" || sandbox.promotedAt !== null;
+}
+function normalizeNullableText(value) {
+    const normalized = value?.trim();
+    return normalized ? normalized : null;
+}
+function normalizeSandboxTitle(input, fallback) {
+    return normalizeNullableText(input) ?? fallback;
+}
+function normalizeSandboxDirectoryName(requestedName, title, repositoryUrl) {
+    const normalized = normalizeNullableText(requestedName)
+        ?? slugifyPathSegment(normalizeNullableText(title) ?? inferRepositoryName(repositoryUrl) ?? `sandbox-${createId().slice(0, 8)}`);
+    if (!normalized) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: "沙箱目录名不能为空",
+            field: "directoryName"
+        });
+    }
+    return normalized;
+}
+function inferRepositoryName(repositoryUrl) {
+    const normalized = normalizeNullableText(repositoryUrl);
+    if (!normalized) {
+        return null;
+    }
+    const tail = normalized.split("/").pop() ?? "";
+    return tail.replace(/\.git$/i, "").trim() || null;
+}
+function slugifyPathSegment(value) {
+    const normalized = value
+        .trim()
+        .replace(/[^a-zA-Z0-9._-]+/g, "-")
+        .replace(/-+/g, "-")
+        .replace(/^-|-$/g, "");
+    return normalized.slice(0, 64);
+}
+function normalizeNullableIsoTime(value, field) {
+    const normalized = normalizeNullableText(value);
+    if (!normalized) {
+        return null;
+    }
+    const timestamp = Date.parse(normalized);
+    if (Number.isNaN(timestamp)) {
+        throw new AppError({
+            statusCode: 400,
+            errorCode: "INVALID_INPUT",
+            detail: `${field} 必须是合法的 ISO 时间`,
+            field
+        });
+    }
+    return new Date(timestamp).toISOString();
+}
+function addDaysIso(referenceAt, days) {
+    return new Date(new Date(referenceAt).getTime() + days * 24 * 60 * 60 * 1000).toISOString();
+}
+function isPathInsideDirectory(candidatePath, parentPath) {
+    const relative = path.relative(path.resolve(parentPath), path.resolve(candidatePath));
+    return relative === "" || (!relative.startsWith("..") && !path.isAbsolute(relative));
+}
+//# sourceMappingURL=assistant-sandbox-service.js.map

package/dist/server/modules/butler/assistant-sandbox-service.js.map

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

package/dist/server/modules/butler/butler-action-context-service.js

@@ -70,8 +70,8 @@ export class ButlerActionContextService {
     }
     async buildSessionActionContext(sessionId, userId) {
         // 这里故意先按 workspace 解析项目，再走原来的 target 逻辑，避免改坏现有会话归属判断。
-        const workspaceId = this.butlerSessionService.getSessionWorkspaceId(sessionId);
-        const project = this.butlerProjectService.resolveWorkspaceActionProject(workspaceId);
+        const workspaceId = this.butlerSessionService.getSessionWorkspaceId(sessionId, userId);
+        const project = this.butlerProjectService.resolveWorkspaceActionProject(workspaceId, userId);
         const target = await this.butlerSessionService.resolveActionTarget(project.id, sessionId, userId);
         const latestFollowUpTask = this.butlerFollowUpService.listTasks({
             sessionId,

package/dist/server/modules/butler/butler-action-context-service.js.map

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