devchain-cli 0.24.0 → 0.24.1

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 (158) hide show
  1. package/README.md +1 -4
  2. package/dist/build-info.json +2 -2
  3. package/dist/cli.js +26 -1
  4. package/dist/server/common/test/fake-docker-engine.server.d.ts +8 -1
  5. package/dist/server/common/test/fake-docker-engine.server.js +65 -11
  6. package/dist/server/common/test/fake-docker-engine.server.js.map +1 -1
  7. package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.d.ts +1 -0
  8. package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.js +9 -3
  9. package/dist/server/modules/cloud-tunnel/services/mobile-chat-rpc.service.js.map +1 -1
  10. package/dist/server/modules/cloud-tunnel/services/mobile-transcript-projection.d.ts +6 -0
  11. package/dist/server/modules/cloud-tunnel/services/mobile-transcript-projection.js +88 -0
  12. package/dist/server/modules/cloud-tunnel/services/mobile-transcript-projection.js.map +1 -0
  13. package/dist/server/modules/cloud-tunnel/services/tunnel-event-forwarder.service.js +7 -1
  14. package/dist/server/modules/cloud-tunnel/services/tunnel-event-forwarder.service.js.map +1 -1
  15. package/dist/server/modules/core/controllers/docker-archive.d.ts +9 -2
  16. package/dist/server/modules/core/controllers/docker-archive.js +22 -6
  17. package/dist/server/modules/core/controllers/docker-archive.js.map +1 -1
  18. package/dist/server/modules/core/controllers/docker-engine.client.js +51 -2
  19. package/dist/server/modules/core/controllers/docker-engine.client.js.map +1 -1
  20. package/dist/server/modules/file-sync/file-sync.service.d.ts +2 -1
  21. package/dist/server/modules/file-sync/file-sync.service.js +8 -4
  22. package/dist/server/modules/file-sync/file-sync.service.js.map +1 -1
  23. package/dist/server/modules/file-sync/syncthing-rest.client.d.ts +1 -1
  24. package/dist/server/modules/file-sync/syncthing-rest.client.js +9 -4
  25. package/dist/server/modules/file-sync/syncthing-rest.client.js.map +1 -1
  26. package/dist/server/modules/file-sync/testing/fake-file-sync.service.d.ts +1 -1
  27. package/dist/server/modules/file-sync/testing/fake-file-sync.service.js +2 -1
  28. package/dist/server/modules/file-sync/testing/fake-file-sync.service.js.map +1 -1
  29. package/dist/server/modules/hooks/dtos/hook-event.dto.d.ts +86 -0
  30. package/dist/server/modules/hooks/dtos/hook-event.dto.js +15 -1
  31. package/dist/server/modules/hooks/dtos/hook-event.dto.js.map +1 -1
  32. package/dist/server/modules/hooks/services/hooks-config.service.js +29 -0
  33. package/dist/server/modules/hooks/services/hooks-config.service.js.map +1 -1
  34. package/dist/server/modules/hooks/services/hooks.service.d.ts +5 -1
  35. package/dist/server/modules/hooks/services/hooks.service.js +27 -5
  36. package/dist/server/modules/hooks/services/hooks.service.js.map +1 -1
  37. package/dist/server/modules/hooks/services/pending-ask-user-question.service.d.ts +2 -2
  38. package/dist/server/modules/hooks/services/pending-ask-user-question.service.js +9 -12
  39. package/dist/server/modules/hooks/services/pending-ask-user-question.service.js.map +1 -1
  40. package/dist/server/modules/metrics/services/metrics.service.js +1 -1
  41. package/dist/server/modules/metrics/services/metrics.service.js.map +1 -1
  42. package/dist/server/modules/providers/adapters/claude.adapter.d.ts +3 -1
  43. package/dist/server/modules/providers/adapters/claude.adapter.js +4 -1
  44. package/dist/server/modules/providers/adapters/claude.adapter.js.map +1 -1
  45. package/dist/server/modules/remotes/docker/docker-copy-back.d.ts +1 -0
  46. package/dist/server/modules/remotes/docker/docker-copy-back.js +31 -16
  47. package/dist/server/modules/remotes/docker/docker-copy-back.js.map +1 -1
  48. package/dist/server/modules/remotes/docker/docker-handoff.js +83 -19
  49. package/dist/server/modules/remotes/docker/docker-handoff.js.map +1 -1
  50. package/dist/server/modules/remotes/docker/docker-handoff.store.d.ts +2 -0
  51. package/dist/server/modules/remotes/docker/docker-handoff.store.js.map +1 -1
  52. package/dist/server/modules/remotes/docker/docker-plan-source.service.d.ts +6 -1
  53. package/dist/server/modules/remotes/docker/docker-plan-source.service.js +13 -4
  54. package/dist/server/modules/remotes/docker/docker-plan-source.service.js.map +1 -1
  55. package/dist/server/modules/remotes/docker/docker-plan.controller.js +1 -1
  56. package/dist/server/modules/remotes/docker/docker-plan.controller.js.map +1 -1
  57. package/dist/server/modules/remotes/docker/docker-plan.dto.d.ts +1 -0
  58. package/dist/server/modules/remotes/docker/docker-plan.dto.js.map +1 -1
  59. package/dist/server/modules/remotes/docker/docker-plan.service.d.ts +4 -1
  60. package/dist/server/modules/remotes/docker/docker-plan.service.js +29 -10
  61. package/dist/server/modules/remotes/docker/docker-plan.service.js.map +1 -1
  62. package/dist/server/modules/remotes/host/host-docker.controller.d.ts +6 -1
  63. package/dist/server/modules/remotes/host/host-docker.controller.js +6 -3
  64. package/dist/server/modules/remotes/host/host-docker.controller.js.map +1 -1
  65. package/dist/server/modules/remotes/host/host-docker.dto.d.ts +34 -3
  66. package/dist/server/modules/remotes/host/host-docker.dto.js +20 -3
  67. package/dist/server/modules/remotes/host/host-docker.dto.js.map +1 -1
  68. package/dist/server/modules/remotes/host/host-docker.service.d.ts +2 -2
  69. package/dist/server/modules/remotes/host/host-docker.service.js +39 -11
  70. package/dist/server/modules/remotes/host/host-docker.service.js.map +1 -1
  71. package/dist/server/modules/remotes/operations/attach.operation.js +1 -0
  72. package/dist/server/modules/remotes/operations/attach.operation.js.map +1 -1
  73. package/dist/server/modules/remotes/operations/docker-import-inventory.store.d.ts +6 -0
  74. package/dist/server/modules/remotes/operations/docker-import-inventory.store.js +6 -0
  75. package/dist/server/modules/remotes/operations/docker-import-inventory.store.js.map +1 -1
  76. package/dist/server/modules/remotes/operations/file-sync-handoff.d.ts +2 -0
  77. package/dist/server/modules/remotes/operations/file-sync-handoff.js +41 -27
  78. package/dist/server/modules/remotes/operations/file-sync-handoff.js.map +1 -1
  79. package/dist/server/modules/remotes/operations/remote-host.client.d.ts +2 -2
  80. package/dist/server/modules/remotes/operations/remote-host.client.js +21 -17
  81. package/dist/server/modules/remotes/operations/remote-host.client.js.map +1 -1
  82. package/dist/server/modules/remotes/operations/remote-operation.runner.js +7 -0
  83. package/dist/server/modules/remotes/operations/remote-operation.runner.js.map +1 -1
  84. package/dist/server/modules/remotes/operations/remote-operation.types.js +4 -2
  85. package/dist/server/modules/remotes/operations/remote-operation.types.js.map +1 -1
  86. package/dist/server/modules/session-reader/adapters/claude-session-reader.adapter.d.ts +5 -0
  87. package/dist/server/modules/session-reader/adapters/claude-session-reader.adapter.js +9 -0
  88. package/dist/server/modules/session-reader/adapters/claude-session-reader.adapter.js.map +1 -1
  89. package/dist/server/modules/session-reader/adapters/session-reader-adapter.interface.d.ts +1 -0
  90. package/dist/server/modules/session-reader/adapters/utils/coalesce-turns.js +1 -0
  91. package/dist/server/modules/session-reader/adapters/utils/coalesce-turns.js.map +1 -1
  92. package/dist/server/modules/session-reader/builders/semantic-step-extractor.js +1 -1
  93. package/dist/server/modules/session-reader/builders/semantic-step-extractor.js.map +1 -1
  94. package/dist/server/modules/session-reader/controllers/session-reader.controller.js +1 -1
  95. package/dist/server/modules/session-reader/controllers/session-reader.controller.js.map +1 -1
  96. package/dist/server/modules/session-reader/data/pricing.json +40 -11
  97. package/dist/server/modules/session-reader/dtos/unified-message.types.d.ts +1 -0
  98. package/dist/server/modules/session-reader/parsers/claude-jsonl.parser.d.ts +3 -0
  99. package/dist/server/modules/session-reader/parsers/claude-jsonl.parser.js +10 -1
  100. package/dist/server/modules/session-reader/parsers/claude-jsonl.parser.js.map +1 -1
  101. package/dist/server/modules/session-reader/parsers/claude-turn-evidence.d.ts +11 -0
  102. package/dist/server/modules/session-reader/parsers/claude-turn-evidence.js +50 -0
  103. package/dist/server/modules/session-reader/parsers/claude-turn-evidence.js.map +1 -0
  104. package/dist/server/modules/session-reader/parsers/codex-jsonl.parser.js +8 -2
  105. package/dist/server/modules/session-reader/parsers/codex-jsonl.parser.js.map +1 -1
  106. package/dist/server/modules/session-reader/services/bounded-anchor-proof.d.ts +7 -0
  107. package/dist/server/modules/session-reader/services/bounded-anchor-proof.js +31 -2
  108. package/dist/server/modules/session-reader/services/bounded-anchor-proof.js.map +1 -1
  109. package/dist/server/modules/session-reader/services/session-cache.service.d.ts +8 -2
  110. package/dist/server/modules/session-reader/services/session-cache.service.js +80 -21
  111. package/dist/server/modules/session-reader/services/session-cache.service.js.map +1 -1
  112. package/dist/server/modules/session-reader/services/session-reader.service.d.ts +4 -0
  113. package/dist/server/modules/session-reader/services/session-reader.service.js +40 -8
  114. package/dist/server/modules/session-reader/services/session-reader.service.js.map +1 -1
  115. package/dist/server/modules/session-reader/services/transcript-cursor.d.ts +16 -4
  116. package/dist/server/modules/session-reader/services/transcript-cursor.js +65 -6
  117. package/dist/server/modules/session-reader/services/transcript-cursor.js.map +1 -1
  118. package/dist/server/modules/session-reader/services/transcript-serialization.js +2 -1
  119. package/dist/server/modules/session-reader/services/transcript-serialization.js.map +1 -1
  120. package/dist/server/modules/session-reader/services/transcript-turn-state.d.ts +4 -0
  121. package/dist/server/modules/session-reader/services/transcript-turn-state.js +20 -0
  122. package/dist/server/modules/session-reader/services/transcript-turn-state.js.map +1 -0
  123. package/dist/server/modules/session-reader/services/transcript-watcher.service.d.ts +4 -1
  124. package/dist/server/modules/session-reader/services/transcript-watcher.service.js +43 -18
  125. package/dist/server/modules/session-reader/services/transcript-watcher.service.js.map +1 -1
  126. package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.d.ts +36 -17
  127. package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.js +26 -9
  128. package/dist/server/modules/sessions/services/session-runtime/__test-utils__/pipeline-harness.js.map +1 -1
  129. package/dist/server/modules/sessions/services/session-runtime/ensure-mcp-readiness.d.ts +19 -0
  130. package/dist/server/modules/sessions/services/session-runtime/ensure-mcp-readiness.js +26 -0
  131. package/dist/server/modules/sessions/services/session-runtime/ensure-mcp-readiness.js.map +1 -0
  132. package/dist/server/modules/sessions/services/session-runtime/session-launch-pipeline.service.js +10 -18
  133. package/dist/server/modules/sessions/services/session-runtime/session-launch-pipeline.service.js.map +1 -1
  134. package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.d.ts +5 -1
  135. package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.js +20 -2
  136. package/dist/server/modules/sessions/services/session-runtime/session-restore-pipeline.service.js.map +1 -1
  137. package/dist/server/modules/teams/storage/teams.store.d.ts +1 -0
  138. package/dist/server/modules/teams/storage/teams.store.js +19 -3
  139. package/dist/server/modules/teams/storage/teams.store.js.map +1 -1
  140. package/dist/server/modules/terminal/services/session-turn-signals.d.ts +18 -0
  141. package/dist/server/modules/terminal/services/session-turn-signals.js +6 -0
  142. package/dist/server/modules/terminal/services/session-turn-signals.js.map +1 -0
  143. package/dist/server/modules/terminal/services/terminal-activity.service.d.ts +32 -4
  144. package/dist/server/modules/terminal/services/terminal-activity.service.js +323 -38
  145. package/dist/server/modules/terminal/services/terminal-activity.service.js.map +1 -1
  146. package/dist/server/modules/terminal/terminal.module.js +2 -0
  147. package/dist/server/modules/terminal/terminal.module.js.map +1 -1
  148. package/dist/server/templates/teams-dev.json +4 -4
  149. package/dist/server/tsconfig.tsbuildinfo +1 -1
  150. package/dist/server/ui/assets/{ExternalRichEditor--kNXs-Eb.js → ExternalRichEditor-DtNvrV0F.js} +1 -1
  151. package/dist/server/ui/assets/{ReviewDetailPage-DMgP5fKn.js → ReviewDetailPage-DJzEoM0x.js} +1 -1
  152. package/dist/server/ui/assets/{ReviewsPage-CkyFUJr6.js → ReviewsPage-z2O8MNEw.js} +1 -1
  153. package/dist/server/ui/assets/{index-CqRufKpA.js → index-CC4P3V8L.js} +222 -222
  154. package/dist/server/ui/assets/{index-CVUaAlP4.css → index-LsJe1ZTS.css} +1 -1
  155. package/dist/server/ui/assets/{useReviewSubscription-CU70CzwG.js → useReviewSubscription-B7AdJBO2.js} +1 -1
  156. package/dist/server/ui/index.html +2 -2
  157. package/dist/templates/teams-dev.json +4 -4
  158. package/package.json +8 -1
@@ -37,5 +37,12 @@ export declare function createDockerArchiveHelper(client: DockerEngineClient, im
37
37
  record: (helper: DockerArchiveHelper) => Promise<void>;
38
38
  }, command?: DockerHelperCommand): Promise<DockerArchiveHelper>;
39
39
  export declare function cleanupDockerArchiveHelper(client: DockerEngineClient, helper: DockerArchiveHelper): Promise<void>;
40
- export declare function readDockerArchive(client: DockerEngineClient, helperId: string, signal?: AbortSignal): Promise<Readable>;
41
- export declare function writeDockerArchive(client: DockerEngineClient, helperId: string, archive: Readable, signal?: AbortSignal): Promise<void>;
40
+ export type DockerCopiedSource = 'volume' | 'bind' | 'file';
41
+ export interface DockerArchiveLayout {
42
+ mount: DockerArchiveMount;
43
+ readPath: string;
44
+ writePath: string;
45
+ }
46
+ export declare function dockerArchiveLayout(type: DockerCopiedSource, source: string): DockerArchiveLayout;
47
+ export declare function readDockerArchive(client: DockerEngineClient, helperId: string, signal?: AbortSignal, path?: string): Promise<Readable>;
48
+ export declare function writeDockerArchive(client: DockerEngineClient, helperId: string, archive: Readable, signal?: AbortSignal, path?: string): Promise<void>;
@@ -4,9 +4,14 @@ exports.DockerArchiveHelperError = exports.DOCKER_BIND_CLEAR_COMMAND = exports.D
4
4
  exports.inventoryDockerArchiveHelper = inventoryDockerArchiveHelper;
5
5
  exports.createDockerArchiveHelper = createDockerArchiveHelper;
6
6
  exports.cleanupDockerArchiveHelper = cleanupDockerArchiveHelper;
7
+ exports.dockerArchiveLayout = dockerArchiveLayout;
7
8
  exports.readDockerArchive = readDockerArchive;
8
9
  exports.writeDockerArchive = writeDockerArchive;
10
+ const node_path_1 = require("node:path");
9
11
  const docker_engine_client_1 = require("./docker-engine.client");
12
+ function archivePath(path) {
13
+ return encodeURIComponent(path).replace(/%2F/g, '/');
14
+ }
10
15
  exports.DOCKER_ARCHIVE_HELPER_LABEL = 'dev.devchain.archive-helper';
11
16
  exports.DOCKER_BIND_CLEAR_COMMAND = {
12
17
  Entrypoint: ['find'],
@@ -110,13 +115,24 @@ async function cleanupDockerArchiveHelper(client, helper) {
110
115
  for (const id of helper.ownedVolumeIds)
111
116
  await remove(`/volumes/${encodeURIComponent(id)}`);
112
117
  }
113
- function readDockerArchive(client, helperId, signal) {
114
- return client.stream('GET', `/containers/${encodeURIComponent(helperId)}/archive?path=/data`, {
115
- signal,
116
- });
118
+ function dockerArchiveLayout(type, source) {
119
+ if (type !== 'file')
120
+ return {
121
+ mount: { Type: type, Source: source, Target: '/data' },
122
+ readPath: '/data',
123
+ writePath: '/',
124
+ };
125
+ return {
126
+ mount: { Type: 'bind', Source: (0, node_path_1.dirname)(source), Target: '/data' },
127
+ readPath: node_path_1.posix.join('/data', (0, node_path_1.basename)(source)),
128
+ writePath: '/data',
129
+ };
130
+ }
131
+ function readDockerArchive(client, helperId, signal, path = '/data') {
132
+ return client.stream('GET', `/containers/${encodeURIComponent(helperId)}/archive?path=${archivePath(path)}`, { signal });
117
133
  }
118
- async function writeDockerArchive(client, helperId, archive, signal) {
119
- const response = await client.stream('PUT', `/containers/${encodeURIComponent(helperId)}/archive?copyUIDGID=true&path=/`, {
134
+ async function writeDockerArchive(client, helperId, archive, signal, path = '/') {
135
+ const response = await client.stream('PUT', `/containers/${encodeURIComponent(helperId)}/archive?copyUIDGID=true&path=${archivePath(path)}`, {
120
136
  body: archive,
121
137
  headers: { 'Content-Type': 'application/x-tar' },
122
138
  signal,
@@ -1 +1 @@
1
- {"version":3,"file":"docker-archive.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/docker-archive.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-archive.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/docker-archive.ts"],"names":[],"mappings":"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"}
@@ -140,6 +140,53 @@ function transportError(signal) {
140
140
  ? new DockerEngineError('cancelled', 'Docker request cancelled')
141
141
  : new DockerEngineError('unavailable', 'Docker engine connection failed');
142
142
  }
143
+ const ENGINE_MESSAGE_BYTES = 64 * 1024;
144
+ const ENGINE_MESSAGE_CHARACTERS = 1000;
145
+ async function engineMessage(res, body) {
146
+ const chunks = [];
147
+ let bytes = 0;
148
+ try {
149
+ for await (const chunk of res) {
150
+ chunks.push(chunk);
151
+ bytes += chunk.length;
152
+ if (bytes >= ENGINE_MESSAGE_BYTES)
153
+ break;
154
+ }
155
+ }
156
+ catch {
157
+ }
158
+ res.destroy();
159
+ const text = Buffer.concat(chunks).toString('utf8').slice(0, ENGINE_MESSAGE_BYTES);
160
+ let message = text;
161
+ try {
162
+ const parsed = JSON.parse(text);
163
+ if (typeof parsed?.message === 'string')
164
+ message = parsed.message;
165
+ }
166
+ catch {
167
+ }
168
+ return maskEnv(message.replace(/\s+/g, ' ').trim(), body).slice(0, ENGINE_MESSAGE_CHARACTERS);
169
+ }
170
+ function maskEnv(message, body) {
171
+ if (typeof body !== 'string' && !Buffer.isBuffer(body))
172
+ return message;
173
+ let env;
174
+ try {
175
+ const text = typeof body === 'string' ? body : body.toString('utf8');
176
+ env = JSON.parse(text)?.Env;
177
+ }
178
+ catch {
179
+ return message;
180
+ }
181
+ if (!Array.isArray(env))
182
+ return message;
183
+ return env
184
+ .filter((entry) => typeof entry === 'string')
185
+ .map((entry) => entry.slice(entry.indexOf('=') + 1))
186
+ .filter((value) => value.length >= 4)
187
+ .sort((a, b) => b.length - a.length)
188
+ .reduce((masked, value) => masked.split(value).join('***'), message);
189
+ }
143
190
  class DockerEngineClient {
144
191
  socketPath;
145
192
  baseUrl;
@@ -170,6 +217,8 @@ class DockerEngineClient {
170
217
  let req;
171
218
  let answered = false;
172
219
  const fail = () => {
220
+ if (answered && !output)
221
+ return;
173
222
  const error = transportError(options.signal);
174
223
  if (output)
175
224
  output.destroy(error);
@@ -197,10 +246,10 @@ class DockerEngineClient {
197
246
  if (!res.statusCode || res.statusCode < 200 || res.statusCode >= 300) {
198
247
  const status = res.statusCode;
199
248
  const code = status === 404 ? 'not-found' : status === 409 ? 'conflict' : 'engine-error';
200
- reject(new DockerEngineError(code, `Docker engine request failed (HTTP ${status ?? 0})`, status));
201
- res.destroy();
249
+ answered = true;
202
250
  if (options.body instanceof node_stream_1.Readable)
203
251
  options.body.destroy();
252
+ void engineMessage(res, options.body).then((detail) => reject(new DockerEngineError(code, `Docker engine request failed (HTTP ${status ?? 0})${detail ? `: ${detail}` : ''}`, status)));
204
253
  return;
205
254
  }
206
255
  answered = true;
@@ -1 +1 @@
1
- {"version":3,"file":"docker-engine.client.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/docker-engine.client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"docker-engine.client.js","sourceRoot":"","sources":["../../../../src/modules/core/controllers/docker-engine.client.ts"],"names":[],"mappings":"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"}
@@ -48,6 +48,7 @@ export interface WaitForCompleteOptions {
48
48
  onProgress?: (progress: SyncProgress) => void;
49
49
  pollIntervalMs?: number;
50
50
  symmetric?: boolean;
51
+ signal?: AbortSignal;
51
52
  }
52
53
  export declare class FileSyncService {
53
54
  private readonly syncthing;
@@ -77,7 +78,7 @@ export declare class FileSyncService {
77
78
  setFolderType(folderId: string, type: FolderType): Promise<void>;
78
79
  status(folderId: string, peerDeviceId?: string): Promise<FolderSyncStatus>;
79
80
  removeFolder(folderId: string): Promise<void>;
80
- rescan(folderId: string): Promise<void>;
81
+ rescan(folderId: string, signal?: AbortSignal): Promise<void>;
81
82
  revertLocalChanges(folderId: string): Promise<void>;
82
83
  waitForComplete(folderId: string, options: WaitForCompleteOptions): Promise<SyncProgress>;
83
84
  private connection;
@@ -248,8 +248,8 @@ let FileSyncService = class FileSyncService {
248
248
  throw error;
249
249
  }
250
250
  }
251
- async rescan(folderId) {
252
- await this.client().request('POST', `/rest/db/scan?folder=${enc(folderId)}`, undefined, exports.SCAN_TIMEOUT_MS);
251
+ async rescan(folderId, signal) {
252
+ await this.client().request('POST', `/rest/db/scan?folder=${enc(folderId)}`, undefined, exports.SCAN_TIMEOUT_MS, signal);
253
253
  }
254
254
  async revertLocalChanges(folderId) {
255
255
  await this.client().request('POST', `/rest/db/revert?folder=${enc(folderId)}`);
@@ -259,6 +259,8 @@ let FileSyncService = class FileSyncService {
259
259
  let progress = null;
260
260
  let lastError = null;
261
261
  for (;;) {
262
+ options.signal?.throwIfAborted();
263
+ let done = false;
262
264
  try {
263
265
  const [sender, receiver] = await Promise.all([options.sender(), options.receiver()]);
264
266
  const result = options.symmetric
@@ -267,12 +269,14 @@ let FileSyncService = class FileSyncService {
267
269
  progress = result.progress;
268
270
  lastError = null;
269
271
  options.onProgress?.(progress);
270
- if (result.done)
271
- return progress;
272
+ done = result.done;
272
273
  }
273
274
  catch (error) {
274
275
  lastError = error instanceof Error ? error.message : String(error);
275
276
  }
277
+ options.signal?.throwIfAborted();
278
+ if (done && progress)
279
+ return progress;
276
280
  if (Date.now() >= deadline)
277
281
  throw new FileSyncTimeoutError(folderId, progress, lastError);
278
282
  await new Promise((resolve) => setTimeout(resolve, options.pollIntervalMs ?? COMPLETION_POLL_MS));
@@ -1 +1 @@
1
- {"version":3,"file":"file-sync.service.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"file-sync.service.js","sourceRoot":"","sources":["../../../src/modules/file-sync/file-sync.service.ts"],"names":[],"mappings":"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"}
@@ -27,5 +27,5 @@ export declare class SyncthingRestClient {
27
27
  patchOptions(patch: SyncthingOptionsPatch): Promise<void>;
28
28
  restartRequired(): Promise<boolean>;
29
29
  shutdown(): Promise<void>;
30
- request(method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE', path: string, body?: unknown, timeoutMs?: number): Promise<unknown>;
30
+ request(method: 'GET' | 'POST' | 'PATCH' | 'PUT' | 'DELETE', path: string, body?: unknown, timeoutMs?: number, signal?: AbortSignal): Promise<unknown>;
31
31
  }
@@ -45,17 +45,20 @@ class SyncthingRestClient {
45
45
  async shutdown() {
46
46
  await this.request('POST', '/rest/system/shutdown');
47
47
  }
48
- async request(method, path, body, timeoutMs = DEFAULT_TIMEOUT_MS) {
49
- const controller = new AbortController();
50
- const timeout = setTimeout(() => controller.abort(), timeoutMs);
48
+ async request(method, path, body, timeoutMs = DEFAULT_TIMEOUT_MS, signal) {
49
+ const timeoutController = new AbortController();
50
+ const timeout = setTimeout(() => timeoutController.abort(), timeoutMs);
51
51
  timeout.unref?.();
52
+ const requestSignal = signal
53
+ ? AbortSignal.any([timeoutController.signal, signal])
54
+ : timeoutController.signal;
52
55
  const route = path.split('?')[0];
53
56
  let response;
54
57
  let text;
55
58
  try {
56
59
  response = await fetch(`${this.baseUrl}${path}`, {
57
60
  method,
58
- signal: controller.signal,
61
+ signal: requestSignal,
59
62
  headers: {
60
63
  'X-API-Key': this.apiKey,
61
64
  ...(body !== undefined && { 'content-type': 'application/json' }),
@@ -65,6 +68,8 @@ class SyncthingRestClient {
65
68
  text = await response.text();
66
69
  }
67
70
  catch (error) {
71
+ if (signal?.aborted)
72
+ throw signal.reason;
68
73
  throw new SyncthingRestError(`Syncthing is unreachable (${method} ${route}): ${error instanceof Error ? error.message : String(error)}`, { path: route, status: null });
69
74
  }
70
75
  finally {
@@ -1 +1 @@
1
- {"version":3,"file":"syncthing-rest.client.js","sourceRoot":"","sources":["../../../src/modules/file-sync/syncthing-rest.client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"syncthing-rest.client.js","sourceRoot":"","sources":["../../../src/modules/file-sync/syncthing-rest.client.ts"],"names":[],"mappings":"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"}
@@ -39,7 +39,7 @@ export declare class FakeFileSyncService implements Pick<FileSyncService, 'devic
39
39
  setFolderType(folderId: string, type: FolderType): Promise<void>;
40
40
  removeFolder(folderId: string): Promise<void>;
41
41
  status(folderId: string, peerDeviceId?: string): Promise<FolderSyncStatus>;
42
- rescan(folderId: string): Promise<void>;
42
+ rescan(folderId: string, signal?: AbortSignal): Promise<void>;
43
43
  revertLocalChanges(folderId: string): Promise<void>;
44
44
  waitForComplete(folderId: string, options: WaitForCompleteOptions): Promise<SyncProgress>;
45
45
  private require;
@@ -108,8 +108,9 @@ class FakeFileSyncService {
108
108
  : null,
109
109
  };
110
110
  }
111
- async rescan(folderId) {
111
+ async rescan(folderId, signal) {
112
112
  this.require(folderId);
113
+ signal?.throwIfAborted();
113
114
  }
114
115
  async revertLocalChanges(folderId) {
115
116
  this.require(folderId);
@@ -1 +1 @@
1
- {"version":3,"file":"fake-file-sync.service.js","sourceRoot":"","sources":["../../../../src/modules/file-sync/testing/fake-file-sync.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fake-file-sync.service.js","sourceRoot":"","sources":["../../../../src/modules/file-sync/testing/fake-file-sync.service.ts"],"names":[],"mappings":"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"}
@@ -39,6 +39,46 @@ export declare const SessionStartHookSchema: z.ZodObject<{
39
39
  permissionMode?: string | undefined;
40
40
  transcriptPath?: string | undefined;
41
41
  }>;
42
+ export declare const UserPromptSubmitHookSchema: z.ZodObject<{
43
+ providerName: z.ZodOptional<z.ZodString>;
44
+ providerSessionId: z.ZodOptional<z.ZodString>;
45
+ tmuxSessionName: z.ZodString;
46
+ projectId: z.ZodString;
47
+ agentId: z.ZodNullable<z.ZodString>;
48
+ sessionId: z.ZodNullable<z.ZodString>;
49
+ claudeSessionId: z.ZodOptional<z.ZodString>;
50
+ model: z.ZodOptional<z.ZodString>;
51
+ permissionMode: z.ZodOptional<z.ZodString>;
52
+ transcriptPath: z.ZodOptional<z.ZodString>;
53
+ firedAtMs: z.ZodOptional<z.ZodNumber>;
54
+ hookEventName: z.ZodLiteral<"UserPromptSubmit">;
55
+ }, "strict", z.ZodTypeAny, {
56
+ projectId: string;
57
+ agentId: string | null;
58
+ sessionId: string | null;
59
+ tmuxSessionName: string;
60
+ hookEventName: "UserPromptSubmit";
61
+ providerName?: string | undefined;
62
+ model?: string | undefined;
63
+ claudeSessionId?: string | undefined;
64
+ providerSessionId?: string | undefined;
65
+ permissionMode?: string | undefined;
66
+ transcriptPath?: string | undefined;
67
+ firedAtMs?: number | undefined;
68
+ }, {
69
+ projectId: string;
70
+ agentId: string | null;
71
+ sessionId: string | null;
72
+ tmuxSessionName: string;
73
+ hookEventName: "UserPromptSubmit";
74
+ providerName?: string | undefined;
75
+ model?: string | undefined;
76
+ claudeSessionId?: string | undefined;
77
+ providerSessionId?: string | undefined;
78
+ permissionMode?: string | undefined;
79
+ transcriptPath?: string | undefined;
80
+ firedAtMs?: number | undefined;
81
+ }>;
42
82
  export declare const StopHookSchema: z.ZodObject<{
43
83
  providerName: z.ZodOptional<z.ZodString>;
44
84
  providerSessionId: z.ZodOptional<z.ZodString>;
@@ -50,6 +90,7 @@ export declare const StopHookSchema: z.ZodObject<{
50
90
  model: z.ZodOptional<z.ZodString>;
51
91
  permissionMode: z.ZodOptional<z.ZodString>;
52
92
  transcriptPath: z.ZodOptional<z.ZodString>;
93
+ firedAtMs: z.ZodOptional<z.ZodNumber>;
53
94
  hookEventName: z.ZodLiteral<"Stop">;
54
95
  stopReason: z.ZodOptional<z.ZodString>;
55
96
  }, "strict", z.ZodTypeAny, {
@@ -64,6 +105,7 @@ export declare const StopHookSchema: z.ZodObject<{
64
105
  providerSessionId?: string | undefined;
65
106
  permissionMode?: string | undefined;
66
107
  transcriptPath?: string | undefined;
108
+ firedAtMs?: number | undefined;
67
109
  stopReason?: string | undefined;
68
110
  }, {
69
111
  projectId: string;
@@ -77,6 +119,7 @@ export declare const StopHookSchema: z.ZodObject<{
77
119
  providerSessionId?: string | undefined;
78
120
  permissionMode?: string | undefined;
79
121
  transcriptPath?: string | undefined;
122
+ firedAtMs?: number | undefined;
80
123
  stopReason?: string | undefined;
81
124
  }>;
82
125
  export declare const PreToolUseHookSchema: z.ZodObject<{
@@ -249,6 +292,46 @@ export declare const HookEventSchema: z.ZodDiscriminatedUnion<"hookEventName", [
249
292
  model: z.ZodOptional<z.ZodString>;
250
293
  permissionMode: z.ZodOptional<z.ZodString>;
251
294
  transcriptPath: z.ZodOptional<z.ZodString>;
295
+ firedAtMs: z.ZodOptional<z.ZodNumber>;
296
+ hookEventName: z.ZodLiteral<"UserPromptSubmit">;
297
+ }, "strict", z.ZodTypeAny, {
298
+ projectId: string;
299
+ agentId: string | null;
300
+ sessionId: string | null;
301
+ tmuxSessionName: string;
302
+ hookEventName: "UserPromptSubmit";
303
+ providerName?: string | undefined;
304
+ model?: string | undefined;
305
+ claudeSessionId?: string | undefined;
306
+ providerSessionId?: string | undefined;
307
+ permissionMode?: string | undefined;
308
+ transcriptPath?: string | undefined;
309
+ firedAtMs?: number | undefined;
310
+ }, {
311
+ projectId: string;
312
+ agentId: string | null;
313
+ sessionId: string | null;
314
+ tmuxSessionName: string;
315
+ hookEventName: "UserPromptSubmit";
316
+ providerName?: string | undefined;
317
+ model?: string | undefined;
318
+ claudeSessionId?: string | undefined;
319
+ providerSessionId?: string | undefined;
320
+ permissionMode?: string | undefined;
321
+ transcriptPath?: string | undefined;
322
+ firedAtMs?: number | undefined;
323
+ }>, z.ZodObject<{
324
+ providerName: z.ZodOptional<z.ZodString>;
325
+ providerSessionId: z.ZodOptional<z.ZodString>;
326
+ tmuxSessionName: z.ZodString;
327
+ projectId: z.ZodString;
328
+ agentId: z.ZodNullable<z.ZodString>;
329
+ sessionId: z.ZodNullable<z.ZodString>;
330
+ claudeSessionId: z.ZodOptional<z.ZodString>;
331
+ model: z.ZodOptional<z.ZodString>;
332
+ permissionMode: z.ZodOptional<z.ZodString>;
333
+ transcriptPath: z.ZodOptional<z.ZodString>;
334
+ firedAtMs: z.ZodOptional<z.ZodNumber>;
252
335
  hookEventName: z.ZodLiteral<"Stop">;
253
336
  stopReason: z.ZodOptional<z.ZodString>;
254
337
  }, "strict", z.ZodTypeAny, {
@@ -263,6 +346,7 @@ export declare const HookEventSchema: z.ZodDiscriminatedUnion<"hookEventName", [
263
346
  providerSessionId?: string | undefined;
264
347
  permissionMode?: string | undefined;
265
348
  transcriptPath?: string | undefined;
349
+ firedAtMs?: number | undefined;
266
350
  stopReason?: string | undefined;
267
351
  }, {
268
352
  projectId: string;
@@ -276,6 +360,7 @@ export declare const HookEventSchema: z.ZodDiscriminatedUnion<"hookEventName", [
276
360
  providerSessionId?: string | undefined;
277
361
  permissionMode?: string | undefined;
278
362
  transcriptPath?: string | undefined;
363
+ firedAtMs?: number | undefined;
279
364
  stopReason?: string | undefined;
280
365
  }>, z.ZodObject<{
281
366
  providerName: z.ZodOptional<z.ZodString>;
@@ -396,6 +481,7 @@ export declare const HookEventSchema: z.ZodDiscriminatedUnion<"hookEventName", [
396
481
  hookEventName: "StatusLine";
397
482
  }>]>;
398
483
  export type SessionStartHookEvent = z.infer<typeof SessionStartHookSchema>;
484
+ export type UserPromptSubmitHookEvent = z.infer<typeof UserPromptSubmitHookSchema>;
399
485
  export type StopHookEvent = z.infer<typeof StopHookSchema>;
400
486
  export type PreToolUseHookEvent = z.infer<typeof PreToolUseHookSchema>;
401
487
  export type PostToolUseHookEvent = z.infer<typeof PostToolUseHookSchema>;
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.HookEventSchema = exports.StatusLineHookSchema = exports.PostToolUseHookSchema = exports.PreToolUseHookSchema = exports.StopHookSchema = exports.SessionStartHookSchema = void 0;
3
+ exports.HookEventSchema = exports.StatusLineHookSchema = exports.PostToolUseHookSchema = exports.PreToolUseHookSchema = exports.StopHookSchema = exports.UserPromptSubmitHookSchema = exports.SessionStartHookSchema = void 0;
4
4
  const zod_1 = require("zod");
5
5
  const runtime_context_capture_types_1 = require("../../runtime-context-capture/runtime-context-capture.types");
6
6
  const baseInjectedFields = {
@@ -27,10 +27,23 @@ exports.SessionStartHookSchema = zod_1.z
27
27
  ...baseInjectedFields,
28
28
  })
29
29
  .strict();
30
+ const turnHookFields = {
31
+ firedAtMs: zod_1.z.number().int().nonnegative().max(Number.MAX_SAFE_INTEGER).optional(),
32
+ };
33
+ exports.UserPromptSubmitHookSchema = zod_1.z
34
+ .object({
35
+ hookEventName: zod_1.z.literal('UserPromptSubmit'),
36
+ ...turnHookFields,
37
+ ...claudeMetaFields,
38
+ ...claudeSessionIdOptional,
39
+ ...baseInjectedFields,
40
+ })
41
+ .strict();
30
42
  exports.StopHookSchema = zod_1.z
31
43
  .object({
32
44
  hookEventName: zod_1.z.literal('Stop'),
33
45
  stopReason: zod_1.z.string().min(1).optional(),
46
+ ...turnHookFields,
34
47
  ...claudeMetaFields,
35
48
  ...claudeSessionIdOptional,
36
49
  ...baseInjectedFields,
@@ -76,6 +89,7 @@ exports.StatusLineHookSchema = zod_1.z
76
89
  .strict();
77
90
  exports.HookEventSchema = zod_1.z.discriminatedUnion('hookEventName', [
78
91
  exports.SessionStartHookSchema,
92
+ exports.UserPromptSubmitHookSchema,
79
93
  exports.StopHookSchema,
80
94
  exports.PreToolUseHookSchema,
81
95
  exports.PostToolUseHookSchema,