@jingyi0605/codingns 0.2.5 → 0.3.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 (227) hide show
  1. package/bin/codingns.mjs +278 -2
  2. package/dist/public/assets/{TerminalPage-BkjqU9NG.js → TerminalPage-CgrfstRm.js} +19 -19
  3. package/dist/public/assets/index-Cek6u0b9.css +1 -0
  4. package/dist/public/assets/index-THHY79si.js +122 -0
  5. package/dist/public/index.html +2 -2
  6. package/dist/server/config/env.d.ts +4 -0
  7. package/dist/server/config/env.js +67 -3
  8. package/dist/server/config/env.js.map +1 -1
  9. package/dist/server/modules/auth/auth-service.d.ts +18 -1
  10. package/dist/server/modules/auth/auth-service.js +168 -7
  11. package/dist/server/modules/auth/auth-service.js.map +1 -1
  12. package/dist/server/modules/butler/butler-codex-model-policy.d.ts +1 -0
  13. package/dist/server/modules/butler/butler-codex-model-policy.js +36 -0
  14. package/dist/server/modules/butler/butler-codex-model-policy.js.map +1 -0
  15. package/dist/server/modules/butler/butler-control-session-service.d.ts +16 -2
  16. package/dist/server/modules/butler/butler-control-session-service.js +58 -210
  17. package/dist/server/modules/butler/butler-control-session-service.js.map +1 -1
  18. package/dist/server/modules/butler/butler-controller.d.ts +17 -0
  19. package/dist/server/modules/butler/butler-controller.js +20 -1
  20. package/dist/server/modules/butler/butler-controller.js.map +1 -1
  21. package/dist/server/modules/butler/butler-follow-up-service.js +7 -3
  22. package/dist/server/modules/butler/butler-follow-up-service.js.map +1 -1
  23. package/dist/server/modules/butler/butler-inbox-analysis-service.d.ts +36 -0
  24. package/dist/server/modules/butler/butler-inbox-analysis-service.js +375 -0
  25. package/dist/server/modules/butler/butler-inbox-analysis-service.js.map +1 -0
  26. package/dist/server/modules/butler/butler-inbox-instruction-adapter.d.ts +23 -0
  27. package/dist/server/modules/butler/butler-inbox-instruction-adapter.js +96 -0
  28. package/dist/server/modules/butler/butler-inbox-instruction-adapter.js.map +1 -0
  29. package/dist/server/modules/butler/butler-inbox-service.d.ts +39 -2
  30. package/dist/server/modules/butler/butler-inbox-service.js +392 -2
  31. package/dist/server/modules/butler/butler-inbox-service.js.map +1 -1
  32. package/dist/server/modules/butler/butler-session-service.d.ts +9 -0
  33. package/dist/server/modules/butler/butler-session-service.js +277 -68
  34. package/dist/server/modules/butler/butler-session-service.js.map +1 -1
  35. package/dist/server/modules/butler/butler-session-summary-service.d.ts +1 -0
  36. package/dist/server/modules/butler/butler-session-summary-service.js +48 -23
  37. package/dist/server/modules/butler/butler-session-summary-service.js.map +1 -1
  38. package/dist/server/modules/butler/butler-workspace-context.d.ts +13 -0
  39. package/dist/server/modules/butler/butler-workspace-context.js +223 -0
  40. package/dist/server/modules/butler/butler-workspace-context.js.map +1 -0
  41. package/dist/server/modules/client/client-controller.d.ts +6 -0
  42. package/dist/server/modules/client/client-controller.js +30 -8
  43. package/dist/server/modules/client/client-controller.js.map +1 -1
  44. package/dist/server/modules/client/client-service.d.ts +22 -10
  45. package/dist/server/modules/client/client-service.js +77 -100
  46. package/dist/server/modules/client/client-service.js.map +1 -1
  47. package/dist/server/modules/client/npm-global-package-service.d.ts +21 -0
  48. package/dist/server/modules/client/npm-global-package-service.js +210 -0
  49. package/dist/server/modules/client/npm-global-package-service.js.map +1 -0
  50. package/dist/server/modules/client/service-update-task-service.d.ts +15 -0
  51. package/dist/server/modules/client/service-update-task-service.js +147 -0
  52. package/dist/server/modules/client/service-update-task-service.js.map +1 -0
  53. package/dist/server/modules/client/service-update-types.d.ts +30 -0
  54. package/dist/server/modules/client/service-update-types.js +2 -0
  55. package/dist/server/modules/client/service-update-types.js.map +1 -0
  56. package/dist/server/modules/debug-target/debug-target-service.d.ts +5 -2
  57. package/dist/server/modules/debug-target/debug-target-service.js +170 -10
  58. package/dist/server/modules/debug-target/debug-target-service.js.map +1 -1
  59. package/dist/server/modules/file/file-constants.d.ts +1 -0
  60. package/dist/server/modules/file/file-constants.js +1 -0
  61. package/dist/server/modules/file/file-constants.js.map +1 -1
  62. package/dist/server/modules/file/file-controller.js +12 -3
  63. package/dist/server/modules/file/file-controller.js.map +1 -1
  64. package/dist/server/modules/file/file-preview-link-service.js +6 -37
  65. package/dist/server/modules/file/file-preview-link-service.js.map +1 -1
  66. package/dist/server/modules/file/file-preview-service.d.ts +6 -12
  67. package/dist/server/modules/file/file-preview-service.js +114 -28
  68. package/dist/server/modules/file/file-preview-service.js.map +1 -1
  69. package/dist/server/modules/file/file-preview-types.d.ts +37 -0
  70. package/dist/server/modules/file/file-preview-types.js +84 -0
  71. package/dist/server/modules/file/file-preview-types.js.map +1 -0
  72. package/dist/server/modules/git/git-controller.d.ts +6 -0
  73. package/dist/server/modules/git/git-controller.js +13 -0
  74. package/dist/server/modules/git/git-controller.js.map +1 -1
  75. package/dist/server/modules/git/git-read-service.d.ts +2 -1
  76. package/dist/server/modules/git/git-read-service.js +100 -0
  77. package/dist/server/modules/git/git-read-service.js.map +1 -1
  78. package/dist/server/modules/git/types.d.ts +23 -0
  79. package/dist/server/modules/model-switch/cc-switch-adapter.d.ts +36 -0
  80. package/dist/server/modules/model-switch/cc-switch-adapter.js +317 -0
  81. package/dist/server/modules/model-switch/cc-switch-adapter.js.map +1 -0
  82. package/dist/server/modules/model-switch/model-switch-controller.d.ts +11 -0
  83. package/dist/server/modules/model-switch/model-switch-controller.js +30 -0
  84. package/dist/server/modules/model-switch/model-switch-controller.js.map +1 -0
  85. package/dist/server/modules/model-switch/model-switch-service.d.ts +16 -0
  86. package/dist/server/modules/model-switch/model-switch-service.js +29 -0
  87. package/dist/server/modules/model-switch/model-switch-service.js.map +1 -0
  88. package/dist/server/modules/preferences/profile-service.d.ts +1 -0
  89. package/dist/server/modules/preferences/profile-service.js +9 -0
  90. package/dist/server/modules/preferences/profile-service.js.map +1 -1
  91. package/dist/server/modules/sessions/codex-app-server-helper-process.js +3 -0
  92. package/dist/server/modules/sessions/codex-app-server-helper-process.js.map +1 -1
  93. package/dist/server/modules/sessions/session-activity-authority-service.d.ts +3 -1
  94. package/dist/server/modules/sessions/session-activity-authority-service.js +16 -1
  95. package/dist/server/modules/sessions/session-activity-authority-service.js.map +1 -1
  96. package/dist/server/modules/sessions/session-activity-inspector.d.ts +1 -1
  97. package/dist/server/modules/sessions/session-activity-inspector.js +52 -9
  98. package/dist/server/modules/sessions/session-activity-inspector.js.map +1 -1
  99. package/dist/server/modules/sessions/session-controller.d.ts +3 -3
  100. package/dist/server/modules/sessions/session-controller.js +3 -3
  101. package/dist/server/modules/sessions/session-controller.js.map +1 -1
  102. package/dist/server/modules/sessions/session-history-service.d.ts +11 -2
  103. package/dist/server/modules/sessions/session-history-service.js +373 -78
  104. package/dist/server/modules/sessions/session-history-service.js.map +1 -1
  105. package/dist/server/modules/sessions/session-live-runtime-service.d.ts +9 -4
  106. package/dist/server/modules/sessions/session-live-runtime-service.js +59 -11
  107. package/dist/server/modules/sessions/session-live-runtime-service.js.map +1 -1
  108. package/dist/server/modules/sessions/session-message-attachment-service.d.ts +8 -8
  109. package/dist/server/modules/sessions/session-message-attachment-service.js +25 -34
  110. package/dist/server/modules/sessions/session-message-attachment-service.js.map +1 -1
  111. package/dist/server/modules/sessions/session-provider-error-mapper.js +7 -0
  112. package/dist/server/modules/sessions/session-provider-error-mapper.js.map +1 -1
  113. package/dist/server/modules/skills/skill-controller.d.ts +23 -0
  114. package/dist/server/modules/skills/skill-controller.js +35 -0
  115. package/dist/server/modules/skills/skill-controller.js.map +1 -0
  116. package/dist/server/modules/skills/skill-manager-service.d.ts +86 -0
  117. package/dist/server/modules/skills/skill-manager-service.js +557 -0
  118. package/dist/server/modules/skills/skill-manager-service.js.map +1 -0
  119. package/dist/server/modules/skills/skill-reconciler.d.ts +21 -0
  120. package/dist/server/modules/skills/skill-reconciler.js +99 -0
  121. package/dist/server/modules/skills/skill-reconciler.js.map +1 -0
  122. package/dist/server/modules/skills/skill-sync-planner.d.ts +8 -0
  123. package/dist/server/modules/skills/skill-sync-planner.js +20 -0
  124. package/dist/server/modules/skills/skill-sync-planner.js.map +1 -0
  125. package/dist/server/modules/skills/skill-target-adapter.d.ts +34 -0
  126. package/dist/server/modules/skills/skill-target-adapter.js +65 -0
  127. package/dist/server/modules/skills/skill-target-adapter.js.map +1 -0
  128. package/dist/server/modules/tailscale/tailscale-controller.d.ts +15 -0
  129. package/dist/server/modules/tailscale/tailscale-controller.js +33 -0
  130. package/dist/server/modules/tailscale/tailscale-controller.js.map +1 -0
  131. package/dist/server/modules/tailscale/tailscale-helper-client.d.ts +41 -0
  132. package/dist/server/modules/tailscale/tailscale-helper-client.js +135 -0
  133. package/dist/server/modules/tailscale/tailscale-helper-client.js.map +1 -0
  134. package/dist/server/modules/tailscale/tailscale-helper-process.d.ts +1 -0
  135. package/dist/server/modules/tailscale/tailscale-helper-process.js +327 -0
  136. package/dist/server/modules/tailscale/tailscale-helper-process.js.map +1 -0
  137. package/dist/server/modules/tailscale/tailscale-manager.d.ts +41 -0
  138. package/dist/server/modules/tailscale/tailscale-manager.js +263 -0
  139. package/dist/server/modules/tailscale/tailscale-manager.js.map +1 -0
  140. package/dist/server/modules/tailscale/tailscale-service.d.ts +43 -0
  141. package/dist/server/modules/tailscale/tailscale-service.js +201 -0
  142. package/dist/server/modules/tailscale/tailscale-service.js.map +1 -0
  143. package/dist/server/modules/tasks/task-lane-executors.js +3 -0
  144. package/dist/server/modules/tasks/task-lane-executors.js.map +1 -1
  145. package/dist/server/modules/tasks/task-types.d.ts +2 -0
  146. package/dist/server/modules/tasks/task-types.js +3 -1
  147. package/dist/server/modules/tasks/task-types.js.map +1 -1
  148. package/dist/server/modules/terminal/command-template-service.js +10 -1
  149. package/dist/server/modules/terminal/command-template-service.js.map +1 -1
  150. package/dist/server/modules/terminal/template-port-runtime.d.ts +12 -1
  151. package/dist/server/modules/terminal/template-port-runtime.js +189 -17
  152. package/dist/server/modules/terminal/template-port-runtime.js.map +1 -1
  153. package/dist/server/modules/terminal/terminal-service.js +30 -3
  154. package/dist/server/modules/terminal/terminal-service.js.map +1 -1
  155. package/dist/server/modules/workspace/workspace-code-composition.js +95 -2
  156. package/dist/server/modules/workspace/workspace-code-composition.js.map +1 -1
  157. package/dist/server/routes/butler.js +4 -0
  158. package/dist/server/routes/butler.js.map +1 -1
  159. package/dist/server/routes/client.js +2 -0
  160. package/dist/server/routes/client.js.map +1 -1
  161. package/dist/server/routes/git.js +1 -0
  162. package/dist/server/routes/git.js.map +1 -1
  163. package/dist/server/routes/sessions.js +1 -1
  164. package/dist/server/routes/sessions.js.map +1 -1
  165. package/dist/server/routes/skills.d.ts +3 -0
  166. package/dist/server/routes/skills.js +7 -0
  167. package/dist/server/routes/skills.js.map +1 -0
  168. package/dist/server/routes/system.d.ts +4 -0
  169. package/dist/server/routes/system.js +11 -0
  170. package/dist/server/routes/system.js.map +1 -0
  171. package/dist/server/server/create-server.d.ts +16 -0
  172. package/dist/server/server/create-server.js +91 -8
  173. package/dist/server/server/create-server.js.map +1 -1
  174. package/dist/server/shared/errors/app-error.d.ts +2 -0
  175. package/dist/server/shared/errors/app-error.js +2 -0
  176. package/dist/server/shared/errors/app-error.js.map +1 -1
  177. package/dist/server/shared/http/error-handler.d.ts +2 -1
  178. package/dist/server/shared/http/error-handler.js +3 -2
  179. package/dist/server/shared/http/error-handler.js.map +1 -1
  180. package/dist/server/shared/utils/command-availability.d.ts +1 -0
  181. package/dist/server/shared/utils/command-availability.js +26 -3
  182. package/dist/server/shared/utils/command-availability.js.map +1 -1
  183. package/dist/server/storage/repositories/auth-login-attempt-repository.d.ts +9 -0
  184. package/dist/server/storage/repositories/auth-login-attempt-repository.js +59 -0
  185. package/dist/server/storage/repositories/auth-login-attempt-repository.js.map +1 -0
  186. package/dist/server/storage/repositories/butler-control-session-repository.d.ts +3 -0
  187. package/dist/server/storage/repositories/butler-control-session-repository.js +80 -4
  188. package/dist/server/storage/repositories/butler-control-session-repository.js.map +1 -1
  189. package/dist/server/storage/repositories/butler-inbox-item-repository.js +54 -3
  190. package/dist/server/storage/repositories/butler-inbox-item-repository.js.map +1 -1
  191. package/dist/server/storage/repositories/instance-tailscale-repository.d.ts +10 -0
  192. package/dist/server/storage/repositories/instance-tailscale-repository.js +112 -0
  193. package/dist/server/storage/repositories/instance-tailscale-repository.js.map +1 -0
  194. package/dist/server/storage/repositories/managed-skill-repository.d.ts +11 -0
  195. package/dist/server/storage/repositories/managed-skill-repository.js +102 -0
  196. package/dist/server/storage/repositories/managed-skill-repository.js.map +1 -0
  197. package/dist/server/storage/repositories/skill-target-binding-repository.d.ts +10 -0
  198. package/dist/server/storage/repositories/skill-target-binding-repository.js +77 -0
  199. package/dist/server/storage/repositories/skill-target-binding-repository.js.map +1 -0
  200. package/dist/server/storage/repositories/terminal-instance-repository.js +1 -1
  201. package/dist/server/storage/repositories/terminal-instance-repository.js.map +1 -1
  202. package/dist/server/storage/repositories/user-preference-profile-repository.js +6 -3
  203. package/dist/server/storage/repositories/user-preference-profile-repository.js.map +1 -1
  204. package/dist/server/storage/sqlite/client.js +137 -0
  205. package/dist/server/storage/sqlite/client.js.map +1 -1
  206. package/dist/server/storage/sqlite/schema.sql +84 -1
  207. package/dist/server/types/domain.d.ts +109 -1
  208. package/dist/server/ws/ws-server.js +4 -4
  209. package/dist/server/ws/ws-server.js.map +1 -1
  210. package/node_modules/@codingns/session-sync-core/dist/patch-builder.d.ts +23 -0
  211. package/node_modules/@codingns/session-sync-core/dist/patch-builder.js +162 -0
  212. package/node_modules/@codingns/session-sync-core/dist/patch-builder.js.map +1 -1
  213. package/node_modules/@codingns/session-sync-core/dist/providers/codex.d.ts +1 -0
  214. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js +89 -33
  215. package/node_modules/@codingns/session-sync-core/dist/providers/codex.js.map +1 -1
  216. package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js +18 -2
  217. package/node_modules/@codingns/session-sync-core/dist/runtime/active-run-registry.js.map +1 -1
  218. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.d.ts +3 -1
  219. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js +238 -53
  220. package/node_modules/@codingns/session-sync-core/dist/runtime/codex-runtime.js.map +1 -1
  221. package/node_modules/@codingns/session-sync-core/dist/runtime/provider-runtime-service.js +1 -0
  222. package/node_modules/@codingns/session-sync-core/dist/runtime/provider-runtime-service.js.map +1 -1
  223. package/node_modules/@codingns/session-sync-core/dist/runtime/types.d.ts +6 -2
  224. package/node_modules/@codingns/session-sync-core/dist/types.d.ts +1 -1
  225. package/package.json +1 -1
  226. package/dist/public/assets/index-C6U8-9jg.css +0 -1
  227. package/dist/public/assets/index-CKSumuV2.js +0 -109
@@ -4,6 +4,7 @@ import path from "node:path";
4
4
  import { createId } from "../../shared/utils/id.js";
5
5
  import { nowIso } from "../../shared/utils/time.js";
6
6
  import { ensureButlerWorkspaceIsolation } from "./butler-profile-service.js";
7
+ import { resolveButlerCodexBackgroundModel } from "./butler-codex-model-policy.js";
7
8
  const DEFAULT_DEBOUNCE_MS = 300_000;
8
9
  const DEFAULT_RECENT_MESSAGE_LIMIT = 40;
9
10
  export class ButlerSessionSummaryService {
@@ -88,6 +89,9 @@ export class ButlerSessionSummaryService {
88
89
  };
89
90
  }
90
91
  async maybeSummarizeSession(project, session, userId, providerId, summaryWorkspacePath, debounceMs) {
92
+ if (!this.hasPersistedButlerSession(session.id)) {
93
+ return "skipped";
94
+ }
91
95
  const index = this.sessionIndexRepository.findIndexRecordBySessionId(session.sessionId);
92
96
  if (!index || index.isArchived || index.isSubagent) {
93
97
  return "skipped";
@@ -97,8 +101,9 @@ export class ButlerSessionSummaryService {
97
101
  || state.sourceMessageCount !== index.messageCount
98
102
  || state.sourceLastMessageAt !== index.lastMessageAt;
99
103
  if (sourceChanged) {
100
- this.scheduleSession(state, session.id, index.messageCount, index.lastMessageAt, debounceMs);
101
- return "scheduled";
104
+ return this.scheduleSession(state, session.id, index.messageCount, index.lastMessageAt, debounceMs)
105
+ ? "scheduled"
106
+ : "skipped";
102
107
  }
103
108
  if (!state || state.status !== "scheduled" || !state.debounceUntil || state.debounceUntil > this.now()) {
104
109
  return "skipped";
@@ -110,6 +115,9 @@ export class ButlerSessionSummaryService {
110
115
  return "summarized";
111
116
  }
112
117
  scheduleSession(current, butlerSessionId, sourceMessageCount, sourceLastMessageAt, debounceMs) {
118
+ if (!this.hasPersistedButlerSession(butlerSessionId)) {
119
+ return false;
120
+ }
113
121
  const timestamp = this.now();
114
122
  this.butlerSessionSummaryStateRepository.upsert({
115
123
  butlerSessionId,
@@ -122,11 +130,15 @@ export class ButlerSessionSummaryService {
122
130
  errorDetail: null,
123
131
  updatedAt: timestamp
124
132
  });
133
+ return true;
125
134
  }
126
135
  resolveDebounceMs(summaryDebounceSeconds) {
127
136
  return Math.max(5_000, Math.trunc(summaryDebounceSeconds * 1_000 || this.debounceMs));
128
137
  }
129
138
  async summarizeSession(project, session, sessionTitle, sourceMessageCount, sourceLastMessageAt, userId, providerId, summaryWorkspacePath) {
139
+ if (!this.hasPersistedButlerSession(session.id)) {
140
+ return;
141
+ }
130
142
  this.inFlightButlerSessionIds.add(session.id);
131
143
  const runningAt = this.now();
132
144
  const currentState = this.butlerSessionSummaryStateRepository.findByButlerSessionId(session.id);
@@ -178,7 +190,7 @@ export class ButlerSessionSummaryService {
178
190
  userId,
179
191
  providerId,
180
192
  prompt: instruction.prompt,
181
- model: resolveSummaryModel(providerId),
193
+ model: resolveSummaryModel(providerId, this.sourceCodexHomeDir),
182
194
  reasoningLevel: "low",
183
195
  permissionMode: "default"
184
196
  });
@@ -188,17 +200,19 @@ export class ButlerSessionSummaryService {
188
200
  }
189
201
  catch (error) {
190
202
  const detail = error instanceof Error ? error.message : String(error);
191
- this.butlerSessionSummaryStateRepository.upsert({
192
- butlerSessionId: session.id,
193
- sourceMessageCount,
194
- sourceLastMessageAt,
195
- lastSummarizedAt: currentState?.lastSummarizedAt ?? null,
196
- lastSummarizedSequence: currentState?.lastSummarizedSequence ?? null,
197
- debounceUntil: null,
198
- status: "failed",
199
- errorDetail: detail,
200
- updatedAt: this.now()
201
- });
203
+ if (this.hasPersistedButlerSession(session.id)) {
204
+ this.butlerSessionSummaryStateRepository.upsert({
205
+ butlerSessionId: session.id,
206
+ sourceMessageCount,
207
+ sourceLastMessageAt,
208
+ lastSummarizedAt: currentState?.lastSummarizedAt ?? null,
209
+ lastSummarizedSequence: currentState?.lastSummarizedSequence ?? null,
210
+ debounceUntil: null,
211
+ status: "failed",
212
+ errorDetail: detail,
213
+ updatedAt: this.now()
214
+ });
215
+ }
202
216
  this.logger.error("[butler-session-summary] summarize failed", {
203
217
  butlerSessionId: session.id,
204
218
  sessionId: session.sessionId,
@@ -219,15 +233,20 @@ export class ButlerSessionSummaryService {
219
233
  ]).slice(0, 3);
220
234
  const riskFlags = dedupeItems(result.structured.riskFlags).slice(0, 4);
221
235
  const existing = this.butlerSessionRepository.findById(session.id);
222
- if (existing) {
223
- this.butlerSessionRepository.update({
224
- ...existing,
225
- status: resolveButlerSessionStatus(session.runningState, progressState),
226
- lastSummary: summary,
227
- lastCheckpointAt: timestamp,
228
- updatedAt: timestamp
236
+ if (!existing) {
237
+ this.logger.error("[butler-session-summary] skip persist for removed session", {
238
+ butlerSessionId: session.id,
239
+ sessionId: session.sessionId
229
240
  });
241
+ return;
230
242
  }
243
+ this.butlerSessionRepository.update({
244
+ ...existing,
245
+ status: resolveButlerSessionStatus(session.runningState, progressState),
246
+ lastSummary: summary,
247
+ lastCheckpointAt: timestamp,
248
+ updatedAt: timestamp
249
+ });
231
250
  this.sessionCheckpointRepository.create({
232
251
  id: createId(),
233
252
  butlerSessionId: session.id,
@@ -261,6 +280,9 @@ export class ButlerSessionSummaryService {
261
280
  resolveExecutorUserId() {
262
281
  return this.authUserRepository.listIds()[0] ?? null;
263
282
  }
283
+ hasPersistedButlerSession(butlerSessionId) {
284
+ return Boolean(this.butlerSessionRepository.findById(butlerSessionId));
285
+ }
264
286
  async collectIncrementalHistory(sessionId, lastSummarizedSequence, userId) {
265
287
  const collected = new Map();
266
288
  let cursor = null;
@@ -306,8 +328,11 @@ export class ButlerSessionSummaryService {
306
328
  }
307
329
  }
308
330
  }
309
- function resolveSummaryModel(providerId) {
310
- return providerId === "codex" ? "gpt-5.1-codex-mini" : "haiku";
331
+ function resolveSummaryModel(providerId, sourceCodexHomeDir) {
332
+ if (providerId !== "codex") {
333
+ return "haiku";
334
+ }
335
+ return resolveButlerCodexBackgroundModel("gpt-5.1-codex-mini", sourceCodexHomeDir);
311
336
  }
312
337
  function resolveButlerSessionStatus(runningState, progressState) {
313
338
  switch (runningState) {
@@ -1 +1 @@
1
- {"version":3,"file":"butler-session-summary-service.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-session-summary-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"butler-session-summary-service.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-session-summary-service.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,13 @@
1
+ import type { ButlerProfile } from "../../types/domain.js";
2
+ import type { ButlerPromptContext } from "./context-aggregator.js";
3
+ import type { ButlerAuthService } from "./butler-auth-service.js";
4
+ import type { SkillManagerService } from "../skills/skill-manager-service.js";
5
+ export declare function syncButlerWorkspaceContext(input: {
6
+ profile: ButlerProfile;
7
+ promptContext: ButlerPromptContext;
8
+ userId: string;
9
+ butlerAuthService: Pick<ButlerAuthService, "ensureWorkspaceCredential" | "getCredentialFilePath">;
10
+ skillManagerService: Pick<SkillManagerService, "getOverview" | "importUnmanagedSkill">;
11
+ codexHomeDir: string | null;
12
+ sourceCodexHomeDir: string | null;
13
+ }): void;
@@ -0,0 +1,223 @@
1
+ import fs from "node:fs";
2
+ import os from "node:os";
3
+ import path from "node:path";
4
+ import { ensureButlerWorkspaceIsolation } from "./butler-profile-service.js";
5
+ export function syncButlerWorkspaceContext(input) {
6
+ fs.mkdirSync(input.profile.workspacePath, { recursive: true });
7
+ ensureButlerWorkspaceIsolation(input.profile.workspacePath);
8
+ const auth = input.butlerAuthService.ensureWorkspaceCredential(input.profile.workspacePath, input.userId);
9
+ const authFilePath = input.butlerAuthService.getCredentialFilePath(input.profile.workspacePath);
10
+ writeInstructionFiles(input.profile, input.promptContext, auth, authFilePath);
11
+ syncCodexInstructionConfig(input.profile, input.skillManagerService, input.codexHomeDir, input.sourceCodexHomeDir);
12
+ }
13
+ function writeInstructionFiles(profile, promptContext, auth, authFilePath) {
14
+ const rootAgentsPath = path.join(profile.workspacePath, "AGENTS.md");
15
+ writeFileIfChanged(rootAgentsPath, composeInstructionContent(profile, promptContext));
16
+ if (profile.agentsMode === "file" && profile.agentsFilePath) {
17
+ writeFileIfChanged(profile.agentsFilePath, composeInstructionContent(profile, promptContext));
18
+ }
19
+ if (profile.providerId === "claude-code") {
20
+ const claudeFilePath = path.join(profile.workspacePath, "CLAUDE.md");
21
+ writeFileIfChanged(claudeFilePath, composeInstructionContent(profile, promptContext));
22
+ }
23
+ writeFileIfChanged(path.join(profile.workspacePath, "BUTLER_CONTEXT.md"), `${promptContext.prompt.trim()}\n`);
24
+ writeFileIfChanged(path.join(profile.workspacePath, "BUTLER_API.md"), buildApiGuideContent(auth, authFilePath));
25
+ }
26
+ function syncCodexInstructionConfig(profile, skillManagerService, codexHomeDir, sourceCodexHomeDir) {
27
+ if (profile.providerId !== "codex" || !codexHomeDir?.trim()) {
28
+ return;
29
+ }
30
+ const targetHomeDir = path.resolve(codexHomeDir);
31
+ const sourceHomeDir = resolveSourceCodexHomeDir(sourceCodexHomeDir, targetHomeDir);
32
+ const sourceConfigPath = path.join(sourceHomeDir, "config.toml");
33
+ const instructionFilePath = profile.agentsMode === "file" && profile.agentsFilePath
34
+ ? path.resolve(profile.agentsFilePath)
35
+ : path.join(profile.workspacePath, "AGENTS.md");
36
+ const sourceConfigContent = sourceHomeDir !== targetHomeDir && fs.existsSync(sourceConfigPath) && fs.statSync(sourceConfigPath).isFile()
37
+ ? fs.readFileSync(sourceConfigPath, "utf8")
38
+ : "";
39
+ const configContent = composeCodexConfigContent(sourceConfigContent, instructionFilePath);
40
+ fs.mkdirSync(targetHomeDir, { recursive: true });
41
+ removeFileIfExists(path.join(targetHomeDir, "AGENTS.md"));
42
+ removeFileIfExists(path.join(targetHomeDir, "AGENTS.override.md"));
43
+ // Butler 运行在独立 home,下游会话仍然需要沿用当前 Codex 登录态。
44
+ syncOptionalFile(path.join(sourceHomeDir, "auth.json"), path.join(targetHomeDir, "auth.json"));
45
+ syncButlerCodexSkill(skillManagerService, path.join(targetHomeDir, "skills", "codingns-assistant"));
46
+ writeFileIfChanged(path.join(targetHomeDir, "config.toml"), `${configContent}\n`);
47
+ }
48
+ function syncButlerCodexSkill(skillManagerService, targetSkillPath) {
49
+ const skillDirectoryName = "codingns-assistant";
50
+ const overview = skillManagerService.getOverview({
51
+ targetCli: ["codex"]
52
+ });
53
+ const managedSkill = overview.managedSkills.find((item) => item.skill.directoryName === skillDirectoryName);
54
+ if (managedSkill) {
55
+ syncOptionalDirectory(managedSkill.ssotPath, targetSkillPath);
56
+ return;
57
+ }
58
+ const unmanagedEntry = overview.unmanagedEntries.find((entry) => entry.targetCli === "codex" && entry.directoryName === skillDirectoryName);
59
+ if (unmanagedEntry) {
60
+ const imported = skillManagerService.importUnmanagedSkill({
61
+ targetCli: "codex",
62
+ directoryPath: unmanagedEntry.directoryPath,
63
+ expectedContentHash: unmanagedEntry.contentHash
64
+ });
65
+ syncOptionalDirectory(imported.ssotPath, targetSkillPath);
66
+ return;
67
+ }
68
+ fs.rmSync(targetSkillPath, { recursive: true, force: true });
69
+ }
70
+ function composeInstructionContent(profile, promptContext) {
71
+ return `${profile.agentsContent.trim()}
72
+
73
+ ## 代码助手运行附加说明(系统自动生成)
74
+
75
+ - 当前工作目录是代码助手专用目录,只使用这里的助手规则,不回退到普通项目会话规则。
76
+ - 你是代码助手控制面,不是项目实现者。默认职责只有:查看、分析、归纳、补查信息、安排下一步、把指令发送给真实项目会话或终端。
77
+ - 禁止直接改业务项目代码、禁止直接生成补丁并落盘、禁止自己在项目目录里写实现。用户要推进开发时,只能通过内部 API 续接/新建项目会话、发送消息、查询结果,或者操作受控终端。
78
+ - 如果用户要求“修改代码”“继续实现”“修 bug”,先定位目标项目和目标会话;没有会话就先新建/续接项目会话,再把任务发给那个会话继续做,不要自己在 Butler 工作目录里动手。
79
+ - 当前聚合后的平台摘要写在 \`BUTLER_CONTEXT.md\`,先看这里,不要把所有项目原始记录一股脑塞进回答。
80
+ - 当前摘要作用域是:${promptContext.scope === "project" ? `项目 ${promptContext.projectId}` : "全局总览"}。
81
+ - 你自己的主工具入口不是一堆 HTTP 路由,而是 \`codingns assistant ...\`。真正执行前,先用 \`codingns assistant --help\`、\`codingns assistant help <group>\`、\`codingns assistant <group> <action> --help\` 按需查命令。
82
+ - 如果当前 Codex 环境能发现 \`codingns-assistant\` skill,优先按这个 skill 的流程工作:先查能力,再查项目/会话/终端,再决定是否发送消息、fork 或发终端输入。
83
+ - 默认查询顺序固定为:先看 \`BUTLER_CONTEXT.md\`,再用 \`codingns assistant capabilities list\` 确认能力,再按 \`projects / sessions / terminals\` 分组查具体对象;不要先翻一大堆旧 REST 文档。
84
+ - 如果你在跟进开发会话,且目标或上下文里提到了 spec,只能围绕 spec 明确写出的必做项推进,不能顺着建议项无限扩展开发范围。
85
+ - 如果当前没有 spec,就先从用户要求和会话现状里归纳一句核心任务,后续只围绕这个核心任务推进;不要把建议项、最佳实践、顺手优化当成必做项。
86
+ - 如果用户的问题里已经带了项目名、会话名、错误词或任务关键词,先通过 \`codingns assistant projects --help\`、\`codingns assistant sessions --help\` 选对命令,再查目标对象;如果用户明确点名历史会话或归档会话,按 help 提示补充筛选参数。
87
+ - 如果 \`BUTLER_CONTEXT.md\` 里的项目数或会话数是 0,不能直接下结论,必须先跑 \`codingns assistant capabilities list\` 和 \`codingns assistant projects list\` 确认真实状态。
88
+ - 如果用户追问的细节超出当前摘要,先明确缺口,再按 \`BUTLER_API.md\` 里记录的 CLI 顺序补查项目、会话、消息窗口或终端历史。
89
+ - 如果用户追问会话内容,先定位 \`sessionId\`,再优先用 \`codingns assistant sessions messages <sessionId>\` 查看最近消息,不要只复述摘要。
90
+ - 需要推进开发时,优先用 \`codingns assistant sessions send <sessionId> --message ...\`;只有明确需要 shell 链路时,才用 \`codingns assistant terminals send <terminalId> --input ...\`。
91
+ - 不要编造不存在的项目状态;信息不足时直接说缺什么。
92
+ `;
93
+ }
94
+ function buildApiGuideContent(auth, authFilePath) {
95
+ return `# 代码助手 CLI 与按需补查指南
96
+
97
+ 默认不要直接背 HTTP 路由。先用 \`codingns assistant ...\` 和分层 help 按需查询。
98
+
99
+ ## 固定认证方式
100
+
101
+ - Butler 专用凭证文件:\`${path.basename(authFilePath)}\`
102
+ - 凭证文件路径:\`${authFilePath}\`
103
+ - 当前 API 基地址:\`${auth.apiBaseUrl}\`
104
+ - 先从这个文件导出环境变量,再执行 \`codingns assistant ...\`。
105
+
106
+ ## 推荐先准备一次环境变量
107
+
108
+ \`\`\`bash
109
+ export CODINGNS_BASE_URL="$(jq -r '.apiBaseUrl' "${authFilePath}")"
110
+ export CODINGNS_ACCESS_TOKEN="$(jq -r '.accessToken' "${authFilePath}")"
111
+ \`\`\`
112
+
113
+ ## 默认读取顺序
114
+
115
+ 1. 先读 \`BUTLER_CONTEXT.md\` 的当前摘要。
116
+ 2. 先跑 \`codingns assistant capabilities list\`,确认当前开放能力。
117
+ 3. 不知道怎么查时,先跑 \`codingns assistant --help\`、\`codingns assistant help projects\`、\`codingns assistant help sessions\`、\`codingns assistant help terminals\`。
118
+ 4. 要找项目时,先 \`codingns assistant projects list\`,需要详情时再 \`projects get <projectId>\`。
119
+ 5. 要找会话时,先 \`codingns assistant sessions list --project <projectId>\`,再按需要用 \`sessions get\`、\`sessions runtime\`、\`sessions messages\`。
120
+ 6. 要推进开发时,优先 \`codingns assistant sessions send <sessionId> --message "..."\`。
121
+ 7. 只有明确需要 shell 链路时,先 \`terminals list\`、\`terminals history\`,再决定是否 \`terminals send\`。
122
+ 8. 要开新分支时,再用 \`codingns assistant sessions fork <sessionId>\`。
123
+
124
+ ## 执行边界
125
+
126
+ - 你不能直接修改项目代码,也不能把自己当成项目执行会话。
127
+ - 需要推进开发时,只能通过下面这些 CLI 命令驱动真实项目会话或受控终端。
128
+ - 需要命令结果时,优先查终端历史;确实要执行命令,再向受控终端发送输入。
129
+ - 需要分叉会话时,统一走 \`codingns assistant sessions fork\`,不要自己伪造一条“新上下文”继续编。
130
+
131
+ ## help 入口
132
+
133
+ \`\`\`bash
134
+ codingns assistant --help
135
+ codingns assistant help projects
136
+ codingns assistant help sessions
137
+ codingns assistant sessions send --help
138
+ codingns assistant terminals send --help
139
+ \`\`\`
140
+
141
+ ## 常用命令
142
+
143
+ - \`codingns assistant capabilities list\`:查看当前 Butler 可用能力。
144
+ - \`codingns assistant projects list\`:列出托管项目。
145
+ - \`codingns assistant projects get <projectId>\`:读取项目详情和项目下可操作会话。
146
+ - \`codingns assistant sessions list --project <projectId>\`:列出项目会话。
147
+ - \`codingns assistant sessions get <sessionId>\`:读取真实会话详情。
148
+ - \`codingns assistant sessions messages <sessionId> --limit 40\`:读取最近消息窗口。
149
+ - \`codingns assistant sessions runtime <sessionId>\`:查看会话是否还在运行。
150
+ - \`codingns assistant sessions send <sessionId> --message "..."\`:向真实项目会话发消息。
151
+ - \`codingns assistant sessions fork <sessionId> --message-id <messageId>\`:从消息点 fork 新会话。
152
+ - \`codingns assistant terminals list --project-id <projectId>\`:列出项目下终端。
153
+ - \`codingns assistant terminals history <terminalId> --limit 50\`:读取终端最近输出。
154
+ - \`codingns assistant terminals send <terminalId> --input "npm test\\n"\`:向终端发送输入。
155
+
156
+ ## 底层说明
157
+
158
+ - 上面这些命令最终还是调用宿主系统的 \`/api/assistant/*\`。
159
+ - 只有当 CLI 还没覆盖某个极少数细节时,才回退到底层 HTTP。
160
+ `;
161
+ }
162
+ function resolveSourceCodexHomeDir(sourceCodexHomeDir, targetHomeDir) {
163
+ const configuredSource = sourceCodexHomeDir?.trim();
164
+ if (configuredSource) {
165
+ const resolvedConfiguredSource = path.resolve(configuredSource);
166
+ if (resolvedConfiguredSource !== targetHomeDir) {
167
+ return resolvedConfiguredSource;
168
+ }
169
+ }
170
+ const fallbackHomeDir = path.resolve(path.join(os.homedir(), ".codex"));
171
+ if (fallbackHomeDir !== targetHomeDir) {
172
+ return fallbackHomeDir;
173
+ }
174
+ return targetHomeDir;
175
+ }
176
+ function composeCodexConfigContent(sourceConfigContent, instructionFilePath) {
177
+ const normalizedSource = sourceConfigContent
178
+ .split(/\r?\n/)
179
+ .filter((line) => {
180
+ const trimmed = line.trim();
181
+ return trimmed.length > 0 && !trimmed.startsWith("model_instructions_file");
182
+ })
183
+ .join("\n")
184
+ .trim();
185
+ return [
186
+ "# 代码助手专用 Codex 配置(系统自动生成)",
187
+ normalizedSource,
188
+ `model_instructions_file = ${toTomlString(instructionFilePath)}`
189
+ ]
190
+ .filter((part) => part.trim().length > 0)
191
+ .join("\n\n");
192
+ }
193
+ function writeFileIfChanged(filePath, content) {
194
+ fs.mkdirSync(path.dirname(filePath), { recursive: true });
195
+ if (fs.existsSync(filePath) && fs.readFileSync(filePath, "utf8") === content) {
196
+ return;
197
+ }
198
+ fs.writeFileSync(filePath, content, "utf8");
199
+ }
200
+ function syncOptionalFile(sourcePath, targetPath) {
201
+ if (!fs.existsSync(sourcePath) || !fs.statSync(sourcePath).isFile()) {
202
+ return;
203
+ }
204
+ writeFileIfChanged(targetPath, fs.readFileSync(sourcePath, "utf8"));
205
+ }
206
+ function syncOptionalDirectory(sourcePath, targetPath) {
207
+ if (!fs.existsSync(sourcePath) || !fs.statSync(sourcePath).isDirectory()) {
208
+ return;
209
+ }
210
+ fs.rmSync(targetPath, { recursive: true, force: true });
211
+ fs.mkdirSync(path.dirname(targetPath), { recursive: true });
212
+ fs.cpSync(sourcePath, targetPath, { recursive: true });
213
+ }
214
+ function removeFileIfExists(filePath) {
215
+ if (!fs.existsSync(filePath)) {
216
+ return;
217
+ }
218
+ fs.rmSync(filePath, { force: true });
219
+ }
220
+ function toTomlString(value) {
221
+ return `"${value.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"")}"`;
222
+ }
223
+ //# sourceMappingURL=butler-workspace-context.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"butler-workspace-context.js","sourceRoot":"","sources":["../../../../src/modules/butler/butler-workspace-context.ts"],"names":[],"mappings":"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"}
@@ -6,4 +6,10 @@ export declare class ClientController {
6
6
  readonly getRuntimeConfig: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
7
7
  readonly getReleaseManifest: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
8
8
  readonly getServiceUpdate: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
9
+ readonly installServiceUpdate: (request: FastifyRequest, reply: FastifyReply) => Promise<void>;
10
+ readonly getServiceUpdateTask: (request: FastifyRequest<{
11
+ Params: {
12
+ taskId: string;
13
+ };
14
+ }>, reply: FastifyReply) => Promise<void>;
9
15
  }
@@ -31,7 +31,7 @@ export class ClientController {
31
31
  throw new AppError({
32
32
  statusCode: 400,
33
33
  errorCode: "INVALID_PLATFORM",
34
- detail: "缺少桌面平台标识",
34
+ detail: "缺少发布平台标识",
35
35
  field: "platform"
36
36
  });
37
37
  }
@@ -39,17 +39,29 @@ export class ClientController {
39
39
  reply.send(this.clientService.getReleaseManifest(channel, query.platform));
40
40
  };
41
41
  getServiceUpdate = async (request, reply) => {
42
- if (!request.auth?.user.userId) {
43
- throw new AppError({
44
- statusCode: 401,
45
- errorCode: "UNAUTHORIZED",
46
- detail: "当前请求缺少有效登录态"
47
- });
48
- }
42
+ ensureAuthenticated(request);
49
43
  const query = request.query;
50
44
  const channel = query.channel === "beta" ? "beta" : "stable";
51
45
  reply.send(await this.clientService.getServiceUpdate(channel));
52
46
  };
47
+ installServiceUpdate = async (request, reply) => {
48
+ ensureAuthenticated(request);
49
+ const body = request.body;
50
+ if (!body?.packageName) {
51
+ throw new AppError({
52
+ statusCode: 400,
53
+ errorCode: "SERVICE_UPDATE_PACKAGE_REQUIRED",
54
+ detail: "缺少需要升级的 npm 包名",
55
+ field: "packageName"
56
+ });
57
+ }
58
+ const channel = body.channel === "beta" ? "beta" : "stable";
59
+ reply.send(await this.clientService.installServiceUpdate(channel, body.packageName));
60
+ };
61
+ getServiceUpdateTask = async (request, reply) => {
62
+ ensureAuthenticated(request);
63
+ reply.send(this.clientService.getServiceUpdateTask(request.params.taskId));
64
+ };
53
65
  }
54
66
  function readRequestProtocol(request) {
55
67
  const forwarded = request.headers["x-forwarded-proto"];
@@ -62,4 +74,14 @@ function normalizePlatform(query) {
62
74
  const platform = query?.platform;
63
75
  return platform === "desktop" ? "desktop" : "web";
64
76
  }
77
+ function ensureAuthenticated(request) {
78
+ if (request.auth?.user.userId) {
79
+ return;
80
+ }
81
+ throw new AppError({
82
+ statusCode: 401,
83
+ errorCode: "UNAUTHORIZED",
84
+ detail: "当前请求缺少有效登录态"
85
+ });
86
+ }
65
87
  //# sourceMappingURL=client-controller.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"client-controller.js","sourceRoot":"","sources":["../../../../src/modules/client/client-controller.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client-controller.js","sourceRoot":"","sources":["../../../../src/modules/client/client-controller.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,7 @@
1
1
  import type { HostConfig } from "../../config/env.js";
2
+ import type { NpmGlobalPackageService } from "./npm-global-package-service.js";
3
+ import type { ServiceUpdateTaskService } from "./service-update-task-service.js";
4
+ import type { ServiceUpdateListDto, ServiceUpdateTaskDto } from "./service-update-types.js";
2
5
  export interface ClientRuntimeConfigDto {
3
6
  platform: "desktop" | "web";
4
7
  hostBaseUrl: string;
@@ -6,7 +9,7 @@ export interface ClientRuntimeConfigDto {
6
9
  autoReconnect: boolean;
7
10
  autoCheckUpdate: boolean;
8
11
  }
9
- export interface ReleaseManifestDto {
12
+ export interface DesktopReleaseManifestDto {
10
13
  channel: "stable" | "beta";
11
14
  platform: string;
12
15
  version: string;
@@ -15,23 +18,32 @@ export interface ReleaseManifestDto {
15
18
  signature: string;
16
19
  publishedAt: string;
17
20
  }
18
- export interface ServiceUpdateDto {
21
+ export interface AndroidReleaseManifestDto {
19
22
  channel: "stable" | "beta";
23
+ version: string;
24
+ versionCode: number;
20
25
  packageName: string;
21
- registryUrl: string;
22
- packagePageUrl: string;
23
- currentVersion: string;
24
- latestVersion: string | null;
25
- hasUpdate: boolean;
26
- updateCommand: string;
26
+ fileName: string;
27
+ downloadUrl: string;
28
+ sha256: string;
29
+ publishedAt: string;
30
+ notes: string;
31
+ minSupportedVersionCode: number | null;
32
+ htmlUrl: string | null;
27
33
  }
34
+ export type ReleaseManifestDto = DesktopReleaseManifestDto | AndroidReleaseManifestDto;
28
35
  export declare class ClientService {
29
36
  private readonly config;
30
- constructor(config: HostConfig);
37
+ private readonly npmGlobalPackageService;
38
+ private readonly serviceUpdateTaskService;
39
+ constructor(config: HostConfig, npmGlobalPackageService: NpmGlobalPackageService, serviceUpdateTaskService: ServiceUpdateTaskService);
31
40
  getRuntimeConfig(platform: "desktop" | "web", requestContext?: {
32
41
  readonly protocol?: string | null;
33
42
  readonly host?: string | null;
34
43
  }): ClientRuntimeConfigDto;
35
44
  getReleaseManifest(channel: "stable" | "beta", platform: string): ReleaseManifestDto;
36
- getServiceUpdate(channel: "stable" | "beta"): Promise<ServiceUpdateDto>;
45
+ getServiceUpdate(channel: "stable" | "beta"): Promise<ServiceUpdateListDto>;
46
+ installServiceUpdate(channel: "stable" | "beta", packageName: string): Promise<ServiceUpdateTaskDto>;
47
+ getServiceUpdateTask(taskId: string): ServiceUpdateTaskDto;
37
48
  }
49
+ export declare function readHostPackageVersion(): string;