@jingyi0605/codingns 0.8.5 → 0.9.0

package/dist/server/modules/browser-runtime/opencli-bridge-browser-executor.js

@@ -23,9 +23,10 @@ export class OpenCliBridgeBrowserExecutor {
         this.installDiscovery = installDiscovery;
     }
     async execute(input) {
-        await this.ensureBridgeReady();
+        const bridge = await this.requireBridgeReady();
         const payload = parseBrowserTaskPayload(input.task.inputJson);
-        const page = await this.createPage();
+        const page = await this.createPageFromInstallPath(bridge.installPath);
+        await this.ensureStartPage(page, payload.startUrl);
         return await runBrowserTaskActions({
             task: input.task,
             payload: {
@@ -175,45 +176,85 @@ export class OpenCliBridgeBrowserExecutor {
                 });
         }
     }
-    async ensureBridgeReady() {
+    async requireBridgeReady() {
         const status = await this.bridgeStatusService.getStatus();
-        if (status.availability === "ready") {
-            return;
+        if (status.availability !== "ready") {
+            const errorCode = status.availability === "daemon_missing"
+                ? "OPENCLI_BRIDGE_DAEMON_MISSING"
+                : status.availability === "extension_missing"
+                    ? "OPENCLI_BRIDGE_EXTENSION_MISSING"
+                    : "OPENCLI_BRIDGE_UNAVAILABLE";
+            throw new AppError({
+                statusCode: 409,
+                errorCode,
+                detail: status.detail ?? "OpenCLI 浏览器桥接当前不可用"
+            });
         }
-        const errorCode = status.availability === "daemon_missing"
-            ? "OPENCLI_BRIDGE_DAEMON_MISSING"
-            : status.availability === "extension_missing"
-                ? "OPENCLI_BRIDGE_EXTENSION_MISSING"
-                : "OPENCLI_BRIDGE_UNAVAILABLE";
-        throw new AppError({
-            statusCode: 409,
-            errorCode,
-            detail: status.detail ?? "OpenCLI 浏览器桥接当前不可用"
-        });
-    }
-    async createPage() {
-        const discovery = this.installDiscovery.discover();
-        const installPath = discovery.installPath?.trim();
+        const installPath = status.installPath?.trim();
         if (!installPath) {
             throw new AppError({
                 statusCode: 409,
                 errorCode: "OPENCLI_INSTALL_NOT_FOUND",
-                detail: "未找到 opencli 安装目录，无法加载浏览器桥接"
+                detail: "OpenCLI 健康检查已就绪，但未返回安装目录，无法加载浏览器桥接"
             });
         }
+        return {
+            installPath
+        };
+    }
+    async createPageFromInstallPath(installPath) {
         const pageModuleUrl = pathToFileURL(path.join(installPath, "dist", "src", "browser", "page.js")).href;
         try {
             const pageModule = await import(pageModuleUrl);
             const PageCtor = pageModule.Page;
+            if (typeof PageCtor !== "function") {
+                throw new Error("page.js 未导出可用的 Page 构造函数");
+            }
             return new PageCtor("codingns-office-browser");
         }
         catch (error) {
             throw new AppError({
                 statusCode: 500,
                 errorCode: "OPENCLI_BRIDGE_LOAD_FAILED",
-                detail: error instanceof Error ? error.message : "无法加载 opencli 浏览器桥接模块"
+                detail: error instanceof Error
+                    ? `无法加载 opencli 浏览器桥接模块: ${error.message}`
+                    : "无法加载 opencli 浏览器桥接模块"
             });
         }
     }
+    async ensureStartPage(page, startUrl) {
+        const normalizedStartUrl = startUrl?.trim();
+        if (!normalizedStartUrl) {
+            return;
+        }
+        await this.navigateToStartPage(page, normalizedStartUrl);
+        if (!isAboutBlank(await page.getCurrentUrl())) {
+            return;
+        }
+        await delay(500);
+        await this.navigateToStartPage(page, normalizedStartUrl);
+        const currentUrl = await page.getCurrentUrl();
+        if (!isAboutBlank(currentUrl)) {
+            return;
+        }
+        throw new AppError({
+            statusCode: 409,
+            errorCode: "OPENCLI_BRIDGE_START_URL_NOT_REACHED",
+            detail: `OpenCLI 浏览器桥接首跳后仍停留在 about:blank，目标页面未打开：${normalizedStartUrl}`
+        });
+    }
+    async navigateToStartPage(page, startUrl) {
+        await page.goto(startUrl, {
+            waitUntil: "domcontentloaded",
+            settleMs: 15_000
+        });
+    }
+}
+function isAboutBlank(url) {
+    const normalizedUrl = url?.trim().toLowerCase();
+    return !normalizedUrl || normalizedUrl === "about:blank";
+}
+function delay(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
 //# sourceMappingURL=opencli-bridge-browser-executor.js.map

package/dist/server/modules/browser-runtime/opencli-bridge-browser-executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"opencli-bridge-browser-executor.js","sourceRoot":"","sources":["../../../../src/modules/browser-runtime/opencli-bridge-browser-executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"opencli-bridge-browser-executor.js","sourceRoot":"","sources":["../../../../src/modules/browser-runtime/opencli-bridge-browser-executor.ts"],"names":[],"mappings":"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"}

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

@@ -8,7 +8,6 @@ import type { SessionLiveRuntimeService } from "../sessions/session-live-runtime
 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";
 import type { SessionProviderUsageLimitGuardService } from "../sessions/session-provider-usage-guard-service.js";
 import type { ProviderControlRepository } from "../../storage/repositories/provider-control-repository.js";
 export interface ButlerControlSessionView extends ButlerControlSession {
@@ -23,6 +22,7 @@ export interface StartButlerControlSessionInput {
     purpose?: ButlerControlSessionPurpose;
     title?: string | null;
     sourceItemId?: string | null;
+    workspaceId?: string | null;
 }
 export interface SendButlerControlMessageInput extends StartButlerControlSessionInput {
     content?: string;
@@ -42,11 +42,10 @@ export declare class ButlerControlSessionService {
     private readonly claudeCodeHomeDir;
     private readonly sourceClaudeCodeHomeDir;
     private readonly sessionMessageOriginRepository;
-    private readonly assistantSandboxService;
     private readonly providerUsageLimitGuardService;
     private readonly providerControlRepository;
-    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" | "listAssistantRuntimeSkillSources">, 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, providerUsageLimitGuardService?: Pick<SessionProviderUsageLimitGuardService, "resolveBlockingInspection" | "createBlockedAppError"> | null, providerControlRepository?: Pick<ProviderControlRepository, "get"> | null);
-    getCurrentSession(userId: string): ButlerControlSessionView | null;
+    constructor(butlerProfileService: ButlerProfileService, butlerControlSessionRepository: ButlerControlSessionRepository, workspaceService: Pick<WorkspaceService, "importWorkspace" | "getWorkspaceOrThrow">, sessionHistoryService: Pick<SessionHistoryService, "getSession" | "resumeSession">, sessionLiveRuntimeService: Pick<SessionLiveRuntimeService, "startLiveSession" | "sendLiveMessage">, butlerContextAggregator: Pick<ButlerContextAggregator, "resolvePromptContext">, butlerAuthService: Pick<ButlerAuthService, "ensureWorkspaceCredential" | "getCredentialFilePath">, skillManagerService: Pick<SkillManagerService, "getOverview" | "importUnmanagedSkill" | "listAssistantRuntimeSkillSources">, codexHomeDir?: string | null, sourceCodexHomeDir?: string | null, claudeCodeHomeDir?: string | null, sourceClaudeCodeHomeDir?: string | null, sessionMessageOriginRepository?: Pick<SessionMessageOriginRepository, "upsert"> | null, providerUsageLimitGuardService?: Pick<SessionProviderUsageLimitGuardService, "resolveBlockingInspection" | "createBlockedAppError"> | null, providerControlRepository?: Pick<ProviderControlRepository, "get"> | null);
+    getCurrentSession(userId: string, workspaceId?: string | null): ButlerControlSessionView | null;
     getSession(controlSessionId: string, userId: string): ButlerControlSessionView | null;
     listSessions(userId: string): ButlerControlSessionView[];
     resetCurrentSession(): void;

package/dist/server/modules/butler/butler-control-session-service.js

@@ -18,10 +18,9 @@ export class ButlerControlSessionService {
     claudeCodeHomeDir;
     sourceClaudeCodeHomeDir;
     sessionMessageOriginRepository;
-    assistantSandboxService;
     providerUsageLimitGuardService;
     providerControlRepository;
-    constructor(butlerProfileService, butlerControlSessionRepository, workspaceService, sessionHistoryService, sessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, skillManagerService, codexHomeDir = null, sourceCodexHomeDir = null, claudeCodeHomeDir = null, sourceClaudeCodeHomeDir = null, sessionMessageOriginRepository = null, assistantSandboxService = null, providerUsageLimitGuardService = null, providerControlRepository = null) {
+    constructor(butlerProfileService, butlerControlSessionRepository, workspaceService, sessionHistoryService, sessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, skillManagerService, codexHomeDir = null, sourceCodexHomeDir = null, claudeCodeHomeDir = null, sourceClaudeCodeHomeDir = null, sessionMessageOriginRepository = null, providerUsageLimitGuardService = null, providerControlRepository = null) {
         this.butlerProfileService = butlerProfileService;
         this.butlerControlSessionRepository = butlerControlSessionRepository;
         this.workspaceService = workspaceService;
@@ -35,7 +34,6 @@ export class ButlerControlSessionService {
         this.claudeCodeHomeDir = claudeCodeHomeDir;
         this.sourceClaudeCodeHomeDir = sourceClaudeCodeHomeDir;
         this.sessionMessageOriginRepository = sessionMessageOriginRepository;
-        this.assistantSandboxService = assistantSandboxService;
         this.providerUsageLimitGuardService = providerUsageLimitGuardService;
         this.providerControlRepository = providerControlRepository ?? {
             get: (providerId) => ({
@@ -45,13 +43,18 @@ export class ButlerControlSessionService {
             })
         };
     }
-    getCurrentSession(userId) {
+    getCurrentSession(userId, workspaceId) {
         const profile = this.butlerProfileService.ensureInitialized();
-        const current = this.butlerControlSessionRepository.findLatestOpenByProvider(profile.providerId);
-        if (!current) {
-            return null;
+        const normalizedWorkspaceId = workspaceId?.trim() ?? "";
+        if (normalizedWorkspaceId) {
+            return this.butlerControlSessionRepository
+                .listByProvider(profile.providerId)
+                .filter((record) => record.status !== "closed")
+                .map((record) => this.toView(record, userId))
+                .find((record) => record.session.workspaceId === normalizedWorkspaceId) ?? null;
         }
-        return this.toView(current, userId);
+        const current = this.butlerControlSessionRepository.findLatestOpenByProvider(profile.providerId);
+        return current ? this.toView(current, userId) : null;
     }
     getSession(controlSessionId, userId) {
         const current = this.butlerControlSessionRepository.findById(controlSessionId.trim());
@@ -149,7 +152,7 @@ export class ButlerControlSessionService {
         const reasoningLevel = normalizeNullableText(input.reasoningLevel) ?? current.reasoningLevel;
         const permissionMode = normalizeNullableText(input.permissionMode) ?? current.permissionMode;
         const promptContext = await this.butlerContextAggregator.resolvePromptContext(userId, content);
-        this.syncWorkspaceContext(profile, promptContext, userId, this.resolveControlSessionWorkspacePath(profile, current.id, userId));
+        const runtimeContext = this.syncWorkspaceContext(profile, promptContext, userId, this.resolveControlSessionWorkspacePath(profile, current.id, userId));
         try {
             const result = await this.sessionLiveRuntimeService.sendLiveMessage({
                 sessionId: current.sessionId,
@@ -160,6 +163,7 @@ export class ButlerControlSessionService {
                     model,
                     reasoningLevel,
                     permissionMode,
+                    providerInstructionFilePath: runtimeContext.providerInstructionFilePath,
                     attachments: []
                 }
             });
@@ -208,7 +212,8 @@ export class ButlerControlSessionService {
         const promptContext = await this.butlerContextAggregator.resolvePromptContext(userId, input.content ?? null);
         const preparedWorkspace = await this.prepareWorkspace(profile, promptContext, userId, {
             title: normalizeNullableText(input.title),
-            content
+            content,
+            workspaceId: normalizeNullableText(input.workspaceId)
         });
         const current = this.butlerControlSessionRepository.findLatestOpenByProvider(providerId);
         if (options.closeExistingCurrent && current && current.status !== "closed") {
@@ -229,6 +234,7 @@ export class ButlerControlSessionService {
                     model,
                     reasoningLevel,
                     permissionMode,
+                    providerInstructionFilePath: preparedWorkspace.providerInstructionFilePath,
                     attachments: []
                 }
             });
@@ -257,20 +263,9 @@ export class ButlerControlSessionService {
                 createdAt: timestamp,
                 updatedAt: timestamp
             });
-            if (preparedWorkspace.sandboxId && this.assistantSandboxService) {
-                this.assistantSandboxService.markSandboxUsedByControlSession(preparedWorkspace.sandboxId, userId, created.id);
-            }
             return this.toView(created, userId);
         }
         catch (error) {
-            if (preparedWorkspace.sandboxId && this.assistantSandboxService) {
-                try {
-                    this.assistantSandboxService.removeSandbox(preparedWorkspace.sandboxId, userId);
-                }
-                catch {
-                    // 控制会话没真正启动成功时，尽量把新建的空白沙箱收口，避免残留无主目录。
-                }
-            }
             throw error;
         }
     }
@@ -329,40 +324,23 @@ export class ButlerControlSessionService {
         }
     }
     async prepareWorkspace(profile, promptContext, userId, input) {
-        if (!this.assistantSandboxService) {
-            this.syncWorkspaceContext(profile, promptContext, userId, profile.workspacePath);
-            const workspace = this.workspaceService.importWorkspace(profile.workspacePath, "代码助手");
+        if (input.workspaceId) {
+            const targetWorkspace = this.workspaceService.getWorkspaceOrThrow(input.workspaceId);
+            const runtimeContext = this.syncWorkspaceContext(profile, promptContext, userId, targetWorkspace.path);
             return {
-                workspaceId: workspace.id,
-                sandboxId: null
+                workspaceId: targetWorkspace.id,
+                providerInstructionFilePath: runtimeContext.providerInstructionFilePath
             };
         }
-        const sandbox = await this.assistantSandboxService.createSandbox({
-            userId,
-            title: inferControlSessionSandboxTitle(input.title, input.content),
-            description: "当前助手会话独占的临时工作区",
-            purpose: "butler_control_session",
-            source: {
-                kind: "blank",
-                directoryName: `control-session-${createId().slice(0, 8)}`
-            }
-        });
-        const workspacePath = sandbox.workspace?.path?.trim();
-        if (!workspacePath) {
-            throw new AppError({
-                statusCode: 500,
-                errorCode: "BUTLER_CONTROL_SANDBOX_UNAVAILABLE",
-                detail: "已创建助手沙箱，但未能解析对应工作区路径"
-            });
-        }
-        this.syncWorkspaceContext(profile, promptContext, userId, workspacePath);
+        const runtimeContext = this.syncWorkspaceContext(profile, promptContext, userId, profile.workspacePath);
+        const workspace = this.workspaceService.importWorkspace(profile.workspacePath, "代码助手");
         return {
-            workspaceId: sandbox.workspaceId,
-            sandboxId: sandbox.id
+            workspaceId: workspace.id,
+            providerInstructionFilePath: runtimeContext.providerInstructionFilePath
         };
     }
     syncWorkspaceContext(profile, promptContext, userId, workspacePath) {
-        syncButlerWorkspaceContext({
+        return syncButlerWorkspaceContext({
             profile,
             promptContext,
             userId,
@@ -376,17 +354,19 @@ export class ButlerControlSessionService {
         });
     }
     resolveControlSessionWorkspacePath(profile, controlSessionId, userId) {
-        const sandboxWorkspacePath = this.assistantSandboxService
-            ?.listSandboxes({
-            userId,
-            controlSessionId,
-            statuses: ["active", "archived"],
-            limit: 1
-        })[0]
-            ?.workspace
-            ?.path
-            ?.trim();
-        return sandboxWorkspacePath || profile.workspacePath;
+        const controlSession = this.butlerControlSessionRepository.findById(controlSessionId.trim());
+        const sessionWorkspaceId = controlSession
+            ? this.sessionHistoryService.getSession(controlSession.sessionId, userId)?.workspaceId?.trim() ?? ""
+            : "";
+        if (sessionWorkspaceId) {
+            try {
+                return this.workspaceService.getWorkspaceOrThrow(sessionWorkspaceId).path;
+            }
+            catch {
+                // ignore and fall back to profile workspace path
+            }
+        }
+        return profile.workspacePath;
     }
     markFailed(record, fallbackSummary) {
         this.butlerControlSessionRepository.update({
@@ -428,7 +408,4 @@ function normalizeNullableText(value) {
 function summarizeMessage(content) {
     return content.length > 120 ? `${content.slice(0, 117)}...` : content;
 }
-function inferControlSessionSandboxTitle(title, content) {
-    return title ?? summarizeMessage(content) ?? "助手临时工作区";
-}
 //# sourceMappingURL=butler-control-session-service.js.map

package/dist/server/modules/butler/butler-control-session-service.js.map

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

package/dist/server/modules/butler/butler-controller.d.ts

@@ -16,6 +16,7 @@ import type { PatrolExecutionService } from "./patrol-execution-service.js";
 import type { PatrolRunService } from "./patrol-run-service.js";
 import type { ProjectMemoryService } from "./project-memory-service.js";
 import type { VerificationRunService } from "./verification-run-service.js";
+import type { AffairsLibraryService } from "../workspace/affairs-library-service.js";
 interface ButlerProjectListQuery {
     workspaceId?: string;
     status?: "active" | "paused" | "archived";
@@ -32,6 +33,9 @@ interface ButlerSessionTargetQuery {
 interface ButlerSessionActionContextQuery {
     sessionId?: string;
 }
+interface ButlerCurrentControlSessionQuery {
+    workspaceId?: string;
+}
 interface ButlerInboxListQuery {
     workspaceId?: string;
     projectId?: string;
@@ -236,15 +240,19 @@ export declare class ButlerController {
     private readonly verificationRunService;
     private readonly butlerActionContextService?;
     private readonly butlerControlTimerService?;
-    constructor(butlerProfileService: ButlerProfileService, butlerControlSessionService: ButlerControlSessionService, butlerControlActionService: Pick<ButlerControlActionService, "listCurrentEvents" | "openProject" | "resumeProjectSession" | "startPatrol" | "startVerification">, butlerContextAggregator: Pick<ButlerContextAggregator, "getOverview" | "getSnapshot" | "getProjectContext" | "searchSummaries">, butlerFollowUpService: ButlerFollowUpService, butlerInboxService: ButlerInboxService, butlerNotificationService: ButlerNotificationService, butlerProjectService: ButlerProjectService, butlerSessionService: ButlerSessionService, projectMemoryService: ProjectMemoryService, patrolPlanService: PatrolPlanService, patrolRunService: PatrolRunService, patrolExecutionService: PatrolExecutionService, verificationRunService: VerificationRunService, butlerActionContextService?: Pick<ButlerActionContextService, "getSessionActionContext" | "invalidateSessionActionContext"> | undefined, butlerControlTimerService?: Pick<ButlerControlTimerService, "listTimers" | "getTimer" | "createTimer" | "cancelTimer"> | undefined);
-    readonly getProfile: (_request: FastifyRequest, reply: FastifyReply) => Promise<void>;
+    private readonly affairsLibraryService?;
+    constructor(butlerProfileService: ButlerProfileService, butlerControlSessionService: ButlerControlSessionService, butlerControlActionService: Pick<ButlerControlActionService, "listCurrentEvents" | "openProject" | "resumeProjectSession" | "startPatrol" | "startVerification">, butlerContextAggregator: Pick<ButlerContextAggregator, "getOverview" | "getSnapshot" | "getProjectContext" | "searchSummaries">, butlerFollowUpService: ButlerFollowUpService, butlerInboxService: ButlerInboxService, butlerNotificationService: ButlerNotificationService, butlerProjectService: ButlerProjectService, butlerSessionService: ButlerSessionService, projectMemoryService: ProjectMemoryService, patrolPlanService: PatrolPlanService, patrolRunService: PatrolRunService, patrolExecutionService: PatrolExecutionService, verificationRunService: VerificationRunService, butlerActionContextService?: Pick<ButlerActionContextService, "getSessionActionContext" | "invalidateSessionActionContext"> | undefined, butlerControlTimerService?: Pick<ButlerControlTimerService, "listTimers" | "getTimer" | "createTimer" | "cancelTimer"> | undefined, affairsLibraryService?: Pick<AffairsLibraryService, "getGlobalBinding"> | undefined);
+    readonly getProfile: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
     readonly initProfile: (request: FastifyRequest<{
         Body: ButlerProfilePatchInput;
     }>, reply: FastifyReply) => Promise<void>;
     readonly updateProfile: (request: FastifyRequest<{
         Body: ButlerProfilePatchInput;
     }>, reply: FastifyReply) => Promise<void>;
-    readonly getCurrentControlSession: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
+    private resolveAffairsSetupCompleted;
+    readonly getCurrentControlSession: (request: FastifyRequest<{
+        Querystring: ButlerCurrentControlSessionQuery;
+    }>, reply: FastifyReply) => Promise<void>;
     readonly listControlSessions: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
     readonly getControlSession: (request: FastifyRequest<{
         Params: ButlerControlSessionParams;

package/dist/server/modules/butler/butler-controller.js

@@ -17,7 +17,8 @@ export class ButlerController {
     verificationRunService;
     butlerActionContextService;
     butlerControlTimerService;
-    constructor(butlerProfileService, butlerControlSessionService, butlerControlActionService, butlerContextAggregator, butlerFollowUpService, butlerInboxService, butlerNotificationService, butlerProjectService, butlerSessionService, projectMemoryService, patrolPlanService, patrolRunService, patrolExecutionService, verificationRunService, butlerActionContextService, butlerControlTimerService) {
+    affairsLibraryService;
+    constructor(butlerProfileService, butlerControlSessionService, butlerControlActionService, butlerContextAggregator, butlerFollowUpService, butlerInboxService, butlerNotificationService, butlerProjectService, butlerSessionService, projectMemoryService, patrolPlanService, patrolRunService, patrolExecutionService, verificationRunService, butlerActionContextService, butlerControlTimerService, affairsLibraryService) {
         this.butlerProfileService = butlerProfileService;
         this.butlerControlSessionService = butlerControlSessionService;
         this.butlerControlActionService = butlerControlActionService;
@@ -34,31 +35,45 @@ export class ButlerController {
         this.verificationRunService = verificationRunService;
         this.butlerActionContextService = butlerActionContextService;
         this.butlerControlTimerService = butlerControlTimerService;
+        this.affairsLibraryService = affairsLibraryService;
     }
-    getProfile = async (_request, reply) => {
+    getProfile = async (request, reply) => {
         const profile = this.butlerProfileService.getProfile();
+        const userId = requireUserId(request);
         reply.send({
-            initialized: profile !== null,
+            initialized: profile?.setupCompleted === true,
+            affairsSetupCompleted: this.resolveAffairsSetupCompleted(userId, profile?.setupCompleted === true),
             profile
         });
     };
     initProfile = async (request, reply) => {
         const profile = this.butlerProfileService.initProfile(request.body ?? {});
+        const userId = requireUserId(request);
         reply.status(201).send({
             initialized: true,
+            affairsSetupCompleted: this.resolveAffairsSetupCompleted(userId, true),
             profile
         });
     };
     updateProfile = async (request, reply) => {
         const profile = this.butlerProfileService.updateProfile(request.body ?? {});
+        const userId = requireUserId(request);
         reply.send({
             initialized: true,
+            affairsSetupCompleted: this.resolveAffairsSetupCompleted(userId, true),
             profile
         });
     };
+    resolveAffairsSetupCompleted(userId, butlerInitialized) {
+        if (!butlerInitialized) {
+            return false;
+        }
+        const binding = this.affairsLibraryService?.getGlobalBinding?.(userId) ?? null;
+        return Boolean(binding?.rootDir?.trim());
+    }
     getCurrentControlSession = async (request, reply) => {
         reply.send({
-            controlSession: this.butlerControlSessionService.getCurrentSession(requireUserId(request))
+            controlSession: this.butlerControlSessionService.getCurrentSession(requireUserId(request), request.query.workspaceId)
         });
     };
     listControlSessions = async (request, reply) => {