@jingyi0605/codingns 0.1.4 → 0.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (209) hide show
  1. package/dist/public/assets/{TerminalPage-4ulgBhv9.js → TerminalPage-4p6EBqrR.js} +1 -1
  2. package/dist/public/assets/gemini-D4G1NbrE.png +0 -0
  3. package/dist/public/assets/index-CxeghocY.css +1 -0
  4. package/dist/public/assets/index-DXusStl0.js +108 -0
  5. package/dist/public/assets/kimi-BWNNSh7e.png +0 -0
  6. package/dist/public/index.html +2 -2
  7. package/dist/server/config/env.d.ts +6 -0
  8. package/dist/server/config/env.js +145 -0
  9. package/dist/server/config/env.js.map +1 -1
  10. package/dist/server/config/opencode-system-probe-helper-process.d.ts +24 -0
  11. package/dist/server/config/opencode-system-probe-helper-process.js +70 -5
  12. package/dist/server/config/opencode-system-probe-helper-process.js.map +1 -1
  13. package/dist/server/modules/butler/butler-action-context-service.d.ts +30 -0
  14. package/dist/server/modules/butler/butler-action-context-service.js +108 -0
  15. package/dist/server/modules/butler/butler-action-context-service.js.map +1 -0
  16. package/dist/server/modules/butler/butler-auth-service.d.ts +17 -0
  17. package/dist/server/modules/butler/butler-auth-service.js +91 -0
  18. package/dist/server/modules/butler/butler-auth-service.js.map +1 -0
  19. package/dist/server/modules/butler/butler-control-action-service.d.ts +65 -0
  20. package/dist/server/modules/butler/butler-control-action-service.js +296 -0
  21. package/dist/server/modules/butler/butler-control-action-service.js.map +1 -0
  22. package/dist/server/modules/butler/butler-control-session-service.d.ts +55 -0
  23. package/dist/server/modules/butler/butler-control-session-service.js +367 -0
  24. package/dist/server/modules/butler/butler-control-session-service.js.map +1 -0
  25. package/dist/server/modules/butler/butler-controller.d.ts +367 -0
  26. package/dist/server/modules/butler/butler-controller.js +475 -0
  27. package/dist/server/modules/butler/butler-controller.js.map +1 -0
  28. package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.d.ts +34 -0
  29. package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js +77 -0
  30. package/dist/server/modules/butler/butler-follow-up-evaluation-instruction-adapter.js.map +1 -0
  31. package/dist/server/modules/butler/butler-follow-up-scheduler.d.ts +23 -0
  32. package/dist/server/modules/butler/butler-follow-up-scheduler.js +57 -0
  33. package/dist/server/modules/butler/butler-follow-up-scheduler.js.map +1 -0
  34. package/dist/server/modules/butler/butler-follow-up-service.d.ts +86 -0
  35. package/dist/server/modules/butler/butler-follow-up-service.js +948 -0
  36. package/dist/server/modules/butler/butler-follow-up-service.js.map +1 -0
  37. package/dist/server/modules/butler/butler-inbox-service.d.ts +35 -0
  38. package/dist/server/modules/butler/butler-inbox-service.js +136 -0
  39. package/dist/server/modules/butler/butler-inbox-service.js.map +1 -0
  40. package/dist/server/modules/butler/butler-notification-service.d.ts +12 -0
  41. package/dist/server/modules/butler/butler-notification-service.js +45 -0
  42. package/dist/server/modules/butler/butler-notification-service.js.map +1 -0
  43. package/dist/server/modules/butler/butler-profile-service.d.ts +26 -0
  44. package/dist/server/modules/butler/butler-profile-service.js +529 -0
  45. package/dist/server/modules/butler/butler-profile-service.js.map +1 -0
  46. package/dist/server/modules/butler/butler-project-service.d.ts +48 -0
  47. package/dist/server/modules/butler/butler-project-service.js +253 -0
  48. package/dist/server/modules/butler/butler-project-service.js.map +1 -0
  49. package/dist/server/modules/butler/butler-session-service.d.ts +79 -0
  50. package/dist/server/modules/butler/butler-session-service.js +503 -0
  51. package/dist/server/modules/butler/butler-session-service.js.map +1 -0
  52. package/dist/server/modules/butler/butler-session-summary-service.d.ts +55 -0
  53. package/dist/server/modules/butler/butler-session-summary-service.js +382 -0
  54. package/dist/server/modules/butler/butler-session-summary-service.js.map +1 -0
  55. package/dist/server/modules/butler/context-aggregator.d.ts +187 -0
  56. package/dist/server/modules/butler/context-aggregator.js +807 -0
  57. package/dist/server/modules/butler/context-aggregator.js.map +1 -0
  58. package/dist/server/modules/butler/instruction-adapter.d.ts +28 -0
  59. package/dist/server/modules/butler/instruction-adapter.js +101 -0
  60. package/dist/server/modules/butler/instruction-adapter.js.map +1 -0
  61. package/dist/server/modules/butler/patrol-execution-service.d.ts +47 -0
  62. package/dist/server/modules/butler/patrol-execution-service.js +347 -0
  63. package/dist/server/modules/butler/patrol-execution-service.js.map +1 -0
  64. package/dist/server/modules/butler/patrol-plan-service.d.ts +54 -0
  65. package/dist/server/modules/butler/patrol-plan-service.js +272 -0
  66. package/dist/server/modules/butler/patrol-plan-service.js.map +1 -0
  67. package/dist/server/modules/butler/patrol-run-service.d.ts +60 -0
  68. package/dist/server/modules/butler/patrol-run-service.js +185 -0
  69. package/dist/server/modules/butler/patrol-run-service.js.map +1 -0
  70. package/dist/server/modules/butler/patrol-scheduler.d.ts +36 -0
  71. package/dist/server/modules/butler/patrol-scheduler.js +99 -0
  72. package/dist/server/modules/butler/patrol-scheduler.js.map +1 -0
  73. package/dist/server/modules/butler/project-memory-service.d.ts +30 -0
  74. package/dist/server/modules/butler/project-memory-service.js +103 -0
  75. package/dist/server/modules/butler/project-memory-service.js.map +1 -0
  76. package/dist/server/modules/butler/provider-adapter-registry.d.ts +61 -0
  77. package/dist/server/modules/butler/provider-adapter-registry.js +430 -0
  78. package/dist/server/modules/butler/provider-adapter-registry.js.map +1 -0
  79. package/dist/server/modules/butler/session-summary-instruction-adapter.d.ts +28 -0
  80. package/dist/server/modules/butler/session-summary-instruction-adapter.js +79 -0
  81. package/dist/server/modules/butler/session-summary-instruction-adapter.js.map +1 -0
  82. package/dist/server/modules/butler/session-summary-scheduler.d.ts +23 -0
  83. package/dist/server/modules/butler/session-summary-scheduler.js +57 -0
  84. package/dist/server/modules/butler/session-summary-scheduler.js.map +1 -0
  85. package/dist/server/modules/butler/verification-run-service.d.ts +73 -0
  86. package/dist/server/modules/butler/verification-run-service.js +633 -0
  87. package/dist/server/modules/butler/verification-run-service.js.map +1 -0
  88. package/dist/server/modules/preferences/profile-service.js +8 -2
  89. package/dist/server/modules/preferences/profile-service.js.map +1 -1
  90. package/dist/server/modules/sessions/claude-runtime-helper-process.js +1 -1
  91. package/dist/server/modules/sessions/claude-runtime-helper-process.js.map +1 -1
  92. package/dist/server/modules/sessions/codex-app-server-helper-client.d.ts +5 -1
  93. package/dist/server/modules/sessions/codex-app-server-helper-client.js +10 -2
  94. package/dist/server/modules/sessions/codex-app-server-helper-client.js.map +1 -1
  95. package/dist/server/modules/sessions/session-controller.d.ts +3 -1
  96. package/dist/server/modules/sessions/session-controller.js +11 -2
  97. package/dist/server/modules/sessions/session-controller.js.map +1 -1
  98. package/dist/server/modules/sessions/session-history-service.d.ts +14 -1
  99. package/dist/server/modules/sessions/session-history-service.js +291 -30
  100. package/dist/server/modules/sessions/session-history-service.js.map +1 -1
  101. package/dist/server/modules/sessions/session-live-runtime-service.d.ts +25 -2
  102. package/dist/server/modules/sessions/session-live-runtime-service.js +526 -158
  103. package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
  104. package/dist/server/modules/sessions/session-provider-error-mapper.js +28 -0
  105. package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
  106. package/dist/server/modules/workbench/workbench-service.d.ts +7 -1
  107. package/dist/server/modules/workbench/workbench-service.js +31 -7
  108. package/dist/server/modules/workbench/workbench-service.js.map +1 -1
  109. package/dist/server/routes/butler.d.ts +3 -0
  110. package/dist/server/routes/butler.js +54 -0
  111. package/dist/server/routes/butler.js.map +1 -0
  112. package/dist/server/server/create-server.d.ts +61 -0
  113. package/dist/server/server/create-server.js +148 -4
  114. package/dist/server/server/create-server.js.map +1 -1
  115. package/dist/server/storage/repositories/butler-control-event-repository.d.ts +8 -0
  116. package/dist/server/storage/repositories/butler-control-event-repository.js +78 -0
  117. package/dist/server/storage/repositories/butler-control-event-repository.js.map +1 -0
  118. package/dist/server/storage/repositories/butler-control-session-repository.d.ts +11 -0
  119. package/dist/server/storage/repositories/butler-control-session-repository.js +86 -0
  120. package/dist/server/storage/repositories/butler-control-session-repository.js.map +1 -0
  121. package/dist/server/storage/repositories/butler-follow-up-task-repository.d.ts +16 -0
  122. package/dist/server/storage/repositories/butler-follow-up-task-repository.js +252 -0
  123. package/dist/server/storage/repositories/butler-follow-up-task-repository.js.map +1 -0
  124. package/dist/server/storage/repositories/butler-inbox-item-repository.d.ts +15 -0
  125. package/dist/server/storage/repositories/butler-inbox-item-repository.js +111 -0
  126. package/dist/server/storage/repositories/butler-inbox-item-repository.js.map +1 -0
  127. package/dist/server/storage/repositories/butler-notification-archive-repository.d.ts +9 -0
  128. package/dist/server/storage/repositories/butler-notification-archive-repository.js +48 -0
  129. package/dist/server/storage/repositories/butler-notification-archive-repository.js.map +1 -0
  130. package/dist/server/storage/repositories/butler-profile-repository.d.ts +9 -0
  131. package/dist/server/storage/repositories/butler-profile-repository.js +86 -0
  132. package/dist/server/storage/repositories/butler-profile-repository.js.map +1 -0
  133. package/dist/server/storage/repositories/butler-project-repository.d.ts +14 -0
  134. package/dist/server/storage/repositories/butler-project-repository.js +140 -0
  135. package/dist/server/storage/repositories/butler-project-repository.js.map +1 -0
  136. package/dist/server/storage/repositories/butler-session-repository.d.ts +11 -0
  137. package/dist/server/storage/repositories/butler-session-repository.js +106 -0
  138. package/dist/server/storage/repositories/butler-session-repository.js.map +1 -0
  139. package/dist/server/storage/repositories/butler-session-summary-state-repository.d.ts +8 -0
  140. package/dist/server/storage/repositories/butler-session-summary-state-repository.js +62 -0
  141. package/dist/server/storage/repositories/butler-session-summary-state-repository.js.map +1 -0
  142. package/dist/server/storage/repositories/patrol-plan-repository.d.ts +27 -0
  143. package/dist/server/storage/repositories/patrol-plan-repository.js +119 -0
  144. package/dist/server/storage/repositories/patrol-plan-repository.js.map +1 -0
  145. package/dist/server/storage/repositories/patrol-run-repository.d.ts +28 -0
  146. package/dist/server/storage/repositories/patrol-run-repository.js +121 -0
  147. package/dist/server/storage/repositories/patrol-run-repository.js.map +1 -0
  148. package/dist/server/storage/repositories/project-memory-repository.d.ts +15 -0
  149. package/dist/server/storage/repositories/project-memory-repository.js +150 -0
  150. package/dist/server/storage/repositories/project-memory-repository.js.map +1 -0
  151. package/dist/server/storage/repositories/session-checkpoint-repository.d.ts +9 -0
  152. package/dist/server/storage/repositories/session-checkpoint-repository.js +72 -0
  153. package/dist/server/storage/repositories/session-checkpoint-repository.js.map +1 -0
  154. package/dist/server/storage/repositories/session-message-origin-repository.d.ts +10 -0
  155. package/dist/server/storage/repositories/session-message-origin-repository.js +93 -0
  156. package/dist/server/storage/repositories/session-message-origin-repository.js.map +1 -0
  157. package/dist/server/storage/repositories/verification-run-repository.d.ts +29 -0
  158. package/dist/server/storage/repositories/verification-run-repository.js +125 -0
  159. package/dist/server/storage/repositories/verification-run-repository.js.map +1 -0
  160. package/dist/server/storage/sqlite/client.js +39 -0
  161. package/dist/server/storage/sqlite/client.js.map +1 -1
  162. package/dist/server/storage/sqlite/schema.sql +324 -0
  163. package/dist/server/types/domain.d.ts +261 -1
  164. package/dist/server/ws/ws-server.d.ts +2 -1
  165. package/dist/server/ws/ws-server.js +2 -1
  166. package/dist/server/ws/ws-server.js.map +1 -1
  167. package/node_modules/@codingns/session-sync-core/dist/index.d.ts +4 -0
  168. package/node_modules/@codingns/session-sync-core/dist/index.js +4 -0
  169. package/node_modules/@codingns/session-sync-core/dist/index.js.map +1 -1
  170. package/node_modules/@codingns/session-sync-core/dist/kimi-message-normalizer.d.ts +18 -0
  171. package/node_modules/@codingns/session-sync-core/dist/kimi-message-normalizer.js +659 -0
  172. package/node_modules/@codingns/session-sync-core/dist/kimi-message-normalizer.js.map +1 -0
  173. package/node_modules/@codingns/session-sync-core/dist/kimi-shared.d.ts +11 -0
  174. package/node_modules/@codingns/session-sync-core/dist/kimi-shared.js +72 -0
  175. package/node_modules/@codingns/session-sync-core/dist/kimi-shared.js.map +1 -0
  176. package/node_modules/@codingns/session-sync-core/dist/patch-builder.d.ts +8 -0
  177. package/node_modules/@codingns/session-sync-core/dist/patch-builder.js +89 -0
  178. package/node_modules/@codingns/session-sync-core/dist/patch-builder.js.map +1 -1
  179. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +4 -1
  180. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
  181. package/node_modules/@codingns/session-sync-core/dist/providers/gemini.d.ts +41 -0
  182. package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js +1086 -0
  183. package/node_modules/@codingns/session-sync-core/dist/providers/gemini.js.map +1 -0
  184. package/node_modules/@codingns/session-sync-core/dist/providers/kimi.d.ts +29 -0
  185. package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js +578 -0
  186. package/node_modules/@codingns/session-sync-core/dist/providers/kimi.js.map +1 -0
  187. package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js +2 -1
  188. package/node_modules/@codingns/session-sync-core/dist/providers/opencode.js.map +1 -1
  189. package/node_modules/@codingns/session-sync-core/dist/providers/utils.js +30 -2
  190. package/node_modules/@codingns/session-sync-core/dist/providers/utils.js.map +1 -1
  191. package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.d.ts +2 -0
  192. package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js +43 -5
  193. package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js.map +1 -1
  194. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.d.ts +2 -0
  195. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +320 -69
  196. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
  197. package/node_modules/@codingns/session-sync-core/dist/runtime/gemini-runtime.d.ts +21 -0
  198. package/node_modules/@codingns/session-sync-core/dist/runtime/gemini-runtime.js +537 -0
  199. package/node_modules/@codingns/session-sync-core/dist/runtime/gemini-runtime.js.map +1 -0
  200. package/node_modules/@codingns/session-sync-core/dist/runtime/kimi-runtime.d.ts +38 -0
  201. package/node_modules/@codingns/session-sync-core/dist/runtime/kimi-runtime.js +911 -0
  202. package/node_modules/@codingns/session-sync-core/dist/runtime/kimi-runtime.js.map +1 -0
  203. package/node_modules/@codingns/session-sync-core/dist/sqlite/node-sqlite.d.ts +6 -0
  204. package/node_modules/@codingns/session-sync-core/dist/sqlite/node-sqlite.js +9 -0
  205. package/node_modules/@codingns/session-sync-core/dist/sqlite/node-sqlite.js.map +1 -0
  206. package/node_modules/@codingns/session-sync-core/package.json +8 -0
  207. package/package.json +1 -1
  208. package/dist/public/assets/index-C5lu52cQ.css +0 -1
  209. package/dist/public/assets/index-WpdUo_Vs.js +0 -108
@@ -0,0 +1,91 @@
1
+ import fs from "node:fs";
2
+ import path from "node:path";
3
+ import { createId } from "../../shared/utils/id.js";
4
+ import { hashToken } from "../../shared/utils/hash.js";
5
+ import { addSeconds, nowIso } from "../../shared/utils/time.js";
6
+ import { createOpaqueToken } from "../../shared/utils/tokens.js";
7
+ const BUTLER_AUTH_FILENAME = "BUTLER_AUTH.json";
8
+ const BUTLER_AUTH_ROTATE_THRESHOLD_SECONDS = 7 * 24 * 60 * 60;
9
+ const BUTLER_AUTH_TTL_SECONDS = 180 * 24 * 60 * 60;
10
+ export class ButlerAuthService {
11
+ authTokenRepository;
12
+ config;
13
+ constructor(authTokenRepository, config) {
14
+ this.authTokenRepository = authTokenRepository;
15
+ this.config = config;
16
+ }
17
+ ensureWorkspaceCredential(workspacePath, userId) {
18
+ const credentialPath = path.join(workspacePath, BUTLER_AUTH_FILENAME);
19
+ const existing = readWorkspaceCredential(credentialPath);
20
+ if (existing && isWorkspaceCredentialValid(existing, userId, this.authTokenRepository)) {
21
+ return existing;
22
+ }
23
+ const next = this.issueWorkspaceCredential(userId);
24
+ fs.mkdirSync(workspacePath, { recursive: true });
25
+ fs.writeFileSync(credentialPath, `${JSON.stringify(next, null, 2)}\n`, "utf8");
26
+ return next;
27
+ }
28
+ getCredentialFilePath(workspacePath) {
29
+ return path.join(workspacePath, BUTLER_AUTH_FILENAME);
30
+ }
31
+ issueWorkspaceCredential(userId) {
32
+ const now = new Date();
33
+ const accessToken = createOpaqueToken();
34
+ const issuedAt = nowIso(now);
35
+ const expiresAt = addSeconds(now, BUTLER_AUTH_TTL_SECONDS);
36
+ this.authTokenRepository.create({
37
+ id: createId(),
38
+ userId,
39
+ tokenType: "access",
40
+ tokenHash: hashToken(accessToken),
41
+ expiresAt,
42
+ revokedAt: null,
43
+ createdAt: issuedAt
44
+ });
45
+ return {
46
+ apiBaseUrl: resolveButlerApiBaseUrl(this.config.host, this.config.port),
47
+ accessToken,
48
+ issuedAt,
49
+ expiresAt,
50
+ userId
51
+ };
52
+ }
53
+ }
54
+ function readWorkspaceCredential(filePath) {
55
+ if (!fs.existsSync(filePath) || !fs.statSync(filePath).isFile()) {
56
+ return null;
57
+ }
58
+ try {
59
+ const parsed = JSON.parse(fs.readFileSync(filePath, "utf8"));
60
+ if (typeof parsed.apiBaseUrl !== "string"
61
+ || typeof parsed.accessToken !== "string"
62
+ || typeof parsed.issuedAt !== "string"
63
+ || typeof parsed.expiresAt !== "string"
64
+ || typeof parsed.userId !== "string") {
65
+ return null;
66
+ }
67
+ return parsed;
68
+ }
69
+ catch {
70
+ return null;
71
+ }
72
+ }
73
+ function isWorkspaceCredentialValid(credential, userId, authTokenRepository) {
74
+ if (credential.userId !== userId) {
75
+ return false;
76
+ }
77
+ const expiresAt = new Date(credential.expiresAt).getTime();
78
+ if (!Number.isFinite(expiresAt) || expiresAt - Date.now() <= BUTLER_AUTH_ROTATE_THRESHOLD_SECONDS * 1000) {
79
+ return false;
80
+ }
81
+ const record = authTokenRepository.findByHash(hashToken(credential.accessToken), "access");
82
+ if (!record || record.revokedAt || record.userId !== userId) {
83
+ return false;
84
+ }
85
+ return new Date(record.expiresAt).getTime() > Date.now();
86
+ }
87
+ function resolveButlerApiBaseUrl(host, port) {
88
+ const normalizedHost = host === "0.0.0.0" || host === "::" ? "127.0.0.1" : host;
89
+ return `http://${normalizedHost}:${port}`;
90
+ }
91
+ //# sourceMappingURL=butler-auth-service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"butler-auth-service.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-auth-service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,65 @@
1
+ import type { ButlerControlEvent } from "../../types/domain.js";
2
+ import type { ButlerControlEventRepository } from "../../storage/repositories/butler-control-event-repository.js";
3
+ import type { ButlerControlSessionRepository } from "../../storage/repositories/butler-control-session-repository.js";
4
+ import type { ButlerProfileService } from "./butler-profile-service.js";
5
+ import type { ButlerProjectService } from "./butler-project-service.js";
6
+ import type { ButlerSessionService, ResumeButlerSessionResult } from "./butler-session-service.js";
7
+ import type { PatrolExecutionService } from "./patrol-execution-service.js";
8
+ import type { PatrolRunService, PatrolRunView } from "./patrol-run-service.js";
9
+ import type { VerificationRunService, VerificationRunView } from "./verification-run-service.js";
10
+ import type { ButlerContextAggregator, ButlerProjectContext } from "./context-aggregator.js";
11
+ export interface ButlerActionResult {
12
+ event: ButlerControlEvent;
13
+ }
14
+ export interface OpenButlerProjectActionResult extends ButlerActionResult {
15
+ context: ButlerProjectContext;
16
+ }
17
+ export interface ResumeButlerProjectSessionActionResult extends ButlerActionResult {
18
+ resumed: ResumeButlerSessionResult;
19
+ }
20
+ export interface StartButlerPatrolActionResult extends ButlerActionResult {
21
+ run: PatrolRunView;
22
+ }
23
+ export interface StartButlerVerificationActionResult extends ButlerActionResult {
24
+ run: VerificationRunView;
25
+ }
26
+ export interface ResumeButlerProjectSessionActionInput {
27
+ projectId: string;
28
+ butlerSessionId: string;
29
+ }
30
+ export interface StartButlerPatrolActionInput {
31
+ projectId: string;
32
+ planId?: string | null;
33
+ triggerRef?: string | null;
34
+ butlerSessionId?: string | null;
35
+ suggestions?: string[];
36
+ }
37
+ export interface StartButlerVerificationActionInput {
38
+ projectId: string;
39
+ verificationType?: "test" | "health" | "browser" | "visual" | "metric";
40
+ targetRef?: string | null;
41
+ butlerSessionId?: string | null;
42
+ sourcePatrolRunId?: string | null;
43
+ spec?: Record<string, unknown>;
44
+ }
45
+ export declare class ButlerControlActionService {
46
+ private readonly butlerProfileService;
47
+ private readonly butlerControlSessionRepository;
48
+ private readonly butlerControlEventRepository;
49
+ private readonly butlerProjectService;
50
+ private readonly butlerSessionService;
51
+ private readonly patrolRunService;
52
+ private readonly patrolExecutionService;
53
+ private readonly verificationRunService;
54
+ private readonly butlerContextAggregator;
55
+ constructor(butlerProfileService: Pick<ButlerProfileService, "ensureInitialized">, butlerControlSessionRepository: Pick<ButlerControlSessionRepository, "findLatestByProvider" | "update">, butlerControlEventRepository: Pick<ButlerControlEventRepository, "create" | "listByControlSessionId">, butlerProjectService: Pick<ButlerProjectService, "getById">, butlerSessionService: Pick<ButlerSessionService, "resumeSession">, patrolRunService: Pick<PatrolRunService, "startRun">, patrolExecutionService: Pick<PatrolExecutionService, "executeQueuedRun">, verificationRunService: Pick<VerificationRunService, "startRun">, butlerContextAggregator: Pick<ButlerContextAggregator, "getProjectContext">);
56
+ listCurrentEvents(): ButlerControlEvent[];
57
+ openProject(projectId: string, userId: string): Promise<OpenButlerProjectActionResult>;
58
+ resumeProjectSession(input: ResumeButlerProjectSessionActionInput, userId: string): Promise<ResumeButlerProjectSessionActionResult>;
59
+ startPatrol(input: StartButlerPatrolActionInput): Promise<StartButlerPatrolActionResult>;
60
+ startVerification(input: StartButlerVerificationActionInput): Promise<StartButlerVerificationActionResult>;
61
+ private getCurrentControlSession;
62
+ private requireCurrentControlSession;
63
+ private recordActionEvent;
64
+ private recordFailureEvent;
65
+ }
@@ -0,0 +1,296 @@
1
+ import { AppError } from "../../shared/errors/app-error.js";
2
+ import { createId } from "../../shared/utils/id.js";
3
+ import { nowIso } from "../../shared/utils/time.js";
4
+ export class ButlerControlActionService {
5
+ butlerProfileService;
6
+ butlerControlSessionRepository;
7
+ butlerControlEventRepository;
8
+ butlerProjectService;
9
+ butlerSessionService;
10
+ patrolRunService;
11
+ patrolExecutionService;
12
+ verificationRunService;
13
+ butlerContextAggregator;
14
+ constructor(butlerProfileService, butlerControlSessionRepository, butlerControlEventRepository, butlerProjectService, butlerSessionService, patrolRunService, patrolExecutionService, verificationRunService, butlerContextAggregator) {
15
+ this.butlerProfileService = butlerProfileService;
16
+ this.butlerControlSessionRepository = butlerControlSessionRepository;
17
+ this.butlerControlEventRepository = butlerControlEventRepository;
18
+ this.butlerProjectService = butlerProjectService;
19
+ this.butlerSessionService = butlerSessionService;
20
+ this.patrolRunService = patrolRunService;
21
+ this.patrolExecutionService = patrolExecutionService;
22
+ this.verificationRunService = verificationRunService;
23
+ this.butlerContextAggregator = butlerContextAggregator;
24
+ }
25
+ listCurrentEvents() {
26
+ const current = this.getCurrentControlSession();
27
+ return current
28
+ ? this.butlerControlEventRepository.listByControlSessionId(current.id)
29
+ : [];
30
+ }
31
+ async openProject(projectId, userId) {
32
+ const current = this.requireCurrentControlSession();
33
+ const project = this.butlerProjectService.getById(projectId);
34
+ try {
35
+ const context = await this.butlerContextAggregator.getProjectContext(project.id, userId);
36
+ const event = this.recordActionEvent(current, "open-project", {
37
+ status: "succeeded",
38
+ title: `已打开项目:${project.name}`,
39
+ content: buildOpenProjectContent(context),
40
+ relatedRefs: [
41
+ createProjectRef(project.id, project.name, project.workspaceId),
42
+ createWorkspaceRef(project.workspaceId)
43
+ ]
44
+ });
45
+ return {
46
+ event,
47
+ context
48
+ };
49
+ }
50
+ catch (error) {
51
+ this.recordFailureEvent(current, "open-project", `打开项目失败:${project.name}`, error, [
52
+ createProjectRef(project.id, project.name, project.workspaceId)
53
+ ]);
54
+ throw error;
55
+ }
56
+ }
57
+ async resumeProjectSession(input, userId) {
58
+ const project = this.butlerProjectService.getById(input.projectId);
59
+ const current = this.requireCurrentControlSession();
60
+ try {
61
+ const resumed = await this.butlerSessionService.resumeSession(input.projectId, input.butlerSessionId, userId);
62
+ const event = this.recordActionEvent(current, "resume-session", {
63
+ status: "succeeded",
64
+ title: `已续接项目会话:${resumed.session.title ?? project.name}`,
65
+ content: buildResumeSessionContent(project.name, resumed.session),
66
+ relatedRefs: [
67
+ createProjectRef(project.id, project.name, project.workspaceId),
68
+ createButlerSessionRef(input.butlerSessionId, resumed.session.title ?? project.name, project.workspaceId, project.id),
69
+ createSessionRef(resumed.session.sessionId, resumed.session.title ?? resumed.session.sessionId, project.workspaceId, project.id)
70
+ ]
71
+ });
72
+ return {
73
+ event,
74
+ resumed
75
+ };
76
+ }
77
+ catch (error) {
78
+ this.recordFailureEvent(current, "resume-session", `续接项目会话失败:${project.name}`, error, [createProjectRef(project.id, project.name, project.workspaceId)]);
79
+ throw error;
80
+ }
81
+ }
82
+ async startPatrol(input) {
83
+ const project = this.butlerProjectService.getById(input.projectId);
84
+ const current = this.requireCurrentControlSession();
85
+ try {
86
+ const queuedRun = this.patrolRunService.startRun(input.projectId, {
87
+ planId: normalizeNullableText(input.planId),
88
+ triggeredBy: "user",
89
+ triggerRef: normalizeNullableText(input.triggerRef) ?? "butler:control-action",
90
+ butlerSessionId: normalizeNullableText(input.butlerSessionId),
91
+ suggestions: input.suggestions ?? []
92
+ });
93
+ const run = await this.patrolExecutionService.executeQueuedRun(queuedRun.id);
94
+ const event = this.recordActionEvent(current, "start-patrol", {
95
+ status: "succeeded",
96
+ title: `已发起巡视:${project.name}`,
97
+ content: buildPatrolContent(project.name, run),
98
+ relatedRefs: [
99
+ createProjectRef(project.id, project.name, project.workspaceId),
100
+ createPatrolRunRef(run.id, project.workspaceId, project.id)
101
+ ]
102
+ });
103
+ return {
104
+ event,
105
+ run
106
+ };
107
+ }
108
+ catch (error) {
109
+ this.recordFailureEvent(current, "start-patrol", `发起巡视失败:${project.name}`, error, [createProjectRef(project.id, project.name, project.workspaceId)]);
110
+ throw error;
111
+ }
112
+ }
113
+ async startVerification(input) {
114
+ const project = this.butlerProjectService.getById(input.projectId);
115
+ const current = this.requireCurrentControlSession();
116
+ try {
117
+ const run = await this.verificationRunService.startRun(input.projectId, {
118
+ verificationType: input.verificationType,
119
+ targetRef: normalizeNullableText(input.targetRef),
120
+ butlerSessionId: normalizeNullableText(input.butlerSessionId),
121
+ sourcePatrolRunId: normalizeNullableText(input.sourcePatrolRunId),
122
+ spec: input.spec
123
+ });
124
+ const event = this.recordActionEvent(current, "start-verification", {
125
+ status: "succeeded",
126
+ title: `已发起验证:${project.name}`,
127
+ content: buildVerificationContent(project.name, run),
128
+ relatedRefs: [
129
+ createProjectRef(project.id, project.name, project.workspaceId),
130
+ createVerificationRunRef(run.id, project.workspaceId, project.id)
131
+ ]
132
+ });
133
+ return {
134
+ event,
135
+ run
136
+ };
137
+ }
138
+ catch (error) {
139
+ this.recordFailureEvent(current, "start-verification", `发起验证失败:${project.name}`, error, [createProjectRef(project.id, project.name, project.workspaceId)]);
140
+ throw error;
141
+ }
142
+ }
143
+ getCurrentControlSession() {
144
+ const profile = this.butlerProfileService.ensureInitialized();
145
+ return this.butlerControlSessionRepository.findLatestByProvider(profile.providerId);
146
+ }
147
+ requireCurrentControlSession() {
148
+ const profile = this.butlerProfileService.ensureInitialized();
149
+ const current = this.butlerControlSessionRepository.findLatestByProvider(profile.providerId);
150
+ if (!current || current.status === "closed") {
151
+ throw new AppError({
152
+ statusCode: 404,
153
+ errorCode: "BUTLER_CONTROL_SESSION_NOT_FOUND",
154
+ detail: "当前 provider 下还没有可用的助手控制会话"
155
+ });
156
+ }
157
+ return current;
158
+ }
159
+ recordActionEvent(controlSession, actionType, input) {
160
+ const timestamp = nowIso();
161
+ const event = this.butlerControlEventRepository.create({
162
+ id: createId(),
163
+ controlSessionId: controlSession.id,
164
+ kind: "action",
165
+ actionType,
166
+ status: input.status,
167
+ title: input.title,
168
+ content: input.content,
169
+ relatedRefs: input.relatedRefs,
170
+ createdAt: timestamp
171
+ });
172
+ this.butlerControlSessionRepository.update({
173
+ ...controlSession,
174
+ lastSummary: input.title,
175
+ updatedAt: timestamp
176
+ });
177
+ return event;
178
+ }
179
+ recordFailureEvent(controlSession, actionType, title, error, relatedRefs) {
180
+ const detail = error instanceof Error ? error.message : String(error);
181
+ return this.recordActionEvent(controlSession, actionType, {
182
+ status: "failed",
183
+ title,
184
+ content: `${title}\n\n- 错误:${detail}`,
185
+ relatedRefs
186
+ });
187
+ }
188
+ }
189
+ function buildOpenProjectContent(context) {
190
+ return [
191
+ `已切换到项目 **${context.project.name}**。`,
192
+ "",
193
+ `- 风险级别:${context.project.riskLevel}`,
194
+ `- 活跃会话:${context.project.activeSessionCount}/${context.project.sessionCount}`,
195
+ `- 主要风险:${joinItems(context.topRisks, "暂无明显风险")}`,
196
+ `- 建议下一步:${joinItems(context.nextActions, "暂无待办动作")}`
197
+ ].join("\n");
198
+ }
199
+ function buildResumeSessionContent(projectName, session) {
200
+ return [
201
+ `已续接项目 **${projectName}** 的会话。`,
202
+ "",
203
+ `- 会话标题:${session.title ?? session.sessionId}`,
204
+ `- provider:${session.provider ?? "unknown"}`,
205
+ `- 当前状态:${session.status}`,
206
+ `- 最近摘要:${session.lastSummary ?? "暂无"}`
207
+ ].join("\n");
208
+ }
209
+ function buildPatrolContent(projectName, run) {
210
+ return [
211
+ `已为项目 **${projectName}** 发起巡视。`,
212
+ "",
213
+ `- 运行状态:${run.status}`,
214
+ `- 风险级别:${run.riskLevel ?? "unknown"}`,
215
+ `- 摘要:${run.summary ?? "巡视已发起,等待更多结果"}`,
216
+ `- 建议:${joinItems(run.suggestions, "暂无")}`
217
+ ].join("\n");
218
+ }
219
+ function buildVerificationContent(projectName, run) {
220
+ return [
221
+ `已为项目 **${projectName}** 发起验证。`,
222
+ "",
223
+ `- 验证类型:${run.verificationType}`,
224
+ `- 运行状态:${run.status}`,
225
+ `- 目标:${run.targetRef ?? "未指定"}`,
226
+ `- 摘要:${run.summary ?? "验证已发起,等待更多结果"}`
227
+ ].join("\n");
228
+ }
229
+ function joinItems(items, fallback) {
230
+ return items.length > 0 ? items.join(";") : fallback;
231
+ }
232
+ function createProjectRef(projectId, label, workspaceId) {
233
+ return {
234
+ kind: "project",
235
+ id: projectId,
236
+ label,
237
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}/butler?projectId=${encodeURIComponent(projectId)}`,
238
+ workspaceId,
239
+ projectId
240
+ };
241
+ }
242
+ function createWorkspaceRef(workspaceId) {
243
+ return {
244
+ kind: "workspace",
245
+ id: workspaceId,
246
+ label: "打开工作区",
247
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}`,
248
+ workspaceId,
249
+ projectId: null
250
+ };
251
+ }
252
+ function createButlerSessionRef(butlerSessionId, label, workspaceId, projectId) {
253
+ return {
254
+ kind: "butler-session",
255
+ id: butlerSessionId,
256
+ label,
257
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}/butler?projectId=${encodeURIComponent(projectId)}&butlerSessionId=${encodeURIComponent(butlerSessionId)}`,
258
+ workspaceId,
259
+ projectId
260
+ };
261
+ }
262
+ function createSessionRef(sessionId, label, workspaceId, projectId) {
263
+ return {
264
+ kind: "session",
265
+ id: sessionId,
266
+ label,
267
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}/sessions/${encodeURIComponent(sessionId)}`,
268
+ workspaceId,
269
+ projectId
270
+ };
271
+ }
272
+ function createPatrolRunRef(runId, workspaceId, projectId) {
273
+ return {
274
+ kind: "patrol-run",
275
+ id: runId,
276
+ label: "查看巡视记录",
277
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}/butler?projectId=${encodeURIComponent(projectId)}&patrolRunId=${encodeURIComponent(runId)}`,
278
+ workspaceId,
279
+ projectId
280
+ };
281
+ }
282
+ function createVerificationRunRef(runId, workspaceId, projectId) {
283
+ return {
284
+ kind: "verification-run",
285
+ id: runId,
286
+ label: "查看验证记录",
287
+ routePath: `/workspaces/${encodeURIComponent(workspaceId)}/butler?projectId=${encodeURIComponent(projectId)}&verificationRunId=${encodeURIComponent(runId)}`,
288
+ workspaceId,
289
+ projectId
290
+ };
291
+ }
292
+ function normalizeNullableText(value) {
293
+ const normalized = value?.trim();
294
+ return normalized ? normalized : null;
295
+ }
296
+ //# sourceMappingURL=butler-control-action-service.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"butler-control-action-service.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-control-action-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;AAmEpD,MAAM,OAAO,0BAA0B;IAElB;IACA;IAIA;IAIA;IACA;IAIA;IACA;IACA;IACA;IAlBnB,YACmB,oBAAqE,EACrE,8BAGhB,EACgB,4BAGhB,EACgB,oBAA2D,EAC3D,oBAGhB,EACgB,gBAAoD,EACpD,sBAAwE,EACxE,sBAAgE,EAChE,uBAA2E;QAjB3E,yBAAoB,GAApB,oBAAoB,CAAiD;QACrE,mCAA8B,GAA9B,8BAA8B,CAG9C;QACgB,iCAA4B,GAA5B,4BAA4B,CAG5C;QACgB,yBAAoB,GAApB,oBAAoB,CAAuC;QAC3D,yBAAoB,GAApB,oBAAoB,CAGpC;QACgB,qBAAgB,GAAhB,gBAAgB,CAAoC;QACpD,2BAAsB,GAAtB,sBAAsB,CAAkD;QACxE,2BAAsB,GAAtB,sBAAsB,CAA0C;QAChE,4BAAuB,GAAvB,uBAAuB,CAAoD;IAC3F,CAAC;IAEJ,iBAAiB;QACf,MAAM,OAAO,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAChD,OAAO,OAAO;YACZ,CAAC,CAAC,IAAI,CAAC,4BAA4B,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE,CAAC;YACtE,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,SAAiB,EAAE,MAAc;QACjD,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE7D,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YACzF,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE;gBAC5D,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,SAAS,OAAO,CAAC,IAAI,EAAE;gBAC9B,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC;gBACzC,WAAW,EAAE;oBACX,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC/D,kBAAkB,CAAC,OAAO,CAAC,WAAW,CAAC;iBACxC;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,OAAO;aACR,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE;gBAChF,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;aAChE,CAAC,CAAC;YACH,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,KAA4C,EAC5C,MAAc;QAEd,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEpD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAC3D,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,eAAe,EACrB,MAAM,CACP,CAAC;YACF,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,gBAAgB,EAAE;gBAC9D,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,WAAW,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE;gBACzD,OAAO,EAAE,yBAAyB,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC;gBACjE,WAAW,EAAE;oBACX,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC/D,sBAAsB,CACpB,KAAK,CAAC,eAAe,EACrB,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,IAAI,EACrC,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,CACX;oBACD,gBAAgB,CACd,OAAO,CAAC,OAAO,CAAC,SAAS,EACzB,OAAO,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,EAClD,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,CACX;iBACF;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,OAAO;aACR,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CACrB,OAAO,EACP,gBAAgB,EAChB,YAAY,OAAO,CAAC,IAAI,EAAE,EAC1B,KAAK,EACL,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAClE,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,WAAW,CACf,KAAmC;QAEnC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEpD,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE;gBAChE,MAAM,EAAE,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC;gBAC3C,WAAW,EAAE,MAAM;gBACnB,UAAU,EAAE,qBAAqB,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,uBAAuB;gBAC9E,eAAe,EAAE,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC7D,WAAW,EAAE,KAAK,CAAC,WAAW,IAAI,EAAE;aACrC,CAAC,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;YAC7E,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,cAAc,EAAE;gBAC5D,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,SAAS,OAAO,CAAC,IAAI,EAAE;gBAC9B,OAAO,EAAE,kBAAkB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;gBAC9C,WAAW,EAAE;oBACX,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC/D,kBAAkB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;iBAC5D;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,GAAG;aACJ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CACrB,OAAO,EACP,cAAc,EACd,UAAU,OAAO,CAAC,IAAI,EAAE,EACxB,KAAK,EACL,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAClE,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,KAAyC;QAEzC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QAEpD,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE;gBACtE,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;gBACxC,SAAS,EAAE,qBAAqB,CAAC,KAAK,CAAC,SAAS,CAAC;gBACjD,eAAe,EAAE,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC;gBAC7D,iBAAiB,EAAE,qBAAqB,CAAC,KAAK,CAAC,iBAAiB,CAAC;gBACjE,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB,CAAC,CAAC;YACH,MAAM,KAAK,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,EAAE;gBAClE,MAAM,EAAE,WAAW;gBACnB,KAAK,EAAE,SAAS,OAAO,CAAC,IAAI,EAAE;gBAC9B,OAAO,EAAE,wBAAwB,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC;gBACpD,WAAW,EAAE;oBACX,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC;oBAC/D,wBAAwB,CAAC,GAAG,CAAC,EAAE,EAAE,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;iBAClE;aACF,CAAC,CAAC;YAEH,OAAO;gBACL,KAAK;gBACL,GAAG;aACJ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,kBAAkB,CACrB,OAAO,EACP,oBAAoB,EACpB,UAAU,OAAO,CAAC,IAAI,EAAE,EACxB,KAAK,EACL,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC,CAClE,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,wBAAwB;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,OAAO,IAAI,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACtF,CAAC;IAEO,4BAA4B;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;QAC9D,MAAM,OAAO,GAAG,IAAI,CAAC,8BAA8B,CAAC,oBAAoB,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE7F,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,iBAAiB,CACvB,cAAoC,EACpC,UAAmC,EACnC,KAKC;QAED,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,4BAA4B,CAAC,MAAM,CAAC;YACrD,EAAE,EAAE,QAAQ,EAAE;YACd,gBAAgB,EAAE,cAAc,CAAC,EAAE;YACnC,IAAI,EAAE,QAAQ;YACd,UAAU;YACV,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,IAAI,CAAC,8BAA8B,CAAC,MAAM,CAAC;YACzC,GAAG,cAAc;YACjB,WAAW,EAAE,KAAK,CAAC,KAAK;YACxB,SAAS,EAAE,SAAS;SACrB,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,kBAAkB,CACxB,cAAoC,EACpC,UAAmC,EACnC,KAAa,EACb,KAAc,EACd,WAAsC;QAEtC,MAAM,MAAM,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAEtE,OAAO,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,UAAU,EAAE;YACxD,MAAM,EAAE,QAAQ;YAChB,KAAK;YACL,OAAO,EAAE,GAAG,KAAK,YAAY,MAAM,EAAE;YACrC,WAAW;SACZ,CAAC,CAAC;IACL,CAAC;CACF;AAED,SAAS,uBAAuB,CAAC,OAA6B;IAC5D,OAAO;QACL,YAAY,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK;QACrC,EAAE;QACF,UAAU,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;QACrC,UAAU,OAAO,CAAC,OAAO,CAAC,kBAAkB,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,EAAE;QAC9E,UAAU,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE;QACjD,WAAW,SAAS,CAAC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE;KACtD,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,yBAAyB,CAChC,WAAmB,EACnB,OAAiC;IAEjC,OAAO;QACL,WAAW,WAAW,SAAS;QAC/B,EAAE;QACF,UAAU,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,SAAS,EAAE;QAC9C,cAAc,OAAO,CAAC,QAAQ,IAAI,SAAS,EAAE;QAC7C,UAAU,OAAO,CAAC,MAAM,EAAE;QAC1B,UAAU,OAAO,CAAC,WAAW,IAAI,IAAI,EAAE;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB,EAAE,GAAkB;IACjE,OAAO;QACL,UAAU,WAAW,UAAU;QAC/B,EAAE;QACF,UAAU,GAAG,CAAC,MAAM,EAAE;QACtB,UAAU,GAAG,CAAC,SAAS,IAAI,SAAS,EAAE;QACtC,QAAQ,GAAG,CAAC,OAAO,IAAI,cAAc,EAAE;QACvC,QAAQ,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE;KAC3C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,wBAAwB,CAAC,WAAmB,EAAE,GAAwB;IAC7E,OAAO;QACL,UAAU,WAAW,UAAU;QAC/B,EAAE;QACF,UAAU,GAAG,CAAC,gBAAgB,EAAE;QAChC,UAAU,GAAG,CAAC,MAAM,EAAE;QACtB,QAAQ,GAAG,CAAC,SAAS,IAAI,KAAK,EAAE;QAChC,QAAQ,GAAG,CAAC,OAAO,IAAI,cAAc,EAAE;KACxC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,SAAS,SAAS,CAAC,KAAe,EAAE,QAAgB;IAClD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AACvD,CAAC;AAED,SAAS,gBAAgB,CAAC,SAAiB,EAAE,KAAa,EAAE,WAAmB;IAC7E,OAAO;QACL,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,SAAS;QACb,KAAK;QACL,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,EAAE;QAC7G,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,WAAmB;IAC7C,OAAO;QACL,IAAI,EAAE,WAAW;QACjB,EAAE,EAAE,WAAW;QACf,KAAK,EAAE,OAAO;QACd,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,EAAE;QAC3D,WAAW;QACX,SAAS,EAAE,IAAI;KAChB,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAC7B,eAAuB,EACvB,KAAa,EACb,WAAmB,EACnB,SAAiB;IAEjB,OAAO;QACL,IAAI,EAAE,gBAAgB;QACtB,EAAE,EAAE,eAAe;QACnB,KAAK;QACL,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,oBAAoB,kBAAkB,CAAC,eAAe,CAAC,EAAE;QACpK,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,SAAiB,EACjB,KAAa,EACb,WAAmB,EACnB,SAAiB;IAEjB,OAAO;QACL,IAAI,EAAE,SAAS;QACf,EAAE,EAAE,SAAS;QACb,KAAK;QACL,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,aAAa,kBAAkB,CAAC,SAAS,CAAC,EAAE;QACrG,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAa,EAAE,WAAmB,EAAE,SAAiB;IAC/E,OAAO;QACL,IAAI,EAAE,YAAY;QAClB,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,kBAAkB,CAAC,KAAK,CAAC,EAAE;QACtJ,WAAW;QACX,SAAS;KACV,CAAC;AACJ,CAAC;AAED,SAAS,wBAAwB,CAC/B,KAAa,EACb,WAAmB,EACnB,SAAiB;IAEjB,OAAO;QACL,IAAI,EAAE,kBAAkB;QACxB,EAAE,EAAE,KAAK;QACT,KAAK,EAAE,QAAQ;QACf,SAAS,EAAE,eAAe,kBAAkB,CAAC,WAAW,CAAC,qBAAqB,kBAAkB,CAAC,SAAS,CAAC,sBAAsB,kBAAkB,CAAC,KAAK,CAAC,EAAE;QAC5J,WAAW;QACX,SAAS;KACV,CAAC;AACJ,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"}
@@ -0,0 +1,55 @@
1
+ import type { ButlerControlSession, SessionListItem } from "../../types/domain.js";
2
+ import type { ButlerControlSessionRepository } from "../../storage/repositories/butler-control-session-repository.js";
3
+ import { type ButlerProfileService } from "./butler-profile-service.js";
4
+ import type { ButlerAuthService } from "./butler-auth-service.js";
5
+ import type { WorkspaceService } from "../workspace/workspace-service.js";
6
+ import type { SessionHistoryService } from "../sessions/session-history-service.js";
7
+ import type { SessionLiveRuntimeService } from "../sessions/session-live-runtime-service.js";
8
+ import type { ButlerContextAggregator } from "./context-aggregator.js";
9
+ export interface ButlerControlSessionView extends ButlerControlSession {
10
+ session: SessionListItem;
11
+ }
12
+ export interface StartButlerControlSessionInput {
13
+ content?: string;
14
+ clientRequestId?: string | null;
15
+ model?: string | null;
16
+ reasoningLevel?: string | null;
17
+ permissionMode?: string | null;
18
+ }
19
+ export interface SendButlerControlMessageInput extends StartButlerControlSessionInput {
20
+ content?: string;
21
+ }
22
+ export declare class ButlerControlSessionService {
23
+ private readonly butlerProfileService;
24
+ private readonly butlerControlSessionRepository;
25
+ private readonly workspaceService;
26
+ private readonly sessionHistoryService;
27
+ private readonly sessionLiveRuntimeService;
28
+ private readonly butlerContextAggregator;
29
+ private readonly butlerAuthService;
30
+ private readonly codexHomeDir;
31
+ private readonly sourceCodexHomeDir;
32
+ 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">, codexHomeDir?: string | null, sourceCodexHomeDir?: string | null);
33
+ getCurrentSession(userId: string): ButlerControlSessionView | null;
34
+ resetCurrentSession(): void;
35
+ startSession(userId: string, input?: StartButlerControlSessionInput): Promise<ButlerControlSessionView>;
36
+ resumeCurrentSession(userId: string): Promise<ButlerControlSessionView & {
37
+ resumedAt: string;
38
+ provider: string;
39
+ providerSessionId: string;
40
+ }>;
41
+ sendMessage(userId: string, input: SendButlerControlMessageInput): Promise<{
42
+ controlSession: ButlerControlSessionView;
43
+ sessionId: string;
44
+ provider: string;
45
+ providerSessionId: string;
46
+ acceptedAt: string;
47
+ clientRequestId: string | null;
48
+ message: Awaited<ReturnType<SessionLiveRuntimeService["sendLiveMessage"]>>["message"];
49
+ }>;
50
+ private requireCurrentSession;
51
+ private toView;
52
+ private prepareWorkspace;
53
+ private syncWorkspaceContext;
54
+ private markFailed;
55
+ }