@jingyi0605/codingns 0.3.5 → 0.4.0

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

@@ -0,0 +1,266 @@
+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";
+export class AssistantSandboxService {
+    repository;
+    butlerProfileService;
+    workspaceService;
+    butlerProjectService;
+    constructor(repository, butlerProfileService, workspaceService, butlerProjectService) {
+        this.repository = repository;
+        this.butlerProfileService = butlerProfileService;
+        this.workspaceService = workspaceService;
+        this.butlerProjectService = butlerProjectService;
+    }
+    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,
+            visibility: "pinned",
+            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);
+    }
+    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);
+    }
+    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: "该沙箱已过期，不能再用于启动会话"
+            });
+        }
+        return sandbox.workspaceId;
+    }
+    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 profile = this.butlerProfileService.getProfile();
+        if (!profile) {
+            throw new AppError({
+                statusCode: 409,
+                errorCode: "BUTLER_PROFILE_NOT_INITIALIZED",
+                detail: "代码助手尚未完成初始化，不能创建沙箱工作区"
+            });
+        }
+        const workspacePath = profile.workspacePath;
+        const sandboxRootPath = path.join(path.resolve(workspacePath), "sandboxes");
+        fs.mkdirSync(sandboxRootPath, { recursive: true });
+        return sandboxRootPath;
+    }
+    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 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();
+}
+//# 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.d.ts

@@ -1,6 +1,7 @@
 import type { ButlerFollowUpService, ButlerFollowUpTaskView } from "./butler-follow-up-service.js";
 import type { ButlerProjectService } from "./butler-project-service.js";
 import type { ButlerProjectSessionView, ButlerSessionService } from "./butler-session-service.js";
+import type { VerificationRunService, VerificationRunView } from "./verification-run-service.js";
 export interface ButlerSessionActionContextProjectView {
     id: string;
     workspaceId: string;
@@ -14,13 +15,15 @@ export interface ButlerSessionActionContextView {
     project: ButlerSessionActionContextProjectView;
     session: ButlerProjectSessionView;
     latestFollowUpTask: ButlerFollowUpTaskView | null;
+    latestVerificationRun: VerificationRunView | null;
 }
 export declare class ButlerActionContextService {
     private readonly butlerProjectService;
     private readonly butlerSessionService;
     private readonly butlerFollowUpService;
+    private readonly verificationRunService;
     private readonly cache;
-    constructor(butlerProjectService: Pick<ButlerProjectService, "resolveWorkspaceActionProject">, butlerSessionService: Pick<ButlerSessionService, "getSessionWorkspaceId" | "resolveActionTarget">, butlerFollowUpService: Pick<ButlerFollowUpService, "listTasks">);
+    constructor(butlerProjectService: Pick<ButlerProjectService, "resolveWorkspaceActionProject">, butlerSessionService: Pick<ButlerSessionService, "getSessionWorkspaceId" | "resolveActionTarget">, butlerFollowUpService: Pick<ButlerFollowUpService, "listTasks">, verificationRunService: Pick<VerificationRunService, "listRuns">);
     getSessionActionContext(sessionId: string, userId: string, options?: {
         force?: boolean;
     }): Promise<ButlerSessionActionContextView>;

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

@@ -4,11 +4,13 @@ export class ButlerActionContextService {
     butlerProjectService;
     butlerSessionService;
     butlerFollowUpService;
+    verificationRunService;
     cache = new Map();
-    constructor(butlerProjectService, butlerSessionService, butlerFollowUpService) {
+    constructor(butlerProjectService, butlerSessionService, butlerFollowUpService, verificationRunService) {
         this.butlerProjectService = butlerProjectService;
         this.butlerSessionService = butlerSessionService;
         this.butlerFollowUpService = butlerFollowUpService;
+        this.verificationRunService = verificationRunService;
     }
     async getSessionActionContext(sessionId, userId, options = {}) {
         const normalizedSessionId = normalizeSessionId(sessionId);
@@ -75,6 +77,9 @@ export class ButlerActionContextService {
             sessionId,
             limit: 1
         })[0] ?? null;
+        const latestVerificationRun = this.verificationRunService
+            .listRuns(project.id)
+            .find((run) => run.butlerSessionId === target.session.id) ?? null;
         return {
             workspaceId: target.workspaceId,
             project: {
@@ -86,7 +91,8 @@ export class ButlerActionContextService {
                 riskLevel: project.riskLevel
             },
             session: target.session,
-            latestFollowUpTask
+            latestFollowUpTask,
+            latestVerificationRun
         };
     }
 }

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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"}

package/dist/server/modules/butler/butler-control-session-service.d.ts

@@ -5,8 +5,10 @@ import type { ButlerAuthService } from "./butler-auth-service.js";
 import type { WorkspaceService } from "../workspace/workspace-service.js";
 import type { SessionHistoryService } from "../sessions/session-history-service.js";
 import type { SessionLiveRuntimeService } from "../sessions/session-live-runtime-service.js";
+import type { SessionMessageOriginRepository } from "../../storage/repositories/session-message-origin-repository.js";
 import type { ButlerContextAggregator } from "./context-aggregator.js";
 import type { SkillManagerService } from "../skills/skill-manager-service.js";
+import type { AssistantSandboxService } from "./assistant-sandbox-service.js";
 export interface ButlerControlSessionView extends ButlerControlSession {
     session: SessionListItem;
 }
@@ -35,7 +37,11 @@ export declare class ButlerControlSessionService {
     private readonly skillManagerService;
     private readonly codexHomeDir;
     private readonly sourceCodexHomeDir;
-    constructor(butlerProfileService: ButlerProfileService, butlerControlSessionRepository: ButlerControlSessionRepository, workspaceService: Pick<WorkspaceService, "importWorkspace">, sessionHistoryService: Pick<SessionHistoryService, "getSession" | "resumeSession">, sessionLiveRuntimeService: Pick<SessionLiveRuntimeService, "startLiveSession" | "sendLiveMessage">, butlerContextAggregator: Pick<ButlerContextAggregator, "resolvePromptContext">, butlerAuthService: Pick<ButlerAuthService, "ensureWorkspaceCredential" | "getCredentialFilePath">, skillManagerService: Pick<SkillManagerService, "getOverview" | "importUnmanagedSkill">, codexHomeDir?: string | null, sourceCodexHomeDir?: string | null);
+    private readonly claudeCodeHomeDir;
+    private readonly sourceClaudeCodeHomeDir;
+    private readonly sessionMessageOriginRepository;
+    private readonly assistantSandboxService;
+    constructor(butlerProfileService: ButlerProfileService, butlerControlSessionRepository: ButlerControlSessionRepository, workspaceService: Pick<WorkspaceService, "importWorkspace">, sessionHistoryService: Pick<SessionHistoryService, "getSession" | "resumeSession">, sessionLiveRuntimeService: Pick<SessionLiveRuntimeService, "startLiveSession" | "sendLiveMessage">, butlerContextAggregator: Pick<ButlerContextAggregator, "resolvePromptContext">, butlerAuthService: Pick<ButlerAuthService, "ensureWorkspaceCredential" | "getCredentialFilePath">, skillManagerService: Pick<SkillManagerService, "getOverview" | "importUnmanagedSkill">, codexHomeDir?: string | null, sourceCodexHomeDir?: string | null, claudeCodeHomeDir?: string | null, sourceClaudeCodeHomeDir?: string | null, sessionMessageOriginRepository?: Pick<SessionMessageOriginRepository, "upsert"> | null, assistantSandboxService?: Pick<AssistantSandboxService, "createSandbox" | "listSandboxes" | "markSandboxUsedByControlSession" | "removeSandbox"> | null);
     getCurrentSession(userId: string): ButlerControlSessionView | null;
     getSession(controlSessionId: string, userId: string): ButlerControlSessionView | null;
     listSessions(userId: string): ButlerControlSessionView[];
@@ -60,6 +66,7 @@ export declare class ButlerControlSessionService {
     private toView;
     private prepareWorkspace;
     private syncWorkspaceContext;
+    private resolveControlSessionWorkspacePath;
     private markFailed;
     updateSessionStatusBySessionId(input: {
         sessionId: string;