@jingyi0605/codingns 0.4.0 → 0.5.1

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

@@ -9,6 +9,7 @@ import type { SessionMessageOriginRepository } from "../../storage/repositories/
 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";
 export interface ButlerControlSessionView extends ButlerControlSession {
     session: SessionListItem;
 }
@@ -41,7 +42,8 @@ export declare class ButlerControlSessionService {
     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);
+    private readonly providerUsageLimitGuardService;
+    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);
     getCurrentSession(userId: string): ButlerControlSessionView | null;
     getSession(controlSessionId: string, userId: string): ButlerControlSessionView | null;
     listSessions(userId: string): ButlerControlSessionView[];
@@ -64,6 +66,7 @@ export declare class ButlerControlSessionService {
     private requireCurrentSession;
     private requireSessionById;
     private toView;
+    private ensureSessionCanStartWork;
     private prepareWorkspace;
     private syncWorkspaceContext;
     private resolveControlSessionWorkspacePath;

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

@@ -18,7 +18,8 @@ export class ButlerControlSessionService {
     sourceClaudeCodeHomeDir;
     sessionMessageOriginRepository;
     assistantSandboxService;
-    constructor(butlerProfileService, butlerControlSessionRepository, workspaceService, sessionHistoryService, sessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, skillManagerService, codexHomeDir = null, sourceCodexHomeDir = null, claudeCodeHomeDir = null, sourceClaudeCodeHomeDir = null, sessionMessageOriginRepository = null, assistantSandboxService = null) {
+    providerUsageLimitGuardService;
+    constructor(butlerProfileService, butlerControlSessionRepository, workspaceService, sessionHistoryService, sessionLiveRuntimeService, butlerContextAggregator, butlerAuthService, skillManagerService, codexHomeDir = null, sourceCodexHomeDir = null, claudeCodeHomeDir = null, sourceClaudeCodeHomeDir = null, sessionMessageOriginRepository = null, assistantSandboxService = null, providerUsageLimitGuardService = null) {
         this.butlerProfileService = butlerProfileService;
         this.butlerControlSessionRepository = butlerControlSessionRepository;
         this.workspaceService = workspaceService;
@@ -33,6 +34,7 @@ export class ButlerControlSessionService {
         this.sourceClaudeCodeHomeDir = sourceClaudeCodeHomeDir;
         this.sessionMessageOriginRepository = sessionMessageOriginRepository;
         this.assistantSandboxService = assistantSandboxService;
+        this.providerUsageLimitGuardService = providerUsageLimitGuardService;
     }
     getCurrentSession(userId) {
         const profile = this.butlerProfileService.ensureInitialized();
@@ -147,6 +149,7 @@ export class ButlerControlSessionService {
     async resumeCurrentSession(userId) {
         const profile = this.butlerProfileService.ensureInitialized();
         const current = this.requireCurrentSession(profile.providerId);
+        await this.ensureSessionCanStartWork(current.sessionId, userId, "助手控制会话");
         const promptContext = await this.butlerContextAggregator.resolvePromptContext(userId, null);
         this.syncWorkspaceContext(profile, promptContext, userId, this.resolveControlSessionWorkspacePath(profile, current.id, userId));
         try {
@@ -174,6 +177,7 @@ export class ButlerControlSessionService {
         const current = input.controlSessionId?.trim()
             ? this.requireSessionById(input.controlSessionId, profile.providerId)
             : this.requireCurrentSession(profile.providerId);
+        await this.ensureSessionCanStartWork(current.sessionId, userId, "助手控制会话");
         const content = normalizeControlContent(input.content, "");
         const requestedAt = nowIso();
         const clientRequestId = recordButlerProxyMessageOrigin(this.sessionMessageOriginRepository, {
@@ -262,6 +266,21 @@ export class ButlerControlSessionService {
             session: this.sessionHistoryService.getSession(record.sessionId, userId)
         };
     }
+    async ensureSessionCanStartWork(sessionId, userId, sourceLabel) {
+        if (!this.providerUsageLimitGuardService) {
+            return;
+        }
+        const blocked = await this.providerUsageLimitGuardService.resolveBlockingInspection([
+            {
+                sessionId,
+                userId,
+                sourceLabel
+            }
+        ], nowIso());
+        if (blocked) {
+            throw this.providerUsageLimitGuardService.createBlockedAppError(blocked);
+        }
+    }
     async prepareWorkspace(profile, promptContext, userId, input) {
         if (!this.assistantSandboxService) {
             this.syncWorkspaceContext(profile, promptContext, userId, profile.workspacePath);

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":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AAkBpD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAC3E,OAAO,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AA6B7F,MAAM,OAAO,2BAA2B;IAEnB;IACA;IACA;IACA;IAIA;IAIA;IACA;IACA;IAIA;IACA;IACA;IACA;IACA;IAIA;IAIA;IA9BnB,YACmB,oBAA0C,EAC1C,8BAA8D,EAC9D,gBAA2D,EAC3D,qBAGhB,EACgB,yBAGhB,EACgB,uBAA8E,EAC9E,iBAAiG,EACjG,mBAGhB,EACgB,eAA8B,IAAI,EAClC,qBAAoC,IAAI,EACxC,oBAAmC,IAAI,EACvC,0BAAyC,IAAI,EAC7C,iCAGN,IAAI,EACE,0BAGN,IAAI,EACE,iCAGN,IAAI;QAhCE,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,mCAA8B,GAA9B,8BAA8B,CAAgC;QAC9D,qBAAgB,GAAhB,gBAAgB,CAA2C;QAC3D,0BAAqB,GAArB,qBAAqB,CAGrC;QACgB,8BAAyB,GAAzB,yBAAyB,CAGzC;QACgB,4BAAuB,GAAvB,uBAAuB,CAAuD;QAC9E,sBAAiB,GAAjB,iBAAiB,CAAgF;QACjG,wBAAmB,GAAnB,mBAAmB,CAGnC;QACgB,iBAAY,GAAZ,YAAY,CAAsB;QAClC,uBAAkB,GAAlB,kBAAkB,CAAsB;QACxC,sBAAiB,GAAjB,iBAAiB,CAAsB;QACvC,4BAAuB,GAAvB,uBAAuB,CAAsB;QAC7C,mCAA8B,GAA9B,8BAA8B,CAGhC;QACE,4BAAuB,GAAvB,uBAAuB,CAGzB;QACE,mCAA8B,GAA9B,8BAA8B,CAGhC;IACd,CAAC;IAEJ,iBAAiB,CAAC,MAAc;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEjG,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,UAAU,CAAC,gBAAwB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAEtF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,YAAY,CAAC,MAAc;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC,8BAA8B;aACvC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC;aAClC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAClD,CAAC;IAED,mBAAmB;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEjG,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC5C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;YACzC,GAAG,OAAO;YACV,MAAM,EAAE,QAAQ;YAChB,SAAS,EAAE,MAAM,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,QAAwC,EAAE;QAE1C,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACjD,MAAM,cAAc,GAAG,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,cAAc,GAAG,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnE,MAAM,eAAe,GAAG,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC;eAC/D,yCAAyC,QAAQ,EAAE,EAAE,CAAC;QAC3D,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,IAAI,IAAI,CAAC,CAAC;QAC7G,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE;YACpF,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC;YACzC,OAAO;SACR,CAAC,CAAC;QACH,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAEjG,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC3C,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;gBACzC,GAAG,OAAO;gBACV,MAAM,EAAE,QAAQ;gBAChB,SAAS,EAAE,MAAM,EAAE;aACpB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,gBAAgB,CAAC;gBACpE,WAAW,EAAE,iBAAiB,CAAC,WAAW;gBAC1C,MAAM;gBACN,QAAQ,EAAE,OAAO,CAAC,UAAU;gBAC5B,OAAO;gBACP,eAAe;gBACf,cAAc,EAAE;oBACd,KAAK;oBACL,cAAc;oBACd,cAAc;oBACd,WAAW,EAAE,EAAE;iBAChB;aACF,CAAC,CAAC;YACH,8BAA8B,CAAC,IAAI,CAAC,8BAA8B,EAAE;gBAClE,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,eAAe;gBACf,SAAS,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI;gBAC7C,OAAO;gBACP,SAAS,EAAE,OAAO,CAAC,UAAU;gBAC7B,WAAW,EAAE,wBAAwB,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,UAAU,EAAE;aAC/E,CAAC,CAAC;YACH,MAAM,SAAS,GAAG,OAAO,CAAC,UAAU,CAAC;YACrC,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;gBACzD,EAAE,EAAE,QAAQ,EAAE;gBACd,UAAU,EAAE,OAAO,CAAC,UAAU;gBAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,MAAM;gBAChC,KAAK,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC;gBACzC,YAAY,EAAE,qBAAqB,CAAC,KAAK,CAAC,YAAY,CAAC;gBACvD,KAAK;gBACL,cAAc;gBACd,cAAc;gBACd,MAAM,EAAE,SAAS;gBACjB,kBAAkB,EAAE,aAAa,CAAC,OAAO;gBACzC,WAAW,EAAE,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,gBAAgB,CAAC,OAAO,CAAC;gBAC5E,SAAS,EAAE,SAAS;gBACpB,SAAS,EAAE,SAAS;aACrB,CAAC,CAAC;YAEH,IAAI,iBAAiB,CAAC,SAAS,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAChE,IAAI,CAAC,uBAAuB,CAAC,+BAA+B,CAC1D,iBAAiB,CAAC,SAAS,EAC3B,MAAM,EACN,OAAO,CAAC,EAAE,CACX,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,iBAAiB,CAAC,SAAS,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAChE,IAAI,CAAC;oBACH,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;gBAClF,CAAC;gBAAC,MAAM,CAAC;oBACP,sCAAsC;gBACxC,CAAC;YACH,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,MAAc;QAMd,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC5F,IAAI,CAAC,oBAAoB,CACvB,OAAO,EACP,aAAa,EACb,MAAM,EACN,IAAI,CAAC,kCAAkC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CACrE,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClF,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;gBACzD,GAAG,OAAO;gBACV,MAAM,EAAE,SAAS;gBACjB,kBAAkB,EAAE,aAAa,CAAC,OAAO;gBACzC,SAAS,EAAE,OAAO,CAAC,SAAS;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;gBAC/B,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;aAC7C,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;YACrC,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAc,EACd,KAAoC;QAUpC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GACX,KAAK,CAAC,gBAAgB,EAAE,IAAI,EAAE;YAC5B,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,UAAU,CAAC;YACrE,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACrD,MAAM,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC1E,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC;QAC7B,MAAM,eAAe,GAAG,8BAA8B,CAAC,IAAI,CAAC,8BAA8B,EAAE;YAC1F,SAAS,EAAE,OAAO,CAAC,SAAS;YAC5B,eAAe,EAAE,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC;YAC7D,OAAO;YACP,SAAS,EAAE,WAAW;YACtB,WAAW,EAAE,uBAAuB,OAAO,CAAC,EAAE,IAAI,WAAW,EAAE;SAChE,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC;QAClE,MAAM,cAAc,GAAG,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC;QAC7F,MAAM,cAAc,GAAG,qBAAqB,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC;QAC7F,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/F,IAAI,CAAC,oBAAoB,CACvB,OAAO,EACP,aAAa,EACb,MAAM,EACN,IAAI,CAAC,kCAAkC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CACrE,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAC,eAAe,CAAC;gBAClE,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,MAAM;gBACN,OAAO;gBACP,eAAe;gBACf,cAAc,EAAE;oBACd,KAAK;oBACL,cAAc;oBACd,cAAc;oBACd,WAAW,EAAE,EAAE;iBAChB;aACF,CAAC,CAAC;YACH,8BAA8B,CAAC,IAAI,CAAC,8BAA8B,EAAE;gBAClE,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,eAAe;gBACf,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,IAAI;gBAC5C,OAAO;gBACP,SAAS,EAAE,MAAM,CAAC,UAAU;gBAC5B,WAAW,EAAE,uBAAuB,OAAO,CAAC,EAAE,IAAI,MAAM,CAAC,UAAU,EAAE;aACtE,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;gBACzD,GAAG,OAAO;gBACV,KAAK;gBACL,cAAc;gBACd,cAAc;gBACd,MAAM,EAAE,SAAS;gBACjB,kBAAkB,EAAE,aAAa,CAAC,OAAO;gBACzC,WAAW,EAAE,gBAAgB,CAAC,OAAO,CAAC;gBACtC,SAAS,EAAE,MAAM,CAAC,UAAU;aAC7B,CAAC,CAAC;YAEH,OAAO;gBACL,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC;gBAC5C,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;gBAC3C,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,OAAO,EAAE,MAAM,CAAC,OAAO;aACxB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,qBAAqB,CAAC,UAAuC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAEzF,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC5C,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,kCAAkC;gBAC7C,MAAM,EAAE,2BAA2B;aACpC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,kBAAkB,CACxB,gBAAwB,EACxB,UAAuC;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,8BAA8B,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,EAAE,CAAC,CAAC;QAErF,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC9E,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,kCAAkC;gBAC7C,MAAM,EAAE,iBAAiB;aAC1B,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,MAA4B,EAAE,MAAc;QACzD,OAAO;YACL,GAAG,MAAM;YACT,OAAO,EAAE,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC;SACzE,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,yBAAyB,CACrC,SAAiB,EACjB,MAAc,EACd,WAAmB;QAEnB,IAAI,CAAC,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACzC,OAAO;QACT,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,8BAA8B,CAAC,yBAAyB,CAAC;YAClF;gBACE,SAAS;gBACT,MAAM;gBACN,WAAW;aACZ;SACF,EAAE,MAAM,EAAE,CAAC,CAAC;QAEb,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,IAAI,CAAC,8BAA8B,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;QAC3E,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAC5B,OAAsB,EACtB,aAAkC,EAClC,MAAc,EACd,KAGC;QAED,IAAI,CAAC,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAClC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YACjF,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;YAEvF,OAAO;gBACL,WAAW,EAAE,SAAS,CAAC,EAAE;gBACzB,SAAS,EAAE,IAAI;aAChB,CAAC;QACJ,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,CAAC;YAC/D,MAAM;YACN,KAAK,EAAE,+BAA+B,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YAClE,WAAW,EAAE,gBAAgB;YAC7B,OAAO,EAAE,wBAAwB;YACjC,MAAM,EAAE;gBACN,IAAI,EAAE,OAAO;gBACb,aAAa,EAAE,mBAAmB,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;aAC3D;SACF,CAAC,CAAC;QACH,MAAM,aAAa,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;QAEtD,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC;gBACjB,UAAU,EAAE,GAAG;gBACf,SAAS,EAAE,oCAAoC;gBAC/C,MAAM,EAAE,sBAAsB;aAC/B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;QAEzE,OAAO;YACL,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,SAAS,EAAE,OAAO,CAAC,EAAE;SACtB,CAAC;IACJ,CAAC;IAEO,oBAAoB,CAC1B,OAAsB,EACtB,aAAkC,EAClC,MAAc,EACd,aAAqB;QAErB,0BAA0B,CAAC;YACzB,OAAO;YACP,aAAa;YACb,MAAM;YACN,aAAa;YACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,uBAAuB,EAAE,IAAI,CAAC,uBAAuB;SACtD,CAAC,CAAC;IACL,CAAC;IAEO,kCAAkC,CACxC,OAAsB,EACtB,gBAAwB,EACxB,MAAc;QAEd,MAAM,oBAAoB,GAAG,IAAI,CAAC,uBAAuB;YACvD,EAAE,aAAa,CAAC;YACd,MAAM;YACN,gBAAgB;YAChB,QAAQ,EAAE,CAAC,QAAQ,EAAE,UAAU,CAAC;YAChC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC,CAAC,CAAC;YACL,EAAE,SAAS;YACX,EAAE,IAAI;YACN,EAAE,IAAI,EAAE,CAAC;QAEX,OAAO,oBAAoB,IAAI,OAAO,CAAC,aAAa,CAAC;IACvD,CAAC;IAEO,UAAU,CAAC,MAA4B,EAAE,eAAuB;QACtE,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;YACzC,GAAG,MAAM;YACT,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,MAAM,CAAC,WAAW,IAAI,eAAe;YAClD,SAAS,EAAE,MAAM,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;IAED,8BAA8B,CAAC,KAI9B;QACC,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5F,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;YAChD,GAAG,OAAO;YACV,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,WAAW,EAAE,qBAAqB,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,WAAW;YAC5E,SAAS,EAAE,MAAM,EAAE;SACpB,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,uBAAuB,CAAC,KAAyB,EAAE,QAAgB;IAC1E,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;IAEpD,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,QAAQ,CAAC;YACjB,UAAU,EAAE,GAAG;YACf,SAAS,EAAE,eAAe;YAC1B,MAAM,EAAE,sBAAsB;YAC9B,KAAK,EAAE,SAAS;SACjB,CAAC,CAAC;IACL,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAgC;IAC7D,MAAM,UAAU,GAAG,KAAK,EAAE,IAAI,EAAE,CAAC;IACjC,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC;AACxC,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe;IACvC,OAAO,OAAO,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC;AACxE,CAAC;AAED,SAAS,+BAA+B,CAAC,KAAoB,EAAE,OAAe;IAC5E,OAAO,KAAK,IAAI,gBAAgB,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;AACzD,CAAC"}

package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.d.ts

@@ -1,5 +1,4 @@
 import type { ButlerProject, SessionRunningState } from "../../types/domain.js";
-export type ButlerFollowUpEvaluationDecision = "continue" | "waiting_user" | "completed" | "failed";
 export interface ButlerFollowUpEvaluationInstructionEnvelope {
     providerId: "codex" | "claude-code";
     outputContractVersion: string;
@@ -13,10 +12,12 @@ export interface ButlerFollowUpEvaluationInstructionEnvelope {
     };
 }
 export interface BuildButlerFollowUpEvaluationInstructionInput {
+    taskId: string;
     providerId: "codex" | "claude-code";
     project: ButlerProject;
     sessionId: string;
     butlerSessionId: string;
+    assistantSessionId: string;
     sessionTitle: string | null;
     objective: string;
     completionCriteria: string;

package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js

@@ -1,11 +1,11 @@
-const OUTPUT_CONTRACT_VERSION = "butler-follow-up-evaluation-v1";
+const OUTPUT_CONTRACT_VERSION = "butler-follow-up-cli-v1";
 export class ButlerFollowUpEvaluationInstructionAdapter {
     buildInstruction(input) {
         const transcript = input.transcriptLines.length > 0
             ? input.transcriptLines.join("\n")
             : "- 最近没有可用消息，请保守判断，并明确说明缺口。";
         const prompt = [
-            "你现在是代码助手的后台跟进评估器，不负责和用户闲聊，也不负责直接开发。",
+            "你现在是在真实助手会话里执行的专用跟进助手，不负责和用户闲聊，也不负责直接开发当前仓库。",
             "你的唯一职责是判断：当前开发会话是否已经真正完成用户目标，是否必须等用户决定，还是应该继续自动推动。",
             "禁止用套话凑结论，禁止只看最后一句就草率下判断。要结合目标、当前运行态和最近消息整体判断。",
             "如果目标或上下文里提到了 spec，完成标准只能按 spec 明确要求的必做项判断。",
@@ -14,25 +14,33 @@ export class ButlerFollowUpEvaluationInstructionAdapter {
             "除非目标本身明确要求，否则重构、补测试、补体验优化、顺手整理代码都不是必须完成条件。",
             "如果信息不足，可以明确说信息不足；但只有在真的缺关键决策信息时，才返回 waiting_user。",
             "如果已经达到预设的自动推进轮数上限，你不能再通过新增目标来继续扩会话范围。",
+            "你可以直接调用 codingns assistant CLI 检查项目和目标会话状态。",
+            "这一轮的正式结论必须通过 `codingns assistant follow-ups.*` 命令回写到跟进任务，而不是输出 JSON 让 Host 猜。",
+            "只要决定继续推进，就必须先用 `codingns assistant sessions send` 把中文跟进消息发到目标开发会话，再用 `codingns assistant follow-ups continue` 回写。",
+            "如果决定等待用户，就使用 `codingns assistant follow-ups waiting-user`。",
+            "如果决定已经完成，就使用 `codingns assistant follow-ups complete`。",
+            "如果上下文损坏或确实无法可靠继续，就使用 `codingns assistant follow-ups fail`。",
             "",
             "判断标准：",
-            "1. 只有目标已经实质完成，而且满足预设结束条件，才返回 completed；不能把建议项没做当成未完成。",
-            "2. 只有确实需要用户做选择、补业务信息、确认高风险操作，或者已经达到自动推进轮数上限时，才返回 waiting_user。",
-            "3. 只要目标还没完成、而且继续推进不会越权，就返回 continue，并给出下一条要发给开发会话的明确中文指令。",
-            "4. 只有当前上下文已经无法可靠判断，或者会话明显坏掉到无法继续时，才返回 failed。",
+            "1. 只有目标已经实质完成，而且满足预设结束条件，才调用 complete；不能把建议项没做当成未完成。",
+            "2. 只有确实需要用户做选择、补业务信息、确认高风险操作，或者已经达到自动推进轮数上限时，才调用 waiting-user。",
+            "3. 只要目标还没完成、而且继续推进不会越权，就先发消息到目标开发会话，再调用 continue。",
+            "4. 只有当前上下文已经无法可靠判断，或者会话明显坏掉到无法继续时，才调用 fail。",
             "",
-            "输出要求：",
+            "执行要求：",
             "- 全部使用中文。",
-            "- 先写一小段中文结论，控制在 2 句内。",
-            "- 最后必须补一个 JSON 代码块，字段必须完整。",
-            "- decision 只能是 continue / waiting_user / completed / failed。",
-            "- continuePrompt 必须是要发给开发会话的下一条中文消息；decision 不是 continue 时填 null。",
-            "- waitingReason 只在 decision=waiting_user 时填写，其它情况填 null。",
+            "- 先自己检查当前项目、目标会话、跟进任务，再决定动作。",
+            "- 不要把命令建议写成自然语言结论后就停下，必须真的执行命令。",
+            "- 如果走 continue，`--continue-prompt` 必须回填你刚刚已经发到目标开发会话的那条中文消息原文。",
+            "- `--summary` 要写本轮结构化结论，后端会把它直接写入跟进任务。",
+            "- 命令执行完成后，你可以再补 1 到 2 句中文说明，但这段说明不是结构化结果来源。",
             "",
+            `跟进任务 ID：${input.taskId}`,
             `项目名称：${input.project.name}`,
             `项目路径：${input.project.repoRoot}`,
             `代码助手会话 ID：${input.butlerSessionId}`,
             `真实会话 ID：${input.sessionId}`,
+            `当前跟进助手会话 ID：${input.assistantSessionId}`,
             `会话标题：${input.sessionTitle ?? "未命名会话"}`,
             `用户目标：${input.objective}`,
             `预设结束条件：${input.completionCriteria}`,
@@ -45,20 +53,14 @@ export class ButlerFollowUpEvaluationInstructionAdapter {
             `上一轮自动化摘要：${input.lastAutomationSummary?.trim() || "无"}`,
             `最近一条助手结论：${input.latestAssistantText?.trim() || "无"}`,
             "",
-            "最近消息摘录：",
-            transcript,
+            "命令模板：",
+            `- 继续推进：codingns assistant sessions send ${input.sessionId} --message \"<你刚发给目标会话的中文消息>\" && codingns assistant follow-ups continue ${input.taskId} --summary \"<本轮结论>\" --continue-prompt \"<同一条消息原文>\"`,
+            `- 等待用户：codingns assistant follow-ups waiting-user ${input.taskId} --summary \"<本轮结论>\" --waiting-reason \"<必须等用户的原因>\"`,
+            `- 已完成：codingns assistant follow-ups complete ${input.taskId} --summary \"<完成结论>\"`,
+            `- 失败：codingns assistant follow-ups fail ${input.taskId} --summary \"<失败结论>\" --reason \"<失败原因>\"`,
             "",
-            "最终输出格式：",
-            "```json",
-            JSON.stringify({
-                decision: "continue",
-                summary: "一句中文结论",
-                waitingReason: null,
-                continuePrompt: "继续未完成的开发工作，先核对当前目标还有哪些没做完，然后直接补齐，不要只做总结。",
-                riskLevel: "medium"
-            }, null, 2),
-            "```",
-            "riskLevel 只能是 low / medium / high。"
+            "最近消息摘录：",
+            transcript
         ].join("\n");
         return {
             providerId: input.providerId,

package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"butler-follow-up-evaluation-instruction-adapter.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-follow-up-evaluation-instruction-adapter.ts"],"names":[],"mappings":"AAEA,MAAM,uBAAuB,GAAG,gCAAgC,CAAC;AAuCjE,MAAM,OAAO,0CAA0C;IACrD,gBAAgB,CACd,KAAoD;QAEpD,MAAM,UAAU,GACd,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YAC9B,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,2BAA2B,CAAC;QAClC,MAAM,MAAM,GAAG;YACb,qCAAqC;YACrC,oDAAoD;YACpD,+CAA+C;YAC/C,4CAA4C;YAC5C,6CAA6C;YAC7C,oDAAoD;YACpD,4CAA4C;YAC5C,mDAAmD;YACnD,uCAAuC;YACvC,EAAE;YACF,OAAO;YACP,uDAAuD;YACvD,gEAAgE;YAChE,2DAA2D;YAC3D,+CAA+C;YAC/C,EAAE;YACF,OAAO;YACP,WAAW;YACX,uBAAuB;YACvB,4BAA4B;YAC5B,8DAA8D;YAC9D,mEAAmE;YACnE,0DAA0D;YAC1D,EAAE;YACF,QAAQ,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,QAAQ,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YAChC,aAAa,KAAK,CAAC,eAAe,EAAE;YACpC,WAAW,KAAK,CAAC,SAAS,EAAE;YAC5B,QAAQ,KAAK,CAAC,YAAY,IAAI,OAAO,EAAE;YACvC,QAAQ,KAAK,CAAC,SAAS,EAAE;YACzB,UAAU,KAAK,CAAC,kBAAkB,EAAE;YACpC,SAAS,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE;YACrC,SAAS,KAAK,CAAC,YAAY,EAAE;YAC7B,UAAU,KAAK,CAAC,aAAa,IAAI,IAAI,EAAE;YACvC,YAAY,KAAK,CAAC,iBAAiB,EAAE;YACrC,cAAc,KAAK,CAAC,oBAAoB,EAAE;YAC1C,YAAY,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE;YAC/E,YAAY,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACxD,YAAY,KAAK,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACtD,EAAE;YACF,SAAS;YACT,UAAU;YACV,EAAE;YACF,SAAS;YACT,SAAS;YACT,IAAI,CAAC,SAAS,CACZ;gBACE,QAAQ,EAAE,UAAU;gBACpB,OAAO,EAAE,QAAQ;gBACjB,aAAa,EAAE,IAAI;gBACnB,cAAc,EAAE,0CAA0C;gBAC1D,SAAS,EAAE,QAAQ;aACpB,EACD,IAAI,EACJ,CAAC,CACF;YACD,KAAK;YACL,oCAAoC;SACrC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,qBAAqB,EAAE,uBAAuB;YAC9C,MAAM;YACN,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC3B,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC/B,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,mBAAmB,EAAE,KAAK,CAAC,eAAe,CAAC,MAAM;aAClD;SACF,CAAC;IACJ,CAAC;CACF"}
+{"version":3,"file":"butler-follow-up-evaluation-instruction-adapter.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-follow-up-evaluation-instruction-adapter.ts"],"names":[],"mappings":"AAEA,MAAM,uBAAuB,GAAG,yBAAyB,CAAC;AAmC1D,MAAM,OAAO,0CAA0C;IACrD,gBAAgB,CACd,KAAoD;QAEpD,MAAM,UAAU,GACd,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC;YAC9B,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC;YAClC,CAAC,CAAC,2BAA2B,CAAC;QAClC,MAAM,MAAM,GAAG;YACb,8CAA8C;YAC9C,oDAAoD;YACpD,+CAA+C;YAC/C,4CAA4C;YAC5C,6CAA6C;YAC7C,oDAAoD;YACpD,4CAA4C;YAC5C,mDAAmD;YACnD,uCAAuC;YACvC,6CAA6C;YAC7C,+EAA+E;YAC/E,mHAAmH;YACnH,4DAA4D;YAC5D,wDAAwD;YACxD,4DAA4D;YAC5D,EAAE;YACF,OAAO;YACP,sDAAsD;YACtD,gEAAgE;YAChE,mDAAmD;YACnD,6CAA6C;YAC7C,EAAE;YACF,OAAO;YACP,WAAW;YACX,8BAA8B;YAC9B,iCAAiC;YACjC,gEAAgE;YAChE,wCAAwC;YACxC,6CAA6C;YAC7C,EAAE;YACF,WAAW,KAAK,CAAC,MAAM,EAAE;YACzB,QAAQ,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;YAC5B,QAAQ,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YAChC,aAAa,KAAK,CAAC,eAAe,EAAE;YACpC,WAAW,KAAK,CAAC,SAAS,EAAE;YAC5B,eAAe,KAAK,CAAC,kBAAkB,EAAE;YACzC,QAAQ,KAAK,CAAC,YAAY,IAAI,OAAO,EAAE;YACvC,QAAQ,KAAK,CAAC,SAAS,EAAE;YACzB,UAAU,KAAK,CAAC,kBAAkB,EAAE;YACpC,SAAS,KAAK,CAAC,YAAY,IAAI,IAAI,EAAE;YACrC,SAAS,KAAK,CAAC,YAAY,EAAE;YAC7B,UAAU,KAAK,CAAC,aAAa,IAAI,IAAI,EAAE;YACvC,YAAY,KAAK,CAAC,iBAAiB,EAAE;YACrC,cAAc,KAAK,CAAC,oBAAoB,EAAE;YAC1C,YAAY,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,GAAG,KAAK,CAAC,iBAAiB,EAAE,CAAC,CAAC,EAAE;YAC/E,YAAY,KAAK,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACxD,YAAY,KAAK,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE;YACtD,EAAE;YACF,OAAO;YACP,2CAA2C,KAAK,CAAC,SAAS,4EAA4E,KAAK,CAAC,MAAM,uDAAuD;YACzM,qDAAqD,KAAK,CAAC,MAAM,uDAAuD;YACxH,gDAAgD,KAAK,CAAC,MAAM,uBAAuB;YACnF,2CAA2C,KAAK,CAAC,MAAM,2CAA2C;YAClG,EAAE;YACF,SAAS;YACT,UAAU;SACX,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEb,OAAO;YACL,UAAU,EAAE,KAAK,CAAC,UAAU;YAC5B,qBAAqB,EAAE,uBAAuB;YAC9C,MAAM;YACN,QAAQ,EAAE;gBACR,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBAC3B,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI;gBAC/B,SAAS,EAAE,KAAK,CAAC,SAAS;gBAC1B,eAAe,EAAE,KAAK,CAAC,eAAe;gBACtC,mBAAmB,EAAE,KAAK,CAAC,eAAe,CAAC,MAAM;aAClD;SACF,CAAC;IACJ,CAAC;CACF"}

package/dist/server/modules/butler/butler-follow-up-service.d.ts

@@ -10,6 +10,7 @@ import type { SessionLiveRuntimeService } from "../sessions/session-live-runtime
 import { ProviderAdapterRegistry } from "./provider-adapter-registry.js";
 import { ButlerFollowUpEvaluationInstructionAdapter } from "./butler-follow-up-evaluation-instruction-adapter.js";
 import type { WorkspaceService } from "../workspace/workspace-service.js";
+import { SessionProviderUsageLimitGuardService } from "../sessions/session-provider-usage-guard-service.js";
 export interface ButlerFollowUpTaskView {
     id: string;
     projectId: string;
@@ -17,6 +18,9 @@ export interface ButlerFollowUpTaskView {
     workspaceId: string;
     butlerSessionId: string;
     sessionId: string;
+    providerId: ButlerFollowUpTask["providerId"];
+    assistantButlerSessionId: string;
+    assistantSessionId: string;
     sessionTitle: string | null;
     objective: string;
     completionCriteria: string;
@@ -46,11 +50,27 @@ export interface ButlerFollowUpRunDueTasksResult {
 export interface CreateButlerFollowUpTaskInput {
     projectId: string;
     butlerSessionId: string;
+    providerId: ButlerFollowUpTask["providerId"];
     objective: string;
     completionCriteria?: string;
     maxAutoContinueCount?: number;
     checkIntervalSeconds?: number;
 }
+export interface ContinueButlerFollowUpTaskInput {
+    summary: string;
+    continuePrompt: string;
+}
+export interface WaitingUserButlerFollowUpTaskInput {
+    summary: string;
+    waitingReason: string;
+}
+export interface CompleteButlerFollowUpTaskInput {
+    summary: string;
+}
+export interface FailButlerFollowUpTaskInput {
+    summary: string;
+    reason?: string | null;
+}
 export declare class ButlerFollowUpService {
     private readonly butlerProfileService;
     private readonly butlerProjectService;
@@ -65,9 +85,10 @@ export declare class ButlerFollowUpService {
     private readonly followUpCodexHomeDir;
     private readonly sourceCodexHomeDir;
     private readonly sessionMessageOriginRepository;
+    private readonly providerUsageLimitGuardService;
     private readonly permissionRequestSweepAtByTaskId;
     private readonly activeExecutionStateByTaskId;
-    constructor(butlerProfileService: Pick<ButlerProfileService, "ensureInitialized">, butlerProjectService: Pick<ButlerProjectService, "getById">, butlerSessionService: Pick<ButlerSessionService, "captureSessionSnapshot">, butlerFollowUpTaskRepository: ButlerFollowUpTaskRepository, sessionHistoryService: Pick<SessionHistoryService, "getSession" | "readRecentHistoryEnvelope">, sessionIndexRepository: Pick<SessionIndexRepository, "findIndexRecordBySessionId">, sessionLiveRuntimeService: Pick<SessionLiveRuntimeService, "getSessionRuntime" | "sendLiveMessage" | "enqueueLiveMessage" | "listPermissionRequests" | "replyPermissionRequest">, workspaceService: Pick<WorkspaceService, "importWorkspace">, providerAdapterRegistry: ProviderAdapterRegistry, instructionAdapter: ButlerFollowUpEvaluationInstructionAdapter, followUpCodexHomeDir?: string | null, sourceCodexHomeDir?: string | null, sessionMessageOriginRepository?: Pick<SessionMessageOriginRepository, "upsert"> | null);
+    constructor(butlerProfileService: Pick<ButlerProfileService, "ensureInitialized">, butlerProjectService: Pick<ButlerProjectService, "getById">, butlerSessionService: Pick<ButlerSessionService, "captureSessionSnapshot" | "startSession">, butlerFollowUpTaskRepository: ButlerFollowUpTaskRepository, sessionHistoryService: Pick<SessionHistoryService, "getSession" | "readRecentHistoryEnvelope">, sessionIndexRepository: Pick<SessionIndexRepository, "findIndexRecordBySessionId">, sessionLiveRuntimeService: Pick<SessionLiveRuntimeService, "getSessionRuntime" | "sendLiveMessage" | "enqueueLiveMessage" | "listPermissionRequests" | "replyPermissionRequest" | "interruptSession">, workspaceService: Pick<WorkspaceService, "importWorkspace">, providerAdapterRegistry: ProviderAdapterRegistry, instructionAdapter: ButlerFollowUpEvaluationInstructionAdapter, followUpCodexHomeDir?: string | null, sourceCodexHomeDir?: string | null, sessionMessageOriginRepository?: Pick<SessionMessageOriginRepository, "upsert"> | null, providerUsageLimitGuardService?: Pick<SessionProviderUsageLimitGuardService, "resolveBlockingInspection">);
     listTasks(filters?: {
         statuses?: ButlerFollowUpTaskStatus[];
         projectId?: string;
@@ -75,12 +96,19 @@ export declare class ButlerFollowUpService {
         limit?: number;
     }): ButlerFollowUpTaskView[];
     getTask(taskId: string): ButlerFollowUpTaskView;
+    private toTaskView;
+    private requireTaskForAssistantUpdate;
     createTask(input: CreateButlerFollowUpTaskInput, userId: string): Promise<ButlerFollowUpTaskView>;
+    continueTask(taskId: string, input: ContinueButlerFollowUpTaskInput, userId: string): Promise<ButlerFollowUpTaskView>;
+    markTaskWaitingUser(taskId: string, input: WaitingUserButlerFollowUpTaskInput, userId: string): Promise<ButlerFollowUpTaskView>;
+    completeTask(taskId: string, input: CompleteButlerFollowUpTaskInput, userId: string): Promise<ButlerFollowUpTaskView>;
+    failTask(taskId: string, input: FailButlerFollowUpTaskInput, userId: string): Promise<ButlerFollowUpTaskView>;
     cancelTask(taskId: string, userId: string): Promise<ButlerFollowUpTaskView>;
     runDueTasks(referenceAt?: string): Promise<ButlerFollowUpRunDueTasksResult>;
     handleSessionTerminal(sessionId: string, referenceAt?: string): Promise<void>;
     processTask(taskId: string, referenceAt?: string): Promise<ButlerFollowUpTask>;
     private persist;
+    private requireAssistantDecisionPersisted;
     private persistWithRound;
     private persistIfExecutionActive;
     private persistWithRoundIfExecutionActive;
@@ -89,12 +117,12 @@ export declare class ButlerFollowUpService {
     private sendContinuePrompt;
     private recordMessageOrigin;
     private inspectTask;
-    private evaluateTask;
+    private inspectSession;
+    private requestAssistantEvaluation;
     private beginTaskExecution;
     private markTaskExecutionCancelled;
     private ensureTaskExecutionActive;
     private isTaskExecutionActive;
     private stopActiveTaskAutomation;
-    private writeEvaluationInstructionFiles;
-    private syncCodexInstructionConfig;
+    private waitForAssistantSessionTerminal;
 }