@agentshouse/kit 0.2.1-cde47fd72fe59 → 0.2.1-ce0af1aee9a57

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 (149) hide show
  1. package/README.md +28 -29
  2. package/dist/acp.js +59 -8
  3. package/dist/afk.js +17 -0
  4. package/dist/agents.js +59 -33
  5. package/dist/api.js +5 -5
  6. package/dist/authority-main.js +3 -3
  7. package/dist/bridge.js +5 -5
  8. package/dist/building.js +50 -0
  9. package/dist/calls.js +71 -0
  10. package/dist/chunks.js +49 -0
  11. package/dist/clis.js +47 -45
  12. package/dist/{stream.js → connection.js} +46 -49
  13. package/dist/content.js +63 -0
  14. package/dist/conversations.js +614 -206
  15. package/dist/copies.js +308 -176
  16. package/dist/end.js +14 -4
  17. package/dist/events.js +742 -210
  18. package/dist/files.js +139 -37
  19. package/dist/git.js +47 -13
  20. package/dist/grok.js +39 -0
  21. package/dist/home.js +0 -7
  22. package/dist/house-cli.js +97 -89
  23. package/dist/house-main.js +3 -3
  24. package/dist/instructions.js +29 -11
  25. package/dist/kit-cli.js +5 -8
  26. package/dist/kit-main.js +3 -3
  27. package/dist/login.js +6 -6
  28. package/dist/logout.js +1 -1
  29. package/dist/mcp.js +6 -2
  30. package/dist/placement.js +21 -20
  31. package/dist/relay.js +21 -0
  32. package/dist/resident.js +69 -48
  33. package/dist/scope.js +15 -4
  34. package/dist/scripts.js +255 -0
  35. package/dist/secret-input.js +1 -1
  36. package/dist/service.js +1 -1
  37. package/dist/sign-in.js +22 -21
  38. package/dist/silence.js +28 -0
  39. package/dist/skills.js +42 -97
  40. package/dist/transcription.js +88 -45
  41. package/dist/translate.js +18 -9
  42. package/dist/update.js +113 -124
  43. package/dist/wire.js +37 -3
  44. package/dist/work.js +9 -2
  45. package/package.json +22 -21
  46. package/dist/bootstrap.json +0 -24
  47. package/dist/chatgpt.js +0 -32
  48. package/dist/clis-main.js +0 -23
  49. package/dist/inputs.js +0 -37
  50. package/dist/parts.js +0 -82
  51. package/how-we-work.md +0 -33
  52. package/skills/ask-matt/LICENSE +0 -21
  53. package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
  54. package/skills/ask-matt/SKILL.md +0 -97
  55. package/skills/ask-matt/agents/openai.yaml +0 -5
  56. package/skills/code-review/LICENSE +0 -21
  57. package/skills/code-review/SKILL.md +0 -89
  58. package/skills/code-review/agents/openai.yaml +0 -3
  59. package/skills/codebase-design/DEEPENING.md +0 -37
  60. package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
  61. package/skills/codebase-design/LICENSE +0 -21
  62. package/skills/codebase-design/SKILL.md +0 -114
  63. package/skills/codebase-design/agents/openai.yaml +0 -3
  64. package/skills/diagnosing-bugs/LICENSE +0 -21
  65. package/skills/diagnosing-bugs/SKILL.md +0 -138
  66. package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
  67. package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
  68. package/skills/domain-modeling/ADR-FORMAT.md +0 -47
  69. package/skills/domain-modeling/GLOSSARY-FORMAT.md +0 -60
  70. package/skills/domain-modeling/LICENSE +0 -21
  71. package/skills/domain-modeling/SKILL.md +0 -74
  72. package/skills/domain-modeling/agents/openai.yaml +0 -3
  73. package/skills/grill-me/LICENSE +0 -21
  74. package/skills/grill-me/SKILL.md +0 -7
  75. package/skills/grill-me/agents/openai.yaml +0 -5
  76. package/skills/grill-with-docs/LICENSE +0 -21
  77. package/skills/grill-with-docs/SKILL.md +0 -7
  78. package/skills/grill-with-docs/agents/openai.yaml +0 -5
  79. package/skills/grilling/LICENSE +0 -21
  80. package/skills/grilling/SKILL.md +0 -30
  81. package/skills/grilling/agents/openai.yaml +0 -3
  82. package/skills/handoff/LICENSE +0 -21
  83. package/skills/handoff/SKILL.md +0 -16
  84. package/skills/handoff/agents/openai.yaml +0 -5
  85. package/skills/implement/LICENSE +0 -21
  86. package/skills/implement/SKILL.md +0 -17
  87. package/skills/implement/agents/openai.yaml +0 -5
  88. package/skills/implement-spec/LICENSE +0 -21
  89. package/skills/implement-spec/SKILL.md +0 -40
  90. package/skills/implement-spec/agents/openai.yaml +0 -5
  91. package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
  92. package/skills/improve-codebase-architecture/LICENSE +0 -21
  93. package/skills/improve-codebase-architecture/SKILL.md +0 -71
  94. package/skills/improve-codebase-architecture/agents/openai.yaml +0 -5
  95. package/skills/pr/CREDITS.md +0 -3
  96. package/skills/pr/LICENSE +0 -21
  97. package/skills/pr/SKILL.md +0 -170
  98. package/skills/pr/agents/openai.yaml +0 -3
  99. package/skills/prototype/LICENSE +0 -21
  100. package/skills/prototype/LOGIC.md +0 -67
  101. package/skills/prototype/SKILL.md +0 -26
  102. package/skills/prototype/UI.md +0 -112
  103. package/skills/prototype/agents/openai.yaml +0 -3
  104. package/skills/research/LICENSE +0 -21
  105. package/skills/research/SKILL.md +0 -12
  106. package/skills/research/agents/openai.yaml +0 -3
  107. package/skills/retro/LICENSE +0 -21
  108. package/skills/retro/SKILL.md +0 -44
  109. package/skills/retro/agents/openai.yaml +0 -5
  110. package/skills/tdd/LICENSE +0 -21
  111. package/skills/tdd/SKILL.md +0 -38
  112. package/skills/tdd/agents/openai.yaml +0 -3
  113. package/skills/tdd/mocking.md +0 -59
  114. package/skills/tdd/tests.md +0 -77
  115. package/skills/teach/GLOSSARY-FORMAT.md +0 -35
  116. package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
  117. package/skills/teach/LICENSE +0 -21
  118. package/skills/teach/MISSION-FORMAT.md +0 -31
  119. package/skills/teach/RESOURCES-FORMAT.md +0 -32
  120. package/skills/teach/SKILL.md +0 -140
  121. package/skills/teach/agents/openai.yaml +0 -5
  122. package/skills/to-questionnaire/LICENSE +0 -21
  123. package/skills/to-questionnaire/SKILL.md +0 -54
  124. package/skills/to-questionnaire/agents/openai.yaml +0 -5
  125. package/skills/to-spec/LICENSE +0 -21
  126. package/skills/to-spec/SKILL.md +0 -75
  127. package/skills/to-spec/agents/openai.yaml +0 -5
  128. package/skills/to-tickets/LICENSE +0 -21
  129. package/skills/to-tickets/SKILL.md +0 -105
  130. package/skills/to-tickets/agents/openai.yaml +0 -5
  131. package/skills/triage/AGENT-BRIEF.md +0 -207
  132. package/skills/triage/LICENSE +0 -21
  133. package/skills/triage/OUT-OF-SCOPE.md +0 -105
  134. package/skills/triage/SKILL.md +0 -112
  135. package/skills/triage/agents/openai.yaml +0 -5
  136. package/skills/wait-what/LICENSE +0 -21
  137. package/skills/wait-what/SKILL.md +0 -7
  138. package/skills/wait-what/agents/openai.yaml +0 -5
  139. package/skills/wayfinder/LICENSE +0 -21
  140. package/skills/wayfinder/SKILL.md +0 -128
  141. package/skills/wayfinder/agents/openai.yaml +0 -5
  142. package/skills/wizard/LICENSE +0 -21
  143. package/skills/wizard/SKILL.md +0 -44
  144. package/skills/wizard/agents/openai.yaml +0 -3
  145. package/skills/wizard/template.sh +0 -223
  146. package/skills/writing-for-agents/LICENSE +0 -21
  147. package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
  148. package/skills/writing-for-agents/SKILL.md +0 -81
  149. package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/dist/copies.js CHANGED
@@ -1,17 +1,32 @@
1
- import { parse } from '@agentshouse/mdmodel';
2
- import { randomUUID } from 'node:crypto';
1
+ import { HOUSE_ROOM_TYPES, readTypes } from '@agentshouse/mdmodel';
2
+ import { createHash, randomUUID } from 'node:crypto';
3
3
  import { mkdir, readFile, readdir, realpath, rename, rm, rmdir, stat, writeFile } from 'node:fs/promises';
4
4
  import { dirname, join } from 'node:path';
5
5
  import { finalRefusal, HouseRefusal, retrying } from './api.js';
6
+ import { chunkTexts, stagedChunks } from './chunks.js';
6
7
  import { blobId, blobText, git, isText, HOUSE_REF, importCommits, localCopies, revision, run, succeeded, tree, } from './git.js';
8
+ import { paused } from './files.js';
7
9
  import { kitHome } from './home.js';
8
10
  import { operationId } from './operation.js';
9
11
  import { refusalOf } from './refusals.js';
10
- import { changed } from './translate.js';
11
- import { relayed } from './relay.js';
12
+ import { changed, readDocument } from './translate.js';
12
13
  const BRANCH = 'main';
13
14
  const PROVENANCE = '_provenance';
14
- const IDENTITY = { GIT_COMMITTER_NAME: 'House Kit', GIT_COMMITTER_EMAIL: 'house-kit@localhost' };
15
+ const IDENTITY = { GIT_COMMITTER_NAME: 'Kit', GIT_COMMITTER_EMAIL: 'house-kit@localhost' };
16
+ const ROOMS = 'rooms/';
17
+ const ENUMERATE = '/kit/door/changes/enumerate';
18
+ const NOT_READY = 'not ready yet; Kit copies it once House has built it';
19
+ const STAGED_CHUNKS = 'house-chunks';
20
+ const SCHEMA = 'settings/schema.yaml';
21
+ // A Room answered not ready is asked again on this schedule: its chunk build usually catches up within seconds, so the first asks come soon and the last repeats until it does.
22
+ const ASKED_AGAIN_MS = [1000, 2000, 3000, 5000, 8000, 11_000, 15_000];
23
+ class NotReady extends Error {
24
+ rooms;
25
+ constructor(rooms) {
26
+ super(NOT_READY);
27
+ this.rooms = rooms;
28
+ }
29
+ }
15
30
  function causeOf(error) {
16
31
  return error instanceof Error ? error.message : String(error);
17
32
  }
@@ -72,6 +87,9 @@ function sidecar(path) {
72
87
  function recordOf(key) {
73
88
  return join(kitHome(), 'local-copies', `${key}.json`);
74
89
  }
90
+ function stagingPrefix() {
91
+ return `.${createHash('sha256').update(kitHome()).digest('hex').slice(0, 16)}-`;
92
+ }
75
93
  function rootOf(handle) {
76
94
  return `/rooms/${handle}`;
77
95
  }
@@ -99,32 +117,59 @@ async function removeFile(repository, path) {
99
117
  return;
100
118
  }
101
119
  }
102
- async function readOnlyPlaced(repository, held, written, removed) {
120
+ async function readOnlyFiles(repository, held) {
103
121
  const tracked = new Set((await git(repository, ['ls-files', '-z'])).split('\0'));
104
122
  const holding = new Set(held);
105
- for (const path of removed) {
106
- if (!holding.has(path))
107
- continue;
108
- if (!tracked.has(path))
109
- await removeFile(repository, path);
110
- holding.delete(path);
111
- }
112
- for (const [path, content] of written) {
113
- if (tracked.has(path))
114
- continue;
115
- if (!holding.has(path) && (await exists(join(repository, path))))
116
- continue;
117
- await writeText(join(repository, path), content);
118
- holding.add(path);
119
- }
120
- return [...holding].sort();
123
+ return {
124
+ remove: async (path) => {
125
+ if (!holding.has(path))
126
+ return;
127
+ if (!tracked.has(path))
128
+ await removeFile(repository, path);
129
+ holding.delete(path);
130
+ },
131
+ place: async (path, content) => {
132
+ if (tracked.has(path))
133
+ return;
134
+ if (!holding.has(path) && (await exists(join(repository, path))))
135
+ return;
136
+ await writeText(join(repository, path), content);
137
+ holding.add(path);
138
+ },
139
+ held: () => [...holding].sort(),
140
+ };
141
+ }
142
+ async function readOnlyPlaced(repository, held, written, removed) {
143
+ const files = await readOnlyFiles(repository, held);
144
+ for (const path of removed)
145
+ await files.remove(path);
146
+ for (const [path, content] of written)
147
+ await files.place(path, content);
148
+ return files.held();
149
+ }
150
+ async function importedWhole(repository, scope, texts, commit, readOnly) {
151
+ const revisions = {};
152
+ async function* tracked() {
153
+ for await (const { path, content, revision: held, provenance } of texts) {
154
+ if (declaredWritable(path, scope)) {
155
+ revisions[path] = held;
156
+ yield [path, content];
157
+ }
158
+ else {
159
+ await readOnly.place(path, content);
160
+ }
161
+ if (provenance !== undefined)
162
+ await readOnly.place(sidecar(path), provenance);
163
+ }
164
+ }
165
+ return { house: await importCommits(repository, [{ ...commit, files: tracked() }]), revisions };
121
166
  }
122
167
  async function ruled(path, rules) {
123
168
  if ((await readFile(path, 'utf8').catch(() => null)) !== rules)
124
169
  await writeFile(path, rules);
125
170
  }
126
171
  async function ignoreRules(repository, writable, copy) {
127
- const readOnly = ('read_only' in copy ? copy.read_only : [...copy.readOnly.keys()]).filter((path) => !path.split('/').includes(PROVENANCE));
172
+ const readOnly = copy.read_only.filter((path) => !path.split('/').includes(PROVENANCE));
128
173
  const protectedPath = (path) => copy.protected.some((prefix) => prefix !== '' && covers(path, prefix));
129
174
  const whole = copy.protected.filter((prefix) => prefix !== '' && !writable.some((path) => covers(path, prefix)));
130
175
  const house = [
@@ -133,7 +178,7 @@ async function ignoreRules(repository, writable, copy) {
133
178
  ].map(pattern);
134
179
  const granted = readOnly.filter((path) => !protectedPath(path)).map(pattern);
135
180
  await ruled(join(repository, '.gitignore'), [
136
- '# House Kit writes this file and .ignore. The paths below are read-only House',
181
+ '# Kit writes this file and .ignore. The paths below are read-only House',
137
182
  '# content: Git does not track them, and House refuses a change to them even',
138
183
  '# when this file is edited or a path is force-added.',
139
184
  '/.gitignore',
@@ -148,13 +193,19 @@ async function ignoreRules(repository, writable, copy) {
148
193
  '',
149
194
  ].join('\n'));
150
195
  await ruled(join(repository, '.ignore'), [
151
- '# House Kit writes this file so native search still reads the read-only House',
196
+ '# Kit writes this file so native search still reads the read-only House',
152
197
  '# content that .gitignore keeps out of Git.',
153
198
  `!${PROVENANCE}`,
154
199
  ...[...house, ...granted].map((rule) => `!${rule}`),
155
200
  '',
156
201
  ].join('\n'));
157
202
  }
203
+ async function modelOf(copy, files) {
204
+ const entry = files.get(SCHEMA);
205
+ if (entry !== undefined)
206
+ return readTypes(await blobText(copy.repository, entry), HOUSE_ROOM_TYPES);
207
+ return readTypes(copy.read_only.includes(SCHEMA) ? await readFile(join(copy.repository, SCHEMA), 'utf8') : '', HOUSE_ROOM_TYPES);
208
+ }
158
209
  function revisionAt(copy, commit, path) {
159
210
  let manifest = copy.manifests[commit];
160
211
  while (manifest !== undefined) {
@@ -184,6 +235,7 @@ export class LocalCopies {
184
235
  house;
185
236
  copies = new Map();
186
237
  queues = new Map();
238
+ waiting = new Set();
187
239
  answering = Promise.resolve();
188
240
  constructor(house) {
189
241
  this.house = house;
@@ -191,7 +243,7 @@ export class LocalCopies {
191
243
  key: 'owner',
192
244
  submit: async (operation, changes) => {
193
245
  try {
194
- const outcome = await retrying(() => house.post('/kit/door/batch', { operation_id: operation, changes }));
246
+ const outcome = await retrying(() => house.post('/kit/door/files/batch', { operation_id: operation, changes }));
195
247
  return { accepted: outcome.contents };
196
248
  }
197
249
  catch (error) {
@@ -215,25 +267,21 @@ export class LocalCopies {
215
267
  this.copies.set(copy.key, copy);
216
268
  }
217
269
  }
218
- async mapping() {
219
- await this.answering;
220
- return [...this.copies.values()]
221
- .filter((copy) => copy.erasing === undefined)
222
- .map((copy) => `${rootOf(copy.room_handle)}: ${copy.repository}`)
223
- .sort();
270
+ async swept() {
271
+ const rooms = join(localCopies(), 'rooms');
272
+ for (const name of await readdir(rooms).catch(() => [])) {
273
+ if (name.startsWith(stagingPrefix()))
274
+ await rm(join(rooms, name), { recursive: true, force: true });
275
+ }
224
276
  }
225
277
  connected() {
226
278
  return this.selected();
227
279
  }
228
- async changed(rooms) {
229
- if (rooms.length > 0)
230
- await this.selected(rooms);
231
- }
232
280
  fetch() {
233
281
  return this.answered(() => this.fetched(true));
234
282
  }
235
- async selected(rooms) {
236
- const copied = await this.answered(() => this.fetched(false, rooms));
283
+ async selected() {
284
+ const copied = await this.answered(() => this.fetched(false));
237
285
  if (copied.refused)
238
286
  logged(copied.text);
239
287
  }
@@ -242,64 +290,99 @@ export class LocalCopies {
242
290
  this.answering = answered.catch(() => undefined);
243
291
  return answered;
244
292
  }
245
- async fetched(refreshing, rooms) {
246
- const { local_copy: answer } = await this.house.post('/kit/local-copy/selection', rooms === undefined ? {} : { rooms });
247
- const synced = new Map(answer.rooms.map((room) => [`rooms/${room.room_ref}`, room.room_handle]));
248
- const named = rooms === undefined ? null : new Set(rooms.map((room) => `rooms/${room}`));
249
- const held = () => [...this.copies.values()].filter((copy) => named === null || named.has(copy.key));
250
- return this.holding([...new Set([...held().map((copy) => copy.key), ...synced.keys()])].sort(), async () => {
293
+ async fetched(refreshing) {
294
+ const { local_copy: answer } = await this.house.post('/kit/local-copies/selection/read', {});
295
+ const synced = new Map(answer.rooms.map((room) => [`${ROOMS}${room.room_ref}`, room.room_handle]));
296
+ return this.holding([...new Set([...this.copies.keys(), ...synced.keys()])].sort(), async () => {
251
297
  const said = [];
252
298
  let refused = false;
253
- for (const copy of held()) {
254
- const returned = synced.has(copy.key);
255
- if (returned && copy.erasing === undefined)
299
+ const mark = refreshing ? 'said' : 'unsaid';
300
+ for (const copy of [...this.copies.values()]) {
301
+ if (synced.has(copy.key) || copy.unfollowed === 'said' || copy.unfollowed === mark)
256
302
  continue;
257
- try {
258
- await this.erase(copy);
259
- said.push(`${rootOf(copy.room_handle)}: ${returned ? '' : 'no longer synced to this Environment; '}erased from the Local copy`);
260
- }
261
- catch (error) {
262
- refused = true;
263
- said.push(`${rootOf(copy.room_handle)}: ${causeOf(error)}`);
264
- }
303
+ await this.save({ ...copy, unfollowed: mark });
304
+ if (refreshing)
305
+ said.push(`${rootOf(copy.room_handle)}: no longer followed; kept as it is`);
265
306
  }
266
307
  const current = [];
308
+ const wanted = new Map();
267
309
  for (const [key, handle] of synced) {
268
310
  try {
269
311
  const held = this.copies.get(key);
270
- if (held?.erasing)
271
- continue;
272
312
  if (held === undefined || !(await exists(held.repository))) {
273
- said.push(await this.materialize(key, handle));
313
+ wanted.set(key, handle);
274
314
  continue;
275
315
  }
276
- current.push(held.room_handle === handle ? held : await this.save({ ...held, room_handle: handle }));
316
+ const { unfollowed, ...followed } = held;
317
+ current.push(unfollowed === undefined && held.room_handle === handle ? held : await this.save({ ...followed, room_handle: handle }));
277
318
  }
278
319
  catch (error) {
279
320
  refused = true;
280
321
  said.push(`${rootOf(handle)}: ${causeOf(error)}`);
281
322
  }
282
323
  }
283
- if (refreshing && current.length > 0) {
284
- const failed = await this.refreshed(current).then(() => null, houseCause);
285
- for (const copy of current)
286
- said.push(...moved(copy, this.copies.get(copy.key)));
324
+ const unready = [];
325
+ const unsettled = [];
326
+ if (wanted.size > 0) {
327
+ const { authorities } = await this.discovered([...wanted.values()]);
328
+ for (const [key, handle] of wanted) {
329
+ const authority = authorities.find((entry) => `${ROOMS}${entry.room_ref}` === key);
330
+ try {
331
+ if (authority === undefined)
332
+ throw new Error('House serves nothing of it to copy');
333
+ said.push(await this.copied({ key, handle, authority }));
334
+ }
335
+ catch (error) {
336
+ if (error instanceof NotReady) {
337
+ unready.push(...error.rooms);
338
+ said.push(`${rootOf(handle)}: ${NOT_READY}`);
339
+ }
340
+ else {
341
+ refused = true;
342
+ unsettled.push(key.slice(ROOMS.length));
343
+ said.push(`${rootOf(handle)}: ${causeOf(error)}`);
344
+ }
345
+ }
346
+ }
347
+ }
348
+ const reading = refreshing ? current : current.filter((copy) => this.waiting.has(copy.room_ref));
349
+ if (reading.length > 0) {
350
+ const failed = await this.refreshed(reading, unready).then(() => null, houseCause);
351
+ for (const copy of reading) {
352
+ said.push(...(unready.includes(copy.room_ref) ? [`${rootOf(copy.room_handle)}: ${NOT_READY}`] : moved(copy, this.copies.get(copy.key))));
353
+ }
287
354
  if (failed !== null) {
288
355
  refused = true;
356
+ unsettled.push(...reading.map((copy) => copy.room_ref));
289
357
  said.push(failed);
290
358
  }
291
359
  }
360
+ for (const room of [...this.waiting]) {
361
+ if (!unready.includes(room) && !unsettled.includes(room))
362
+ this.waiting.delete(room);
363
+ }
364
+ const due = unready.filter((room) => !this.waiting.has(room));
365
+ for (const room of due)
366
+ this.waiting.add(room);
367
+ if (due.length > 0)
368
+ void this.askedAgain(due);
292
369
  return { refused, text: said.length === 0 ? 'Nothing new from House.' : said.join('\n') };
293
370
  });
294
371
  }
372
+ async askedAgain(rooms) {
373
+ let asking = rooms;
374
+ for (let step = 0; asking.length > 0; step++) {
375
+ await paused(ASKED_AGAIN_MS[Math.min(step, ASKED_AGAIN_MS.length - 1)]);
376
+ await this.selected().catch(logged);
377
+ asking = asking.filter((room) => this.waiting.has(room));
378
+ }
379
+ }
295
380
  async observed(report) {
296
381
  const key = await this.keyAt(dirname(report.common));
297
382
  if (key === undefined)
298
383
  return;
299
384
  await this.exclusive(key, async () => {
300
385
  const copy = this.copies.get(key);
301
- if (copy === undefined || copy.erasing)
302
- return;
303
386
  let moves = copy.moves;
304
387
  for (const { from, to } of report.moves) {
305
388
  const held = moves.find((move) => move.worktree === report.worktree && move.to === from);
@@ -355,138 +438,170 @@ export class LocalCopies {
355
438
  this.copies.set(copy.key, copy);
356
439
  return copy;
357
440
  }
358
- async erase(copy) {
359
- await this.save({ ...copy, erasing: true });
360
- await rm(copy.repository, { recursive: true, force: true });
361
- await rm(recordOf(copy.key), { force: true });
362
- this.copies.delete(copy.key);
363
- }
364
- async read(handle) {
365
- const prefixes = [rootOf(handle)];
366
- const discovery = await this.house.post('/kit/door/discover', { prefixes });
367
- let bundle = await this.house.post('/kit/door/bootstrap', { prefixes });
368
- if ('transfer' in bundle)
369
- bundle = (await (await fetch(relayed(bundle.transfer.url))).json());
370
- const [view] = bundle.scopes;
371
- if (view === undefined)
372
- return null;
373
- const authority = discovery.authorities.find((entry) => entry.room_ref === view.manifest.anchor);
374
- const contents = new Map(view.contents.map((entry) => [entry.path, entry.content]));
375
- const read = {
376
- anchor: view.manifest.anchor,
377
- position: view.manifest.position,
378
- log_epoch: view.manifest.log_epoch,
379
- write: authority.operations.write,
380
- protected: authority.protected_paths,
381
- writable: new Map(),
382
- revisions: {},
383
- readOnly: new Map(),
384
- };
385
- for (const file of view.manifest.files) {
386
- const content = contents.get(file.path);
387
- if (file.writable) {
388
- read.writable.set(file.path, content);
389
- read.revisions[file.path] = file.revision;
390
- }
391
- else {
392
- read.readOnly.set(file.path, content);
441
+ async discovered(handles) {
442
+ const discover = (group) => this.house.post('/kit/door/rooms/discover', { prefixes: group.map(rootOf) });
443
+ const [first, ...rest] = handles;
444
+ const { bounds, authorities } = await discover([first]);
445
+ for (const group of grouped(rest, bounds.max_prefixes))
446
+ authorities.push(...(await discover(group)).authorities);
447
+ return { bounds, authorities };
448
+ }
449
+ async chunked(root, room, directory) {
450
+ await mkdir(directory, { recursive: true });
451
+ for (let renewed = false;; renewed = true) {
452
+ const { rooms } = await this.house.post('/kit/door/room-chunks/list', { prefixes: [root] });
453
+ const list = rooms.find((entry) => entry.room_ref === room);
454
+ if (list === undefined)
455
+ throw new Error('House serves nothing of it to copy');
456
+ if (!list.ready)
457
+ throw new NotReady([room]);
458
+ const held = new Set(await readdir(directory));
459
+ const failure = await stagedChunks(directory, list.chunks.filter(({ hash }) => !held.has(hash)));
460
+ if (failure === undefined) {
461
+ return { position: list.position, log_epoch: list.log_epoch, texts: chunkTexts(directory, list.chunks, list.models) };
393
462
  }
394
- if (file.provenance !== undefined)
395
- read.readOnly.set(sidecar(file.path), file.provenance);
463
+ if (renewed && (await readdir(directory)).length === held.size)
464
+ throw failure;
396
465
  }
397
- return read;
398
466
  }
399
- async materialize(key, handle) {
400
- const read = await this.read(handle);
401
- if (read === null)
402
- throw new Error('House serves nothing of it to copy');
403
- const repository = join(localCopies(), 'rooms', read.anchor);
467
+ async materialized({ key, handle, authority }, whole) {
468
+ const repository = join(localCopies(), 'rooms', authority.room_ref);
404
469
  if (await exists(repository))
405
- throw new Error(`${repository} already exists and House Kit leaves it as it is`);
406
- const staging = join(dirname(repository), `.${randomUUID()}`);
470
+ throw new Error(`${repository} already exists and Kit leaves it as it is`);
471
+ const staging = join(dirname(repository), `${stagingPrefix()}${randomUUID()}`);
472
+ const scope = { write: authority.operations.write, protected: authority.protected_paths };
407
473
  await mkdir(staging, { recursive: true });
408
- let house;
409
- let readOnly;
474
+ let copy;
410
475
  try {
411
476
  await git(staging, ['init', '-q', '-b', BRANCH]);
412
- house = await importCommits(staging, [
413
- { message: `House ${rootOf(handle)}`, from: null, files: read.writable },
414
- ]);
477
+ const read = await whole(join(staging, '.git', STAGED_CHUNKS));
478
+ const readOnly = await readOnlyFiles(staging, []);
479
+ const { house, revisions } = await importedWhole(staging, scope, read.texts, { message: `House ${rootOf(handle)}`, from: null }, readOnly);
415
480
  await git(staging, ['update-ref', `refs/heads/${BRANCH}`, house]);
416
481
  await git(staging, ['reset', '-q', '--hard']);
417
- readOnly = await readOnlyPlaced(staging, [], read.readOnly, []);
418
- await ignoreRules(staging, [...read.writable.keys()], read);
482
+ copy = {
483
+ key,
484
+ room_ref: authority.room_ref,
485
+ room_handle: handle,
486
+ repository,
487
+ house,
488
+ position: read.position,
489
+ log_epoch: read.log_epoch,
490
+ ...scope,
491
+ read_only: readOnly.held(),
492
+ manifests: { [house]: { parent: null, files: revisions } },
493
+ moves: [],
494
+ };
495
+ await ignoreRules(staging, Object.keys(revisions), copy);
496
+ await rm(join(staging, '.git', STAGED_CHUNKS), { recursive: true, force: true });
419
497
  await rename(staging, repository);
420
498
  }
421
499
  catch (error) {
422
500
  await rm(staging, { recursive: true, force: true });
423
501
  throw error;
424
502
  }
425
- await this.save({
426
- key,
427
- room_ref: read.anchor,
428
- room_handle: handle,
429
- repository,
430
- house,
431
- position: read.position,
432
- log_epoch: read.log_epoch,
433
- write: read.write,
434
- protected: read.protected,
435
- read_only: readOnly,
436
- manifests: { [house]: { parent: null, files: read.revisions } },
437
- moves: [],
438
- });
439
- return `${rootOf(handle)}: copied to ${repository}`;
503
+ return this.save(copy);
440
504
  }
441
- async received(copy) {
442
- const read = await this.read(copy.room_handle);
443
- if (read === null)
444
- return copy;
445
- const house = await importCommits(copy.repository, [
446
- { message: `House ${rootOf(copy.room_handle)} at position ${read.position}`, from: copy.house, replaces: true, files: read.writable },
447
- ]);
448
- const removed = copy.read_only.filter((path) => !read.readOnly.has(path));
449
- const readOnly = await readOnlyPlaced(copy.repository, copy.read_only, read.readOnly, removed);
450
- const next = {
451
- ...copy,
452
- house,
453
- position: read.position,
454
- log_epoch: read.log_epoch,
455
- write: read.write,
456
- protected: read.protected,
457
- read_only: readOnly,
458
- manifests: { ...copy.manifests, [house]: { parent: null, files: read.revisions } },
459
- };
460
- await ignoreRules(copy.repository, [...read.writable.keys()], next);
461
- return next;
505
+ async copied(wanted) {
506
+ const { handle, authority } = wanted;
507
+ const root = rootOf(handle);
508
+ let answer = null;
509
+ try {
510
+ if (!this.waiting.has(authority.room_ref)) {
511
+ answer = await this.house.post(ENUMERATE, {
512
+ prefixes: [root],
513
+ positions: [
514
+ { authority: authority.room_ref, position: '0', log_epoch: authority.log_epoch, page: { through: authority.position, read: 0 } },
515
+ ],
516
+ });
517
+ }
518
+ }
519
+ catch (error) {
520
+ if (expiredAuthority(error) !== authority.room_ref)
521
+ throw error;
522
+ }
523
+ const view = answer?.authorities.find((entry) => entry.authority === authority.room_ref);
524
+ if (answer !== null && view === undefined)
525
+ throw new Error('House serves nothing of it to copy');
526
+ if (view !== undefined && view.next === undefined) {
527
+ const texts = view.changes.filter((change) => !('removed' in change));
528
+ const copy = await this.materialized(wanted, async () => ({ position: view.position, log_epoch: view.log_epoch, texts }));
529
+ return `${root}: copied to ${copy.repository}`;
530
+ }
531
+ const copy = await this.materialized(wanted, (directory) => this.chunked(root, authority.room_ref, directory));
532
+ const [caught] = await this.caughtUp([copy], true);
533
+ await succeeded(copy.repository, ['merge', '--ff-only', '-q', caught.house]);
534
+ return `${root}: copied to ${copy.repository}`;
462
535
  }
463
- async refreshed(copies) {
464
- const discover = (group) => this.house.post('/kit/door/discover', { prefixes: group.map((copy) => rootOf(copy.room_handle)) });
465
- const [first, ...rest] = copies;
466
- const { bounds, authorities } = await discover([first]);
467
- for (const group of grouped(rest, bounds.max_prefixes))
468
- authorities.push(...(await discover(group)).authorities);
536
+ async received(copy, authority) {
537
+ const root = rootOf(copy.room_handle);
538
+ const directory = join(copy.repository, '.git', STAGED_CHUNKS);
539
+ const scope = { write: authority.operations.write, protected: authority.protected_paths };
540
+ try {
541
+ const read = await this.chunked(root, copy.room_ref, directory);
542
+ const readOnly = await readOnlyFiles(copy.repository, copy.read_only);
543
+ for (const path of copy.read_only)
544
+ await readOnly.remove(path);
545
+ const commit = { message: `House ${root} at position ${read.position}`, from: copy.house, replaces: true };
546
+ const { house, revisions } = await importedWhole(copy.repository, scope, read.texts, commit, readOnly);
547
+ const next = {
548
+ ...copy,
549
+ ...scope,
550
+ house,
551
+ position: read.position,
552
+ log_epoch: read.log_epoch,
553
+ read_only: readOnly.held(),
554
+ manifests: { ...copy.manifests, [house]: { parent: null, files: revisions } },
555
+ };
556
+ await ignoreRules(copy.repository, Object.keys(revisions), next);
557
+ return next;
558
+ }
559
+ finally {
560
+ await rm(directory, { recursive: true, force: true });
561
+ }
562
+ }
563
+ async reread(copy) {
564
+ const { authorities } = await this.discovered([copy.room_handle]);
565
+ const authority = authorities.find((entry) => entry.room_ref === copy.room_ref);
566
+ if (authority === undefined)
567
+ throw new NotReady([copy.room_ref]);
568
+ return this.received(copy, authority);
569
+ }
570
+ async refreshed(copies, unready) {
571
+ const { bounds, authorities } = await this.discovered(copies.map((copy) => copy.room_handle));
572
+ const read = [];
469
573
  const unchanged = [];
470
574
  for (const copy of copies) {
471
575
  const authority = authorities.find((entry) => entry.room_ref === copy.room_ref);
472
576
  if (authority !== undefined &&
473
577
  JSON.stringify([authority.operations.write, authority.protected_paths]) !== JSON.stringify([copy.write, copy.protected])) {
474
- await this.save(await this.received(copy));
578
+ try {
579
+ read.push(await this.save(await this.received(copy, authority)));
580
+ }
581
+ catch (error) {
582
+ if (!(error instanceof NotReady))
583
+ throw error;
584
+ unready.push(...error.rooms);
585
+ }
475
586
  }
476
587
  else {
477
588
  unchanged.push(copy);
478
589
  }
479
590
  }
480
591
  for (const group of grouped(unchanged, bounds.max_prefixes))
481
- await this.caughtUp(group, false);
592
+ await this.caughtUp(group, false, unready);
593
+ for (const group of grouped(read, bounds.max_prefixes))
594
+ await this.caughtUp(group, true, unready);
482
595
  }
483
- async caughtUp(copies, whole) {
596
+ async caughtUp(copies, whole, unready) {
484
597
  const caught = new Map(copies.map((copy) => [copy.key, copy]));
598
+ const read = new Set();
599
+ const waiting = unready ?? [];
485
600
  let asking = [...copies];
486
601
  while (asking.length > 0) {
487
602
  let answer;
488
603
  try {
489
- answer = await this.house.post('/kit/door/enumerate', {
604
+ answer = await this.house.post(ENUMERATE, {
490
605
  prefixes: asking.map((copy) => rootOf(copy.room_handle)),
491
606
  positions: asking.map((copy) => ({ authority: copy.room_ref, position: copy.position, log_epoch: copy.log_epoch })),
492
607
  });
@@ -495,8 +610,22 @@ export class LocalCopies {
495
610
  const expired = asking.find((copy) => copy.room_ref === expiredAuthority(error));
496
611
  if (expired === undefined)
497
612
  throw error;
498
- caught.set(expired.key, await this.save(await this.received(expired)));
499
613
  asking = asking.filter((copy) => copy !== expired);
614
+ if (read.has(expired.key)) {
615
+ waiting.push(expired.room_ref);
616
+ continue;
617
+ }
618
+ read.add(expired.key);
619
+ try {
620
+ const next = await this.save(await this.reread(expired));
621
+ caught.set(expired.key, next);
622
+ asking.push(next);
623
+ }
624
+ catch (refused) {
625
+ if (!(refused instanceof NotReady))
626
+ throw refused;
627
+ waiting.push(expired.room_ref);
628
+ }
500
629
  continue;
501
630
  }
502
631
  const advanced = [];
@@ -508,8 +637,10 @@ export class LocalCopies {
508
637
  caught.set(copy.key, next);
509
638
  advanced.push(next);
510
639
  }
511
- asking = whole ? advanced : [];
640
+ asking = advanced.filter((copy) => whole || read.has(copy.key));
512
641
  }
642
+ if (unready === undefined && waiting.length > 0)
643
+ throw new NotReady(waiting);
513
644
  return copies.map((copy) => caught.get(copy.key));
514
645
  }
515
646
  async incorporated(copy, changes, position, logEpoch) {
@@ -560,8 +691,6 @@ export class LocalCopies {
560
691
  }
561
692
  async pushed(key, worktree, selector, caller) {
562
693
  let copy = this.copies.get(key);
563
- if (copy === undefined || copy.erasing)
564
- return outside(worktree);
565
694
  if (copy.push?.state === 'submitted')
566
695
  return this.settle(copy, caller);
567
696
  const selected = await run(worktree, ['rev-parse', '--verify', '--quiet', '--end-of-options', `${selector}^{commit}`]);
@@ -614,7 +743,7 @@ export class LocalCopies {
614
743
  const arrived = new Set(moved.values());
615
744
  const arriving = [...after].filter(([path, entry]) => before.get(path) !== entry);
616
745
  if (arriving.length > 0) {
617
- const { bounds } = await this.house.post('/kit/door/discover', { prefixes: [root] });
746
+ const { bounds } = await this.house.post('/kit/door/rooms/discover', { prefixes: [root] });
618
747
  const binary = [];
619
748
  for (const [path, entry] of arriving) {
620
749
  if (!(await isText(copy.repository, entry, bounds.max_authored_file_bytes)))
@@ -624,6 +753,7 @@ export class LocalCopies {
624
753
  throw new Error(textOnly(binary));
625
754
  }
626
755
  const text = (entry) => blobText(copy.repository, entry);
756
+ const model = await modelOf(copy, after);
627
757
  const changes = [];
628
758
  for (const path of [...new Set([...before.keys(), ...after.keys()])].sort()) {
629
759
  if (arrived.has(path))
@@ -647,7 +777,7 @@ export class LocalCopies {
647
777
  else if (prior === undefined)
648
778
  changes.push({ op: 'create', path: `${root}/${path}`, content: await text(next) });
649
779
  else
650
- changes.push(...changed(`${root}/${path}`, path, known, await text(prior), await text(next)));
780
+ changes.push(...changed(`${root}/${path}`, path, known, await text(prior), await text(next), model));
651
781
  }
652
782
  return changes;
653
783
  }
@@ -676,8 +806,10 @@ export class LocalCopies {
676
806
  }
677
807
  if (outcome.refused.code === 'expired')
678
808
  return this.recovered(copy);
679
- const rebased = rebaseFixes(outcome.refused);
680
809
  let settled = await this.save(without(copy));
810
+ if (settled.unfollowed !== undefined)
811
+ return { refused: true, text: outcome.refused.text };
812
+ const rebased = rebaseFixes(outcome.refused);
681
813
  try {
682
814
  settled = (await this.caughtUp([settled], true))[0];
683
815
  }
@@ -701,7 +833,8 @@ export class LocalCopies {
701
833
  const current = (await this.caughtUp([copy], true))[0];
702
834
  const house = await tree(copy.repository, current.house);
703
835
  const root = rootOf(current.room_handle);
704
- if (!(await this.landed(copy.repository, push.changes, house, await tree(copy.repository, push.commit)))) {
836
+ const model = await modelOf(current, house);
837
+ if (!(await this.landed(copy.repository, push.changes, house, await tree(copy.repository, push.commit), model))) {
705
838
  await this.save(without(current));
706
839
  return {
707
840
  refused: true,
@@ -800,7 +933,7 @@ export class LocalCopies {
800
933
  push: { ...push, acknowledged },
801
934
  };
802
935
  }
803
- async landed(repository, changes, house, selected) {
936
+ async landed(repository, changes, house, selected, model) {
804
937
  const text = async (path) => {
805
938
  const entry = house.get(relative(path));
806
939
  return entry === undefined ? undefined : blobText(repository, entry);
@@ -814,9 +947,8 @@ export class LocalCopies {
814
947
  }
815
948
  if ((change.op === 'create' || change.op === 'replace') && current === change.content)
816
949
  continue;
817
- const parsed = current === undefined ? null : parse(current, change.path);
818
- const document = parsed?.ok === true ? parsed.document : null;
819
- if (document === null)
950
+ const document = current === undefined ? undefined : readDocument(current, relative(change.path), model)?.document;
951
+ if (document === undefined)
820
952
  return false;
821
953
  if (change.op === 'set_field' && JSON.stringify(document.fields[change.field]) === JSON.stringify(change.value))
822
954
  continue;
@@ -829,7 +961,7 @@ export class LocalCopies {
829
961
  return true;
830
962
  }
831
963
  async revisionText(path, wanted) {
832
- const page = await this.house.post('/kit/door/revisions', {
964
+ const page = await this.house.post('/kit/door/files/revisions/list', {
833
965
  path,
834
966
  revision: wanted,
835
967
  });